diff options
Diffstat (limited to 'source/a')
185 files changed, 4821 insertions, 7443 deletions
diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild index 3d1a73051..d8c06b4af 100755 --- a/source/a/aaa_base/aaa_base.SlackBuild +++ b/source/a/aaa_base/aaa_base.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,19 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=13.0 -ARCH=${ARCH:-x86_64} +VERSION=13.1 BUILD=${BUILD:-2} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-aaa_base diff --git a/source/a/aaa_base/slackware-version b/source/a/aaa_base/slackware-version index 0c779cf82..11bc56a49 100644 --- a/source/a/aaa_base/slackware-version +++ b/source/a/aaa_base/slackware-version @@ -1 +1 @@ -Slackware 13.0.0.0.0 +Slackware 13.1.0 diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index fd5ade86f..10bd02ce0 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,18 @@ PKGNAM=aaa_elflibs -VERSION=${VERSION:-13.0} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-13.1} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index b8c2c758a..29c8bcc11 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -8,6 +8,7 @@ /lib/libgpm.so.1 /lib/libncurses.so.5 /lib/libncursesw.so.5 +/lib/libpopt.so.0 /lib/libsysfs.so.2 /lib/libtermcap.so.2 /usr/lib/libasound.so.2 @@ -24,15 +25,21 @@ /usr/lib/libglib-2.0.so.0 /usr/lib/libgmodule-2.0.so.0 /usr/lib/libgmp.so.3 +/usr/lib/libgmp.so.10 /usr/lib/libgmpxx.so.3 +/usr/lib/libgmpxx.so.4 /usr/lib/libgobject-2.0.so.0 /usr/lib/libgthread-2.0.so.0 /usr/lib/libhistory.so.4 /usr/lib/libhistory.so.5 /usr/lib/libidn.so.11 /usr/lib/libjpeg.so.62 +/usr/lib/libjpeg.so.8 /usr/lib/liblber-2.3.so.0 +/usr/lib/liblber-2.4.so.2 /usr/lib/libldap-2.3.so.0 +/usr/lib/libldap-2.4.so.2 +/usr/lib/libltdl.so.3 /usr/lib/libmenu.so.5 /usr/lib/libmenuw.so.5 /usr/lib/libmm.so.14 @@ -42,14 +49,16 @@ /usr/lib/libpcre.so.0 /usr/lib/libpcreposix.so.0 /usr/lib/libpng.so.3 +/usr/lib/libpng.so.14 /usr/lib/libpng12.so.0 -/usr/lib/libpopt.so.0 +/usr/lib/libpng14.so.14 /usr/lib/libreadline.so.4 /usr/lib/libreadline.so.5 /usr/lib/libslang.so.1 /usr/lib/libslang.so.2 /usr/lib/libtiff.so.3 /usr/lib/libusb-0.1.so.4 +/usr/lib/libusb-1.0.so.0 /usr/lib/libvga.so.1 /usr/lib/libvgagl.so.1 /usr/lib/libz.so.1 diff --git a/source/a/acpid/acpid.SlackBuild b/source/a/acpid/acpid.SlackBuild index 3010e0136..cb4831385 100755 --- a/source/a/acpid/acpid.SlackBuild +++ b/source/a/acpid/acpid.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.0.8 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo acpid-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j8} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -42,33 +53,37 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make || exit 1 -strip acpid acpi_listen -mkdir -p $PKG/usr/sbin -cat acpid > $PKG/usr/sbin/acpid -chmod 755 $PKG/usr/sbin/acpid -mkdir -p $PKG/usr/bin -cat acpi_listen > $PKG/usr/bin/acpi_listen -chmod 755 $PKG/usr/bin/acpi_listen -mkdir -p $PKG/usr/man/man8 -cat acpid.8 | gzip -9c > $PKG/usr/man/man8/acpid.8.gz -cat acpi_listen.8 | gzip -9c > $PKG/usr/man/man8/acpi_listen.8.gz -mkdir -p $PKG/usr/doc/acpid-$VERSION -cp -a Changelog README \ - $PKG/usr/doc/acpid-$VERSION -cp -a samples $PKG/usr/doc/acpid-$VERSION +make install \ + OPT="-O2" \ + PREFIX=/usr \ + MANDIR=/usr/man \ + DOCDIR=/usr/doc/acpid-$VERSION \ + DESTDIR=$PKG \ + || exit 1 + +strip --strip-unneeded $PKG/usr/bin/acpi_listen $PKG/usr/sbin/acpid + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/etc/acpi/events zcat $CWD/acpi_handler.sh.gz > $PKG/etc/acpi/acpi_handler.sh.new -chmod 755 $PKG/etc/acpi/acpi_handler.sh.new +chmod 0755 $PKG/etc/acpi/acpi_handler.sh.new zcat $CWD/default.gz > $PKG/etc/acpi/events/default + mkdir -p $PKG/etc/rc.d zcat $CWD/rc.acpid.gz > $PKG/etc/rc.d/rc.acpid -chmod 755 $PKG/etc/rc.d/rc.acpid +chmod 0755 $PKG/etc/rc.d/rc.acpid + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -# Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/acpid-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/acpid/doinst.sh b/source/a/acpid/doinst.sh index c090b9fe5..dfc78d656 100644 --- a/source/a/acpid/doinst.sh +++ b/source/a/acpid/doinst.sh @@ -1,11 +1,11 @@ -#!/bin/sh config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy rm $NEW fi # Otherwise, we leave the .new copy for the admin to consider... diff --git a/source/a/acpid/rc.acpid b/source/a/acpid/rc.acpid index 32486d17c..d6b74e881 100644 --- a/source/a/acpid/rc.acpid +++ b/source/a/acpid/rc.acpid @@ -11,7 +11,11 @@ acpid_start() { # Stop acpid: acpid_stop() { - killall acpid + if [ -r /var/run/acpid.pid ]; then + kill $(cat /var/run/acpid.pid) + else + killall acpid + fi } # Restart acpid: diff --git a/source/a/bash/bash-4.1-patches/bash41-001 b/source/a/bash/bash-4.1-patches/bash41-001 new file mode 100644 index 000000000..758e1fa40 --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-001 @@ -0,0 +1,48 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-001 + +Bug-Reported-by: Yann Rouillard <yann@pleiades.fr.eu.org> +Bug-Reference-ID: <4B44A410.4070107@pleiades.fr.eu.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00018.html + +Bug-Description: + +A prototype for vsnprintf was incorrect, and caused compilation failures +on systems that did not have a suitable vsnprintf, but had a declaration in +one of the system header files. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/builtins/printf.def 2009-11-20 15:31:23.000000000 -0500 +--- builtins/printf.def 2010-01-07 08:50:06.000000000 -0500 +*************** +*** 173,177 **** + + #if !HAVE_VSNPRINTF +! extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4))); + #endif + +--- 173,177 ---- + + #if !HAVE_VSNPRINTF +! extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0))); + #endif + +*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 +--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 0 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-002 b/source/a/bash/bash-4.1-patches/bash41-002 new file mode 100644 index 000000000..a1151985c --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-002 @@ -0,0 +1,65 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-002 + +Bug-Reported-by: guillaume.outters@free.fr +Bug-Reference-ID: <20100105230441.70D171AA7F52@asterix.local> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00017.html + +Bug-Description: + +Bash-4.1/Readline-6.1 introduced a hook function that allows applications +to rewrite or modify filenames read from the file system before comparing +them with a word to be completed. The converted filename, if it matches, +needs to be inserted into the line buffer, replacing the original contents. + +This fixes a completion bug on Mac OS X involving filenames containing +UTF-8 characters. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/lib/readline/complete.c 2009-11-29 18:39:30.000000000 -0500 +--- lib/readline/complete.c 2010-01-06 08:30:23.000000000 -0500 +*************** +*** 2139,2143 **** + if (filename_len == 0) + { +! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name)) + continue; + +--- 2139,2143 ---- + if (filename_len == 0) + { +! if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn)) + continue; + +*************** +*** 2220,2224 **** + } + +! strcpy (temp + dirlen, entry->d_name); + } + else +--- 2220,2224 ---- + } + +! strcpy (temp + dirlen, convfn); + } + else +*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 +--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-003 b/source/a/bash/bash-4.1-patches/bash41-003 new file mode 100644 index 000000000..479fdcd9d --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-003 @@ -0,0 +1,48 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-003 + +Bug-Reported-by: coyote@wariat.org.pl +Bug-Reference-ID: <4b64a1f8.06e2660a.60af.4bfb@mx.google.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-01/msg00135.html + +Bug-Description: + +If command completion is attempted on a word with a quoted globbing +character (e.g., `*' or `?'), bash can reference a NULL pointer and +dump core. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/bashline.c 2009-10-24 14:10:19.000000000 -0400 +--- bashline.c 2010-01-30 21:53:49.000000000 -0500 +*************** +*** 1681,1685 **** + characters in the common prefix are bad) will ever be returned on + regular completion. */ +! if (glob_pattern_p (hint)) + { + if (state == 0) +--- 1681,1685 ---- + characters in the common prefix are bad) will ever be returned on + regular completion. */ +! if (globpat) + { + if (state == 0) +*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 +--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-004 b/source/a/bash/bash-4.1-patches/bash41-004 new file mode 100644 index 000000000..33f79bb7c --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-004 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-004 + +Bug-Reported-by: Crestez Dan Leonard <cdleonard@gmail.com> +Bug-Reference-ID: <1265592839.30682.21.camel@deskbox> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00034.html + +Bug-Description: + +When running in Posix mode and executing a shell function without local +variables, bash will not propagate a variable in a special builtin's temporary +environment to have global scope. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/variables.c 2009-11-03 14:13:58.000000000 -0500 +--- variables.c 2010-02-08 17:36:18.000000000 -0500 +*************** +*** 3809,3812 **** +--- 3809,3817 ---- + if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate))) + { ++ /* Make sure we have a hash table to store the variable in while it is ++ being propagated down to the global variables table. Create one if ++ we have to */ ++ if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0) ++ shell_variables->table = hash_create (0); + /* XXX - should we set v->context here? */ + v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0); +*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 +--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-005 b/source/a/bash/bash-4.1-patches/bash41-005 new file mode 100644 index 000000000..8a2fec8a3 --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-005 @@ -0,0 +1,56 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-005 + +Bug-Reported-by: werner@suse.de +Bug-Reference-ID: <201002251238.o1PCcYcg016893@boole.suse.de> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-02/msg00132.html + +Bug-Description: + +When the `read' builtin times out after the timeout specified with -t is +exceeded, it does not reset the flags that tell signal handlers to process +signals immediately instead of deferring their handling. This can result +in unsafe functions being called from signal handlers, which can cause bash +to hang or dump core. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/builtins/read.def 2009-10-08 11:35:46.000000000 -0400 +--- builtins/read.def 2010-03-17 17:35:39.000000000 -0400 +*************** +*** 616,621 **** + zsyncfd (fd); + +- interrupt_immediately--; +- terminate_immediately--; + discard_unwind_frame ("read_builtin"); + +--- 616,619 ---- +*************** +*** 624,627 **** +--- 622,628 ---- + assign_vars: + ++ interrupt_immediately--; ++ terminate_immediately--; ++ + #if defined (ARRAY_VARS) + /* If -a was given, take the string read, break it into a list of words, +*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 +--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-006 b/source/a/bash/bash-4.1-patches/bash41-006 new file mode 100644 index 000000000..d6553b8bb --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-006 @@ -0,0 +1,76 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-006 + +Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> +Bug-Reference-ID: <201003210155.56618.vapier@gentoo.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00063.html + +Bug-Description: + +Bash did not correctly print/reproduce here documents attached to commands +inside compound commands such as for and while. This affected the +execution of such commands inside a shell function when the function +definition is saved and later restored using `.' or `eval'. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/print_cmd.c 2009-09-16 15:32:26.000000000 -0400 +--- print_cmd.c 2010-03-22 21:15:30.000000000 -0400 +*************** +*** 114,117 **** +--- 114,123 ---- + #define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr) + ++ #define PRINT_DEFERRED_HEREDOCS(x) \ ++ do { \ ++ if (deferred_heredocs) \ ++ print_deferred_heredocs (x); \ ++ } while (0) ++ + /* Non-zero means the stuff being printed is inside of a function def. */ + static int inside_function_def; +*************** +*** 561,571 **** + { + print_for_command_head (for_command); +- + cprintf (";"); + newline ("do\n"); + indentation += indentation_amount; + make_command_string_internal (for_command->action); + semicolon (); + indentation -= indentation_amount; + newline ("done"); + } +--- 566,578 ---- + { + print_for_command_head (for_command); + cprintf (";"); + newline ("do\n"); ++ + indentation += indentation_amount; + make_command_string_internal (for_command->action); ++ PRINT_DEFERRED_HEREDOCS (""); + semicolon (); + indentation -= indentation_amount; ++ + newline ("done"); + } +*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 +--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash-4.1-patches/bash41-007 b/source/a/bash/bash-4.1-patches/bash41-007 new file mode 100644 index 000000000..07b4796c4 --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-007 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-007 + +Bug-Reported-by: Rob Robason <rob@robason.net> +Bug-Reference-ID: <1269513145.22336.9.camel@home.robason.homelinux.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00089.html + +Bug-Description: + +A typo caused bash to not honor a precision specification in a printf +format. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/builtins/printf.def 2010-01-18 10:50:22.000000000 -0500 +--- builtins/printf.def 2010-03-25 09:40:56.000000000 -0400 +*************** +*** 118,122 **** + nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ + else if (have_precision) \ +! nw = vflag ? vbprintf (f, precision, func) : printf (f, fieldwidth, func); \ + else \ + nw = vflag ? vbprintf (f, func) : printf (f, func); \ +--- 118,122 ---- + nw = vflag ? vbprintf (f, fieldwidth, func) : printf (f, fieldwidth, func); \ + else if (have_precision) \ +! nw = vflag ? vbprintf (f, precision, func) : printf (f, precision, func); \ + else \ + nw = vflag ? vbprintf (f, func) : printf (f, func); \ +*** ../bash-4.1-patched/patchlevel.h 2009-10-01 16:39:22.000000000 -0400 +--- patchlevel.h 2010-01-14 09:38:08.000000000 -0500 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/bash.SlackBuild b/source/a/bash/bash.SlackBuild index 04c8ff953..32ce9a40d 100755 --- a/source/a/bash/bash.SlackBuild +++ b/source/a/bash/bash.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,14 +20,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.1 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} - -CWD=$(pwd) -TMP=${TMP:-/tmp} +# Set initial variables: +CWD=`pwd` +if [ "$TMP" = "" ]; then + TMP=/tmp +fi PKG=$TMP/package-bash +VERSION=${VERSION:-$(echo bash-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" elif [ "$ARCH" = "i486" ]; then @@ -36,52 +48,98 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi +if [ ! -d $TMP ]; then + mkdir -p $TMP # location to build the source +fi rm -rf $PKG -mkdir -p $TMP $PKG +mkdir -p $PKG # Determine bash patchlevel: -PATCHLEVEL=`( cd $CWD/patches ; /bin/ls *gz | tail -1 | cut -f 2 -d - | cut -f 1 -d . 2> /dev/null )` +PATCHLEVEL="$( cd $CWD/bash-${VERSION}-patches ; /bin/ls bash4?-??? | tail -1 | cut -f 2 -d - 2> /dev/null )" if [ "$PATCHLEVEL" = "" ]; then PATCHLEVEL=0 fi cd $TMP rm -rf bash-$VERSION -tar xzvf $CWD/bash-$VERSION.tar.gz || exit 1 -cd bash-$VERSION +tar xvf $CWD/bash-$VERSION.tar.?z* || exit 1 +cd bash-$VERSION || exit 1 chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -for patch in $CWD/patches/bash* ; do - zcat $patch | patch -p0 --verbose || exit 1 -done +find . -perm 664 | xargs chmod 644 +find . -perm 775 | xargs chmod 755 + +if [ -d $CWD/bash-${VERSION}-patches ]; then + ( cd $CWD/bash-${VERSION}-patches ; cat bash4?-??? ) | patch -p0 --verbose || exit 1 +fi + CFLAGS="$SLKCFLAGS" \ -./configure --prefix=/usr $ARCH-slackware-linux -make -j3 || exit 1 +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --build=$ARCH-slackware-linux +make -j4 || make || exit 1 make install DESTDIR=$PKG +mv $PKG/usr/share/doc $PKG/usr mkdir -p $PKG/bin -mv $PKG/usr/bin/bash $PKG/bin/bash2.new -strip --strip-unneeded $PKG/bin/bash2.new +mv $PKG/usr/bin/bash $PKG/bin/bash4.new # We don't include the "bashbug" script. rm -rf $PKG/usr/bin $PKG/usr/man/man1/bashbug.1 -gzip -9 $PKG/usr/man/man1/* + +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# bash.1 is already installed by "make install" +( cd doc + for page in builtins.1 rbash.1 ; do + cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz + done +) + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi + mkdir -p $PKG/usr/doc/bash-$VERSION cp -a AUTHORS CHANGES COMPAT COPYING INSTALL MANIFEST NEWS NOTES \ - README Y2K doc/FAQ doc/INTRO $PKG/usr/doc/bash-$VERSION -cd doc -groff -ms -Tascii article.ms > $PKG/usr/doc/bash-$VERSION/article.txt -# bash.1 is already installed by "make install" -for page in builtins.1 rbash.1 ; do - cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz -done -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* + README Y2K doc/FAQ doc/INTRO \ + $PKG/usr/doc/bash-$VERSION +( cd doc ; groff -ms -Tascii article.ms > $PKG/usr/doc/bash-$VERSION/article.txt ) + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc @@ -90,8 +148,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG makepkg -l y -c n $TMP/bash-$VERSION.$PATCHLEVEL-$ARCH-$BUILD.txz -# Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/bash-$VERSION - rm -rf $PKG -fi diff --git a/source/a/bash/doinst.sh b/source/a/bash/doinst.sh index 21760838d..867958fb8 100644 --- a/source/a/bash/doinst.sh +++ b/source/a/bash/doinst.sh @@ -1,7 +1,7 @@ if [ -r bin/bash ]; then mv bin/bash bin/bash.old fi -mv bin/bash2.new bin/bash +mv bin/bash4.new bin/bash if [ -f bin/bash.old ]; then rm -f bin/bash.old fi @@ -9,10 +9,10 @@ if [ ! -r etc/shells ]; then touch etc/shells chmod 644 etc/shells fi -if fgrep "/bin/bash" etc/shells 1> /dev/null 2> /dev/null ; then +if grep -wq /bin/bash etc/shells ; then true else - echo "/bin/bash" >> etc/shells + echo /bin/bash >> etc/shells fi ( cd usr/bin ; rm -rf bash ) ( cd usr/bin ; ln -sf /bin/bash bash ) diff --git a/source/a/bash/patches/bash31-001 b/source/a/bash/patches/bash31-001 deleted file mode 100644 index 4a10a02c1..000000000 --- a/source/a/bash/patches/bash31-001 +++ /dev/null @@ -1,104 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-001 - -Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> -Bug-Reference-ID: <20051212015924.GA820@toucan.gentoo.org> <20051214034438.GK1863@toucan.gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00030.html http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00041.html - -Bug-Description: - -There are parsing problems with compound assignments in several contexts, -including as arguments to builtins like `local', `eval', and `let', and -as multiple assignments in a single command. - -Patch: - -*** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 ---- parse.y Fri Dec 16 20:43:07 2005 -*************** -*** 3696,3700 **** - b = builtin_address_internal (token, 0); - if (b && (b->flags & ASSIGNMENT_BUILTIN)) -! parser_state |= PST_ASSIGNOK; - } - ---- 3696,3702 ---- - b = builtin_address_internal (token, 0); - if (b && (b->flags & ASSIGNMENT_BUILTIN)) -! parser_state |= PST_ASSIGNOK; -! else if (STREQ (token, "eval") || STREQ (token, "let")) -! parser_state |= PST_ASSIGNOK; - } - -*************** -*** 4687,4691 **** - { - WORD_LIST *wl, *rl; -! int tok, orig_line_number, orig_token_size; - char *saved_token, *ret; - ---- 4689,4693 ---- - { - WORD_LIST *wl, *rl; -! int tok, orig_line_number, orig_token_size, orig_last_token, assignok; - char *saved_token, *ret; - -*************** -*** 4693,4696 **** ---- 4695,4699 ---- - orig_token_size = token_buffer_size; - orig_line_number = line_number; -+ orig_last_token = last_read_token; - - last_read_token = WORD; /* WORD to allow reserved words here */ -*************** -*** 4699,4702 **** ---- 4702,4707 ---- - token_buffer_size = 0; - -+ assignok = parser_state&PST_ASSIGNOK; /* XXX */ -+ - wl = (WORD_LIST *)NULL; /* ( */ - parser_state |= PST_COMPASSIGN; -*************** -*** 4741,4745 **** - } - -! last_read_token = WORD; - if (wl) - { ---- 4746,4750 ---- - } - -! last_read_token = orig_last_token; /* XXX - was WORD? */ - if (wl) - { -*************** -*** 4753,4756 **** ---- 4758,4765 ---- - if (retlenp) - *retlenp = (ret && *ret) ? strlen (ret) : 0; -+ -+ if (assignok) -+ parser_state |= PST_ASSIGNOK; -+ - return ret; - } -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-002 b/source/a/bash/patches/bash31-002 deleted file mode 100644 index fac9a99af..000000000 --- a/source/a/bash/patches/bash31-002 +++ /dev/null @@ -1,239 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-002 - -Bug-Reported-by: vapier@gentoo.org -Bug-Reference-ID: <20051210223218.GD3324@toucan.gentoo.org> -Bug-Reference-URL:http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00021.html - -Bug-Description: - -This corrects several omissions in the bash documentation: It adds the new -options to `ulimit', the exact expansions for `case' patterns, clarification -of the language concerning the return value of `[[', and updated version -information. - -Patch: - -*** ../bash-3.1/doc/bash.1 Wed Oct 12 11:40:52 2005 ---- doc/bash.1 Wed Dec 28 19:58:54 2005 -*************** -*** 7,16 **** - .\" chet@po.cwru.edu - .\" -! .\" Last Change: Sat Aug 27 13:28:44 EDT 2005 - .\" - .\" bash_builtins, strip all but Built-Ins section - .if \n(zZ=1 .ig zZ - .if \n(zY=1 .ig zY -! .TH BASH 1 "2005 Aug 27" "GNU Bash-3.1-beta1" - .\" - .\" There's some problem with having a `@' ---- 7,16 ---- - .\" chet@po.cwru.edu - .\" -! .\" Last Change: Wed Dec 28 19:58:45 EST 2005 - .\" - .\" bash_builtins, strip all but Built-Ins section - .if \n(zZ=1 .ig zZ - .if \n(zY=1 .ig zY -! .TH BASH 1 "2005 Dec 28" "GNU Bash-3.1" - .\" - .\" There's some problem with having a `@' -*************** -*** 678,683 **** - is enabled, the match is performed without regard to the case - of alphabetic characters. -! The return value is 0 if the string matches or does not match -! the pattern, respectively, and 1 otherwise. - Any part of the pattern may be quoted to force it to be matched as a - string. ---- 678,683 ---- - is enabled, the match is performed without regard to the case - of alphabetic characters. -! The return value is 0 if the string matches (\fB==\fP) or does not match -! (\fB!=\fP) the pattern, and 1 otherwise. - Any part of the pattern may be quoted to force it to be matched as a - string. -*************** -*** 808,811 **** ---- 808,817 ---- - .B Pathname Expansion - below). -+ The \fIword\fP is expanded using tilde -+ expansion, parameter and variable expansion, arithmetic substituion, -+ command substitution, process substitution and quote removal. -+ Each \fIpattern\fP examined is expanded using tilde -+ expansion, parameter and variable expansion, arithmetic substituion, -+ command substitution, and process substitution. - If the shell option - .B nocasematch -*************** -*** 8485,8489 **** - none are found. - .TP -! \fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]] - Provides control over the resources available to the shell and to - processes started by it, on systems that allow such control. ---- 8485,8489 ---- - none are found. - .TP -! \fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]] - Provides control over the resources available to the shell and to - processes started by it, on systems that allow such control. -*************** -*** 8524,8527 **** ---- 8524,8530 ---- - The maximum size of files created by the shell - .TP -+ .B \-i -+ The maximum number of pending signals -+ .TP - .B \-l - The maximum size that may be locked into memory -*************** -*** 8537,8540 **** ---- 8540,8546 ---- - The pipe size in 512-byte blocks (this may not be set) - .TP -+ .B \-q -+ The maximum number of bytes in POSIX message queues -+ .TP - .B \-s - The maximum stack size -*************** -*** 8548,8551 **** ---- 8554,8560 ---- - .B \-v - The maximum amount of virtual memory available to the shell -+ .TP -+ .B \-x -+ The maximum number of file locks - .PD - .PP -*** ../bash-3.1/doc/bashref.texi Mon Oct 3 15:07:21 2005 ---- doc/bashref.texi Fri Dec 30 10:50:39 2005 -*************** -*** 962,967 **** - is enabled, the match is performed without regard to the case - of alphabetic characters. -! The return value is 0 if the string matches or does not match -! the pattern, respectively, and 1 otherwise. - Any part of the pattern may be quoted to force it to be matched as a - string. ---- 962,967 ---- - is enabled, the match is performed without regard to the case - of alphabetic characters. -! The return value is 0 if the string matches (@samp{==}) or does not -! match (@samp{!=})the pattern, and 1 otherwise. - Any part of the pattern may be quoted to force it to be matched as a - string. -*************** -*** 2599,2603 **** - or inconvenient to obtain with separate utilities. - -! This section briefly the builtins which Bash inherits from - the Bourne Shell, as well as the builtin commands which are unique - to or have been extended in Bash. ---- 2597,2601 ---- - or inconvenient to obtain with separate utilities. - -! This section briefly describes the builtins which Bash inherits from - the Bourne Shell, as well as the builtin commands which are unique - to or have been extended in Bash. -*************** -*** 3834,3838 **** - @btindex ulimit - @example -! ulimit [-acdflmnpstuvSH] [@var{limit}] - @end example - @code{ulimit} provides control over the resources available to processes ---- 3834,3838 ---- - @btindex ulimit - @example -! ulimit [-acdfilmnpqstuvxSH] [@var{limit}] - @end example - @code{ulimit} provides control over the resources available to processes -*************** -*** 3858,3861 **** ---- 3858,3864 ---- - The maximum size of files created by the shell. - -+ @item -i -+ The maximum number of pending signals. -+ - @item -l - The maximum size that may be locked into memory. -*************** -*** 3870,3873 **** ---- 3873,3879 ---- - The pipe buffer size. - -+ @item -q -+ The maximum number of bytes in POSIX message queues. -+ - @item -s - The maximum stack size. -*************** -*** 3882,3885 **** ---- 3888,3894 ---- - The maximum amount of virtual memory available to the process. - -+ @item -x -+ The maximum number of file locks. -+ - @end table - -*************** -*** 4090,4095 **** - - @item -x -! Print a trace of simple commands, \fBfor\fP commands, \fBcase\fP -! commands, \fBselect\fP commands, and arithmetic \fBfor\fP commands - and their arguments or associated word lists after they are - expanded and before they are executed. The value of the @env{PS4} ---- 4103,4108 ---- - - @item -x -! Print a trace of simple commands, @code{for} commands, @code{case} -! commands, @code{select} commands, and arithmetic @code{for} commands - and their arguments or associated word lists after they are - expanded and before they are executed. The value of the @env{PS4} -*** ../bash-3.1/doc/version.texi Tue Sep 20 14:52:56 2005 ---- doc/version.texi Fri Dec 30 10:50:58 2005 -*************** -*** 3,10 **** - @end ignore - -! @set LASTCHANGE Mon Sep 5 11:47:04 EDT 2005 - -! @set EDITION 3.1-beta1 -! @set VERSION 3.1-beta1 -! @set UPDATED 5 September 2005 -! @set UPDATED-MONTH September 2005 ---- 3,10 ---- - @end ignore - -! @set LASTCHANGE Fri Dec 30 10:50:51 EST 2005 - -! @set EDITION 3.1 -! @set VERSION 3.1 -! @set UPDATED 30 December 2005 -! @set UPDATED-MONTH December 2005 -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-003 b/source/a/bash/patches/bash31-003 deleted file mode 100644 index cd36dc83e..000000000 --- a/source/a/bash/patches/bash31-003 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-003 - -Bug-Reported-by: Adam Buraczewski <adamb@nor.pl> -Bug-Reference-ID: <200512210950.jBL9o4C2008608@localhost.localdomain> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00055.html - -Bug-Description: - -A missing #define guard causes bash to not compile when readline is not -configured in, either as the result of explicit disabling or when the -`--enable-minimal-config' option is given to configure. - -Patch: - -*** ../bash-3.1/variables.c Sat Nov 12 21:22:37 2005 ---- variables.c Mon Dec 26 13:34:03 2005 -*************** -*** 861,867 **** ---- 863,871 ---- - char val[INT_STRLEN_BOUND(int) + 1], *v; - -+ #if defined (READLINE) - /* If we are currently assigning to LINES or COLUMNS, don't do anything. */ - if (winsize_assignment) - return; -+ #endif - - v = inttostr (lines, val, sizeof (val)); -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-004 b/source/a/bash/patches/bash31-004 deleted file mode 100644 index 4f9d578ef..000000000 --- a/source/a/bash/patches/bash31-004 +++ /dev/null @@ -1,48 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-004 - -Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> -Bug-Reference-ID: <20051223172359.GF14579@toucan.gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00062.html - -Bug-Description: - -A local array variable declared at function scope that shadows a variable -of the same name declared in a previous scope did not create a separate -variable instance, but used the previous one. - -Patch: - -*** ../bash-3.1/subst.c Mon Oct 24 09:51:13 2005 ---- subst.c Fri Dec 30 12:11:53 2005 -*************** -*** 2188,2192 **** - { - v = find_variable (name); -! if (v == 0 || array_p (v) == 0) - v = make_local_array_variable (name); - v = assign_array_var_from_string (v, value, flags); ---- 2188,2192 ---- - { - v = find_variable (name); -! if (v == 0 || array_p (v) == 0 || v->context != variable_context) - v = make_local_array_variable (name); - v = assign_array_var_from_string (v, value, flags); -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-005 b/source/a/bash/patches/bash31-005 deleted file mode 100644 index b6d5cdca8..000000000 --- a/source/a/bash/patches/bash31-005 +++ /dev/null @@ -1,54 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-005 - -Bug-Reported-by: -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -When tilde expansion fails, POSIX leaves it unspecified whether or not the -word undergoes the additional word expansions. Bash-3.1 as distributed -skipped the rest of the expansions; this patch restores the bash-3.0 behavior. - -This means that something like - USER=ratbert - echo ~$USER - -will echo `~ratbert' rather than `~$USER'. - -Patch: - -*** ../bash-3.1/subst.c Mon Oct 24 09:51:13 2005 ---- subst.c Fri Dec 30 12:11:53 2005 -*************** -*** 6796,6799 **** ---- 6823,6832 ---- - { - temp1 = bash_tilde_expand (temp, tflag); -+ if (temp1 && *temp1 == '~' && STREQ (temp, temp1)) -+ { -+ FREE (temp); -+ FREE (temp1); -+ goto add_character; /* tilde expansion failed */ -+ } - free (temp); - temp = temp1; -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-006 b/source/a/bash/patches/bash31-006 deleted file mode 100644 index 8d7499381..000000000 --- a/source/a/bash/patches/bash31-006 +++ /dev/null @@ -1,58 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-006 - -Bug-Reported-by: Mike Frysinger <vapier@gentoo.org> -Bug-Reference-ID: <200601120613.11907.vapier@gentoo.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00045.html - -Bug-Description: - -Under some circumstances, Bash can use an incorrect setting for the flag -that indicates whether or not the terminal can auto-wrap, resulting in line- -wrapping errors. - -Patch: - -*** ../bash-3.1/lib/readline/terminal.c Sat Nov 12 20:46:54 2005 ---- lib/readline/terminal.c Tue Jan 31 10:57:54 2006 -*************** -*** 123,127 **** - - /* Non-zero means the terminal can auto-wrap lines. */ -! int _rl_term_autowrap; - - /* Non-zero means that this terminal has a meta key. */ ---- 126,130 ---- - - /* Non-zero means the terminal can auto-wrap lines. */ -! int _rl_term_autowrap = -1; - - /* Non-zero means that this terminal has a meta key. */ -*************** -*** 275,278 **** ---- 278,284 ---- - int rows, cols; - { -+ if (_rl_term_autowrap == -1) -+ _rl_init_terminal_io (rl_terminal_name); -+ - if (rows > 0) - _rl_screenheight = rows; -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-007 b/source/a/bash/patches/bash31-007 deleted file mode 100644 index 6233786c4..000000000 --- a/source/a/bash/patches/bash31-007 +++ /dev/null @@ -1,121 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-007 - -Bug-Reported-by: Tim Waugh <twaugh@redhat.com>, Laird Breyer <laird@lbreyer.com> -Bug-Reference-ID: <20060105174434.GY16000@redhat.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00009.html - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347695 - -Bug-Description: - -When the number of saved jobs exceeds the initial size of the jobs array -(4096 slots), the array must be compacted and reallocated. An error in -the code to do that could cause a segmentation fault. - -Patch: - -*** ../bash-3.1/jobs.c Fri Nov 11 23:13:27 2005 ---- jobs.c Wed Feb 1 13:55:38 2006 -*************** -*** 845,851 **** - { - sigset_t set, oset; -! int nsize, i, j; - JOB **nlist; - - nsize = ((js.j_njobs + JOB_SLOTS - 1) / JOB_SLOTS); - nsize *= JOB_SLOTS; ---- 888,895 ---- - { - sigset_t set, oset; -! int nsize, i, j, ncur, nprev; - JOB **nlist; - -+ ncur = nprev = NO_JOB; - nsize = ((js.j_njobs + JOB_SLOTS - 1) / JOB_SLOTS); - nsize *= JOB_SLOTS; -*************** -*** 855,869 **** - - BLOCK_CHILD (set, oset); -! nlist = (JOB **) xmalloc (nsize * sizeof (JOB *)); - for (i = j = 0; i < js.j_jobslots; i++) - if (jobs[i]) -! nlist[j++] = jobs[i]; - - js.j_firstj = 0; -! js.j_lastj = (j > 0) ? j - 1: 0; - js.j_jobslots = nsize; - -! free (jobs); -! jobs = nlist; - - UNBLOCK_CHILD (oset); ---- 899,947 ---- - - BLOCK_CHILD (set, oset); -! nlist = (js.j_jobslots == nsize) ? jobs : (JOB **) xmalloc (nsize * sizeof (JOB *)); -! - for (i = j = 0; i < js.j_jobslots; i++) - if (jobs[i]) -! { -! if (i == js.j_current) -! ncur = j; -! if (i == js.j_previous) -! nprev = j; -! nlist[j++] = jobs[i]; -! } -! -! #if defined (DEBUG) -! itrace ("realloc_jobs_list: resize jobs list from %d to %d", js.j_jobslots, nsize); -! itrace ("realloc_jobs_list: j_lastj changed from %d to %d", js.j_lastj, (j > 0) ? j - 1 : 0); -! itrace ("realloc_jobs_list: j_njobs changed from %d to %d", js.j_njobs, (j > 0) ? j - 1 : 0); -! #endif - - js.j_firstj = 0; -! js.j_lastj = (j > 0) ? j - 1 : 0; -! js.j_njobs = j; - js.j_jobslots = nsize; - -! /* Zero out remaining slots in new jobs list */ -! for ( ; j < nsize; j++) -! nlist[j] = (JOB *)NULL; -! -! if (jobs != nlist) -! { -! free (jobs); -! jobs = nlist; -! } -! -! if (ncur != NO_JOB) -! js.j_current = ncur; -! if (nprev != NO_JOB) -! js.j_previous = nprev; -! -! /* Need to reset these */ -! if (js.j_current == NO_JOB || js.j_previous == NO_JOB || js.j_current > js.j_lastj || js.j_previous > js.j_lastj) -! reset_current (); -! -! #ifdef DEBUG -! itrace ("realloc_jobs_list: reset js.j_current (%d) and js.j_previous (%d)", js.j_current, js.j_previous); -! #endif - - UNBLOCK_CHILD (oset); -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-008 b/source/a/bash/patches/bash31-008 deleted file mode 100644 index 3427b64e0..000000000 --- a/source/a/bash/patches/bash31-008 +++ /dev/null @@ -1,51 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-008 - -Bug-Reported-by: Ingemar Nilsson <init@kth.se> -Bug-Reference-ID: <43C38D35.7020404@kth.se> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00044.html - -Bug-Description: - -In some cases, bash inappropriately allows SIGINT from the terminal to -reach background processes. - -Patch: - -*** ../bash-3.1/jobs.c Fri Nov 11 23:13:27 2005 ---- jobs.c Wed Feb 1 13:55:38 2006 -*************** -*** 2199,2203 **** - wait_sigint_received = 0; - if (job_control == 0) -! old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); - - termination_state = last_command_exit_value; ---- 2298,2306 ---- - wait_sigint_received = 0; - if (job_control == 0) -! { -! old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); -! if (old_sigint_handler == SIG_IGN) -! set_signal_handler (SIGINT, old_sigint_handler); -! } - - termination_state = last_command_exit_value; -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-009 b/source/a/bash/patches/bash31-009 deleted file mode 100644 index 8ef229585..000000000 --- a/source/a/bash/patches/bash31-009 +++ /dev/null @@ -1,66 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-009 - -Bug-Reported-by: Joshua Neuheisel <jneuheisel@gmail.com> -Bug-Reference-ID: <25d873330601140820v4ad8efd2t8bf683b073c138b3@mail.gmail.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00062.html - -Bug-Description: - -Under some circumstances, background (asynchronous) jobs can set the terminal -process group incorrectly. This can cause a foreground process (including -the foreground shell) to get read errors and exit. - -Patch: - -*** ../bash-3.1/jobs.c Fri Nov 11 23:13:27 2005 ---- jobs.c Wed Feb 1 13:55:38 2006 -*************** -*** 620,625 **** - * the parent gives it away. - * - */ -! if (job_control && newjob->pgrp) - give_terminal_to (newjob->pgrp, 0); - } ---- 634,642 ---- - * the parent gives it away. - * -+ * Don't give the terminal away if this shell is an asynchronous -+ * subshell. -+ * - */ -! if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0) - give_terminal_to (newjob->pgrp, 0); - } -*************** -*** 1656,1660 **** - shell's process group (we could be in the middle of a - pipeline, for example). */ -! if (async_p == 0 && pipeline_pgrp != shell_pgrp) - give_terminal_to (pipeline_pgrp, 0); - ---- 1743,1747 ---- - shell's process group (we could be in the middle of a - pipeline, for example). */ -! if (async_p == 0 && pipeline_pgrp != shell_pgrp && ((subshell_environment&SUBSHELL_ASYNC) == 0)) - give_terminal_to (pipeline_pgrp, 0); - -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-010 b/source/a/bash/patches/bash31-010 deleted file mode 100644 index 066a3242d..000000000 --- a/source/a/bash/patches/bash31-010 +++ /dev/null @@ -1,54 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-010 - -Bug-Reported-by: vw@vonwolff.de -Bug-Reference-ID: <20060123135234.1AC2F1D596@wst07.vonwolff.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00090.html - -Bug-Description: - -There is a difference in behavior between bash-3.0 and bash-3.1 involving -parsing of single- and double-quoted strings occurring in old-style -command substitution. The difference has to do with how backslashes are -processed. This patch restores a measure of backwards compatibility while -the question of POSIX conformance and ultimately correct behavior is discussed. - -Patch: - -*** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 ---- parse.y Wed Jan 25 14:55:18 2006 -*************** -*** 2899,2903 **** - else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0) - { -! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags); - goto add_nestret; - } ---- 2901,2909 ---- - else if MBTEST(qc == '`' && (ch == '"' || ch == '\'') && in_comment == 0) - { -! /* Add P_ALLOWESC so backslash quotes the next character and -! shell_getc does the right thing with \<newline>. We do this for -! a measure of backwards compatibility -- it's not strictly the -! right POSIX thing. */ -! nestret = parse_matched_pair (0, ch, ch, &nestlen, rflags|P_ALLOWESC); - goto add_nestret; - } -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-011 b/source/a/bash/patches/bash31-011 deleted file mode 100644 index 025b83907..000000000 --- a/source/a/bash/patches/bash31-011 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-011 - -Bug-Reported-by: Mike Stroyan <mike.stroyan@hp.com> -Bug-Reference-ID: <E1EvwxP-0004LD-GC@localhost.localdomain> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00033.html - -Bug-Description: - -A change in bash-3.1 caused the single quotes to be stripped from ANSI-C -quoting inside double-quoted command substitutions. - -Patch: - -*** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 ---- parse.y Wed Jan 25 14:55:18 2006 -*************** -*** 2908,2912 **** - count--; - if (ch == '(') /* ) */ -! nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags); - else if (ch == '{') /* } */ - nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags); ---- 2914,2918 ---- - count--; - if (ch == '(') /* ) */ -! nestret = parse_matched_pair (0, '(', ')', &nestlen, rflags & ~P_DQUOTE); - else if (ch == '{') /* } */ - nestret = parse_matched_pair (0, '{', '}', &nestlen, P_FIRSTCLOSE|rflags); -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-012 b/source/a/bash/patches/bash31-012 deleted file mode 100644 index b0ddb3a48..000000000 --- a/source/a/bash/patches/bash31-012 +++ /dev/null @@ -1,47 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-012 - -Bug-Reported-by: Alexander Kshevetskiy <alex@dgap.mipt.ru> -Bug-Reference-ID: <308374997.20060124175849@dgap.mipt.ru> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-01/msg00097.html - -Bug-Description: - -There is a parsing problem involving parentheses in assignment statements -that causes words to be terminated prematurely. - -Patch: - -*** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 ---- parse.y Wed Jan 25 14:55:18 2006 -*************** -*** 3579,3583 **** - all_digit_token = 0; - compound_assignment = 1; -! #if 0 - goto next_character; - #else ---- 3584,3588 ---- - all_digit_token = 0; - compound_assignment = 1; -! #if 1 - goto next_character; - #else -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 12 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-013 b/source/a/bash/patches/bash31-013 deleted file mode 100644 index 93c7c8fc8..000000000 --- a/source/a/bash/patches/bash31-013 +++ /dev/null @@ -1,44 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-013 - -Bug-Reported-by: Bob Rossi <bob@brasko.net> -Bug-Reference-ID: <43F60606.80708@case.edu> -Bug-Reference-URL: - -Bug-Description: - -In some cases, readline will reference freed memory when attempting to -display a portion of the prompt. - -Patch: - -*** ../bash-3.1-patched/lib/readline/readline.c Mon Jul 4 22:29:35 2005 ---- lib/readline/readline.c Fri Feb 17 22:54:22 2006 -*************** -*** 282,287 **** ---- 282,288 ---- - { - FREE (rl_prompt); - rl_prompt = prompt ? savestring (prompt) : (char *)NULL; -+ rl_display_prompt = rl_prompt ? rl_prompt : ""; - - rl_visible_prompt_length = rl_expand_prompt (rl_prompt); - return 0; -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 12 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 13 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-014 b/source/a/bash/patches/bash31-014 deleted file mode 100644 index 82ff9b408..000000000 --- a/source/a/bash/patches/bash31-014 +++ /dev/null @@ -1,105 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-014 - -Bug-Reported-by: Mike Stroyan <mike.stroyan@hp.com> -Bug-Reference-ID: <20060203191607.GC27614@localhost> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00004.html - -Bug-Description: - -The displayed search prompt is corrupted when using non-incremental -searches in vi and emacs mode if the prompt contains non-printing -characters or spans multiple lines. The prompt is expanded more than -once; the second time without the escape sequences that protect non- -printing characters from the length calculations. - -Patch: - -*** ../bash-3.1-patched/lib/readline/display.c Wed Nov 30 14:05:02 2005 ---- lib/readline/display.c Sat Feb 18 12:14:58 2006 -*************** -*** 1983,1993 **** - int pchar; - { - int len; -! char *pmt; - - rl_save_prompt (); - -! if (saved_local_prompt == 0) - { - len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; - pmt = (char *)xmalloc (len + 2); ---- 1998,2012 ---- - int pchar; - { - int len; -! char *pmt, *p; - - rl_save_prompt (); - -! /* We've saved the prompt, and can do anything with the various prompt -! strings we need before they're restored. We want the unexpanded -! portion of the prompt string after any final newline. */ -! p = rl_prompt ? strrchr (rl_prompt, '\n') : 0; -! if (p == 0) - { - len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; - pmt = (char *)xmalloc (len + 2); -*************** -*** 1998,2016 **** - } - else - { -! len = *saved_local_prompt ? strlen (saved_local_prompt) : 0; - pmt = (char *)xmalloc (len + 2); - if (len) -! strcpy (pmt, saved_local_prompt); - pmt[len] = pchar; - pmt[len+1] = '\0'; -! local_prompt = savestring (pmt); -! prompt_last_invisible = saved_last_invisible; -! prompt_visible_length = saved_visible_length + 1; -! } - - prompt_physical_chars = saved_physical_chars + 1; -- - return pmt; - } - ---- 2017,2033 ---- - } - else - { -! p++; -! len = strlen (p); - pmt = (char *)xmalloc (len + 2); - if (len) -! strcpy (pmt, p); - pmt[len] = pchar; - pmt[len+1] = '\0'; -! } - -+ /* will be overwritten by expand_prompt, called from rl_message */ - prompt_physical_chars = saved_physical_chars + 1; - return pmt; - } - -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 13 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 14 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-015 b/source/a/bash/patches/bash31-015 deleted file mode 100644 index deb9eed58..000000000 --- a/source/a/bash/patches/bash31-015 +++ /dev/null @@ -1,106 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-015 - -Bug-Reported-by: Benoit Vila -Bug-Reference-ID: <43FCA614.1090108@free.fr> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00058.html - -Bug-Description: - -A problem with the extended globbing code prevented dots from matching -filenames when used in some extended matching patterns. - -Patch: - -*** ../bash-3.1-patched/lib/glob/sm_loop.c Sun Oct 16 21:21:04 2005 ---- lib/glob/sm_loop.c Mon Feb 27 17:18:43 2006 -*************** -*** 639,643 **** - CHAR *pnext; /* pointer to next sub-pattern */ - CHAR *srest; /* pointer to rest of string */ -! int m1, m2; - - #if DEBUG_MATCHING ---- 638,642 ---- - CHAR *pnext; /* pointer to next sub-pattern */ - CHAR *srest; /* pointer to rest of string */ -! int m1, m2, xflags; /* xflags = flags passed to recursive matches */ - - #if DEBUG_MATCHING -*************** -*** 645,648 **** ---- 644,648 ---- - fprintf(stderr, "extmatch: s = %s; se = %s\n", s, se); - fprintf(stderr, "extmatch: p = %s; pe = %s\n", p, pe); -+ fprintf(stderr, "extmatch: flags = %d\n", flags); - #endif - -*************** -*** 678,683 **** - multiple matches of the pattern. */ - if (m1) -! m2 = (GMATCH (srest, se, prest, pe, flags) == 0) || -! (s != srest && GMATCH (srest, se, p - 1, pe, flags) == 0); - if (m1 && m2) - return (0); ---- 678,687 ---- - multiple matches of the pattern. */ - if (m1) -! { -! /* if srest > s, we are not at start of string */ -! xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; -! m2 = (GMATCH (srest, se, prest, pe, xflags) == 0) || -! (s != srest && GMATCH (srest, se, p - 1, pe, xflags) == 0); -! } - if (m1 && m2) - return (0); -*************** -*** 705,710 **** - for ( ; srest <= se; srest++) - { - if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 && -! GMATCH (srest, se, prest, pe, flags) == 0) - return (0); - } ---- 709,716 ---- - for ( ; srest <= se; srest++) - { -+ /* if srest > s, we are not at start of string */ -+ xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; - if (GMATCH (s, srest, psub, pnext - 1, flags) == 0 && -! GMATCH (srest, se, prest, pe, xflags) == 0) - return (0); - } -*************** -*** 727,731 **** - break; - } -! if (m1 == 0 && GMATCH (srest, se, prest, pe, flags) == 0) - return (0); - } ---- 733,739 ---- - break; - } -! /* if srest > s, we are not at start of string */ -! xflags = (srest > s) ? (flags & ~FNM_PERIOD) : flags; -! if (m1 == 0 && GMATCH (srest, se, prest, pe, xflags) == 0) - return (0); - } -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 14 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 15 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-016 b/source/a/bash/patches/bash31-016 deleted file mode 100644 index fa0ffe1c7..000000000 --- a/source/a/bash/patches/bash31-016 +++ /dev/null @@ -1,51 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-016 - -Bug-Reported-by: Nikita Danilov <nikita@clusterfs.com> -Bug-Reference-ID: <17397.51015.769854.541057@gargle.gargle.HOWL> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-02/msg00064.html - -Bug-Description: - -Bash will dump core when attempting to perform globbing in directories with -very large numbers of files. - -Patch: - -*** ../bash-3.1-patched/lib/glob/glob.c Thu Mar 24 12:42:27 2005 ---- lib/glob/glob.c Fri Mar 3 16:54:12 2006 -*************** -*** 361,364 **** ---- 361,365 ---- - - firstmalloc = 0; -+ nalloca = 0; - - /* If PAT is empty, skip the loop, but return one (empty) filename. */ -*************** -*** 547,550 **** ---- 551,556 ---- - tmplink = lastlink; - } -+ else -+ tmplink = 0; - free (lastlink->name); - lastlink = lastlink->next; -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 15 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 16 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/bash/patches/bash31-017 b/source/a/bash/patches/bash31-017 deleted file mode 100644 index 84f891551..000000000 --- a/source/a/bash/patches/bash31-017 +++ /dev/null @@ -1,131 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.1 -Patch-ID: bash31-017 - -Bug-Reported-by: syphir@syphir.sytes.net -Bug-Reference-ID: <442421F5.3010105@syphir.sytes.net> -Bug-Reference-URL: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=358831 - -Bug-Description: - -Array expansion fails with an arithmetic syntax error when the subscript -appears within double quotes. For example: ${a["4"]}. - -Patch: - -*** ../bash-3.1-patched/subst.c Wed Apr 12 08:47:08 2006 ---- subst.c Wed Apr 12 08:49:02 2006 -*************** -*** 2576,2579 **** ---- 2576,2586 ---- - } - -+ char * -+ expand_arith_string (string, quoted) -+ char *string; -+ { -+ return (expand_string_if_necessary (string, quoted, expand_string)); -+ } -+ - #if defined (COND_COMMAND) - /* Just remove backslashes in STRING. Returns a new string. */ -*************** -*** 5249,5253 **** - t = (char *)0; - -! temp1 = expand_string_if_necessary (substr, Q_DOUBLE_QUOTES, expand_string); - *e1p = evalexp (temp1, &expok); - free (temp1); ---- 5256,5260 ---- - t = (char *)0; - -! temp1 = expand_arith_string (substr, Q_DOUBLE_QUOTES); - *e1p = evalexp (temp1, &expok); - free (temp1); -*************** -*** 5294,5298 **** - t++; - temp2 = savestring (t); -! temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string); - free (temp2); - t[-1] = ':'; ---- 5301,5305 ---- - t++; - temp2 = savestring (t); -! temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES); - free (temp2); - t[-1] = ':'; -*************** -*** 6436,6440 **** - - /* Expand variables found inside the expression. */ -! temp1 = expand_string_if_necessary (temp2, Q_DOUBLE_QUOTES, expand_string); - free (temp2); - ---- 6443,6447 ---- - - /* Expand variables found inside the expression. */ -! temp1 = expand_arith_string (temp2, Q_DOUBLE_QUOTES); - free (temp2); - -*************** -*** 6478,6482 **** - - /* Do initial variable expansion. */ -! temp1 = expand_string_if_necessary (temp, Q_DOUBLE_QUOTES, expand_string); - - goto arithsub; ---- 6485,6489 ---- - - /* Do initial variable expansion. */ -! temp1 = expand_arith_string (temp, Q_DOUBLE_QUOTES); - - goto arithsub; -*** ../bash-3.1-patched/subst.h Sun Nov 7 15:12:28 2004 ---- subst.h Mon Mar 27 09:10:38 2006 -*************** -*** 152,155 **** ---- 152,158 ---- - extern char *expand_assignment_string_to_string __P((char *, int)); - -+ /* Expand an arithmetic expression string */ -+ extern char *expand_arith_string __P((char *, int)); -+ - /* De-quoted quoted characters in STRING. */ - extern char *dequote_string __P((char *)); -*** ../bash-3.1-patched/arrayfunc.c Mon Jul 4 20:25:58 2005 ---- arrayfunc.c Mon Mar 27 09:10:47 2006 -*************** -*** 593,601 **** - strncpy (exp, s, len - 1); - exp[len - 1] = '\0'; -! #if 0 -! t = expand_string_to_string (exp, 0); -! #else -! t = expand_string_to_string (exp, Q_DOUBLE_QUOTES); -! #endif - this_command_name = (char *)NULL; - val = evalexp (t, &expok); ---- 591,595 ---- - strncpy (exp, s, len - 1); - exp[len - 1] = '\0'; -! t = expand_arith_string (exp, 0); - this_command_name = (char *)NULL; - val = evalexp (t, &expok); -*** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 ---- patchlevel.h Wed Dec 7 13:48:42 2005 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 16 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 17 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/source/a/coreutils/coreutils-dircolors.csh b/source/a/coreutils/coreutils-dircolors.csh index 38d73ca2a..d7234c855 100644 --- a/source/a/coreutils/coreutils-dircolors.csh +++ b/source/a/coreutils/coreutils-dircolors.csh @@ -18,8 +18,8 @@ setenv COLOR auto # simply setting the LS_OPTIONS variable using the information # already given above: setenv LS_OPTIONS " $OPTIONS --color=$COLOR " -unset COLOR -unset OPTIONS +unsetenv COLOR +unsetenv OPTIONS # Set up aliases to use color ls by default. A few additional # aliases like 'dir', 'vdir', etc, are some ancient artifacts @@ -30,7 +30,7 @@ alias dir '/bin/ls $LS_OPTIONS --format=vertical'; alias vdir '/bin/ls $LS_OPTIONS --format=long'; alias d dir; alias v vdir; -unset noglob; +unsetenv noglob; # Set up the LS_COLORS environment: [ -f $HOME/.dir_colors ] diff --git a/source/a/coreutils/coreutils-dircolors.sh b/source/a/coreutils/coreutils-dircolors.sh index 728ea7452..fc848c6fc 100644 --- a/source/a/coreutils/coreutils-dircolors.sh +++ b/source/a/coreutils/coreutils-dircolors.sh @@ -6,13 +6,7 @@ # -F = show '/' for dirs, '*' for executables, etc. # -T 0 = don't trust tab spacing when formatting ls output. # -b = better support for special characters -if [ "$SHELL" != "/bin/zsh" ]; then - # Edit options below for all sh-like shells except zsh: - OPTIONS="-F -b -T 0" -else - # If you use zsh, edit the options below instead: - OPTIONS=( -F -b -T 0 ) -fi +OPTIONS="-F -b -T 0" # COLOR needs one of these arguments: # 'auto' colorizes output to ttys, but not pipes. @@ -20,14 +14,11 @@ fi # 'never' shuts colorization off. COLOR=auto + # This section shouldn't require any user adjustment since it is # simply setting the LS_OPTIONS variable using the information # already given above: -if [ "$SHELL" = "/bin/zsh" ]; then - LS_OPTIONS=( $OPTIONS --color=$COLOR ); -else - LS_OPTIONS=" $OPTIONS --color=$COLOR "; -fi +LS_OPTIONS="$OPTIONS --color=$COLOR"; export LS_OPTIONS; unset COLOR unset OPTIONS @@ -36,23 +27,21 @@ unset OPTIONS # aliases like 'dir', 'vdir', etc, are some ancient artifacts # from 1992 or so... possibly they should be disabled, but maybe # someone out there is actually using them? :-) -# Assume shell aliases are supported. Ash is going to freak out -# when it sees zsh syntax anyway, so whatever. -alias ls='/bin/ls $LS_OPTIONS'; -alias dir='/bin/ls $LS_OPTIONS --format=vertical'; -alias vdir='/bin/ls $LS_OPTIONS --format=long'; -alias d=dir; -alias v=vdir; - -# Just for fun, here are the old sh/ash style shell functions. -# this script isn't currently working with ash (and makes some noisy -# error messages), but perhaps these will still be of use to -# someone... -#ls () { /bin/ls $LS_OPTIONS "$@" ; }; -#dir () { /bin/ls $LS_OPTIONS --format=vertical "$@" ; }; -#vdir () { /bin/ls $LS_OPTIONS --format=long "$@" ; }; -#d () { dir "$@" ; }; -#v () { vdir "$@" ; }; +# Assume shell aliases are supported. +if [ "$SHELL" = "/bin/zsh" ] ; then + # By default, zsh doesn't split parameters into separate words + # when it encounters whitespace. The '=' flag will fix this. + # see zshexpn(1) man-page regarding SH_WORD_SPLIT. + alias ls='/bin/ls ${=LS_OPTIONS}' + alias dir='/bin/ls ${=LS_OPTIONS} --format=vertical' + alias vdir='/bin/ls ${=LS_OPTIONS} --format=long' +else + alias ls='/bin/ls $LS_OPTIONS' + alias dir='/bin/ls $LS_OPTIONS --format=vertical' + alias vdir='/bin/ls $LS_OPTIONS --format=long' +fi +alias d=dir +alias v=vdir # Set up the LS_COLORS environment: if [ -f $HOME/.dir_colors ]; then diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index bc0434277..3d31bf9fb 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,47 +20,64 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=coreutils -VERSION=${VERSION:-7.4} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +PKGNAM=coreutils +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j6} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" elif [ "$ARCH" = "arm" ]; then SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" + LIBDIRSUFFIX="" elif [ "$ARCH" = "armel" ]; then SLKCFLAGS="-O2 -march=armv4t" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -if [ -r $CWD/$PRGNAM-$VERSION.tar.gz ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -elif [ -r $CWD/$PRGNAM-$VERSION.tar.bz2 ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -elif [ -r $CWD/$PRGNAM-$VERSION.tar.xz ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1 -elif [ -r $CWD/$PRGNAM-$VERSION.tar.lzma ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.lzma || exit 1 +rm -rf $PKGNAM-$VERSION +if [ -r $CWD/$PKGNAM-$VERSION.tar.gz ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 +elif [ -r $CWD/$PKGNAM-$VERSION.tar.bz2 ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +elif [ -r $CWD/$PKGNAM-$VERSION.tar.xz ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +elif [ -r $CWD/$PKGNAM-$VERSION.tar.lzma ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.lzma || exit 1 else exit 1 fi -cd $PRGNAM-$VERSION +cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -68,8 +85,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch in the uname for Linux enhancements -zcat $CWD/$PRGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# Patch uname to correctly display CPU information: +zcat $CWD/$PKGNAM.uname.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 # Compilation with glibc version later than 2.3.2 needs the environment # variable DEFAULT_POSIX2_VERSION set to 199209. @@ -87,6 +104,8 @@ DEFAULT_POSIX2_VERSION=199209 \ --mandir=/usr/man \ --infodir=/usr/info \ --sysconfdir=/etc \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --without-gmp \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -153,10 +172,18 @@ done rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING* NEWS README THANKS THANKS-to-translators TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh @@ -164,5 +191,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/coreutils/coreutils.uname.diff b/source/a/coreutils/coreutils.uname.diff index bd39221c1..699110318 100644 --- a/source/a/coreutils/coreutils.uname.diff +++ b/source/a/coreutils/coreutils.uname.diff @@ -1,15 +1,6 @@ -Submitted By: Jim Gifford <jim at linuxfromscratch dot org> -Date: 2006-08-24 -Initial Package Version: 5.97 -Upstream Status: Not Accepted -Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils -Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo - -Original Patch by - Matthew Burgess and Scot McPherson - -diff -Nur coreutils-7.1.orig/src/uname.c coreutils-7.1/src/uname.c ---- coreutils-7.1/src/uname.c 2008-09-18 02:06:57.000000000 -0500 -+++ coreutils-7.1/src/uname.c 2009-02-22 21:23:02.209219703 -0600 +diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c +--- coreutils-7.6.orig/src/uname.c 2009-09-01 06:01:16.000000000 -0500 ++++ coreutils-7.6/src/uname.c 2009-09-15 08:55:26.239452858 -0500 @@ -50,6 +50,11 @@ # include <mach-o/arch.h> #endif @@ -41,87 +32,87 @@ diff -Nur coreutils-7.1.orig/src/uname.c coreutils-7.1/src/uname.c + +static void __eat_cpuinfo_space(char *buf) +{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); ++ /* first eat trailing space */ ++ char *tmp = buf + strlen(buf) - 1; ++ while (tmp > buf && isspace(*tmp)) ++ *tmp-- = '\0'; ++ /* then eat leading space */ ++ tmp = buf; ++ while (*tmp && isspace(*tmp)) ++ tmp++; ++ if (tmp != buf) ++ memmove(buf, tmp, strlen(tmp)+1); +} + +static int __linux_procinfo (int x, char *fstr, size_t s) +{ -+ FILE *fp; ++ FILE *fp; + -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(bfin) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; ++ char *procinfo_keys[] = { ++ /* --processor --hardware-platform */ ++ #if defined(__alpha__) ++ "cpu model", "system type" ++ #elif defined(__arm__) ++ "Processor", "Hardware" ++ #elif defined(bfin) ++ "CPU", "BOARD Name" ++ #elif defined(__cris__) ++ "cpu", "cpu model" ++ #elif defined(__frv__) ++ "CPU-Core", "System" ++ #elif defined(__i386__) || defined(__x86_64__) ++ "model name", "vendor_id" ++ #elif defined(__ia64__) ++ "family", "vendor" ++ #elif defined(__hppa__) ++ "cpu", "model" ++ #elif defined(__m68k__) ++ "CPU", "MMU" ++ #elif defined(__mips__) ++ "cpu model", "system type" ++ #elif defined(__powerpc__) || defined(__powerpc64__) ++ "cpu", "machine" ++ #elif defined(__s390__) || defined(__s390x__) ++ "Type", "Manufacturer" ++ #elif defined(__sh__) ++ "cpu type", "machine" ++ #elif defined(sparc) || defined(__sparc__) ++ "type", "cpu" ++ #elif defined(__vax__) ++ "cpu type", "cpu" ++ #else ++ "unknown", "unknown" ++ #endif ++ }; + -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; ++ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { ++ char key[65], value[257], eol, *ret = NULL; + -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); ++ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { ++ __eat_cpuinfo_space(key); ++ if (!strcmp(key, procinfo_keys[x])) { ++ __eat_cpuinfo_space(value); ++ ret = value; ++ break; ++ } ++ if (eol != '\n') { ++ /* we need two fscanf's here in case the previous ++ * length limit caused us to read right up to the ++ * newline ... doing "%*[^\n]\n" wont eat the newline ++ */ ++ fscanf(fp, "%*[^\n]"); ++ fscanf(fp, "\n"); ++ } ++ } ++ fclose(fp); + -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } ++ if (ret) { ++ strncpy(fstr, ret, s); ++ return 0; ++ } ++ } + -+ return -1; ++ return -1; +} + +#endif @@ -136,26 +127,26 @@ diff -Nur coreutils-7.1.orig/src/uname.c coreutils-7.1/src/uname.c -#if HAVE_SYSINFO && defined SI_ARCHITECTURE +#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) { - static char processor[257]; + static char processor[257]; +#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) +#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) +#endif - element = processor; + element = processor; } #endif @@ -358,9 +467,13 @@ if (element == unknown) - { - static char hardware_platform[257]; + { + static char hardware_platform[257]; +#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) ++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) +#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) + size_t s = sizeof hardware_platform; + static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; + if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) +#endif - element = hardware_platform; - } + element = hardware_platform; + } #endif diff --git a/source/a/kbd/sources/kbd-1.15.tar.bz2.sign b/source/a/cpufrequtils/cpufrequtils-007.tar.bz2.sign index 39388b383..0f1c2d05a 100644 --- a/source/a/kbd/sources/kbd-1.15.tar.bz2.sign +++ b/source/a/cpufrequtils/cpufrequtils-007.tar.bz2.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBJj684yGugalF9Dw4RAqQuAJ9fBsk3RWp6BT4UWHjceFn5YuEBygCff3dW -qo/ACrIhyBx/eiZEpao8N4o= -=0zxS +iD8DBQBLUe7ryGugalF9Dw4RAjeTAJ0ZRX3DI6onTBY5uGhNP9xgOrI6TACfcVoa ++S69xcWuAKSnsqVPuZWZhDM= +=gD0S -----END PGP SIGNATURE----- diff --git a/source/a/device-mapper/device-mapper.SlackBuild b/source/a/cpufrequtils/cpufrequtils.SlackBuild index d770deed7..329ab4d3d 100755 --- a/source/a/device-mapper/device-mapper.SlackBuild +++ b/source/a/cpufrequtils/cpufrequtils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,14 +20,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.02.28 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} + +PKGNAM=cpufrequtils +VERSION=${VERSION:-$(echo $(basename $(echo $PKGNAM-*.tar.bz2 | cut -f 2 -d -) .tar.bz2) | cut -f 2 -d -)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-device-mapper +PKG=$TMP/package-${PKGNAM} +rm -rf $PKG +mkdir -p $TMP $PKG if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -38,61 +50,36 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi -rm -rf $PKG -mkdir -p $TMP $PKG cd $TMP -rm -rf device-mapper.$VERSION -tar xvf $CWD/device-mapper.$VERSION.tar.bz2 || exit 1 -cd device-mapper.$VERSION +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +cd ${PKGNAM}-$VERSION -chown -R root.root . +# Make sure ownerships and permissions are sane: +chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -./configure \ - --libdir=/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-static_link \ - --enable-pkgconfig \ - --enable-dmeventd \ - --disable-selinux \ - --with-device-uid=0 \ - --with-device-gid=6 \ - --with-device-mode=0660 \ - --build=$ARCH-slackware-linux - # I tried adding --enable-compat but that failed to compile - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# On x86_64 the pkgconfig files are installed to the wrong directory, but -# the .pc content is correct, so we just move them over: -if [ ! -d $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ]; then - mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} - mv $PKG/usr/lib/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}/ - rmdir $PKG/usr/lib || exit 1 -fi +# Build and install: +make libdir=/usr/lib${LIBDIRSUFFIX} +make install libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG -mkdir -p $PKG/lib/udev/rules.d -cat $CWD/64-device-mapper.rules > $PKG/lib/udev/rules.d/64-device-mapper.rules +# Don't ship these: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.{a,la} -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/device-mapper.$VERSION -cp -a \ - COPYING* INSTALL INTRO README* VERSION WHATS_NEW \ - $PKG/usr/doc/device-mapper.$VERSION - -# Compress and if needed symlink the man pages: +# Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man for manpagedir in $(find . -type d -name "man*") ; do @@ -107,9 +94,15 @@ if [ -d $PKG/usr/man ]; then ) fi +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/device-mapper-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/cpufrequtils/slack-desc b/source/a/cpufrequtils/slack-desc new file mode 100644 index 000000000..2e4b1ac36 --- /dev/null +++ b/source/a/cpufrequtils/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +cpufrequtils: cpufrequtils (Kernel CPUfreq utilities) +cpufrequtils: +cpufrequtils: The cpufrequtils package makes access to the Linux kernel CPUfreq +cpufrequtils: subsystem easier for users and cpufreq userspace tools. It contains +cpufrequtils: a library used by other programs (libcpufreq), and command line tools +cpufrequtils: to determine current CPUfreq settings and to modify them. +cpufrequtils: +cpufrequtils: Dominik Brodowski is the cpufrequtils maintainer. +cpufrequtils: The cpufrequtils page is hosted on kernel.org: +cpufrequtils: http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufreq.html +cpufrequtils: diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild index 7a7f3a8ba..35b674aee 100755 --- a/source/a/cryptsetup/cryptsetup.SlackBuild +++ b/source/a/cryptsetup/cryptsetup.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (c) 2007, 2009 Eric Hameleers <alien@slackware.com> -# Copyright (c) 2007, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright (c) 2007, 2009, 2010 Eric Hameleers <alien@slackware.com> +# Copyright (c) 2007, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,15 +28,23 @@ # By: Eric Hameleers <alien@slackware.com> # For: cryptsetup # Descr: Utility for setting up encrypted filesystems -# URL: http://luks.endorphin.org/dm-crypt +# URL: http://code.google.com/p/cryptsetup/ # # ----------------------------------------------------------------------------- -PRGNAM=cryptsetup -VERSION=${VERSION:-1.0.7} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} - +PKGNAM=cryptsetup +VERSION=${VERSION:-1.1.0} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -47,6 +55,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -67,7 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -echo Building ... LDFLAGS="$SLKLDFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -76,60 +86,40 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --sysconfdir=/etc \ --mandir=/usr/man \ - --enable-libgcrypt \ - --enable-libdevmapper \ - --program-prefix= \ - --program-suffix= \ + --docdir=/usr/doc/cryptsetup-$VERSION \ --build=$ARCH-slackware-linux make make DESTDIR=$PKG install -# -# Next, make the static version that we will use for mkinitrd: -# - -make clean -echo Building ... -LDFLAGS="$SLKLDFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --enable-libgcrypt \ - --enable-libdevmapper \ - --enable-static \ - --disable-shared \ - --disable-shared-library \ - --program-prefix= \ - --program-suffix= \ - --build=$ARCH-slackware-linux -make - -# I have to do one old-school thing to leave a mark here: +# Move the shared library to $PKG/lib${LIBDIRSUFFIX}: +mkdir -p $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) + +# Move the cryptsetup binary to $PKG/sbin: mkdir -p $PKG/sbin -cat src/cryptsetup > $PKG/sbin/cryptsetup.static -chmod 755 $PKG/sbin/cryptsetup.static - -mv $PKG/usr/sbin/cryptsetup $PKG/usr/sbin/cryptsetup.dynamic -# Replace with a link: -( cd $PKG/usr/sbin ; ln -sf cryptsetup.dynamic cryptsetup ) -# In /sbin, use the static version as /usr *might* not be mounted yet. -# However, note that some cryptsetup operations cause the static -# version to segfault, so for things like formatting you'll want -# to use the dynamic one. That's what should be in the $PATH first. -( cd $PKG/sbin ; ln -sf cryptsetup.static cryptsetup ) - -# Remove unneeded empty directory: -#rmdir $PKG/usr/lib/cryptsetup - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +( cd $PKG/usr/sbin + mv cryptsetup ../../sbin + ln -sf ../../sbin/cryptsetup . +) + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* + AUTHORS COPYING* INSTALL NEWS README TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; || true @@ -140,5 +130,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/a/cups/cups.SlackBuild b/source/a/cups/cups.SlackBuild index 5ae070951..1c285c63a 100755 --- a/source/a/cups/cups.SlackBuild +++ b/source/a/cups/cups.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,18 @@ # CUPS build script by volkerdi@slackware.com. -VERSION=1.3.11 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-1} +VERSION=1.4.3 +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" @@ -33,6 +41,8 @@ else LIBDIRSUFFIX="" fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-cups @@ -45,7 +55,8 @@ rm -rf cups-$VERSION tar xvf $CWD/cups-$VERSION-source.tar.?z* || exit 1 cd cups-$VERSION -zcat $CWD/cups.firefox.desktop.diff.gz | patch -p1 --verbose || exit 1 +# Fix the USB backend to use either usblp or libusb: +zcat $CWD/usb-backend-both-usblp-and-libusb.dpatch.gz | patch -p1 --verbose || exit 1 sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure ./configure \ @@ -74,6 +85,17 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new # Clear out the additions: rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d +### OBSOLETE. The USB backend is patched to support usblp again. ### +## From 1.4.x, CUPS no longer uses usblp, and having the module loaded +## will interfere with USB printers. So, we will add a blacklist rule +## so that the module is not loaded: +#mkdir -p $PKG/etc/modprobe.d +#cat << EOF > $PKG/etc/modprobe.d/cups.blacklist.usblp.conf.new +## Do not load the kernel usblp module, since it interferes with +## versions of CUPS 1.4.0 and newer: +#blacklist usblp +#EOF + # I'm not sure if overwriting this blindly could have ill effects, # but it never hurts to play it safe. According to the dbus-daemon # manpage, only files ending in .conf will be used, so there won't @@ -110,6 +132,14 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG/usr/doc ln -sf cups-$VERSION cups ) +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGES.txt ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGES.txt | head -n 1000 > $DOCSDIR/CHANGES.txt + touch -r CHANGES.txt $DOCSDIR/CHANGES.txt +fi + # I'm sorry, but PDF files are almost as bloated and annoying as # MS Word documents. We'll retain the HTML files in /usr/doc. ( cd $PKG/usr/doc diff --git a/source/a/cups/cups.firefox.desktop.diff b/source/a/cups/cups.firefox.desktop.diff deleted file mode 100644 index 96affd5a3..000000000 --- a/source/a/cups/cups.firefox.desktop.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -u -r --new-file cups-1.3.11.orig/desktop/cups.desktop cups-1.3.11/desktop/cups.desktop ---- cups-1.3.11.orig/desktop/cups.desktop 2008-09-05 19:30:39.000000000 -0500 -+++ cups-1.3.11/desktop/cups.desktop 2009-08-21 20:18:23.604682681 -0500 -@@ -1,6 +1,6 @@ - [Desktop Entry] - Categories=System;Printing;HardwareSettings;X-Red-Hat-Base; --Exec=htmlview http://localhost:631/ -+Exec=firefox http://localhost:631/ - Icon=cups - StartupNotify=false - Terminal=false diff --git a/source/a/cups/doinst.sh b/source/a/cups/doinst.sh index 3f56dab3f..6807cc3ac 100644 --- a/source/a/cups/doinst.sh +++ b/source/a/cups/doinst.sh @@ -14,6 +14,12 @@ for file in etc/cups/*.new ; do done config etc/dbus-1/system.d/cups.conf.new +# This file will just have to go. It appeared for a while during a -current +# devel period and has never been part of a stable release. +#config etc/modprobe.d/cups.blacklist.usblp.conf.new +rm -f etc/modprobe.d/cups.blacklist.usblp.conf.new +rm -f etc/modprobe.d/cups.blacklist.usblp.conf + # Leave any new rc.cups with the same permissions as the old one: # This is a kludge, but it's because there's no --reference option # on busybox's 'chmod': diff --git a/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch b/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch new file mode 100644 index 000000000..88ae9d077 --- /dev/null +++ b/source/a/cups/usb-backend-both-usblp-and-libusb.dpatch @@ -0,0 +1,574 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## usb-backend-both-usblp-and-libusb.dpatch by <till.kamppeter@gmail.com> +## +## DP: http://www.cups.org/str.php?L3357 + +@DPATCH@ +diff -urNad cups-1.4.3~/backend/Makefile cups-1.4.3/backend/Makefile +--- cups-1.4.3~/backend/Makefile 2010-04-09 15:56:03.735720821 +0200 ++++ cups-1.4.3/backend/Makefile 2010-04-09 15:56:04.335705387 +0200 +@@ -267,7 +267,7 @@ + echo Linking $@... + $(CC) $(LDFLAGS) -o usb usb.o libbackend.a $(LIBUSB) \ + $(BACKLIBS) $(LIBS) +-usb.o: usb.c usb-darwin.c usb-libusb.c usb-unix.c ++usb.o: usb.c usb-darwin.c usb-hybrid.c usb-libusb.c usb-unix.c + + + # +diff -urNad cups-1.4.3~/backend/ieee1284.c cups-1.4.3/backend/ieee1284.c +--- cups-1.4.3~/backend/ieee1284.c 2009-12-08 03:13:42.000000000 +0100 ++++ cups-1.4.3/backend/ieee1284.c 2010-04-09 15:56:04.335705387 +0200 +@@ -255,6 +255,7 @@ + cups_option_t *values; /* Keys and values in device ID */ + const char *mfg, /* Manufacturer */ + *mdl, /* Model */ ++ *des, /* Description */ + *sern; /* Serial number */ + char temp[256], /* Temporary manufacturer string */ + *tempptr; /* Pointer into temp string */ +@@ -285,10 +286,20 @@ + } + else + { +- strlcpy(temp, make_model, sizeof(temp)); ++ /* ++ * No manufacturer? Use the model string or description... ++ */ ++ ++ if (mdl) ++ _ppdNormalizeMakeAndModel(mdl, temp, sizeof(temp)); ++ else if ((des = cupsGetOption("DESCRIPTION", num_values, values)) != NULL || ++ (des = cupsGetOption("DES", num_values, values)) != NULL) ++ _ppdNormalizeMakeAndModel(des, temp, sizeof(temp)); ++ else ++ strlcpy(temp, "Unknown", sizeof(temp)); + + if ((tempptr = strchr(temp, ' ')) != NULL) +- *tempptr = '\0'; ++ *tempptr = '\0'; + + mfg = temp; + } +diff -urNad cups-1.4.3~/backend/usb-hybrid.c cups-1.4.3/backend/usb-hybrid.c +--- cups-1.4.3~/backend/usb-hybrid.c 1970-01-01 01:00:00.000000000 +0100 ++++ cups-1.4.3/backend/usb-hybrid.c 2010-04-09 15:56:04.345707078 +0200 +@@ -0,0 +1,87 @@ ++/* ++ * "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $" ++ * ++ * USB port backend for the Common UNIX Printing System (CUPS). ++ * ++ * This file is included from "usb.c" when compiled on Linux. ++ * ++ * Copyright 2007-2008 by Apple Inc. ++ * Copyright 1997-2007 by Easy Software Products, all rights reserved. ++ * ++ * These coded instructions, statements, and computer programs are the ++ * property of Apple Inc. and are protected by Federal copyright ++ * law. Distribution and use rights are outlined in the file "LICENSE.txt" ++ * "LICENSE" which should have been included with this file. If this ++ * file is missing or damaged, see the license at "http://www.cups.org/". ++ * ++ * This file is subject to the Apple OS-Developed Software exception. ++ * ++ * Contents: ++ * ++ * print_device() - Print a file to a USB device. ++ * list_devices() - List all USB devices. ++ */ ++ ++/* ++ * Include necessary headers. ++ */ ++ ++#include <sys/select.h> ++ ++/* ++ * Include the two USB implementations used under Linux ... ++ */ ++ ++#include "usb-libusb.c" ++#include "usb-unix.c" ++ ++/* ++ * 'print_device()' - Print a file to a USB device. ++ */ ++ ++int /* O - Exit status */ ++print_device(const char *uri, /* I - Device URI */ ++ const char *hostname, /* I - Hostname/manufacturer */ ++ const char *resource, /* I - Resource/modelname */ ++ char *options, /* I - Device options/serial number */ ++ int print_fd, /* I - File descriptor to print */ ++ int copies, /* I - Copies to print */ ++ int argc, /* I - Number of command-line arguments (6 or 7) */ ++ char *argv[]) /* I - Command-line arguments */ ++{ ++ int result; ++ for(;;) ++ { ++ result = print_device_unix(uri, hostname, resource, options, print_fd, ++ copies, argc, argv); ++ if (result == -1) ++ { ++ result = print_device_libusb(uri, hostname, resource, options, print_fd, ++ copies, argc, argv); ++ if (result == -1) ++ sleep(5); ++ else ++ return(result); ++ } ++ else ++ return(result); ++ } ++} ++ ++/* ++ * 'list_devices()' - List all USB devices. ++ */ ++ ++void ++list_devices(void) ++{ ++ /* Try both discovery methods, each device will appear only under one ++ of them */ ++ list_devices_libusb(); ++ list_devices_unix(); ++} ++ ++ ++/* ++ * End of "$Id: usb-hybrid.c 8807 2009-08-31 18:45:43Z mike $". ++ */ +diff -urNad cups-1.4.3~/backend/usb-libusb.c cups-1.4.3/backend/usb-libusb.c +--- cups-1.4.3~/backend/usb-libusb.c 2009-09-11 22:03:31.000000000 +0200 ++++ cups-1.4.3/backend/usb-libusb.c 2010-04-09 15:56:04.345707078 +0200 +@@ -13,16 +13,16 @@ + * + * Contents: + * +- * list_devices() - List the available printers. +- * print_device() - Print a file to a USB device. ++ * list_devices_libusb() - List the available printers. ++ * print_device_libusb() - Print a file to a USB device. + * close_device() - Close the connection to the USB printer. + * find_device() - Find or enumerate USB printers. + * get_device_id() - Get the IEEE-1284 device ID for the printer. + * list_cb() - List USB printers for discovery. + * make_device_uri() - Create a device URI for a USB printer. +- * open_device() - Open a connection to the USB printer. ++ * open_device_libusb() - Open a connection to the USB printer. + * print_cb() - Find a USB printer for printing. +- * side_cb() - Handle side-channel requests. ++ * side_cb_libusb() - Handle side-channel requests. + */ + + /* +@@ -65,30 +65,30 @@ + static char *make_device_uri(usb_printer_t *printer, + const char *device_id, + char *uri, size_t uri_size); +-static int open_device(usb_printer_t *printer, int verbose); ++static int open_device_libusb(usb_printer_t *printer, int verbose); + static int print_cb(usb_printer_t *printer, const char *device_uri, + const char *device_id, const void *data); +-static ssize_t side_cb(usb_printer_t *printer, int print_fd); ++static ssize_t side_cb_libusb(usb_printer_t *printer, int print_fd); + + + /* +- * 'list_devices()' - List the available printers. ++ * 'list_devices_libusb()' - List the available printers. + */ + + void +-list_devices(void) ++list_devices_libusb(void) + { +- fputs("DEBUG: list_devices\n", stderr); ++ fputs("DEBUG: list_devices_libusb\n", stderr); + find_device(list_cb, NULL); + } + + + /* +- * 'print_device()' - Print a file to a USB device. ++ * 'print_device_libusb()' - Print a file to a USB device. + */ + + int /* O - Exit status */ +-print_device(const char *uri, /* I - Device URI */ ++print_device_libusb(const char *uri, /* I - Device URI */ + const char *hostname, /* I - Hostname/manufacturer */ + const char *resource, /* I - Resource/modelname */ + char *options, /* I - Device options/serial number */ +@@ -105,19 +105,23 @@ + struct pollfd pfds[2]; /* Poll descriptors */ + + +- fputs("DEBUG: print_device\n", stderr); ++ fputs("DEBUG: print_device_libusb\n", stderr); + + /* + * Connect to the printer... + */ + ++#if defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) ++ if ((printer = find_device(print_cb, uri)) == NULL) ++ return(-1); ++#else + while ((printer = find_device(print_cb, uri)) == NULL) + { + _cupsLangPuts(stderr, + _("INFO: Waiting for printer to become available...\n")); + sleep(5); + } +- ++#endif + + /* + * If we are printing data from a print driver on stdin, ignore SIGTERM +@@ -189,7 +193,7 @@ + + if (pfds[1].revents & (POLLIN | POLLHUP)) + { +- if ((bytes = side_cb(printer, print_fd)) < 0) ++ if ((bytes = side_cb_libusb(printer, print_fd)) < 0) + pfds[1].events = 0; /* Filter has gone away... */ + else + tbytes += bytes; +@@ -359,7 +363,7 @@ + printer.iface = iface; + printer.handle = NULL; + +- if (!open_device(&printer, data != NULL)) ++ if (!open_device_libusb(&printer, data != NULL)) + { + if (!get_device_id(&printer, device_id, sizeof(device_id))) + { +@@ -583,6 +587,14 @@ + mfg = tempmfg; + } + ++ if (!strncasecmp(mdl, mfg, strlen(mfg))) ++ { ++ mdl += strlen(mfg); ++ ++ while (isspace(*mdl & 255)) ++ mdl ++; ++ } ++ + /* + * Generate the device URI from the manufacturer, model, serial number, + * and interface number... +@@ -611,11 +623,11 @@ + + + /* +- * 'open_device()' - Open a connection to the USB printer. ++ * 'open_device_libusb()' - Open a connection to the USB printer. + */ + + static int /* O - 0 on success, -1 on error */ +-open_device(usb_printer_t *printer, /* I - Printer */ ++open_device_libusb(usb_printer_t *printer, /* I - Printer */ + int verbose) /* I - Update connecting-to-device state? */ + { + int number; /* Configuration/interface/altset numbers */ +@@ -733,16 +745,73 @@ + const char *device_id, /* I - IEEE-1284 device ID */ + const void *data) /* I - User data (make, model, S/N) */ + { +- return (!strcmp((char *)data, device_uri)); ++ char *uri = (char *)data, ++ *str1, ++ *str2, ++ buf[255], ++ requested_uri[1024]; ++ ++ /* Work on a copy of uri */ ++ strncpy(requested_uri, uri, sizeof(requested_uri)); ++ requested_uri[sizeof(requested_uri) - 1] = '\0'; ++ ++ /* ++ * libusb-discovered URIs can have an "interface" specification and this ++ * never happens for usblp-discovered URIs, so remove the "interface" ++ * specification from the URI which we are checking currently. This way a ++ * queue for a usblp-discovered printer can now be accessed via libusb ++ */ ++ if (((str1 = strstr(requested_uri, "interface=")) == NULL) && ++ ((str2 = strstr(device_uri, "interface=")) != NULL)) ++ { ++ *(str2 - 1) = '\0'; ++ } ++ ++ /* ++ * Old URI with "serial=?". Cut this part off and consider this as ++ * an URI without serial number ++ */ ++ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) ++ *(str1 - 1) = '\0'; ++ ++ /* ++ * Old URI without serial number. Match it also with URIs with serial ++ * number ++ */ ++ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && ++ ((str2 = strstr(device_uri, "serial=")) != NULL)) ++ *(str2 - 1) = '\0'; ++ ++ /* ++ * libusb-discovered URIs can have a "serial" specification when the ++ * usblp-discovered URI for the same printer does not have one, as ++ * with libusb we can discover serial numbers also with other methods ++ * than only via the device ID. Therefore we accept also a ++ * usblp-discovered printer without serial number as a match. This we ++ * do by removing the serial number from the queue's (libusb-discovered) ++ * URI before comparing. Also warn the user because of the incapability ++ * of the usblp-based access to distinguish printers by the serial ++ * number. ++ */ ++ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && ++ ((str2 = strstr(device_uri, "serial=")) != NULL)) ++ { ++ *(str2 - 1) = '\0'; ++ if (backendGetMakeModel(device_id, buf, sizeof(buf)) == 0) ++ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please make sure that the \"usblp\" kernel module is always unloaded (and blacklisted) and re-create the queues for these printers. Otherwise CUPS will not be able to distinguish them.\n", ++ buf); ++ } ++ ++ return (!strcmp(requested_uri, device_uri)); + } + + + /* +- * 'side_cb()' - Handle side-channel requests. ++ * 'side_cb_libusb()' - Handle side-channel requests. + */ + + static ssize_t /* O - Number of bytes written */ +-side_cb(usb_printer_t *printer, /* I - Printer */ ++side_cb_libusb(usb_printer_t *printer, /* I - Printer */ + int print_fd) /* I - File to print */ + { + ssize_t bytes, /* Bytes read/written */ +diff -urNad cups-1.4.3~/backend/usb-unix.c cups-1.4.3/backend/usb-unix.c +--- cups-1.4.3~/backend/usb-unix.c 2009-12-08 03:13:42.000000000 +0100 ++++ cups-1.4.3/backend/usb-unix.c 2010-04-09 15:56:30.799666933 +0200 +@@ -18,10 +18,10 @@ + * + * Contents: + * +- * print_device() - Print a file to a USB device. +- * list_devices() - List all USB devices. +- * open_device() - Open a USB device... +- * side_cb() - Handle side-channel requests... ++ * print_device_unix() - Print a file to a USB device. ++ * list_devices_unix() - List all USB devices. ++ * open_device_unix() - Open a USB device... ++ * side_cb_unix() - Handle side-channel requests... + */ + + /* +@@ -35,17 +35,17 @@ + * Local functions... + */ + +-static int open_device(const char *uri, int *use_bc); +-static int side_cb(int print_fd, int device_fd, int snmp_fd, ++static int open_device_unix(const char *uri, int *use_bc); ++static int side_cb_unix(int print_fd, int device_fd, int snmp_fd, + http_addr_t *addr, int use_bc); + + + /* +- * 'print_device()' - Print a file to a USB device. ++ * 'print_device_unix()' - Print a file to a USB device. + */ + + int /* O - Exit status */ +-print_device(const char *uri, /* I - Device URI */ ++print_device_unix(const char *uri, /* I - Device URI */ + const char *hostname, /* I - Hostname/manufacturer */ + const char *resource, /* I - Resource/modelname */ + char *options, /* I - Device options/serial number */ +@@ -102,7 +102,7 @@ + strncasecmp(hostname, "Minolta", 7); + #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ + +- if ((device_fd = open_device(uri, &use_bc)) == -1) ++ if ((device_fd = open_device_unix(uri, &use_bc)) == -1) + { + if (getenv("CLASS") != NULL) + { +@@ -132,6 +132,10 @@ + _("INFO: Printer busy; will retry in 10 seconds...\n")); + sleep(10); + } ++#ifdef HAVE_USB_H ++ else ++ return (-1); ++#else + else if (errno == ENXIO || errno == EIO || errno == ENOENT || + errno == ENODEV) + { +@@ -147,6 +151,7 @@ + resource, strerror(errno)); + return (CUPS_BACKEND_FAILED); + } ++#endif + } + } + while (device_fd < 0); +@@ -190,7 +195,7 @@ + tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, NULL); + + #else +- tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb); ++ tbytes = backendRunLoop(print_fd, device_fd, -1, NULL, use_bc, 1, side_cb_unix); + #endif /* __sun */ + + if (print_fd != 0 && tbytes >= 0) +@@ -214,11 +219,11 @@ + + + /* +- * 'list_devices()' - List all USB devices. ++ * 'list_devices_unix()' - List all USB devices. + */ + + void +-list_devices(void) ++list_devices_unix(void) + { + #ifdef __linux + int i; /* Looping var */ +@@ -320,11 +325,11 @@ + + + /* +- * 'open_device()' - Open a USB device... ++ * 'open_device_unix()' - Open a USB device... + */ + + static int /* O - File descriptor or -1 on error */ +-open_device(const char *uri, /* I - Device URI */ ++open_device_unix(const char *uri, /* I - Device URI */ + int *use_bc) /* O - Set to 0 for unidirectional */ + { + int fd; /* File descriptor */ +@@ -357,9 +362,12 @@ + char device[255], /* Device filename */ + device_id[1024], /* Device ID string */ + make_model[1024], /* Make and model */ +- device_uri[1024]; /* Device URI string */ +- ++ device_uri[1024], /* Device URI string */ ++ requested_uri[1024], /* Device URI string */ ++ *str1, ++ *str2; + ++ + /* + * Find the correct USB device... + */ +@@ -407,7 +415,55 @@ + device_uri[0] = '\0'; + } + +- if (!strcmp(uri, device_uri)) ++ /* Work on a copy of uri */ ++ strncpy(requested_uri, uri, sizeof(requested_uri)); ++ requested_uri[sizeof(requested_uri) - 1] = '\0'; ++ ++ /* ++ * libusb-discovered URIs can have an "interface" specification and this ++ * never happens for usblp-discovered URIs, so remove the "interface" ++ * specification from the URI of the print queue. This way a queue for ++ * a libusb-discovered printer can now be accessed via the usblip kernel ++ * module ++ */ ++ if ((str1 = strstr(requested_uri, "interface=")) != NULL) ++ *(str1 - 1) = '\0'; ++ ++ /* ++ * Old URI with "serial=?". Cut this part off and consider this as ++ * an URI without serial number ++ */ ++ if ((str1 = strstr(requested_uri, "serial=?")) != NULL) ++ *(str1 - 1) = '\0'; ++ ++ /* ++ * Old URI without serial number. Match it also with URIs with serial ++ * number ++ */ ++ if (((str1 = strstr(requested_uri, "serial=")) == NULL) && ++ ((str2 = strstr(device_uri, "serial=")) != NULL)) ++ *(str2 - 1) = '\0'; ++ ++ /* ++ * libusb-discovered URIs can have a "serial" specification when the ++ * usblp-discovered URI for the same printer does not have one, as ++ * with libusb we can discover serial numbers also with other methods ++ * than only via the device ID. Therefore we accept also a ++ * usblp-discovered printer without serial number as a match. This we ++ * do by removing the serial number from the queue's (libusb-discovered) ++ * URI before comparing. Also warn the user because of the incapability ++ * of the usblp-based access to distinguish printers by the serial ++ * number. ++ */ ++ if (((str1 = strstr(requested_uri, "serial=")) != NULL) && ++ ((str2 = strstr(device_uri, "serial=")) == NULL)) ++ { ++ *(str1 - 1) = '\0'; ++ fprintf(stderr, "WARNING: If you have more than one %s printer connected to this machine, please unload (and blacklist) the \"usblp\" kernel module as otherwise CUPS will not be able to distinguish your printers.\n", ++ make_model); ++ } ++ ++ if (!strcmp(requested_uri, device_uri)) + { + /* + * Yes, return this file descriptor... +@@ -433,10 +489,14 @@ + */ + + if (busy) ++ { + _cupsLangPuts(stderr, + _("INFO: Printer busy; will retry in 5 seconds...\n")); + +- sleep(5); ++ sleep(5); ++ } ++ else ++ return -1; + } + } + #elif defined(__sun) && defined(ECPPIOC_GETDEVID) +@@ -557,11 +617,11 @@ + + + /* +- * 'side_cb()' - Handle side-channel requests... ++ * 'side_cb_unix()' - Handle side-channel requests... + */ + + static int /* O - 0 on success, -1 on error */ +-side_cb(int print_fd, /* I - Print file */ ++side_cb_unix(int print_fd, /* I - Print file */ + int device_fd, /* I - Device file */ + int snmp_fd, /* I - SNMP socket (unused) */ + http_addr_t *addr, /* I - Device address (unused) */ +diff -urNad cups-1.4.3~/backend/usb.c cups-1.4.3/backend/usb.c +--- cups-1.4.3~/backend/usb.c 2008-06-24 03:28:36.000000000 +0200 ++++ cups-1.4.3/backend/usb.c 2010-04-09 15:56:04.345707078 +0200 +@@ -56,7 +56,7 @@ + */ + + #ifdef HAVE_USB_H +-# include "usb-libusb.c" ++# include "usb-hybrid.c" + #elif defined(__APPLE__) + # include "usb-darwin.c" + #elif defined(__linux) || defined(__sun) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) diff --git a/source/a/cxxlibs/cxxlibs.SlackBuild b/source/a/cxxlibs/cxxlibs.SlackBuild index 025a64949..19f8042ed 100755 --- a/source/a/cxxlibs/cxxlibs.SlackBuild +++ b/source/a/cxxlibs/cxxlibs.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,18 @@ PKGNAM=cxxlibs -VERSION=${VERSION:-6.0.10} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +VERSION=${VERSION:-6.0.13} +BUILD=${BUILD:-2} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/a/dbus/dbus-1.2.x-allow_root_globally.diff b/source/a/dbus/dbus-1.2.x-allow_root_globally.diff new file mode 100644 index 000000000..913a9d2b1 --- /dev/null +++ b/source/a/dbus/dbus-1.2.x-allow_root_globally.diff @@ -0,0 +1,22 @@ +Allow root to do anything via dbus method calls, since users expect root + to be, well, root. This removes the insanity of adding root to all sorts + of system groups in /etc/group. --rworkman 20091031 + +diff -Nur dbus-1.2.16.orig/bus/system.conf.in dbus-1.2.16/bus/system.conf.in +--- dbus-1.2.16.orig/bus/system.conf.in 2009-07-13 05:14:40.000000000 -0500 ++++ dbus-1.2.16/bus/system.conf.in 2009-10-31 00:47:34.338981143 -0500 +@@ -70,6 +70,14 @@ + send_member="UpdateActivationEnvironment"/> + </policy> + ++ <!-- Allow root to do anything over the messagebus. ++ Don't whine about "security" - anyone with root privileges ++ can edit this file anyway, so -ENOHOLE here. --> ++ <policy user="root"> ++ <allow send_destination="*"/> ++ <allow send_interface="*"/> ++ </policy> ++ + <!-- Config files are placed here that among other things, punch + holes in the above policy for specific services. --> + <includedir>system.d</includedir> diff --git a/source/a/dbus/dbus.SlackBuild b/source/a/dbus/dbus.SlackBuild index c761ce54c..533ccd897 100755 --- a/source/a/dbus/dbus.SlackBuild +++ b/source/a/dbus/dbus.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright 2007, 2008 Robby Workman <http://rlworkman.net> -# Copyright 2007, 2008, 2009 Patrick Volkerding, Sebeka, MN, USA + +# Copyright 2007-2010 Robby Workman, Northport, Alabama, USA +# Copyright 2007-2010 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,16 +21,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=dbus -VERSION=1.2.14 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +PKGNAM=dbus +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -40,14 +50,17 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -55,6 +68,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/dbus-1.2.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -64,9 +79,10 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-shared=yes \ --enable-static=no \ + --enable-inotify \ --with-system-pid-file=/var/run/dbus/dbus.pid \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-init-scripts=slackware \ @@ -96,16 +112,16 @@ mv $PKG/etc/dbus-1/system.conf $PKG/etc/dbus-1/system.conf.new chown messagebus $PKG/var/lib/dbus # Add documentation -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING HACKING INSTALL NEWS README doc/*.{txt,html,dtd} \ - $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; + $PKG/usr/doc/$PKGNAM-$VERSION +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 644 {} \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/dcron/crontab.c.O_EXCL.diff b/source/a/dcron/crontab.c.O_EXCL.diff new file mode 100644 index 000000000..7acd5ce29 --- /dev/null +++ b/source/a/dcron/crontab.c.O_EXCL.diff @@ -0,0 +1,11 @@ +--- ./crontab.c.orig 2010-01-18 09:27:31.000000000 -0600 ++++ ./crontab.c 2010-02-11 16:38:03.000000000 -0600 +@@ -199,7 +199,7 @@ + * Read from repFd, write to fd for "$CDir/$USER.new" + */ + snprintf(path, sizeof(path), "%s.new", pas->pw_name); +- if ((fd = open(path, O_CREAT|O_TRUNC|O_EXCL|O_APPEND|O_WRONLY, 0600)) >= 0) { ++ if ((fd = open(path, O_CREAT|O_TRUNC|O_APPEND|O_WRONLY, 0600)) >= 0) { + while ((n = read(repFd, buf, sizeof(buf))) > 0) { + write(fd, buf, n); + } diff --git a/source/a/dcron/crontab.root b/source/a/dcron/crontab.root new file mode 100644 index 000000000..b5b425628 --- /dev/null +++ b/source/a/dcron/crontab.root @@ -0,0 +1,22 @@ +# If you don't want the output of a cron job mailed to you, you have to direct +# any output to /dev/null. We'll do this here since these jobs should run +# properly on a newly installed system, but if they don't the average newbie +# might get quite perplexed about getting strange mail every 5 minutes. :^) +# +# Run the hourly, daily, weekly, and monthly cron jobs. +# Jobs that need different timing may be entered into the crontab as before, +# but most really don't need greater granularity than this. If the exact +# times of the hourly, daily, weekly, and monthly cron jobs do not suit your +# needs, feel free to adjust them. +# +# Run hourly cron jobs at 47 minutes after the hour: +47 * * * * /usr/bin/run-parts /etc/cron.hourly 1> /dev/null +# +# Run daily cron jobs at 4:40 every day: +40 4 * * * /usr/bin/run-parts /etc/cron.daily 1> /dev/null +# +# Run weekly cron jobs at 4:30 on the first day of the week: +30 4 * * 0 /usr/bin/run-parts /etc/cron.weekly 1> /dev/null +# +# Run monthly cron jobs at 4:20 on the first day of the month: +20 4 1 * * /usr/bin/run-parts /etc/cron.monthly 1> /dev/null diff --git a/source/a/dcron/dcron-2.3.3.crontab.diff4 b/source/a/dcron/dcron-2.3.3.crontab.diff4 deleted file mode 100644 index 30d0501a0..000000000 --- a/source/a/dcron/dcron-2.3.3.crontab.diff4 +++ /dev/null @@ -1,19 +0,0 @@ ---- ./crontab.c.orig Wed Feb 20 14:31:32 2002 -+++ ./crontab.c Wed Feb 20 14:33:13 2002 -@@ -197,14 +197,14 @@ - int n; - - snprintf(path, sizeof(path), "%s.new", pas->pw_name); -- if ((fd = open(path, O_CREAT|O_TRUNC|O_EXCL|O_APPEND|O_WRONLY, 0600)) >= 0) { -+ if ((fd = open(path, O_CREAT|O_TRUNC|O_APPEND|O_WRONLY, 0600)) >= 0) { - while ((n = read(repFd, buf, sizeof(buf))) > 0) { - write(fd, buf, n); - } - close(fd); - rename(path, pas->pw_name); - } else { -- fprintf(stderr, "unable to create %s/%s\n", CDir, buf); -+ fprintf(stderr, "unable to create %s/%s\n", CDir, path); - } - close(repFd); - } diff --git a/source/a/dcron/dcron-2.3.3.diff b/source/a/dcron/dcron-2.3.3.diff deleted file mode 100644 index 22806de3e..000000000 --- a/source/a/dcron/dcron-2.3.3.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- ./defs.h.orig Fri Sep 5 14:44:32 1997 -+++ ./defs.h Thu Aug 26 16:56:10 1999 -@@ -29,7 +29,7 @@ - #define CRONTABS "/var/spool/cron/crontabs" - #endif - #ifndef TMPDIR --#define TMPDIR "/tmp" -+#define TMPDIR "/var/spool/cron" - #endif - #ifndef OPEN_MAX - #define OPEN_MAX 256 ---- ./subs.c.orig Mon Feb 16 13:35:10 1998 -+++ ./subs.c Thu Aug 26 16:57:21 1999 -@@ -15,7 +15,7 @@ - Prototype int ChangeUser(const char *user, short dochdir); - Prototype void vlog(int level, int fd, const char *ctl, va_list va); - Prototype int slog(char *buf, size_t sz, const char *ctl, va_list va, short useDate); --Prototype char *strdup(const char *); -+Prototype char *xx_strdup(const char *); - - void - log9(const char *ctl, ...) -@@ -80,7 +80,7 @@ - - buf[0] = 0; - if (useDate) -- strftime(buf, 128, "%d-%b-%y %H:%M ", tp); -+ strftime(buf, 128, "%d-%b-%Y %H:%M ", tp); - vsnprintf(buf + strlen(buf), sz - strlen(buf), ctl, va); - return(strlen(buf)); - } -@@ -132,7 +132,7 @@ - } - - char * --strdup(const char *str) -+xx_strdup(const char *str) - { - char *ptr = malloc(strlen(str) + 1); - diff --git a/source/a/dcron/dcron-2.3.3.diff2 b/source/a/dcron/dcron-2.3.3.diff2 deleted file mode 100644 index 8eb8242c5..000000000 --- a/source/a/dcron/dcron-2.3.3.diff2 +++ /dev/null @@ -1,477 +0,0 @@ ---- ./CHANGES:1.1 Fri Jan 7 18:15:59 2000 -+++ ./CHANGES Thu Apr 20 12:10:36 2000 -@@ -1,3 +1,15 @@ -+20/03/00 - TEMHOTA <temnota@kmv.ru> -+ Adding SIGHUP signal handler. crond die when init send to it SIGHUP. -+ Rewrtited all loging code. Added logging through syslog and normal -+ logging to file. -+ -+ Technical details: -+ + logging through syslog used facility LOG_CRON -+ + log_err - now *always* write message to logger (if selected logging -+ through syslog - message send as LOG_ERR). -+ + log9 - sends message hrough syslog loglevel LOG_WARNING -+ + for all other log levels - default syslog loglevel LOG_NOTICE -+ - 02/16/98 - Jordan Mendelson (jordy@wserv.com) - - Numerous people have reported a problem with logging. I'm sorry ---- ./Makefile:1.1 Fri Jan 7 18:15:59 2000 -+++ ./Makefile Thu Apr 20 12:24:40 2000 -@@ -27,7 +27,7 @@ - rm -f crond crontab - - cleano: -- rm -f *.o dcron.tgz $(PROTOS) -+ rm -f *.o dcron.tgz $(PROTOS) *~ - - install: crond crontab - install -o root -g root -m 0755 crond /usr/sbin ---- ./crontab.c:1.1 Fri Jan 7 18:15:59 2000 -+++ ./crontab.c Sun Mar 19 15:03:36 2000 -@@ -15,6 +15,9 @@ - char *CDir = CRONTABS; - int UserId; - short LogLevel = 9; -+short DebugOpt = 0; -+short LoggerOpt = 0; -+char *LogFile = LOG_FILE; - - void EditFile(const char *user, const char *file); - int GetReplaceStream(const char *user, const char *file); -@@ -136,7 +139,7 @@ - */ - - if (chdir(CDir) < 0) { -- fprintf(stderr, "cannot change diir to %s: %s\n", CDir, strerror(errno)); -+ fprintf(stderr, "cannot change dir to %s: %s\n", CDir, strerror(errno)); - exit(1); - } - ---- ./defs.h:1.1 Fri Jan 7 18:15:59 2000 -+++ ./defs.h Sun Mar 19 15:03:36 2000 -@@ -17,6 +17,9 @@ - #include <pwd.h> - #include <unistd.h> - #include <grp.h> -+#include <syslog.h> -+#include <signal.h> -+#include <getopt.h> - #include <sys/ioctl.h> - #include <sys/wait.h> - #include <sys/stat.h> -@@ -30,6 +33,9 @@ - #endif - #ifndef TMPDIR - #define TMPDIR "/var/spool/cron" -+#endif -+#ifndef LOG_FILE -+#define LOG_FILE "/var/log/cron" - #endif - #ifndef OPEN_MAX - #define OPEN_MAX 256 ---- ./job.c:1.1 Fri Jan 7 18:15:59 2000 -+++ ./job.c Thu Apr 20 12:10:36 2000 -@@ -16,7 +16,7 @@ - { - char mailFile[128]; - int mailFd; -- -+ - line->cl_Pid = 0; - line->cl_MailFlag = 0; - -@@ -57,14 +57,6 @@ - log(5, "Child Running %s\n", line->cl_Shell); - - /* -- * Setup close-on-exec descriptor in case exec fails -- */ -- -- dup2(2, 8); -- fcntl(8, F_SETFD, 1); -- fclose(stderr); -- -- /* - * stdin is already /dev/null, setup stdout and stderr - */ - -@@ -73,13 +65,13 @@ - dup2(mailFd, 2); - close(mailFd); - } else { -- logfd(8, "unable to create mail file user %s file %s, output to /dev/null\n", -+ log_err("unable to create mail file user %s file %s, output to /dev/null\n", - file->cf_User, - mailFile - ); - } - execl("/bin/sh", "/bin/sh", "-c", line->cl_Shell, NULL, NULL); -- logfd(8, "unable to exec, user %s cmd /bin/sh -c %s\n", -+ log_err("unable to exec, user %s cmd /bin/sh -c %s\n", - file->cf_User, - line->cl_Shell - ); -@@ -89,7 +81,7 @@ - /* - * PARENT, FORK FAILED - */ -- log9("couldn't fork, user %s\n", file->cf_User); -+ log_err("couldn't fork, user %s\n", file->cf_User); - line->cl_Pid = 0; - remove(mailFile); - } else { -@@ -158,6 +150,7 @@ - if (mailFd < 0) { - return; - } -+ - if (fstat(mailFd, &sbuf) < 0 || - sbuf.st_uid != DaemonUid || - sbuf.st_nlink != 0 || -@@ -182,15 +175,6 @@ - exit(0); - - /* -- * create close-on-exec log descriptor in case exec fails -- */ -- -- dup2(2, 8); -- fcntl(8, F_SETFD, 1); -- -- fclose(stderr); -- -- /* - * run sendmail with mail file as standard input, only if - * mail file exists! - */ -@@ -200,7 +184,7 @@ - close(mailFd); - - execl(SENDMAIL, SENDMAIL, SENDMAIL_ARGS, NULL, NULL); -- logfd(8, "unable to exec %s %s, user %s, output to sink null", -+ log_err("unable to exec %s %s, user %s, output to sink null", - SENDMAIL, - SENDMAIL_ARGS, - file->cf_User -@@ -210,7 +194,7 @@ - /* - * PARENT, FORK FAILED - */ -- log9("unable to fork, user %s", file->cf_User); -+ log_err("unable to fork, user %s", file->cf_User); - line->cl_Pid = 0; - } else { - /* ---- ./main.c:1.1 Fri Jan 7 18:15:59 2000 -+++ ./main.c Sun Mar 19 15:03:36 2000 -@@ -15,14 +15,18 @@ - Prototype short DebugOpt; - Prototype short LogLevel; - Prototype short ForegroundOpt; --Prototype char *CDir; --Prototype int DaemonUid; -+Prototype short LoggerOpt; -+Prototype char *CDir; -+Prototype char *LogFile; -+Prototype uid_t DaemonUid; - - short DebugOpt; - short LogLevel = 8; --short ForegroundOpt; -+short ForegroundOpt = 0; -+short LoggerOpt; - char *CDir = CRONTABS; --int DaemonUid; -+char *LogFile = LOG_FILE; -+uid_t DaemonUid; - - int - main(int ac, char **av) -@@ -35,48 +39,49 @@ - - DaemonUid = getuid(); - -- for (i = 1; i < ac; ++i) { -- char *ptr = av[i]; -+ opterr = 0; /* disable getopt 'errors' message.*/ - -- if (*ptr == '-') { -- ptr += 2; -- -- switch(ptr[-1]) { -+ while ((i = getopt(ac,av,"d:l:L:fbSc:")) != EOF){ -+ -+ switch (i){ - case 'l': -- LogLevel = (*ptr) ? strtol(ptr, NULL, 0) : 1; -- continue; -+ LogLevel = atoi(optarg); -+ break; - case 'd': -- DebugOpt = (*ptr) ? strtol(ptr, NULL, 0) : 1; -+ DebugOpt = atoi(optarg); - LogLevel = 0; - /* fall through */ -+ break; - case 'f': - ForegroundOpt = 1; -- continue; -+ break; - case 'b': - ForegroundOpt = 0; -- continue; -+ break; -+ case 'S': /* select logging to syslog */ -+ LoggerOpt = 0; -+ break; -+ case 'L': /* select internal file logger */ -+ LoggerOpt = 1; -+ if (*optarg != 0) LogFile = optarg; -+ break; - case 'c': -- CDir = (*ptr) ? ptr : av[++i]; -- continue; -+ if (*optarg != 0) CDir = optarg; -+ break; - default: -+ /* -+ * parse error -+ */ -+ printf("dcron " VERSION "\n"); -+ printf("dcron -d [#] -l [#] -S -L logfile -f -b -c dir\n"); -+ printf("-d num\tdebug level\n-l num\tlog level (8 - default)\n-S\tlog to syslod (defualt)\n"); -+ printf("-L file\tlog to file\n-f\trun in fordeground\n"); -+ printf("-b\trun in background (default)\n-c dir\tworking dir\n"); -+ exit(1); - break; -- } -- } -- break; /* error */ -- } -- -- /* -- * check for parse error -- */ -- -- if (i != ac) { -- if (i > ac) -- puts("expected argument for option"); -- printf("dcron " VERSION "\n"); -- printf("dcron -d[#] -l[#] -f -b -c dir\n"); -- exit(1); -+ } - } -- -+ - /* - * change directory - */ -@@ -87,14 +92,15 @@ - } - - /* -- * close stdin and stdout (stderr normally redirected by caller). -- * close unused descriptors -+ * close stdin and stdout, stderr. -+ * close unused descriptors - don't need. - * optional detach from controlling terminal - */ - - fclose(stdin); - fclose(stdout); -- -+ fclose(stderr); -+ - i = open("/dev/null", O_RDWR); - if (i < 0) { - perror("open: /dev/null:"); -@@ -102,15 +108,14 @@ - } - dup2(i, 0); - dup2(i, 1); -+ dup2(i, 2); - -- for (i = 3; i < OPEN_MAX; ++i) { -- close(i); -- } -- - if (ForegroundOpt == 0) { - int fd; - int pid; -- -+ if (setsid() < 0) -+ perror("setsid"); -+ - if ((fd = open("/dev/tty", O_RDWR)) >= 0) { - ioctl(fd, TIOCNOTTY, 0); - close(fd); -@@ -125,13 +130,17 @@ - if (pid > 0) - exit(0); - } -- -+ -+ (void)startlogger(); /* need if syslog mode selected */ -+ (void)initsignals(); /* set some signal handlers */ -+ - /* - * main loop - synchronize to 1 second after the minute, minimum sleep - * of 1 second. - */ -+ -+ log(9,"%s " VERSION " dillon, started, log level %d\n", av[0], LogLevel); - -- log9("%s " VERSION " dillon, started\n", av[0]); - SynchronizeDir("."); - - { ---- ./subs.c:1.1 Fri Jan 7 18:15:59 2000 -+++ ./subs.c Sun Mar 19 15:03:36 2000 -@@ -10,43 +10,62 @@ - - Prototype void log(int level, const char *ctl, ...); - Prototype void log9(const char *ctl, ...); --Prototype void logfd(int fd, const char *ctl, ...); -+Prototype void log_err(const char *ctl, ...); - Prototype void fdprintf(int fd, const char *ctl, ...); --Prototype int ChangeUser(const char *user, short dochdir); --Prototype void vlog(int level, int fd, const char *ctl, va_list va); --Prototype int slog(char *buf, size_t sz, const char *ctl, va_list va, short useDate); -+Prototype void vlog(int level, int MLOG_LEVEL, const char *ctl, va_list va); -+Prototype int ChangeUser(const char *user, short dochdir); - Prototype char *xx_strdup(const char *); -+Prototype void startlogger(void); -+Prototype void initsignals(void); - -+/* -+ set log_level=9 and log messages -+*/ -+ - void - log9(const char *ctl, ...) - { - va_list va; - - va_start(va, ctl); -- vlog(9, 2, ctl, va); -+ vlog(9, LOG_WARNING, ctl, va); - va_end(va); - } - -+/* -+ normal logger call point. -+*/ -+ - void - log(int level, const char *ctl, ...) - { - va_list va; - - va_start(va, ctl); -- vlog(level, 2, ctl, va); -+ vlog(level, LOG_NOTICE, ctl, va); - va_end(va); - } - -+/* -+ Original: void -+ logfd(int fd, const char *ctl, ...) -+ Updated to: log_error (used by jobs.c) -+*/ -+ - void --logfd(int fd, const char *ctl, ...) -+log_err(const char *ctl, ...) - { - va_list va; - - va_start(va, ctl); -- vlog(9, fd, ctl, va); -+ vlog(20, LOG_ERR, ctl, va); - va_end(va); - } - -+/* -+ used by jobs.c (write to temp file..) -+*/ -+ - void - fdprintf(int fd, const char *ctl, ...) - { -@@ -60,32 +79,28 @@ - } - - void --vlog(int level, int fd, const char *ctl, va_list va) -+vlog(int level, int MLOG_LEVEL, const char *ctl, va_list va) - { - char buf[1024]; -- short n; -- static short useDate = 1; -+ int logfd; - - if (level >= LogLevel) { -- write(fd, buf, n = slog(buf, sizeof(buf), ctl, va, useDate)); -- useDate = (n && buf[n-1] == '\n'); -+ -+ vsnprintf(buf,sizeof(buf), ctl, va); -+ if (DebugOpt) fprintf(stderr,"%s",buf); -+ else -+ if (LoggerOpt == 0) syslog(MLOG_LEVEL, "%s",buf ); -+ else { -+ if ((logfd = open(LogFile,O_WRONLY|O_CREAT|O_APPEND,600)) >= 0){ -+ write(logfd, buf, strlen(buf)); -+ close(logfd); -+ } else -+ fprintf(stderr,"Can't open log file. Err: %s",strerror(errno)); -+ } - } - } - - int --slog(char *buf, size_t sz, const char *ctl, va_list va, short useDate) --{ -- time_t t = time(NULL); -- struct tm *tp = localtime(&t); -- -- buf[0] = 0; -- if (useDate) -- strftime(buf, 128, "%d-%b-%Y %H:%M ", tp); -- vsnprintf(buf + strlen(buf), sz - strlen(buf), ctl, va); -- return(strlen(buf)); --} -- --int - ChangeUser(const char *user, short dochdir) - { - struct passwd *pas; -@@ -141,3 +156,28 @@ - return(ptr); - } - -+ -+void -+startlogger(void){ -+int logfd; -+ -+ if (LoggerOpt == 0) -+ openlog("crond",LOG_CONS|LOG_PID,LOG_CRON); -+ -+ else { /* test logfile */ -+ if ((logfd = open(LogFile,O_WRONLY|O_CREAT|O_APPEND,600)) >= 0) -+ close(logfd); -+ else -+ printf("Failed to open log file '%s' reason: %s",LogFile,strerror(errno)); -+ } -+} -+ -+ -+void -+initsignals(void){ -+ -+ signal(SIGHUP,SIG_IGN); /* hmm.. but, if kill -HUP original -+ * version - his died. ;( -+ */ -+ -+} diff --git a/source/a/dcron/dcron-2.3.3.diff3 b/source/a/dcron/dcron-2.3.3.diff3 deleted file mode 100644 index 25c72fc96..000000000 --- a/source/a/dcron/dcron-2.3.3.diff3 +++ /dev/null @@ -1,11 +0,0 @@ ---- ./defs.h.orig Wed May 30 14:13:05 2001 -+++ ./defs.h Wed May 30 14:13:13 2001 -@@ -41,7 +41,7 @@ - #define OPEN_MAX 256 - #endif - #ifndef SENDMAIL --#define SENDMAIL "/usr/lib/sendmail" -+#define SENDMAIL "/usr/sbin/sendmail" - #endif - #ifndef SENDMAIL_ARGS - #define SENDMAIL_ARGS "-t", "-oem", "-i" diff --git a/source/a/dcron/dcron-2.3.3.lsm b/source/a/dcron/dcron-2.3.3.lsm deleted file mode 100644 index 5c161b50a..000000000 --- a/source/a/dcron/dcron-2.3.3.lsm +++ /dev/null @@ -1,17 +0,0 @@ -Begin3 -Title: DCron - yet another cron -Version: 2.3.3 -Entered-date: 17Feb98 -Description: A multi-user cron written from scratch by the author, - similar to vixie-cron but with significant differences. - Attention paid less to feature creep and more to usability - and reliability -Keywords: cron crontab dcron -Author: dillon@apollo.west.oic.com (Matthew Dillon) -Maintained-by: dillon@apollo.west.oic.com (Matthew Dillon) -Primary-site: sunsite.unc.edu /pub/Linux/system/daemons/cron -Alternate-site: -Original-site: -Platforms: -Copying-policy: GPL -End diff --git a/source/a/dcron/dcron-2.3.3.version.diff b/source/a/dcron/dcron-2.3.3.version.diff deleted file mode 100644 index 1b65a0c98..000000000 --- a/source/a/dcron/dcron-2.3.3.version.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./defs.h.orig Tue Apr 9 01:07:07 2002 -+++ ./defs.h Tue Apr 9 01:07:15 2002 -@@ -51,7 +51,7 @@ - #endif - - --#define VERSION "2.3.2" -+#define VERSION "2.3.3" - - typedef struct CronFile { - struct CronFile *cf_Next; diff --git a/source/a/dcron/dcron.SlackBuild b/source/a/dcron/dcron.SlackBuild index c9bb62ff3..f67f869ff 100755 --- a/source/a/dcron/dcron.SlackBuild +++ b/source/a/dcron/dcron.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -9,7 +9,7 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -20,57 +20,99 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.3.3 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-6} +VERSION=${VERSION:-$(echo dcron-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-dcron +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + rm -rf $PKG mkdir -p $TMP $PKG - -# Explode the package framework: -cd $PKG -explodepkg $CWD/_dcron.tar.gz - cd $TMP -rm -rf dcron-$VERSION -tar xzvf $CWD/dcron-$VERSION.tar.gz +rm -rf dcron +tar xvf $CWD/dcron-$VERSION.tar.?z* || exit 1 cd dcron-$VERSION -mkdir -p $PKG/usr/doc/dcron-$VERSION -cp -a CHANGES README dcron-$VERSION.lsm $PKG/usr/doc/dcron-2.3.3 -chown root:root $PKG/usr/doc/dcron-$VERSION/* -chmod 644 $PKG/usr/doc/dcron-$VERSION/* -zcat $CWD/dcron-$VERSION.diff.gz | patch -p1 -E --verbose --backup || exit -# Added signal handling/logging patch from TEMHOTA <temnota@kmv.ru>: -zcat $CWD/dcron-$VERSION.diff2.gz | patch -p1 -E --verbose --backup || exit -# Use /usr/sbin/sendmail, not /usr/lib/sendmail. Fixes cron working -# with Postfix. Suggested by Big Brother. -zcat $CWD/dcron-$VERSION.diff3.gz | patch -p1 -E --verbose --backup || exit +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Define TMPDIR as /var/spool/cron instead of /tmp +zcat $CWD/defs.h.TMPDIR.diff.gz | patch -p1 || exit 1 + # Fix problem where user creates /var/spool/cron/crontabs/<user>.new # using 'crontab -', exits with control-c, and then crontab refuses to -# overwrite the junk file: -zcat $CWD/dcron-$VERSION.crontab.diff4.gz | patch -p1 -E --verbose --backup || exit -# Dcron reports wrong version: -zcat $CWD/dcron-2.3.3.version.diff.gz | patch -p1 || exit -# Keep dcron from improperly forking in some circumstances. -# Thanks to Henrik Carlqvist for the patch. -zcat $CWD/dcron.fork.diff.gz | patch -p1 -make -strip crond crontab +# overwrite the junk file. It would be better if dcron would wipe +# the junk file in the event it were not closed correctly, but oh well. +zcat $CWD/patches/crontab.c.O_EXCL.diff.gz | patch -p1 || exit 1 + +# Get the directory names under /var/spool/ right in the manpages: +zcat $CWD/dcron.manpage.paths.diff.gz | patch -p1 --verbose || exit 1 + +CFLAGS+="$SLKCFLAGS" make || exit 1 +strip --strip-unneeded crond crontab + +mkdir -p $PKG/usr/{bin,sbin} cat crond > $PKG/usr/sbin/crond cat crontab > $PKG/usr/bin/crontab zcat $CWD/run-parts.gz > $PKG/usr/bin/run-parts +chmod 0755 $PKG/usr/sbin/crond +chmod 4711 $PKG/usr/bin/crontab +chmod 0755 $PKG/usr/bin/run-parts + +mkdir -p $PKG/usr/man/man{1,8} cat crontab.1 | gzip -9c > $PKG/usr/man/man1/crontab.1.gz cat crond.8 | gzip -9c > $PKG/usr/man/man8/crond.8.gz cat $CWD/run-parts.8.gz > $PKG/usr/man/man8/run-parts.8.gz +# Create some other stuff we need +mkdir -p $PKG/etc/cron.{hourly,daily,weekly,monthly} +mkdir -p $PKG/var/spool/cron/crontabs +mkdir -p $PKG/var/spool/cron/cronstamps +chmod 0751 $PKG/var/spool/cron +chmod 0750 $PKG/var/spool/cron/crontabs $PKG/var/spool/cron/cronstamps +zcat $CWD/crontab.root > $PKG/var/spool/cron/crontabs/root.new +chmod 0600 $PKG/var/spool/cron/crontabs/root.new +# dcron will whine about "unable to scan" this directory, so we'll create it +mkdir -p $PKG/etc/cron.d + +mkdir -p $PKG/usr/doc/dcron-$VERSION +cp -a \ + CHANGELOG README \ + extra \ + $PKG/usr/doc/dcron-$VERSION +chown -R root:root $PKG/usr/doc/dcron-$VERSION/* + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -# Build the package: cd $PKG -makepkg -l y -c n $TMP/dcron-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/dcron-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/dcron/dcron.fork.diff b/source/a/dcron/dcron.fork.diff deleted file mode 100644 index b3aefc054..000000000 --- a/source/a/dcron/dcron.fork.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./job.c.orig 2005-09-11 16:36:43.000000000 -0700 -+++ ./job.c 2005-09-11 16:37:51.000000000 -0700 -@@ -51,7 +51,7 @@ - */ - - if (ChangeUser(file->cf_User, 1) < 0) -- return; -+ exit(0); - - if (DebugOpt) - log(5, "Child Running %s\n", line->cl_Shell); diff --git a/source/a/dcron/dcron.manpage.paths.diff b/source/a/dcron/dcron.manpage.paths.diff new file mode 100644 index 000000000..afd9c3d16 --- /dev/null +++ b/source/a/dcron/dcron.manpage.paths.diff @@ -0,0 +1,65 @@ +--- ./crond.8.orig 2010-01-18 09:29:25.000000000 -0600 ++++ ./crond.8 2010-02-11 17:22:36.000000000 -0600 +@@ -17,13 +17,13 @@ + .RE + .TP + .B -c dir +-directory of per-user crontabs (defaults to /var/spool/cron) ++directory of per-user crontabs (defaults to /var/spool/cron/crontabs) + .RS + .RE + .TP + .B -t dir + directory of timestamps for \@freq and FREQ=\&... jobs (defaults to +-/var/spool/cronstamps) ++/var/spool/cron/cronstamps) + .RS + .RE + .TP +@@ -172,7 +172,7 @@ + \f[B]crontab\f[] notifies \f[B]crond\f[] that a user's crontab file + has been modified (or created or deleted) through the + \[lq]cron.update\[rq] file, which resides in the per-user crontabs +-directory (usually /var/spool/cron). ++directory (usually /var/spool/cron/crontabs). + \f[B]crontab\f[] appends the filename of the modified crontab file + to \[lq]cron.update\[rq]; and \f[B]crond\f[] inspects this file to + determine when to reparse or otherwise update its internal list of +@@ -180,7 +180,7 @@ + .PP + Whenever a \[lq]cron.update\[rq] file is seen, \f[B]crond\f[] also + re-reads timestamp files from its timestamp directory (usually +-/var/spool/cronstamps). ++/var/spool/cron/cronstamps). + Normally these will just mirror \f[B]crond\f[]'s own internal + representations, but this mechanism could be used to manually + notify \f[B]crond\f[] that you've externally updated the +@@ -210,7 +210,7 @@ + crontab to /etc/cron.d/foo. + .PP + The superuser has a per-user crontab along with other users. +-It usually resides at /var/spool/cron/root. ++It usually resides at /var/spool/cron/crontabs/root. + .PP + Users can only have a crontab if they have an entry in /etc/passwd; + however they do not need to have login shell privileges. +--- ./crontab.1.orig 2010-01-18 09:29:25.000000000 -0600 ++++ ./crontab.1 2010-02-11 17:23:13.000000000 -0600 +@@ -45,7 +45,7 @@ + different user and/or crontab directory. + .PP + The superuser also has his or her own per-user crontab, saved as +-/var/spool/cron/root. ++/var/spool/cron/crontabs/root. + .PP + Unlike other cron daemons, this crond/crontab package doesn't try + to do everything under the sun. +@@ -117,7 +117,7 @@ + The formats \@hourly, \@daily, \@weekly, \@monthly, and \@yearly + need to update timestamp files when their jobs have been run. + The timestamp files are saved as +-/var/spool/cronstamps/user.jobname. ++/var/spool/cron/cronstamps/user.jobname. + So for all of these formats, the cron command needs a jobname, + given by prefixing the command with \f[B]ID=jobname\f[]. + (This syntax was chosen to maximize the chance that our crontab diff --git a/source/a/dcron/dcron.tmpdir.diff b/source/a/dcron/dcron.tmpdir.diff deleted file mode 100644 index 3946fedeb..000000000 --- a/source/a/dcron/dcron.tmpdir.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- defs.h.orig Mon May 2 10:27:40 1994 -+++ defs.h Sun Apr 4 22:09:00 1999 -@@ -29,7 +29,7 @@ - #define CRONTABS "/var/spool/cron/crontabs" - #endif - #ifndef TMPDIR --#define TMPDIR "/tmp" -+#define TMPDIR "/var/spool/cron" - #endif - #ifndef OPEN_MAX - #define OPEN_MAX 256 diff --git a/source/a/dcron/defs.h.TMPDIR.diff b/source/a/dcron/defs.h.TMPDIR.diff new file mode 100644 index 000000000..6263843b2 --- /dev/null +++ b/source/a/dcron/defs.h.TMPDIR.diff @@ -0,0 +1,11 @@ +--- ./defs.h.orig 2010-01-15 20:17:04.000000000 -0600 ++++ ./defs.h 2010-02-11 16:39:33.000000000 -0600 +@@ -73,7 +73,7 @@ + #define CRONUPDATE "cron.update" + #endif + #ifndef TMPDIR +-#define TMPDIR "/tmp" ++#define TMPDIR "/var/spool/cron" + #endif + + #ifndef SENDMAIL diff --git a/source/a/dcron/doinst.sh b/source/a/dcron/doinst.sh new file mode 100644 index 000000000..ce8dc7f3b --- /dev/null +++ b/source/a/dcron/doinst.sh @@ -0,0 +1,5 @@ +if [ ! -r var/spool/cron/crontabs/root ]; then + mv var/spool/cron/crontabs/root.new var/spool/cron/crontabs/root +else + rm -f var/spool/cron/crontabs/root.new +fi diff --git a/source/a/dcron/run-parts b/source/a/dcron/run-parts index dd6b59b3e..247d8c6e1 100644 --- a/source/a/dcron/run-parts +++ b/source/a/dcron/run-parts @@ -29,7 +29,7 @@ for SCRIPT in $1/* ; do # Determine if this file should be skipped by suffix: SKIP=false for SUFFIX in $IGNORE_SUFFIXES ; do - if [ ! "`basename $SCRIPT $SUFFIX`" = "`basename $SCRIPT`" ]; then + if [ ! "$(basename $SCRIPT $SUFFIX)" = "$(basename $SCRIPT)" ]; then SKIP=true break fi diff --git a/source/a/device-mapper/64-device-mapper.rules b/source/a/device-mapper/64-device-mapper.rules deleted file mode 100644 index 7e9a235db..000000000 --- a/source/a/device-mapper/64-device-mapper.rules +++ /dev/null @@ -1,37 +0,0 @@ -# device mapper links hook into "change" events, when the dm table -# becomes available; some table-types must be ignored - -KERNEL=="device-mapper", NAME="mapper/control" - -KERNEL!="dm-*", GOTO="device_mapper_end" -ACTION!="add|change", GOTO="device_mapper_end" - -# lookup device name -# use dmsetup, until devmap_name is provided by sys-fs/device-mapper -PROGRAM=="/sbin/dmsetup -j %M -m %m --noopencount --noheadings -c -o name info", - ENV{DM_NAME}="%c" - -# do not do anything if dmsetup does not provide a name -ENV{DM_NAME}=="", NAME="", OPTIONS="ignore_device" - -# ignore luks crypt devices while not fully up -ENV{DM_NAME}=="temporary-cryptsetup-*", NAME="", OPTIONS="ignore_device" - -# use queried name -ENV{DM_NAME}=="?*", NAME="mapper/$env{DM_NAME}" - -SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" -SYMLINK+="disk/by-name/$env{DM_NAME}" - -PROGRAM!="/sbin/dmsetup status -j %M -m %m", GOTO="device_mapper_end" -ENV{DM_TYPE}="%c{3}" - -ENV{DM_TYPE}=="|*error*", GOTO="device_mapper_end" - -IMPORT{program}="vol_id --export $tempnode" -OPTIONS="link_priority=50" -ENV{DM_TYPE}=="*snapshot-origin*", OPTIONS="link_priority=60" -ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" -ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" - -LABEL="device_mapper_end" diff --git a/source/a/device-mapper/slack-desc b/source/a/device-mapper/slack-desc deleted file mode 100644 index 2708a39fb..000000000 --- a/source/a/device-mapper/slack-desc +++ /dev/null @@ -1,20 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to -# leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -device-mapper: device-mapper (device-mapper for logical volume management) -device-mapper: -device-mapper: The goal of device-mapper is to support volume management. The -device-mapper: driver enables the definition of new block devices composed of -device-mapper: ranges of sectors of existing devices. This can be used to define -device-mapper: disk partitions or logical volumes. -device-mapper: -device-mapper: device-mapper is required by LVM2, the Logical Volume Manager. -device-mapper: -device-mapper: -device-mapper: - diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index c57cea4f3..c79c29eb7 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.41.8} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo e2fsprogs*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -34,6 +44,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -53,11 +66,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Disable --uuidd builds the same functionality into libuuid.*. -# It's better that way. -# Keep the included libblkid and libuuid for now, but we'll be using the -# system-wide one from util-linux-ng sooner or later... -# fsck.* will also be moving to u-l-ng +# Disable libblkid and libuuid, as we'll be using the ones in u-l-ng CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix= \ @@ -69,8 +78,8 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/e2fsprogs-$VERSION \ --enable-elf-shlibs \ - --enable-libblkid \ - --enable-libuuid \ + --disable-libblkid \ + --disable-libuuid \ --disable-uuidd \ --build=$ARCH-slackware-linux @@ -99,6 +108,7 @@ mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/lib${LIBDIRSUFFIX}/*.so \ ln -sf /lib${LIBDIRSUFFIX}/$(readlink $i) $i ; done ) +# findfs is intentionally left out here - we use the one in util-linux-ng ( cd $PKG/sbin rm -f \ mkfs.ext2 mkfs.ext3 mkfs.ext4 mkfs.ext4dev \ @@ -108,7 +118,6 @@ mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/lib${LIBDIRSUFFIX}/*.so \ ln -sf mke2fs mkfs.ext4 ln -sf mke2fs mkfs.ext4dev ln -sf tune2fs e2label - ln -sf tune2fs findfs cat << EOF > fsck.ext2 #!/bin/sh exec /sbin/e2fsck -C 0 \$* diff --git a/source/a/eject/eject.SlackBuild b/source/a/eject/eject.SlackBuild index 56d1e79fc..c637ef553 100755 --- a/source/a/eject/eject.SlackBuild +++ b/source/a/eject/eject.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,17 @@ PKGNAM=eject VERSION=${VERSION:-2.1.5} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} - +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -39,6 +47,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi cd $TMP @@ -46,6 +56,9 @@ rm -rf ${PKGNAM} tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 cd ${PKGNAM} +# Patch a problem with spaces in the pathname: +zcat $CWD/eject.spaces.diff.gz | patch -p0 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/a/eject/eject.spaces.diff b/source/a/eject/eject.spaces.diff new file mode 100644 index 000000000..2935b24bb --- /dev/null +++ b/source/a/eject/eject.spaces.diff @@ -0,0 +1,51 @@ +--- eject.c 15 Jul 2006 23:28:28 -0000 1.10 ++++ eject.c 2007-02-14 13:57:52.000000000 +0100 +@@ -379,6 +379,30 @@ static int FileExists(const char *name, + + + /* ++ * Linux mangles spaces in mount points by changing them to an octal string ++ * of '\040'. So lets scan the mount point and fix it up by replacing all ++ * occurrences off '\0##' with the ASCII value of 0##. Requires a writable ++ * string as input as we mangle in place. Some of this was taken from the ++ * util-linux package. ++ */ ++#define octalify(a) ((a) & 7) ++#define tooctal(s) (64*octalify(s[1]) + 8*octalify(s[2]) + octalify(s[3])) ++#define isoctal(a) (((a) & ~7) == '0') ++static char *DeMangleMount(char *s) ++{ ++ char *tmp = s; ++ while ((tmp = strchr(tmp, '\\')) != NULL) { ++ if (tmp[1] == '0' && isoctal(tmp[2]) && isoctal(tmp[3])) { ++ tmp[0] = tooctal(tmp); ++ memmove(tmp+1, tmp+4, strlen(tmp)-3); ++ } ++ ++tmp; ++ } ++ return s; ++} ++ ++ ++/* + * Given name, such as foo, see if any of the following exist: + * + * foo (if foo starts with '.' or '/') +@@ -890,6 +914,8 @@ static int MountedDevice(const char *nam + if (rc >= 2) { + int mtabmaj, mtabmin; + GetMajorMinor(s1, &mtabmaj, &mtabmin); ++ DeMangleMount(s1); ++ DeMangleMount(s2); + if (((strcmp(s1, name) == 0) || (strcmp(s2, name) == 0)) || + ((maj != -1) && (maj == mtabmaj) && (min == mtabmin))) { + FCLOSE(fp); +@@ -935,6 +961,8 @@ static int MountableDevice(const char *n + + while (fgets(line, sizeof(line), fp) != 0) { + rc = sscanf(line, "%1023s %1023s", s1, s2); ++ DeMangleMount(s1); ++ DeMangleMount(s2); + if (rc >= 2 && s1[0] != '#' && strcmp(s2, name) == 0) { + FCLOSE(fp); + *deviceName = strdup(s1); diff --git a/source/a/elvis/elvis.SlackBuild b/source/a/elvis/elvis.SlackBuild index 3bb83ba70..14f3cc926 100755 --- a/source/a/elvis/elvis.SlackBuild +++ b/source/a/elvis/elvis.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,18 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=2.2_0 -ARCH=${ARCH:-x86_64} BUILD=${BUILD:-2} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-elvis @@ -34,6 +43,11 @@ cd $TMP rm -rf elvis-$VERSION tar xjvf $CWD/elvis-$VERSION.tar.bz2 cd elvis-$VERSION + +# Fix redefined getline() with glibc > 2.9 by changing the +# local function to elv_getline(): +zcat $CWD/elvis.ref.c.getline.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . # Time for a kludge (i.e. don't suggest this kind of thing be # done as a rule... I don't know why I'm crazy today). diff --git a/source/a/elvis/elvis.ref.c.getline.diff b/source/a/elvis/elvis.ref.c.getline.diff new file mode 100644 index 000000000..957c2d231 --- /dev/null +++ b/source/a/elvis/elvis.ref.c.getline.diff @@ -0,0 +1,47 @@ +--- ./ref.c.orig 2003-10-20 21:32:25.000000000 -0500 ++++ ./ref.c 2010-01-27 12:27:06.000000000 -0600 +@@ -42,7 +42,7 @@ + + #if USE_PROTOTYPES + static void usage(char *argv0); +-static char *getline(FILE *fp); ++static char *elv_getline(FILE *fp); + static void store(char *line, char **list); + static LINECLS classify(char *line, LINECLS prev); + static void lookup(TAG *tag); +@@ -171,7 +171,7 @@ + /* This function reads a single line, and replaces the terminating newline with + * a '\0' byte. The string will be in a static buffer. Returns NULL at EOF. + */ +-static char *getline(fp) ++static char *elv_getline(fp) + FILE *fp; + { + int ch; +@@ -348,7 +348,7 @@ + } + + /* for each line... */ +- for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++) ++ for (lnum = 1, lc = LC_COMPLETE; (line = elv_getline(fp)) != NULL; lnum++) + { + /* is this the tag definition? */ + if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len)) +@@ -377,7 +377,7 @@ + { + if (strchr(line, '(') != NULL) + { +- while ((line = getline(fp)) != NULL ++ while ((line = elv_getline(fp)) != NULL + && *line + && ((*line != '#' && *line != '{') + || line[strlen(line) - 1] == '\\')) +@@ -387,7 +387,7 @@ + } + else if ((lc = classify(line, lc)) == LC_PARTIAL) + { +- while ((line = getline(fp)) != NULL ++ while ((line = elv_getline(fp)) != NULL + && (lc = classify(line, lc)) == LC_PARTIAL) + { + puts(line); diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild index 6c708883b..d4508f2b5 100755 --- a/source/a/etc/etc.SlackBuild +++ b/source/a/etc/etc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,18 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=13.0 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=13.013 +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild index aaa0ca41f..04c47856b 100755 --- a/source/a/file/file.SlackBuild +++ b/source/a/file/file.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,12 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=5.03 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -35,24 +44,21 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-file + rm -rf $PKG mkdir -p $TMP $PKG - cd $TMP rm -rf file-$VERSION tar xvf $CWD/file-$VERSION.tar.?z* || exit 1 cd file-$VERSION || exit 1 - -# Make the default data directory /etc/file like it has always been: -zcat $CWD/file.etc.file.diff.gz | patch -p1 --verbose || exit 1 -# This is needed after the patch above: -autoreconf || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -60,6 +66,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Make the default data directory /etc/file like it has always been: +zcat $CWD/file.etc.file.diff.gz | patch -p1 --verbose || exit 1 +# This is needed after the patch above: +autoreconf || exit 1 + # Don't spew warnings about using the flat text files zcat $CWD/file.quiet.diff.gz | patch -p1 -E --verbose || exit 1 # I don't know what this one does @@ -82,9 +93,16 @@ CFLAGS="$SLKCFLAGS" \ --disable-static \ --build=$ARCH-slackware-linux +# The generated $TMP/file-$VERSION/libtool is buggy. I don't know if this is supposed +# to work, but it certainly does, so... :-) +cat $(which libtool) > libtool + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Seems --disable-static has been ignored lately: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libmagic.a + # Is file really this much of a processing bottleneck? Doubtful. # # NOTE: Benchmarked flat files vs. .mgc June 2009, found no measurable diff --git a/source/a/gawk/gawk.SlackBuild b/source/a/gawk/gawk.SlackBuild index e65e5aaf7..157f7ce9b 100755 --- a/source/a/gawk/gawk.SlackBuild +++ b/source/a/gawk/gawk.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,22 +20,34 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.1.6 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=gawk +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j6} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-gawk -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" -elif [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi rm -rf $PKG @@ -43,57 +55,82 @@ mkdir -p $TMP $PKG cd $TMP rm -rf gawk-$VERSION -tar xjvf $CWD/gawk-$VERSION.tar.bz2 +tar xvf $CWD/gawk-$VERSION.tar.xz cd gawk-$VERSION chown -R root:root . + +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --mandir=/usr/man \ --infodir=/usr/info \ - $ARCH-slackware-linux + --build=$ARCH-slackware-linux -make -j3 || exit 1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) + ( cd $PKG/usr/bin ln -sf gawk-$VERSION gawk ln -sf pgawk-$VERSION pgawk ) + mkdir -p $PKG/bin mv $PKG/usr/bin/gawk* $PKG/bin mv $PKG/usr/bin/awk $PKG/bin + ( cd $PKG/usr/bin ln -sf ../../bin/awk . ln -sf ../../bin/gawk . ln -sf ../../bin/gawk-$VERSION . ) + ( cd $PKG/usr/info rm dir gzip -9 * ) + ( cd $PKG/usr/man/man1 rm -f pgawk.1 gzip -9 * ln -sf gawk.1.gz awk.1.gz ln -sf gawk.1.gz pgawk.1.gz ) + mkdir -p $PKG/usr/doc/gawk-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING FUTURES INSTALL LIMITATIONS NEWS POSIX.STD \ - PROBLEMS README README_d \ + ABOUT-NLS AUTHORS COPYING* FUTURES INSTALL LIMITATIONS NEWS POSIX.STD \ + PROBLEMS README* \ $PKG/usr/doc/gawk-$VERSION -find $PKG/usr/doc/gawk-$VERSION -type d -exec chmod 755 {} \; -find $PKG/usr/doc/gawk-$VERSION -type f -exec chmod 644 {} \; + +# We don't need to run the GPL: +chmod 644 $PKG/usr/doc/gawk-$VERSION/COPYING* + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg -l y -c n $TMP/gawk-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/gawk-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild index 945032c69..134066195 100755 --- a/source/a/gettext/gettext-tools.SlackBuild +++ b/source/a/gettext/gettext-tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2008 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,17 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.17 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -40,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild index bdc269c50..89de611ef 100755 --- a/source/a/gettext/gettext.SlackBuild +++ b/source/a/gettext/gettext.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,17 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=0.17 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -40,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild index c2719ebd3..d5133fd5b 100755 --- a/source/a/gzip/gzip.SlackBuild +++ b/source/a/gzip/gzip.SlackBuild @@ -1,5 +1,6 @@ #!/bin/sh -# Copyright 2006-2009 Patrick J. Volkerding, Sebeka, MN, USA + +# Copyright 2006-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=gzip -VERSION=${VERSION:-1.3.12} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-1.4} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j6} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -36,6 +48,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi rm -rf $PKG @@ -43,7 +57,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION # Make sure ownerships and permissions are sane: @@ -68,7 +82,7 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux # Build and install: -make -j4 || exit 1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # The ncompress package already has this: @@ -76,8 +90,10 @@ rm -f $PKG/bin/uncompress # Strip binaries: ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) # Fix locations: @@ -138,9 +154,17 @@ cp -a \ AUTHORS COPYING INSTALL NEWS README README-alpha THANKS TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $TMP/package-${PKGNAM} -makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.tgz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.tgz diff --git a/source/a/hdparm/hdparm.SlackBuild b/source/a/hdparm/hdparm.SlackBuild index 293b1cf87..fbb2a2f71 100755 --- a/source/a/hdparm/hdparm.SlackBuild +++ b/source/a/hdparm/hdparm.SlackBuild @@ -20,7 +20,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-9.3} +VERSION=${VERSION:-9.27} ARCH=${ARCH:-x86_64} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} diff --git a/source/a/inotify-tools/inotify-tools.SlackBuild b/source/a/inotify-tools/inotify-tools.SlackBuild index 82e807fce..c115b4e04 100755 --- a/source/a/inotify-tools/inotify-tools.SlackBuild +++ b/source/a/inotify-tools/inotify-tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=inotify-tools -VERSION=${VERSION:-3.13} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -40,11 +49,14 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION # Make sure ownerships and permissions are sane: @@ -95,13 +107,20 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION} cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ + AUTHORS COPYING* INSTALL NEWS README* \ $PKG/usr/doc/${PKGNAM}-${VERSION} # Get rid of html api documentation: rm -rf $PKG/usr/doc/${PKGNAM}-${VERSION}/html +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install -#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/source/a/kbd/kbd.SlackBuild b/source/a/kbd/kbd.SlackBuild index 7ac0b142f..ddcd96703 100755 --- a/source/a/kbd/kbd.SlackBuild +++ b/source/a/kbd/kbd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,18 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=kbd -VERSION=1.15 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +VERSION=1.15.2 +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:--j4} @@ -40,7 +49,7 @@ cd $TMP # Extract source: rm -rf $PKGNAM-$VERSION -tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.bz2 +tar xvf $CWD/sources/$PKGNAM-$VERSION.tar.bz2 || exit 1 cd $PKGNAM-$VERSION # Make sure ownerships and permissions are sane: @@ -59,12 +68,10 @@ find . -perm 555 -exec chmod 755 {} \; # Apply patches: # These are taken from Fedora's SRPM: -zcat $CWD/sources/kbd-1.15-po.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/sources/kbd-1.15.2-po.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/sources/kbd-1.15-keycodes-man.patch | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-sparc.patch | patch -p1 --verbose || exit 1 zcat $CWD/sources/kbd-1.15-unicode_start.patch | patch -p1 --verbose || exit 1 zcat $CWD/sources/kbd-1.15-resizecon-x86_64.patch | patch -p1 --verbose || exit 1 -zcat $CWD/sources/kbd-1.15-quiet_doc.patch | patch -p1 --verbose || exit 1 # This is from Fedora's spec file: # 7-bit maps are obsolete; so are non-euro maps @@ -122,10 +129,18 @@ install -vpm755 $CWD/setconsolefont $PKG/usr/bin/ # Copy docs: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ChangeLog COPYING README doc/* \ + COPYING* README* doc/* \ $PKG/usr/doc/$PKGNAM-$VERSION rm -f $PKG/usr/doc/$PKGNAM-$VERSION/kbd.FAQ.sgml +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + # Additional keymaps: # This is the keymap for Speakup (http://linux-speakup.org) users: cat $CWD/sources/speakupmap.map.gz > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakupmap.map.gz @@ -136,7 +151,9 @@ tar xvf $CWD/sources/speakup-jfw.tar.gz cat readme > $PKG/usr/share/kbd/keymaps/i386/qwerty/speakup-jfw.readme ) # Create the default run control script which will set the -# console font to the default: +# console font to the "default"... though this might not be +# the same state as if setfont were not used at all. +# For that reason, default the script to non-executable. mkdir -pm755 $PKG/etc/rc.d cat << EOF > $PKG/etc/rc.d/rc.font.new #!/bin/sh @@ -146,16 +163,38 @@ cat << EOF > $PKG/etc/rc.d/rc.font.new # setfont -v EOF -chmod 755 $PKG/etc/rc.d/rc.font.new +chmod 644 $PKG/etc/rc.d/rc.font.new # Create package post-install script: mkdir -p $PKG/install cat << EOF > $PKG/install/doinst.sh -#if [ -r etc/rc.d/rc.font ]; then -# rm -f etc/rc.d/rc.font.new -#else -# mv etc/rc.d/rc.font.new etc/rc.d/rc.font -#fi + +config() { + NEW="\$1" + OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r \$OLD ]; then + mv \$NEW \$OLD + elif [ "\$(cat \$OLD | md5sum)" = "\$(cat \$NEW | md5sum)" ]; then + # toss the redundant copy + rm \$NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +# Leave any new rc.font with the same permissions as the old one: +# This is a kludge, but it's because there's no --reference option +# on busybox's 'chmod': +if [ -e etc/rc.d/rc.font ]; then + if [ -x etc/rc.d/rc.font ]; then + chmod 755 etc/rc.d/rc.font.new + else + chmod 644 etc/rc.d/rc.font.new + fi +fi +# Then config() it: +config etc/rc.d/rc.font.new + EOF # Compress man pages: diff --git a/source/a/kbd/setconsolefont b/source/a/kbd/setconsolefont index d4cfb875a..fe56a34f6 100644 --- a/source/a/kbd/setconsolefont +++ b/source/a/kbd/setconsolefont @@ -5,6 +5,8 @@ # Run 'setfont' in a chroot. This makes setfont work # correctly in the installer. +# 2010-04-28, add LatKaCyrHeb-14.psfu.gz <volkerdi> + if [ "$TMP" = "" ]; then TMP=/var/log/setup/tmp fi @@ -78,6 +80,7 @@ screen font. You'll be able to try as many of these as you like." 21 65 12 \ "LatArCyrHeb-16+.psfu.gz" "" \ "LatArCyrHeb-16.psfu.gz" "" \ "LatArCyrHeb-19.psfu.gz" "" \ +"LatKaCyrHeb-14.psfu.gz" "" \ "Mik_8x16.gz" "" \ "UniCyrExt_8x16.psf.gz" "" \ "UniCyr_8x14.psf.gz" "" \ @@ -296,7 +299,8 @@ Cyr_a8x14.psfu.gz Cyr_a8x16.psfu.gz Cyr_a8x8.psfu.gz Goha-12.psfu.gz Goha-14.psfu.gz Goha-16.psfu.gz GohaClassic-12.psfu.gz GohaClassic-14.psfu.gz GohaClassic-16.psfu.gz Lat2-Terminus16.psfu.gz LatArCyrHeb-08.psfu.gz LatArCyrHeb-14.psfu.gz LatArCyrHeb-16+.psfu.gz LatArCyrHeb-16.psfu.gz -LatArCyrHeb-19.psfu.gz Mik_8x16.gz UniCyrExt_8x16.psf.gz UniCyr_8x14.psf.gz +LatArCyrHeb-19.psfu.gz LatKaCyrHeb-14.psfu.gz +Mik_8x16.gz UniCyrExt_8x16.psf.gz UniCyr_8x14.psf.gz UniCyr_8x16.psf.gz UniCyr_8x8.psf.gz alt-8x14.gz alt-8x16.gz alt-8x8.gz altc-8x16.gz aply16.psf.gz arm8.fnt.gz b.fnt.gz c.fnt.gz cp1250.psfu.gz cp850-8x14.psfu.gz cp850-8x16.psfu.gz cp850-8x8.psfu.gz cp857.08.gz cp857.14.gz diff --git a/source/a/kbd/sources/kbd-1.15-po.patch b/source/a/kbd/sources/kbd-1.15-po.patch deleted file mode 100644 index 0221f60c9..000000000 --- a/source/a/kbd/sources/kbd-1.15-po.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up kbd-1.15/po/Makefile.in_old kbd-1.15/po/Makefile.in ---- kbd-1.15/po/Makefile.in_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/po/Makefile.in 2008-12-09 15:35:58.000000000 +0100 -@@ -4,10 +4,10 @@ srcdir = @srcdir@ - - prefix = @prefix@ - datarootdir = @datarootdir@ --datadir = @datadir@ --localedir = $(DESTDIR)$(datadir)/locale --gnulocaledir = $(DESTDIR)$(datadir)/locale --gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po -+datadir = $(DESTDIR)@datadir@ -+localedir = $(DESTDIR)@localedir@ -+gnulocaledir = $(DESTDIR)@localedir@ -+gettextsrcdir = $(datadir)/gettext/po - - FOREIGN = @FOREIGN@ - HAVE_XGETTEXT = @HAVE_XGETTEXT@ -@@ -36,10 +36,10 @@ INCLUDES = -I.. -I$(INTL) - COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - - # Enter here all .po files --POFILES = cs.po da.po de.po el.po es.po fr.po gr.po nl.po pl.po \ -+POFILES = cs.po da.po de.po el.po es.po fr.po nl.po pl.po \ - ro.po ru.po sv.po tr.po - # the same but with .gmo --GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo gr.gmo nl.gmo \ -+GMOFILES = cs.gmo da.gmo de.gmo el.gmo es.gmo fr.gmo nl.gmo \ - pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo - - CATALOGS = $(GMOFILES) diff --git a/source/a/kbd/sources/kbd-1.15-quiet_doc.patch b/source/a/kbd/sources/kbd-1.15-quiet_doc.patch deleted file mode 100644 index eca867b85..000000000 --- a/source/a/kbd/sources/kbd-1.15-quiet_doc.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up kbd-1.15/man/man1/loadkeys.1.in_old kbd-1.15/man/man1/loadkeys.1.in ---- kbd-1.15/man/man1/loadkeys.1.in_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/man/man1/loadkeys.1.in 2009-03-05 13:11:08.000000000 +0100 -@@ -19,6 +19,8 @@ loadkeys \- load keyboard translation ta - ] [ - .I -m --mktable - ] [ -+.I -q --quiet -+] [ - .I -s --clearstrings - ] [ - .I -v --verbose -@@ -148,6 +150,10 @@ command (and does not modify the current - .B loadkeys - prints its version number and a short usage message to the programs - standard error output and exits. -+.TP -+.B \-q \-\-quiet -+.B loadkeys -+suppresses all normal output. - .SH WARNING - Note that anyone having read access to - .B /dev/console -diff -up kbd-1.15/src/loadkeys.c_old kbd-1.15/src/loadkeys.c ---- kbd-1.15/src/loadkeys.c_old 2008-10-23 21:03:59.000000000 +0200 -+++ kbd-1.15/src/loadkeys.c 2009-03-05 13:09:00.000000000 +0100 -@@ -1966,6 +1966,7 @@ usage(void) { - " -d --default load \"%s\"\n" - " -h --help display this help text\n" - " -m --mktable output a \"defkeymap.c\" to stdout\n" -+" -q --quiet suppress all normal output\n" - " -s --clearstrings clear kernel string table\n" - " -u --unicode implicit conversion to Unicode\n" - " -v --verbose report the changes\n"), PACKAGE_VERSION, DEFMAP); diff --git a/source/a/kbd/sources/kbd-1.15-sparc.patch b/source/a/kbd/sources/kbd-1.15-sparc.patch deleted file mode 100644 index a858a253a..000000000 --- a/source/a/kbd/sources/kbd-1.15-sparc.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -up kbd-1.15/man/man8/kbdrate.8_old kbd-1.15/man/man8/kbdrate.8 ---- kbd-1.15/man/man8/kbdrate.8_old 2008-12-10 14:20:33.000000000 +0100 -+++ kbd-1.15/man/man8/kbdrate.8 2008-12-10 14:41:10.000000000 +0100 -@@ -22,7 +22,7 @@ Using - without any options will reset the repeat rate to 10.9 characters per second (cps) - and the delay to 250 milliseconds (ms) for Intel- and M68K-based systems. - These are the IBM defaults. On SPARC-based systems it will reset the repeat rate --to 5 cps and the delay to 200 ms. -+to 20 cps and the delay to 200 ms. - - .SH OPTIONS - .TP -@@ -69,3 +69,5 @@ When these ioctls fail an ioport interfa - .I /etc/rc.local - .br - .I /dev/port -+.br -+.I /dev/kbd -diff -up kbd-1.15/src/kbdrate.c_old kbd-1.15/src/kbdrate.c ---- kbd-1.15/src/kbdrate.c_old 2008-12-10 14:00:25.000000000 +0100 -+++ kbd-1.15/src/kbdrate.c 2008-12-10 14:20:11.000000000 +0100 -@@ -77,7 +77,6 @@ beats rebuilding the kernel! - - #ifdef __sparc__ - #include <asm/param.h> --#include <asm/kbio.h> - #endif - - #ifndef KDKBDREP -@@ -109,11 +108,15 @@ static int valid_delays[] = { 250, 500, - - static int - KDKBDREP_ioctl_ok(double rate, int delay, int silent) { -+#if defined(KDKBDREP) && !defined(__sparc__) - /* - * This ioctl is defined in <linux/kd.h> but is not - * implemented anywhere - must be in some m68k patches. -+ * We cannot blindly try unimplemented ioctls on sparc64 - -+ * the 32<->64bit transition layer does not like it. - * Since 2.4.9 also on i386. -- */ -+ */ -+ - struct my_kbd_repeat kbdrep_s; - - /* don't change, just test */ -@@ -177,6 +180,9 @@ KDKBDREP_ioctl_ok(double rate, int delay - rate, kbdrep_s.delay ); - - return 1; /* success! */ -+#else /* no KDKBDREP or __sparc__ */ -+ return 0; -+#endif /* KDKBDREP */ - } - - static int -@@ -221,7 +227,7 @@ sigalrmhandler( int sig ) { - int - main( int argc, char **argv ) { - #ifdef __sparc__ -- double rate = 5.0; /* Default rate */ -+ double rate = 20.0; /* Default rate */ - int delay = 200; /* Default delay */ - #else - double rate = 10.9; /* Default rate */ -@@ -272,7 +278,9 @@ main( int argc, char **argv ) { - - - /* The ioport way */ -+ /* The ioport way - will crash on sparc */ - -+#ifndef __sparc__ - for (i = 0; i < RATE_COUNT; i++) - if (rate * 10 >= valid_rates[i]) { - value &= 0x60; -@@ -335,5 +343,7 @@ main( int argc, char **argv ) { - valid_rates[value & 0x1f] / 10.0, - valid_delays[ (value & 0x60) >> 5 ] ); - -+#endif -+ - return 0; - } -diff -up kbd-1.15/src/setleds.c_old kbd-1.15/src/setleds.c ---- kbd-1.15/src/setleds.c_old 2008-12-10 14:00:02.000000000 +0100 -+++ kbd-1.15/src/setleds.c 2008-12-10 14:00:16.000000000 +0100 -@@ -14,10 +14,6 @@ - #include "nls.h" - #include "version.h" - --#ifdef __sparc__ --#include <asm/kbio.h> --#endif -- - static void - usage(void) - { diff --git a/source/a/kbd/sources/kbd-1.15.2-po.patch b/source/a/kbd/sources/kbd-1.15.2-po.patch new file mode 100644 index 000000000..a32a793f4 --- /dev/null +++ b/source/a/kbd/sources/kbd-1.15.2-po.patch @@ -0,0 +1,14 @@ +--- ./po/Makefile.in.in.orig 2010-04-10 16:34:12.000000000 -0500 ++++ ./po/Makefile.in.in 2010-04-29 00:19:10.000000000 -0500 +@@ -22,8 +22,9 @@ + + prefix = @prefix@ + exec_prefix = @exec_prefix@ +-datadir = @datadir@ +-localedir = $(datadir)/locale ++datadir = @datadir@ ++localedir = @localedir@ ++gnulocaledir = @localedir@ + gettextsrcdir = $(datadir)/gettext/po + + INSTALL = @INSTALL@ diff --git a/source/a/udev/udev-141.tar.bz2.sign b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign index a30826919..39f3c0228 100644 --- a/source/a/udev/udev-141.tar.bz2.sign +++ b/source/a/kbd/sources/kbd-1.15.2.tar.bz2.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBJ3TgkyGugalF9Dw4RAtJCAJ4+ns9bz4ZIu+3ecfra/BWrn3euqwCeOFQZ -6A7UqbHlTlD48sOk249ZATA= -=AY1A +iD8DBQBLwPHZyGugalF9Dw4RAhiyAJ9DdLbizzsoJi87OjQ8VzyNsRnr2QCeJ9zg +MOKY0UbkCZyUALLyzxF2bKE= +=Ou46 -----END PGP SIGNATURE----- diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild index 643359571..49a15eed4 100755 --- a/source/a/less/less.SlackBuild +++ b/source/a/less/less.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,19 +21,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-less +VERSION=${VERSION:-$(echo less-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} -VERSION=${VERSION:-418} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" -elif [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -45,14 +48,20 @@ elif [ "$ARCH" = "arm" ]; then elif [ "$ARCH" = "armel" ]; then SLKCFLAGS="-O2 -march=armv4t" LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-less rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf less-$VERSION -tar xvf $CWD/less-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/less-$VERSION.tar.?z* || exit 1 cd less-$VERSION zcat $CWD/less.sysconfdir.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/a/less/lesspipe.sh b/source/a/less/lesspipe.sh index 2d660522d..7850a488f 100644 --- a/source/a/less/lesspipe.sh +++ b/source/a/less/lesspipe.sh @@ -45,6 +45,7 @@ lesspipe() { *.1.gz|*.2.gz|*.3.gz|*.4.gz|*.5.gz|*.6.gz|*.7.gz|*.8.gz|*.9.gz|*.n.gz|*.man.gz) # compressed *roff src? if gzip -dc "$1" | file - | grep roff 1> /dev/null ; then gzip -dc "$1" | nroff -S -mandoc - + else gzip -dc "$1" 2>/dev/null fi ;; *.1.bz2|*.2.bz2|*.3.bz2|*.4.bz2|*.5.bz2|*.6.bz2|*.7.bz2|*.8.bz2|*.9.bz2|*.n.bz2|*.man.bz2) # compressed *roff src? if bzip2 -dc "$1" | file - | grep roff 1> /dev/null ; then diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild index 197f33843..e33c8778b 100755 --- a/source/a/lilo/lilo.SlackBuild +++ b/source/a/lilo/lilo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,17 @@ VERSION=${VERSION:-22.8} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-14} +BUILD=${BUILD:-15} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -38,6 +47,9 @@ tar xvf $CWD/lilo-$VERSION.src.tar.gz || exit 1 cd lilo-$VERSION chown -R root:root . +# This is needed for LVM+udev+devtmpfs +zcat $CWD/lilo.use_major_minor_instead_lvm_name.diff.gz | patch -p1 --verbose || exit 1 + make || exit 1 make install ROOT=$PKG diff --git a/source/a/lilo/lilo.use_major_minor_instead_lvm_name.diff b/source/a/lilo/lilo.use_major_minor_instead_lvm_name.diff new file mode 100644 index 000000000..860347ebb --- /dev/null +++ b/source/a/lilo/lilo.use_major_minor_instead_lvm_name.diff @@ -0,0 +1,47 @@ +--- lilo-22.8/geometry.c 2006-12-17 01:46:17.000000000 -0200 ++++ lilo-22.8-new/geometry.c 2009-12-18 02:09:54.000000000 -0200 +@@ -903,24 +903,17 @@ + void *next = NULL; + char dmdev[PATH_MAX+1]; + char buf[PATH_MAX+1]; +- char *slash; + int result; + + dev_open(&dev, device, -1); + strncpy(dmdev, dev.name, PATH_MAX); + dmdev[PATH_MAX] = 0; ++ + do { + memset(buf, 0, PATH_MAX + 1); + if ((result = readlink(dmdev, buf, PATH_MAX)) < 0 && errno != EINVAL) + die("device-mapper: readlink(\"%s\") failed with: %s",buf, + strerror(errno)); +- if (result >= 0) { +- if (buf[0] != '/' && (slash = strrchr(dmdev, '/')) != NULL) +- slash++; +- else +- slash = dmdev; +- strncpy(slash, buf, PATH_MAX - (slash-dmdev)); +- } + if (realpath(dmdev, buf) == NULL) + die("device-mapper: realpath(\"%s\") failed with: %s",dmdev, + strerror(errno)); +@@ -930,13 +923,11 @@ + + if (!(dmt = dm_task_create(DM_DEVICE_TABLE))) + die("device-mapper: dm_task_create(DM_DEVICE_TABLE) failed"); +- slash = strrchr(dmdev, '/'); +- if (slash) +- slash++; +- else +- slash = dmdev; +- if (!dm_task_set_name(dmt, slash)) +- die("device-mapper: dm_task_set_name(\"%s\") failed",dmdev); ++ // Using device name is flawed. Better to use device major and minor ++ if (!dm_task_set_major(dmt, MAJOR(device))) ++ die("device-mapper: dm_task_set_major(DM_DEVICE_TABLE) failed"); ++ if (!dm_task_set_minor(dmt, MINOR(device))) ++ die("device-mapper: dm_task_set_minor(DM_DEVICE_TABLE) failed"); + if (!dm_task_run(dmt)) + die("device-mapper: dm_task_run(DM_DEVICE_TABLE) failed"); + diff --git a/source/a/lilo/slack.bmp b/source/a/lilo/slack.bmp Binary files differindex 3dd5652a8..229299163 100644 --- a/source/a/lilo/slack.bmp +++ b/source/a/lilo/slack.bmp diff --git a/source/a/logrotate/doinst.sh b/source/a/logrotate/doinst.sh new file mode 100644 index 000000000..ea006ffac --- /dev/null +++ b/source/a/logrotate/doinst.sh @@ -0,0 +1,13 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config etc/logrotate.conf.new + diff --git a/source/a/logrotate/logrotate.SlackBuild b/source/a/logrotate/logrotate.SlackBuild index 6b6284b7c..76cc34abe 100755 --- a/source/a/logrotate/logrotate.SlackBuild +++ b/source/a/logrotate/logrotate.SlackBuild @@ -20,25 +20,42 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -VERSION=${VERSION:-3.7.4} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-3.7.8} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-logrotate +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + rm -rf $PKG mkdir -p $TMP $PKG - -# Explode the package framework: -cd $PKG -explodepkg $CWD/_logrotate.tar.gz - cd $TMP rm -rf logrotate-$VERSION -tar xzvf $CWD/logrotate-$VERSION.tar.gz +tar xvf $CWD/logrotate-$VERSION.tar.?z* || exit 1 cd logrotate-$VERSION chown -R root:root . find . \ @@ -47,25 +64,43 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/logrotate.slackware.diff.gz | patch -p1 +# Fixup a few things: +zcat $CWD/logrotate.slackware.diff.gz | patch -p1 || exit 1 + make clean -make || exit 1 +make EXTRA_CFLAGS="$SLKCFLAGS" || exit 1 strip logrotate + +mkdir -p $PKG/usr/sbin cat logrotate > $PKG/usr/sbin/logrotate +chmod 0755 $PKG/usr/sbin/logrotate + +mkdir -p $PKG/usr/man/man8 cat logrotate.8 | gzip -9c > $PKG/usr/man/man8/logrotate.8.gz + +# Create the logrotate.d directory and install the config file +mkdir -p $PKG/etc/logrotate.d +zcat $CWD/logrotate.conf.gz > $PKG/etc/logrotate.conf.new + +# Make logrotate run from cron every day +mkdir -p $PKG/etc/cron.daily +zcat $CWD/logrotate.cron.gz > $PKG/etc/cron.daily/logrotate +chmod 0755 $PKG/etc/cron.daily/logrotate + +# Create the state directory +mkdir -p $PKG/var/lib/logrotate + mkdir -p $PKG/usr/doc/logrotate-$VERSION cp -a \ CHANGES COPYING READM* \ - $PKG/usr/doc/logrotate-$VERSION + $PKG/usr/doc/logrotate-$VERSION + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# Build the package: +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + cd $PKG -makepkg -l y -c n $TMP/logrotate-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/logrotate-$VERSION-$ARCH-$BUILD.txz -# Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/logrotate-$VERSION - rm -rf $PKG -fi diff --git a/source/a/logrotate/logrotate.conf b/source/a/logrotate/logrotate.conf new file mode 100644 index 000000000..27b03e134 --- /dev/null +++ b/source/a/logrotate/logrotate.conf @@ -0,0 +1,50 @@ +# /etc/logrotate.conf +# +# logrotate is designed to ease administration of systems that generate large +# numbers of log files. It allows automatic rotation, compression, removal, and +# mailing of log files. Each log file may be handled daily, weekly, monthly, or +# when it grows too large. +# +# logrotate is normally run daily from root's crontab. +# +# For more details, see "man logrotate". + +# rotate log files weekly: +weekly + +# keep 4 weeks worth of backlogs: +rotate 4 + +# create new (empty) log files after rotating old ones: +create + +# uncomment if you want to use the date as a suffix of the rotated file +#dateext + +# uncomment this if you want your log files compressed: +#compress + +# some packages install log rotation information in this directory: +include /etc/logrotate.d + +# Rotate /var/log/wtmp: +/var/log/wtmp { + monthly + create 0664 root utmp + minsize 1M + rotate 1 +} + +# Rotate /var/log/btmp: +/var/log/btmp { + monthly + create 0600 root root + rotate 1 +} + +# Note that /var/log/lastlog is not rotated. This is intentional, and it should +# not be. The lastlog file is a database, and is also a sparse file that takes +# up much less space on the drive than it appears. + +# system-specific logs may be also be configured below: + diff --git a/source/a/logrotate/logrotate.cron b/source/a/logrotate/logrotate.cron new file mode 100644 index 000000000..f91b3adda --- /dev/null +++ b/source/a/logrotate/logrotate.cron @@ -0,0 +1,3 @@ +#!/bin/sh +/usr/sbin/logrotate /etc/logrotate.conf +[ $? != 0 ] && /usr/bin/logger -t logrotate "ALERT - exited abnormally." diff --git a/source/a/logrotate/logrotate.slackware.diff b/source/a/logrotate/logrotate.slackware.diff index 77b8aad6b..e9126cee3 100644 --- a/source/a/logrotate/logrotate.slackware.diff +++ b/source/a/logrotate/logrotate.slackware.diff @@ -1,44 +1,55 @@ -diff -u -r --new-file logrotate-3.7.4.orig/config.c logrotate-3.7.4/config.c ---- logrotate-3.7.4.orig/config.c 2006-07-24 07:08:04.000000000 -0500 -+++ logrotate-3.7.4/config.c 2006-09-21 01:07:50.000000000 -0500 -@@ -29,7 +29,7 @@ +diff -Nur logrotate-3.7.8.orig/Makefile logrotate-3.7.8/Makefile +--- logrotate-3.7.8.orig/Makefile 2008-05-19 05:25:54.000000000 -0500 ++++ logrotate-3.7.8/Makefile 2009-05-09 23:25:12.060201375 -0500 +@@ -1,7 +1,7 @@ + VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec) + OS_NAME = $(shell uname -s) + LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) +-CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) ++CFLAGS = -Wall $(EXTRA_CFLAGS) -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) + PROG = logrotate + MAN = logrotate.8 + LOADLIBES = -lpopt +diff -Nur logrotate-3.7.8.orig/config.c logrotate-3.7.8/config.c +--- logrotate-3.7.8.orig/config.c 2008-06-02 05:26:14.000000000 -0500 ++++ logrotate-3.7.8/config.c 2009-05-09 23:53:36.748287318 -0500 +@@ -33,8 +33,9 @@ #define isblank(c) ( (c) == ' ' || (c) == '\t' ) ? 1 : 0 #endif -static char *defTabooExts[] = { ".rpmsave", ".rpmorig", "~", ",v", -+static char *defTabooExts[] = { ".new", ".rpmsave", ".rpmorig", "~", ",v", - ".rpmnew", ".swp" +- ".rpmnew", ".swp", ".cfsaved", ".rhn-cfg-tmp-*" ++static char *defTabooExts[] = { ".new", ".orig", ".old", ".bak", ++ ".rpmsave", ".rpmorig", "~", ",v", ".rpmnew", ".swp", ".cfsaved", ++ ".rhn-cfg-tmp-*" }; static int defTabooCount = sizeof(defTabooExts) / sizeof(char *); -diff -u -r --new-file logrotate-3.7.4.orig/config.h logrotate-3.7.4/config.h ---- logrotate-3.7.4.orig/config.h 2005-11-12 13:07:56.000000000 -0600 -+++ logrotate-3.7.4/config.h 2006-09-21 01:08:02.000000000 -0500 -@@ -36,5 +36,5 @@ - #endif - #ifndef STATEFILE --#define STATEFILE "/var/lib/logrotate.status" +diff -Nur logrotate-3.7.8.orig/config.h logrotate-3.7.8/config.h +--- logrotate-3.7.8.orig/config.h 2005-11-12 13:07:56.000000000 -0600 ++++ logrotate-3.7.8/config.h 2009-05-09 23:58:17.040241145 -0500 +@@ -13,7 +13,7 @@ + #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx" + #define COMPRESS_COMMAND "/usr/local/bin/gzip" + #define UNCOMPRESS_COMMAND "/usr/local/bin/gunzip" +-#define STATEFILE "/var/log/logrotate.status" +#define STATEFILE "/var/lib/logrotate/status" #endif -diff -u -r --new-file logrotate-3.7.4.orig/logrotate.8 logrotate-3.7.4/logrotate.8 ---- logrotate-3.7.4.orig/logrotate.8 2006-05-17 09:46:51.000000000 -0500 -+++ logrotate-3.7.4/logrotate.8 2006-09-21 01:07:14.000000000 -0500 -@@ -1,4 +1,4 @@ --.TH LOGROTATE 8 "Wed Nov 5 2002" "Red Hat Linux" "System Administrator's Manual" -+.TH LOGROTATE 8 "Wed Nov 5 2002" "Linux" "System Administrator's Manual" - .SH NAME - logrotate \- rotates, compresses, and mails system logs - .SH SYNOPSIS -@@ -410,7 +410,7 @@ + + /* +diff -Nur logrotate-3.7.8.orig/logrotate.8 logrotate-3.7.8/logrotate.8 +--- logrotate-3.7.8.orig/logrotate.8 2008-12-06 08:05:40.000000000 -0600 ++++ logrotate-3.7.8/logrotate.8 2009-05-09 23:56:45.137687740 -0500 +@@ -442,7 +442,7 @@ for information on the taboo extensions). If a + precedes the list of extensions, the current taboo extension list is augmented, otherwise it is replaced. At startup, the taboo extension list --contains .rpmorig, .rpmsave, ,v, .swp, .rpmnew, and ~. -+contains .new, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, and ~. +-contains .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*. ++contains .new, .orig, .bak, .old, .rpmorig, .rpmsave, ,v, .swp, .rpmnew, ~, .cfsaved and .rhn-cfg-tmp-*. .TP \fBweekly\fR -@@ -427,7 +427,7 @@ +@@ -459,7 +459,7 @@ .SH FILES .PD 0 .TP 27 diff --git a/source/a/logrotate/slack-desc b/source/a/logrotate/slack-desc index 2a1c76a5d..e0fafdb5b 100644 --- a/source/a/logrotate/slack-desc +++ b/source/a/logrotate/slack-desc @@ -5,7 +5,7 @@ # exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| logrotate: logrotate (system log rotation tool) logrotate: logrotate: The logrotate utility is designed to simplify the administration diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild index f0f630d89..5199f9c7d 100755 --- a/source/a/lvm2/lvm2.SlackBuild +++ b/source/a/lvm2/lvm2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,11 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.02.40 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=$(echo LVM2.*.tar.?z* | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-lvm2 @@ -39,13 +49,16 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $PKG cd $TMP rm -rf LVM2.$VERSION -tar xvf $CWD/LVM2.$VERSION.tar.bz2 +tar xvf $CWD/LVM2.$VERSION.tar.xz cd LVM2.$VERSION || exit 1 chown -R root:root . @@ -55,23 +68,59 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# uid 0 = root +# gid 6 = disk CFLAGS="$SLKCFLAGS" \ ./configure \ --disable-readline \ --enable-cmdlib \ --enable-dmeventd \ - --libdir=/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --enable-static_link \ - --with-lvm1=internal + --with-lvm1=internal \ + --enable-pkgconfig \ + --enable-udev_sync \ + --enable-udev_rules \ + --with-udev-prefix="" \ + --with-device-uid=0 \ + --with-device-gid=6 \ + --with-device-mode=0664 \ + --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 + mv $PKG/etc/lvm/lvm.conf $PKG/etc/lvm/lvm.conf.new +if [ -d $PKG/usr/share/man ]; then # --mandir was ignored + mv $PKG/usr/share/man $PKG/usr + rmdir $PKG/usr/share +fi + +# Move the binary and shared library to /sbin and /lib{,64}: +mkdir -p $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) +# The Makefile is DIW. +( cd $PKG/usr/lib${LIBDIRSUFFIX} + find . -name "*.so" -type l | cut -b3- | while read file ; do + rm -f $file + ln -sf ${file}.?.* $file + done +) + ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) mkdir -p $PKG/usr/doc/LVM2.$VERSION @@ -99,5 +148,5 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/lvm2-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/lvm2-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign b/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign deleted file mode 100644 index 36b614805..000000000 --- a/source/a/mdadm/mdadm-2.6.4.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBHGC8JyGugalF9Dw4RArGIAJ9W38h+Mb/c62Ia6kn+TiDfd8ZxJQCfXEY8 -FdGihwdJnxz8cK3+VC4rmZs= -=+YBi ------END PGP SIGNATURE----- diff --git a/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign b/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign new file mode 100644 index 000000000..95c6050d4 --- /dev/null +++ b/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBJtgO9yGugalF9Dw4RAjdkAJ9yrZow4cgdSuoqFbXROoDzH9EyTwCfSVY5 +Ew7L5NKxUJZbZVXseX82eT0= +=X/Wg +-----END PGP SIGNATURE----- diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild index 45cc83b31..4e59b7030 100755 --- a/source/a/mdadm/mdadm.SlackBuild +++ b/source/a/mdadm/mdadm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.6.4 -ARCH=${ARCH:-x86_64} +VERSION=2.6.9 BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mdadm @@ -33,11 +42,11 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf mdadm-$VERSION -tar xjvf $CWD/mdadm-$VERSION.tar.bz2 +tar xjvf $CWD/mdadm-$VERSION.tar.bz2 || exit 1 cd mdadm-$VERSION -# Build this static... it's small enough. -zcat $CWD/mdadm.static.small.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# Build this static: +zcat $CWD/mdadm.static.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 chown -R root:root . find . \ diff --git a/source/a/mdadm/mdadm.static.diff b/source/a/mdadm/mdadm.static.diff new file mode 100644 index 000000000..ae8a46421 --- /dev/null +++ b/source/a/mdadm/mdadm.static.diff @@ -0,0 +1,11 @@ +--- ./Makefile.orig 2009-03-10 01:01:17.000000000 -0500 ++++ ./Makefile 2010-05-16 20:56:33.000000000 -0500 +@@ -55,7 +55,7 @@ + CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) + + # If you want a static binary, you might uncomment these +-# LDFLAGS = -static ++LDFLAGS = -static + # STRIP = -s + + INSTALL = /usr/bin/install diff --git a/source/a/mdadm/mdadm.static.small.diff b/source/a/mdadm/mdadm.static.small.diff deleted file mode 100644 index 6be02fda5..000000000 --- a/source/a/mdadm/mdadm.static.small.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./Makefile.orig 2006-06-15 19:21:52.000000000 -0500 -+++ ./Makefile 2006-06-25 00:28:24.000000000 -0500 -@@ -39,7 +39,7 @@ - - CC = $(CROSS_COMPILE)gcc - CXFLAGS = -ggdb --CWFLAGS = -Wall -Werror -Wstrict-prototypes -+CWFLAGS = -Wall -Werror -Wstrict-prototypes -Os - - ifdef DEBIAN - CPPFLAGS= -DDEBIAN -@@ -55,7 +55,7 @@ - CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) - - # If you want a static binary, you might uncomment these --# LDFLAGS = -static -+LDFLAGS = -static - # STRIP = -s - - INSTALL = /usr/bin/install diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild index c9249f64b..91e7baa9b 100755 --- a/source/a/minicom/minicom.SlackBuild +++ b/source/a/minicom/minicom.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,17 @@ VERSION=2.1 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -35,6 +44,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi rm -rf $PKG @@ -43,19 +54,28 @@ mkdir -p $TMP $PKG # minicom cd $TMP rm -rf minicom-$VERSION -tar xzvf $CWD/minicom-$VERSION.tar.gz +tar xzvf $CWD/minicom-$VERSION.tar.gz || exit 1 cd minicom-$VERSION + +# The following command renames the internal implementation of getline +# to g_getline as newer versions of Glibc provide an incompatible version: +sed -i -e "s/getline/g_&/" $(grep -lr getline *) + chown -R root:root . find . -perm 777 -exec chmod 755 {} \; find . -perm 664 -exec chmod 644 {} \; # Fix re-declaration of BC in termcap.h zcat $CWD/wintcap.diff.gz | patch -p1 --verbose || exit 1 + +## Forget it... it just doesn't help. +## Remove the autoconf program for this sorry old turd or abandon all hope. +#touch configure CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc -make -j3 -make install DESTDIR=$PKG +make -j3 || exit 1 +make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/etc zcat $CWD/minicom.users.gz > $PKG/etc/minicom.users.new zcat $CWD/minirc.dfl.gz > $PKG/etc/minirc.dfl.new @@ -70,16 +90,17 @@ cp -a \ # If autoconf causes failure here (which it probably will), # remove it temporarily and the build should work fine... cd $TMP -tar xzvf $CWD/lrzsz_0.12.21.orig.tar.gz +tar xzvf $CWD/lrzsz_0.12.21.orig.tar.gz || exit 1 cd lrzsz-990823 # Make x86_64 a valid machine type (thanks to Fred Emmott) zcat $CWD/config.sub-x86_64.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/lrzsz_0.12.21-4.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . +#touch configure ./configure \ --prefix=/usr \ $ARCH-slackware-linux -make -j3 +make -j3 || exit 1 cd src cat lrz > $PKG/usr/bin/lrz cat lsz > $PKG/usr/bin/lsz diff --git a/source/a/mkinitrd/README.initrd b/source/a/mkinitrd/README.initrd index f027fa276..86d77539b 100644 --- a/source/a/mkinitrd/README.initrd +++ b/source/a/mkinitrd/README.initrd @@ -22,7 +22,7 @@ and before the main root filesystem is mounted. The usual reason to use an initrd is because you need to load kernel modules before mounting the root partition. Usually these modules are -required to support the filesystem used by the root partition (ext3, +required to support the filesystem used by the root partition (ext3, ext4, reiserfs, xfs), or perhaps the controller that the hard drive is attached to (SCSI, RAID, etc). Essentially, there are so many different options available in modern Linux kernels that it isn't practical to try to ship @@ -52,7 +52,7 @@ Now you'll want to run "mkinitrd". I'm using reiserfs for my root filesystem, and since it's an IDE system the reiserfs module will be the only one I need to load: - mkinitrd -c -k 2.6.29.5 -m reiserfs + mkinitrd -c -k 2.6.32.3 -m reiserfs This should do two things. First, it will create a directory /boot/initrd-tree containing the initrd's filesystem. Then it will @@ -61,11 +61,10 @@ you could make some additional changes in /boot/initrd-tree/ and then run mkinitrd again without options to rebuild the image. That's optional, though, and only advanced users will need to think about that. -Here's another example: Build an initrd image using Linux 2.6.29.5 -kernel modules for a system with an ext3 root partition on /dev/hdb3. -Note that you need the mbcache, jbd, and ext3 modules to use ext3: +Here's another example: Build an initrd image using Linux 2.6.32.3 +kernel modules for a system with an ext4 root partition on /dev/sdb3: - mkinitrd -c -k 2.6.29.5 -m mbcache:jbd:ext3 -f ext3 -r /dev/hdb3 + mkinitrd -c -k 2.6.32.3 -m ext4 -f ext4 -r /dev/sdb3 4. Now that I've built an initrd, how do I use it? @@ -77,10 +76,10 @@ initrd. Here's an example section of lilo.conf showing how this is done: # Linux bootable partition config begins -image = /boot/vmlinuz-generic-2.6.29.5 +image = /boot/vmlinuz-generic-2.6.32.3 initrd = /boot/initrd.gz - root = /dev/hda6 - label = Lnx26295 + root = /dev/sdb3 + label = Lnx26323 read-only # Linux bootable partition config ends diff --git a/source/a/mkinitrd/archive/busybox-1.7.2.no-gc-sections.diff b/source/a/mkinitrd/archive/busybox-1.7.2.no-gc-sections.diff deleted file mode 100644 index e4f64367c..000000000 --- a/source/a/mkinitrd/archive/busybox-1.7.2.no-gc-sections.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.orig 2007-09-29 18:54:25.000000000 -0500 -+++ ./Makefile 2007-11-27 15:35:42.000000000 -0600 -@@ -570,7 +570,7 @@ - quiet_cmd_busybox__ ?= LINK $@ - cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \ - -o $@ -Wl,-Map -Wl,$@.map \ -- -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ -+ -Wl,--warn-common -Wl,--sort-common \ - -Wl,--start-group $(busybox-all) -Wl,--end-group \ - $(LDLIBS) - diff --git a/source/a/mkinitrd/archive/busybox-1.7.2.remove_warning.diff b/source/a/mkinitrd/archive/busybox-1.7.2.remove_warning.diff deleted file mode 100644 index 99257fc76..000000000 --- a/source/a/mkinitrd/archive/busybox-1.7.2.remove_warning.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./applets/applets.c.orig 2007-09-16 13:48:10.000000000 -0500 -+++ ./applets/applets.c 2007-10-04 22:07:47.000000000 -0500 -@@ -16,7 +16,7 @@ - #include "busybox.h" - - /* Apparently uclibc defines __GLIBC__ (compat trick?). Oh well. */ --#if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__) -+/* #if ENABLE_STATIC && defined(__GLIBC__) && !defined(__UCLIBC__) - #warning Static linking against glibc produces buggy executables - #warning (glibc does not cope well with ld --gc-sections). - #warning See sources.redhat.com/bugzilla/show_bug.cgi?id=3400 -@@ -24,7 +24,7 @@ - #warning If you still want to do it, remove -Wl,--gc-sections - #warning from top-level Makefile and remove this warning. - #error Aborting compilation. --#endif -+#endif */ - - - /* Declare <applet>_main() */ diff --git a/source/a/mkinitrd/archive/busybox-1.7.2.tar.bz2.sign b/source/a/mkinitrd/archive/busybox-1.7.2.tar.bz2.sign deleted file mode 100644 index 19ac2fabe..000000000 --- a/source/a/mkinitrd/archive/busybox-1.7.2.tar.bz2.sign +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -busybox-1.7.2.tar.bz2 released Sun, 30 Sep 2007 01:02:10 +0100 - -MD5: c91ec9756e2000073a9dd8fa9fc3f89e busybox-1.7.2.tar.bz2 -SHA1: d9c618a7b104af4e70d623b1b6f3bc454405e12b busybox-1.7.2.tar.bz2 - -To verify this signature, you can obtain my public key -from http://busybox.net/~vda/vda_pubkey.gpg - ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.2 (GNU/Linux) - -iD8DBQFG/ueHR7cMVazJllsRAuBAAJ9r7SuXFQJCm/k0KZp39oDMsqBy7ACffZ9t -r/kwDWTYEr7doIKcNINt+p0= -=GHTs ------END PGP SIGNATURE----- diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.11.2 b/source/a/mkinitrd/archive/busybox-dot-config.1.11.2 deleted file mode 100644 index 012350efa..000000000 --- a/source/a/mkinitrd/archive/busybox-dot-config.1.11.2 +++ /dev/null @@ -1,855 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.11.2 -# Tue Sep 23 23:25:46 2008 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_DESKTOP=y -# CONFIG_FEATURE_ASSUME_UNICODE is not set -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_FEATURE_INSTALLER=y -CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_INCLUDE_SUSv2=y - -# -# Installation Options -# -CONFIG_INSTALL_NO_USR=y -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=64 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_BUNZIP2=y -CONFIG_BZIP2=y -CONFIG_CPIO=y -CONFIG_FEATURE_CPIO_O=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -CONFIG_RPM2CPIO=y -# CONFIG_RPM is not set -# CONFIG_FEATURE_RPM_BZ2 is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_BZIP2=y -CONFIG_FEATURE_TAR_LZMA=y -CONFIG_FEATURE_TAR_COMPRESS=y -CONFIG_FEATURE_TAR_AUTODETECT=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_FEATURE_TAR_UNAME_GNAME=y -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAL=y -CONFIG_CAT=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_INODE=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_FEATURE_DIFF_MINIMAL=y -CONFIG_ED=y -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -# CONFIG_DEBUG_INIT is not set -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=10 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -# CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y - -# -# Linux Module Utilities -# -CONFIG_DEPMOD=y -# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set -CONFIG_FEATURE_DEPMOD_ALIAS=y -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -# CONFIG_FINDFS is not set -CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -CONFIG_GETOPT=y -CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y -CONFIG_HD=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_V0=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_VOLUMEID=y -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SYSV=y -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_READPROFILE=y -CONFIG_RTCWAKE=y -CONFIG_SCRIPT=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_FEATURE_SWAPON_PRI=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MTAB_SUPPORT=y - -# -# Miscellaneous Utilities -# -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_CHAT=y -CONFIG_FEATURE_CHAT_NOFAIL=y -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -CONFIG_FEATURE_CHAT_IMPLICIT_CR=y -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -CONFIG_CHRT=y -CONFIG_CROND=y -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y -CONFIG_FBSPLASH=y -CONFIG_INOTIFYD=y -CONFIG_LAST=y -CONFIG_FEATURE_LAST_SMALL=y -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_FLAGCS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y -CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -CONFIG_RUNLEVEL=y -CONFIG_RX=y -CONFIG_SETSID=y -CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y -CONFIG_TIME=y -CONFIG_TTYSIZE=y -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFENSLAVE=y -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y -# CONFIG_SENDMAIL is not set -# CONFIG_FETCHMAIL is not set -CONFIG_SLATTACH=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -CONFIG_TFTP=y -# CONFIG_TFTPD is not set -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_DEBUG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_DHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS= -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_ZCIP=y -CONFIG_TCPSVD=y -CONFIG_UDPSVD=y - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_TIME=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_READ_NCHARS=y -CONFIG_ASH_READ_TIMEOUT=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -CONFIG_ASH_MATH_SUPPORT_64=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -CONFIG_CTTYHACK=y - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_SV=y -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -CONFIG_LPR=y -# CONFIG_LPQ is not set diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.12.0 b/source/a/mkinitrd/archive/busybox-dot-config.1.12.0 deleted file mode 100644 index b462fe9a1..000000000 --- a/source/a/mkinitrd/archive/busybox-dot-config.1.12.0 +++ /dev/null @@ -1,857 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.12.0 -# Thu Sep 25 12:38:54 2008 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_DESKTOP=y -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_FEATURE_ASSUME_UNICODE is not set -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_FEATURE_INSTALLER=y -CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_INCLUDE_SUSv2=y -# CONFIG_PARSE is not set - -# -# Installation Options -# -CONFIG_INSTALL_NO_USR=y -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=64 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_BUNZIP2=y -CONFIG_BZIP2=y -CONFIG_CPIO=y -CONFIG_FEATURE_CPIO_O=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_GZIP=y -CONFIG_RPM2CPIO=y -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_AUTODETECT=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_FEATURE_TAR_UNAME_GNAME=y -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_UNZIP=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAL=y -CONFIG_CAT=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_INODE=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -# CONFIG_FEATURE_FLOAT_SLEEP is not set -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETFONT=y -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y -CONFIG_SHOWKEY=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_FEATURE_DIFF_MINIMAL=y -CONFIG_ED=y -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -# CONFIG_DEBUG_INIT is not set -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=10 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -# CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y - -# -# Linux Module Utilities -# -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_DEPMOD=y -# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set -CONFIG_FEATURE_DEPMOD_ALIAS=y -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -# CONFIG_FINDFS is not set -CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -CONFIG_GETOPT=y -CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y -CONFIG_HD=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_V0=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_VOLUMEID=y -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SYSV=y -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_RDEV=y -CONFIG_READPROFILE=y -CONFIG_RTCWAKE=y -CONFIG_SCRIPT=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_FEATURE_SWAPON_PRI=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MTAB_SUPPORT=y - -# -# Miscellaneous Utilities -# -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_CHAT=y -CONFIG_FEATURE_CHAT_NOFAIL=y -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -CONFIG_FEATURE_CHAT_IMPLICIT_CR=y -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -CONFIG_CHRT=y -CONFIG_CROND=y -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y -CONFIG_FBSPLASH=y -CONFIG_INOTIFYD=y -CONFIG_LAST=y -CONFIG_FEATURE_LAST_SMALL=y -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_FLAGCS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y -CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -CONFIG_RUNLEVEL=y -CONFIG_RX=y -CONFIG_SETSID=y -CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y -CONFIG_TIME=y -CONFIG_TTYSIZE=y -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFENSLAVE=y -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y -# CONFIG_SENDMAIL is not set -# CONFIG_FETCHMAIL is not set -CONFIG_SLATTACH=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -CONFIG_TFTP=y -# CONFIG_TFTPD is not set -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_DEBUG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_DHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS= -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_ZCIP=y -CONFIG_TCPSVD=y -CONFIG_UDPSVD=y - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_TIME=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_READ_NCHARS=y -CONFIG_ASH_READ_TIMEOUT=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -CONFIG_ASH_MATH_SUPPORT_64=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -CONFIG_CTTYHACK=y - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_SV=y -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -CONFIG_LPR=y -# CONFIG_LPQ is not set diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.12.1 b/source/a/mkinitrd/archive/busybox-dot-config.1.12.1 deleted file mode 100644 index 5987e0503..000000000 --- a/source/a/mkinitrd/archive/busybox-dot-config.1.12.1 +++ /dev/null @@ -1,857 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.12.1 -# Fri Nov 7 10:20:30 2008 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_DESKTOP=y -# CONFIG_EXTRA_COMPAT is not set -# CONFIG_FEATURE_ASSUME_UNICODE is not set -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_FEATURE_INSTALLER=y -CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_INCLUDE_SUSv2=y -# CONFIG_PARSE is not set - -# -# Installation Options -# -CONFIG_INSTALL_NO_USR=y -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=64 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -# CONFIG_FEATURE_HWIB is not set - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -CONFIG_FEATURE_SEAMLESS_BZ2=y -CONFIG_FEATURE_SEAMLESS_GZ=y -CONFIG_FEATURE_SEAMLESS_Z=y -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_BUNZIP2=y -CONFIG_BZIP2=y -CONFIG_CPIO=y -CONFIG_FEATURE_CPIO_O=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_GZIP=y -CONFIG_RPM2CPIO=y -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_AUTODETECT=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_FEATURE_TAR_UNAME_GNAME=y -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_UNZIP=y - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAL=y -CONFIG_CAT=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_FEATURE_DF_INODE=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -# CONFIG_FEATURE_FLOAT_SLEEP is not set -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_KBD_MODE=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETFONT=y -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y -CONFIG_SHOWKEY=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_FEATURE_DIFF_MINIMAL=y -CONFIG_ED=y -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -# CONFIG_DEBUG_INIT is not set -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=10 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_FEATURE_CHECK_NAMES=y -CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -# CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y - -# -# Linux Module Utilities -# -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_DEPMOD=y -# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set -CONFIG_FEATURE_DEPMOD_ALIAS=y -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y -CONFIG_FEATURE_MODPROBE_BLACKLIST=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -CONFIG_FINDFS=y -CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -CONFIG_GETOPT=y -CONFIG_HEXDUMP=y -CONFIG_FEATURE_HEXDUMP_REVERSE=y -CONFIG_HD=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -CONFIG_FEATURE_MDEV_RENAME_REGEXP=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_V0=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_VOLUMEID=y -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_REISERFS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -CONFIG_FEATURE_VOLUMEID_HFS=y -CONFIG_FEATURE_VOLUMEID_JFS=y -CONFIG_FEATURE_VOLUMEID_XFS=y -CONFIG_FEATURE_VOLUMEID_NTFS=y -CONFIG_FEATURE_VOLUMEID_ISO9660=y -CONFIG_FEATURE_VOLUMEID_UDF=y -CONFIG_FEATURE_VOLUMEID_LUKS=y -CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y -CONFIG_FEATURE_VOLUMEID_CRAMFS=y -CONFIG_FEATURE_VOLUMEID_ROMFS=y -CONFIG_FEATURE_VOLUMEID_SYSV=y -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -CONFIG_FEATURE_VOLUMEID_LINUXRAID=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_FAKE=y -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -CONFIG_FEATURE_MOUNT_HELPERS=y -CONFIG_FEATURE_MOUNT_LABEL=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_RDEV=y -CONFIG_READPROFILE=y -CONFIG_RTCWAKE=y -CONFIG_SCRIPT=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_FEATURE_SWAPON_PRI=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MTAB_SUPPORT=y - -# -# Miscellaneous Utilities -# -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_CHAT=y -CONFIG_FEATURE_CHAT_NOFAIL=y -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -CONFIG_FEATURE_CHAT_IMPLICIT_CR=y -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -CONFIG_CHRT=y -CONFIG_CROND=y -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_EJECT=y -CONFIG_FEATURE_EJECT_SCSI=y -CONFIG_FBSPLASH=y -CONFIG_INOTIFYD=y -CONFIG_LAST=y -CONFIG_FEATURE_LAST_SMALL=y -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_FLAGCS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y -CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -CONFIG_RUNLEVEL=y -CONFIG_RX=y -CONFIG_SETSID=y -CONFIG_STRINGS=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y -CONFIG_TIME=y -CONFIG_TTYSIZE=y -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_BRCTL=y -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFENSLAVE=y -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_FEATURE_NETSTAT_PRG=y -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PSCAN=y -CONFIG_ROUTE=y -# CONFIG_SENDMAIL is not set -# CONFIG_FETCHMAIL is not set -CONFIG_SLATTACH=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -CONFIG_TFTP=y -# CONFIG_TFTPD is not set -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_DEBUG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCPC_ARPING is not set -# CONFIG_FEATURE_UDHCP_PORT is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_DHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS= -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_ZCIP=y -CONFIG_TCPSVD=y -CONFIG_UDPSVD=y - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_NMETER=y -CONFIG_PGREP=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PKILL=y -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_TIME=y -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_FEATURE_TOPMEM=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_READ_NCHARS=y -CONFIG_ASH_READ_TIMEOUT=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -CONFIG_ASH_MATH_SUPPORT_64=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -CONFIG_CTTYHACK=y - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -# CONFIG_FEATURE_SYSLOGD_DUP is not set -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_SV=y -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -CONFIG_LPR=y -# CONFIG_LPQ is not set diff --git a/source/a/mkinitrd/archive/busybox-dot-config.1.7.2 b/source/a/mkinitrd/archive/busybox-dot-config.1.7.2 deleted file mode 100644 index 5b9c00b45..000000000 --- a/source/a/mkinitrd/archive/busybox-dot-config.1.7.2 +++ /dev/null @@ -1,753 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.7.2 -# Thu Oct 4 22:03:29 2007 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -CONFIG_NITPICK=y -CONFIG_DESKTOP=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -CONFIG_FEATURE_COMPRESS_USAGE=y -CONFIG_FEATURE_INSTALLER=y -CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_FULL_LIBBUSYBOX is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_BUILD_AT_ONCE=y - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -CONFIG_INCLUDE_SUSv2=y - -# -# Installation Options -# -CONFIG_INSTALL_NO_USR=y -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_FANCY_KEYS=y -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=64 -# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y -CONFIG_GZIP=y -CONFIG_RPM2CPIO=y -# CONFIG_RPM is not set -# CONFIG_FEATURE_RPM_BZ2 is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -CONFIG_FEATURE_TAR_LZMA=y -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -CONFIG_FEATURE_TAR_COMPRESS=y -CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_UNCOMPRESS=y -CONFIG_UNLZMA=y -CONFIG_FEATURE_LZMA_FAST=y -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -CONFIG_FEATURE_UNARCHIVE_TAPE=y -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -CONFIG_CAL=y -CONFIG_CAT=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -CONFIG_CKSUM=y -CONFIG_COMM=y -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_DF=y -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -CONFIG_EXPAND=y -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -CONFIG_SHA1SUM=y -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -CONFIG_SPLIT=y -CONFIG_FEATURE_SPLIT_FANCY=y -CONFIG_STAT=y -CONFIG_FEATURE_STAT_FORMAT=y -CONFIG_STTY=y -CONFIG_SUM=y -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNEXPAND=y -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y -CONFIG_UNIQ=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -CONFIG_UUENCODE=y -CONFIG_WC=y -CONFIG_FEATURE_WC_LARGE=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y -CONFIG_FEATURE_DIFF_DIR=y -CONFIG_FEATURE_DIFF_MINIMAL=y -CONFIG_ED=y -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -CONFIG_FEATURE_FIND_INUM=y -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y - -# -# Init Utilities -# -CONFIG_INIT=y -# CONFIG_DEBUG_INIT is not set -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -CONFIG_HALT=y -CONFIG_MESG=y - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_ADDUSER=y -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -CONFIG_LOGIN_SCRIPTS=y -CONFIG_FEATURE_NOLOGIN=y -# CONFIG_FEATURE_SECURETTY is not set -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_CRYPTPW=y -CONFIG_CHPASSWD=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFLUSH=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -CONFIG_FEATURE_OSF_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -CONFIG_FREERAMDISK=y -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -CONFIG_GETOPT=y -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_EXEC=y -CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y -CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_V0=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -CONFIG_FEATURE_MOUNT_NFS=y -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -CONFIG_READPROFILE=y -CONFIG_SETARCH=y -CONFIG_SWAPONOFF=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MTAB_SUPPORT=y - -# -# Miscellaneous Utilities -# -CONFIG_ADJTIMEX=y -CONFIG_BBCONFIG=y -CONFIG_CHRT=y -CONFIG_CROND=y -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_EJECT=y -CONFIG_LAST=y -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_FLAGCS=y -CONFIG_FEATURE_LESS_MARKS=y -CONFIG_FEATURE_LESS_REGEXP=y -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y -CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y -CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -CONFIG_RAIDAUTORUN=y -CONFIG_READAHEAD=y -CONFIG_RUNLEVEL=y -CONFIG_RX=y -CONFIG_STRINGS=y -CONFIG_SETSID=y -CONFIG_TASKSET=y -CONFIG_FEATURE_TASKSET_FANCY=y -CONFIG_TIME=y -CONFIG_TTYSIZE=y -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -CONFIG_ARP=y -CONFIG_ARPING=y -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -CONFIG_FAKEIDENTD=y -CONFIG_FTPGET=y -CONFIG_FTPPUT=y -CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPCALC=y -CONFIG_FEATURE_IPCALC_FANCY=y -CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y -CONFIG_NAMEIF=y -CONFIG_NC=y -CONFIG_NC_SERVER=y -CONFIG_NC_EXTRA=y -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_PSCAN=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_ROUTE=y -CONFIG_SLATTACH=y -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -CONFIG_TELNETD=y -CONFIG_FEATURE_TELNETD_STANDALONE=y -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_DEBUG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_APP_UDHCPD is not set -# CONFIG_APP_DHCPRELAY is not set -# CONFIG_APP_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -# CONFIG_APP_UDHCPC is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_ZCIP=y - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_NMETER=y -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -CONFIG_FEATURE_TOP_DECIMALS=y -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_LASH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_READ_NCHARS=y -CONFIG_ASH_READ_TIMEOUT=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -CONFIG_ASH_MATH_SUPPORT_64=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_CMDCMD=y -CONFIG_ASH_MAIL=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -CONFIG_CTTYHACK=y - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_SV=y -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set - -# -# ipsvd utilities -# -CONFIG_TCPSVD=y -CONFIG_UDPSVD=y diff --git a/source/a/mkinitrd/busybox-1.12.1_inotify.diff b/source/a/mkinitrd/busybox-1.12.1_inotify.diff deleted file mode 100644 index 151d16ce9..000000000 --- a/source/a/mkinitrd/busybox-1.12.1_inotify.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.12.1.orig/miscutils/inotifyd.c 2008-11-07 01:39:21.000000000 +0000 -+++ busybox-1.12.1/miscutils/inotifyd.c 2008-11-07 01:37:05.000000000 +0000 -@@ -28,7 +28,7 @@ - */ - - #include "libbb.h" --#include <linux/inotify.h> -+#include <sys/inotify.h> - - static volatile smallint signalled; - diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config index 5987e0503..65e298b5f 100644 --- a/source/a/mkinitrd/busybox-dot-config +++ b/source/a/mkinitrd/busybox-dot-config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.12.1 -# Fri Nov 7 10:20:30 2008 +# Busybox version: 1.15.3 +# Thu Dec 17 17:50:16 2009 # CONFIG_HAVE_DOT_CONFIG=y @@ -14,7 +14,6 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_DESKTOP=y # CONFIG_EXTRA_COMPAT is not set -# CONFIG_FEATURE_ASSUME_UNICODE is not set CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set @@ -23,7 +22,9 @@ CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_FEATURE_INSTALLER=y CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y +# CONFIG_FEATURE_ASSUME_UNICODE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set CONFIG_FEATURE_PIDFILE=y @@ -39,7 +40,7 @@ CONFIG_FEATURE_HAVE_RPC=y # # Build Options # -CONFIG_STATIC=y +# CONFIG_STATIC is not set # CONFIG_PIE is not set # CONFIG_NOMMU is not set # CONFIG_BUILD_LIBBUSYBOX is not set @@ -47,6 +48,7 @@ CONFIG_STATIC=y # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" +CONFIG_EXTRA_CFLAGS="" # # Debugging Options @@ -58,7 +60,6 @@ CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set CONFIG_INCLUDE_SUSv2=y -# CONFIG_PARSE is not set # # Installation Options @@ -71,7 +72,7 @@ CONFIG_INSTALL_APPLET_SYMLINKS=y # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" +CONFIG_PREFIX="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" # # Busybox Library Tuning @@ -88,6 +89,8 @@ CONFIG_FEATURE_EDITING_HISTORY=64 CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_EDITING_ASK_TERMINAL=y +# CONFIG_FEATURE_NON_POSIX_CP is not set CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_COPYBUF_KB=4 CONFIG_MONOTONIC_SYSCALL=y @@ -111,11 +114,14 @@ CONFIG_BUNZIP2=y CONFIG_BZIP2=y CONFIG_CPIO=y CONFIG_FEATURE_CPIO_O=y +CONFIG_FEATURE_CPIO_P=y # CONFIG_DPKG is not set # CONFIG_DPKG_DEB is not set # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=y CONFIG_RPM2CPIO=y # CONFIG_RPM is not set CONFIG_TAR=y @@ -153,7 +159,7 @@ CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_DF=y -CONFIG_FEATURE_DF_INODE=y +CONFIG_FEATURE_DF_FANCY=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y CONFIG_UNIX2DOS=y @@ -169,6 +175,7 @@ CONFIG_EXPR=y CONFIG_EXPR_MATH_SUPPORT_64=y CONFIG_FALSE=y CONFIG_FOLD=y +CONFIG_FSYNC=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y @@ -208,6 +215,8 @@ CONFIG_RMDIR=y # CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set CONFIG_SEQ=y CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y # CONFIG_FEATURE_FLOAT_SLEEP is not set @@ -283,6 +292,8 @@ CONFIG_FEATURE_RESIZE_PRINT=y CONFIG_SETCONSOLE=y CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y CONFIG_SETFONT=y +CONFIG_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" CONFIG_SETKEYCODES=y CONFIG_SETLOGCONS=y CONFIG_SHOWKEY=y @@ -304,7 +315,7 @@ CONFIG_WHICH=y # Editors # CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y +CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y CONFIG_DIFF=y CONFIG_FEATURE_DIFF_BINARY=y @@ -367,7 +378,6 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # Init Utilities # CONFIG_INIT=y -# CONFIG_DEBUG_INIT is not set CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_REMOVED=y CONFIG_FEATURE_KILL_DELAY=10 @@ -377,6 +387,8 @@ CONFIG_FEATURE_EXTRA_QUIET=y # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_INITRD is not set CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" CONFIG_MESG=y # @@ -386,13 +398,17 @@ CONFIG_FEATURE_SHADOWPASSWDS=y # CONFIG_USE_BB_PWD_GRP is not set # CONFIG_USE_BB_SHADOW is not set CONFIG_USE_BB_CRYPT=y +CONFIG_USE_BB_CRYPT_SHA=y CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y CONFIG_FEATURE_ADDUSER_TO_GROUP=y CONFIG_DELGROUP=y CONFIG_FEATURE_DEL_USER_FROM_GROUP=y CONFIG_FEATURE_CHECK_NAMES=y CONFIG_ADDUSER=y # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set +CONFIG_FIRST_SYSTEM_ID=1000 +CONFIG_LAST_SYSTEM_ID=12000 CONFIG_DELUSER=y CONFIG_GETTY=y CONFIG_FEATURE_UTMP=y @@ -425,36 +441,35 @@ CONFIG_LSATTR=y # CONFIG_MODPROBE_SMALL is not set # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_DEPMOD=y -# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set -CONFIG_FEATURE_DEPMOD_ALIAS=y CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set CONFIG_RMMOD=y CONFIG_LSMOD=y CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y # # Options common to multiple modutils # -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +CONFIG_FEATURE_MODUTILS_ALIAS=y +CONFIG_FEATURE_MODUTILS_SYMBOLS=y CONFIG_DEFAULT_MODULES_DIR="/lib/modules" CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set # # Linux System Utilities # +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y CONFIG_FBSET=y @@ -479,7 +494,9 @@ CONFIG_MKFS_MINIX=y # Minix filesystem support # CONFIG_FEATURE_MINIX2=y +CONFIG_MKFS_VFAT=y CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=y CONFIG_HEXDUMP=y CONFIG_FEATURE_HEXDUMP_REVERSE=y CONFIG_HD=y @@ -496,7 +513,7 @@ CONFIG_FEATURE_MDEV_RENAME_REGEXP=y CONFIG_FEATURE_MDEV_EXEC=y CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y -CONFIG_FEATURE_MKSWAP_V0=y +CONFIG_FEATURE_MKSWAP_UUID=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y CONFIG_VOLUMEID=y @@ -531,6 +548,7 @@ CONFIG_RDEV=y CONFIG_READPROFILE=y CONFIG_RTCWAKE=y CONFIG_SCRIPT=y +CONFIG_SCRIPTREPLAY=y CONFIG_SETARCH=y CONFIG_SWAPONOFF=y CONFIG_FEATURE_SWAPON_PRI=y @@ -549,6 +567,9 @@ CONFIG_FEATURE_MTAB_SUPPORT=y # CONFIG_ADJTIMEX=y CONFIG_BBCONFIG=y +CONFIG_BEEP=y +CONFIG_FEATURE_BEEP_FREQ=4000 +CONFIG_FEATURE_BEEP_LENGTH_MS=30 CONFIG_CHAT=y CONFIG_FEATURE_CHAT_NOFAIL=y # CONFIG_FEATURE_CHAT_TTY_HIFI is not set @@ -559,18 +580,25 @@ CONFIG_FEATURE_CHAT_IMPLICIT_CR=y # CONFIG_FEATURE_CHAT_CLR_ABORT is not set CONFIG_CHRT=y CONFIG_CROND=y -# CONFIG_DEBUG_CROND_OPTION is not set +CONFIG_FEATURE_CROND_D=y # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/var/spool/cron" CONFIG_CRONTAB=y CONFIG_DC=y +CONFIG_FEATURE_DC_LIBM=y # CONFIG_DEVFSD is not set # CONFIG_DEVFSD_MODLOAD is not set # CONFIG_DEVFSD_FG_NP is not set # CONFIG_DEVFSD_VERBOSE is not set # CONFIG_FEATURE_DEVFS is not set +CONFIG_DEVMEM=y CONFIG_EJECT=y CONFIG_FEATURE_EJECT_SCSI=y CONFIG_FBSPLASH=y +CONFIG_FLASH_LOCK=y +CONFIG_FLASH_UNLOCK=y +CONFIG_FLASH_ERASEALL=y +CONFIG_IONICE=y CONFIG_INOTIFYD=y CONFIG_LAST=y CONFIG_FEATURE_LAST_SMALL=y @@ -579,9 +607,11 @@ CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_FLAGCS=y CONFIG_FEATURE_LESS_MARKS=y CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_FEATURE_LESS_WINCH=y +CONFIG_FEATURE_LESS_DASHCMD=y +CONFIG_FEATURE_LESS_LINENUMS=y CONFIG_HDPARM=y CONFIG_FEATURE_HDPARM_GET_IDENTITY=y CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y @@ -605,13 +635,16 @@ CONFIG_STRINGS=y CONFIG_TASKSET=y CONFIG_FEATURE_TASKSET_FANCY=y CONFIG_TIME=y +CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y CONFIG_WATCHDOG=y # # Networking Utilities # CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_UNIX_LOCAL=y CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set CONFIG_ARP=y @@ -622,6 +655,8 @@ CONFIG_BRCTL=y CONFIG_DNSD=y CONFIG_ETHER_WAKE=y CONFIG_FAKEIDENTD=y +CONFIG_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y @@ -629,11 +664,9 @@ CONFIG_HOSTNAME=y # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_RANGES is not set # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set # CONFIG_FEATURE_HTTPD_CGI is not set # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set @@ -647,6 +680,7 @@ CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y CONFIG_IFENSLAVE=y +CONFIG_IFPLUGD=y CONFIG_IFUPDOWN=y CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" CONFIG_FEATURE_IFUPDOWN_IP=y @@ -693,8 +727,6 @@ CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y CONFIG_PSCAN=y CONFIG_ROUTE=y -# CONFIG_SENDMAIL is not set -# CONFIG_FETCHMAIL is not set CONFIG_SLATTACH=y CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y @@ -706,7 +738,7 @@ CONFIG_TFTP=y CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_DEBUG_TFTP is not set +CONFIG_TFTP_DEBUG=y CONFIG_TRACEROUTE=y # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set @@ -719,10 +751,11 @@ CONFIG_DHCPD_LEASES_FILE="" # CONFIG_APP_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_DHCPC_DEFAULT_SCRIPT="" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS= +CONFIG_UDHCP_DEBUG=0 +# CONFIG_FEATURE_UDHCP_RFC3397 is not set +CONFIG_UDHCPC_DEFAULT_SCRIPT="" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 +CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y @@ -730,9 +763,29 @@ CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y CONFIG_ZCIP=y CONFIG_TCPSVD=y +CONFIG_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y CONFIG_UDPSVD=y # +# Print Utilities +# +# CONFIG_LPD is not set +CONFIG_LPR=y +# CONFIG_LPQ is not set + +# +# Mail Utilities +# +CONFIG_MAKEMIME=y +CONFIG_FEATURE_MIME_CHARSET="us-ascii" +CONFIG_POPMAILDIR=y +CONFIG_FEATURE_POPMAILDIR_DELIVERY=y +CONFIG_REFORMIME=y +CONFIG_FEATURE_REFORMIME_COMPAT=y +# CONFIG_SENDMAIL is not set + +# # Process Utilities # CONFIG_FREE=y @@ -749,36 +802,62 @@ CONFIG_PKILL=y CONFIG_PS=y CONFIG_FEATURE_PS_WIDE=y CONFIG_FEATURE_PS_TIME=y +CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y CONFIG_TOP=y CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_SMP_CPU=y CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOP_SMP_PROCESS=y CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_WATCH=y # +# Runit Utilities +# +CONFIG_RUNSV=y +CONFIG_RUNSVDIR=y +CONFIG_FEATURE_RUNSVDIR_LOG=y +CONFIG_SV=y +CONFIG_SV_DEFAULT_SERVICE_DIR="/var/service" +CONFIG_SVLOGD=y +CONFIG_CHPST=y +CONFIG_SETUIDGID=y +CONFIG_ENVUIDGID=y +CONFIG_ENVDIR=y +CONFIG_SOFTLIMIT=y +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# # Shells # CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set # CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y - -# -# Ash Shell Options -# CONFIG_ASH_BASH_COMPAT=y CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_READ_NCHARS=y CONFIG_ASH_READ_TIMEOUT=y CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -CONFIG_ASH_MATH_SUPPORT_64=y CONFIG_ASH_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y @@ -789,6 +868,7 @@ CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_RANDOM_SUPPORT=y CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH is not set +# CONFIG_HUSH_BASH_COMPAT is not set # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set # CONFIG_HUSH_JOB is not set @@ -796,12 +876,13 @@ CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH_IF is not set # CONFIG_HUSH_LOOPS is not set # CONFIG_HUSH_CASE is not set +# CONFIG_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_EXPORT_N is not set # CONFIG_LASH is not set # CONFIG_MSH is not set - -# -# Bourne Shell Options -# +CONFIG_SH_MATH_SUPPORT=y +CONFIG_SH_MATH_SUPPORT_64=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set @@ -820,38 +901,3 @@ CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y CONFIG_KLOGD=y CONFIG_LOGGER=y - -# -# Runit Utilities -# -CONFIG_RUNSV=y -CONFIG_RUNSVDIR=y -CONFIG_SV=y -CONFIG_SVLOGD=y -CONFIG_CHPST=y -CONFIG_SETUIDGID=y -CONFIG_ENVUIDGID=y -CONFIG_ENVDIR=y -CONFIG_SOFTLIMIT=y -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# Print Utilities -# -# CONFIG_LPD is not set -CONFIG_LPR=y -# CONFIG_LPQ is not set diff --git a/source/a/mkinitrd/init b/source/a/mkinitrd/init index 0559932e9..a6f1091e8 100755 --- a/source/a/mkinitrd/init +++ b/source/a/mkinitrd/init @@ -4,7 +4,7 @@ # This requires that your kernel supports initramfs!!! # # Copyright 2004 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2008 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -33,95 +33,131 @@ # # Config files used by this script: # -# /rootdev Contains the name of the root device, such as: /dev/hda1 +# /rootdev Contains the name of the root device, such as: /dev/hda1 # -# /rootfs Contains the root filesystem type, such as: xfs +# /rootfs Contains the root filesystem type, such as: xfs # # /initrd-name Contains the name of the initrd file. # +# /resumedev Contains the name of the device to resume from hibernation. +# +# /luksdev Contains colon separated list of luks encrypted devices to +# be unlocked. +# +# /lukskey Contains the path to a LUKS key-file for automatic unlock +# Format: LABEL=<partition_label>:/path/to/file +# UUID=<partition_uuid>:/path/to/file +# +# /wait-for-root Contains a number - the init script will wait this amount +# of seconds before creating device nodes. +# +# /keymap Contains the name for a custom keyboard map +# # Optional: -# /load_kernel_modules A script that uses insmod to load the desired -# modules. If this file is not present, all the modules -# in /lib/modules/`uname -r`/ will be loaded in the usual -# sorted order. If you need to load the modules in a -# certain order, or if the modules need extra options, -# then use a load_kernel_modules script. -# -# There's an example in here. To actually use it, you'll -# need to make it executable: -# -# chmod 755 load_kernel_modules - -INITRD=`cat /initrd-name` -ROOTDEV=`cat /rootdev` -ROOTFS=`cat /rootfs` -LUKSDEV=`cat /luksdev` -RESUMEDEV=`cat /resumedev` -WAIT=`cat /wait-for-root` -KEYMAP=`cat /keymap` +# +# /load_kernel_modules +# A script that uses insmod to load the desired +# modules. If this file is not present, all the modules +# in /lib/modules/$(uname -r)/ will be loaded in the usual +# sorted order. If you need to load the modules in a +# certain order, or if the modules need extra options, +# then use a load_kernel_modules script. +# +# There's an example in here. To actually use it, you'll +# need to make it executable: +# +# chmod 755 load_kernel_modules + +INITRD=$(cat /initrd-name) +ROOTDEV=$(cat /rootdev) +ROOTFS=$(cat /rootfs) +LUKSDEV=$(cat /luksdev) +LUKSKEY=$(cat /lukskey) +RESUMEDEV=$(cat /resumedev) +WAIT=$(cat /wait-for-root) +KEYMAP=$(cat /keymap) +INIT=/sbin/init + +PATH="/sbin:/bin:/usr/sbin:/usr/bin" # Mount /proc and /sys: mount -n proc /proc -t proc mount -n sysfs /sys -t sysfs +if grep devtmpfs /proc/filesystems 1>/dev/null 2>/dev/null ; then + DEVTMPFS=1 + mount -n devtmpfs /dev -t devtmpfs +fi + # Parse command line -for ARG in `cat /proc/cmdline`; do +for ARG in $(cat /proc/cmdline); do case $ARG in - rescue) - RESCUE=1 - ;; - root=/dev/*) - ROOTDEV=`echo $ARG | cut -f2 -d=` + 0|1|2|3|4|5|6|S|s|single) + RUNLEVEL=$ARG ;; - rootfs=*) - ROOTFS=`echo $ARG | cut -f2 -d=` + init=*) + INIT=$(echo $ARG | cut -f2 -d=) ;; luksdev=/dev/*) - LUKSDEV=`echo $ARG | cut -f2 -d=` + LUKSDEV=$(echo $ARG | cut -f2 -d=) ;; - waitforroot=*) - WAIT=`echo $ARG | cut -f2 -d=` + lukskey=*) + LUKSKEY=$(echo $ARG | cut -f2- -d=) ;; - root=LABEL=*) - ROOTDEV=`echo $ARG | cut -f2- -d=` + rescue) + RESCUE=1 ;; resume=*) - RESUMEDEV=`echo $ARG | cut -f2 -d=` + RESUMEDEV=$(echo $ARG | cut -f2 -d=) ;; - 0|1|2|3|4|5|6) - RUNLEVEL=$ARG + root=/dev/*) + ROOTDEV=$(echo $ARG | cut -f2 -d=) + ;; + root=LABEL=*) + ROOTDEV=$(echo $ARG | cut -f2- -d=) + ;; + root=UUID=*) + ROOTDEV=$(echo $ARG | cut -f2- -d=) + ;; + rootfs=*) + ROOTFS=$(echo $ARG | cut -f2 -d=) + ;; + waitforroot=*) + WAIT=$(echo $ARG | cut -f2 -d=) ;; esac done # Load kernel modules: -if [ ! -d /lib/modules/`uname -r` ]; then - echo "No kernel modules found for Linux `uname -r`." +if [ ! -d /lib/modules/$(uname -r) ]; then + echo "No kernel modules found for Linux $(uname -r)." elif [ -x ./load_kernel_modules ]; then # use load_kernel_modules script: echo "${INITRD}: Loading kernel modules from initrd image:" . ./load_kernel_modules else # load modules (if any) in order: - if ls /lib/modules/`uname -r`/*.*o 1> /dev/null 2> /dev/null ; then + if ls /lib/modules/$(uname -r)/*.*o 1> /dev/null 2> /dev/null ; then echo "${INITRD}: Loading kernel modules from initrd image:" - for module in /lib/modules/`uname -r`/*.*o ; do - insmod $module + for module in /lib/modules/$(uname -r)/*.*o ; do + /sbin/insmod $module done unset module fi fi -# Sometimes the devices needs extra time to be available. -# root on USB are good example of that. +# Sometimes the devices need extra time to be available. +# A root filesystem on USB is a good example of that. sleep $WAIT # If udevd is available, use it to generate block devices # else use mdev to read sysfs and generate the needed devices if [ -x /sbin/udevd -a -x /sbin/udevadm ]; then /sbin/udevd --daemon - /sbin/udevadm trigger --subsystem-match=block + /sbin/udevadm control --property=STARTUP=1 + /sbin/udevadm trigger --subsystem-match=block --action=add /sbin/udevadm settle --timeout=10 + /sbin/udevadm control --property=STARTUP= else - mdev -s + [ "$DEVTMPFS" != "1" ] && mdev -s fi # Load a custom keyboard mapping: @@ -136,62 +172,106 @@ if [ "$RESCUE" = "" ]; then /sbin/mdadm -E -s >/etc/mdadm.conf /sbin/mdadm -A -s fi - - # Find root device if a label was given: - if echo $ROOTDEV | grep -q "LABEL=" ; then - ROOTDEV=`findfs $ROOTDEV` - fi - # Make encrypted root partition available: - # The useable device will be under /dev/mapper/ - # Three scenarios for the commandline exist: - # 1- ROOTDEV is on a LUKS volume, and LUKSDEV is a real block device - # 2- ROOTDEV is on a LVM volume, and LUKSDEV is a real block device - # 3- ROOTDEV is on a LUKS volume, and LUKSDEV is on a LVM volume - # Case (3) will have to wait until we initialize the LVM. - # Test if ROOTDEV is "/dev/someting" or just "something" - the first means - # ROOTDEV is on a LVM volume (scenario 2); we don't need to rewrite ROOTDEV. - # The second means that ROOTDEV is on a LUKS volume (scenario 1). - CRYPTDEV="" + # Unlock any encrypted partitions necessary to access the + # root filesystem, such as encrypted LVM Physical volumes, disk + # partitions or mdadm arrays. + # Unavailable devices such as LVM Logical Volumes will need to be + # deferred until they become available after the vgscan. + if [ -x /sbin/cryptsetup ]; then - # If we find a LUKS device now, it is on a real block device: - if /sbin/cryptsetup isLuks ${LUKSDEV} 1>/dev/null 2>/dev/null ; then - CRYPTDEV=$(basename $ROOTDEV) - echo "Unlocking LUKS crypt volume '${CRYPTDEV}' on device '$LUKSDEV':" - /sbin/cryptsetup luksOpen ${LUKSDEV} $CRYPTDEV </dev/systty >/dev/systty 2>&1 - if [ "$CRYPTDEV" == "$ROOTDEV" ]; then # scenario 1 - ROOTDEV="/dev/mapper/${CRYPTDEV}" + + # Determine if we have to use a LUKS keyfile: + if [ ! -z "$LUKSKEY" ]; then + mkdir /mountkey + KEYPART=$(echo $LUKSKEY |cut -f1 -d:) + LUKSPATH="/mountkey$(echo $LUKSKEY |cut -f2 -d:)" + # Catch possible mount failure: + if blkid -t TYPE=vfat $KEYPART 1>/dev/null 2>&1 ; then + MOUNTOPTS="-t vfat -o shortname=mixed" + else + MOUNTOPTS="-t auto" + fi + mount $MOUNTOPTS $(findfs $KEYPART) /mountkey 2>/dev/null + # Check if we can actually use this file: + if [ ! -f $LUKSPATH ]; then + LUKSKEY="" + else + echo ">>> Using LUKS key file: '$LUKSKEY'" + LUKSKEY="-d $LUKSPATH" fi fi + + LUKSLIST_DEFERRED="" + LUKSLIST=$(echo $LUKSDEV | tr -s ':' ' ') + for LUKSDEV in $LUKSLIST ; do + if /sbin/cryptsetup isLuks ${LUKSDEV} 1>/dev/null 2>/dev/null ; then + if echo $ROOTDEV | grep -q "LABEL=" || echo $ROOTDEV | grep -q "UUID=" ; then + CRYPTDEV="luks$(basename $LUKSDEV)" + elif [ "x$ROOTDEV" = "x$(basename $ROOTDEV)" ]; then + CRYPTDEV="$ROOTDEV" + else + CRYPTDEV="luks$(basename $LUKSDEV)" + fi + echo "Unlocking LUKS encrypted device '${LUKSDEV}' as luks mapped device '$CRYPTDEV':" + /sbin/cryptsetup ${LUKSKEY} luksOpen ${LUKSDEV} ${CRYPTDEV} </dev/tty0 >/dev/tty0 2>&1 + if [ "$ROOTDEV" = "$LUKSDEV" -o "$ROOTDEV" = "$CRYPTDEV" ] ; then + ROOTDEV="/dev/mapper/$CRYPTDEV" + fi + else + LUKSLIST_DEFERRED="${LUKSLIST_DEFERRED} ${LUKSDEV}" + fi + done fi # Initialize LVM: - if [ -x /sbin/vgscan ]; then - /sbin/vgscan --mknodes --ignorelockingfailure - sleep 10 + if [ -x /sbin/vgchange ]; then /sbin/vgchange -ay --ignorelockingfailure fi - # Make encrypted root partition available (scenario 3): - # We have to handle cases here where the LUKS volume is created on a LV - if [ -x /sbin/cryptsetup ]; then - if /sbin/cryptsetup isLuks ${LUKSDEV} 1>/dev/null 2>/dev/null ; then - # Only act if we could not open the LUKS device before (i.e. is on a LV): - if [ "x$CRYPTDEV" == "x" ]; then - echo "Unlocking LUKS crypt volume '${ROOTDEV}' on device '$LUKSDEV':" - /sbin/cryptsetup luksOpen ${LUKSDEV} $ROOTDEV </dev/systty >/dev/systty 2>&1 - ROOTDEV="/dev/mapper/${ROOTDEV}" + # Unlock any LUKS encrypted devices that were deferred above but have now + # become available due to the vgscan (i.e. filesystems on LVM Logical Volumes) + + if [ -x /sbin/cryptsetup -a -n "${LUKSLIST_DEFERRED}" ]; then + for LUKSDEV in ${LUKSLIST_DEFERRED} ; do + if /sbin/cryptsetup isLuks ${LUKSDEV} 1>/dev/null 2>/dev/null ; then + if echo $ROOTDEV | grep -q "LABEL=" || echo $ROOTDEV | grep -q "UUID=" ; then + CRYPTDEV="luks$(basename $LUKSDEV)" + elif [ "x$ROOTDEV" = "x$(basename $ROOTDEV)" ]; then + CRYPTDEV="$ROOTDEV" + else + CRYPTDEV="luks$(basename $LUKSDEV)" + fi + echo "Unlocking LUKS encrypted device '${LUKSDEV}' as luks mapped device '$CRYPTDEV':" + /sbin/cryptsetup ${LUKSKEY} luksOpen ${LUKSDEV} ${CRYPTDEV} </dev/tty0 >/dev/tty0 2>&1 + if [ "$ROOTDEV" = "$LUKSDEV" -o "$ROOTDEV" = "$CRYPTDEV" ] ; then + ROOTDEV="/dev/mapper/$CRYPTDEV" + fi + else + echo "LUKS device '${LUKSDEV}' unavailable for unlocking!" fi - fi + done fi + # Find root device if a label or UUID was given: + if echo $ROOTDEV | grep -q "LABEL=" || \ + echo $ROOTDEV | grep -q "UUID=" ; then + ROOTDEV=$(findfs $ROOTDEV) + fi + + # Clean up after LUKS unlock using a keyfile: + if grep -q mountkey /proc/mounts 2>/dev/null ; then + umount -l /mountkey + rmdir /mountkey 2>/dev/null + fi + # Resume state from swap if [ "$RESUMEDEV" != "" ]; then if ls -l $RESUMEDEV | grep -q "^l" ; then - RESUMEDEV=`ls -l $RESUMEDEV | awk '{ print $NF }'` + RESUMEDEV=$(ls -l $RESUMEDEV | awk '{ print $NF }') fi echo "Trying to resume from $RESUMEDEV" - RESMAJMIN=`ls -l $RESUMEDEV | tr , : | awk '{ print $5$6 }'` + RESMAJMIN=$(ls -l $RESUMEDEV | tr , : | awk '{ print $5$6 }') echo $RESMAJMIN > /sys/power/resume fi @@ -206,6 +286,7 @@ if [ "$RESCUE" = "" ]; then /bin/sh fi else + echo echo "RESCUE mode" echo echo " You can try to fix or rescue your system now. If you want" @@ -219,12 +300,13 @@ else /bin/sh fi -if ps axc | grep -q udevd ; then - killall udevd +if pgrep udevd >/dev/null ; then + pkill udevd fi unset ERR -umount /proc -umount /sys +mount -o move /proc /mnt/proc +mount -o move /sys /mnt/sys +[ "$DEVTMPFS" = "1" ] && mount -o move /dev /mnt/dev echo "${INITRD}: exiting" -exec switch_root /mnt /sbin/init $RUNLEVEL +exec switch_root /mnt $INIT $RUNLEVEL diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index 8f77725fe..4cd97296b 100644 --- a/source/a/mkinitrd/mkinitrd +++ b/source/a/mkinitrd/mkinitrd @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2004 Slackware Linux, Inc., Concord, CA, USA # Copyright 2004 Patrick J. Volkerding, Concord, CA, USA -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,24 +22,28 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman <rworkman@slackware.com> 26 November 2007 -# to add support for mkinitrd.conf - No additional license terms added +# to add support for mkinitrd.conf - No additional license terms added # Modified by Alan Hicks <alan@slackware.com> 27 November 2007 to enable -# passing arguments to kernel modules - No additional license terms added -# volkerdi - feel free to remove these :) +# passing arguments to kernel modules - No additional license terms added +# volkerdi - feel free to remove these :) # Modified by Eric Hameleers <alien@slackware.com> 3 April 2008 -# to add support custom keymaps - No additional license terms added +# to add support custom keymaps - No additional license terms added # Modified by Patrick Volkerding <volkerdi@slackware.com> 17 Dec 2008 -# Added support to bail out if kernel modules are requested for a kernel -# version that is not installed (thanks to Eric Hameleers), be more -# verbose about showing modules added to the initrd (thanks to -# Ellington Santos), and if "mount" returns /dev/root as the root device, -# use readlink to resolve the device pointed to by the /dev/root -# symlink, changed modprobe to use --ignore-install to avoid catching -# custom "install" lines and causing /sbin/modprobe to be copied to the -# initrd (thanks to Ken Milmore). -# Of course, license terms remain unchanged. - -MKINITRD_VERSION=1.3.4 +# Added support to bail out if kernel modules are requested for a kernel +# version that is not installed (thanks to Eric Hameleers), be more +# verbose about showing modules added to the initrd (thanks to +# Ellington Santos), and if "mount" returns /dev/root as the root device, +# use readlink to resolve the device pointed to by the /dev/root +# symlink, changed modprobe to use --ignore-install to avoid catching +# custom "install" lines and causing /sbin/modprobe to be copied to the +# initrd (thanks to Ken Milmore). +# Of course, license terms remain unchanged. +# Modified by Eric Hameleers <alien@slackware.com> 3 March 2010 +# Add lukskey option (-K). Automatically add kernel modules listed in +# load-kernel-modules if that file is executable. +# Yada yada yada. + +MKINITRD_VERSION=1.4.5 print_usage() { cat << EOF @@ -70,22 +74,22 @@ initrd, and the script is easy to modify. Be creative. :-) -o Output image (default /boot/initrd.gz) -r Root partition device (must be used with -f) -s Initrd source tree (default /boot/initrd-tree/) + -u Include udev in the initrd -w Time to wait until all disks are detected - -C Use cryptsetup to unlock the underlying device of an - encrypted root filesystem (must be used with '-r' parameter). - Two scenarios are possible. (1) root filesystem was created on the - encrypted disk/LVM partition, example: - -C /dev/sda2 -r cryptroot - where /dev/sda2 is the encrypted partition and - the actual root device name in /etc/fstab is: - /dev/mapper/cryptroot - (2) the encrypted partition contains a LVM volume which holds the - root filesystem, example: - -C /dev/sda2 -r /dev/vg/root - where /dev/sda2 is the encrypted partition and - the actual root device name in /etc/fstab is: - /dev/vg/root + -C A colon (:) delimited list of luks encrypted block devices to be + unlocked by the initrd using cryptsetup. All devices that must + be unlocked in order to access the root filesystem must be + specified. (Use with '-r' parameter). -L Add support for LVM partitions + -K Use a USB key (fat-formatted) to unlock the root LUKS volume + The parameter value is filename of a keyfile, as well as the label + (or uuid) of the partition this file is on. This way, you can unlock + your computer automatically if you have a USB stick with your LUKS + key inserted at boot. A passphrase will still be asked if the LUKS + key can not be found. + For example, if your USB thumb drive has a FAT partition with label + "TRAVELSTICK" and the actual keyfile is called "/keys/alien.luks", + then you need to pass: -K LABEL=TRAVELSTICK:/keys/alien.luks -R Add support for RAID partitions -V Display version number @@ -93,10 +97,10 @@ A simple example: Build an initrd for a reiserfs root partition: mkinitrd -c -m reiserfs -Another example: Build an initrd image using Linux 2.6.29.3-smp kernel +Another example: Build an initrd image using Linux 2.6.29.6-smp kernel modules for a system with an ext3 root partition on /dev/hdb3: - mkinitrd -c -k 2.6.29.3-smp -m mbcache:jbd:ext3 -f ext3 -r /dev/hdb3 + mkinitrd -c -k 2.6.29.6-smp -m mbcache:jbd:ext3 -f ext3 -r /dev/hdb3 Note that if you are already logged in with /dev/hdb3 as your / partition, and it is running ext3, this command works just the same: @@ -151,11 +155,21 @@ build_initrd_image() { fi fi done + # Use the output image name written in the initrd-tree if present: + if [ ! -z "$(cat $SOURCE_TREE/initrd-name)" ]; then + OUTPUT_IMAGE=$(cat $SOURCE_TREE/initrd-name) + if [ "$OUTPUT_IMAGE" = "$(basename $OUTPUT_IMAGE)" ]; then + OUTPUT_IMAGE=/boot/$OUTPUT_IMAGE + fi + mkdir -p $(dirname $OUTPUT_IMAGE) + fi # Wrap the initrd as an initramfs image and move it into place: ( cd $SOURCE_TREE rm -f $OUTPUT_IMAGE find . | cpio -o -H newc | gzip -9c > $OUTPUT_IMAGE ) + echo "$OUTPUT_IMAGE created." + echo "Be sure to run lilo again if you use it." } badconf_file() { @@ -166,6 +180,44 @@ badconf_file() { exit 1 } + +unify_libs() { + awk '/=. \// { print $3 }' | sort -u +} + +copy_libs() { + # First copy the essential glibc files: + find /lib* -name "ld-*so*" -o -name "libnss_files*so*" -o -name "libnss_compat*so*" | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/ + + # Then copy all remaining libs our initrd files link against: + COUNT=1 + PRFX=$(tempfile --prefix ldd-) + TMPFILE=${PRFX}${COUNT} + + find $SOURCE_TREE -type f -exec ldd {} 2>/dev/null \; | unify_libs > $TMPFILE + while [ "$COUNT" != "0" ]; do + COUNT=$((COUNT+1)) + for i in $(cat $TMPFILE) ; do + ldd $i 2>/dev/null + done | unify_libs > ${PRFX}${COUNT} + TMPFILE=${PRFX}${COUNT} + [ $(cat $TMPFILE | wc -l) -eq 0 ] && COUNT=0 + done + + for i in $(cat ${PRFX}* | sort -u) ; do + cp -P --parents ${i}* $SOURCE_TREE + done + + ( + cd $SOURCE_TREE + for i in $(find -L . -type l -exec readlink -m /{} \; 2>/dev/null ) ; do + cp -P --parents ${i} $SOURCE_TREE + done + ) + + rm ${PRFX}* +} + # If --help is given, print_usage and exit: if echo $* | grep -wq '\--help' ; then print_usage @@ -181,11 +233,13 @@ fi # Default values if these aren't previously set. # Might be set from config file or by -s and -o options too. SOURCE_TREE=${SOURCE_TREE:-/boot/initrd-tree} -OUTPUT_IMAGE=${OUTPUT_IMAGE:-/boot/initrd.gz} +OUTPUT_IMAGE=${OUTPUT_IMAGE:-""} KERNEL_VERSION=${KERNEL_VERSION:-"$(uname -r)"} # Default actions without options: if [ -z "$1" ]; then + # We need a sensible default for this special case: + OUTPUT_IMAGE=${OUTPUT_IMAGE:-/boot/initrd.gz} # If the output tree doesn't exist, create it and then exit: if [ ! -d $SOURCE_TREE ]; then echo "Nothing found at location $SOURCE_TREE, so we will create an" @@ -204,8 +258,6 @@ if [ -z "$1" ]; then # If the source tree does exist, the default is to build the initrd # image from it and then exit: build_initrd_image - echo "$OUTPUT_IMAGE created." - echo "Be sure to run lilo again if you use it." exit 0 fi fi # default no-option actions @@ -264,6 +316,10 @@ while [ ! -z "$1" ]; do SOURCE_TREE="$2" shift 2 ;; + -u) + UDEV=1 + shift + ;; -w) WAIT="$2" shift 2 @@ -273,6 +329,10 @@ while [ ! -z "$1" ]; do LUKSDEV="$2" shift 2 ;; + -K) + LUKSKEY="$2" + shift 2 + ;; -L) LVM=1 shift @@ -306,13 +366,13 @@ fi # If $ROOTDEV and $ROOTFS are not set, assume we want the # values for the currently mounted / # (unless we find that values are already set in the initrd-tree): -if [ -z "$ROOTDEV" -a -z "$(cat $SOURCE_TREE/rootdev 2> /dev/null)" ]; then +if [ -z "$ROOTDEV" -a -z "$(cat $SOURCE_TREE/rootdev 2>/dev/null)" ]; then ROOTDEV=$(mount | grep ' on / ' | cut -f 1 -d ' ') if [ "$ROOTDEV" = "/dev/root" ]; then # find real root device ROOTDEV="/dev/$(readlink /dev/root)" fi fi -if [ -z "$ROOTFS" -a -z "$(cat $SOURCE_TREE/rootfs 2> /dev/null)" ]; then +if [ -z "$ROOTFS" -a -z "$(cat $SOURCE_TREE/rootfs 2>/dev/null)" ]; then ROOTFS=$(mount | grep ' on / ' | cut -f 5 -d ' ') fi # If needed, write them in the initrd-tree: @@ -333,9 +393,12 @@ if [ ! -z "$WAIT" ]; then echo $WAIT > $SOURCE_TREE/wait-for-root fi -# Useful to know which initrd is running: -INITRD_NAME=$(basename $OUTPUT_IMAGE) -echo $INITRD_NAME > $SOURCE_TREE/initrd-name +# If no OUTPUT_IMAGE was specified, read it from the SOURCE_TREE if possible: +OUTPUT_IMAGE=${OUTPUT_IMAGE:-"$(cat $SOURCE_TREE/initrd-name)"} +# If we still have no value, apply the default: +OUTPUT_IMAGE=${OUTPUT_IMAGE:-"/boot/initrd.gz"} +# Finally, write the image name into the SOURCE_TREE: +echo "$OUTPUT_IMAGE" > $SOURCE_TREE/initrd-name # Fill /resumedev with the swap partition holding the hibernation image if [ ! -z "$RESUMEDEV" ]; then @@ -353,49 +416,73 @@ if [ ! -z "$LUKSDEV" ]; then CRYPT=1 fi +# If LUKSKEY was set in the config file, then give it a warm welcome: +if [ ! -z "$LUKSKEY" ]; then + # $SOURCE_TREE/wait-for-root may have been configured earlier in the script, + # but we require at least 5 seconds for the USB stick to settle + # after insertion : + if [ ! -s $SOURCE_TREE/wait-for-root ] || [ $(cat $SOURCE_TREE/wait-for-root) -lt 5 ]; then + echo 5 > $SOURCE_TREE/wait-for-root + fi + + # Several extra modules are needed to support a vfat formatted USB stick... + # assuming here we are using a western codepage. + # This possibly adds doublures, but we clean up the MODULE_LIST further down! + MODULE_LIST="${MODULE_LIST}:ehci-hcd:uhci-hcd:usb-storage:hid:usbhid:fat:nls_cp437:nls_iso8859-1:msdos:vfat" + + # Finally, write the lukskey to the initrd-tree: + echo $LUKSKEY > $SOURCE_TREE/lukskey +fi + # Include RAID support in initrd if [ ! -z "$RAID" ]; then if [ -r /sbin/mdadm ]; then mkdir -p $SOURCE_TREE/sbin cp /sbin/mdadm $SOURCE_TREE/sbin/mdadm - chmod 755 $SOURCE_TREE/sbin/mdadm + chmod 0755 $SOURCE_TREE/sbin/mdadm else echo "ERROR: mdadm binary is missing, RAID support not installed" fi fi +# Include udev in initrd +if [ ! -z "$UDEV" ]; then + cp /sbin/udev* $SOURCE_TREE/sbin/ + cp -a /lib/udev $SOURCE_TREE/lib/ +fi + # Include LVM support in initrd if [ ! -z "$LVM" ]; then - if [ -f /sbin/lvm.static ]; then + if [ -f /sbin/lvm ]; then mkdir -p $SOURCE_TREE/sbin - cp /sbin/lvm.static $SOURCE_TREE/sbin/lvm.static - cp /sbin/dmsetup.static $SOURCE_TREE/sbin/dmsetup.static + cp /sbin/lvm $SOURCE_TREE/sbin/lvm + cp /sbin/dmsetup $SOURCE_TREE/sbin/dmsetup + find /lib* -name "libdevmapper*so*" | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/ ( cd $SOURCE_TREE/sbin - ln -s lvm.static vgchange 2>/dev/null - ln -s lvm.static vgscan 2>/dev/null ) + ln -s lvm vgchange 2>/dev/null + ln -s lvm vgscan 2>/dev/null ) if [ -z "${MODULE_LIST}" ] ; then MODULE_LIST="dm-mod" elif ! echo ${MODULE_LIST} | grep -q dm-mod ; then MODULE_LIST="$MODULE_LIST:dm-mod" fi else - echo "LVM static binary is missing, LVM support isn't installed" + echo "LVM binary is missing, LVM support isn't installed" fi fi # Include cryptsetup (LUKS) support in initrd if [ ! -z "$CRYPT" ]; then - if [ -e /sbin/cryptsetup.static ]; then + if [ -e /usr/sbin/cryptsetup ]; then mkdir -p $SOURCE_TREE/sbin - cp /sbin/cryptsetup.static $SOURCE_TREE/sbin/cryptsetup.static - ( cd $SOURCE_TREE/sbin - ln -s cryptsetup.static cryptsetup 2>/dev/null - ) - cat << EOF > $SOURCE_TREE/sbin/udevadm + cp /usr/sbin/cryptsetup $SOURCE_TREE/sbin/cryptsetup + if [ ! -e $SOURCE_TREE/sbin/udevadm ]; then + cat << EOF > $SOURCE_TREE/sbin/udevadm #!/bin/sh sleep 3 EOF - chmod 0755 $SOURCE_TREE/sbin/udevadm + chmod 0755 $SOURCE_TREE/sbin/udevadm + fi if [ -z "${MODULE_LIST}" ] ; then MODULE_LIST="dm-mod" @@ -405,7 +492,7 @@ EOF # Write the underlying luks device to the initrd-tree: echo $LUKSDEV > $SOURCE_TREE/luksdev else - echo "Cryptsetup static binary is missing, CRYPT support isn't installed" + echo "Cryptsetup binary is missing, CRYPT support isn't installed" fi fi @@ -414,7 +501,14 @@ if [ ! -d $SOURCE_TREE/lib/modules/$KERNEL_VERSION ]; then mkdir -p $SOURCE_TREE/lib/modules/$KERNEL_VERSION fi -# If a module list was given, copy the modules into place: +# If an executable $SOURCE_TREE/load_kernel_modules already exists, then +# we assume you will want to load the kernel modules mentioned in there. +# This means, you do not have to explicitly add those on the commandline: +if [ -x $SOURCE_TREE/load_kernel_modules ]; then + MODULE_LIST="${MODULE_LIST}:$(cat $SOURCE_TREE/load_kernel_modules |grep "^insmod" |rev |cut -d/ -f1 |rev |cut -d. -f1)" +fi + +# If the module list is not empty, copy the modules into place: if [ ! -z "$MODULE_LIST" ]; then if grep -q "#insmod /lib/modules/2.6.18.8-smp/reiserfs.ko" $SOURCE_TREE/load_kernel_modules ; then rm -f $SOURCE_TREE/load_kernel_modules @@ -426,6 +520,12 @@ if [ ! -z "$MODULE_LIST" ]; then echo >> $SOURCE_TREE/load_kernel_modules fi + # Sanitize the modules list first, before any further processing. + # The awk command eliminates doubles without changing the order: + MODULE_LIST=$(echo $MODULE_LIST |tr -s ':' '\n' |awk '!x[$0]++' |tr '\n' ' ') + MODULE_LIST=$(echo $MODULE_LIST | tr ' ' ':') + MODULE_LIST=$(echo ${MODULE_LIST%:}) # Weed out a trailing ':' + # Count number of modules # This INDEX number gives us an easy way to find individual # modules and their arguments, as well as tells us how many @@ -433,6 +533,8 @@ if [ ! -z "$MODULE_LIST" ]; then if ! echo $MODULE_LIST | grep ':' > /dev/null ; then # only 1 module specified INDEX=1 else + # Trim excess ':' which will screw this routine: + MODULE_LIST=$(echo $MODULE_LIST | tr -s ':') INDEX=1 while [ ! "$(echo "$MODULE_LIST" | cut -f $INDEX -d ':' )" = "" ]; do INDEX=$(expr $INDEX + 1) @@ -458,7 +560,7 @@ while [ $i -ne $INDEX ]; do fi # Get MODULE deps and prepare insmod lines - /sbin/modprobe --set-version $KERNEL_VERSION --show-depends --ignore-install $MODULE 2> /dev/null \ + /sbin/modprobe --set-version $KERNEL_VERSION --show-depends --ignore-install $MODULE 2>/dev/null \ | grep "^insmod " | cut -f 2 -d ' ' | while read SRCMOD; do if ! grep -q "$SRCMOD" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then @@ -477,10 +579,13 @@ while [ $i -ne $INDEX ]; do echo "$LINE" >> $SOURCE_TREE/load_kernel_modules fi - if cp -a --parents $SRCMOD $SOURCE_TREE 2> /dev/null; then - echo "OK: $SRCMOD added." - else - echo "WARNING: Could not find module \"$SRCMOD\"" + if [ ! -f ${SOURCE_TREE}${SRCMOD} ]; then + # We did not yet copy this module into the initrd-tree + if cp -a --parents $SRCMOD $SOURCE_TREE 2>/dev/null; then + echo "OK: $SRCMOD added." + else + echo "WARNING: Could not find module \"$SRCMOD\"" + fi fi done @@ -489,6 +594,9 @@ done fi +# Copy needed libraries +copy_libs + # And finally, build the initrd: build_initrd_image diff --git a/source/a/mkinitrd/mkinitrd.8 b/source/a/mkinitrd/mkinitrd.8 index 5fa957218..be4e9d42d 100644 --- a/source/a/mkinitrd/mkinitrd.8 +++ b/source/a/mkinitrd/mkinitrd.8 @@ -7,7 +7,7 @@ .ie \\n(.$=0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP .el .TP "\\$1" .. -.TH MKINITRD 8 "04 March 2008" "Slackware Version 12.1" +.TH MKINITRD 8 "27 March 2010" "Slackware Version 13.1" .SH NAME mkinitrd \- create or rebuilt an initrd (initial ramdisk) using initramfs (simple cpio+gzip). .SH SYNOPSIS @@ -40,7 +40,16 @@ mkinitrd \- create or rebuilt an initrd (initial ramdisk) using initramfs (simpl .B \-s source_tree ] [ -.B \-C crypt_device +.B \-u +] +[ +.B \-w wait_time +] +[ +.B \-C device1:device2:device3... +] +[ +.B \-K luks_keyfile ] [ .B \-L @@ -117,29 +126,50 @@ together with the \-f option in order to be beneficial. .B \-s source tree The directory to use as the source for the initrd. (default: /boot/initrd-tree/) .TP +.B \-u +Include udev in the initrd. +.TP .B \-w The -w option specifies how long to wait in seconds before assuming that all the drives are spun up and ready to go. .TP -.B \-C -Use cryptsetup to enable the underlying device of an encrypted root partition. -Requires '-r' parameter. Two scenarios are possible. -.br -(1) root filesystem was created on the encrypted disk/LVM partition, example: +.B \-C device list +A colon (:) delimited list of luks encrypted block devices to be unlocked by +the initrd using cryptsetup. All devices that must be unlocked in order to +access the root filesystem must be specified. e.g. - -C /dev/sda2 -r cryptroot + -C /dev/sda2:/dev/sda3 -where /dev/sda2 is the encrypted partition and the actual root device name in /etc/fstab is: +Each unlocked device will be assigned an automatically generated luks device +name of the form luks<device> where '<device>' will be the basename of the +encrypted device. e.g. - /dev/mapper/cryptroot + /dev/mapper/lukssda2 -(2) the encrypted partition contains a LVM volume which holds the root filesystem, example: +As a convenience to users, where -r specifies one of the device names listed +on the -C option it will be automatically adjusted to use the correct luks +device name. i.e. - -C /dev/sda2 -r /dev/vg/root + "-C /dev/sda2 -r /dev/sda2" and + "-C /dev/sda2 -r /dev/mapper/lukssda2" -where /dev/sda2 is the encrypted partition and the actual root device name in /etc/fstab is: +are equivalent. +.br +(Use with '-r' option). +.TP +.B \-K luks_keyfile +When using cryptsetup to encrypt your partition, you can use a keyfile instead +of a passphrase to unlock the LUKS volume. The LUKSKEY variable holds the +filename of a keyfile, as well as the label (or uuid) of the partition this +file is on. This way, you can unlock your computer automatically if you have a +USB stick with your LUKS key inserted at boot. A passphrase will still be asked +if the LUKS key can not be found. +.br +For example, if your USB thumb drive has a FAT partition with label +"TRAVELSTICK" and the actual keyfile is called "/keys/alien.luks", then +you need to set: - /dev/vg/root + -K LABEL=TRAVELSTICK:/keys/alien.luks .TP .B \-L This option adds LVM support to the initrd, if the tools are @@ -156,10 +186,33 @@ A simple example: Build an initrd for a reiserfs root partition: mkinitrd -c -m reiserfs -Another example: Build an initrd image using Linux 2.6.24.5 kernel -modules for a system with an ext3 root partition on /dev/hdb3: +Another example: Build an initrd image using Linux 2.6.33.1 kernel +modules for a system with an ext3 root partition on /dev/sdb3: + + mkinitrd -c -k 2.6.33.1 -m ext3 -f ext3 -r /dev/sdb3 + +An example of a single encrypted partition setup: +.br +As a user convenience, the value for the "-r" option may also be specified as +"/dev/sda2" in this example: + + mkinitrd -c -k 2.6.33.1 \\ + -m ext4:ehci-hcd:uhci-hcd:usbhid \\ + -f ext4 -r /dev/mapper/lukssda2 \\ + -C /dev/sda2 \\ + -l uk + +Finally, A more complex example: +.br +This one is for a LVM Volume Group (rootvg) comprising of two LVM Physical +Volumes, each of which is on a LUKS encrypted partition that will need to be +unlocked before the root filesystem (/dev/rootvg/lvroot) can be accessed. - mkinitrd -c -k 2.6.24.5 -m ext3 -f ext3 -r /dev/hdb3 + mkinitrd -c -k 2.6.29.6 \\ + -m ext4:ehci-hcd:uhci-hcd:usbhid \\ + -f ext4 -r /dev/rootvg/lvroot \\ + -L -C /dev/sda2:/dev/sdb2 \\ + -l uk If run without options, mkinitrd will rebuild an initrd image using the contents of the $SOURCE_TREE directory, or, if that directory @@ -174,13 +227,16 @@ line to /etc/lilo.conf. Here's a section of lilo.conf that shows how to set this up: # Linux bootable partition config begins - image = /boot/vmlinuz-generic-2.6.24.5 + image = /boot/vmlinuz-generic-2.6.33.1 initrd = /boot/initrd.gz - root = /dev/hda6 - label = Linux26245 + root = /dev/sda3 + label = Linux26331 read-only # Linux bootable partition config ends +Note that the line "root = /dev/sda3" is not needed if the root device +has been configured in the initrd image. + Once you've created the initrd and editing /etc/lilo.conf, you will need to run 'lilo' to write out the changed boot block. The next time you reboot the initrd should be loaded along with the kernel. diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 10e70b997..7beba6c63 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,16 +21,32 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.3.4 -BB=1.12.1 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-1.4.5} +BB=1.15.3 NUMJOBS=${NUMJOBS:--j7} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mkinitrd +# Write a warning to stdout if the mkinitrd script has a different version: +eval $( grep "^MKINITRD_VERSION=" $CWD/mkinitrd ) +if [ "$VERSION" != "$MKINITRD_VERSION" ]; then + echo "The version of this package ($VERSION) is not equal to the version of the mkinitrd script ($MKINITRD_VERSION)." + sleep 5 +fi + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -41,7 +57,7 @@ cd busybox-$BB #zcat $CWD/busybox-${BB}.remove_warning.diff.gz | patch -p1 --verbose || exit 1 #zcat $CWD/busybox-${BB}.no-gc-sections.diff.gz | patch -p1 --verbose || exit 1 # Needed with 2.6.27 kernel: -zcat $CWD/busybox-1.12.1_inotify.diff.gz | patch -p1 --verbose || exit 1 +#zcat $CWD/busybox-1.12.1_inotify.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . sed -e \ diff --git a/source/a/mkinitrd/mkinitrd.conf.5 b/source/a/mkinitrd/mkinitrd.conf.5 index 5890e2462..7b316d0f1 100644 --- a/source/a/mkinitrd/mkinitrd.conf.5 +++ b/source/a/mkinitrd/mkinitrd.conf.5 @@ -1,7 +1,7 @@ .\" mkinitrd.5 Robby Workman <rworkman@slackware.com> -.\" 25 November 2007 " +.\" 19 December 2009 " -.TH MKINITRD.CONF 5 "05 Februrary 2008" "Slackware 12.1" +.TH MKINITRD.CONF 5 "27 March 2010" "Slackware 13.1" .SH NAME .B mkinitrd.conf(5) .SH SYNOPSIS @@ -89,21 +89,44 @@ Example: MODULE_LIST="module1:module2 option=1:module3" .TP 5 .I LUKSDEV -When using cryptsetup with an encrypted root partition, use this variable to -define the *actual* device name of the encrypted root partition and define the -*mapped* device name as ROOTDEV. +Contains a colon (:) delimited list of luks encrypted block devices to be +unlocked by the initrd using cryptsetup. All devices that must be unlocked +in order to access the root filesystem must be specified. .br -For example, if your actual root device name in /etc/fstab is: -.br -.I /dev/mapper/cryptroot -on -.I /dev/sda2 +Example: LUKSDEV="/dev/sda2:/dev/sda3" + +Each unlocked device will be assigned an automatically generated luks device +name of the form luks<device> where '<device>' will be the basename of the +encrypted device. e.g. + + /dev/mapper/lukssda2 -Then you'll need to set: +As a convenience to users, if +.I ROOTDEV +(see below) specifies one of the device names listed in the +.I LUKSDEV +option, then it will be automatically adjusted to use the correct luks +device name. i.e. when specifying +.I "LUKSDEV=/dev/sda2" +then +.I "ROOTDEV=/dev/sda2" +and +.I "ROOTDEV=/dev/mapper/lukssda2" +are equivalent. +.TP 5 +.I LUKSKEY +When using cryptsetup to encrypt your partition, you can use a keyfile instead +of a passphrase to unlock the LUKS volume. The LUKSKEY variable holds the +filename of a keyfile, as well as the label (or uuid) of the partition this +file is on. This way, you can unlock your computer automatically if you have a +USB stick with your LUKS key inserted at boot. A passphrase will still be asked +if the LUKS key can not be found. .br -LUKSDEV="/dev/sda2" +For example, if your USB thumb drive has a FAT partition with label +"TRAVELSTICK" and the actual keyfile is called "/keys/alien.luks", then +you need to set: .br -ROOTDEV="cryptroot" +LUKSKEY="LABEL=TRAVELSTICK:/keys/alien.luks" .TP 5 .I ROOTDEV @@ -146,6 +169,12 @@ LVM="0" # Do not add LVM support to initrd LVM="1" # Add LVM support to initrd .TP 5 +.I UDEV +Use UDEV in the initrd. +.br +Example: UDEV="1" + +.TP 5 .I WAIT This defines the time to wait, in seconds, until all disks are detected. .br diff --git a/source/a/mkinitrd/mkinitrd.conf.sample b/source/a/mkinitrd/mkinitrd.conf.sample index 29e56f5f0..4838354b5 100644 --- a/source/a/mkinitrd/mkinitrd.conf.sample +++ b/source/a/mkinitrd/mkinitrd.conf.sample @@ -7,10 +7,12 @@ #KERNEL_VERSION="$(uname -r)" #KEYMAP="us" #MODULE_LIST="ext3" -#LUKSDEV="/dev/hda1" -#ROOTDEV="/dev/hda1" +#LUKSDEV="/dev/sda2" +#LUKSKEY="LABEL=TRAVELSTICK:/keys/alienbob.luks" +#ROOTDEV="/dev/sda1" #ROOTFS="ext3" -#RESUMEDEV="/dev/hda2" +#RESUMEDEV="/dev/sda2" #RAID="0" #LVM="0" +#UDEV="1" #WAIT="1" diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh index d3cdfb731..b26d9109c 100644 --- a/source/a/mkinitrd/mkinitrd_command_generator.sh +++ b/source/a/mkinitrd/mkinitrd_command_generator.sh @@ -47,6 +47,7 @@ FSTAB=${FSTAB:-"/etc/fstab"} # so we can test with alternate fstab files SOURCE_TREE=${SOURCE_TREE:-"/boot/initrd-tree"} CLEAR_TREE=${CLEAR_TREE:-1} KEYMAP=${KEYMAP:-"us"} +UDEV=${UDEV:-0} WAIT=${WAIT:-1} # A basic explanation of the commandline parameters: @@ -532,6 +533,7 @@ configurations are optional and you can stick to the defaults." 11 72 3 \ "KEYMAP" "Select keyboard layout (default: US)" \ $([ $USING_LUKS = 1 ] && echo on || echo off) \ "RESUMEDEV" "Select device for 'suspend-to-disk' feature" off \ +"UDEV" "Use UDEV in the initrd for device configuration" off \ "WAIT" "Add delay to allow detection of slow disks at boot" off) if [ "$?" != "0" ]; then exit 1 @@ -702,6 +704,10 @@ through the whole list of choices." \ [ -n "$KEYMAP" ] && KEYMAP=$(basename $KEYMAP .map) fi + if echo $EXTRA | grep -q UDEV ; then + UDEV=1 + fi + if echo $EXTRA | grep -q RESUMEDEV ; then # Print information about swap partitions: FREERAM=$(free -k | grep "^Mem:" | tr -s ' ' | cut -d' ' -f2) @@ -772,6 +778,10 @@ if [ -n "$KEYMAP" -a "$KEYMAP" != "us" ]; then # Add non-us keyboard mapping: MKINIT="$MKINIT -l $KEYMAP" fi +if [ $UDEV -eq 1 ]; then + # Add UDEV support: + MKINIT="$MKINIT -u" +fi if [ -n "$WAIT" -a $WAIT -ne 1 ]; then # Add non-default wait time: MKINIT="$MKINIT -w $WAIT" @@ -815,6 +825,7 @@ elif [ "$EMIT" = "conf" ]; then RESUMEDEV="$RESUMEDEV" RAID="$USING_RAID" LVM="$USING_LVM" + UDEV="$UDEV" WAIT="$WAIT" EOT fi diff --git a/source/a/mkinitrd/mkinitrd_kernelcheck.diff b/source/a/mkinitrd/mkinitrd_kernelcheck.diff deleted file mode 100644 index e1302f54e..000000000 --- a/source/a/mkinitrd/mkinitrd_kernelcheck.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- mkinitrd.orig 2008-11-30 15:35:58.000000000 +0100 -+++ mkinitrd 2008-12-11 11:16:37.000000000 +0100 -@@ -277,6 +277,12 @@ - esac - done - -+# If kernel modules are needed but the kernel version is absent, exit now: -+if [ ! -d /lib/modules/$KERNEL_VERSION ]; then -+ echo "No modules tree found for kernel \"$KERNEL_VERSION\"" -+ exit 1 -+fi -+ - # If clearing source tree was requested, do that first - if [ "$CLEAR_TREE" = "1" ]; then - clear_source_tree diff --git a/source/a/module-init-tools/doinst.sh b/source/a/module-init-tools/doinst.sh deleted file mode 100644 index 41ff1d753..000000000 --- a/source/a/module-init-tools/doinst.sh +++ /dev/null @@ -1,22 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} -config etc/modprobe.conf.new - -# Retain legacy behavior by tossing a symlink in /etc/modprobe.d/: -# Note that the plan is to eliminate /etc/modprobe.conf and -# /etc/modules.conf in the long run, so you may wish to remove the -# link and move your actual file into /etc/modprobe.d/ if you want -# to keep it instead of going with smaller chunks in there... -if [ -r etc/modprobe.conf ]; then - ( cd etc/modprobe.d ; ln -s ../modprobe.conf . 2> /dev/null ) -fi - diff --git a/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff b/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff deleted file mode 100644 index 1565d93a6..000000000 --- a/source/a/module-init-tools/modprobe.favor.etc.modprobe.d.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur module-init-tools-3.6.old/doc/modprobe.conf.sgml module-init-tools-3.6.new/doc/modprobe.conf.sgml ---- module-init-tools-3.6.old/doc/modprobe.conf.sgml 2009-02-04 01:45:24.000000000 -0600 -+++ module-init-tools-3.6.new/doc/modprobe.conf.sgml 2009-02-08 01:42:05.097637263 -0600 -@@ -35,7 +35,9 @@ - <para>Because the <command>modprobe</command> command can add or - remove extra more than one module, due to module dependencies, - we need a method of specifying what options are to be used with -- those modules. <filename>/etc/modprobe.conf</filename> (or, if that does not exist, all files under the <filename>/etc/modprobe.d</filename> directory) specifies -+ those modules. All of the files under the <filename>/etc/modprobe.d/</filename> -+ directory are used, or if that directory does not exist, the -+ <filename>/etc/modprobe.conf</filename> file specifies - those options, as required. It can also be used to create - convenient aliases: alternate names for a module. Finally, it - can override the normal <command>modprobe</command> behavior -diff -Nur module-init-tools-3.6.old/modprobe.c module-init-tools-3.6.new/modprobe.c ---- module-init-tools-3.6.old/modprobe.c 2009-02-04 01:45:24.000000000 -0600 -+++ module-init-tools-3.6.new/modprobe.c 2009-02-08 01:42:05.099636402 -0600 -@@ -1366,8 +1366,8 @@ - - static const char *default_configs[] = - { -- "/etc/modprobe.conf", - "/etc/modprobe.d", -+ "/etc/modprobe.conf", - }; - - static void read_toplevel_config(const char *filename, diff --git a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff index 24967f0b2..a65fba0ad 100644 --- a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff +++ b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff @@ -1,43 +1,41 @@ -diff -Nur module-init-tools-3.6.old/modprobe.c module-init-tools-3.6.new/modprobe.c ---- module-init-tools-3.6.old/modprobe.c 2009-02-04 01:45:24.000000000 -0600 -+++ module-init-tools-3.6.new/modprobe.c 2009-02-08 01:40:24.143637295 -0600 +diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modprobe.c +--- module-init-tools-3.11.orig/modprobe.c 2009-10-15 04:59:28.000000000 -0500 ++++ module-init-tools-3.11.new/modprobe.c 2009-10-15 08:14:12.108359199 -0500 @@ -38,6 +38,7 @@ #include <asm/unistd.h> #include <sys/wait.h> #include <syslog.h> +#include <regex.h> - #define streq(a,b) (strcmp((a),(b)) == 0) - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) -@@ -1275,6 +1276,20 @@ - return 1; + #include "util.h" + #include "elfops.h" +@@ -861,6 +862,20 @@ + options, commands, aliases, blacklist); } +/* Let's exclude a few file extensions */ +static int valid_file_name(const char *filename) +{ -+ static regex_t *re = NULL; ++ static regex_t *re = NULL; + -+ if (!re) { -+ re = NOFAIL(malloc(sizeof(regex_t))); -+ if (regcomp(re, "(^(\\.|\\.\\.)|\\.(new|orig|bak)$)", -+ REG_EXTENDED|REG_NOSUB) != 0) -+ fatal("regcomp failed: %s\n", strerror(errno)); -+ } -+ return regexec(re, filename, 0, NULL, 0); ++ if (!re) { ++ re = NOFAIL(malloc(sizeof(regex_t))); ++ if (regcomp(re, "(^(\\.|\\.\\.)|\\.(new|orig|bak)$)", ++ REG_EXTENDED|REG_NOSUB) != 0) ++ fatal("regcomp failed: %s\n", strerror(errno)); ++ } ++ return regexec(re, filename, 0, NULL, 0); +} + - /* Simple format, ignore lines starting with #, one command per line. - Returns true or false. */ - static int read_config(const char *filename, -@@ -1294,7 +1309,10 @@ - if (dir) { - struct dirent *i; + static int parse_config_scan(const char *filename, + const char *name, + int dump_only, +@@ -887,6 +902,8 @@ while ((i = readdir(dir)) != NULL) { -+ /* Removed this line: - if (!streq(i->d_name,".") && !streq(i->d_name,"..") -+ and replaced with this one: */ -+ if (valid_file_name(i->d_name) - && config_filter(i->d_name)) { - char sub[strlen(filename) + 1 - + strlen(i->d_name) + 1]; + size_t len; + ++ if (!valid_file_name(i->d_name)) ++ continue; + if (i->d_name[0] == '.') + continue; + if (!config_filter(i->d_name)) diff --git a/source/a/module-init-tools/modprobe.no_sys_check.diff b/source/a/module-init-tools/modprobe.no_sys_check.diff deleted file mode 100644 index 90e9a7d19..000000000 --- a/source/a/module-init-tools/modprobe.no_sys_check.diff +++ /dev/null @@ -1,51 +0,0 @@ -http://bugs.gentoo.org/258442 - -From 1a55ee5297b883ea4b43cdf74ad890873ebe966c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Fri, 13 Feb 2009 02:21:10 -0500 -Subject: [PATCH] modprobe: remove pointless /sys requirement - -When modprobe was converted from parsing /proc to parsing /sys, it was not -a straight conversion. Instead, a "sanity" check was added early on where -modprobe would simply abort doing anything useful if /sys isn't mounted. -Unfortunately, this makes modprobe fairly unusable. Considering the -kernel itself can invoke modprobe before userspace gets a chance to start -the init process (and actually mount /sys), we end up with a chicken and -egg issue. Which gets even worse when the kernel keeps running modprobe -over and over and the boot output fills up with: -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. -modprobe: FATAL: /sys is not mounted. - -Since modprobe itself is already written to handle the case where it -cannot figure out whether a given module is loaded (and so was able to run -perfectly fine without /proc being mounted), the check is wholly useless. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - modprobe.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/modprobe.c b/modprobe.c -index 022004c..110204b 100644 ---- a/modprobe.c -+++ b/modprobe.c -@@ -1522,11 +1522,6 @@ static void handle_module(const char *modname, - const char *cmdline_opts, - int flags) - { -- struct stat finfo; -- -- if (stat("/sys/module", &finfo) < 0) -- fatal("/sys is not mounted.\n"); -- - if (list_empty(todo_list)) { - const char *command; - --- -1.6.1.3 - - diff --git a/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff b/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff new file mode 100644 index 000000000..640ab3086 --- /dev/null +++ b/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff @@ -0,0 +1,15 @@ +--- ./modprobe.c.orig 2010-02-06 13:56:19.000000000 -0600 ++++ ./modprobe.c 2010-02-06 14:00:49.000000000 -0600 +@@ -971,10 +971,8 @@ + } + + /* deprecated config file */ +- if (parse_config_file("/etc/modprobe.conf", name, dump_only, removing, +- options, commands, aliases, blacklist) > 0) +- warn("Deprecated config file /etc/modprobe.conf, " +- "all config files belong into /etc/modprobe.d/.\n"); ++ parse_config_file("/etc/modprobe.conf", name, dump_only, removing, ++ options, commands, aliases, blacklist); + + /* default config */ + parse_config_scan("/etc/modprobe.d", name, dump_only, removing, diff --git a/source/a/module-init-tools/module-init-tools.SlackBuild b/source/a/module-init-tools/module-init-tools.SlackBuild index d69b43bc2..9b390d11a 100755 --- a/source/a/module-init-tools/module-init-tools.SlackBuild +++ b/source/a/module-init-tools/module-init-tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.6 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo module-init-tools-*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-module-init-tools @@ -36,7 +45,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf module-init-tools-$VERSION -tar xvf $CWD/module-init-tools-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/module-init-tools-$VERSION.tar.?z* || exit 1 cd module-init-tools-$VERSION || exit 1 chown -R root:root . find . \ @@ -45,20 +54,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Look for /etc/modprobe.d/ first rather than bailing on the idea if -# /etc/modprobe.conf exists. IMHO, this is a better default behavior -# because it allows /etc/modprobe.conf to remain behind if something -# still looks there, and allows a smoother transition towards using -# /etc/modprobe.d/ instead. -zcat $CWD/modprobe.favor.etc.modprobe.d.diff.gz | patch -p1 --verbose || exit 1 - # Exclude *.{old,new,bak} files (and a few others that obviously aren't # valid for this... Thanks to Marco d'Itri for the patch that it's based on -zcat $CWD/modprobe.ignore_some_suffixes.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/modprobe.ignore_some_suffixes.diff.gz | patch -p1 || exit 1 -# We get (pointless) errors in early stages of the boot if modprobe checks for -# a mounted /sys before it actually gets mounted: -zcat $CWD/modprobe.no_sys_check.diff.gz | patch -p1 --verbose || exit 1 +# Using modprobe.conf still works, so don't whine about it, +# especially since there's nothing in /etc/modprobe.conf +# except for comments explaining not to use it. +zcat $CWD/modprobe.quit.whining.about.modprobe.conf.diff.gz | patch -p1 || exit 1 # Using --bindir=/sbin to make lsmod go there too CFLAGS= \ @@ -73,49 +76,37 @@ CFLAGS= \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# We don't need this -rm -f $PKG/sbin/generate-modprobe.conf +# Create the config directory just in case +mkdir -p $PKG/etc/modprobe.d/ -# Links lsmod into /bin +# Link lsmod into /bin mkdir -p $PKG/bin ( cd $PKG/bin ; ln -sf /sbin/lsmod . ) -# Add manpage symlink for modprobe.d -( cd $PKG/usr/man/man5 - if [ -f modprobe.conf.5 -a ! -e modprobe.d.5 ]; then - ln -sf modprobe.conf.5 modprobe.d.5 - fi -) - # Compress manpages ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) -mkdir -p $PKG/etc/modprobe.d/ -cat << EOF > $PKG/etc/modprobe.conf.new -# /etc/modprobe.conf (old location for Linux 2.6+ config) -# -# The use of this config file is deprecated. -# Instead, create files in the /etc/modprobe.d/ directory -# containing modprobe options. -# -# For more information, see "man modprobe.conf". -EOF - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/module-init-tools-$VERSION -# Most of these are out of date cp -a \ - AUTHORS CODING COPYING FAQ HACKING INSTALL NEWS README TODO \ + AUTHORS CODING COPYING FAQ README TODO \ $PKG/usr/doc/module-init-tools-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/module-init-tools-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/module-init-tools/slack-desc b/source/a/module-init-tools/slack-desc index 2f0ca3316..99d071b0e 100644 --- a/source/a/module-init-tools/slack-desc +++ b/source/a/module-init-tools/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler-------------------------------------------------------| module-init-tools: module-init-tools (kernel module utilities) module-init-tools: module-init-tools: Utilities to load and unload kernel modules. These are used on Linux diff --git a/source/a/ntfs-3g/10-ntfs-3g-policy.fdi b/source/a/ntfs-3g/10-ntfs-3g-policy.fdi index baaf81591..8b837d101 100644 --- a/source/a/ntfs-3g/10-ntfs-3g-policy.fdi +++ b/source/a/ntfs-3g/10-ntfs-3g-policy.fdi @@ -1,13 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Theoretically, this file should ship with ntfs-3g --> + <deviceinfo version="0.2"> <device> - <match key="volume.fstype" string="ntfs"> - <match key="@block.storage_device:storage.hotpluggable" bool="true"> - <merge key="volume.fstype" type="string">ntfs-3g</merge> - <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge> - <append key="volume.mount.valid_options" type="strlist">locale=</append> + <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> + <match key="volume.fstype" string="ntfs"> + + <!-- "Register" ntfs-3g as a valid alternative handler --> + <append key="volume.fstype.alternative" type="strlist">ntfs-3g</append> + + <!-- "Register" ntfs-3g as the preferred alternative handler --> + <merge key="volume.fstype.alternative.preferred" type="string">ntfs-3g</merge> + + <!-- Set valid mount options --> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">ro</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">sync</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">dirsync</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">noatime</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">nodiratime</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">noexec</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">quiet</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">remount</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">exec</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">locale=</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">uid=</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">gid=</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">umask=</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">dmask=</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">fmask=</append> + <append key="volume.mount.ntfs-3g.valid_options" type="strlist">utf8</append> + </match> </match> </device> </deviceinfo> + diff --git a/source/a/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild index 2883d4fbf..93612e0c3 100755 --- a/source/a/ntfs-3g/ntfs-3g.SlackBuild +++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for ntfs-3g -# Copyright (c) 2008, Antonio Hernandez Blas <hba.nihilismus@gmail.com> +# Copyright 2008 Antonio Hernandez Blas <hba.nihilismus@gmail.com> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -25,13 +25,22 @@ # Modified by Patrick Volkerding <volkerdi@slackware.com> # Modified by Eric Hameleers <alien@slackware.com> -PRGNAM=ntfs-3g -VERSION=${VERSION:-2009.4.4} -ARCH=${ARCH:-x86_64} +PKGNAM=ntfs-3g +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -41,18 +50,21 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -68,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --bindir=/bin \ --sbindir=/sbin \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --with-fuse=internal \ --disable-ldconfig \ --enable-static=no \ @@ -78,7 +90,8 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Add the HAL fdi file so that automount uses "ntfs-3g" as filesystem type +# Add the HAL fdi file so that automount uses ntfs-3g for mounting +# This should work with the "volume.fstype.alternative.*" in hal-0.5.12+ mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor cat $CWD/10-ntfs-3g-policy.fdi \ > $PKG/usr/share/hal/fdi/policy/10osvendor/10-ntfs-3g-policy.fdi @@ -92,14 +105,22 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ ) rm -rf $PKG/usr/share/doc -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* CREDITS INSTALL NEWS README* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/pciutils/pciutils.SlackBuild b/source/a/pciutils/pciutils.SlackBuild index 183c7adde..b3425b6a9 100755 --- a/source/a/pciutils/pciutils.SlackBuild +++ b/source/a/pciutils/pciutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-3.1.3} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo pciutils-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-pciutils @@ -46,7 +55,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf pciutils-$VERSION -tar xvf $CWD/pciutils-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/pciutils-$VERSION.tar.?z* || exit 1 cd pciutils-$VERSION chown -R root:root . @@ -64,7 +73,7 @@ sh update-pciids.sh zcat $CWD/pciutils.ids.dest.diff.gz | patch -p1 --verbose || exit 1 mkdir -p $PKG/usr/sbin cat update-pciids.sh > $PKG/usr/sbin/update-pciids -chmod 755 $PKG/usr/sbin/update-pciids +chmod 0755 $PKG/usr/sbin/update-pciids make \ PREFIX=/usr \ @@ -81,7 +90,7 @@ make install install-lib \ MANDIR=/usr/man \ DESTDIR=$PKG -# Do not compress pci.ids - hal-0.5.11 needs it uncompressed +# Do not compress pci.ids - hal needs it uncompressed ( cd $PKG/usr/share ; gzip -d pci.ids.gz ) # Remove the update-pciids script that 'make install' placed rm -f $PKG/sbin/update-pciids diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index da70e19f0..46235e16e 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2005, 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,9 +27,9 @@ fi PKG=$TMP/package-pkgtools # *** UPDATE THESE WITH EACH BUILD: -VERSION=13.0 +VERSION=13.1 ARCH=${ARCH:-noarch} -BUILD=3 +BUILD=1 if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source diff --git a/source/a/pkgtools/scripts/explodepkg b/source/a/pkgtools/scripts/explodepkg index a113b085d..110ebf069 100644 --- a/source/a/pkgtools/scripts/explodepkg +++ b/source/a/pkgtools/scripts/explodepkg @@ -46,7 +46,7 @@ Explodes a Slackware compatible software package (or any tar+{gzip,bzip2,lzma,xz archive) in the current directory. Equivalent to (for each package listed): - ( umask 000 ; cat package_name | COMPRESSOR -dc | tar xzvf package_name ) + ( umask 000 ; cat package_name | COMPRESSOR -dc | tar xvf package_name ) Note: This should only be used for debugging or examining packages, not for installing them. It doesn't execute installation scripts or update the package diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool index 6191e36e7..c0a2a9730 100644 --- a/source/a/pkgtools/scripts/pkgtool +++ b/source/a/pkgtools/scripts/pkgtool @@ -4,7 +4,7 @@ # 1998, 1999 Patrick Volkerding, Moorhead, MN USA # Copyright 2001, 2004 Slackware Linux, Inc., Concord, CA USA # All rights reserved. -# Copyright 2007, 2009 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2009, 2010 Patrick Volkerding, Sebeka, MN, USA # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -81,11 +81,11 @@ if [ -L /bin/chmod -a -L /bin/chown ]; then # probably on the bootdisk using bus echo "You can't run pkgtool from the rootdisk until you've mounted your Linux" echo "partitions beneath /mnt. Here are some examples of this:" echo - echo "If your root partition is /dev/hda1, and is using ext2fs, you would type:" - echo "mount /dev/hda1 /mnt -t ext2" + echo "If your root partition is /dev/sda1, and is using ext2fs, you would type:" + echo "mount /dev/sda1 /mnt -t ext2" echo - echo "Then, supposing your /usr partition is /dev/hda2, you must do this:" - echo "mount /dev/hda2 /mnt/usr -t ext2" + echo "Then, supposing your /usr partition is /dev/sda2, you must do this:" + echo "mount /dev/sda2 /mnt/usr -t ext2" echo echo "Please mount your Linux partitions and then run pkgtool again." echo @@ -210,7 +210,7 @@ else # there were no arguments, so we'll get the needed information from the CMD_START="true" rm -f $TMP/SeT* while [ 0 ]; do - dialog --title "Slackware Package Tool (pkgtool version 13.0)" \ + dialog --title "Slackware Package Tool (pkgtool version 13.1)" \ --menu "\nWelcome to the Slackware package tool.\n\ \nWhich option would you like?\n" 17 75 7 \ "Current" "Install packages from the current directory" \ diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg index cc3250dae..6b0c2abb4 100644 --- a/source/a/pkgtools/scripts/upgradepkg +++ b/source/a/pkgtools/scripts/upgradepkg @@ -245,7 +245,7 @@ if [ ! -r $ROOT/var/log/packages/$OLD ]; then +============================================================================== EOF - installpkg $INCOMINGDIR/$NNAME + /sbin/installpkg $INCOMINGDIR/$NNAME fi fi shift 1 @@ -323,11 +323,11 @@ EOF # Next, the new package is pre-installed: if [ "$VERBOSE" = "verbose" ]; then - installpkg $INCOMINGDIR/$NNAME + /sbin/installpkg $INCOMINGDIR/$NNAME RETCODE=$? else echo "Pre-installing package $NEW..." - installpkg $INCOMINGDIR/$NNAME 1> /dev/null + /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null RETCODE=$? fi # Make sure that worked: @@ -347,9 +347,9 @@ if [ -d "$ROOT" ]; then ( cd $ROOT/var/log/packages for rempkg in *-$TIMESTAMP ; do if [ "$VERBOSE" = "verbose" ]; then - ROOT=$ROOT removepkg $rempkg + ROOT=$ROOT /sbin/removepkg $rempkg else - ROOT=$ROOT removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:" + ROOT=$ROOT /sbin/removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:" fi done ) @@ -357,9 +357,9 @@ else ( cd /var/log/packages for rempkg in *-$TIMESTAMP ; do if [ "$VERBOSE" = "verbose" ]; then - removepkg $rempkg + /sbin/removepkg $rempkg else - removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:" + /sbin/removepkg $rempkg | grep -v "Skipping\." | grep -v "Removing files:" fi done ) @@ -370,7 +370,7 @@ echo # Seriously, the reinstalling of a package can be crucial if any files # shift location, so we should always reinstall as the final step: if [ ! "$NOT_PARANOID" = "true" ]; then - installpkg $INCOMINGDIR/$NNAME + /sbin/installpkg $INCOMINGDIR/$NNAME fi echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME." diff --git a/source/a/rpm2tgz/patches/0001-fix-d-handling.patch b/source/a/rpm2tgz/patches/0001-fix-d-handling.patch new file mode 100644 index 000000000..ca15a98fd --- /dev/null +++ b/source/a/rpm2tgz/patches/0001-fix-d-handling.patch @@ -0,0 +1,26 @@ +From 976ac157b878ecc260d54e3b5a1f3cd4403259df Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 21:13:02 +0400 +Subject: [PATCH 1/6] fix -d handling + +this option also requires get_meta_data() call +to set $PRGNAM properly +--- + rpm2tgz | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index 5c91c64..f5f206c 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -202,6 +202,7 @@ for i in $* ; do + + # Save the rpm's summary and description as the slack-desc + if [ "$DESC" = "true" ]; then ++ get_meta_data $i + mkdir -p $TMPDIR/install + rpm -qp --qf %{SUMMARY} $i | sed -l 70 -r "s/^(.*)/$PRGNAM: $PRGNAM - \1\n/" > $TMPDIR/install/slack-desc + rpm -qp --qf %{DESCRIPTION} $i | sed -l 70 -r "s/^/$PRGNAM: /" >> $TMPDIR/install/slack-desc +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch b/source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch new file mode 100644 index 000000000..92a9cb259 --- /dev/null +++ b/source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch @@ -0,0 +1,34 @@ +From e2a9bf836465dbb138ee83ccbe41b385e4648014 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 22:02:45 +0400 +Subject: [PATCH 2/6] fix spurious path to rpm file with -n option + +there is no need to prepend $CWD to the path to file, +as it produce wrong path in the case, when path to file +is not relative to the current working directory +--- + rpm2tgz | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index f5f206c..c41f456 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -213,11 +213,12 @@ for i in $* ; do + # makepkg to produce the .tgz: + if [ "$(basename $0)" = "rpm2tgz" ]; then + ( +- cd $TMPDIR + if [ "$META_NAME" = "true" ]; then +- get_meta_data $CWD/$i ++ get_meta_data $i ++ cd $TMPDIR + makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz + else ++ cd $TMPDIR + makepkg -l y -c n $CWD/$(basename $i .rpm).tgz + fi + ) +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch b/source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch new file mode 100644 index 000000000..07d20286a --- /dev/null +++ b/source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch @@ -0,0 +1,29 @@ +From c57c0a39b6745203ebec36f37318ea3b0b4820f9 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 22:06:56 +0400 +Subject: [PATCH 3/6] allow every user to use rpm2tgz + +--- + rpm2tgz | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index c41f456..4818b74 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -216,10 +216,10 @@ for i in $* ; do + if [ "$META_NAME" = "true" ]; then + get_meta_data $i + cd $TMPDIR +- makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz ++ /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz + else + cd $TMPDIR +- makepkg -l y -c n $CWD/$(basename $i .rpm).tgz ++ /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).tgz + fi + ) + else +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch b/source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch new file mode 100644 index 000000000..836b36e5a --- /dev/null +++ b/source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch @@ -0,0 +1,29 @@ +From 531b6f6c429678f69f2c90280a1e706eed6dcfbc Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 22:56:56 +0400 +Subject: [PATCH 4/6] produce more compliant slack-desc + +slackware uses slightly different format for slack-desc files +from that which is used by rpm2tgz; +also remove all -l 70 options as it is only usable with l command +--- + rpm2tgz | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index 4818b74..cc25407 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -204,8 +204,7 @@ for i in $* ; do + if [ "$DESC" = "true" ]; then + get_meta_data $i + mkdir -p $TMPDIR/install +- rpm -qp --qf %{SUMMARY} $i | sed -l 70 -r "s/^(.*)/$PRGNAM: $PRGNAM - \1\n/" > $TMPDIR/install/slack-desc +- rpm -qp --qf %{DESCRIPTION} $i | sed -l 70 -r "s/^/$PRGNAM: /" >> $TMPDIR/install/slack-desc ++ rpm -qp --qf '%{NAME} (%{SUMMARY})\n\n%{DESCRIPTION}\n\n %{URL}\n' $i | head -n 11 | sed -r "s/^/$PRGNAM: /" > $TMPDIR/install/slack-desc + fi + + # If this program was called as "rpm2targz", then repack as a plain +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch b/source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch new file mode 100644 index 000000000..b4849c298 --- /dev/null +++ b/source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch @@ -0,0 +1,47 @@ +From 49c80142bf0f0ead2bcff8b03a39aa98e38f2dd9 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 23:11:55 +0400 +Subject: [PATCH 5/6] gzip man & info pages + +we don't want to repack package just to fix not gzipped man pages +--- + rpm2tgz | 23 +++++++++++++++++++++++ + 1 files changed, 23 insertions(+), 0 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index cc25407..32c450b 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -206,6 +206,29 @@ for i in $* ; do + mkdir -p $TMPDIR/install + rpm -qp --qf '%{NAME} (%{SUMMARY})\n\n%{DESCRIPTION}\n\n %{URL}\n' $i | head -n 11 | sed -r "s/^/$PRGNAM: /" > $TMPDIR/install/slack-desc + fi ++ ++ # Compress and link manpages, if any: ++ if [ -d $TMPDIR/usr/man ]; then ++ ( cd $TMPDIR/usr/man ++ for manpagedir in $(find . -type d -name "man*") ; do ++ ( cd $manpagedir ++ for eachpage in $(find . -type l -maxdepth 1) ; do ++ ln -s $( readlink $eachpage ).gz $eachpage.gz ++ rm $eachpage ++ done ++ gzip -9 *.? ++ ) ++ done ++ ) ++ fi ++ ++ # Compress info files, if any: ++ if [ -d $TMPDIR/usr/info ]; then ++ ( cd $TMPDIR/usr/info ++ rm -f dir ++ gzip -9 * ++ ) ++ fi + + # If this program was called as "rpm2targz", then repack as a plain + # tar+gz archive. If it was called as "rpm2tgz", use Slackware's +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch b/source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch new file mode 100644 index 000000000..5d86972f0 --- /dev/null +++ b/source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch @@ -0,0 +1,45 @@ +From 60b1b269e13d6ac5f167c898f92d1c33a4caf779 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 23:19:05 +0400 +Subject: [PATCH 6/6] should we use .txz format in slackware-current? + +yes, everyone loves xz +--- + rpm2tgz | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index 32c450b..4dd3756 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -231,22 +231,22 @@ for i in $* ; do + fi + + # If this program was called as "rpm2targz", then repack as a plain +- # tar+gz archive. If it was called as "rpm2tgz", use Slackware's +- # makepkg to produce the .tgz: ++ # tar+xz archive. If it was called as "rpm2tgz", use Slackware's ++ # makepkg to produce the .txz: + if [ "$(basename $0)" = "rpm2tgz" ]; then + ( + if [ "$META_NAME" = "true" ]; then + get_meta_data $i + cd $TMPDIR +- /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz ++ /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.txz + else + cd $TMPDIR +- /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).tgz ++ /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).txz + fi + ) + else + ( cd $TMPDIR ; tar cf - . ) > $(basename $i .rpm).tar +- gzip -9 $(basename $i .rpm).tar ++ xz -9 $(basename $i .rpm).tar + fi + + # Remove temporary directory: +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/rpm2targz b/source/a/rpm2tgz/rpm2targz index 484e5ad05..5c91c64a4 100644 --- a/source/a/rpm2tgz/rpm2targz +++ b/source/a/rpm2tgz/rpm2targz @@ -22,22 +22,35 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -if [ "$1" = "" ]; then +CWD=$(pwd) + +# Breaking the help out into it's own deal +usage() { echo "$0: Converts RPM format to standard GNU tar + GNU zip format." echo " (view converted packages with \"less\", install and remove" echo " with \"installpkg\", \"removepkg\", \"pkgtool\", or manually" echo " with \"tar\")" echo - echo "Usage: $0 <file.rpm>" if [ "$(basename $0)" = "rpm2tgz" ]; then + echo "Usage: $0 [OPTION] <file.rpm>" echo " (Outputs \"file.tgz\")" + echo + echo " -s extract the install scripts to /usr/doc/\$PRGNAM-\$VERSION/" + echo " for review." + echo " -S extracts the install scripts to be executed on package installation" + echo " (only pre-install and post-install scripts used)" + echo " USE WITH CAUTION! " + echo " -n name the output package using the rpm's metadata" + echo " -r extract what the rpm's \"requires\" (dependencies)" + echo " as documention to /usr/doc/\$PRGNAM-\$VERSION/" + echo " -d attempt a wellformed slack-desc from the rpm meta data" + echo else + echo "Usage: $0 <file.rpm>" echo " (Outputs \"file.tar.gz\")" fi exit 1; -fi - -CWD=$(pwd) +} # Create a new temporary directory with a secure filename: make_temp_dir() { @@ -67,6 +80,51 @@ make_temp_dir() { fi } +# Get the meta data off of the rpm +get_meta_data() { + RPM=$1 + PRGNAM=$(rpm -qp --qf %{NAME} $RPM ) + ARCH=$(rpm -qp --qf %{ARCH} $RPM ) + VERSION=$(rpm -qp --qf %{VERSION} $RPM ) + BUILD=$(rpm -qp --qf %{RELEASE} $RPM ) +} + +if [ "$1" = "" ]; then + usage +fi + +ARGS=$(getopt "hsSndr" $* ) +set -- ${ARGS} +for i; do + case "$1" in + -s) + DOC_SCRIPTS="true" + shift + ;; + -S) + INSTALL_SCRIPTS="true" + shift + ;; + -r) + DOC_REQUIRES="true" + shift + ;; + -d) + DESC="true" + shift + ;; + -n) + META_NAME="true" + shift + ;; + --) + shift + break + ;; + esac +done + + for i in $* ; do # Determine if this is a source or binary RPM. @@ -78,7 +136,7 @@ for i in $* ; do isSource=0 fi else # use file. This works fine on Slackware, and is the default. - if file $i | grep RPM | grep " src " 1> /dev/null 2> /dev/null ; then + if file $i | grep RPM | grep -w src 1> /dev/null 2> /dev/null ; then isSource=1 else isSource=0 @@ -112,11 +170,56 @@ for i in $* ; do find . -type d -perm 700 -exec chmod 755 {} \; ) + # Save the scripts in the rpm as documentation + if [ "$DOC_SCRIPTS" = "true" ]; then + get_meta_data $i + mkdir -p $TMPDIR/usr/doc/$PRGNAM-$VERSION/ + for state in PREIN POSTIN PREUN POSTUN ; do + if [ "$(rpm -qp --qf %{$state} $i )" != '(none)' ] ; then + rpm -qp --qf %{$state} $i > $TMPDIR/usr/doc/$PRGNAM-$VERSION/$state.script + fi + done + fi + + # Save the scripts in the rpm to be installed + if [ "$INSTALL_SCRIPTS" = "true" ]; then + mkdir -p $TMPDIR/install + echo '#!/bin/sh' > $TMPDIR/install/doinst.sh + for state in PREIN POSTIN ; do + if [ "$(rpm -qp --qf %{$state} $i )" != '(none)' ] ; then + rpm -qp --qf %{$state} $i > $TMPDIR/install/doinst.sh + echo "" >> $TMPDIR/install/doinst.sh + fi + done + fi + + # Save the rpm's requires (dependencies) as documentation + if [ "$DOC_REQUIRES" = "true" ]; then + get_meta_data $i + mkdir -p $TMPDIR/usr/doc/$PRGNAM-$VERSION/ + rpm -qp --qf %{REQUIRES} $i > $TMPDIR/usr/doc/$PRGNAM-$VERSION/README-$PRGNAM-rpm-dependencies.txt + fi + + # Save the rpm's summary and description as the slack-desc + if [ "$DESC" = "true" ]; then + mkdir -p $TMPDIR/install + rpm -qp --qf %{SUMMARY} $i | sed -l 70 -r "s/^(.*)/$PRGNAM: $PRGNAM - \1\n/" > $TMPDIR/install/slack-desc + rpm -qp --qf %{DESCRIPTION} $i | sed -l 70 -r "s/^/$PRGNAM: /" >> $TMPDIR/install/slack-desc + fi + # If this program was called as "rpm2targz", then repack as a plain # tar+gz archive. If it was called as "rpm2tgz", use Slackware's # makepkg to produce the .tgz: if [ "$(basename $0)" = "rpm2tgz" ]; then - ( cd $TMPDIR ; makepkg -l y -c n $CWD/$(basename $i .rpm).tgz ) + ( + cd $TMPDIR + if [ "$META_NAME" = "true" ]; then + get_meta_data $CWD/$i + makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz + else + makepkg -l y -c n $CWD/$(basename $i .rpm).tgz + fi + ) else ( cd $TMPDIR ; tar cf - . ) > $(basename $i .rpm).tar gzip -9 $(basename $i .rpm).tar diff --git a/source/a/rpm2tgz/rpm2tgz.SlackBuild b/source/a/rpm2tgz/rpm2tgz.SlackBuild index abfe3298a..c6d766093 100755 --- a/source/a/rpm2tgz/rpm2tgz.SlackBuild +++ b/source/a/rpm2tgz/rpm2tgz.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,13 +20,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.1 -ARCH=${ARCH:-x86_64} +VERSION=1.2.1 BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-bin +PKG=$TMP/package-rpm2tgz rm -rf $PKG mkdir -p $TMP $PKG @@ -38,8 +47,26 @@ cd $TMP mkdir -p $PKG/usr/bin cc -o $PKG/usr/bin/rpmoffset $CWD/rpmoffset.c cat $CWD/rpm2targz > $PKG/usr/bin/rpm2targz -chmod 755 $PKG/usr/bin/{rpmoffset,rpm2targz} + +# Apply some patches: +( cd $PKG/usr/bin + # These are all against "rpm2tgz", so mv it until we are done patching: + mv rpm2targz rpm2tgz + zcat $CWD/patches/0001-fix-d-handling.patch.gz | patch -p1 || exit 1 + zcat $CWD/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch.gz | patch -p1 || exit 1 + zcat $CWD/patches/0003-allow-every-user-to-use-rpm2tgz.patch.gz | patch -p1 || exit 1 + zcat $CWD/patches/0004-produce-more-compliant-slack-desc.patch.gz | patch -p1 || exit 1 + # Not applied. Rationale: We do not want to alter the files in the RPM. + #zcat $CWD/patches/0005-gzip-man-info-pages.patch.gz | patch -p1 || exit 1 + # Not applied. Rationale: .tgz works with all versions of Slackware. + # Translated RPMs may be targeting systems with no .txz support. + #zcat $CWD/patches/0006-should-we-use-.txz-format-in-slackware-current.patch.gz | patch -p1 || exit 1 + # mv the script back: + mv rpm2tgz rpm2targz +) || exit 1 + ( cd $PKG/usr/bin ; ln -sf rpm2targz rpm2tgz ) +chmod 755 $PKG/usr/bin/{rpmoffset,rpm2targz} mkdir -p $PKG/usr/doc/rpm2targz cp -a $CWD/rpm2targz.README $PKG/usr/doc/rpm2targz/rpm2targz.README chown root:root $PKG/usr/doc/rpm2targz/rpm2targz.README diff --git a/source/a/rpm2tgz/rpmoffset.c b/source/a/rpm2tgz/rpmoffset.c index 57af397c6..fd09e623b 100644 --- a/source/a/rpm2tgz/rpmoffset.c +++ b/source/a/rpm2tgz/rpmoffset.c @@ -5,6 +5,7 @@ /* Wouldn't it be a lot more sane if we could just untar these things? */ #include <stdlib.h> +#include <stdio.h> /* These offsets keep getting bigger, so we're going to just bite a 2MB */ /* chunk of RAM right away so that we have enough. Yeah, horrible */ diff --git a/source/a/sdparm/sdparm.SlackBuild b/source/a/sdparm/sdparm.SlackBuild index e00a93568..c0d155ef3 100755 --- a/source/a/sdparm/sdparm.SlackBuild +++ b/source/a/sdparm/sdparm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,16 +22,24 @@ PKGNAM=sdparm -VERSION=${VERSION:-1.01} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} - +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-"-j6"} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -39,11 +47,15 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2" +else + SLKCFLAGS="-O2" fi +rm -rf $PKG +mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xjvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION # Make sure ownerships and permissions are sane: @@ -68,13 +80,15 @@ CFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux # Build and install: -make -j4 || exit 1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 # Strip binaries: ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) # Compress and link manpages, if any: @@ -96,12 +110,19 @@ fi mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ AUTHORS COPYING CREDITS INSTALL NEWS README notes.txt \ - doc/sdparm.html \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/sed/sed.SlackBuild b/source/a/sed/sed.SlackBuild index 8dedfc4b4..7684a10dc 100755 --- a/source/a/sed/sed.SlackBuild +++ b/source/a/sed/sed.SlackBuild @@ -21,22 +21,35 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=4.1.5 -ARCH=${ARCH:-x86_64} +VERSION=4.2.1 BUILD=${BUILD:-1} CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-sed +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i386" ]; then SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi rm -rf $PKG @@ -44,34 +57,61 @@ mkdir -p $PKG $PKG cd $TMP rm -rf sed-$VERSION -tar xzvf $CWD/sed-$VERSION.tar.gz +tar xvf $CWD/sed-$VERSION.tar.?z* || exit 1 cd sed-$VERSION chown -R root:root . find . -perm 777 -exec chmod 755 {} \; find . -perm 664 -exec chmod 644 {} \; + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - $ARCH-slackware-linux -make -j5 -make install DESTDIR=$PKG + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --docdir=/usr/doc/sed-$VERSION \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + mkdir -p $PKG/bin mv $PKG/usr/bin/sed $PKG/bin ( cd $PKG/usr/bin ; ln -sf /bin/sed . ) + ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/* + mkdir -p $PKG/usr/doc/sed-$VERSION cp -a \ - ANNOUNCE AUTHORS BUGS COPYING* INSTALL NEWS README README.boot THANKS TODO \ + AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS \ $PKG/usr/doc/sed-$VERSION -gzip -9 $PKG/usr/man/man?/*.? -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/sed-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/sed-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser index 02385e33c..038a0a949 100644 --- a/source/a/shadow/adduser +++ b/source/a/shadow/adduser @@ -1,8 +1,8 @@ #!/bin/bash # # Copyright 1995 Hrvoje Dogan, Croatia. -# Copyright 2002, 2003, 2004, 2008, 2009 Stuart Winter, Surrey, England, UK. -# Copyright 2004, 2008, 2009 Slackware Linux, Inc., Concord, CA, USA +# Copyright 2002-2004, 2008, 2009, 2010 Stuart Winter, Surrey, England, UK. +# Copyright 2004, 2008-2010 Slackware Linux, Inc., Concord, CA, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,12 +29,15 @@ # Author : Stuart Winter <mozes@slackware.com> # Based on the original Slackware adduser by Hrvoje Dogan # with modifications by Patrick Volkerding -# Version: 1.12 +# Version: 1.13 ########################################################################## # Usage..: adduser [<new_user_name>] ########################################################################## # History # ########### +# v1.13 - 13/01/10 +# * Fix bug that removed underscore characters from group names. +# Thanks to mRgOBLIN for the report and Jim Hawkins for the fix. <sw> # v1.12 - 21/07/09 # * Adjusted the search of /etc/passwd to exclude the NIS inclusion # string. Thanks to Dominik L. Borkowski. @@ -282,8 +285,8 @@ while [ ! -z "$needinput" ]; do history -c history -s "$AGID" echo "Press ENTER to continue without adding any additional groups" - echo "Or press the UP arrow to add/select/edit additional groups" - AGID="$(get_input ": " | tr -d '[:punct:]' | tr -s ' ' | sed 's?^ $??g' )" + echo "Or press the UP arrow key to add/select/edit additional groups" + AGID="$(get_input ": " | sed 's/[^A-Za-z0-9 _]//g;s/ */ /g;s/^ $//g' )" if [ ! -z "$AGID" ]; then check_group "$AGID" # check all groups at once (treated as N # of params) if [ $? -gt 0 ]; then diff --git a/source/a/shadow/doinst.sh b/source/a/shadow/doinst.sh new file mode 100644 index 000000000..88fefb3af --- /dev/null +++ b/source/a/shadow/doinst.sh @@ -0,0 +1,17 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/login.access.new +config etc/login.defs.new +config var/log/faillog.new +rm -f var/log/faillog.new + diff --git a/source/a/shadow/login.defs b/source/a/shadow/login.defs new file mode 100644 index 000000000..dde37c97b --- /dev/null +++ b/source/a/shadow/login.defs @@ -0,0 +1,387 @@ +# +# /etc/login.defs - Configuration control definitions for the shadow package. +# +# $Id: login.defs 3038 2009-07-23 20:41:35Z nekral-guest $ +# + +# +# Delay in seconds before being allowed another attempt after a login failure +# +FAIL_DELAY 3 + +# +# Enable logging and display of /var/log/faillog login failure info. +# +FAILLOG_ENAB yes + +# +# Enable display of unknown usernames when login failures are recorded. +# +LOG_UNKFAIL_ENAB no + +# +# Enable logging of successful logins +# +LOG_OK_LOGINS no + +# +# Enable logging and display of /var/log/lastlog login time info. +# +LASTLOG_ENAB yes + +# +# Enable checking and display of mailbox status upon login. +# +# Disable if the shell startup files already check for mail +# ("mailx -e" or equivalent). +# +MAIL_CHECK_ENAB yes + +# +# Enable additional checks upon password changes. +# +OBSCURE_CHECKS_ENAB yes + +# +# Enable checking of time restrictions specified in /etc/porttime. +# +PORTTIME_CHECKS_ENAB yes + +# +# Enable setting of ulimit, umask, and niceness from passwd gecos field. +# +QUOTAS_ENAB yes + +# +# Enable "syslog" logging of su activity - in addition to sulog file logging. +# SYSLOG_SG_ENAB does the same for newgrp and sg. +# +SYSLOG_SU_ENAB yes +SYSLOG_SG_ENAB yes + +# +# If defined, either full pathname of a file containing device names or +# a ":" delimited list of device names. Root logins will be allowed only +# upon these devices. +# +CONSOLE /etc/securetty +#CONSOLE console:tty01:tty02:tty03:tty04 + +# +# If defined, all su activity is logged to this file. +# +#SULOG_FILE /var/log/sulog + +# +# If defined, ":" delimited list of "message of the day" files to +# be displayed upon login. +# +MOTD_FILE /etc/motd +#MOTD_FILE /etc/motd:/usr/lib/news/news-motd + +# +# If defined, this file will be output before each login prompt. +# +#ISSUE_FILE /etc/issue + +# +# If defined, file which maps tty line to TERM environment parameter. +# Each line of the file is in a format something like "vt100 tty01". +# +#TTYTYPE_FILE /etc/ttytype + +# +# If defined, login failures will be logged here in a utmp format. +# last, when invoked as lastb, will read /var/log/btmp, so... +# +FTMP_FILE /var/log/btmp + +# +# If defined, name of file whose presence which will inhibit non-root +# logins. The contents of this file should be a message indicating +# why logins are inhibited. +# +NOLOGINS_FILE /etc/nologin + +# +# If defined, the command name to display when running "su -". For +# example, if this is defined as "su" then a "ps" will display the +# command is "-su". If not defined, then "ps" would display the +# name of the shell actually being run, e.g. something like "-sh". +# +SU_NAME su + +# +# *REQUIRED* +# Directory where mailboxes reside, _or_ name of file, relative to the +# home directory. If you _do_ define both, MAIL_DIR takes precedence. +# +MAIL_DIR /var/spool/mail +#MAIL_FILE .mail + +# +# If defined, file which inhibits all the usual chatter during the login +# sequence. If a full pathname, then hushed mode will be enabled if the +# user's name or shell are found in the file. If not a full pathname, then +# hushed mode will be enabled if the file exists in the user's home directory. +# +HUSHLOGIN_FILE .hushlogin +#HUSHLOGIN_FILE /etc/hushlogins + +# +# If defined, either a TZ environment parameter spec or the +# fully-rooted pathname of a file containing such a spec. +# +#ENV_TZ TZ=CST6CDT +#ENV_TZ /etc/tzname + +# +# If defined, an HZ environment parameter spec. +# +# for Linux/x86 +ENV_HZ HZ=100 +# For Linux/Alpha... +#ENV_HZ HZ=1024 + +# +# *REQUIRED* The default PATH settings, for superuser and normal users. +# +# (they are minimal, add the rest in the shell startup files) +ENV_SUPATH PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin +ENV_PATH PATH=/usr/local/bin:/bin:/usr/bin + +# +# Terminal permissions +# +# TTYGROUP Login tty will be assigned this group ownership. +# TTYPERM Login tty will be set to this permission. +# +# If you have a "write" program which is "setgid" to a special group +# which owns the terminals, define TTYGROUP to the group number and +# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign +# TTYPERM to either 622 or 600. +# +TTYGROUP tty +TTYPERM 0620 + +# +# Login configuration initializations: +# +# ERASECHAR Terminal ERASE character ('\010' = backspace). +# KILLCHAR Terminal KILL character ('\025' = CTRL/U). +# ULIMIT Default "ulimit" value. +# +# The ERASECHAR and KILLCHAR are used only on System V machines. +# The ULIMIT is used only if the system supports it. +# (now it works with setrlimit too; ulimit is in 512-byte units) +# +# Prefix these values with "0" to get octal, "0x" to get hexadecimal. +# +ERASECHAR 0177 +KILLCHAR 025 +#ULIMIT 2097152 + +# Default initial "umask" value. +# UMASK is also used by useradd and newusers to set the mode of new home +# directories. +# 022 is the default value, but 027, or even 077, could be considered +# better for privacy. There is no One True Answer here: each sysadmin +# must make up her mind. +UMASK 022 + +# +# Password aging controls: +# +# PASS_MAX_DAYS Maximum number of days a password may be used. +# PASS_MIN_DAYS Minimum number of days allowed between password changes. +# PASS_MIN_LEN Minimum acceptable password length. +# PASS_WARN_AGE Number of days warning given before a password expires. +# +PASS_MAX_DAYS 99999 +PASS_MIN_DAYS 0 +PASS_MIN_LEN 5 +PASS_WARN_AGE 7 + +# +# If "yes", the user must be listed as a member of the first gid 0 group +# in /etc/group (called "root" on most Linux systems) to be able to "su" +# to uid 0 accounts. If the group doesn't exist or is empty, no one +# will be able to "su" to uid 0. +# +SU_WHEEL_ONLY no + +# +# If compiled with cracklib support, where are the dictionaries +# +#CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict + +# +# Min/max values for automatic uid selection in useradd +# +UID_MIN 1000 +UID_MAX 60000 +# System accounts +SYS_UID_MIN 101 +SYS_UID_MAX 999 + +# +# Min/max values for automatic gid selection in groupadd +# +GID_MIN 1000 +GID_MAX 60000 +# System accounts +SYS_GID_MIN 101 +SYS_GID_MAX 999 + +# +# Max number of login retries if password is bad +# +LOGIN_RETRIES 5 + +# +# Max time in seconds for login +# +LOGIN_TIMEOUT 60 + +# +# Maximum number of attempts to change password if rejected (too easy) +# +PASS_CHANGE_TRIES 5 + +# +# Warn about weak passwords (but still allow them) if you are root. +# +PASS_ALWAYS_WARN yes + +# +# Number of significant characters in the password for crypt(). +# Default is 8, don't change unless your crypt() is better. +# Ignored if MD5_CRYPT_ENAB set to "yes". +# +#PASS_MAX_LEN 8 + +# +# Require password before chfn/chsh can make any changes. +# +CHFN_AUTH yes + +# +# Which fields may be changed by regular users using chfn - use +# any combination of letters "frwh" (full name, room number, work +# phone, home phone). If not defined, no changes are allowed. +# For backward compatibility, "yes" = "rwh" and "no" = "frwh". +# +CHFN_RESTRICT frwh + +# +# Password prompt (%s will be replaced by user name). +# +# XXX - it doesn't work correctly yet, for now leave it commented out +# to use the default which is just "Password: ". +#LOGIN_STRING "%s's Password: " + +# +# Only works if compiled with MD5_CRYPT defined: +# If set to "yes", new passwords will be encrypted using the MD5-based +# algorithm compatible with the one used by recent releases of FreeBSD. +# It supports passwords of unlimited length and longer salt strings. +# Set to "no" if you need to copy encrypted passwords to other systems +# which don't understand the new algorithm. Default is "no". +# +# This variable is deprecated. You should use ENCRYPT_METHOD. +# +#MD5_CRYPT_ENAB no + +# +# Only works if compiled with ENCRYPTMETHOD_SELECT defined: +# If set to MD5 , MD5-based algorithm will be used for encrypting password +# If set to SHA256, SHA256-based algorithm will be used for encrypting password +# If set to SHA512, SHA512-based algorithm will be used for encrypting password +# If set to DES, DES-based algorithm will be used for encrypting password (default) +# Overrides the MD5_CRYPT_ENAB option +# +ENCRYPT_METHOD MD5 + +# +# Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. +# +# Define the number of SHA rounds. +# With a lot of rounds, it is more difficult to brute forcing the password. +# But note also that it more CPU resources will be needed to authenticate +# users. +# +# If not specified, the libc will choose the default number of rounds (5000). +# The values must be inside the 1000-999999999 range. +# If only one of the MIN or MAX values is set, then this value will be used. +# If MIN > MAX, the highest value will be used. +# +# SHA_CRYPT_MIN_ROUNDS 5000 +# SHA_CRYPT_MAX_ROUNDS 5000 + +# +# List of groups to add to the user's supplementary group set +# when logging in on the console (as determined by the CONSOLE +# setting). Default is none. +# +# Use with caution - it is possible for users to gain permanent +# access to these groups, even when not logged in on the console. +# How to do it is left as an exercise for the reader... +# +# Most of these groups are self-explanatory. +# +# Note that users are added to these default groups only when +# logging into a shell with /bin/login, not when using a login +# manager such as kdm. In that case, users who should have +# hardware access must be added to the appropriate groups +# when the user is added with adduser or useradd, or by editing +# /etc/group directly, preferably using "vigr" +# +CONSOLE_GROUPS floppy:audio:cdrom:video:scanner + +# +# Should login be allowed if we can't cd to the home directory? +# Default in no. +# +DEFAULT_HOME yes + +# +# If this file exists and is readable, login environment will be +# read from it. Every line should be in the form name=value. +# +ENVIRON_FILE /etc/environment + +# +# If defined, this command is run when removing a user. +# It should remove any at/cron/print jobs etc. owned by +# the user to be removed (passed as the first argument). +# +#USERDEL_CMD /usr/sbin/userdel_local + +# +# Enable setting of the umask group bits to be the same as owner bits +# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is +# the same as gid, and username is the same as the primary group name. +# +# This also enables userdel to remove user groups if no members exist. +# +USERGROUPS_ENAB yes + +# +# If set to a non-nul number, the shadow utilities will make sure that +# groups never have more than this number of users on one line. +# This permit to support split groups (groups split into multiple lines, +# with the same group ID, to avoid limitation of the line length in the +# group file). +# +# 0 is the default value and disables this feature. +# +#MAX_MEMBERS_PER_GROUP 0 + +# +# If useradd should create home directories for users by default (non +# system users only) +# This option is overridden with the -M or -m flags on the useradd command +# line. +# +#CREATE_HOME yes + diff --git a/source/a/shadow/shadow-4.0.3.x86_64.diff b/source/a/shadow/shadow-4.0.3.x86_64.diff deleted file mode 100644 index 15d16c7c8..000000000 --- a/source/a/shadow/shadow-4.0.3.x86_64.diff +++ /dev/null @@ -1,166 +0,0 @@ ---- shadow-4.0.3/libmisc/failure.h.orig 2004-01-02 18:47:01.000000000 -0800 -+++ shadow-4.0.3/libmisc/failure.h 2004-01-02 18:52:38.000000000 -0800 -@@ -4,7 +4,12 @@ - - #include "defines.h" - #include "faillog.h" -+ -+#if HAVE_UTMPX_H -+#include <utmpx.h> -+#else - #include <utmp.h> -+#endif - - /* - * failure - make failure entry -@@ -38,7 +43,11 @@ - * failtmp updates the (struct utmp) formatted failure log which - * maintains a record of all login failures. - */ -+#if HAVE_UTMPX_H -+extern void failtmp(const struct utmpx *); -+#else - extern void failtmp(const struct utmp *); -+#endif - - #endif - ---- shadow-4.0.3/libmisc/failure.c.orig 2004-01-02 18:47:06.000000000 -0800 -+++ shadow-4.0.3/libmisc/failure.c 2004-01-02 18:53:37.000000000 -0800 -@@ -39,7 +39,11 @@ - #include "getdef.h" - #include "failure.h" - -+#if HAVE_UTMPX_H -+#include <utmpx.h> -+#else - #include <utmp.h> -+#endif - - #define YEAR (365L*DAY) - -@@ -248,7 +252,11 @@ - */ - - void -+#if HAVE_UTMPX_H -+failtmp(const struct utmpx *failent) -+#else - failtmp(const struct utmp *failent) -+#endif - { - char *ftmp; - int fd; ---- shadow-4.0.3/libmisc/log.c.orig 2004-01-02 18:58:04.000000000 -0800 -+++ shadow-4.0.3/libmisc/log.c 2004-01-02 18:58:51.000000000 -0800 -@@ -57,6 +57,7 @@ - int fd; - off_t offset; - struct lastlog newlog; -+ time_t ll_time; - - /* - * If the file does not exist, don't create it. -@@ -88,7 +89,8 @@ - if (ll) - *ll = newlog; - -- time(&newlog.ll_time); -+ ll_time = newlog.ll_time; -+ time(&ll_time); - strncpy(newlog.ll_line, line, sizeof newlog.ll_line); - #if HAVE_LL_HOST - strncpy(newlog.ll_host, host, sizeof newlog.ll_host); ---- shadow-4.0.3/libmisc/utmp.c.orig 2004-01-02 18:59:04.000000000 -0800 -+++ shadow-4.0.3/libmisc/utmp.c 2004-01-02 19:05:34.000000000 -0800 -@@ -79,6 +79,8 @@ - { - char *line; - struct utmp *ut; -+ time_t uttime; -+ - pid_t pid = getpid(); - - setutent(); -@@ -111,7 +113,8 @@ - /* XXX - assumes /dev/tty?? */ - strncpy(utent.ut_id, utent.ut_line + 3, sizeof utent.ut_id); - strcpy(utent.ut_user, "LOGIN"); -- time(&utent.ut_time); -+ time(&uttime); -+ utent.ut_time = uttime; - } - } - -@@ -284,9 +287,14 @@ - void - setutmp(const char *name, const char *line, const char *host) - { -+ time_t uttime; -+ - utent.ut_type = USER_PROCESS; - strncpy(utent.ut_user, name, sizeof utent.ut_user); -- time(&utent.ut_time); -+ -+ time(&uttime); -+ utent.ut_time = uttime; -+ - /* other fields already filled in by checkutmp above */ - setutent(); - pututline(&utent); ---- shadow-4.0.3/src/lastlog.c.orig 2004-01-02 18:06:09.000000000 -0800 -+++ shadow-4.0.3/src/lastlog.c 2004-01-02 18:29:57.000000000 -0800 -@@ -167,6 +167,7 @@ - static int once; - char *cp; - struct tm *tm; -+ time_t ll_time; - - #ifdef HAVE_STRFTIME - char ptime[80]; -@@ -184,7 +185,9 @@ - #endif - once++; - } -- tm = localtime (&lastlog.ll_time); -+ ll_time = lastlog.ll_time; -+ tm = localtime (&ll_time); -+ - #ifdef HAVE_STRFTIME - strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm); - cp = ptime; ---- shadow-4.0.3/src/login.c.orig 2004-01-02 18:33:13.000000000 -0800 -+++ shadow-4.0.3/src/login.c 2004-01-02 18:40:17.000000000 -0800 -@@ -1019,8 +1019,12 @@ - const char *failent_user; - - #if HAVE_UTMPX_H -+ struct timeval ut_tv; -+ ut_tv.tv_sec = failent.ut_tv.tv_sec; -+ ut_tv.tv_usec = failent.ut_tv.tv_usec; -+ - failent = utxent; -- gettimeofday (&(failent.ut_tv), NULL); -+ gettimeofday (&ut_tv, NULL); - #else - failent = utent; - time (&failent.ut_time); -@@ -1271,15 +1275,16 @@ - } - if (getdef_bool ("LASTLOG_ENAB") - && lastlog.ll_time != 0) { -+ time_t ll_time= lastlog.ll_time; - #ifdef HAVE_STRFTIME - strftime (ptime, sizeof (ptime), - "%a %b %e %H:%M:%S %z %Y", -- localtime (&lastlog.ll_time)); -+ localtime (&ll_time)); - printf (_("Last login: %s on %s"), - ptime, lastlog.ll_line); - #else - printf (_("Last login: %.19s on %s"), -- ctime (&lastlog.ll_time), -+ ctime (&ll_time), - lastlog.ll_line); - #endif - #ifdef HAVE_LL_HOST /* SVR4 || __linux__ || SUN4 */ diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index 2f0e11786..77e34089c 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,24 +20,40 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=4.0.3 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-18} +VERSION=4.1.4.2 +BUILD=${BUILD:-3} + +NUMJOBS=${NUMJOBS:--j6} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-shadow +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" +fi + rm -rf $PKG mkdir -p $TMP $PKG - -# Explode the package framework: -cd $PKG -explodepkg $CWD/_shadow.tar.gz - cd $TMP rm -rf shadow-$VERSION -tar xjvf $CWD/shadow-$VERSION.tar.bz2 +tar xvf $CWD/shadow-$VERSION.tar.?z* || exit 1 cd shadow-$VERSION chown -R root:root . @@ -47,110 +63,91 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/shadow.shadowconfig.diff.gz | patch -p1 --verbose --backup || exit 1 -zcat $CWD/shadow.newgrp.nopam.gz | patch -p0 --verbose --backup || exit 1 -zcat $CWD/shadow.login.defs.diff.gz | patch -p0 --verbose --backup || exit 1 -zcat $CWD/shadow.newgrp.getlogin.gz | patch -p1 --verbose --backup || exit 1 -zcat $CWD/shadow.gcc34.diff.gz | patch -p1 --verbose --backup || exit 1 -zcat $CWD/shadow.remove.obsolete.options.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -if [ "$ARCH" = "x86_64" ]; then - zcat $CWD/shadow-4.0.3.x86_64.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -fi - +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/shadow-$VERSION \ --disable-shared \ - --disable-desrpc \ + --without-libcrack \ --build=$ARCH-slackware-linux -make -j6 || exit 1 -cat etc/login.defs.linux > $PKG/etc/login.defs.new -cat etc/login.access > $PKG/etc/login.access.new +# --enable-utmpx # defaults to 'no' + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Fix user group = 100: +zcat $CWD/useradd.gz > $PKG/etc/default/useradd + +# /bin/groups is provided by coreutils. +rm -f $PKG/bin/groups +find $PKG -name groups.1 -exec rm {} \; + +# Install a login.defs with unsurprising defaults: +rm -f $PKG/etc/login.defs +zcat $CWD/login.defs.gz > $PKG/etc/login.defs.new + +mv $PKG/etc/login.access $PKG/etc/login.access.new + +# I don't think this works well enough to recommend it. +#mv $PKG/etc/limits $PKG/etc/limits.new +rm -f $PKG/etc/limits + +# Add the friendly 'adduser' script: cat $CWD/adduser > $PKG/usr/sbin/adduser +chmod 0755 $PKG/usr/sbin/adduser + +# Add sulogin to the package: +cp -a src/sulogin $PKG/sbin +( cd $PKG/bin ; ln -s ../sbin/sulogin ) + +# Add the empty faillog log file: +mkdir -p $PKG/var/log +touch $PKG/var/log/faillog.new + +# Put some stuff back in "old" locations and make symlinks for compat +( cd $PKG/usr/bin + mv faillog ../sbin + mv lastlog ../sbin + ln -s ../sbin/faillog + ln -s ../sbin/lastlog +) + +# Fixup a few permissions: +chmod 4711 $PKG/bin/su +chmod 4711 $PKG/usr/bin/* + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi -# These things aren't needed when using glibc, as it -# supplies its own shadow functions: -#cat lib/libshadow.a > $PKG/usr/lib/libshadow.a -#cp -a lib/pwauth.h $PKG/usr/include/shadow/pwauth.h -#cp -a lib/shadow_.h $PKG/usr/include/shadow/shadow.h -#chmod 644 $PKG/usr/include/shadow/* -#chown root.root $PKG/usr/include/shadow/* - -cd po -for file in *.gmo ; do - mkdir -p $PKG/usr/share/locale/$(basename $file .gmo)/LC_MESSAGES - cat $file > $PKG/usr/share/locale/$(basename $file .gmo)/LC_MESSAGES/shadow.mo -done -cd ../src -cat login > $PKG/bin/login -cat su > $PKG/bin/su -cat sulogin > $PKG/sbin/sulogin -cat ../debian/shadowconfig.sh > $PKG/usr/sbin/shadowconfig -for file in chpasswd dpasswd faillog groupadd groupdel groupmod grpck \ -lastlog logoutd mkpasswd newusers pwck useradd userdel usermod \ -pwconv pwunconv grpconv grpunconv vipw ; do - cat $file > $PKG/usr/sbin/$file -done -for file in chage chfn chsh expiry gpasswd newgrp passwd ; do - cat $file > $PKG/usr/bin/$file -done -cd .. -cp contrib/adduser.sh /sbin/adduser mkdir -p $PKG/usr/doc/shadow-$VERSION cp -a \ - ABOUT-NLS ChangeLog NEWS README TODO doc/* \ + COPYING ChangeLog NEWS README TODO doc/{README*,HOWTO,WISHLIST,*.txt} \ $PKG/usr/doc/shadow-$VERSION -chmod 644 $PKG/usr/doc/shadow-$VERSION/* - -install_man_pages() { -for file in chage.1 chfn.1 chsh.1 gpasswd.1 groups.1 login.1 newgrp.1 \ -passwd.1 su.1 ; do - if [ -r $file ]; then - mkdir -p $1/man1 - gzip -9c $file > $1/man1/$file.gz - fi -done -for file in pw_auth.3 shadow.3 ; do - if [ -r $file ]; then - mkdir -p $1/man3 - gzip -9c $file > $1/man3/$file.gz - fi -done -for file in faillog.5 limits.5 login.access.5 login.defs.5 passwd.5 \ -porttime.5 shadow.5 suauth.5 ; do - if [ -r $file ]; then - mkdir -p $1/man5 - gzip -9c $file > $1/man5/$file.gz - fi -done -for file in chpasswd.8 dpasswd.8 faillog.8 groupadd.8 groupdel.8 groupmod.8 \ -grpck.8 lastlog.8 logoutd.8 mkpasswd.8 newusers.8 pwauth.8 pwck.8 pwconv.8 \ -shadowconfig.8 sulogin.8 useradd.8 userdel.8 usermod.8 vipw.8 ; do - if [ -r $file ]; then - mkdir -p $1/man8 - gzip -9c $file > $1/man8/$file.gz - fi -done -} - -cd man - install_man_pages $PKG/usr/man - for dir in * ; do - if [ -d $dir ] ; then - ( cd $dir ; install_man_pages $PKG/usr/man/$dir ) - fi - done -cd .. +#chmod 0644 $PKG/usr/doc/shadow-$VERSION/* + +# The entire ChangeLog is excessive for most users: +cat $PKG/usr/doc/shadow-$VERSION/ChangeLog | head -n 2000 > $PKG/usr/doc/shadow-$VERSION/CL +mv $PKG/usr/doc/shadow-$VERSION/CL $PKG/usr/doc/shadow-$VERSION/ChangeLog mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -# Build the package: cd $PKG -makepkg -l y -c n $TMP/shadow-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/shadow-$VERSION-$ARCH-$BUILD.txz -# Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/shadow-$VERSION - rm -rf $PKG -fi diff --git a/source/a/shadow/shadow.gcc34.diff b/source/a/shadow/shadow.gcc34.diff deleted file mode 100644 index 71dff4c85..000000000 --- a/source/a/shadow/shadow.gcc34.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./libmisc/xmalloc.c.orig 1998-12-28 14:34:56.000000000 -0600 -+++ ./libmisc/xmalloc.c 2006-08-12 19:02:51.000000000 -0500 -@@ -16,8 +16,6 @@ - - #include "defines.h" - --extern char *malloc(); -- - char * - xmalloc(size_t size) - { diff --git a/source/a/shadow/shadow.login.defs.diff b/source/a/shadow/shadow.login.defs.diff deleted file mode 100644 index bfed463ae..000000000 --- a/source/a/shadow/shadow.login.defs.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- ./etc/login.defs.linux.orig 2000-08-26 13:27:10.000000000 -0500 -+++ ./etc/login.defs.linux 2008-03-24 15:10:09.000000000 -0500 -@@ -170,8 +170,8 @@ - # *REQUIRED* The default PATH settings, for superuser and normal users. - # - # (they are minimal, add the rest in the shell startup files) --ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin --ENV_PATH PATH=/bin:/usr/bin -+ENV_SUPATH PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:/bin:/usr/bin -+ENV_PATH PATH=/usr/local/bin:/bin:/usr/bin - - # - # Terminal permissions -@@ -185,7 +185,7 @@ - # TTYPERM to either 622 or 600. - # - TTYGROUP tty --TTYPERM 0600 -+TTYPERM 0620 - - # - # Login configuration initializations: -@@ -230,7 +230,7 @@ - # - # If compiled with cracklib support, where are the dictionaries - # --CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict -+#CRACKLIB_DICTPATH /var/cache/cracklib/cracklib_dict - - # - # Min/max values for automatic uid selection in useradd -@@ -282,7 +282,7 @@ - # phone, home phone). If not defined, no changes are allowed. - # For backward compatibility, "yes" = "rwh" and "no" = "frwh". - # --CHFN_RESTRICT rwh -+CHFN_RESTRICT frwh - - # - # Password prompt (%s will be replaced by user name). -@@ -299,7 +299,7 @@ - # Set to "no" if you need to copy encrypted passwords to other systems - # which don't understand the new algorithm. Default is "no". - # --#MD5_CRYPT_ENAB no -+MD5_CRYPT_ENAB yes - - # - # List of groups to add to the user's supplementary group set -@@ -310,7 +310,16 @@ - # access to these groups, even when not logged in on the console. - # How to do it is left as an exercise for the reader... - # --#CONSOLE_GROUPS floppy:audio:cdrom -+# Most of these groups are self-explanatory. -+# -+# Note that users are added to these default groups only when -+# logging into a shell with /bin/login, not when using a login -+# manager such as kdm. In that case, users who should have -+# hardware access must be added to the appropriate groups -+# when the user is added with adduser or useradd, or by editing -+# /etc/group directly. -+# -+CONSOLE_GROUPS floppy:audio:cdrom:video - - # - # Should login be allowed if we can't cd to the home directory? diff --git a/source/a/shadow/shadow.newgrp.getlogin b/source/a/shadow/shadow.newgrp.getlogin deleted file mode 100644 index 5d032f15c..000000000 --- a/source/a/shadow/shadow.newgrp.getlogin +++ /dev/null @@ -1,21 +0,0 @@ ---- ./src/newgrp.c.orig 2003-05-31 21:19:39.000000000 -0700 -+++ ./src/newgrp.c 2003-05-31 21:21:32.000000000 -0700 -@@ -76,6 +76,7 @@ - gid_t gid; - char *cp; - const char *cpasswd, *name, *prog; -+ char *loginname = NULL; - char *group = NULL; - char *command = NULL; - char **envp = environ; -@@ -386,7 +387,9 @@ - SYSLOG ((LOG_INFO, "user `%s' switched to group `%s'", - name, group)); - if (getdef_bool ("SYSLOG_SG_ENAB")) { -- char *loginname = xstrdup (getlogin ()); -+ char *user = getlogin (); -+ if (user != NULL) -+ loginname = xstrdup (user); - char *tty = xstrdup (ttyname (0)); - - if (loginname == NULL) diff --git a/source/a/shadow/shadow.newgrp.nopam b/source/a/shadow/shadow.newgrp.nopam deleted file mode 100644 index 7920dde00..000000000 --- a/source/a/shadow/shadow.newgrp.nopam +++ /dev/null @@ -1,18 +0,0 @@ ---- src/newgrp.c.orig 2002-10-12 14:15:34.000000000 +0100 -+++ src/newgrp.c 2002-10-12 14:15:42.000000000 +0100 -@@ -398,6 +398,7 @@ - SYSLOG ((LOG_INFO, - "user `%s' (login `%s' on %s) switched to group `%s'", - name, loginname, tty, group)); -+#ifdef USE_PAM - if (getdef_bool ("CLOSE_SESSIONS")) { - /* - * We want to fork and exec the new shell in the child, leaving the -@@ -450,6 +451,7 @@ - signal (SIGTTIN, SIG_DFL); - signal (SIGTTOU, SIG_DFL); - } -+#endif // USE_PAM - } - #endif /* USE_SYSLOG */ - diff --git a/source/a/shadow/shadow.remove.obsolete.options.diff b/source/a/shadow/shadow.remove.obsolete.options.diff deleted file mode 100644 index 100fe2a88..000000000 --- a/source/a/shadow/shadow.remove.obsolete.options.diff +++ /dev/null @@ -1,78 +0,0 @@ ---- ./man/passwd.1.orig 2002-03-13 11:52:15.000000000 -0600 -+++ ./man/passwd.1 2006-08-20 18:29:58.000000000 -0500 -@@ -29,26 +29,17 @@ - .SH NAME - passwd \- change user password - .SH SYNOPSIS --\fBpasswd\fR [\fB-f\fR|\fB-s\fR] [\fIname\fR] --.br --\fBpasswd\fR [\fB-g\fR] [\fB-r\fR|\fB-R\fR] \fIgroup\fR -+\fBpasswd\fR [\fIname\fR] - .br - \fBpasswd\fR [\fB-x \fImax\fR] [\fB-n \fImin\fR] - [\fB-w \fIwarn\fR] [\fB-i \fIinact\fR] \fIlogin\fR - .br - \fBpasswd\fR {\fB-l\fR|\fB-u\fR|\fB-d\fR|\fB-S\fR|\fB-e\fR} \fIlogin\fR - .SH DESCRIPTION --\fBpasswd\fR changes passwords for user and group accounts. -+\fBpasswd\fR changes passwords for user accounts. - A normal user may only change the password for his/her own account, - the super user may change the password for any account. --The administrator of a group may change the password for the group. --\fBpasswd\fR also changes account information, such as the full name --of the user, user's login shell, or password expiry date and interval. --.PP --The \fB-s\fR option makes passwd call chsh to change the user's shell. The --\fB-f\fR option makes passwd call chfn to change the user's gecos --information. These two options are only meant for compatiblity, since the --other programs can be called directly. -+.PP - .SS Password Changes - The user is first prompted for his/her old password, if one is present. - This password is then encrypted and compared against the -@@ -86,17 +77,6 @@ - against the first. - Both entries are required to match in order for the password - to be changed. --.SS Group passwords --When the \fB-g\fR option is used, the password for the named --group is changed. --The user must either be the super user, or a group administrator --for the named group. --The current group password is not prompted for. --The \fB-r\fR option is used with the \fB-g\fR option to remove --the current password from the named group. --This allows group access to all members. --The \fB-R\fR option is used with the \fB-g\fR option to restrict --the named group for all users. - .SS Password expiry information - The password aging information may be changed by the super - user with the \fB-x\fR, \fB-n\fR, \fB-w\fR, and \fB-i\fR options. -@@ -191,6 +171,9 @@ - .br - /etc/shadow \- encrypted user passwords - .SH "SEE ALSO" -+.BR chfn (1), -+.BR chsh (1), -+.BR gpasswd (1), - .BR group (5), - .BR passwd (5) - .SH AUTHOR ---- ./src/passwd.c.orig 2002-01-05 09:41:43.000000000 -0600 -+++ ./src/passwd.c 2006-08-20 18:31:50.000000000 -0500 -@@ -955,6 +955,7 @@ - * Please run these programs directly. --marekm - */ - -+#ifdef I_LIKE_OBSOLETE_OPTIONS - if (argc > 1 && argv[1][0] == '-' && strchr ("gfs", argv[1][1])) { - char buf[200]; - -@@ -980,6 +981,7 @@ - closelog (); - exit (E_FAILURE); - } -+#endif - - /* - * The remaining arguments will be processed one by one and executed diff --git a/source/a/shadow/shadow.shadowconfig.diff b/source/a/shadow/shadow.shadowconfig.diff deleted file mode 100644 index 7dc9286e7..000000000 --- a/source/a/shadow/shadow.shadowconfig.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- ./debian/shadowconfig.sh.orig 2001-05-29 23:20:22.000000000 -0700 -+++ ./debian/shadowconfig.sh 2003-06-23 16:35:38.000000000 -0700 -@@ -1,23 +1,28 @@ - #!/bin/bash --# turn shadow passwords on or off on a Debian system -+# -+# 'shadowconfig on' will turn shadow passwords on; -+# 'shadowconfig off' will turn shadow passwords off. -+# -+# shadowconfig will print an error message and exit with -+# a nonzero code if it finds anything awry. If that happens, -+# you should correct the error and run it again. -+# -+# Turning shadow passwords on when they are already on, or -+# off when they are already off, is harmless. -+# -+# Be aware that account expiration dates are only supported -+# by shadow passwords -- these dates will be lost when converting -+# from shadow to non-shadow passwords. If you need to save this -+# information, back up your /etc/shadow before turning off -+# shadow passwords. -+# - --set -e - --permfix () { -- [ -f $1 ] || return 0 -- chown root:shadow $1 -- chmod 2755 $1 --} --export -f permfix -+set -e - - shadowon () { - bash<<- EOF - set -e -- -- permfix /usr/X11R6/bin/xlock -- permfix /usr/X11R6/bin/xtrlock -- permfix /bin/vlock -- - pwck -q - grpck - pwconv -@@ -65,3 +70,4 @@ - echo Usage: $0 on \| off - ;; - esac -+ diff --git a/source/a/shadow/useradd b/source/a/shadow/useradd new file mode 100644 index 000000000..f3205e496 --- /dev/null +++ b/source/a/shadow/useradd @@ -0,0 +1,8 @@ +# useradd defaults file +GROUP=100 +HOME=/home +INACTIVE=-1 +EXPIRE= +SHELL=/bin/bash +SKEL=/etc/skel +CREATE_MAIL_SPOOL=yes diff --git a/source/a/smartmontools/smartmontools.SlackBuild b/source/a/smartmontools/smartmontools.SlackBuild index fd4fcf35b..5ebed962e 100755 --- a/source/a/smartmontools/smartmontools.SlackBuild +++ b/source/a/smartmontools/smartmontools.SlackBuild @@ -21,10 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=5.38 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo smartmontools-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else @@ -40,39 +49,47 @@ mkdir -p $TMP $PKG cd $TMP rm -rf smartmontools-$VERSION -tar xvf $CWD/smartmontools-$VERSION.tar.* +tar xvf $CWD/smartmontools-$VERSION.tar.?z* || exit 1 cd smartmontools-$VERSION chown -R root:root . + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --sysconfdir=/etc \ - $ARCH-slackware-linux -make -make install DESTDIR=$PKG + --build=$ARCH-slackware-linux + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + # Not used on Slackware: rm -rf $PKG/etc/rc.d + mv $PKG/etc/smartd.conf $PKG/etc/smartd.conf.new gzip -9 $PKG/usr/man/man?/*.? mv $PKG/usr/share/doc $PKG/usr rmdir $PKG/usr/share -rm -f $PKG/usr/doc/smartmontools-$VERSION/CHANGELOG \ - $PKG/usr/doc/smartmontools-$VERSION/smartd.conf +rm -f $PKG/usr/doc/smartmontools-$VERSION/smartd.conf + ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc +# If there's a CHANGELOG, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGELOG ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG + touch -r CHANGELOG $DOCSDIR/CHANGELOG +fi + # Build the package: cd $PKG makepkg -l y -c n $TMP/smartmontools-$VERSION-$ARCH-$BUILD.txz -# Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/smartmontools-$VERSION - rm -rf $PKG -fi diff --git a/source/a/syslinux/syslinux-3.52.tar.bz2.sign b/source/a/syslinux/syslinux-3.52.tar.bz2.sign deleted file mode 100644 index 1d319cd30..000000000 --- a/source/a/syslinux/syslinux-3.52.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.7 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBG+aOayGugalF9Dw4RAtvoAJ93vpkYgJsPYBI95vXW1/qLIQC2lwCcCOPf -NhphOdhGCaUwMdqZH9tahC0= -=OS5y ------END PGP SIGNATURE----- diff --git a/source/a/syslinux/syslinux-3.84.tar.bz2.sign b/source/a/syslinux/syslinux-3.84.tar.bz2.sign new file mode 100644 index 000000000..987a8ed9b --- /dev/null +++ b/source/a/syslinux/syslinux-3.84.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBLLBRQyGugalF9Dw4RAmsiAJ9geAzuilvLYCEc03sP1mJLG77UaQCeJlV+ +TgEccKCkyIkwwpBYDHesUjA= +=1AUa +-----END PGP SIGNATURE----- diff --git a/source/a/syslinux/syslinux.SlackBuild b/source/a/syslinux/syslinux.SlackBuild index e084f96f5..1e7baad75 100755 --- a/source/a/syslinux/syslinux.SlackBuild +++ b/source/a/syslinux/syslinux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,18 @@ PKGNAM=syslinux -VERSION=${VERSION:-3.52} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +VERSION=${VERSION:-3.84} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -48,18 +57,13 @@ find . \ # Build: make -j4 || exit 1 -make install-all INSTALLROOT=/tmp/package-syslinux -make mkdiskimage -make libsyslinux.a -cp -a unix/syslinux-nomtools mkdiskimage $PKG/usr/bin -chmod 755 $PKG/usr/bin/* +# Without -i, the following fails trying to install w32 junk: +make -i install INSTALLROOT=/tmp/package-syslinux -mkdir -p $PKG/usr/lib -cp -a libsyslinux.a $PKG/usr/lib -mkdir -p $PKG/usr/include -cp -a syslinux.h $PKG/usr/include +cp -a linux/syslinux-nomtools $PKG/usr/bin +chmod 755 $PKG/usr/bin/* -rm -rf $PKG/usr/lib/syslinux/com32 +rm -rf $PKG/usr/share/syslinux/com32 # Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then @@ -77,14 +81,17 @@ if [ -d $PKG/usr/man ]; then fi # Add a documentation directory: -mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION/{cmenu,com32} cp -a \ BUGS COPYING NEWS README* TODO \ - distrib.doc isolinux.doc pxelinux.doc syslinux.doc \ - com32/LICENSE \ - memdisk/memdisk.doc \ - menu \ + doc \ $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a com32/LICENCE $PKG/usr/doc/${PKGNAM}-$VERSION/com32 +( cd com32/cmenu + cp -a \ + CHANGES HISTORY MANUAL MENU_FORMAT README TODO \ + $PKG/usr/doc/${PKGNAM}-$VERSION/cmenu +) mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index 2d5028e35..e49160161 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -202,21 +202,21 @@ echo "Remounting root filesystem read-only." /bin/sync # Close any volumes opened by cryptsetup: -if [ -f /etc/crypttab -a -x /sbin/cryptsetup.static ]; then +if [ -f /etc/crypttab -a -x /sbin/cryptsetup ]; then cat /etc/crypttab | grep -v "^#" | grep -v "^$" | while read line; do # NOTE: we only support LUKS formatted volumes (except for swap)! LUKS=$(echo $line | tr '\t' ' ' | tr -s ' ' | cut -f1 -d' ') DEV=$(echo $line | tr '\t' ' ' | tr -s ' ' | cut -f2 -d' ') OPTS=$(echo $line | tr '\t' ' ' | tr -s ' ' | cut -f4 -d' ') - if /sbin/cryptsetup.static isLuks $DEV 2>/dev/null ; then + if /sbin/cryptsetup isLuks $DEV 2>/dev/null ; then echo "Locking LUKS crypt volume '${LUKS}':" - /sbin/cryptsetup.static luksClose ${LUKS} + /sbin/cryptsetup luksClose ${LUKS} elif echo $OPTS | grep -wq swap ; then # If any of the volumes was used as encrypted swap, # then run mkswap on the underlying device - # in case other Linux installations on this computer should use it: echo "Erasing encrypted swap '${LUKS}' and restoring normal swap on ${DEV}:" - /sbin/cryptsetup.static remove ${LUKS} + /sbin/cryptsetup remove ${LUKS} mkswap $DEV fi done diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index fe2c9b6f0..ccdcb6f30 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -74,7 +74,7 @@ fi # If we are returning from single-user mode we will need to restart # udevd on systems that use udev: -if grep -wq sysfs /proc/mounts && grep -wq tmpfs /proc/filesystems ; then +if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then /bin/sh /etc/rc.d/rc.udev start @@ -217,7 +217,7 @@ fi # If we're using udev, make /dev/cdrom and any other optical drive symlinks # if some udev rule hasn't made them already: -if grep -wq sysfs /proc/mounts && grep -wq tmpfs /proc/filesystems; then +if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /lib/udev/rc.optical-symlinks -a -x /etc/rc.d/rc.udev ]; then /bin/sh /lib/udev/rc.optical-symlinks diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index a0072d286..7c5c43edb 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -7,8 +7,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin -# Mount /proc right away: -/sbin/mount -v proc /proc -n -t proc +# Try to mount /proc: +/sbin/mount -v proc /proc -n -t proc 2> /dev/null # Mount sysfs next, if the kernel supports it: if [ -d /sys ]; then @@ -29,7 +29,7 @@ fi # promise to list all of them), and make any additional device nodes that you # need in the /dev directory. Even USB and IEEE1394 devices will need to have # the modules loaded by hand if udev is not used with a 2.6 kernel. So use it. :-) -if grep -wq sysfs /proc/mounts && grep -wq tmpfs /proc/filesystems ; then +if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then if ! grep -wq nohotplug /proc/cmdline ; then if [ -x /etc/rc.d/rc.udev ]; then /bin/sh /etc/rc.d/rc.udev start @@ -59,7 +59,7 @@ if [ -r /etc/lvmtab -o -d /etc/lvm/backup ]; then fi # Open any volumes created by cryptsetup: -if [ -f /etc/crypttab -a -x /sbin/cryptsetup.static ]; then +if [ -f /etc/crypttab -a -x /sbin/cryptsetup ]; then # First, check for device-mapper support. if ! grep -wq device-mapper /proc/devices ; then # If device-mapper exists as a module, try to load it. @@ -77,19 +77,19 @@ if [ -f /etc/crypttab -a -x /sbin/cryptsetup.static ]; then if echo $OPTS | grep -wq ro ; then LUKSOPTS="${LUKSOPTS} --readonly" ; fi # Skip LUKS volumes that were already unlocked (in the initrd): - /sbin/cryptsetup.static status $LUKS 1>/dev/null 2>/dev/null && continue - if /sbin/cryptsetup.static isLuks $DEV 2>/dev/null ; then + /sbin/cryptsetup status $LUKS 1>/dev/null 2>/dev/null && continue + if /sbin/cryptsetup isLuks $DEV 2>/dev/null ; then echo "Unlocking LUKS crypt volume '${LUKS}' on device '$DEV':" if [ -n "${PASS}" ]; then if [ -f ${PASS} ]; then - /sbin/cryptsetup.static ${LUKSOPTS} --key-file=${PASS} luksOpen $DEV $LUKS + /sbin/cryptsetup ${LUKSOPTS} --key-file=${PASS} luksOpen $DEV $LUKS elif [ "${PASS}" != "none" ]; then # A password field of 'none' indicates a line for swap: - echo "${PASS}" | /sbin/cryptsetup.static ${LUKSOPTS} luksOpen $DEV $LUKS + echo "${PASS}" | /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS fi else for i in seq 1 3 ; do - /sbin/cryptsetup.static ${LUKSOPTS} luksOpen $DEV $LUKS </dev/tty0 >/dev/tty0 2>&1 + /sbin/cryptsetup ${LUKSOPTS} luksOpen $DEV $LUKS </dev/tty0 >/dev/tty0 2>&1 [ $? -eq 0 ] && break done fi @@ -97,14 +97,14 @@ if [ -f /etc/crypttab -a -x /sbin/cryptsetup.static ]; then # If any of the volumes is to be used as encrypted swap, # then encrypt it using a random key and run mkswap: echo "Creating encrypted swap on device '$DEV' mapped to '${LUKS}':" - /sbin/cryptsetup.static --cipher=aes --key-file=/dev/urandom --key-size=256 create $LUKS $DEV + /sbin/cryptsetup --cipher=aes --key-file=/dev/urandom --key-size=256 create $LUKS $DEV mkswap /dev/mapper/$LUKS fi done fi # Enable swapping: -/sbin/swapon -a +/sbin/swapon -a 2> /dev/null # Start FUSE, if requested: if [ -x /etc/rc.d/rc.fuse ]; then @@ -322,7 +322,7 @@ fi # Enable swapping again. This is needed in case a swapfile is used, # as it can't be enabled until the filesystem it resides on has been # mounted read-write. -/sbin/swapon -a +/sbin/swapon -a 2> /dev/null # Clean up some temporary files: rm -f /var/run/* /var/run/*/* /var/run/*/*/* /etc/nologin \ diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 4b9eba043..537d8be98 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ VERSION=${VERSION:-1.2} ARCH=noarch -BUILD=${BUILD:-30} +BUILD=${BUILD:-32} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/a/tar/tar-1.22-support_txz.diff b/source/a/tar/tar-1.22-support_txz.diff deleted file mode 100644 index 5104f5639..000000000 --- a/source/a/tar/tar-1.22-support_txz.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur tar-1.22.orig/src/suffix.c tar-1.22/src/suffix.c ---- tar-1.22.orig/src/suffix.c 2009-03-05 01:04:13.000000000 -0600 -+++ tar-1.22/src/suffix.c 2009-05-06 15:59:10.695985191 -0500 -@@ -41,6 +41,7 @@ - { S(tlz, lzma) }, - { S(lzo, lzop) }, - { S(xz, xz) }, -+ { S(txz, xz) }, - #undef S - }; - diff --git a/source/a/tar/tar-1.23-support_txz.diff b/source/a/tar/tar-1.23-support_txz.diff new file mode 100644 index 000000000..efd720b55 --- /dev/null +++ b/source/a/tar/tar-1.23-support_txz.diff @@ -0,0 +1,11 @@ +diff -Nur tar-1.23.orig/src/suffix.c tar-1.23/src/suffix.c +--- tar-1.23.orig/src/suffix.c 2010-03-09 06:52:41.000000000 -0600 ++++ tar-1.23/src/suffix.c 2010-03-10 15:34:22.417696189 -0600 +@@ -43,6 +43,7 @@ + { S(tlz, LZMA) }, + { S(lzo, LZOP) }, + { S(xz, XZ) }, ++ { S(txz, XZ) }, + #undef S + #undef __CAT2__ + }; diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild index 43181ccbe..21484f4cc 100755 --- a/source/a/tar/tar.SlackBuild +++ b/source/a/tar/tar.SlackBuild @@ -22,12 +22,20 @@ # Slackware build script for tar -VERSION=1.22 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=1.23 +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} +# Automatically determine architecture for build & packaging: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-tar @@ -41,6 +49,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi # This old version is the only one that won't clobber symlinks, e.g.: @@ -58,7 +68,7 @@ tar xvf $CWD/tar-1.13.tar.gz || exit 1 cd tar-1.13 || exit 1 zcat $CWD/tar-1.13.bzip2.diff.gz | patch -p1 --verbose || exit 1 # The original config.{guess,sub} do not work on x86_64 -cp -p /usr/share/libtool/config.{guess,sub} . +cp -p /usr/share/libtool/config/config.{guess,sub} . chown -R root:root . CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -73,7 +83,7 @@ chmod 0755 $PKG/bin/tar-1.13 cd $TMP rm -rf tar-$VERSION -tar xvf $CWD/tar-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/tar-$VERSION.tar.xz || exit 1 cd tar-$VERSION || exit 1 chown -R root:root . find . \ @@ -89,7 +99,7 @@ zcat $CWD/tar.norecordsizespam.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/tar.nolonezero.diff.gz | patch -p1 --verbose || exit 1 # Add support for *.txz files (our packages) -zcat $CWD/tar-1.22-support_txz.diff.gz | patch -p1 --verbose || exit1 +zcat $CWD/tar-1.23-support_txz.diff.gz | patch -p1 --verbose || exit1 CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -103,8 +113,10 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) mv $PKG/usr/bin/tar $PKG/bin diff --git a/source/a/tar/tar.nolonezero.diff b/source/a/tar/tar.nolonezero.diff index 3c6f6f97b..0209c692a 100644 --- a/source/a/tar/tar.nolonezero.diff +++ b/source/a/tar/tar.nolonezero.diff @@ -1,24 +1,25 @@ ---- ./src/list.c.orig 2004-05-10 04:49:09.000000000 -0700 -+++ ./src/list.c 2004-06-06 13:13:23.000000000 -0700 +diff -Nur tar-1.23.orig//src/list.c tar-1.23//src/list.c +--- tar-1.23.orig//src/list.c 2010-01-26 05:28:09.000000000 -0600 ++++ tar-1.23//src/list.c 2010-03-15 23:46:19.841670026 -0500 @@ -138,6 +138,14 @@ if (!ignore_zeros_option) { + -+ /* -+ * According to POSIX tar specs, this is wrong, but on the web -+ * there are some tar specs that can trigger this, and some tar -+ * implementations create tars according to that spec. For now, -+ * let's not be pedantic about issuing the warning. -+ */ -+#if 0 ++ /* ++ * According to POSIX tar specs, this is wrong, but on the web ++ * there are some tar specs that can trigger this, and some tar ++ * implementations create tars according to that spec. For now, ++ * let's not be pedantic about issuing the warning. ++ */ ++#if 0 char buf[UINTMAX_STRSIZE_BOUND]; - status = read_header (false); -@@ -145,6 +153,7 @@ - break; - WARN ((0, 0, _("A lone zero block at %s"), - STRINGIFY_BIGINT (current_block_ordinal (), buf))); + status = read_header (¤t_header, ¤t_stat_info, +@@ -147,6 +155,7 @@ + WARNOPT (WARN_ALONE_ZERO_BLOCK, + (0, 0, _("A lone zero block at %s"), + STRINGIFY_BIGINT (current_block_ordinal (), buf))); +#endif break; } diff --git a/source/a/tar/tar.norecordsizespam.diff b/source/a/tar/tar.norecordsizespam.diff index b7d1b7a9f..0a1f4e1df 100644 --- a/source/a/tar/tar.norecordsizespam.diff +++ b/source/a/tar/tar.norecordsizespam.diff @@ -1,15 +1,16 @@ ---- ./src/buffer.c.orig 2009-03-05 01:04:13.000000000 -0600 -+++ ./src/buffer.c 2009-03-09 20:17:50.000000000 -0500 -@@ -688,7 +688,7 @@ +diff -Nur tar-1.23.orig//src/buffer.c tar-1.23/src/buffer.c +--- tar-1.23.orig//src/buffer.c 2010-03-09 06:52:41.000000000 -0600 ++++ tar-1.23/src/buffer.c 2010-03-15 23:47:30.122668444 -0500 +@@ -734,7 +734,7 @@ more = record_start->buffer + status; left = record_size - status; - if (left && left % BLOCKSIZE == 0 + /* if (left && left % BLOCKSIZE == 0 && verbose_option - && record_start_block == 0 && status != 0) - { -@@ -698,7 +698,7 @@ + && record_start_block == 0 && status != 0 + && archive_is_dev ()) +@@ -745,7 +745,7 @@ "Record size = %lu blocks", rsize), rsize)); diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/udev/config/rc.d/rc.udev.new index 8c238b0dd..40f38d1de 100644 --- a/source/a/udev/config/rc.d/rc.udev.new +++ b/source/a/udev/config/rc.d/rc.udev.new @@ -11,6 +11,18 @@ OPT="" # remove trailing slash from udev_root UDEV_ROOT=$(echo "${udev_root}" |sed 's/\/*$//') +check_mounted() { + grep -E -q "^[^[:space:]]+ $1 $2" /proc/mounts + return $? +} + +mount_devpts() { + if ! check_mounted $UDEV_ROOT/pts devpts ; then + mkdir $UDEV_ROOT/pts 2> /dev/null + mount -n -o mode=0620,gid=5 -t devpts devpts $UDEV_ROOT/pts + fi +} + case "$1" in start) # Sanity check #1, udev requires that the kernel support tmpfs: @@ -23,8 +35,8 @@ case "$1" in # Sanity check #2, make sure that a 2.6.x kernel is new enough: if [ "$(uname -r | cut -f 1,2 -d .)" = "2.6" ]; then - if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "15" ]; then - echo "Sorry, but you need a 2.6.15+ kernel to use udev." + if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "27" ]; then + echo "Sorry, but you need a 2.6.27+ kernel to use udev." echo "Your kernel version is only $(uname -r)." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." @@ -48,45 +60,59 @@ case "$1" in echo "" > /proc/sys/kernel/hotplug fi - # if udevd is already running, rc.udev start will try to re-run - # failed events. Else, it will start udevd. - if ps axc | grep -q udevd ; then - OPT="--type=failed $OPT" - ( cd ${UDEV_ROOT}/.udev - for TMPFILE in tmp-rules-*.rules ; do - mv $TMPFILE /etc/udev/rules.d/${TMPFILE/tmp-rules--/} 2>/dev/null - done - ) - else - # Mount tmpfs on $UDEV_ROOT: - if ! grep -E -q "^[^[:space:]]+ $UDEV_ROOT tmpfs" /proc/mounts; then + if grep -qw devtmpfs /proc/filesystems ; then + if ! check_mounted $UDEV_ROOT devtmpfs ; then # umount shm if needed - if grep -E -q "^[^[:space:]]+ $UDEV_ROOT/shm tmpfs" /proc/mounts; then - umount -l $UDEV_ROOT/shm - fi + check_mounted $UDEV_ROOT/shm tmpfs && umount -l $UDEV_ROOT/shm # Umount pts if needed, we will remount it later: - if grep -E -q "^[^[:space:]]+ $UDEV_ROOT/pts devpts" /proc/mounts; then - umount -l $UDEV_ROOT/pts + check_mounted $UDEV_ROOT/pts devpts && umount -l $UDEV_ROOT/pts + + # Mount tmpfs on $UDEV_ROOT: + mount -n -t devtmpfs devtmpfs $UDEV_ROOT + fi + else + # Mount tmpfs on $UDEV_ROOT: + if ! check_mounted $UDEV_ROOT tmpfs ; then + # umount shm if needed + check_mounted $UDEV_ROOT/shm tmpfs && umount -l $UDEV_ROOT/shm + + # Umount pts if needed, we will remount it later: + check_mounted $UDEV_ROOT/pts devpts && umount -l $UDEV_ROOT/pts + + # Mount tmpfs on $UDEV_ROOT: + # the -n is because we don't want $UDEV_ROOT umounted when + # someone (rc.[06]) calls umount -a + mount -n -o mode=0755 -t tmpfs tmpfs $UDEV_ROOT + fi + fi + # Mount devpts + mount_devpts - # Mount tmpfs on $UDEV_ROOT: - # the -n is because we don't want $UDEV_ROOT umounted when - # someone (rc.[06]) calls umount -a - mount -n -o mode=0755 -t tmpfs tmpfs $UDEV_ROOT + # Start udevd. + /sbin/udevd --daemon 2>/dev/null - # Remount pts: - mkdir $UDEV_ROOT/pts 2> /dev/null - mount -n -o mode=0620,gid=5 -t devpts devpts $UDEV_ROOT/pts - fi + # If udevd was already running, then it will return !=0 exit code, + # so we'll try to re-run failed events + if [ $? != 0 ]; then + OPT="--type=failed $OPT" + ( cd ${UDEV_ROOT}/.udev + for TMPFILE in tmp-rules-*.rules ; do + mv $TMPFILE /etc/udev/rules.d/${TMPFILE/tmp-rules--/} 2>/dev/null + done + ) + else # udev is just now being started, so we'll do some initial setup: - # Add the static nodes to $UDEV_ROOT: - cp --preserve=all --recursive --remove-destination /lib/udev/devices/* $UDEV_ROOT + # Set STARTUP=1 in the environment + /sbin/udevadm control --property=STARTUP=1 - # Start udevd: - echo "Starting udevd: /sbin/udevd --daemon" - /sbin/udevd --daemon + # Set OPT="--action=add" to generate add events on coldplug + OPT="--action=add" + # Add the static nodes to $UDEV_ROOT: + cp --preserve=all --recursive --remove-destination /lib/udev/devices/* $UDEV_ROOT + # Create rootdev rules DEVICENUMBER=$( /bin/stat -c %d / ) MAJORNUMBER=$(($DEVICENUMBER / 256)) @@ -99,9 +125,15 @@ case "$1" in echo "Triggering udev events: /sbin/udevadm trigger $OPT" # Call udevtrigger and udevsettle to do the device configuration: /sbin/udevadm trigger $OPT && /sbin/udevadm settle --timeout=120 + # Unset STARTUP=1 in the environment + /sbin/udevadm control --property=STARTUP= ;; stop) + echo "Stopping udevd is STRONGLY discouraged and not supported." + echo "If you are sure you want to do this, use 'force-stop' instead." + ;; + force-stop) echo "Stopping udevd" if [ -e /proc/sys/kernel/hotplug ]; then echo /sbin/hotplug > /proc/sys/kernel/hotplug @@ -109,6 +141,10 @@ case "$1" in killall udevd ;; restart) + echo "Restarting udevd is STRONGLY discouraged and not supported." + echo "If you are sure you want to do this, use 'force-restart' instead." + ;; + force-restart) echo "Restarting udevd" killall udevd sleep 5 diff --git a/source/a/udev/config/rules.d/59-non-libata-devices.rules b/source/a/udev/config/rules.d/59-non-libata-devices.rules new file mode 100644 index 000000000..4b1238a43 --- /dev/null +++ b/source/a/udev/config/rules.d/59-non-libata-devices.rules @@ -0,0 +1,44 @@ +# Support for the deprecated IDE devices has been removed from the +# default set of rules shipped with udev, but some administrators +# might want (or need) the old ata drivers and thus build a custom +# kernel, so we'll carry these on our own for now... + +############################################################################# + +# Old 50-udev-default.rules + +# floppy +KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy" + +# cdrom +SUBSYSTEM=="block", KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="cdrom", GROUP="cdrom" + +############################################################################# + +# Old 60-persistent-storage.rules + +# never access non-cdrom removable ide devices, the drivers are causing event loops on open() +KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="old_persistent_storage_end" +KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="old_persistent_storage_end" + +# by-id (hardware serial number) +KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" +KERNEL=="hd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}" +KERNEL=="hd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_SERIAL}-part%n" + +LABEL="old_persistent_storage_end" + +############################################################################# + +# Old ide stuff from our custom 65-permissions.rules + +# permissions for IDE floppy devices +KERNEL=="hd*[!0-9]", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", SYMLINK+="floppy floppy-%k" +KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", SYMLINK+="floppy-%k" + +# put all removable devices in group "plugdev" +KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GROUP="plugdev" +KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GROUP="plugdev" + +############################################################################# + diff --git a/source/a/udev/config/rules.d/65-permissions.rules b/source/a/udev/config/rules.d/65-permissions.rules index b0cfb2590..6f82b0f36 100644 --- a/source/a/udev/config/rules.d/65-permissions.rules +++ b/source/a/udev/config/rules.d/65-permissions.rules @@ -12,15 +12,7 @@ # all disks with group disk KERNEL!="fd*", SUBSYSTEM=="block", GROUP="disk" -# permissions for IDE floppy devices -KERNEL=="hd*[!0-9]", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", \ - SYMLINK+="floppy floppy-%k", OPTIONS+="ignore_remove" -KERNEL=="hd*[0-9]", ATTRS{media}=="floppy", ATTRS{removable}=="1", \ - SYMLINK+="floppy-%k", OPTIONS+="ignore_remove" - # put all removable devices in group "plugdev" -KERNEL=="hd*[!0-9]", ATTR{removable}=="1", GROUP="plugdev" -KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GROUP="plugdev" KERNEL=="sd*[!0-9]", ATTR{removable}=="1", GROUP="plugdev" KERNEL=="sd*[0-9]", ATTRS{removable}=="1", GROUP="plugdev" @@ -44,9 +36,6 @@ SUBSYSTEMS=="scsi", KERNEL=="s[gt][0-9]*", ATTRS{type}=="5", \ # Make DRI video devices usable by anyone in group "video": KERNEL=="card[0-9]*",GROUP:="video" -# alsa devices -SUBSYSTEM=="sound", GROUP="audio" - # Make the real time clock readable by all, and writable by root: KERNEL=="rtc|rtc0", MODE="0644" diff --git a/source/a/udev/rule_generator.diff b/source/a/udev/rule_generator.diff index 0ff218a6c..f3f67516d 100644 --- a/source/a/udev/rule_generator.diff +++ b/source/a/udev/rule_generator.diff @@ -1,6 +1,6 @@ -diff -Naur udev-114/extras/rule_generator/write_cd_rules udev-114slk/extras/rule_generator/write_cd_rules ---- udev-114/extras/rule_generator/write_cd_rules 2007-08-05 09:08:47.000000000 -0300 -+++ udev-114slk/extras/rule_generator/write_cd_rules 2007-08-22 20:17:24.000000000 -0300 +diff -Naur udev.orig/extras/rule_generator/write_cd_rules udev/extras/rule_generator/write_cd_rules +--- udev.orig/extras/rule_generator/write_cd_rules 2009-05-19 00:24:39.000000000 -0300 ++++ udev/extras/rule_generator/write_cd_rules 2009-05-19 01:02:17.000000000 -0300 @@ -3,7 +3,8 @@ # This script is run if an optical drive lacks a rule for persistent naming. # @@ -11,13 +11,13 @@ diff -Naur udev-114/extras/rule_generator/write_cd_rules udev-114slk/extras/rule # # (C) 2006 Marco d'Itri <md@Linux.IT> # -@@ -97,18 +98,59 @@ +@@ -96,18 +97,57 @@ choose_rules_file link_num=$(find_next_available 'cdrom[0-9]*') +[ "$link_num" = "" ] && link_num=0 - match="ENV{ID_CDROM}==\"?*\", $RULE" + match="SUBSYSTEM==\"block\", ENV{ID_CDROM}==\"?*\", $RULE" comment="$ID_MODEL ($ID_PATH)" - @@ -73,8 +73,6 @@ diff -Naur udev-114/extras/rule_generator/write_cd_rules udev-114slk/extras/rule + fi + fi + fi -+ -+ + echo >> $RULES_FILE unlock_rules_file - diff --git a/source/a/udev/udev-153.tar.sign b/source/a/udev/udev-153.tar.sign new file mode 100644 index 000000000..193f3a0e7 --- /dev/null +++ b/source/a/udev/udev-153.tar.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBLzqFNyGugalF9Dw4RApGYAKCVo2YvsfeOD/ozq/rsURNM/AoxrwCcCJl1 +YD0LnOVyqilDyMQdOk2VA7o= +=hHbP +-----END PGP SIGNATURE----- diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild index 0c6327486..e891fca35 100755 --- a/source/a/udev/udev.SlackBuild +++ b/source/a/udev/udev.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,13 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -VERSION=${VERSION:-141} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else @@ -41,7 +49,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/lib/udev cd $TMP rm -rf udev-$VERSION -tar xvf $CWD/udev-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/udev-$VERSION.tar.xz || exit 1 cd udev-$VERSION || exit 1 chown -R root:root . find . \ @@ -50,31 +58,31 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/rule_generator.diff.gz | patch -p1 --verbose || exit 1 +# Fixup the rule generator for our use +zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1 +# static libudev is needed for lvm2 ./configure \ + --enable-static \ --prefix=/usr \ - --exec-prefix=/ \ --sysconfdir=/etc \ + --sbindir=/sbin \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-rootlibdir=/lib${LIBDIRSUFFIX} \ + --libexecdir=/lib/udev \ + --disable-introspection \ --mandir=/usr/man \ - --with-libdir-name=lib${LIBDIRSUFFIX} \ + --docdir=/usr/doc/udev-$VERSION \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ - xargs strip --strip-unneeded 2> /dev/null -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# scsi_id and vol_id are needed by multipath -( cd $PKG/sbin - ln -s ../lib/udev/scsi_id scsi_id - ln -s ../lib/udev/vol_id vol_id -) +# scsi_id is needed by multipath +( cd $PKG/sbin ; ln -s ../lib/udev/scsi_id scsi_id ) mkdir -p \ $PKG/etc/modprobe.d \ @@ -84,15 +92,10 @@ mkdir -p \ # Yes, these will clobber existing config files. cp -a $CWD/config/udev.conf $PKG/etc/udev/udev.conf + # Copy Slackware custom rules cp -a $CWD/config/rules.d/* $PKG/lib/udev/rules.d/ -# Copy some files from upstream -cp -a rules/packages/40-alsa.rules $PKG/lib/udev/rules.d/ -cp -a rules/packages/40-isdn.rules $PKG/lib/udev/rules.d/ -cp -a rules/packages/40-zaptel.rules $PKG/lib/udev/rules.d/ -cp -a rules/packages/40-infiniband.rules $PKG/lib/udev/rules.d/ -#cp -a rules/packages/40-pilot-links.rules $PKG/etc/udev/rules.d/ -#cp -a rules/packages/64-md-raid.rules $PKG/etc/udev/rules.d/ + # Now the init script and module-init-tools stuff cp -a $CWD/config/rc.d/rc.udev.new $PKG/etc/rc.d/rc.udev.new cp -a $CWD/config/modprobe.d/* $PKG/etc/modprobe.d @@ -100,7 +103,7 @@ cp -a $CWD/config/modprobe.d/* $PKG/etc/modprobe.d chown -R root:root $PKG/etc find $PKG/etc -type f -exec chmod 644 {} \; find $PKG/etc -type d -exec chmod 755 {} \; -chmod 755 $PKG/etc/rc.d/rc.udev.new +chmod 0755 $PKG/etc/rc.d/rc.udev.new # Add extra device nodes to the package that udev doesn't make: tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG @@ -112,11 +115,21 @@ done chown -R root:root $PKG/lib/udev chmod 755 $PKG/lib/udev/* +# Move the pkgconfig file to where we expect it +mv $PKG/usr/share/pkgconfig/* $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig +rmdir $PKG/usr/share/pkgconfig + +# Kill the ConsoleKit stuff +rm -rf $PKG/usr/lib/ConsoleKit ; rmdir $PKG/usr/lib 2>/dev/null + mkdir -p $PKG/usr/doc/udev-$VERSION cp -a \ - COPYING* FAQ README* TODO RELEASE-NOTES docs \ + COPYING* README* TODO \ $PKG/usr/doc/udev-$VERSION +# Don't package the API docs: +rm -rf $PKG/usr/share/gtk-doc ; rmdir $PKG/usr/share 2>/dev/null + # Compress and fix manpage symlinks: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man diff --git a/source/a/usb_modeswitch/doinst.sh b/source/a/usb_modeswitch/doinst.sh new file mode 100644 index 000000000..1ed6e1740 --- /dev/null +++ b/source/a/usb_modeswitch/doinst.sh @@ -0,0 +1,14 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config etc/usb_modeswitch.conf.new + diff --git a/source/a/usb_modeswitch/slack-desc b/source/a/usb_modeswitch/slack-desc new file mode 100644 index 000000000..9581428b2 --- /dev/null +++ b/source/a/usb_modeswitch/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +usb_modeswitch: usb_modeswitch (mode switching tool for multiple mode USB devices) +usb_modeswitch: +usb_modeswitch: USB-ModeSwitch is (surprise!) a small mode switching tool for +usb_modeswitch: controlling "flip flop" (multiple device) USB gear. These devices +usb_modeswitch: initially appear to be USB storage, typically containing the MS +usb_modeswitch: Windows drivers for whatever the real purpose of the device is, such +usb_modeswitch: as a wireless USB modem. To use these devices with Linux, they need +usb_modeswitch: to be told to switch out of storage mode, which is the purpose of the +usb_modeswitch: USB-ModeSwitch utility. +usb_modeswitch: +usb_modeswitch: Homepage: http://www.draisberghof.de/usb_modeswitch diff --git a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild new file mode 100755 index 000000000..f4e6569ef --- /dev/null +++ b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh + +# Slackware build script for usb_modeswitch. + +# Copyright 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010 David Somero, Athens, TN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=usb_modeswitch +VERSION=${VERSION:-1.1.2} +DATAVER=${DATAVER:-20100418} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +# Upstream is playing guess the program name. +SRCPKGNAM=$(echo $PKGNAM | tr _ -) + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCPKGNAM-$VERSION +tar xvf $CWD/$SRCPKGNAM-$VERSION.tar.?z* || exit 1 +cd $SRCPKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +make clean +gcc $SLKCFLAGS $LDFLAGS -lusb -Wall -o usb_modeswitch usb_modeswitch.c || exit 1 + +install -D -s -m 0755 usb_modeswitch $PKG/usr/sbin/usb_modeswitch +install -D -m 0755 usb_modeswitch.tcl $PKG/lib/udev/usb_modeswitch +install -D -m 0644 usb_modeswitch.conf $PKG/etc/usb_modeswitch.conf.new + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING* README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +# Now, install the data pack: +cd $TMP +rm -rf usb-modeswitch-data-${DATAVER} +tar xvf $CWD/usb-modeswitch-data-${DATAVER}.tar.?z* || exit 1 +cd usb-modeswitch-data-${DATAVER} || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; +install -D -m 0644 40-usb_modeswitch.rules $PKG/lib/udev/rules.d/40-usb_modeswitch.rules +mkdir -p $PKG/etc +cp -a usb_modeswitch.d $PKG/etc +mkdir -p $PKG/usr/doc/usb-modeswitch-data-${DATAVER} +cat ChangeLog | head -n 1000 > $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog +touch -r ChangeLog $PKG/usr/doc/usb-modeswitch-data-${DATAVER}/ChangeLog +cp -a \ + COPYING* README* \ + $PKG/usr/doc/usb-modeswitch-data-${DATAVER} + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild index dcb14b466..7263b8647 100755 --- a/source/a/usbutils/usbutils.SlackBuild +++ b/source/a/usbutils/usbutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-0.82} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo usbutils-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-usbutils @@ -40,6 +49,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -88,6 +100,10 @@ mv $PKG/sbin/update-usbids.sh $PKG/usr/sbin/update-usbids.sh # upstream name available there too... ( cd $PKG/sbin ; ln -sf /usr/sbin/update-usbids.sh . ) +# Move the pkgconfig directory to @libdir@ instead of @datadir@ +mkdir $PKG/usr/lib${LIBDIRSUFFIX} +mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -108,9 +124,17 @@ fi mkdir -p $PKG/usr/doc/usbutils-$VERSION cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ + AUTHORS COPYING NEWS README \ $PKG/usr/doc/usbutils-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff b/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff new file mode 100644 index 000000000..97f078437 --- /dev/null +++ b/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff @@ -0,0 +1,13 @@ +diff -Nur setserial-2.17.orig/setserial.c setserial-2.17/setserial.c +--- setserial-2.17.orig/setserial.c 2000-01-27 09:40:52.000000000 -0600 ++++ setserial-2.17/setserial.c 2010-03-29 23:05:27.093878048 -0500 +@@ -26,6 +26,9 @@ + + #include "version.h" + ++/* http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f53a2ade0bb9f2a81f473e6469155172a96b7c38 */ ++#undef TIOCGHAYESESP ++ + static char version_str[] = "setserial version " SETSERIAL_VERSION ", " + SETSERIAL_DATE; + diff --git a/source/a/util-linux-ng/util-linux-ng.SlackBuild b/source/a/util-linux-ng/util-linux-ng.SlackBuild index 2c2ea55e5..386487aba 100755 --- a/source/a/util-linux-ng/util-linux-ng.SlackBuild +++ b/source/a/util-linux-ng/util-linux-ng.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,23 @@ # Slackware build script for util-linux-ng -VERSION=${VERSION:-2.14.2} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo util-linux-ng*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} ADJTIMEXVERS=1.23 SETSERIALVERS=2.17 ZIPTOOLVERS=1.4.0 +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -39,17 +48,20 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-util-linux-ng + rm -rf $PKG mkdir -p $TMP $PKG - cd $TMP || exit 1 rm -rf util-linux-ng-$VERSION -tar xvf $CWD/util-linux-ng-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/util-linux-ng-$VERSION.tar.xz || exit 1 cd util-linux-ng-$VERSION || exit 1 chown -R root.root . find . \ @@ -84,6 +96,7 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/util-linux-ng-$VERSION \ + --disable-static \ --enable-arch \ --enable-agetty \ --disable-init \ @@ -99,12 +112,24 @@ CFLAGS="$SLKCFLAGS" \ --enable-wall \ --enable-write \ --enable-use-tty-group \ + --enable-libblkid \ + --enable-libuuid \ + --disable-uuidd \ --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux \ || exit 1 make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || make install DESTDIR=$PKG + +# Move the libblkid and libuuid libraries to /lib${LIBSUFFIX} +mkdir -p $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + mv libblkid.so.1* $PKG/lib${LIBDIRSUFFIX} + mv libuuid.so.1* $PKG/lib${LIBDIRSUFFIX} + rm -f libblkid.so libuuid.so + ln -sf /lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so + ln -sf /lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so +) # Moving things around that have been in the same place # for 15 years is, IMHO, not a wise idea AT ALL. @@ -124,12 +149,11 @@ fi cat ./sys-utils/rdev > $PKG/sbin/rdev chown root:root $PKG/sbin/rdev chmod 755 $PKG/sbin/rdev -#cat ./sys-utils/rdev.8 | gzip -9c > $PKG/usr/man/man8/rdev.8.gz # Build ziptool cd $TMP || exit 1 rm -rf ziptool-$ZIPTOOLVERS -tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.bz2 || exit 1 +tar xvf $CWD/ziptool-$ZIPTOOLVERS.tar.xz || exit 1 cd ziptool-$ZIPTOOLVERS || exit 1 zcat $CWD/ziptool-fix_build.patch.gz | patch -p1 || exit 1 mkdir scsi @@ -159,7 +183,7 @@ cat strings.1 | gzip -9c > $PKG/usr/man/man1/strings.1.gz # installing just the A series will not have a hostname (null): cd $TMP || exit 1 rm -rf net-tools-1.60 -tar xvf $CWD/net-tools-1.60.tar.bz2 +tar xvf $CWD/net-tools-1.60.tar.xz cd net-tools-1.60 zcat $CWD/net-tools_1.60-19.diff.gz | patch -p1 || exit zcat $CWD/net-tools.diff.gz | patch -p1 || exit @@ -205,8 +229,9 @@ tar xvf $CWD/setserial-$SETSERIALVERS.tar.gz || exit 1 cd setserial-$SETSERIALVERS || exit 1 chown -R root:root . zcat $CWD/setserial-rc.serial.diff.gz | patch -E -p1 --verbose || exit 1 +zcat $CWD/setserial-undef_TIOCGHAYESESP.diff.gz | patch -E -p1 --verbose || exit 1 # The original config.{guess,sub} do not work on x86_64 -cp -p /usr/share/libtool/config.{guess,sub} . +cp -p /usr/share/libtool/config/config.{guess,sub} . ./configure --prefix=/usr || exit 1 make || exit 1 strip setserial @@ -272,7 +297,8 @@ rm $PKG/usr/info/dir gzip -9 $PKG/usr/info/* mkdir -p $PKG/usr/doc/util-linux-ng-$VERSION -cp ABOUT-NLS AUTHORS COPYING DEPRECATED NEWS README* TODO docs/* \ +cp -a AUTHORS COPYING DEPRECATED NEWS README* TODO \ + docs/v${VERSION}-ReleaseNotes \ $PKG/usr/doc/util-linux-ng-$VERSION mkdir $PKG/install diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild index 7ef1c07c6..cf832cfb9 100755 --- a/source/a/xfsprogs/xfsprogs.SlackBuild +++ b/source/a/xfsprogs/xfsprogs.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.0.1 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo xfsprogs-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-xfsprogs @@ -40,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -85,11 +97,28 @@ mv $PKG/usr/doc/xfsprogs $PKG/usr/doc/xfsprogs-$VERSION cp -a README doc/COPYING doc/CREDITS doc/PORTING \ $PKG/usr/doc/xfsprogs-$VERSION +rm -f $PKG/usr/doc/xfsprogs-$VERSION/CHANGES.gz + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r doc/CHANGES ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat doc/CHANGES | head -n 1000 > $DOCSDIR/CHANGES + touch -r doc/CHANGES $DOCSDIR/CHANGES +fi + +# The install location for many binaries changed with the update to 3.1.1, +# but it seems like the wrong place to put most of this stuff: +mkdir -p $PKG/usr/sbin +mv $PKG/sbin/xfs_* $PKG/usr/sbin +mv $PKG/usr/sbin/xfs_repair $PKG/sbin + # Remove bogus files: rm -f $PKG/lib${LIBDIRSUFFIX}/*.a $PKG/lib${LIBDIRSUFFIX}/*.so \ $PKG/lib${LIBDIRSUFFIX}/*.la $PKG/usr/lib${LIBDIRSUFFIX}/*.la # Make /usr/lib/libhandle.so a symlink to /lib/libhandle.so.1: if [ -f $PKG/lib${LIBDIRSUFFIX}/libhandle.so.1 ]; then + mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} ( cd $PKG/usr/lib${LIBDIRSUFFIX} rm -f libhandle.so ln -sf /lib${LIBDIRSUFFIX}/libhandle.so.1 libhandle.so diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild index 240334178..205a12ef6 100755 --- a/source/a/xz/xz.SlackBuild +++ b/source/a/xz/xz.SlackBuild @@ -22,10 +22,19 @@ # SUCH DAMAGE. PRGNAM=xz -VERSION=${VERSION:-4.999.8beta} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-4.999.9beta} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + case "$ARCH" in i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -75,6 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --docdir=/usr/doc/xz-$VERSION \ --sysconfdir=/etc \ --mandir=/usr/man \ --enable-shared \ |
