wok-next rev 20680
Up at (3.1.20), bluez (5.48)
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Thu May 17 13:01:17 2018 +0300 (2018-05-17) |
parents | 1ca369c9f448 |
children | 802e7ed99164 |
files | asciidoc/receipt aspell/receipt at/receipt autoconf213/receipt autoconf213/stuff/patches/autoconf-2.13-consolidated_fixes-1.patch autoconf213/stuff/patches/series bluez/receipt bluez/stuff/patches/bluez-5.43-obexd_without_systemd-1.patch bluez/stuff/patches/bluez-5.48-obexd_without_systemd-1.patch bluez/stuff/patches/install-experimental.patch bluez/stuff/patches/series |
line diff
1.1 --- a/asciidoc/receipt Thu May 17 01:08:40 2018 +0300 1.2 +++ b/asciidoc/receipt Thu May 17 13:01:17 2018 +0300 1.3 @@ -7,6 +7,7 @@ 1.4 MAINTAINER="pankso@slitaz.org" 1.5 LICENSE="GPL2" 1.6 WEB_SITE="http://www.methods.co.nz/asciidoc/" 1.7 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/asciidoc.html" 1.8 1.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 1.10 WGET_URL="$SF_MIRROR/asciidoc/$TARBALL"
2.1 --- a/aspell/receipt Thu May 17 01:08:40 2018 +0300 2.2 +++ b/aspell/receipt Thu May 17 13:01:17 2018 +0300 2.3 @@ -27,11 +27,7 @@ 2.4 2.5 ln -svfn aspell-0.60 $install/usr/lib/aspell 2.6 2.7 - docdir="$install/usr/share/doc/aspell-$VERSION" 2.8 - install -v -m755 -d $docdir/aspell.html 2.9 - install -v -m755 -d $docdir/aspell-dev.html 2.10 - install -v -m644 manual/aspell.html/* $docdir/aspell.html 2.11 - install -v -m644 manual/aspell-dev.html/* $docdir/aspell-dev.html 2.12 + cook_pick_docs manual/aspell.html/ manual/aspell-dev.html/ 2.13 } 2.14 2.15 genpkg_rules() {
3.1 --- a/at/receipt Thu May 17 01:08:40 2018 +0300 3.2 +++ b/at/receipt Thu May 17 13:01:17 2018 +0300 3.3 @@ -1,37 +1,52 @@ 3.4 -# SliTaz package receipt. 3.5 +# SliTaz package receipt v2. 3.6 3.7 PACKAGE="at" 3.8 -VERSION="3.1.13" 3.9 +VERSION="3.1.20" 3.10 CATEGORY="system-tools" 3.11 -SHORT_DESC="Schedule commands to be executed once." 3.12 +SHORT_DESC="Schedule commands to be executed once" 3.13 MAINTAINER="pascal.bellard@slitaz.org" 3.14 LICENSE="GPL2" 3.15 WEB_SITE="http://packages.debian.org/lenny/at" 3.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/at.html" 3.17 + 3.18 TARBALL="${PACKAGE}_${VERSION}.orig.tar.gz" 3.19 -WGET_URL="http://ftp.debian.org/debian/pool/main/${PACKAGE:0:1}/$PACKAGE/$TARBALL" 3.20 +WGET_URL="http://ftp.debian.org/debian/pool/main/a/at/$TARBALL" 3.21 3.22 -BUILD_DEPENDS="bison flex ssmtp" 3.23 +BUILD_DEPENDS="automake bison flex ssmtp" 3.24 3.25 -# Rules to configure and make the package. 3.26 -compile_rules() 3.27 -{ 3.28 - sed -i 's|/doc|/share/doc|' Makefile* 3.29 - ./configure --with-daemon_username=nobody \ 3.30 - --with-daemon_groupname=nogroup \ 3.31 - --with-atspool=/var/spool/atd \ 3.32 - --with-jobdir=/var/spool/atd \ 3.33 - $CONFIGURE_ARGS && 3.34 +compile_rules() { 3.35 + addgroup -g 17 -S atd 3.36 + adduser -S -H -D -g "atd daemon" -G atd -u 17 atd 3.37 + mkdir -p /var/spool/cron 3.38 + 3.39 + sed -i '/docdir/s|=.*|= @docdir@|' Makefile.in 3.40 + autoreconf 3.41 + 3.42 + ./configure \ 3.43 + --with-daemon_username=atd \ 3.44 + --with-daemon_groupname=atd \ 3.45 + SENDMAIL=/usr/sbin/sendmail \ 3.46 + \ 3.47 + --with-atspool=/var/spool/atd \ 3.48 + --with-jobdir=/var/spool/atd \ 3.49 + $CONFIGURE_ARGS && 3.50 make -j1 && 3.51 - make -j1 IROOT=$DESTDIR install 3.52 + make -j1 \ 3.53 + IROOT=$DESTDIR \ 3.54 + docdir=/usr/share/doc/$PACKAGE-$VERSION \ 3.55 + atdocdir=/usr/share/doc/$PACKAGE-$VERSION \ 3.56 + install || return 1 3.57 + 3.58 + install -Dm755 $stuff/atd $install/etc/init.d/atd 3.59 } 3.60 3.61 -# Rules to gen a SliTaz package suitable for Tazpkg. 3.62 -genpkg_rules() 3.63 -{ 3.64 - mkdir -p $fs/usr $fs/etc/init.d 3.65 - cp -a $install/usr/bin $fs/usr 3.66 - cp -a $install/usr/sbin $fs/usr 3.67 - cp -a $install/etc $fs 3.68 - cp -a $install/var $fs 3.69 - cp -a $stuff/atd $fs/etc/init.d 3.70 +genpkg_rules() { 3.71 + copy @std 3.72 } 3.73 + 3.74 +post_install() { 3.75 + if ! grep -q '^atd:' "$1/etc/group"; then 3.76 + chroot "$1/" addgroup -g 17 -S atd 3.77 + chroot "$1/" adduser -S -H -D -g "atd daemon" -G atd -u 17 atd 3.78 + fi 3.79 +}
4.1 --- a/autoconf213/receipt Thu May 17 01:08:40 2018 +0300 4.2 +++ b/autoconf213/receipt Thu May 17 13:01:17 2018 +0300 4.3 @@ -12,14 +12,18 @@ 4.4 TARBALL="autoconf-$VERSION.tar.gz" 4.5 WGET_URL="http://ftpmirror.gnu.org/autoconf/$TARBALL" 4.6 4.7 -BUILD_DEPENDS="m4 perl sed" 4.8 +BUILD_DEPENDS="m4 perl sed texinfo" 4.9 4.10 compile_rules() { 4.11 + mv -v autoconf.texi autoconf213.texi 4.12 + rm -v autoconf.info 4.13 ./configure \ 4.14 --prefix=/usr \ 4.15 --program-suffix=-2.13 && 4.16 make && 4.17 - make prefix="$DESTDIR/usr" install 4.18 + make install || return 1 4.19 + 4.20 + install -m644 autoconf213.info $install/usr/share/info/ 4.21 } 4.22 4.23 genpkg_rules() {
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/autoconf213/stuff/patches/autoconf-2.13-consolidated_fixes-1.patch Thu May 17 13:01:17 2018 +0300 5.3 @@ -0,0 +1,504 @@ 5.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 5.5 +Date: 2016-06-11 5.6 +Initial Package Version: 2.13 5.7 +Upstream Status: Version is historic and unmaintained. 5.8 +Origin: Found at fedora, plus fixes for LFS. 5.9 +Description: All of the patches currently used by fedora, except for 5.10 +the patch which ensures gawk is used in preference to mawk (we do not 5.11 +install mawk). For LFS: we put mktemp in /usr/bin not /bin, remove 5.12 +the install-info target because that will overwrite standards.info 5.13 +with an old version (fedora always use a DESTDIR), and change the 5.14 +man and info dirs to ${datadir}/ i.e. /usr/share (an empty /usr/info 5.15 +will otherwise be created). 5.16 + 5.17 +diff -Naur a/acgeneral.m4 b/acgeneral.m4 5.18 +--- a/acgeneral.m4 1999-01-05 13:27:37.000000000 +0000 5.19 ++++ b/acgeneral.m4 2016-06-11 00:18:24.429043947 +0100 5.20 +@@ -1817,10 +1817,6 @@ 5.21 + [cat > conftest.$ac_ext <<EOF 5.22 + [#]line __oline__ "configure" 5.23 + #include "confdefs.h" 5.24 +-ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus 5.25 +-extern "C" void exit(int); 5.26 +-#endif 5.27 +-])dnl 5.28 + [$1] 5.29 + EOF 5.30 + if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null 5.31 +@@ -1988,12 +1984,12 @@ 5.32 + AC_MSG_CHECKING(size of $1) 5.33 + AC_CACHE_VAL(AC_CV_NAME, 5.34 + [AC_TRY_RUN([#include <stdio.h> 5.35 +-main() 5.36 ++int main() 5.37 + { 5.38 + FILE *f=fopen("conftestval", "w"); 5.39 +- if (!f) exit(1); 5.40 ++ if (!f) return(1); 5.41 + fprintf(f, "%d\n", sizeof($1)); 5.42 +- exit(0); 5.43 ++ return(0); 5.44 + }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , AC_CV_NAME=$2))])dnl 5.45 + AC_MSG_RESULT($AC_CV_NAME) 5.46 + AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME) 5.47 +@@ -2160,20 +2156,38 @@ 5.48 + dnl AC_OUTPUT_MAKE_DEFS() 5.49 + define(AC_OUTPUT_MAKE_DEFS, 5.50 + [# Transform confdefs.h into DEFS. 5.51 +-dnl Using a here document instead of a string reduces the quoting nightmare. 5.52 + # Protect against shell expansion while executing Makefile rules. 5.53 + # Protect against Makefile macro expansion. 5.54 +-cat > conftest.defs <<\EOF 5.55 ++# 5.56 ++# If the first sed substitution is executed (which looks for macros that 5.57 ++# take arguments), then we branch to the quote section. Otherwise, 5.58 ++# look for a macro that doesn't take arguments. 5.59 ++cat >confdef2opt.sed <<\_ACEOF 5.60 + changequote(<<, >>)dnl 5.61 +-s%<<#define>> \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g 5.62 +-s%[ `~<<#>>$^&*(){}\\|;'"<>?]%\\&%g 5.63 +-s%\[%\\&%g 5.64 +-s%\]%\\&%g 5.65 +-s%\$%$$%g 5.66 ++t clear 5.67 ++: clear 5.68 ++s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g 5.69 ++t quote 5.70 ++s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g 5.71 ++t quote 5.72 ++d 5.73 ++: quote 5.74 ++s,[ `~#$^&*(){}\\|;'"<>?],\\&,g 5.75 ++s,\[,\\&,g 5.76 ++s,\],\\&,g 5.77 ++s,\$,$$,g 5.78 ++p 5.79 + changequote([, ])dnl 5.80 +-EOF 5.81 +-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` 5.82 +-rm -f conftest.defs 5.83 ++_ACEOF 5.84 ++# We use echo to avoid assuming a particular line-breaking character. 5.85 ++# The extra dot is to prevent the shell from consuming trailing 5.86 ++# line-breaks from the sub-command output. A line-break within 5.87 ++# single-quotes doesn't work because, if this script is created in a 5.88 ++# platform that uses two characters for line-breaks (e.g., DOS), tr 5.89 ++# would break. 5.90 ++ac_LF_and_DOT=`echo; echo .` 5.91 ++DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` 5.92 ++rm -f confdef2opt.sed 5.93 + ]) 5.94 + 5.95 + dnl Do the variable substitutions to create the Makefiles or whatever. 5.96 +diff -Naur a/acspecific.m4 b/acspecific.m4 5.97 +--- a/acspecific.m4 1999-01-05 13:27:52.000000000 +0000 5.98 ++++ b/acspecific.m4 2016-06-11 00:18:17.533078644 +0100 5.99 +@@ -152,8 +152,41 @@ 5.100 + CXXFLAGS= 5.101 + fi 5.102 + fi 5.103 ++ 5.104 ++AC_PROG_CXX_EXIT_DECLARATION 5.105 + ]) 5.106 + 5.107 ++ 5.108 ++# AC_PROG_CXX_EXIT_DECLARATION 5.109 ++# ----------------------------- 5.110 ++# Find a valid prototype for exit and declare it in confdefs.h. 5.111 ++AC_DEFUN(AC_PROG_CXX_EXIT_DECLARATION, 5.112 ++[for ac_declaration in \ 5.113 ++ ''\ 5.114 ++ '#include <stdlib.h>' \ 5.115 ++ 'extern "C" void std::exit (int) throw (); using std::exit;' \ 5.116 ++ 'extern "C" void std::exit (int); using std::exit;' \ 5.117 ++ 'extern "C" void exit (int) throw ();' \ 5.118 ++ 'extern "C" void exit (int);' \ 5.119 ++ 'void exit (int);' 5.120 ++do 5.121 ++ AC_TRY_COMPILE([#include <stdlib.h> 5.122 ++$ac_declaration], 5.123 ++ [exit (42);], 5.124 ++ [], 5.125 ++ [continue]) 5.126 ++ AC_TRY_COMPILE([$ac_declaration], 5.127 ++ [exit (42);], 5.128 ++ [break]) 5.129 ++done 5.130 ++if test -n "$ac_declaration"; then 5.131 ++ echo '#ifdef __cplusplus' >>confdefs.h 5.132 ++ echo $ac_declaration >>confdefs.h 5.133 ++ echo '#endif' >>confdefs.h 5.134 ++fi 5.135 ++])# AC_PROG_CXX_EXIT_DECLARATION 5.136 ++ 5.137 ++ 5.138 + dnl Determine a Fortran 77 compiler to use. If `F77' is not already set 5.139 + dnl in the environment, check for `g77', `f77' and `f2c', in that order. 5.140 + dnl Set the output variable `F77' to the name of the compiler found. 5.141 +@@ -1010,7 +1043,7 @@ 5.142 + ]) 5.143 + 5.144 + AC_DEFUN(AC_FUNC_MMAP, 5.145 +-[AC_CHECK_HEADERS(unistd.h) 5.146 ++[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h sys/types.h) 5.147 + AC_CHECK_FUNCS(getpagesize) 5.148 + AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, 5.149 + [AC_TRY_RUN([ 5.150 +@@ -1039,11 +1072,24 @@ 5.151 + #include <fcntl.h> 5.152 + #include <sys/mman.h> 5.153 + 5.154 ++#if HAVE_SYS_TYPES_H 5.155 ++# include <sys/types.h> 5.156 ++#endif 5.157 ++ 5.158 ++#if HAVE_STDLIB_H 5.159 ++# include <stdlib.h> 5.160 ++#endif 5.161 ++ 5.162 ++#if HAVE_SYS_STAT_H 5.163 ++# include <sys/stat.h> 5.164 ++#endif 5.165 ++ 5.166 ++#if HAVE_UNISTD_H 5.167 ++# include <unistd.h> 5.168 ++#endif 5.169 ++ 5.170 + /* This mess was copied from the GNU getpagesize.h. */ 5.171 + #ifndef HAVE_GETPAGESIZE 5.172 +-# ifdef HAVE_UNISTD_H 5.173 +-# include <unistd.h> 5.174 +-# endif 5.175 + 5.176 + /* Assume that all systems that can run configure have sys/param.h. */ 5.177 + # ifndef HAVE_SYS_PARAM_H 5.178 +@@ -1373,6 +1419,8 @@ 5.179 + r.ru_majflt = r.ru_minflt = 0; 5.180 + switch (fork()) { 5.181 + case 0: /* Child. */ 5.182 ++ /* Unless we actually _do_ something, the kernel sometimes doesn't chalk up any system time to this process. */ 5.183 ++ if(fork()) { i = 123; wait(NULL); } else { i = 234; exit(0); } 5.184 + sleep(1); /* Give up the CPU. */ 5.185 + _exit(0); 5.186 + case -1: _exit(0); /* What can we do? */ 5.187 +diff -Naur a/autoconf.sh b/autoconf.sh 5.188 +--- a/autoconf.sh 1999-01-05 13:27:53.000000000 +0000 5.189 ++++ b/autoconf.sh 2016-06-11 00:22:17.351872133 +0100 5.190 +@@ -45,20 +45,20 @@ 5.191 + esac 5.192 + 5.193 + : ${TMPDIR=/tmp} 5.194 +-tmpout=${TMPDIR}/acout.$$ 5.195 ++tmpout=`/usr/bin/mktemp ${TMPDIR}/acout.XXXXXX` 5.196 + localdir= 5.197 + show_version=no 5.198 + 5.199 + while test $# -gt 0 ; do 5.200 + case "${1}" in 5.201 + -h | --help | --h* ) 5.202 +- echo "${usage}" 1>&2; exit 0 ;; 5.203 ++ echo "${usage}" 1>&2; rm -f $tmpout ; exit 0 ;; 5.204 + --localdir=* | --l*=* ) 5.205 + localdir="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" 5.206 + shift ;; 5.207 + -l | --localdir | --l*) 5.208 + shift 5.209 +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } 5.210 ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } 5.211 + localdir="${1}" 5.212 + shift ;; 5.213 + --macrodir=* | --m*=* ) 5.214 +@@ -66,7 +66,7 @@ 5.215 + shift ;; 5.216 + -m | --macrodir | --m* ) 5.217 + shift 5.218 +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } 5.219 ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $tmpout; exit 1; } 5.220 + AC_MACRODIR="${1}" 5.221 + shift ;; 5.222 + --version | --v* ) 5.223 +@@ -76,7 +76,7 @@ 5.224 + - ) # Use stdin as input. 5.225 + break ;; 5.226 + -* ) 5.227 +- echo "${usage}" 1>&2; exit 1 ;; 5.228 ++ echo "${usage}" 1>&2; rm -f $tmpout; exit 1 ;; 5.229 + * ) 5.230 + break ;; 5.231 + esac 5.232 +@@ -86,23 +86,25 @@ 5.233 + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ 5.234 + $AC_MACRODIR/acgeneral.m4` 5.235 + echo "Autoconf version $version" 5.236 ++ rm -f $tmpout 5.237 + exit 0 5.238 + fi 5.239 + 5.240 + case $# in 5.241 + 0) infile=configure.in ;; 5.242 + 1) infile="$1" ;; 5.243 +- *) echo "$usage" >&2; exit 1 ;; 5.244 ++ *) echo "$usage" >&2; rm -f $tmpout; exit 1 ;; 5.245 + esac 5.246 + 5.247 + trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 5.248 + 5.249 +-tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. 5.250 ++tmpin=`/usr/bin/mktemp ${TMPDIR}/acin.XXXXXX` 5.251 ++# Always set this, to avoid bogus errors from some rm's. 5.252 + if test z$infile = z-; then 5.253 + infile=$tmpin 5.254 +- cat > $infile 5.255 + elif test ! -r "$infile"; then 5.256 + echo "autoconf: ${infile}: No such file or directory" >&2 5.257 ++ rm -f $tmpin $tmpout 5.258 + exit 1 5.259 + fi 5.260 + 5.261 +@@ -111,6 +113,8 @@ 5.262 + else 5.263 + use_localdir= 5.264 + fi 5.265 ++# Make sure we don't leave those around - they are annoying 5.266 ++trap 'rm -f $tmpin $tmpout' 0 5.267 + 5.268 + # Use the frozen version of Autoconf if available. 5.269 + r= f= 5.270 +@@ -118,7 +122,7 @@ 5.271 + case `$M4 --help < /dev/null 2>&1` in 5.272 + *reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;; 5.273 + *traditional*) ;; 5.274 +-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;; 5.275 ++*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin $tmpout; exit 1 ;; 5.276 + esac 5.277 + 5.278 + $M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout || 5.279 +@@ -154,6 +158,6 @@ 5.280 + /__oline__/s/^\([0-9][0-9]*\):\(.*\)__oline__/\2\1/ 5.281 + ' >&4 5.282 + 5.283 +-rm -f $tmpout 5.284 ++rm -f $tmpout $tmpin 5.285 + 5.286 + exit $status 5.287 +diff -Naur a/autoconf.texi b/autoconf.texi 5.288 +--- a/autoconf.texi 1999-01-05 13:28:37.000000000 +0000 5.289 ++++ b/autoconf.texi 2016-06-11 00:18:46.360933604 +0100 5.290 +@@ -1,7 +1,7 @@ 5.291 + \input texinfo @c -*-texinfo-*- 5.292 + @c %**start of header 5.293 +-@setfilename autoconf.info 5.294 +-@settitle Autoconf 5.295 ++@setfilename autoconf213.info 5.296 ++@settitle Autoconf-2.13 5.297 + @c For double-sided printing, uncomment: 5.298 + @c @setchapternewpage odd 5.299 + @c %**end of header 5.300 +@@ -17,7 +17,8 @@ 5.301 + @ifinfo 5.302 + @format 5.303 + START-INFO-DIR-ENTRY 5.304 +-* Autoconf: (autoconf). Create source code configuration scripts. 5.305 ++* Autoconf213: (autoconf213). Create source code configuration scripts. 5.306 ++ This is a legacy version of autoconf. 5.307 + END-INFO-DIR-ENTRY 5.308 + @end format 5.309 + 5.310 +diff -Naur a/autoheader.sh b/autoheader.sh 5.311 +--- a/autoheader.sh 1999-01-05 13:28:39.000000000 +0000 5.312 ++++ b/autoheader.sh 2016-06-11 00:22:17.351872133 +0100 5.313 +@@ -194,9 +194,9 @@ 5.314 + # Some fgrep's have limits on the number of lines that can be in the 5.315 + # pattern on the command line, so use a temporary file containing the 5.316 + # pattern. 5.317 +- (fgrep_tmp=${TMPDIR-/tmp}/autoh$$ 5.318 ++ (fgrep_tmp=`/usr/bin/mktemp ${TMPDIR-/tmp}/autoh$$.XXXXXX` 5.319 + trap "rm -f $fgrep_tmp; exit 1" 1 2 15 5.320 +- cat > $fgrep_tmp <<EOF 5.321 ++ cat >> $fgrep_tmp <<EOF 5.322 + $syms 5.323 + EOF 5.324 + fgrep -f $fgrep_tmp 5.325 +diff -Naur a/autoupdate.sh b/autoupdate.sh 5.326 +--- a/autoupdate.sh 1999-01-05 13:28:42.000000000 +0000 5.327 ++++ b/autoupdate.sh 2016-06-11 00:23:19.151561252 +0100 5.328 +@@ -26,7 +26,7 @@ 5.329 + Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] 5.330 + [--version] [template-file]" 5.331 + 5.332 +-sedtmp=/tmp/acups.$$ 5.333 ++sedtmp=`/usr/bin/mktemp /tmp/acups.XXXXXX` 5.334 + # For debugging. 5.335 + #sedtmp=/tmp/acups 5.336 + show_version=no 5.337 +@@ -35,13 +35,13 @@ 5.338 + while test $# -gt 0 ; do 5.339 + case "${1}" in 5.340 + -h | --help | --h* ) 5.341 +- echo "${usage}" 1>&2; exit 0 ;; 5.342 ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 0 ;; 5.343 + --macrodir=* | --m*=* ) 5.344 + AC_MACRODIR="`echo \"${1}\" | sed -e 's/^[^=]*=//'`" 5.345 + shift ;; 5.346 + -m | --macrodir | --m* ) 5.347 + shift 5.348 +- test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; } 5.349 ++ test $# -eq 0 && { echo "${usage}" 1>&2; rm -f $sedtmp; exit 1; } 5.350 + AC_MACRODIR="${1}" 5.351 + shift ;; 5.352 + --version | --versio | --versi | --vers) 5.353 +@@ -51,7 +51,7 @@ 5.354 + - ) # Use stdin as input. 5.355 + break ;; 5.356 + -* ) 5.357 +- echo "${usage}" 1>&2; exit 1 ;; 5.358 ++ echo "${usage}" 1>&2; rm -f $sedtmp; exit 1 ;; 5.359 + * ) 5.360 + break ;; 5.361 + esac 5.362 +@@ -61,6 +61,7 @@ 5.363 + version=`sed -n 's/define.AC_ACVERSION.[ ]*\([0-9.]*\).*/\1/p' \ 5.364 + $AC_MACRODIR/acgeneral.m4` 5.365 + echo "Autoconf version $version" 5.366 ++ rm -f $sedtmp 5.367 + exit 0 5.368 + fi 5.369 + 5.370 +@@ -68,6 +69,7 @@ 5.371 + 5.372 + tmpout=acupo.$$ 5.373 + trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 5.374 ++trap 'rm -f $sedtmp' 0 5.375 + case $# in 5.376 + 0) infile=configure.in; out="> $tmpout" 5.377 + # Make sure $infile can be read, and $tmpout has the same permissions. 5.378 +diff -Naur a/configure b/configure 5.379 +--- a/configure 1999-01-05 13:28:57.000000000 +0000 5.380 ++++ b/configure 2016-06-11 00:50:57.771231914 +0100 5.381 +@@ -43,8 +43,8 @@ 5.382 + libdir='${exec_prefix}/lib' 5.383 + includedir='${prefix}/include' 5.384 + oldincludedir='/usr/include' 5.385 +-infodir='${prefix}/info' 5.386 +-mandir='${prefix}/man' 5.387 ++infodir='${datadir}/info' 5.388 ++mandir='${datadir}/man' 5.389 + 5.390 + # Initialize some other variables. 5.391 + subdirs= 5.392 +diff -Naur a/Makefile.in b/Makefile.in 5.393 +--- a/Makefile.in 1999-01-05 13:27:16.000000000 +0000 5.394 ++++ b/Makefile.in 2016-06-11 00:29:34.005678107 +0100 5.395 +@@ -49,7 +49,7 @@ 5.396 + 5.397 + # Directory in which to install library files. 5.398 + datadir = @datadir@ 5.399 +-acdatadir = $(datadir)/autoconf 5.400 ++acdatadir = $(datadir)/autoconf-2.13 5.401 + 5.402 + # Directory in which to install documentation info files. 5.403 + infodir = @infodir@ 5.404 +@@ -68,8 +68,8 @@ 5.405 + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ 5.406 + Makefile.in NEWS README TODO $(M4FILES) \ 5.407 + acconfig.h acfunctions acheaders acidentifiers \ 5.408 +- acmakevars acprograms autoconf.info* \ 5.409 +- autoconf.sh autoconf.texi install.texi \ 5.410 ++ acmakevars acprograms autoconf213.info* \ 5.411 ++ autoconf.sh autoconf213.texi install.texi \ 5.412 + autoheader.sh autoscan.pl autoreconf.sh autoupdate.sh ifnames.sh \ 5.413 + config.guess config.sub configure configure.in \ 5.414 + install-sh mkinstalldirs texinfo.tex \ 5.415 +@@ -106,11 +106,11 @@ 5.416 + autoconf.m4f: autoconf.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 5.417 + autoheader.m4f: autoheader.m4 acgeneral.m4 acspecific.m4 acoldnames.m4 5.418 + 5.419 +-info: autoconf.info @standards_info@ INSTALL 5.420 ++info: autoconf213.info @standards_info@ INSTALL 5.421 + 5.422 + # Use --no-split to avoid creating filenames > 14 chars. 5.423 +-autoconf.info: autoconf.texi install.texi 5.424 +- $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf.texi --no-split --output=$@ 5.425 ++autoconf213.info: autoconf213.texi install.texi 5.426 ++ $(MAKEINFO) -I$(srcdir) $(srcdir)/autoconf213.texi --no-split --output=$@ 5.427 + 5.428 + INSTALL: install.texi 5.429 + $(MAKEINFO) -I$(srcdir) $(srcdir)/install.texi --output=$@ \ 5.430 +@@ -121,8 +121,8 @@ 5.431 + 5.432 + dvi: autoconf.dvi @standards_dvi@ 5.433 + 5.434 +-autoconf.dvi: autoconf.texi 5.435 +- $(TEXI2DVI) $(srcdir)/autoconf.texi 5.436 ++autoconf.dvi: autoconf213.texi 5.437 ++ $(TEXI2DVI) $(srcdir)/autoconf213.texi 5.438 + 5.439 + standards.dvi: standards.texi make-stds.texi 5.440 + $(TEXI2DVI) $(srcdir)/standards.texi 5.441 +@@ -137,35 +137,35 @@ 5.442 + cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@ 5.443 + 5.444 + installdirs: 5.445 +- $(SHELL) ${srcdir}/mkinstalldirs $(bindir) $(infodir) $(acdatadir) 5.446 ++ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) $(DESTDIR)/$(acdatadir) 5.447 + 5.448 +-install: all $(M4FILES) acconfig.h installdirs install-info 5.449 ++install: all $(M4FILES) acconfig.h installdirs 5.450 + for p in $(ASCRIPTS); do \ 5.451 +- $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \ 5.452 ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)/$(bindir)/`echo $$p|sed '$(transform)'`; \ 5.453 + done 5.454 + for i in $(M4FROZEN); do \ 5.455 +- $(INSTALL_DATA) $$i $(acdatadir)/$$i; \ 5.456 ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(acdatadir)/$$i; \ 5.457 + done 5.458 + for i in $(M4FILES) acconfig.h; do \ 5.459 +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ 5.460 ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ 5.461 + done 5.462 + -if test -f autoscan; then \ 5.463 +- $(INSTALL_PROGRAM) autoscan $(bindir)/`echo autoscan|sed '$(transform)'`; \ 5.464 ++ $(INSTALL_PROGRAM) autoscan $(DESTDIR)/$(bindir)/`echo autoscan|sed '$(transform)'`; \ 5.465 + for i in acfunctions acheaders acidentifiers acprograms \ 5.466 + acmakevars; do \ 5.467 +- $(INSTALL_DATA) $(srcdir)/$$i $(acdatadir)/$$i; \ 5.468 ++ $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/$(acdatadir)/$$i; \ 5.469 + done; \ 5.470 + else :; fi 5.471 + 5.472 + # Don't cd, to avoid breaking install-sh references. 5.473 + install-info: info installdirs 5.474 +- if test -f autoconf.info; then \ 5.475 ++ if test -f autoconf213.info; then \ 5.476 + for i in *.info*; do \ 5.477 +- $(INSTALL_DATA) $$i $(infodir)/$$i; \ 5.478 ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/$$i; \ 5.479 + done; \ 5.480 + else \ 5.481 + for i in $(srcdir)/*.info*; do \ 5.482 +- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ 5.483 ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ 5.484 + done; \ 5.485 + fi 5.486 + 5.487 +@@ -174,7 +174,7 @@ 5.488 + rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \ 5.489 + done 5.490 + rm -fr $(acdatadir) 5.491 +- cd $(infodir) && rm -f autoconf.info* 5.492 ++ cd $(infodir) && rm -f autoconf213.info* 5.493 + if test -f standards.info || test -f $(srcdir)/standards.info; \ 5.494 + then cd $(infodir) && rm -f standards.info*; fi 5.495 + 5.496 +diff -Naur a/testsuite/autoconf.s/syntax.exp b/testsuite/autoconf.s/syntax.exp 5.497 +--- a/testsuite/autoconf.s/syntax.exp 1999-01-05 13:29:54.000000000 +0000 5.498 ++++ b/testsuite/autoconf.s/syntax.exp 2016-06-11 00:18:51.996905247 +0100 5.499 +@@ -2,7 +2,7 @@ 5.500 + 5.501 + send_user "Checking for syntax errors in the specific tests...\n" 5.502 + set script {s/^AC_DEFUN(\([^,]*\).*/\1/p} 5.503 +-set macros [exec sed -n $script $srcdir/../acspecific.m4] 5.504 ++set macros [exec sed -n $script $srcdir/../acspecific.m4 | grep -v -e AC_FUNC_GETLOADAVG -e F77] 5.505 + 5.506 + foreach mac $macros { 5.507 + send_user "$mac\n"
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/autoconf213/stuff/patches/series Thu May 17 13:01:17 2018 +0300 6.3 @@ -0,0 +1,2 @@ 6.4 +# http://www.linuxfromscratch.org/patches/blfs/8.2/autoconf-2.13-consolidated_fixes-1.patch 6.5 +autoconf-2.13-consolidated_fixes-1.patch
7.1 --- a/bluez/receipt Thu May 17 01:08:40 2018 +0300 7.2 +++ b/bluez/receipt Thu May 17 13:01:17 2018 +0300 7.3 @@ -1,7 +1,7 @@ 7.4 # SliTaz package receipt v2. 7.5 7.6 PACKAGE="bluez" 7.7 -VERSION="5.43" 7.8 +VERSION="5.48" 7.9 CATEGORY="system-tools" 7.10 SHORT_DESC="Bluetooth protocol stack" 7.11 MAINTAINER="pankso@slitaz.org" 7.12 @@ -29,8 +29,7 @@ 7.13 mkdir -p $install/usr/sbin 7.14 ln -svf ../libexec/bluetooth/bluetoothd $install/usr/sbin 7.15 7.16 - mkdir -p $install/etc/bluetooth 7.17 - cp src/main.conf $install/etc/bluetooth 7.18 + install -Dm644 src/main.conf $install/etc/bluetooth/main.conf 7.19 7.20 cook_pick_docs doc/*.txt 7.21 7.22 @@ -43,16 +42,18 @@ 7.23 copy bccmd bluemoon ciptool hciattach hciconfig hcidump hcitool \ 7.24 hex2hcd l2ping l2test mpris-proxy rctest rfcomm sdptool 7.25 CAT="system-tools|tools" 7.26 + DEPENDS="dbus glib bluez" 7.27 ;; 7.28 bluez-tools-experimental) 7.29 copy bin/ @rm 7.30 rm $fs/usr/bin/bluetoothctl $fs/usr/bin/btmon # -> main package 7.31 CAT="system-tools|experimental tools" 7.32 + DEPENDS="dbus eudev glib readline bluez" 7.33 ;; 7.34 bluez) 7.35 copy @std @rm 7.36 TAGS="bluetooth" 7.37 - DEPENDS="dbus eudev glib libical ncurses readline linux-bluetooth" 7.38 + DEPENDS="dbus eudev glib libical readline linux-bluetooth" 7.39 ;; 7.40 *-dev) 7.41 copy @dev
8.1 --- a/bluez/stuff/patches/bluez-5.43-obexd_without_systemd-1.patch Thu May 17 01:08:40 2018 +0300 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,61 +0,0 @@ 8.4 -Submitted By: Armin K. <krejzi at email dot com> 8.5 -Date: 2013-04-29 8.6 -Initial Package Version: 5.17 8.7 -Upstream Status: unknown 8.8 -Origin: Arch Linux (Giovanni Campagna) 8.9 -Description: Allow using obexd without systemd in the user session 8.10 - 8.11 -Not all sessions run systemd --user (actually, the majority 8.12 -doesn't), so the dbus daemon must be able to spawn obexd 8.13 -directly, and to do so it needs the full path of the daemon. 8.14 ---- 8.15 - Makefile.obexd | 4 ++-- 8.16 - obexd/src/org.bluez.obex.service | 4 ---- 8.17 - obexd/src/org.bluez.obex.service.in | 4 ++++ 8.18 - 3 files changed, 6 insertions(+), 6 deletions(-) 8.19 - delete mode 100644 obexd/src/org.bluez.obex.service 8.20 - create mode 100644 obexd/src/org.bluez.obex.service.in 8.21 - 8.22 -diff --git a/Makefile.obexd b/Makefile.obexd 8.23 -index 3760867..142e7c3 100644 8.24 ---- a/Makefile.obexd 8.25 -+++ b/Makefile.obexd 8.26 -@@ -2,12 +2,12 @@ 8.27 - if SYSTEMD 8.28 - systemduserunitdir = @SYSTEMD_USERUNITDIR@ 8.29 - systemduserunit_DATA = obexd/src/obex.service 8.30 -+endif 8.31 - 8.32 - dbussessionbusdir = @DBUS_SESSIONBUSDIR@ 8.33 - dbussessionbus_DATA = obexd/src/org.bluez.obex.service 8.34 --endif 8.35 - 8.36 --EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service 8.37 -+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in 8.38 - 8.39 - obex_plugindir = $(libdir)/obex/plugins 8.40 - 8.41 -diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service 8.42 -deleted file mode 100644 8.43 -index a538088..0000000 8.44 ---- a/obexd/src/org.bluez.obex.service 8.45 -+++ /dev/null 8.46 -@@ -1,4 +0,0 @@ 8.47 --[D-BUS Service] 8.48 --Name=org.bluez.obex 8.49 --Exec=/bin/false 8.50 --SystemdService=dbus-org.bluez.obex.service 8.51 -diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in 8.52 -new file mode 100644 8.53 -index 0000000..9c815f2 8.54 ---- /dev/null 8.55 -+++ b/obexd/src/org.bluez.obex.service.in 8.56 -@@ -0,0 +1,4 @@ 8.57 -+[D-BUS Service] 8.58 -+Name=org.bluez.obex 8.59 -+Exec=@libexecdir@/obexd 8.60 -+SystemdService=dbus-org.bluez.obex.service 8.61 --- 8.62 -1.8.3.1 8.63 - 8.64 -
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/bluez/stuff/patches/bluez-5.48-obexd_without_systemd-1.patch Thu May 17 13:01:17 2018 +0300 9.3 @@ -0,0 +1,61 @@ 9.4 +Submitted By: Armin K. <krejzi at email dot com> 9.5 +Date: 2013-04-29 9.6 +Initial Package Version: 5.17 9.7 +Upstream Status: unknown 9.8 +Origin: Arch Linux (Giovanni Campagna) 9.9 +Description: Allow using obexd without systemd in the user session 9.10 + 9.11 +Not all sessions run systemd --user (actually, the majority 9.12 +doesn't), so the dbus daemon must be able to spawn obexd 9.13 +directly, and to do so it needs the full path of the daemon. 9.14 +--- 9.15 + Makefile.obexd | 4 ++-- 9.16 + obexd/src/org.bluez.obex.service | 4 ---- 9.17 + obexd/src/org.bluez.obex.service.in | 4 ++++ 9.18 + 3 files changed, 6 insertions(+), 6 deletions(-) 9.19 + delete mode 100644 obexd/src/org.bluez.obex.service 9.20 + create mode 100644 obexd/src/org.bluez.obex.service.in 9.21 + 9.22 +diff --git a/Makefile.obexd b/Makefile.obexd 9.23 +index 3760867..142e7c3 100644 9.24 +--- a/Makefile.obexd 9.25 ++++ b/Makefile.obexd 9.26 +@@ -2,12 +2,12 @@ 9.27 + if SYSTEMD 9.28 + systemduserunitdir = @SYSTEMD_USERUNITDIR@ 9.29 + systemduserunit_DATA = obexd/src/obex.service 9.30 ++endif 9.31 + 9.32 + dbussessionbusdir = @DBUS_SESSIONBUSDIR@ 9.33 + dbussessionbus_DATA = obexd/src/org.bluez.obex.service 9.34 +-endif 9.35 + 9.36 +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service 9.37 ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in 9.38 + 9.39 + obex_plugindir = $(libdir)/obex/plugins 9.40 + 9.41 +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service 9.42 +deleted file mode 100644 9.43 +index a538088..0000000 9.44 +--- a/obexd/src/org.bluez.obex.service 9.45 ++++ /dev/null 9.46 +@@ -1,4 +0,0 @@ 9.47 +-[D-BUS Service] 9.48 +-Name=org.bluez.obex 9.49 +-Exec=/bin/false 9.50 +-SystemdService=dbus-org.bluez.obex.service 9.51 +diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in 9.52 +new file mode 100644 9.53 +index 0000000..9c815f2 9.54 +--- /dev/null 9.55 ++++ b/obexd/src/org.bluez.obex.service.in 9.56 +@@ -0,0 +1,4 @@ 9.57 ++[D-BUS Service] 9.58 ++Name=org.bluez.obex 9.59 ++Exec=@libexecdir@/obexd 9.60 ++SystemdService=dbus-org.bluez.obex.service 9.61 +-- 9.62 +1.8.3.1 9.63 + 9.64 +
10.1 --- a/bluez/stuff/patches/install-experimental.patch Thu May 17 01:08:40 2018 +0300 10.2 +++ b/bluez/stuff/patches/install-experimental.patch Thu May 17 13:01:17 2018 +0300 10.3 @@ -1,16 +1,16 @@ 10.4 Install misc experimental programs not provided to install by BlueZ maintainers 10.5 for some reason. 10.6 10.7 ---- a/Makefile.in.orig 10.8 +--- a/Makefile.in 10.9 +++ b/Makefile.in 10.10 @@ -84,8 +84,8 @@ 10.11 build_triplet = @build@ 10.12 host_triplet = @host@ 10.13 bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ 10.14 -- $(am__EXEEXT_4) 10.15 --noinst_PROGRAMS = $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ 10.16 -+ $(am__EXEEXT_4) \ 10.17 -+ $(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \ 10.18 - $(am__EXEEXT_8) $(am__EXEEXT_11) 10.19 +- $(am__EXEEXT_4) $(am__EXEEXT_5) 10.20 +-noinst_PROGRAMS = $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \ 10.21 ++ $(am__EXEEXT_4) $(am__EXEEXT_5) \ 10.22 ++ $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \ 10.23 + $(am__EXEEXT_9) $(am__EXEEXT_10) $(am__EXEEXT_11) \ 10.24 + $(am__EXEEXT_15) 10.25 libexec_PROGRAMS = src/bluetoothd$(EXEEXT) obexd/src/obexd$(EXEEXT) 10.26 - @LIBRARY_TRUE@am__append_1 = $(lib_headers)
11.1 --- a/bluez/stuff/patches/series Thu May 17 01:08:40 2018 +0300 11.2 +++ b/bluez/stuff/patches/series Thu May 17 13:01:17 2018 +0300 11.3 @@ -1,2 +1,3 @@ 11.4 -bluez-5.43-obexd_without_systemd-1.patch 11.5 +# http://www.linuxfromscratch.org/patches/blfs/8.2/bluez-5.48-obexd_without_systemd-1.patch 11.6 +bluez-5.48-obexd_without_systemd-1.patch 11.7 install-experimental.patch