diff options
Diffstat (limited to 'source/a')
202 files changed, 14838 insertions, 8587 deletions
diff --git a/source/a/aaa_base/aaa_base.SlackBuild b/source/a/aaa_base/aaa_base.SlackBuild index d8c06b4af..297591448 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, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=13.1 -BUILD=${BUILD:-2} +VERSION=13.37 +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -48,7 +48,9 @@ echo "| repackaging aaa_base |" echo "+======================+" cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/slackware-version > $PKG/etc/slackware-version +cp -a $CWD/slackware-version $PKG/etc/slackware-version +chown root:root $PKG/etc/slackware-version +chmod 644 $PKG/etc/slackware-version # Add lib64 directories on x86_64: if [ "$ARCH" = "x86_64" ]; then diff --git a/source/a/aaa_base/slackware-version b/source/a/aaa_base/slackware-version index 11bc56a49..9f526a9a3 100644 --- a/source/a/aaa_base/slackware-version +++ b/source/a/aaa_base/slackware-version @@ -1 +1 @@ -Slackware 13.1.0 +Slackware 13.37.0 diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index 10bd02ce0..09c181ef2 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, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ PKGNAM=aaa_elflibs -VERSION=${VERSION:-13.1} -BUILD=${BUILD:-1} +VERSION=${VERSION:-13.37} +BUILD=${BUILD:-7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index 29c8bcc11..ab5ec3d7a 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -6,6 +6,7 @@ /lib/libdm.so.0 /lib/libfuse.so.2 /lib/libgpm.so.1 +/lib/liblzma.so.0 /lib/libncurses.so.5 /lib/libncursesw.so.5 /lib/libpopt.so.0 @@ -15,6 +16,7 @@ /usr/lib/libcurl.so.2 /usr/lib/libcurl.so.3 /usr/lib/libcurl.so.4 +/usr/lib/libelf.so.0 /usr/lib/libexpat.so.0 /usr/lib/libexpat.so.1 /usr/lib/libform.so.5 @@ -40,10 +42,12 @@ /usr/lib/libldap-2.3.so.0 /usr/lib/libldap-2.4.so.2 /usr/lib/libltdl.so.3 +/usr/lib/libltdl.so.7 /usr/lib/libmenu.so.5 /usr/lib/libmenuw.so.5 /usr/lib/libmm.so.14 /usr/lib/libmp.so.3 +/usr/lib/libmpfr.so.1 /usr/lib/libpanel.so.5 /usr/lib/libpanelw.so.5 /usr/lib/libpcre.so.0 diff --git a/source/a/aaa_elflibs/tracked-files b/source/a/aaa_elflibs/tracked-files index 16b731ba0..040ecbbcd 100644 --- a/source/a/aaa_elflibs/tracked-files +++ b/source/a/aaa_elflibs/tracked-files @@ -6,3 +6,4 @@ /usr/lib/libcups.so.2 /usr/lib/libcupsimage.so.2 /usr/lib/libgcc_s.so.1 +/usr/lib/libtalloc.so.2 diff --git a/source/a/aaa_terminfo/aaa_terminfo.SlackBuild b/source/a/aaa_terminfo/aaa_terminfo.SlackBuild index a1e7d288f..291215a9e 100755 --- a/source/a/aaa_terminfo/aaa_terminfo.SlackBuild +++ b/source/a/aaa_terminfo/aaa_terminfo.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,19 @@ PKGNAM=aaa_terminfo # Note the version of ncurses in use: -VERSION=${VERSION:-5.7} -ARCH=${ARCH:-noarch} +VERSION=${VERSION:-5.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 + if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else diff --git a/source/a/acl/acl.SlackBuild b/source/a/acl/acl.SlackBuild index 7ad70d045..a97bf27d1 100755 --- a/source/a/acl/acl.SlackBuild +++ b/source/a/acl/acl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.2.47-1 -ARCH=${ARCH:-x86_64} +PKGNAM=acl +VERSION=2.2.50 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-acl @@ -40,8 +50,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf acl-$(echo $VERSION | cut -f 1 -d '-') -tar xzvf $CWD/acl_$VERSION.tar.gz -cd acl-$(echo $VERSION | cut -f 1 -d '-') +tar xzvf $CWD/acl-$VERSION.src.tar.gz || exit 1 +cd acl-$(echo $VERSION | cut -f 1 -d '-') || exit 1 chown -R root:root . find . \ @@ -77,7 +87,7 @@ mv $PKG/usr/share/doc $PKG/usr ( cd $PKG/usr/doc ; mv acl acl-$VERSION ) #It would be nice to keep the same timestamps that the files have in the source: cp -a \ - README doc/COPYING doc/PORTING \ + README doc/COPYING* doc/PORTING \ $PKG/usr/doc/acl-$VERSION ( cd $PKG diff --git a/source/a/acl/acl.destdir.diff b/source/a/acl/acl.destdir.diff index df284724b..aa4b42e83 100644 --- a/source/a/acl/acl.destdir.diff +++ b/source/a/acl/acl.destdir.diff @@ -1,17 +1,6 @@ ---- ./include/buildmacros.orig 2007-09-10 21:00:47.000000000 -0500 -+++ ./include/buildmacros 2008-03-31 23:58:16.000000000 -0500 -@@ -27,7 +27,7 @@ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images ---- ./include/builddefs.in.orig 2007-09-10 21:00:47.000000000 -0500 -+++ ./include/builddefs.in 2008-03-31 23:58:16.000000000 -0500 -@@ -27,14 +27,14 @@ +--- ./include/builddefs.in.orig 2011-04-08 11:55:52.000000000 -0500 ++++ ./include/builddefs.in 2011-04-18 13:41:25.000000000 -0500 +@@ -28,14 +28,14 @@ PKG_VERSION = @pkg_version@ PKG_PLATFORM = @pkg_platform@ PKG_DISTRIBUTION= @pkg_distribution@ @@ -34,3 +23,14 @@ CC = @cc@ AWK = @awk@ +--- ./include/buildmacros.orig 2011-04-08 11:55:52.000000000 -0500 ++++ ./include/buildmacros 2011-04-18 13:41:54.000000000 -0500 +@@ -40,7 +40,7 @@ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/include/install-sh + + SHELL = /bin/sh + IMAGES_DIR = $(TOPDIR)/all-images diff --git a/source/a/acl/slack-desc b/source/a/acl/slack-desc index 9609c5854..93484df35 100644 --- a/source/a/acl/slack-desc +++ b/source/a/acl/slack-desc @@ -15,5 +15,5 @@ acl: discretionary access rights for files and directories. acl: acl: acl: -acl: +acl: Homepage: http://savannah.nongnu.org/projects/acl acl: diff --git a/source/a/acpid/acpid.SlackBuild b/source/a/acpid/acpid.SlackBuild index cb4831385..bd96d8b11 100755 --- a/source/a/acpid/acpid.SlackBuild +++ b/source/a/acpid/acpid.SlackBuild @@ -20,11 +20,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +PKGNAM=acpid 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 @@ -39,6 +38,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-acpid +NUMJOBS=${NUMJOBS:--j8} + rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/a/acpid/slack-desc b/source/a/acpid/slack-desc index b72ac8e62..1b065fcee 100644 --- a/source/a/acpid/slack-desc +++ b/source/a/acpid/slack-desc @@ -15,5 +15,5 @@ acpid: order to make the Linux ACPI support completely functional. acpid: acpid: ACPI must be compiled into the kernel to run acpid. acpid: -acpid: +acpid: Homepage: http://www.tedfelix.com/linux/acpid-netlink.html acpid: diff --git a/source/a/apmd/apmd.SlackBuild b/source/a/apmd/apmd.SlackBuild index 13e472735..b17ddf36f 100755 --- a/source/a/apmd/apmd.SlackBuild +++ b/source/a/apmd/apmd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-3.2.2} -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 "} -BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -85,6 +95,10 @@ cat apmd.8 | gzip -9c > $PKG/usr/man/man8/apmd.8.gz mkdir -p $PKG/usr/man/fr/man1 cat apmsleep.fr.1 | gzip -9c > $PKG/usr/man/fr/man1/apmsleep.1.gz +# Remove this version since the one in pm-utils is better: +rm -f $PKG/usr/bin/on_ac_power +rm -f $PKG/usr/man/man1/on_ac_power.1.gz + mkdir -p $PKG/usr/doc/apmd-$VERSION cp -a \ AUTHORS COPYING LSM README apmlib.COPYING apmsleep.README \ diff --git a/source/a/attr/attr.SlackBuild b/source/a/attr/attr.SlackBuild index 9c16a8d60..1b6fe70b4 100755 --- a/source/a/attr/attr.SlackBuild +++ b/source/a/attr/attr.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.4.43-1 -ARCH=${ARCH:-x86_64} +PKGNAM=attr +VERSION=2.4.45 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-attr @@ -39,8 +49,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf attr-$(echo $VERSION | cut -f 1 -d '-') -tar xzvf $CWD/attr_$VERSION.tar.gz -cd attr-$(echo $VERSION | cut -f 1 -d '-') +tar xvf $CWD/attr-$VERSION.src.tar.gz || exit 1 +cd attr-$(echo $VERSION | cut -f 1 -d '-') || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -76,7 +86,7 @@ mv $PKG/usr/share/doc $PKG/usr #It would be nice to keep the same timestamps that the files have in the source: rm -rf $PKG/usr/doc/attr-$VERSION/ea-conv cp -a \ - README doc/COPYING doc/PORTING doc/ea-conv \ + README doc/COPYING* doc/PORTING doc/ea-conv \ $PKG/usr/doc/attr-$VERSION find $PKG | xargs file | grep -e "executable" -e "shared object" \ diff --git a/source/a/attr/attr.destdir.diff b/source/a/attr/attr.destdir.diff index ced69eefb..5065675ba 100644 --- a/source/a/attr/attr.destdir.diff +++ b/source/a/attr/attr.destdir.diff @@ -1,17 +1,6 @@ ---- ./include/buildmacros.orig 2007-09-10 21:00:49.000000000 -0500 -+++ ./include/buildmacros 2008-03-31 23:54:02.000000000 -0500 -@@ -27,7 +27,7 @@ - $(LFILES:.l=.o) \ - $(YFILES:%.y=%.tab.o) - --INSTALL = $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP) -+INSTALL = $(TOPDIR)/install-sh - - SHELL = /bin/sh - IMAGES_DIR = $(TOPDIR)/all-images ---- ./include/builddefs.in.orig 2007-09-10 21:00:49.000000000 -0500 -+++ ./include/builddefs.in 2008-03-31 23:54:02.000000000 -0500 -@@ -27,14 +27,14 @@ +--- ./include/builddefs.in.orig 2011-04-08 11:56:59.000000000 -0500 ++++ ./include/builddefs.in 2011-04-18 13:27:35.000000000 -0500 +@@ -40,14 +40,14 @@ PKG_VERSION = @pkg_version@ PKG_PLATFORM = @pkg_platform@ PKG_DISTRIBUTION= @pkg_distribution@ @@ -34,3 +23,14 @@ CC = @cc@ AWK = @awk@ +--- ./include/buildmacros.orig 2011-04-08 11:56:59.000000000 -0500 ++++ ./include/buildmacros 2011-04-18 13:28:23.000000000 -0500 +@@ -40,7 +40,7 @@ + $(LFILES:.l=.o) \ + $(YFILES:%.y=%.tab.o) + +-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP) ++INSTALL = $(TOPDIR)/include/install-sh + + SHELL = /bin/sh + IMAGES_DIR = $(TOPDIR)/all-images diff --git a/source/a/attr/slack-desc b/source/a/attr/slack-desc index e9220f2fb..ebca0fe70 100644 --- a/source/a/attr/slack-desc +++ b/source/a/attr/slack-desc @@ -16,4 +16,4 @@ attr: Extended attributes are used to provide additional functionality to attr: a filesystem. For example, Access Control Lists (ACLs) are attr: implemented using extended attributes. attr: -attr: +attr: Homepage: http://savannah.nongnu.org/projects/attr diff --git a/source/a/bash/bash-4.1-patches/bash41-008 b/source/a/bash/bash-4.1-patches/bash41-008 new file mode 100644 index 000000000..2bec4de4f --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-008 @@ -0,0 +1,49 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-008 + +Bug-Reported-by: Dennis van Dok <dvandok@gmail.com> +Bug-Reference-ID: <4BBF2501.5050703@gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-04/msg00038.html + +Bug-Description: + +When declaring an associative array and implicitly assigning a value +to element "0", bash does not correctly allocate memory, leading to +a segmentation violation when that element or the array itself is +unset. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/builtins/declare.def 2009-11-25 19:42:00.000000000 -0500 +--- builtins/declare.def 2010-05-30 18:25:21.000000000 -0400 +*************** +*** 513,517 **** + /* let bind_{array,assoc}_variable take care of this. */ + if (assoc_p (var)) +! bind_assoc_variable (var, name, "0", value, aflags); + else + bind_array_variable (name, 0, value, aflags); +--- 519,523 ---- + /* let bind_{array,assoc}_variable take care of this. */ + if (assoc_p (var)) +! bind_assoc_variable (var, name, savestring ("0"), value, aflags); + else + bind_array_variable (name, 0, value, aflags); +*** ../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 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/bash-4.1-patches/bash41-009 b/source/a/bash/bash-4.1-patches/bash41-009 new file mode 100644 index 000000000..ae0f1e3e0 --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-009 @@ -0,0 +1,48 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-009 + +Bug-Reported-by: Tomas Trnka <tomastrnka@gmx.com> +Bug-Reference-ID: <201003242030.02166.tomastrnka@gmx.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-03/msg00090.html + +Bug-Description: + +An arriving SIGCHLD will interrupt `slow' system calls such as write(2) to +or read(2) from a terminal. This results in an error message and truncated +input or output. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/sig.c Fri Aug 14 16:31:52 2009 +--- sig.c Fri Mar 26 22:34:11 2010 +*************** +*** 655,660 **** +--- 655,663 ---- + act.sa_flags |= SA_INTERRUPT; /* XXX */ + else + act.sa_flags |= SA_RESTART; /* XXX */ ++ #else ++ if (sig == SIGCHLD) ++ act.sa_flags |= SA_RESTART; + #endif + sigemptyset (&act.sa_mask); + sigemptyset (&oact.sa_mask); +*** ../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 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/bash-4.1-patches/bash41-010 b/source/a/bash/bash-4.1-patches/bash41-010 new file mode 100644 index 000000000..b5a4b615a --- /dev/null +++ b/source/a/bash/bash-4.1-patches/bash41-010 @@ -0,0 +1,68 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.1 +Patch-ID: bash41-010 + +Bug-Reported-by: Stephane Jourdois <sjourdois@gmail.com> +Bug-Reference-ID: <AANLkTimbh1t2BmCjnCgACpEidArJMBIEtr30Vv3VzHxf@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2010-05/msg00165.html + +Bug-Description: + +The expansion of the \W prompt string escape sequence incorrectly used +strcpy to copy overlapping strings. Only memmove works in this case. + +Patch (apply with `patch -p0'): + +*** ../bash-4.1-patched/parse.y 2009-12-30 12:51:42.000000000 -0500 +--- parse.y 2011-02-24 16:40:48.000000000 -0500 +*************** +*** 5153,5157 **** + t = strrchr (t_string, '/'); + if (t) +! strcpy (t_string, t + 1); + } + } +--- 5153,5157 ---- + t = strrchr (t_string, '/'); + if (t) +! memmove (t_string, t + 1, strlen (t)); + } + } +*** ../bash-4.1-patched/y.tab.c 2009-12-30 12:52:02.000000000 -0500 +--- y.tab.c 2011-02-24 16:50:27.000000000 -0500 +*************** +*** 7482,7486 **** + t = strrchr (t_string, '/'); + if (t) +! strcpy (t_string, t + 1); + } + } +--- 7482,7486 ---- + t = strrchr (t_string, '/'); + if (t) +! memmove (t_string, t + 1, strlen (t)); + } + } +*************** +*** 8244,8246 **** + } + #endif /* HANDLE_MULTIBYTE */ +- +--- 8244,8245 ---- +*** ../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 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/bin/bin.SlackBuild b/source/a/bin/bin.SlackBuild index 69995accc..415e558ea 100755 --- a/source/a/bin/bin.SlackBuild +++ b/source/a/bin/bin.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2009, 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=11.1 -ARCH=${ARCH:-x86_64} 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 diff --git a/source/a/btrfs-progs/btrfs-progs.SlackBuild b/source/a/btrfs-progs/btrfs-progs.SlackBuild new file mode 100755 index 000000000..ebbd9a536 --- /dev/null +++ b/source/a/btrfs-progs/btrfs-progs.SlackBuild @@ -0,0 +1,128 @@ +#!/bin/sh +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, 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. + + +CWD=$(pwd) + +PKGNAM=btrfs-progs +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Download the btrfs-progs-unstable Git head if there's no tarball: +if ! /bin/ls $CWD/btrfs-progs*tar* 1> /dev/null 2> /dev/null ; then + git clone git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs-unstable.git + rm -r btrfs-progs-unstable/.git + tar cf btrfs-progs-$(date +%Y%m%d).tar btrfs-progs-unstable + xz -9 btrfs-progs-$(date +%Y%m%d).tar + rm -r $CWD/btrfs-progs-unstable +fi + +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -f 3 -d - | cut -f 1 -d .)} + +# 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 [ "$TMP" = "" ]; then + TMP=/tmp +fi +PKG=$TMP/package-${PKGNAM} +rm -rf $PKG +mkdir -p $PKG + +cd $TMP +rm -rf btrfs-progs-unstable +tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd btrfs-progs-unstable + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . -perm 666 -exec chmod 644 {} \; +find . -perm 664 -exec chmod 644 {} \; +find . -perm 600 -exec chmod 644 {} \; +find . -perm 444 -exec chmod 644 {} \; +find . -perm 400 -exec chmod 644 {} \; +find . -perm 440 -exec chmod 644 {} \; +find . -perm 777 -exec chmod 755 {} \; +find . -perm 775 -exec chmod 755 {} \; +find . -perm 511 -exec chmod 755 {} \; +find . -perm 711 -exec chmod 755 {} \; +find . -perm 555 -exec chmod 755 {} \; + +# Build: +make $NUMJOBS || make || exit 1 + +# Build ext* conversion utility: +make $NUMJOBS convert || make convert || exit 1 + +# Install: +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 +) + +# Move stuff out of /usr/local: +mv $PKG/usr/local/bin $PKG/sbin +mv $PKG/usr/local/man $PKG/usr/man +rmdir $PKG/usr/local + +# Add an fsck.btrfs script. For now this serves to eat options such as -a +# that would otherwise cause issues for btrfs at boot time. +cat $CWD/fsck.btrfs > $PKG/sbin/fsck.btrfs +chmod 755 $PKG/sbin/fsck.btrfs + +# 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 + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + COPYING* INSTALL README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $TMP/package-${PKGNAM} +makepkg -l y -c n ../${PKGNAM}-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/btrfs-progs/fsck.btrfs b/source/a/btrfs-progs/fsck.btrfs new file mode 100644 index 000000000..779e0b794 --- /dev/null +++ b/source/a/btrfs-progs/fsck.btrfs @@ -0,0 +1,57 @@ +#!/bin/sh + +# Copyright 2011 Patrick J. Volkerding, Sebeka, Minnesota, 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. + +# Currently, btrfsck does not recognize any options, so eat any initial options +# beginning with '-'. Then, check the remaining args with btrfsck only if they +# exist and are readable. + +# Strip initial args: +while [ ! -z "$1" ]; do + if [ "$(echo $1 | cut -b1)" = "-" ]; then + shift # strip option from command line + else + break + fi +done + +# Main filesystem check loop: +RETVAL=0 +while [ ! -z "$1" ]; do + if [ -r "$1" ]; then + echo "fsck.btrfs: Checking filesystem on $1" + # Checking the root filesystem (even read-only) will fail, check for that: + if ! grep -w "$1" /etc/fstab | grep -wq / ; then + btrfsck "$1" + ERRCODE=$? + if [ ! $ERRCODE = 0 ]; then + RETVAL=$ERRCODE + fi + else + echo " $1 mounted on /, skipped." + fi + fi + shift +done + +# If there was an error, return the most recent error code: +exit $RETVAL + diff --git a/source/a/btrfs-progs/slack-desc b/source/a/btrfs-progs/slack-desc new file mode 100644 index 000000000..e9088d053 --- /dev/null +++ b/source/a/btrfs-progs/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-------------------------------------------------------| +btrfs-progs: btrfs-progs (Btrfs filesystem utilities) +btrfs-progs: +btrfs-progs: Btrfs is a new copy on write filesystem for Linux aimed at implementing +btrfs-progs: advanced features while focusing on fault tolerance, repair and easy +btrfs-progs: administration. Initially developed by Oracle, Btrfs is licensed under +btrfs-progs: the GPL and open for contribution from anyone. Btrfs is under heavy +btrfs-progs: development, and is not suitable for any uses other than benchmarking +btrfs-progs: and review. The Btrfs disk format is not yet finalized. +btrfs-progs: +btrfs-progs: Btrfs homepage: http://btrfs.wiki.kernel.org +btrfs-progs: diff --git a/source/a/bzip2/bzip2-1.0.4.saneso.diff b/source/a/bzip2/bzip2-1.0.4.saneso.diff deleted file mode 100644 index edbf1ad00..000000000 --- a/source/a/bzip2/bzip2-1.0.4.saneso.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./Makefile-libbz2_so.orig 2007-01-02 20:00:55.000000000 -0600 -+++ ./Makefile-libbz2_so 2007-01-23 22:02:29.000000000 -0600 -@@ -35,13 +35,13 @@ - bzlib.o - - all: $(OBJS) -- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS) -+ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.4 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.4 libbz2.so.1.0 -+ rm -f libbz2.so.1 -+ ln -s libbz2.so.1.0.4 libbz2.so.1 - - clean: -- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared -+ rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1 bzip2-shared - - blocksort.o: blocksort.c - $(CC) $(CFLAGS) -c blocksort.c diff --git a/source/a/bzip2/bzip2.SlackBuild b/source/a/bzip2/bzip2.SlackBuild index 465f75e07..46b1b1ef9 100755 --- a/source/a/bzip2/bzip2.SlackBuild +++ b/source/a/bzip2/bzip2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, 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=1.0.5 -SOLIB=1.0.4 -ARCH=${ARCH:-x86_64} +PKGNAM=bzip2 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +SOLIB=1.0.6 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-bzip2 @@ -40,13 +50,13 @@ mkdir -p $TMP $PKG cd $TMP rm -rf bzip2-$VERSION -tar xzvf $CWD/bzip2-$VERSION.tar.gz -cd bzip2-$VERSION +tar xzvf $CWD/bzip2-$VERSION.tar.gz || exit 1 +cd bzip2-$VERSION || exit 1 chown -R root:root . # This should be ok, since libbz2.so.1.0 will still exist. -zcat $CWD/bzip2-1.0.4.saneso.diff.gz | patch -p1 || exit +zcat $CWD/bzip2.saneso.diff.gz | patch -p1 || exit make -f Makefile-libbz2_so || exit 1 -make || exit 1 +make -j3 || make || exit 1 mkdir -p $PKG/usr/include cp -a bzlib.h $PKG/usr/include chown root:root $PKG/usr/include/bzlib.h @@ -64,7 +74,7 @@ mkdir -p $PKG/usr/man/man1 cat bzip2.1 | gzip -9c > $PKG/usr/man/man1/bzip2.1.gz echo '.so man1/bzip2.1' | gzip -9c > $PKG/usr/man/man1/bzip2recover.1.gz mkdir -p $PKG/usr/doc/bzip2-$VERSION -cp -a CHANGES LICENSE README README.COMPILATION.PROBLEMS Y2K_INFO \ +cp -a CHANGES LICENSE README* \ bzip2.txt *.html $PKG/usr/doc/bzip2-$VERSION chmod 644 $PKG/usr/doc/bzip2-$VERSION/* # Link up them links diff --git a/source/a/bzip2/bzip2.saneso.diff b/source/a/bzip2/bzip2.saneso.diff new file mode 100644 index 000000000..4f0acc6e1 --- /dev/null +++ b/source/a/bzip2/bzip2.saneso.diff @@ -0,0 +1,20 @@ +--- ./Makefile-libbz2_so.orig 2010-09-10 18:07:52.000000000 -0500 ++++ ./Makefile-libbz2_so 2010-09-20 12:30:10.475525363 -0500 +@@ -35,13 +35,13 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) ++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 +- rm -f libbz2.so.1.0 +- ln -s libbz2.so.1.0.6 libbz2.so.1.0 ++ rm -f libbz2.so.1 ++ ln -s libbz2.so.1.0.6 libbz2.so.1 + + clean: +- rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared ++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1 bzip2-shared + + blocksort.o: blocksort.c + $(CC) $(CFLAGS) -c blocksort.c diff --git a/source/a/coreutils/DIR_COLORS b/source/a/coreutils/DIR_COLORS index 2556aa014..fd77f5630 100644 --- a/source/a/coreutils/DIR_COLORS +++ b/source/a/coreutils/DIR_COLORS @@ -7,10 +7,9 @@ # options in the Slackware aliases) # Below, there should be one TERM entry for each termtype that is colorizable -TERM linux -TERM linux-c -TERM mach-color -TERM console +TERM Eterm +TERM ansi +TERM color-xterm TERM con132x25 TERM con132x30 TERM con132x43 @@ -21,18 +20,43 @@ TERM con80x30 TERM con80x43 TERM con80x50 TERM con80x60 +TERM cons25 +TERM console TERM cygwin TERM dtterm +TERM eterm-color +TERM gnome +TERM gnome-256color +TERM jfbterm +TERM konsole +TERM kterm +TERM linux +TERM linux-c +TERM mach-color +TERM mlterm TERM putty -TERM xterm -TERM xterm-color -TERM xterm-debian TERM rxvt +TERM rxvt-256color +TERM rxvt-cygwin +TERM rxvt-cygwin-native +TERM rxvt-unicode +TERM rxvt-unicode-256color +TERM rxvt-unicode256 TERM screen +TERM screen-256color +TERM screen-256color-bce TERM screen-bce TERM screen-w +TERM screen.linux +TERM screen.rxvt +TERM terminator TERM vt100 -TERM Eterm +TERM xterm +TERM xterm-16color +TERM xterm-256color +TERM xterm-88color +TERM xterm-color +TERM xterm-debian # Below are the color init strings for the basic file types. A color init # string consists of one or more of the following numeric codes: @@ -84,15 +108,16 @@ EXEC 01;32 # This is for files with execute permission: # archives or compressed (bright red) .7z 01;31 .ace 01;31 +.ACE 01;31 .arj 01;31 .bz2 01;31 -.cpio 01;31 +.cpio 01;31 .deb 01;31 .dz 01;31 .gz 01;31 .jar 01;31 .lzh 01;31 -.lzma 01;31 +.lzma 01;31 .rar 01;31 .RAR 01;31 .rpm 01;31 @@ -116,87 +141,95 @@ EXEC 01;32 # This is for files with execute permission: .zoo 01;31 # multimedia (video/image/sound) file formats -.aac 00;35 -.anx 01;35 -.asf 01;35 -.ASF 01;35 -.au 00;35 -.axa 00;35 -.axv 01;35 -.avi 01;35 -.AVI 01;35 -.bmp 01;35 -.BMP 01;35 +.aac 01;35 +.AAC 01;35 +.anx 01;35 +.asf 01;35 +.ASF 01;35 +.au 01;35 +.axa 01;35 +.axv 01;35 +.avi 01;35 +.AVI 01;35 +.bmp 01;35 +.BMP 01;35 +.divx 01;35 +.DIVX 01;35 .flac 01;35 .FLAC 01;35 -.gif 01;35 -.GIF 01;35 -.jpg 01;35 -.JPG 01;35 +.gif 01;35 +.GIF 01;35 +.jpg 01;35 +.JPG 01;35 .jpeg 01;35 .JPEG 01;35 -.m2a 01;35 -.M2A 01;35 -.m2v 01;35 -.M2V 01;35 -.m4a 01;35 -.M4A 01;35 -.m4p 01;35 -.M4P 01;35 -.m4v 01;35 -.M4V 01;35 -.mid 00;35 -.midi 00;35 -.mka 00;35 -.mov 01;35 -.MOV 01;35 -.mp3 01;35 -.MP3 01;35 -.mp4 01;35 +.m2a 01;35 +.M2A 01;35 +.m2v 01;35 +.M2V 01;35 +.m4a 01;35 +.M4A 01;35 +.m4p 01;35 +.M4P 01;35 +.m4v 01;35 +.M4V 01;35 +.mid 01;35 +.midi 01;35 +.mka 01;35 +.mkv 01;35 +.MKV 01;35 +.mov 01;35 +.MOV 01;35 +.mp3 01;35 +.MP3 01;35 +.mp4 01;35 +.MP4 01;35 .mp4v 01;35 -.mpc 01;35 -.MPC 01;35 +.mpc 01;35 +.MPC 01;35 .mpeg 01;35 .MPEG 01;35 -.mpg 01;35 -.MPG 01;35 -.nuv 01;35 -.oga 00;35 -.ogv 01;35 -.ogx 01;35 -.ogg 01;35 -.OGG 01;35 -.pbm 01;35 -.pgm 01;35 -.png 01;35 -.PNG 01;35 -.ppm 01;35 -.qt 01;35 -.ra 00;35 -.ram 01;35 -.RAM 01;35 -.rm 01;35 -.RM 01;35 -.spx 00;35 -.svg 01;35 +.mpg 01;35 +.MPG 01;35 +.nuv 01;35 +.oga 01;35 +.ogv 01;35 +.ogx 01;35 +.ogg 01;35 +.OGG 01;35 +.pbm 01;35 +.pgm 01;35 +.png 01;35 +.PNG 01;35 +.ppm 01;35 +.qt 01;35 +.ra 01;35 +.RA 01;35 +.ram 01;35 +.RAM 01;35 +.rm 01;35 +.RM 01;35 +.spx 01;35 +.svg 01;35 .svgz 01;35 -.tga 01;35 -.TGA 01;35 -.tif 01;35 -.TIF 01;35 +.tga 01;35 +.TGA 01;35 +.tif 01;35 +.TIF 01;35 .tiff 01;35 .TIFF 01;35 -.vob 01;35 -.wav 01;35 -.WAV 01;35 -.wma 01;35 -.WMA 01;35 -.wmv 01;35 -.WMV 01;35 -.xbm 01;35 -.xcf 01;35 -.xpm 01;35 -.xspf 00;35 -.xwd 01;35 -.XWD 01;35 - +.vob 01;35 +.VOB 01;35 +.wav 01;35 +.WAV 01;35 +.wma 01;35 +.WMA 01;35 +.wmv 01;35 +.WMV 01;35 +.xbm 01;35 +.xcf 01;35 +.xpm 01;35 +.xspf 01;35 +.xwd 01;35 +.XWD 01;35 +.xvid 01;35 diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild index 3d31bf9fb..860199847 100755 --- a/source/a/coreutils/coreutils.SlackBuild +++ b/source/a/coreutils/coreutils.SlackBuild @@ -22,7 +22,7 @@ PKGNAM=coreutils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -174,7 +174,7 @@ gzip -9 $PKG/usr/info/* mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* NEWS README THANKS THANKS-to-translators TODO \ + AUTHORS COPYING* NEWS README* THANKS THANKS-to-translators TODO \ $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/a/cpio/cpio-2.9.gcc43.diff b/source/a/cpio/cpio-2.9.gcc43.diff deleted file mode 100644 index cfe02d7f0..000000000 --- a/source/a/cpio/cpio-2.9.gcc43.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- ./lib/argp-fmtstream.h.orig 2006-01-21 04:37:18.000000000 -0600 -+++ ./lib/argp-fmtstream.h 2009-03-15 15:17:22.000000000 -0500 -@@ -198,8 +198,12 @@ - #endif - - #ifndef ARGP_FS_EI -+#ifdef __GNUC_STDC_INLINE__ -+#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__)) -+#else - #define ARGP_FS_EI extern inline - #endif -+#endif - - ARGP_FS_EI size_t - __argp_fmtstream_write (argp_fmtstream_t __fs, ---- ./lib/argp.h.orig 2007-03-30 11:20:19.000000000 -0500 -+++ ./lib/argp.h 2009-03-15 15:16:34.000000000 -0500 -@@ -580,7 +580,11 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# if defined __GNUC_STDC_INLINE__ -+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__)) -+# else -+# define ARGP_EI extern __inline__ -+# endif - # endif - - ARGP_EI void diff --git a/source/a/cpio/cpio.SlackBuild b/source/a/cpio/cpio.SlackBuild index 9cb6054bc..b078d0677 100755 --- a/source/a/cpio/cpio.SlackBuild +++ b/source/a/cpio/cpio.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, 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=cpio -VERSION=${VERSION:-2.9} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=$(ls $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -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 NUMJOBS=${NUMJOBS:-" -j7 "} @@ -50,10 +59,10 @@ 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 || exit 1 -zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || exit 1 +#zcat $CWD/cpio-2.9.gcc43.diff.gz | patch -p1 --verbose || exit 1 # Make sure ownerships and permissions are sane: chown -R root:root . @@ -114,10 +123,18 @@ gzip -9f $PKG/usr/info/* # Add a documentation directory: mkdir -p $PKG/usr/doc/cpio-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README THANKS TODO \ + ABOUT-NLS AUTHORS COPYING* NEWS README* THANKS TODO \ $PKG/usr/doc/cpio-$VERSION chmod 644 $PKG/usr/doc/cpio-$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 diff --git a/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign b/source/a/cpufrequtils/cpufrequtils-008.tar.bz2.sign index 95c6050d4..a242f00c4 100644 --- a/source/a/mdadm/mdadm-2.6.9.tar.bz2.sign +++ b/source/a/cpufrequtils/cpufrequtils-008.tar.bz2.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBJtgO9yGugalF9Dw4RAjdkAJ9yrZow4cgdSuoqFbXROoDzH9EyTwCfSVY5 -Ew7L5NKxUJZbZVXseX82eT0= -=X/Wg +iD8DBQBMMf7wyGugalF9Dw4RAi3wAJ0QXH5vw0DN6m1rMXU745McDwHd6ACfeWJP +atC8wFCUzLZix4bZhYp2Mvw= +=/hFX -----END PGP SIGNATURE----- diff --git a/source/a/cryptsetup/cryptsetup.SlackBuild b/source/a/cryptsetup/cryptsetup.SlackBuild index 35b674aee..11370fc64 100755 --- a/source/a/cryptsetup/cryptsetup.SlackBuild +++ b/source/a/cryptsetup/cryptsetup.SlackBuild @@ -33,8 +33,8 @@ # ----------------------------------------------------------------------------- PKGNAM=cryptsetup -VERSION=${VERSION:-1.1.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.2.0} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -110,7 +110,7 @@ mkdir -p $PKG/sbin mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README TODO \ + AUTHORS COPYING* INSTALL NEWS README TODO FAQ \ $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/a/cryptsetup/slack-desc b/source/a/cryptsetup/slack-desc index fbc0035b5..1dd4eeca9 100644 --- a/source/a/cryptsetup/slack-desc +++ b/source/a/cryptsetup/slack-desc @@ -15,7 +15,7 @@ cryptsetup: LUKS for dm-crypt is now implemented in cryptsetup replacing the cryptsetup: original cryptsetup. It provides all the functionally of the cryptsetup: original version plus all LUKS features. cryptsetup: -cryptsetup: cryptsetup home: http://luks.endorphin.org/dm-crypt +cryptsetup: cryptsetup home: http://code.google.com/p/cryptsetup/ cryptsetup: diff --git a/source/a/cups/cups.SlackBuild b/source/a/cups/cups.SlackBuild index 1c285c63a..7af4bd818 100755 --- a/source/a/cups/cups.SlackBuild +++ b/source/a/cups/cups.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # CUPS build script by volkerdi@slackware.com. -VERSION=1.4.3 -BUILD=${BUILD:-3} +VERSION=1.4.6 +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -58,6 +58,9 @@ cd cups-$VERSION # 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 +# Fix locking to avoid crashes with OpenSSL: +zcat $CWD/cups.fix_broken_locking.diff.gz | patch -p1 --verbose || exit 1 + sed -i.orig -e 's#$exec_prefix/lib/cups#$libdir/cups#g' configure ./configure \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/a/cups/cups.fix_broken_locking.diff b/source/a/cups/cups.fix_broken_locking.diff new file mode 100644 index 000000000..44f97533f --- /dev/null +++ b/source/a/cups/cups.fix_broken_locking.diff @@ -0,0 +1,256 @@ +Submitted By: DJ Lucas <robert AT linuxfromscratch DOT org> +Date: 2010-09-13 +Initial Package Version: 1.4.4 +Upstream Status: Unknown +Origin: https://bugzilla.redhat.com/show_bug.cgi?id=553834 +Description: Bug fix for invalid locking with GCrypt. + +diff -Naurp cups-1.4.4-orig/cups/http.c cups-1.4.4/cups/http.c +--- cups-1.4.4-orig/cups/http.c 2010-06-16 00:27:41.000000000 -0500 ++++ cups-1.4.4/cups/http.c 2010-09-13 01:27:03.000000000 -0500 +@@ -83,12 +83,10 @@ + * http_debug_hex() - Do a hex dump of a buffer. + * http_field() - Return the field index for a field name. + * http_read_ssl() - Read from a SSL/TLS connection. +- * http_locking_cb() - Lock/unlock a thread's mutex. + * http_send() - Send a request with all fields and the trailing + * blank line. + * http_setup_ssl() - Set up SSL/TLS support on a connection. + * http_shutdown_ssl() - Shut down SSL/TLS on a connection. +- * http_threadid_cb() - Return the current thread ID. + * http_upgrade() - Force upgrade to TLS encryption. + * http_write() - Write a buffer to a HTTP connection. + * http_write_chunk() - Write a chunked buffer. +@@ -146,19 +144,6 @@ static int http_setup_ssl(http_t *http) + static void http_shutdown_ssl(http_t *http); + static int http_upgrade(http_t *http); + static int http_write_ssl(http_t *http, const char *buf, int len); +- +-# ifdef HAVE_GNUTLS +-# ifdef HAVE_PTHREAD_H +-GCRY_THREAD_OPTION_PTHREAD_IMPL; +-# endif /* HAVE_PTHREAD_H */ +- +-# elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) +-static pthread_mutex_t *http_locks; /* OpenSSL lock mutexes */ +- +-static void http_locking_cb(int mode, int type, const char *file, +- int line); +-static unsigned long http_threadid_cb(void); +-# endif /* HAVE_GNUTLS */ + #endif /* HAVE_SSL */ + + +@@ -1188,22 +1173,21 @@ httpHead(http_t *http, /* I - Conne + void + httpInitialize(void) + { +- static int initialized = 0; /* Have we been called before? */ +-#ifdef WIN32 +- WSADATA winsockdata; /* WinSock data */ +-#endif /* WIN32 */ + #ifdef HAVE_LIBSSL +- int i; /* Looping var */ +- unsigned char data[1024]; /* Seed data */ ++# ifndef WIN32 ++ struct timeval curtime; /* Current time in microseconds */ ++# endif /* !WIN32 */ ++ int i; /* Looping var */ ++ unsigned char data[1024]; /* Seed data */ + #endif /* HAVE_LIBSSL */ + +- +- if (initialized) +- return; +- + #ifdef WIN32 +- WSAStartup(MAKEWORD(2,2), &winsockdata); ++ WSADATA winsockdata; /* WinSock data */ ++ + ++ static int initialized = 0; /* Has WinSock been initialized? */ ++ if (!initialized) ++ WSAStartup(MAKEWORD(1,1), &winsockdata); + #elif !defined(SO_NOSIGPIPE) + /* + * Ignore SIGPIPE signals... +@@ -1226,21 +1210,15 @@ httpInitialize(void) + #endif /* WIN32 */ + + #ifdef HAVE_GNUTLS +- /* +- * Make sure we handle threading properly... +- */ +- +-# ifdef HAVE_PTHREAD_H +- gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); +-# endif /* HAVE_PTHREAD_H */ + + /* + * Initialize GNU TLS... + */ + + gnutls_global_init(); ++#endif /* HAVE_GNUTLS */ + +-#elif defined(HAVE_LIBSSL) ++#ifdef HAVE_LIBSSL + /* + * Initialize OpenSSL... + */ +@@ -1249,33 +1227,21 @@ httpInitialize(void) + SSL_library_init(); + + /* +- * Set the threading callbacks... +- */ +- +-# ifdef HAVE_PTHREAD_H +- http_locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t)); +- +- for (i = 0; i < CRYPTO_num_locks(); i ++) +- pthread_mutex_init(http_locks + i, NULL); +- +- CRYPTO_set_id_callback(http_threadid_cb); +- CRYPTO_set_locking_callback(http_locking_cb); +-# endif /* HAVE_PTHREAD_H */ +- +- /* + * Using the current time is a dubious random seed, but on some systems + * it is the best we can do (on others, this seed isn't even used...) + */ + +- CUPS_SRAND(time(NULL)); ++# ifdef WIN32 ++# else ++ gettimeofday(&curtime, NULL); ++ srand(curtime.tv_sec + curtime.tv_usec); ++# endif /* WIN32 */ + + for (i = 0; i < sizeof(data); i ++) +- data[i] = CUPS_RAND(); ++ data[i] = rand(); + + RAND_seed(data, sizeof(data)); +-#endif /* HAVE_GNUTLS */ +- +- initialized = 1; ++#endif /* HAVE_LIBSSL */ + } + + +@@ -2834,25 +2800,6 @@ http_read_ssl(http_t *http, /* I - Conn + #endif /* HAVE_SSL */ + + +-#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) +-/* +- * 'http_locking_cb()' - Lock/unlock a thread's mutex. +- */ +- +-static void +-http_locking_cb(int mode, /* I - Lock mode */ +- int type, /* I - Lock type */ +- const char *file, /* I - Source file */ +- int line) /* I - Line number */ +-{ +- if (mode & CRYPTO_LOCK) +- pthread_mutex_lock(http_locks + type); +- else +- pthread_mutex_unlock(http_locks + type); +-} +-#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */ +- +- + /* + * 'http_send()' - Send a request with all fields and the trailing blank line. + */ +@@ -3224,19 +3171,6 @@ http_shutdown_ssl(http_t *http) /* I - + #endif /* HAVE_SSL */ + + +-#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H) +-/* +- * 'http_threadid_cb()' - Return the current thread ID. +- */ +- +-static unsigned long /* O - Thread ID */ +-http_threadid_cb(void) +-{ +- return ((unsigned long)pthread_self()); +-} +-#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */ +- +- + #ifdef HAVE_SSL + /* + * 'http_upgrade()' - Force upgrade to TLS encryption. +diff -Naurp cups-1.4.4-orig/cups/http-private.h cups-1.4.4/cups/http-private.h +--- cups-1.4.4-orig/cups/http-private.h 2010-04-11 23:03:53.000000000 -0500 ++++ cups-1.4.4/cups/http-private.h 2010-09-13 01:27:24.000000000 -0500 +@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void) + * The GNU TLS library is more of a "bare metal" SSL/TLS library... + */ + # include <gnutls/gnutls.h> +-# include <gcrypt.h> + + typedef struct + { +diff -Naurp cups-1.4.4-orig/scheduler/main.c cups-1.4.4/scheduler/main.c +--- cups-1.4.4-orig/scheduler/main.c 2010-04-23 13:56:34.000000000 -0500 ++++ cups-1.4.4/scheduler/main.c 2010-09-13 01:27:36.000000000 -0500 +@@ -549,8 +549,6 @@ main(int argc, /* I - Number of comm + * Startup the server... + */ + +- httpInitialize(); +- + cupsdStartServer(); + + /* +diff -Naurp cups-1.4.4-orig/scheduler/server.c cups-1.4.4/scheduler/server.c +--- cups-1.4.4-orig/scheduler/server.c 2010-04-11 23:03:53.000000000 -0500 ++++ cups-1.4.4/scheduler/server.c 2010-09-13 01:27:49.000000000 -0500 +@@ -44,6 +44,42 @@ static int started = 0; + void + cupsdStartServer(void) + { ++#ifdef HAVE_LIBSSL ++ int i; /* Looping var */ ++ struct timeval curtime; /* Current time in microseconds */ ++ unsigned char data[1024]; /* Seed data */ ++#endif /* HAVE_LIBSSL */ ++ ++ ++#ifdef HAVE_LIBSSL ++ /* ++ * Initialize the encryption libraries... ++ */ ++ ++ SSL_library_init(); ++ SSL_load_error_strings(); ++ ++ /* ++ * Using the current time is a dubious random seed, but on some systems ++ * it is the best we can do (on others, this seed isn't even used...) ++ */ ++ ++ gettimeofday(&curtime, NULL); ++ srand(curtime.tv_sec + curtime.tv_usec); ++ ++ for (i = 0; i < sizeof(data); i ++) ++ data[i] = rand(); /* Yes, this is a poor source of random data... */ ++ ++ RAND_seed(&data, sizeof(data)); ++#elif defined(HAVE_GNUTLS) ++ /* ++ * Initialize the encryption libraries... ++ */ ++ ++ gnutls_global_init(); ++#endif /* HAVE_LIBSSL */ ++ ++ + /* + * Create the default security profile... + */ diff --git a/source/a/cxxlibs/cxxlibs.SlackBuild b/source/a/cxxlibs/cxxlibs.SlackBuild index 19f8042ed..eff5d26c3 100755 --- a/source/a/cxxlibs/cxxlibs.SlackBuild +++ b/source/a/cxxlibs/cxxlibs.SlackBuild @@ -21,8 +21,8 @@ PKGNAM=cxxlibs -VERSION=${VERSION:-6.0.13} -BUILD=${BUILD:-2} +VERSION=${VERSION:-6.0.14} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/cxxlibs/oldgcc/oldgcc.build b/source/a/cxxlibs/oldgcc/oldgcc.build deleted file mode 100755 index 471fefa13..000000000 --- a/source/a/cxxlibs/oldgcc/oldgcc.build +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh -# GCC package build script (written by volkerdi@slackware.com) -# -# Copyright 2003, 2005 Slackware Linux, Inc., Concord, California, 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. -# - -# NOTE - THIS DOESN'T MAKE PACKAGES! IT JUST BUILDS GCC AND G++ -# this is for the purpose of getting libstdc++.so.5 -VERSION=3.3.6 -ARCH=${ARCH:-x86_64} -TARGET=${TARGET:-$ARCH-slackware-linux} -BUILD=${BUILD:-1} - -CWD=`pwd` -# Temporary build location. This should *NOT* be a directory -# path a non-root user could create later... -TMP=/gcc-build-$(mcookie) - -# Clear the build locations: -if [ -d $TMP ]; then - rm -rf $TMP -fi - -EXTRA=--disable-multilib - -mkdir -p $TMP -cd $TMP -tar xjvf $CWD/gcc-$VERSION.tar.bz2 -# install docs -( cd gcc-$VERSION - # Fix perms/owners - chown -R root.root . - find . -perm 777 -exec chmod 755 {} \; - find . -perm 775 -exec chmod 755 {} \; - find . -perm 754 -exec chmod 755 {} \; - find . -perm 664 -exec chmod 644 {} \; -) -# build gcc -( mkdir gcc.build.lnx; - cd gcc.build.lnx; - CFLAGS="-O2 -fPIC" \ - ../gcc-$VERSION/configure \ - --enable-shared \ - --enable-threads=posix \ - --enable-__cxa_atexit \ - --enable-languages=c,c++ \ - --disable-checking \ - --with-gnu-ld \ - --verbose \ - --target=${TARGET} \ - --host=${TARGET} \ - $EXTRA - # Include all debugging info (for now): - make #bootstrap; -) 2>&1 | tee $TMP/gcc.build.log diff --git a/source/a/dbus/dbus-1.2.x-allow_root_globally.diff b/source/a/dbus/dbus-1.4.x-allow_root_globally.diff index 913a9d2b1..6bd84833f 100644 --- a/source/a/dbus/dbus-1.2.x-allow_root_globally.diff +++ b/source/a/dbus/dbus-1.4.x-allow_root_globally.diff @@ -1,10 +1,6 @@ -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 +diff -Nur dbus-1.4.0.orig//bus/system.conf.in dbus-1.4.0//bus/system.conf.in +--- dbus-1.4.0.orig//bus/system.conf.in 2010-08-31 16:44:19.000000000 -0500 ++++ dbus-1.4.0//bus/system.conf.in 2010-09-14 09:17:56.080373096 -0500 @@ -70,6 +70,14 @@ send_member="UpdateActivationEnvironment"/> </policy> @@ -16,7 +12,7 @@ diff -Nur dbus-1.2.16.orig/bus/system.conf.in dbus-1.2.16/bus/system.conf.in + <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 533ccd897..b11340cd9 100755 --- a/source/a/dbus/dbus.SlackBuild +++ b/source/a/dbus/dbus.SlackBuild @@ -22,8 +22,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=dbus -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -68,7 +68,7 @@ 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 +zcat $CWD/dbus-1.4.x-allow_root_globally.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -94,29 +94,23 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( 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 -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Install a custom init script for dbus - the included one is not good for us rm $PKG/etc/rc.d/* zcat $CWD/rc.messagebus.gz > $PKG/etc/rc.d/rc.messagebus.new chmod 0755 $PKG/etc/rc.d/rc.messagebus.new -# Let's not clobber existing config files -mv $PKG/etc/dbus-1/session.conf $PKG/etc/dbus-1/session.conf.new -mv $PKG/etc/dbus-1/system.conf $PKG/etc/dbus-1/system.conf.new - # Fix some directory ownership chown messagebus $PKG/var/lib/dbus # Add documentation mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING HACKING INSTALL NEWS README doc/*.{txt,html,dtd} \ + AUTHORS COPYING* HACKING INSTALL NEWS README* doc/*.{txt,html,dtd} \ $PKG/usr/doc/$PKGNAM-$VERSION -find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 644 {} \; +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 0644 {} \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/dbus/doinst.sh b/source/a/dbus/doinst.sh index 71c3d7a07..d12d7756a 100644 --- a/source/a/dbus/doinst.sh +++ b/source/a/dbus/doinst.sh @@ -18,7 +18,5 @@ if [ -e etc/rc.d/rc.messagebus ]; then mv etc/rc.d/rc.messagebus.new.incoming etc/rc.d/rc.messagebus.new fi -config etc/dbus-1/session.conf.new -config etc/dbus-1/system.conf.new config etc/rc.d/rc.messagebus.new diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild index 9c9bd3f65..c79a6c819 100755 --- a/source/a/dialog/dialog.SlackBuild +++ b/source/a/dialog/dialog.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011 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=dialog -VERSION=${VERSION:-1.1-20080819} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)} +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} @@ -49,7 +58,7 @@ fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION || exit 1 zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1 @@ -108,9 +117,17 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - CHANGES COPYING README VERSION dialog.lsm \ + COPYING* README* VERSION dialog.lsm \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a CHANGES file, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGES ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat CHANGES | head -n 2500 > $DOCSDIR/CHANGES + touch -r CHANGES $DOCSDIR/CHANGES +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/a/dosfstools/dosfstools-3.0.11.tar.bz2.sign b/source/a/dosfstools/dosfstools-3.0.11.tar.bz2.sign new file mode 100644 index 000000000..ca1fec559 --- /dev/null +++ b/source/a/dosfstools/dosfstools-3.0.11.tar.bz2.sign @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.10 (GNU/Linux) + +iEYEABECAAYFAk0U0YcACgkQ+C5cwEsrK54SwACg2GdKFHonvr+sJx9d6wA+OTwT +pbUAoK/eDyuvkyfQygxW07g6URh5Adg+ +=eKdA +-----END PGP SIGNATURE----- diff --git a/source/a/dosfstools/dosfstools.SlackBuild b/source/a/dosfstools/dosfstools.SlackBuild index ebe99c68b..abb2d85ba 100755 --- a/source/a/dosfstools/dosfstools.SlackBuild +++ b/source/a/dosfstools/dosfstools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,55 +20,116 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.11 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} + +PKGNAM=dosfstools +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | rev | cut -f 2- -d -)} +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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + +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 CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-dosfstools +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf dosfstools-$VERSION -tar xzvf $CWD/dosfstools-$VERSION.src.tar.gz -cd dosfstools-$VERSION +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +cd $PKGNAM-$VERSION + chown -R root:root . -make -j4 || exit 1 - -( cd mkdosfs - mkdir -p $PKG/sbin - cat mkdosfs > $PKG/sbin/mkdosfs - chmod 755 $PKG/sbin/mkdosfs - mkdir -p $PKG/usr/man/man8 - cat mkdosfs.8 | gzip -9c > $PKG/usr/man/man8/mkdosfs.8.gz -) -( cd $PKG/sbin ; rm -f mkfs.msdos ; ln -sf mkdosfs mkfs.msdos ) -( cd dosfsck - cat dosfsck > $PKG/sbin/dosfsck - chmod 755 $PKG/sbin/dosfsck - cat dosfsck.8 | gzip -9c > $PKG/usr/man/man8/dosfsck.8.gz -) -mkdir -p $PKG/usr/doc/dosfstools-$VERSION +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 {} \; + +zcat $CWD/dosfstools.paths.diff.gz | patch -p1 --verbose || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +## I do not believe we want these, or it may cause autofscking fat volumes at boot: +## NOTE: only if it is set in fstab, which is not default. Some other things need +## to see fsck.vfat, so allowing it again. +#rm -f $PKG/sbin/fsck.* $PKG/usr/man/man?/fsck.* + +# We can handle this: +rm -r $PKG/usr/doc +# Add a documentation directory: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - CHANGES README.Atari TODO \ - $PKG/usr/doc/dosfstools-$VERSION -mkdir -p $PKG/usr/doc/dosfstools-$VERSION/mkdosfs -( cd mkdosfs ; cp -a ANNOUNCE COPYING README mkdosfs-ygg-0.3b.lsm $PKG/usr/doc/dosfstools-$VERSION/mkdosfs ) -mkdir -p $PKG/usr/doc/dosfstools-$VERSION/dosfsck -( cd dosfsck ; cp -a CHANGES COPYING README $PKG/usr/doc/dosfstools-$VERSION/dosfsck ) + COPYING* README* \ + doc/ANNOUNCE* doc/README* doc/TODO* \ + $PKG/usr/doc/$PKGNAM-$VERSION +# 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 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 + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi + +# 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 -# Build the package: cd $PKG -makepkg -l y -c n $TMP/dosfstools-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz diff --git a/source/a/dosfstools/dosfstools.paths.diff b/source/a/dosfstools/dosfstools.paths.diff new file mode 100644 index 000000000..cdd473df7 --- /dev/null +++ b/source/a/dosfstools/dosfstools.paths.diff @@ -0,0 +1,17 @@ +--- ./Makefile.orig 2010-04-04 02:36:49.000000000 -0500 ++++ ./Makefile 2011-02-25 13:45:41.443999917 -0600 +@@ -19,10 +19,10 @@ + # can be found in /usr/share/common-licenses/GPL-3 file. + + DESTDIR = +-PREFIX = /usr/local +-SBINDIR = $(PREFIX)/sbin +-DOCDIR = $(PREFIX)/share/doc +-MANDIR = $(PREFIX)/share/man ++PREFIX = /usr ++SBINDIR = /sbin ++DOCDIR = $(PREFIX)/doc ++MANDIR = $(PREFIX)/man + + #OPTFLAGS = -O2 -fomit-frame-pointer -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + OPTFLAGS = -O2 -fomit-frame-pointer $(shell getconf LFS_CFLAGS) diff --git a/source/a/e2fsprogs/e2fsprogs.SlackBuild b/source/a/e2fsprogs/e2fsprogs.SlackBuild index c79c29eb7..a14d8e118 100755 --- a/source/a/e2fsprogs/e2fsprogs.SlackBuild +++ b/source/a/e2fsprogs/e2fsprogs.SlackBuild @@ -129,11 +129,6 @@ EOF cp -a fsck.ext2 fsck.ext4 cp -a fsck.ext2 fsck.ext4dev ) -( cd $PKG/usr/man/man3 - rm -f uuid_generate_random.3 uuid_generate_time.3 - ln -sf uuid_generate.3 uuid_generate_random.3 - ln -sf uuid_generate.3 uuid_generate_time.3 -) ( cd $PKG/usr/man/man8 rm -f fsck.ext2.8 fsck.ext3.8 mkfs.ext2.8 mkfs.ext3.8 \ mkfs.ext4.8 mkfs.ext4dev.8 diff --git a/source/a/ed/ed.SlackBuild b/source/a/ed/ed.SlackBuild index 534ca116d..72f47141e 100755 --- a/source/a/ed/ed.SlackBuild +++ b/source/a/ed/ed.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,10 +22,19 @@ PKGNAM=ed -VERSION=${VERSION:-1.3} -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 + NUMJOBS=${NUMJOBS:-" -j7 "} CWD=$(pwd) @@ -36,7 +45,7 @@ mkdir -p $TMP $PKG 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: @@ -104,9 +113,17 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README TODO \ + 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/${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 diff --git a/source/a/findutils/findutils.SlackBuild b/source/a/findutils/findutils.SlackBuild index aca93a0cc..5aef7e739 100755 --- a/source/a/findutils/findutils.SlackBuild +++ b/source/a/findutils/findutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2009, 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=4.4.2 -ARCH=${ARCH:-x86_64} 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:--j6} CWD=$(pwd) diff --git a/source/a/floppy/floppy.SlackBuild b/source/a/floppy/floppy.SlackBuild index 38a5cc86f..04966d1ca 100755 --- a/source/a/floppy/floppy.SlackBuild +++ b/source/a/floppy/floppy.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,9 +22,18 @@ VERSION=5.4 MTOOLS=3.9.8 -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 + if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O -fPIC" LIBDIRSUFFIX="64" diff --git a/source/a/gdisk/gdisk.SlackBuild b/source/a/gdisk/gdisk.SlackBuild new file mode 100755 index 000000000..841332dd5 --- /dev/null +++ b/source/a/gdisk/gdisk.SlackBuild @@ -0,0 +1,117 @@ +#!/bin/sh + +# Copyright (c) 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2011 Patrick J. Volkerding, Sebeka, Minnesota, 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=gdisk +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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + +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 + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$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 {} \; + +export LDFLAGS="$SLKLDFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export CFLAGS="$SLKCFLAGS" +make || exit 1 + +# Manually install the stuff: +for FILE in gdisk sgdisk ; do + install -D $FILE $PKG/sbin/$FILE + install -D $FILE.8 $PKG/usr/man/man8/$FILE.8 +done + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING* NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# 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 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 + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/gdisk/slack-desc b/source/a/gdisk/slack-desc new file mode 100644 index 000000000..492b4460e --- /dev/null +++ b/source/a/gdisk/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------------------------------------------------------| +gdisk: gdisk (GPT fdisk) +gdisk: +gdisk: GPT fdisk (gdisk) is a partitioning tool for disks using a GPT (GUID +gdisk: Partition Table). It features a command-line interface, fairly direct +gdisk: manipulation of partition table structures, recovery tools to help +gdisk: you deal with corrupt partition tables, and the ability to convert +gdisk: MBR disks to GPT format. +gdisk: +gdisk: +gdisk: gdisk home: http://www.rodsbooks.com/gdisk/ +gdisk: diff --git a/source/a/genpower/genpower.SlackBuild b/source/a/genpower/genpower.SlackBuild index 03f15675c..bcf40786e 100755 --- a/source/a/genpower/genpower.SlackBuild +++ b/source/a/genpower/genpower.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,9 +21,18 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-1.0.5} -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-genpower diff --git a/source/a/gettext/gettext-tools.SlackBuild b/source/a/gettext/gettext-tools.SlackBuild index 134066195..0ed840dcc 100755 --- a/source/a/gettext/gettext-tools.SlackBuild +++ b/source/a/gettext/gettext-tools.SlackBuild @@ -20,8 +20,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=0.17 -BUILD=${BUILD:-4} +VERSION=0.18.1.1 +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j6 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,7 +79,9 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/gettext-tools-$VERSION \ --build=$ARCH-slackware-linux -make -j4 || exit 1 + +make $NUMJOBS || make || exit 1 + cd gettext-tools make install DESTDIR=$PKG @@ -85,12 +89,12 @@ make install DESTDIR=$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 ) + rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* gzip $PKG/usr/man/man?/* -( cd $PKG/usr/doc - mv gettext gettext-tools-$VERSION - cd gettext-tools-$VERSION + +( cd $PKG/usr/doc/gettext-tools-$VERSION # These take up a ton of space otherwise tar cf examples.tar examples bzip2 -9 examples.tar @@ -103,12 +107,14 @@ gzip $PKG/usr/man/man?/* rm -f ABOUT-NLS ln -sf /usr/share/gettext/ABOUT-NLS . ) + cp -a \ AUTHORS ../COPYING INSTALL NEWS README \ $PKG/usr/doc/gettext-tools-$VERSION + mkdir -p $PKG/install cat $CWD/slack-desc.gettext-tools > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/gettext-tools-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/gettext-tools-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/gettext/gettext.SlackBuild b/source/a/gettext/gettext.SlackBuild index 89de611ef..acaf1df14 100755 --- a/source/a/gettext/gettext.SlackBuild +++ b/source/a/gettext/gettext.SlackBuild @@ -20,8 +20,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=0.17 -BUILD=${BUILD:-3} +VERSION=0.18.1.1 +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j6 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -79,32 +81,32 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --build=$ARCH-slackware-linux -make -j4 || exit 1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG + ( 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 ) + rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* gzip -9 $PKG/usr/man/man?/* -( cd $PKG/usr/doc - mkdir gettext-$VERSION - mv gettext/csharpdoc gettext/javadoc1 gettext/javadoc2 libasprintf \ - gettext-$VERSION - rm -rf gettext - cd gettext-$VERSION + +( cd $PKG/usr/doc/gettext-$VERSION if [ -r $PKG/usr/share/gettext/ABOUT-NLS ]; then rm -f ABOUT-NLS ln -sf /usr/share/gettext/ABOUT-NLS . fi ) + cp -a \ AUTHORS BUGS intl/COPYING.LIB-2.0 intl/COPYING.LIB-2.1 INSTALL NEWS README \ $PKG/usr/doc/gettext-$VERSION + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/gettext-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/gettext-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/getty-ps/getty-ps.SlackBuild b/source/a/getty-ps/getty-ps.SlackBuild index 76e4012dd..fb1a49f8b 100755 --- a/source/a/getty-ps/getty-ps.SlackBuild +++ b/source/a/getty-ps/getty-ps.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,9 +22,18 @@ VERSION=2.1.0b -ARCH=${ARCH:-x86_64} 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-getty-ps diff --git a/source/a/gpm/gpm.SlackBuild b/source/a/gpm/gpm.SlackBuild index b0352fe89..a79ce2b6c 100755 --- a/source/a/gpm/gpm.SlackBuild +++ b/source/a/gpm/gpm.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 @@ -23,9 +23,18 @@ # by: volkerdi@slackware.com VERSION=1.20.1 -ARCH=${ARCH:-x86_64} BUILD=${BUILD:-5} +# 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-gpm diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild index 1b2ac8e7e..b789bc724 100755 --- a/source/a/grep/grep.SlackBuild +++ b/source/a/grep/grep.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2008, 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,12 +20,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-2.5.4} -ARCH=${ARCH:-x86_64} +PKGNAM=grep +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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-grep @@ -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 $TMP $PKG cd $TMP rm -rf grep-$VERSION -tar xvf $CWD/grep-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/grep-$VERSION.tar.xz || exit 1 cd grep-$VERSION || exit 1 chown -R root:root . find . \ @@ -60,24 +73,15 @@ CFLAGS="$SLKCFLAGS" \ --bindir=/bin \ --mandir=/usr/man \ --infodir=/usr/info \ - --disable-perl-regexp \ + --docdir=/usr/doc/grep-$VERSION \ --build=$ARCH-slackware-linux -make $NUMJOBS || make || exit 1 +make $NUMJOBS -e LIB_PCRE=/usr/lib${LIBDIRSUFFIX}/libpcre.a || make -e LIB_PCRE=/usr/lib${LIBDIRSUFFIX}/libpcre.a || exit 1 make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -# **************************************************************************** -# Makefile installs different binaries for each of grep, egrep, and fgrep -# This is how we used to do it... -#( cd $PKG/bin -# rm -f egrep ; ln -sf grep egrep -# rm -f fgrep ; ln -sf grep fgrep -#) -# **************************************************************************** - # Make symlinks in /usr/bin: mkdir -p $PKG/usr/bin ( cd $PKG/usr/bin @@ -98,9 +102,17 @@ gzip -9 $PKG/usr/info/* mkdir -p $PKG/usr/doc/grep-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \ + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \ $PKG/usr/doc/grep-$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/hdparm/hdparm.SlackBuild b/source/a/hdparm/hdparm.SlackBuild index fbb2a2f71..951436d16 100755 --- a/source/a/hdparm/hdparm.SlackBuild +++ b/source/a/hdparm/hdparm.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,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=${VERSION:-9.27} -ARCH=${ARCH:-x86_64} +PKGNAM=hdparm +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 + NUMJOBS=${NUMJOBS:--j7} CWD=$(pwd) @@ -34,7 +45,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf hdparm-$VERSION -tar xvf $CWD/hdparm-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/hdparm-$VERSION.tar.?z* || exit 1 cd hdparm-$VERSION || exit 1 chown -R root:root . make $NUMJOBS || make || exit 1 @@ -54,6 +65,14 @@ cp -a \ # I'm also not sure why I'm putting a binary in the docs, but... rm -f $PKG/usr/doc/hdparm-$VERSION/contrib/fix_standby.c +# 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 + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/infozip/infozip.SlackBuild b/source/a/infozip/infozip.SlackBuild index 900c4f95d..5ac456d10 100755 --- a/source/a/infozip/infozip.SlackBuild +++ b/source/a/infozip/infozip.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,9 +22,18 @@ VERSION=6.0 ZIP=3.0 -ARCH=${ARCH:-x86_64} 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-infozip diff --git a/source/a/jfsutils/jfsutils.SlackBuild b/source/a/jfsutils/jfsutils.SlackBuild index d97ebcb62..1795e9703 100755 --- a/source/a/jfsutils/jfsutils.SlackBuild +++ b/source/a/jfsutils/jfsutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.1.14} -ARCH=${ARCH:-x86_64} +PKGNAM=jfsutils +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-jfsutils @@ -80,9 +90,17 @@ done mkdir -p $PKG/usr/doc/jfsutils-$VERSION cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ + AUTHORS COPYING* NEWS README \ $PKG/usr/doc/jfsutils-$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 + ( 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 diff --git a/source/a/lha/lha.SlackBuild b/source/a/lha/lha.SlackBuild index fb333362f..fffdab687 100755 --- a/source/a/lha/lha.SlackBuild +++ b/source/a/lha/lha.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,9 +22,18 @@ VERSION=114i -ARCH=${ARCH:-x86_64} 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-lha diff --git a/source/a/libcgroup/doinst.sh b/source/a/libcgroup/doinst.sh new file mode 100644 index 000000000..0799f0d9b --- /dev/null +++ b/source/a/libcgroup/doinst.sh @@ -0,0 +1,43 @@ +#!/bin/sh +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 files with the same permissions as the old ones: +if [ -e etc/rc.d/rc.cgconfig ]; then + if [ -x etc/rc.d/rc.cgconfig ]; then + chmod 755 etc/rc.d/rc.cgconfig.new + else + chmod 644 etc/rc.d/rc.cgconfig.new + fi +fi +if [ -e etc/rc.d/rc.cgred ]; then + if [ -x etc/rc.d/rc.cgred ]; then + chmod 755 etc/rc.d/rc.cgred.new + else + chmod 644 etc/rc.d/rc.cgred.new + fi +fi + +# Then config() them: +config etc/rc.d/rc.cgconfig.new +config etc/rc.d/rc.cgred.new + +# config() the other configuration files: +config etc/cgconfig.conf.new +config etc/cgred.conf.new +config etc/cgrules.conf.new +config etc/cgsnapshot_blacklist.conf.new + +# If there are already installed config files, get rid of the .new ones. +# There will still be fresh samples in the docs. +rm -f etc/cgconfig.conf.new etc/cgred.conf.new etc/cgrules.conf.new etc/cgsnapshot_blacklist.conf.new + diff --git a/source/a/libcgroup/libcgroup.SlackBuild b/source/a/libcgroup/libcgroup.SlackBuild new file mode 100755 index 000000000..286a7fa2a --- /dev/null +++ b/source/a/libcgroup/libcgroup.SlackBuild @@ -0,0 +1,163 @@ +#!/bin/sh + +# Copyright 2011 Patrick J. Volkerding, Sebeka, Minnesota, 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=libcgroup +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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + +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 + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION + +# Remove Red Hat / LSB init-scriptisms: +zcat $CWD/libcgroup.init.diff.gz | patch -p1 --verbose || exit 1 + +# Slackware does not use /etc/sysconfig: +zcat $CWD/libcgroup.conf.diff.gz | patch -p1 --verbose || 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 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --disable-pam \ + --disable-static \ + --build=$ARCH-slackware-linux + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# If this directory is empty, do not include it in the package: +rmdir $PKG/usr/lib${LIBDIRSUFFIX}/security 2> /dev/null + +# Install init scripts: +mkdir -p $PKG/etc/rc.d +cp -a scripts/init.d/cgconfig $PKG/etc/rc.d/rc.cgconfig.new +cp -a scripts/init.d/cgred $PKG/etc/rc.d/rc.cgred.new +chmod 644 $PKG/etc/rc.d/* +chown -R root:root $PKG/etc/rc.d/* + +# Install sample config files: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION/samples +( cd samples + for conffile in cgconfig.conf cgred.conf cgrules.conf cgsnapshot_blacklist.conf ; do + cp -a $conffile $PKG/etc/${conffile}.new + cp -a $conffile $PKG/usr/doc/${PKGNAM}-$VERSION/samples + done +) + +# 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 +) + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# 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 + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi + +# 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 +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/libcgroup/libcgroup.conf.diff b/source/a/libcgroup/libcgroup.conf.diff new file mode 100644 index 000000000..f6e9dd102 --- /dev/null +++ b/source/a/libcgroup/libcgroup.conf.diff @@ -0,0 +1,8 @@ +--- ./samples/cgred.conf.orig 2011-01-10 14:16:09.750002388 -0600 ++++ ./samples/cgred.conf 2011-01-10 14:16:20.446998061 -0600 +@@ -1,4 +1,4 @@ +-# /etc/sysconfig/cgred.conf - CGroup Rules Engine Daemon configuration file ++# /etc/cgred.conf - CGroup Rules Engine Daemon configuration file + # + # The four options listed below (CONFIG_FILE, LOG_FILE, NODAEMON, LOG) are + # the only valid ones. Defining anything else in this file will cause the diff --git a/source/a/libcgroup/libcgroup.init.diff b/source/a/libcgroup/libcgroup.init.diff new file mode 100644 index 000000000..754912959 --- /dev/null +++ b/source/a/libcgroup/libcgroup.init.diff @@ -0,0 +1,133 @@ +--- ./scripts/init.d/cgred.in.orig 2011-03-03 02:29:41.000000000 -0600 ++++ ./scripts/init.d/cgred.in 2011-03-03 14:23:03.000000000 -0600 +@@ -39,9 +39,8 @@ + # Sanity checks + [ -x $CGRED_BIN ] || exit 1 + +-# Source function library & LSB routines ++# Source function library + . /etc/rc.d/init.d/functions +-. /lib/lsb/init-functions + + # Read in configuration options. + if [ -f "/etc/sysconfig/cgred.conf" ] ; then +@@ -70,16 +69,16 @@ + { + echo -n $"Starting CGroup Rules Engine Daemon: " + if [ -f "$lockfile" ]; then +- log_failure_msg "$servicename is already running with PID `cat ${pidfile}`" ++ echo "$servicename is already running with PID `cat ${pidfile}`" + return 0 + fi + if [ ! -s $CGRED_CONF ]; then +- log_failure_msg "not configured" ++ echo "not configured" + return 6 + fi + if ! grep "^cgroup" /proc/mounts &>/dev/null; then + echo +- log_failure_msg $"Cannot find cgroups, is cgconfig service running?" ++ echo $"Cannot find cgroups, is cgconfig service running?" + return 1 + fi + daemon --check $servicename --pidfile $pidfile $CGRED_BIN $OPTIONS +@@ -100,7 +99,7 @@ + { + echo -n $"Stopping CGroup Rules Engine Daemon..." + if [ ! -f $pidfile ]; then +- log_success_msg ++ #log_success_msg + return 0 + fi + killproc -p $pidfile -TERM "$processname" +@@ -146,13 +145,13 @@ + echo $"Reloading rules configuration..." + kill -s 12 `cat ${pidfile}` + RETVAL=$? +- if [ $RETVAL -eq 0 ] ; then +- log_success_msg +- else +- log_failure_msg +- fi ++ #if [ $RETVAL -eq 0 ] ; then ++ # log_success_msg ++ #else ++ # log_failure_msg ++ #fi + else +- log_failure_msg "$servicename is not running." ++ echo "$servicename is not running." + fi + ;; + *) +--- ./scripts/init.d/cgconfig.in.orig 2011-03-03 02:29:41.000000000 -0600 ++++ ./scripts/init.d/cgconfig.in 2011-03-03 14:21:27.000000000 -0600 +@@ -36,11 +36,6 @@ + servicename=cgconfig + lockfile=/var/lock/subsys/$servicename + +-# +-# Source LSB routines +-# +-. /lib/lsb/init-functions +- + # read the config + CREATE_DEFAULT=yes + if [ -e /etc/sysconfig/cgconfig ]; then +@@ -54,8 +49,8 @@ + grep -m1 '^\*[[:space:]]\+' /etc/cgrules.conf | \ + read user ctrl defaultcgroup + if [ -n "$defaultcgroup" -a "$defaultcgroup" = "*" ]; then +- log_warning_msg "/etc/cgrules.conf incorrect" +- log_warning_msg "Overriding it" ++ echo "/etc/cgrules.conf incorrect" ++ echo "Overriding it" + defaultcgroup= + fi + fi +@@ -98,20 +93,20 @@ + start() { + echo -n "Starting cgconfig service: " + if [ -f "$lockfile" ]; then +- log_warning_msg "lock file already exists" ++ echo "lock file already exists" + return 0 + fi + + if [ $? -eq 0 ]; then + if [ ! -s $CONFIG_FILE ]; then +- log_failure_msg $CONFIG_FILE "is not configured" ++ echo $CONFIG_FILE "is not configured" + return 6 + fi + + $CGCONFIGPARSER_BIN -l $CONFIG_FILE + retval=$? + if [ $retval -ne 0 ]; then +- log_failure_msg "Failed to parse " $CONFIG_FILE ++ echo "Failed to parse " $CONFIG_FILE + return 1 + fi + fi +@@ -123,10 +118,10 @@ + touch "$lockfile" + retval=$? + if [ $retval -ne 0 ]; then +- log_failure_msg "Failed to touch $lockfile" ++ echo "Failed to touch $lockfile" + return 1 + fi +- log_success_msg ++ #log_success_msg + return 0 + } + +@@ -134,7 +129,7 @@ + echo -n "Stopping cgconfig service: " + cgclear + rm -f "$lockfile" +- log_success_msg ++ #log_success_msg + return 0 + } + diff --git a/source/a/libcgroup/slack-desc b/source/a/libcgroup/slack-desc new file mode 100644 index 000000000..30a43ebed --- /dev/null +++ b/source/a/libcgroup/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-------------------------------------------------------| +libcgroup: libcgroup (library and utilities for kernel control groups) +libcgroup: +libcgroup: Control Groups provide a mechanism for aggregating/partitioning sets of +libcgroup: tasks, and all their future children, into hierarchical groups with +libcgroup: specialized behaviour. It makes use of a filesystem interface. +libcgroup: This package contains a library for developing applications that use +libcgroup: control groups, as well as some basic userspace tools for controlling +libcgroup: and monitoring control groups. +libcgroup: +libcgroup: Homepage: http://libcg.sourceforge.net/ +libcgroup: diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild index e33c8778b..2e7902cde 100755 --- a/source/a/lilo/lilo.SlackBuild +++ b/source/a/lilo/lilo.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-22.8} -BUILD=${BUILD:-15} +BUILD=${BUILD:-16} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,12 +80,11 @@ rm -rf $PKG/usr/doc/lilo-$VERSION mkdir -p $PKG/usr/doc/lilo-$VERSION cp -a CHANGES COPYING COPYRIGHT INCOMPAT QuickInst READM* doc sample \ $PKG/usr/doc/lilo-$VERSION -if [ -r $CWD/lilo-$VERSION.lsm ]; then - cp -a $CWD/lilo-$VERSION.lsm $PKG/usr/doc/lilo-$VERSION -fi -if [ -r $CWD/lilo-$VERSION.announce.txt ]; then - cp -a $CWD/lilo-$VERSION.announce.txt $PKG/usr/doc/lilo-$VERSION -fi +for bootsplash in $CWD/*.bmp ; do + cp -a $bootsplash $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash) + chown root:root $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash) + chmod 644 $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash) +done mv $PKG/usr/share/man $PKG/usr rmdir $PKG/usr/share diff --git a/source/a/lilo/liloconfig b/source/a/lilo/liloconfig index e786e7522..7dccd3d62 100644 --- a/source/a/lilo/liloconfig +++ b/source/a/lilo/liloconfig @@ -2,7 +2,7 @@ # # Copyright 1994, 1998, 1999 Patrick Volkerding, Moorhead, Minnesota USA # Copyright 2002, 2003 Slackware Linux, Inc, Concord, CA -# Copyright 2007, 2008 Patrick Volkerding, Sebeka, Minnesota, USA +# Copyright 2007, 2008, 2011 Patrick Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -46,12 +46,18 @@ if [ ! -d "$T_PX" ]; then elif [ -r /usr/lib/setup/setup ]; then T_PX=/mnt else - # We will have to assume we've on an installed and running system. + # We will have to assume we're on an installed and running system. T_PX=/ fi fi fi +# Determine LILO documentation directory: +LILODOCDIR="$(ls -d /usr/doc/lilo-* | tail -n 1)" +if [ ! -d "$LILODOCDIR" ]; then + LILODOCDIR="/usr/doc/lilo/" +fi + # If there's no boot_message.txt, start the header for one now: if [ ! -r $T_PX/boot/boot_message.txt ]; then cat << EOF > $T_PX/boot/boot_message.txt @@ -132,24 +138,26 @@ EO_BMP use_framebuffer() { if cat /proc/devices | grep "29 fb" 1> /dev/null ; then dialog --title "CONFIGURE LILO TO USE FRAME BUFFER CONSOLE?" \ - --default-item 1024x768x256 \ + --default-item standard \ --menu "Looking at /proc/devices, it seems your kernel has support for \ -the Linux frame buffer console. If we enable this in /etc/lilo.conf, it \ +the VESA frame buffer console. If we enable this in /etc/lilo.conf, it \ will allow more rows and columns of text on the screen and give you a cool \ penguin logo at boot time. However, the frame buffer text console is \ slower than a standard text console. In addition, not every video card \ -or monitor supports all of these video modes. Would you like to use the \ -frame buffer console, or the standard Linux console?" 0 0 0 \ +or monitor supports all of these video modes, and some X drivers could be \ +confused by them. Would you like to use the frame buffer console, \ +or the standard Linux console?" 0 0 0 \ "standard" "Use the standard Linux console (the safe choice)" \ - "640x480x256" "Frame buffer console, 640x480x256" \ - "800x600x256" "Frame buffer console, 800x600x256" \ - "1024x768x256" "Frame buffer console, 1024x768x256" \ - "640x480x32k" "Frame buffer console, 640x480x32k" \ - "800x600x32k" "Frame buffer console, 800x600x32k" \ - "1024x768x32k" "Frame buffer console, 1024x768x32k" \ + "ask" "Ask about using VESA modes at boot; time out to standard" \ "640x480x64k" "Frame buffer console, 640x480x64k" \ "800x600x64k" "Frame buffer console, 800x600x64k" \ "1024x768x64k" "Frame buffer console, 1024x768x64k" \ + "640x480x32k" "Frame buffer console, 640x480x32k" \ + "800x600x32k" "Frame buffer console, 800x600x32k" \ + "1024x768x32k" "Frame buffer console, 1024x768x32k" \ + "640x480x256" "Frame buffer console, 640x480x256" \ + "800x600x256" "Frame buffer console, 800x600x256" \ + "1024x768x256" "Frame buffer console, 1024x768x256" \ 2> $TMP/reply if [ $? = 1 -o $? = 255 ]; then exit @@ -289,14 +297,28 @@ EOF boot = $ROOT_DEVICE #delay = 5 EOF - if [ "$CONSOLETYPE" = "standard" ]; then + if [ $CONSOLETYPE = standard ]; then cat << EOF >> $T_PX/etc/lilo.conf +# Normal VGA console vga = normal +# Ask for video mode at boot (time out to normal in 30s) +#vga = ask +EOF + elif [ $CONSOLETYPE = ask ]; then + cat << EOF >> $T_PX/etc/lilo.conf +# Ask for video mode at boot (time out to normal in 30s) +vga = ask +# Normal VGA console +#vga = normal EOF else cat << EOF >> $T_PX/etc/lilo.conf # VESA framebuffer at $CONSOLETYPE vga = $CONSOLENUM +# Ask for video mode at boot (time out to normal in 30s) +#vga = ask +# Normal VGA console +#vga = normal EOF fi cat << EOF >> $T_PX/etc/lilo.conf @@ -406,55 +428,50 @@ timeout = 1200 change-rules reset EOF - if [ "$CONSOLETYPE" = "standard" ]; then + if [ $CONSOLETYPE = standard ]; then cat << EOF >> $T_PX/etc/lilo.conf # Normal VGA console vga = normal -# VESA framebuffer console @ 1024x768x64k -# vga=791 -# VESA framebuffer console @ 1024x768x32k -# vga=790 -# VESA framebuffer console @ 1024x768x256 -# vga=773 -# VESA framebuffer console @ 800x600x64k -# vga=788 -# VESA framebuffer console @ 800x600x32k -# vga=787 -# VESA framebuffer console @ 800x600x256 -# vga=771 -# VESA framebuffer console @ 640x480x64k -# vga=785 -# VESA framebuffer console @ 640x480x32k -# vga=784 -# VESA framebuffer console @ 640x480x256 -# vga=769 +# Ask for video mode at boot (time out to normal in 30s) +#vga = ask +EOF + elif [ $CONSOLETYPE = ask ]; then + cat << EOF >> $T_PX/etc/lilo.conf +# Ask for video mode at boot (time out to normal in 30s) +vga = ask +# Normal VGA console +#vga = normal EOF else cat << EOF >> $T_PX/etc/lilo.conf # VESA framebuffer console @ $CONSOLETYPE vga = $CONSOLENUM # Normal VGA console -# vga = normal +#vga = normal +# Ask for video mode at boot (time out to normal in 30s) +#vga = ask +EOF + fi +cat << EOF >> $T_PX/etc/lilo.conf # VESA framebuffer console @ 1024x768x64k -# vga=791 +#vga=791 # VESA framebuffer console @ 1024x768x32k -# vga=790 +#vga=790 # VESA framebuffer console @ 1024x768x256 -# vga=773 +#vga=773 # VESA framebuffer console @ 800x600x64k -# vga=788 +#vga=788 # VESA framebuffer console @ 800x600x32k -# vga=787 +#vga=787 # VESA framebuffer console @ 800x600x256 -# vga=771 +#vga=771 # VESA framebuffer console @ 640x480x64k -# vga=785 +#vga=785 # VESA framebuffer console @ 640x480x32k -# vga=784 +#vga=784 # VESA framebuffer console @ 640x480x256 -# vga=769 +#vga=769 EOF - fi cat << EOF >> $T_PX/etc/lilo.conf # End LILO global section EOF @@ -551,8 +568,35 @@ name?" 7 60 fi } +checkbootsplash() +{ + if [ "$(uname -m)" = "x86_64" ]; then + if [ -r $LILODOCDIR/sample/slack64.bmp ]; then + cp -a $LILODOCDIR/sample/slack64.bmp /boot/slack.bmp + fi + else + if [ -r $LILODOCDIR/sample/slack.bmp ]; then + cp -a $LILODOCDIR/sample/slack.bmp /boot/slack.bmp + fi + fi + if [ -r $HOME/1337 ]; then + if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then + cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp + fi + fi + # Thanks to amrit@slackware.com: + if grep -wq 13.37.0 /etc/slackware-version ; then + if ls -l /etc/lilo.conf | grep -q 13:37 ; then + if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then + cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp + fi + fi + fi +} + installcolor() { + checkbootsplash; dialog --infobox "\nInstalling the Linux Loader..." 5 40 if [ "$T_PX" = "/" ]; then lilo 1> /dev/null 2> /etc/lilo-error.$$ @@ -586,7 +630,7 @@ has not been correctly installed. You'll have to use a bootdisk \ to start your \ machine instead. It should still be possible to get LILO working by \ editing the /etc/lilo.conf and reinstalling LILO manually. See the \ -LILO man page and documentation in /usr/doc/lilo/ for more help. \ +LILO man page and documentation in $LILODOCDIR for more help. \ The error message may be seen above. EOF dialog --msgbox "$(cat /etc/lilo-error.$$)" 0 0 @@ -595,6 +639,7 @@ EOF installtext() { + checkbootsplash; echo "Installing the Linux Loader..." if [ "$T_PX" = "/" ]; then lilo @@ -629,7 +674,7 @@ Sorry, but the attempt to install LILO has returned an error, so LILO has not been correctly installed. You'll have to use a bootdisk to start your machine instead. It should still be possible to get LILO working by editing the /etc/lilo.conf and reinstalling LILO manually. -See the LILO man page and documentation in /usr/doc/lilo/ for more +See the LILO man page and documentation in $LILODOCDIR for more help. EOF @@ -888,31 +933,27 @@ EOF cat << EOF >> $TMP/lilo.conf # Normal VGA console vga = normal -# VESA framebuffer console @ 1024x768x64k -# vga=791 -# VESA framebuffer console @ 1024x768x32k -# vga=790 -# VESA framebuffer console @ 1024x768x256 -# vga=773 -# VESA framebuffer console @ 800x600x64k -# vga=788 -# VESA framebuffer console @ 800x600x32k -# vga=787 -# VESA framebuffer console @ 800x600x256 -# vga=771 -# VESA framebuffer console @ 640x480x64k -# vga=785 -# VESA framebuffer console @ 640x480x32k -# vga=784 -# VESA framebuffer console @ 640x480x256 -# vga=769 +# Ask for video mode at boot (time out to normal in 30s) +#vga = ask +EOF + elif [ "$CONSOLETYPE" = "ask" ]; then + cat << EOF >> $TMP/lilo.conf +# Ask for video mode at boot (time out to normal in 30s) +vga = ask +# Normal VGA console +#vga = normal EOF else cat << EOF >> $TMP/lilo.conf # VESA framebuffer console @ $CONSOLETYPE vga = $CONSOLENUM # Normal VGA console -# vga = normal +#vga = normal +# Ask for video mode at boot (time out to normal in 30s) +#vga = ask +EOF + fi + cat << EOF >> $TMP/lilo.conf # VESA framebuffer console @ 1024x768x64k # vga=791 # VESA framebuffer console @ 1024x768x32k @@ -932,7 +973,6 @@ vga = $CONSOLENUM # VESA framebuffer console @ 640x480x256 # vga=769 EOF - fi cat << EOF >> $TMP/lilo.conf # ramdisk = 0 # paranoia setting # End LILO global section @@ -940,14 +980,20 @@ EOF HDR="yes" elif [ "$REPLY" = "Linux" ]; then if [ "$HDR" = "yes" ]; then - echo "These are your Linux partitions:" > $TMP/tmpmsg - echo >> $TMP/tmpmsg - echo " Device Boot Start End Blocks Id System" >> $TMP/tmpmsg - PROBE -l | grep "Linux$" | sort >> $TMP/tmpmsg - echo >> $TMP/tmpmsg - echo "Which one would you like LILO to boot?" >> $TMP/tmpmsg - dialog --title "SELECT LINUX PARTITION" --no-collapse --inputbox \ -"`cat $TMP/tmpmsg`" 21 74 2> $TMP/reply + if [ "$ROOT_DEVICE" != "" ]; then + DEFROOT="--default-item $ROOT_DEVICE" + fi + echo "dialog --title \"SELECT LINUX PARTITION\" $DEFROOT --menu \\" > $TMP/tmpmsg + echo "\"Which Linux partition would you like LILO to boot?\n\ +\n\ + Partition Start End Sectors ID\" 22 74 13 \\" >> $TMP/tmpmsg + PROBE -l 2> /dev/null | grep "Linux$" | sort | while read STR; do + STR1="$(echo -n "$STR" | cut -f 1 -d ' ')" + STR2="$(echo -n "$STR" | cut -f 2- -d ' ')" + echo "\"$STR1\" \"$STR2\" \\" >> $TMP/tmpmsg + done + echo "2> $TMP/reply" >> $TMP/tmpmsg + . $TMP/tmpmsg if [ $? = 1 -o $? = 255 ]; then rm $TMP/tmpmsg continue @@ -958,7 +1004,7 @@ EOF if [ ! $? = 0 ]; then continue; fi - dialog --title "SELECT PARTITION NAME" --inputbox \ + dialog --title "SELECT PARTITION NAME FOR $LINUX_PART" --inputbox \ "Now you must select a short, unique name for this partition. \ You'll use this name if you specify a partition to boot at the \ LILO prompt. 'Linux' might not be a bad choice. THIS MUST BE A \ diff --git a/source/a/lilo/sl1337.bmp b/source/a/lilo/sl1337.bmp Binary files differnew file mode 100644 index 000000000..34a62d1bf --- /dev/null +++ b/source/a/lilo/sl1337.bmp diff --git a/source/a/lilo/slack64.bmp b/source/a/lilo/slack64.bmp Binary files differindex 464e4683e..0d17f2346 100644 --- a/source/a/lilo/slack64.bmp +++ b/source/a/lilo/slack64.bmp diff --git a/source/a/lrzip/doinst.sh b/source/a/lrzip/doinst.sh new file mode 100644 index 000000000..6ed464c6e --- /dev/null +++ b/source/a/lrzip/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/lrzip.conf.new + diff --git a/source/a/lrzip/lrzip.SlackBuild b/source/a/lrzip/lrzip.SlackBuild new file mode 100755 index 000000000..b45a8a5a0 --- /dev/null +++ b/source/a/lrzip/lrzip.SlackBuild @@ -0,0 +1,131 @@ +#!/bin/sh + +# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, 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=lrzip +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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + +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 + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$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 \ + --sysconfdir=/etc \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +if [ -r doc/lrzip.conf.example ]; then + mkdir -p $PKG/etc + cp -a doc/lrzip.conf.example $PKG/etc/lrzip.conf.new + chown root:root $PKG/etc/lrzip.conf.new + chmod 644 $PKG/etc/lrzip.conf.new +fi + +find $PKG | xargs file | grep -e "executable" -e "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 + +# Restore a few original file timestamps: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS BUGS COPYING* README* TODO WHATS-NEW \ + doc/README* doc/lrzip.conf.example doc/magic.header.txt \ + $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 +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/lrzip/slack-desc b/source/a/lrzip/slack-desc new file mode 100644 index 000000000..12b1b9d69 --- /dev/null +++ b/source/a/lrzip/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------------------------------------------------------| +lrzip: lrzip (Long Range ZIP) +lrzip: +lrzip: LRZIP is a file compression program designed to do particularly well +lrzip: on very large files containing long distance redundancy. The larger +lrzip: the file and the more memory you have, the better the compression +lrzip: advantage this will provide. A variety of compression options allow +lrzip: optimizing for size or speed. +lrzip: +lrzip: Homepage: http://ck.kolivas.org/apps/lrzip/ +lrzip: +lrzip: diff --git a/source/a/lvm2/build_with_udev_165_and_later.diff b/source/a/lvm2/build_with_udev_165_and_later.diff new file mode 100644 index 000000000..800e0f9f3 --- /dev/null +++ b/source/a/lvm2/build_with_udev_165_and_later.diff @@ -0,0 +1,21 @@ +diff -Nur LVM2.2.02.84.orig//configure LVM2.2.02.84/configure +--- LVM2.2.02.84.orig//configure 2011-02-04 16:17:54.000000000 -0600 ++++ LVM2.2.02.84/configure 2011-02-09 20:23:11.818797797 -0600 +@@ -8768,7 +8768,7 @@ + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ludev $LIBS" ++LIBS="-ludev -lrt $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -8799,7 +8799,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_udev_udev_queue_get_udev_is_active" >&5 + $as_echo "$ac_cv_lib_udev_udev_queue_get_udev_is_active" >&6; } + if test "x$ac_cv_lib_udev_udev_queue_get_udev_is_active" = x""yes; then : +- UDEV_PC="libudev"; UDEV_LIBS="-ludev" ++ UDEV_PC="libudev"; UDEV_LIBS="-ludev -lrt" + else + as_fn_error $? "bailing out... libudev library is required" "$LINENO" 5 + fi diff --git a/source/a/lvm2/lvm2.SlackBuild b/source/a/lvm2/lvm2.SlackBuild index 5199f9c7d..e72897d0e 100755 --- a/source/a/lvm2/lvm2.SlackBuild +++ b/source/a/lvm2/lvm2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=$(echo LVM2.*.tar.?z* | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VERSION=$(echo LVM2.*.tar.xz | cut -f 2- -d . | rev | cut -f 3- -d . | cut -f 1 -d - | rev) BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -58,7 +58,7 @@ rm -rf $PKG mkdir -p $PKG cd $TMP rm -rf LVM2.$VERSION -tar xvf $CWD/LVM2.$VERSION.tar.xz +tar xvf $CWD/LVM2.$VERSION.tar.xz || exit 1 cd LVM2.$VERSION || exit 1 chown -R root:root . @@ -68,6 +68,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix linking of librt until upstream does it correctly :) +zcat $CWD/build_with_udev_165_and_later.diff.gz | patch -p1 --verbose || exit 1 + # uid 0 = root # gid 6 = disk CFLAGS="$SLKCFLAGS" \ @@ -75,10 +78,12 @@ CFLAGS="$SLKCFLAGS" \ --disable-readline \ --enable-cmdlib \ --enable-dmeventd \ + --enable-applib \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-usrlibdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --enable-static_link \ + --enable-realtime \ --with-lvm1=internal \ --enable-pkgconfig \ --enable-udev_sync \ @@ -86,7 +91,7 @@ CFLAGS="$SLKCFLAGS" \ --with-udev-prefix="" \ --with-device-uid=0 \ --with-device-gid=6 \ - --with-device-mode=0664 \ + --with-device-mode=0660 \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -94,6 +99,9 @@ make install DESTDIR=$PKG || exit 1 mv $PKG/etc/lvm/lvm.conf $PKG/etc/lvm/lvm.conf.new +# Create default rundir +mkdir -p $PKG/var/run/lvm + if [ -d $PKG/usr/share/man ]; then # --mandir was ignored mv $PKG/usr/share/man $PKG/usr rmdir $PKG/usr/share @@ -106,42 +114,29 @@ mkdir -p $PKG/lib${LIBDIRSUFFIX} 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 + # These two excluded files are in ./device-mapper/ subdir + if [ "$file" != "libdevmapper-event-lvm2mirror.so" -a "$file" != "libdevmapper-event-lvm2snapshot.so" ]; then + rm -f $file + ln -sf $(basename ../../lib${LIBDIRSUFFIX}/${file}.?.*) $file + fi 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 $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/LVM2.$VERSION cp -a \ COPYING* INSTALL README* VERSION WHATS_NEW \ $PKG/usr/doc/LVM2.$VERSION -# 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 +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/a/mcelog/doinst.sh b/source/a/mcelog/doinst.sh new file mode 100644 index 000000000..fd9d549aa --- /dev/null +++ b/source/a/mcelog/doinst.sh @@ -0,0 +1,24 @@ +#!/bin/sh +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... +} + +# Keep same perms on rc.mcelog.new: +if [ -e etc/rc.d/rc.mcelog ]; then + cp -a etc/rc.d/rc.mcelog etc/rc.d/rc.mcelog.new.incoming + cat etc/rc.d/rc.mcelog.new > etc/rc.d/rc.mcelog.new.incoming + mv etc/rc.d/rc.mcelog.new.incoming etc/rc.d/rc.mcelog.new +fi + +config etc/logrotate.d/mcelog.new +config etc/mcelog/mcelog.conf.new +config etc/rc.d/rc.mcelog.new + diff --git a/source/a/udev/udev-153.tar.sign b/source/a/mcelog/mcelog-1.0pre3.tar.bz2.sign index 193f3a0e7..1f9c73a47 100644 --- a/source/a/udev/udev-153.tar.sign +++ b/source/a/mcelog/mcelog-1.0pre3.tar.bz2.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBLzqFNyGugalF9Dw4RApGYAKCVo2YvsfeOD/ozq/rsURNM/AoxrwCcCJl1 -YD0LnOVyqilDyMQdOk2VA7o= -=hHbP +iD8DBQBLV9g/yGugalF9Dw4RAlheAJ4t2DqUZX1ySR3QH8RdVHLYyePHawCcC/Ct +N94+oQu1HHumOx0V6Ft+2Fo= +=eEE6 -----END PGP SIGNATURE----- diff --git a/source/a/mcelog/mcelog.SlackBuild b/source/a/mcelog/mcelog.SlackBuild new file mode 100755 index 000000000..0a461cd80 --- /dev/null +++ b/source/a/mcelog/mcelog.SlackBuild @@ -0,0 +1,90 @@ + +#!/bin/sh + +# Copyright 2010 Patrick J. Volkerding, Sebeka, Minnesota, 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=mcelog +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | 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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +cd $PKGNAM-$VERSION + +zcat $CWD/mcelog.init.diff.gz | patch -p1 --verbose || 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 $NUMJOBS || make || exit 1 + +mkdir -p $PKG/etc/mcelog $PKG/usr/sbin $PKG/usr/man/man8 +install -m 755 -p mcelog $PKG/usr/sbin/mcelog +install -m 644 -p mcelog.8 $PKG/usr/man/man8 +gzip -9 $PKG/usr/man/man8/mcelog.8 +install -m 644 -p -b mcelog.conf $PKG/etc/mcelog/mcelog.conf.new +for i in cache-error-trigger dimm-error-trigger page-error-trigger socket-memory-error-trigger ; do + install -m 755 -p -b triggers/$i $PKG/etc/mcelog +done + +mkdir -p $PKG/etc/rc.d +install -m 755 -p mcelog.init $PKG/etc/rc.d/rc.mcelog.new + +mkdir -p $PKG/etc/logrotate.d +install -m 644 -p mcelog.logrotate $PKG/etc/logrotate.d/mcelog.new + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + CHANGES README* TODO* *.pdf \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/a/mcelog/mcelog.init.diff b/source/a/mcelog/mcelog.init.diff new file mode 100644 index 000000000..cc2eee96b --- /dev/null +++ b/source/a/mcelog/mcelog.init.diff @@ -0,0 +1,56 @@ +--- ./mcelog.init.orig 2010-01-20 20:36:52.000000000 -0600 ++++ ./mcelog.init 2010-09-27 17:23:24.964394022 -0500 +@@ -2,11 +2,6 @@ + # + # Startup script for mcelog + # +-# This should be customized for distribution standards +-# (using rc_status etc.) +-# The paths are hardcoded and are not automatically adjusted +-# for different prefix +-# + ### BEGIN INIT INFO + # Provides: mcelog + # Default-Start: 3 5 +@@ -16,8 +11,6 @@ + # This logs and handles CPU hardware errors on x86 systems. + ### END INIT INFO + +-# put this is sysconfig +- + # mcelog mode + # valid values: daemon, trigger, cron + # Recommended value daemon +@@ -52,8 +45,8 @@ + case "$1" in + start) + if [ "$MCELOG_MODE" = "daemon" ] ; then +- echo "Starting mcelog daemon" +- startproc $MCELOG --daemon $MCELOG_OPTIONS ++ echo "Starting mcelog daemon: $MCELOG --daemon $MCELOG_OPTIONS" ++ $MCELOG --daemon $MCELOG_OPTIONS + elif [ -f "$TRIGGER" ] ; then + echo $MCELOG > "$TRIGGER" + else +@@ -62,8 +55,8 @@ + ;; + stop) + if [ "$MCELOG_MODE" = "daemon" ] ; then +- echo "Stopping mcelog" +- killproc -TERM $MCELOG ++ echo "Stopping mcelog daemon: killall -TERM $MCELOG" ++ killall -TERM $MCELOG + elif [ "$MCELOG_MODE" = "trigger" -a -f "$TRIGGER" ]; then + echo "" > "$TRIGGER" + else +@@ -85,8 +78,8 @@ + ;; + status) + if [ "$MCELOG_MODE" = "daemon" ] ; then +- echo "Checking for mcelog" +- checkproc $MCELOG ++ echo "Checking for mcelog:" ++ ps ax | grep $MCELOG | cut -f 1 -d ' ' + fi + ;; + *) diff --git a/source/a/mcelog/slack-desc b/source/a/mcelog/slack-desc new file mode 100644 index 000000000..0948e2687 --- /dev/null +++ b/source/a/mcelog/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------------------------------------------------------| +mcelog: mcelog (Machine Check Event logger) +mcelog: +mcelog: mcelog is the user space backend for logging machine check errors +mcelog: reported by the hardware to the kernel. The kernel does the immediate +mcelog: actions (like killing processes etc.) and mcelog decodes the logs the +mcelog: errors. It primarily handles machine checks and thermal events, which +mcelog: are reported for errors detected by the CPU. It is recommended that +mcelog: mcelog runs on all x86 machines, both 64-bit and 32bit. +mcelog: +mcelog: mcelog home: ftp://ftp.kernel.org:/pub/linux/utils/cpu/mce +mcelog: diff --git a/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign b/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign new file mode 100644 index 000000000..e5c727688 --- /dev/null +++ b/source/a/mdadm/mdadm-3.1.5.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBNiYLLyGugalF9Dw4RAjiBAJkB62x+h+B7v24ghmwIUa2p44sWNwCeIZfe +sW9YOnjL/odR4C9Uuzu5pUQ= +=qI9A +-----END PGP SIGNATURE----- diff --git a/source/a/mdadm/mdadm.SlackBuild b/source/a/mdadm/mdadm.SlackBuild index 4e59b7030..71f7c1a31 100755 --- a/source/a/mdadm/mdadm.SlackBuild +++ b/source/a/mdadm/mdadm.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.6.9 +VERSION=3.1.5 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -45,8 +45,10 @@ rm -rf mdadm-$VERSION tar xjvf $CWD/mdadm-$VERSION.tar.bz2 || exit 1 cd mdadm-$VERSION -# Build this static: -zcat $CWD/mdadm.static.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# With glibc on the initrd and installer, there is no longer a +# good reason to compile this statically. Commented out. +## 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/minicom/doinst.sh b/source/a/minicom/doinst.sh index f667412ed..5961829bc 100644 --- a/source/a/minicom/doinst.sh +++ b/source/a/minicom/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/minicom/lrzsz_0.12.21-4.diff b/source/a/minicom/lrzsz_0.12.21-4.diff deleted file mode 100644 index 01c721571..000000000 --- a/source/a/minicom/lrzsz_0.12.21-4.diff +++ /dev/null @@ -1,3019 +0,0 @@ ---- lrzsz-0.12.21.orig/Makefile.in -+++ lrzsz-0.12.21/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4a from Makefile.am -+# Makefile.in generated automatically by automake 1.4 from Makefile.am - - # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation -@@ -46,10 +46,9 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_FLAG = - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -106,13 +105,13 @@ - - DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ - INSTALL Makefile.am Makefile.in NEWS Specfile.in THANKS TODO acconfig.h \ --acinclude.m4 aclocal.m4 config.guess config.h.in configure configure.in \ --install-sh missing mkinstalldirs systype.in -+acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \ -+configure.in install-sh missing mkinstalldirs systype.in - - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: -@@ -298,7 +297,7 @@ - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -@@ -340,7 +339,7 @@ - all-am: Makefile $(SCRIPTS) config.h - all-redirect: all-recursive-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: installdirs-recursive - installdirs-am: - ---- lrzsz-0.12.21.orig/aclocal.m4 -+++ lrzsz-0.12.21/aclocal.m4 -@@ -1,4 +1,4 @@ --dnl aclocal.m4 generated automatically by aclocal 1.4a -+dnl aclocal.m4 generated automatically by aclocal 1.4 - - dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation -@@ -117,8 +117,6 @@ - - AC_DEFUN(AM_INIT_AUTOMAKE, - [AC_REQUIRE([AC_PROG_INSTALL]) --dnl We require 2.13 because we rely on SHELL being computed by configure. --AC_PREREQ([2.13]) - PACKAGE=[$1] - AC_SUBST(PACKAGE) - VERSION=[$2] ---- lrzsz-0.12.21.orig/configure -+++ lrzsz-0.12.21/configure -@@ -703,7 +703,6 @@ - fi - - -- - PACKAGE=lrzsz - - VERSION=0.12.21rc -@@ -723,7 +722,7 @@ - - missing_dir=`cd $ac_aux_dir && pwd` - echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 --echo "configure:727: checking for working aclocal" >&5 -+echo "configure:726: checking for working aclocal" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -736,7 +735,7 @@ - fi - - echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 --echo "configure:740: checking for working autoconf" >&5 -+echo "configure:739: checking for working autoconf" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -749,7 +748,7 @@ - fi - - echo $ac_n "checking for working automake""... $ac_c" 1>&6 --echo "configure:753: checking for working automake" >&5 -+echo "configure:752: checking for working automake" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -762,7 +761,7 @@ - fi - - echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 --echo "configure:766: checking for working autoheader" >&5 -+echo "configure:765: checking for working autoheader" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -775,7 +774,7 @@ - fi - - echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 --echo "configure:779: checking for working makeinfo" >&5 -+echo "configure:778: checking for working makeinfo" >&5 - # Run test in a subshell; some versions of sh will print an error if - # an executable is not found, even if stderr is redirected. - # Redirect stdin to placate older versions of autoconf. Sigh. -@@ -926,7 +925,7 @@ - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:930: checking for $ac_word" >&5 -+echo "configure:929: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -956,7 +955,7 @@ - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:960: checking for $ac_word" >&5 -+echo "configure:959: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1007,7 +1006,7 @@ - # Extract the first word of "cl", so it can be a program name with args. - set dummy cl; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1011: checking for $ac_word" >&5 -+echo "configure:1010: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1039,7 +1038,7 @@ - fi - - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 - - ac_ext=c - # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1050,12 +1049,12 @@ - - cat > conftest.$ac_ext << EOF - --#line 1054 "configure" -+#line 1053 "configure" - #include "confdefs.h" - - main(){return(0);} - EOF --if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then -@@ -1081,12 +1080,12 @@ - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } - fi - echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 --echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 - echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 - cross_compiling=$ac_cv_prog_cc_cross - - echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 --echo "configure:1090: checking whether we are using GNU C" >&5 -+echo "configure:1089: checking whether we are using GNU C" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1095,7 +1094,7 @@ - yes; - #endif - EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes - else - ac_cv_prog_gcc=no -@@ -1114,7 +1113,7 @@ - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1146,7 +1145,7 @@ - fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:1150: checking how to run the C preprocessor" >&5 -+echo "configure:1149: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= -@@ -1161,13 +1160,13 @@ - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext <<EOF --#line 1165 "configure" -+#line 1164 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1178,13 +1177,13 @@ - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext <<EOF --#line 1182 "configure" -+#line 1181 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1195,13 +1194,13 @@ - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext <<EOF --#line 1199 "configure" -+#line 1198 "configure" - #include "confdefs.h" - #include <assert.h> - Syntax Error - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - : -@@ -1235,13 +1234,13 @@ - fi - if test $ac_cv_prog_gcc = yes; then - echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 --echo "configure:1239: checking whether ${CC-cc} needs -traditional" >&5 -+echo "configure:1238: checking whether ${CC-cc} needs -traditional" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_pattern="Autoconf.*'x'" - cat > conftest.$ac_ext <<EOF --#line 1245 "configure" -+#line 1244 "configure" - #include "confdefs.h" - #include <sgtty.h> - Autoconf TIOCGETP -@@ -1259,7 +1258,7 @@ - - if test $ac_cv_prog_gcc_traditional = no; then - cat > conftest.$ac_ext <<EOF --#line 1263 "configure" -+#line 1262 "configure" - #include "confdefs.h" - #include <termio.h> - Autoconf TCGETA -@@ -1283,7 +1282,7 @@ - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1287: checking for $ac_word" >&5 -+echo "configure:1286: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1311,7 +1310,7 @@ - fi - - echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 --echo "configure:1315: checking for POSIXized ISC" >&5 -+echo "configure:1314: checking for POSIXized ISC" >&5 - if test -d /etc/conf/kconfig.d && - grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 - then -@@ -1332,9 +1331,9 @@ - fi - - echo $ac_n "checking for AIX""... $ac_c" 1>&6 --echo "configure:1336: checking for AIX" >&5 -+echo "configure:1335: checking for AIX" >&5 - cat > conftest.$ac_ext <<EOF --#line 1338 "configure" -+#line 1337 "configure" - #include "confdefs.h" - #ifdef _AIX - yes -@@ -1357,17 +1356,17 @@ - - ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 --echo "configure:1361: checking for minix/config.h" >&5 -+echo "configure:1360: checking for minix/config.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1366 "configure" -+#line 1365 "configure" - #include "confdefs.h" - #include <minix/config.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1408,7 +1407,7 @@ - - - echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 --echo "configure:1412: checking for ${CC-cc} option to accept ANSI C" >&5 -+echo "configure:1411: checking for ${CC-cc} option to accept ANSI C" >&5 - if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -1424,7 +1423,7 @@ - do - CC="$ac_save_CC $ac_arg" - cat > conftest.$ac_ext <<EOF --#line 1428 "configure" -+#line 1427 "configure" - #include "confdefs.h" - #include <stdarg.h> - #include <stdio.h> -@@ -1461,7 +1460,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - am_cv_prog_cc_stdc="$ac_arg"; break - else -@@ -1487,7 +1486,7 @@ - - - echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 --echo "configure:1491: checking for function prototypes" >&5 -+echo "configure:1490: checking for function prototypes" >&5 - if test "$am_cv_prog_cc_stdc" != no; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -@@ -1500,12 +1499,12 @@ - U=_ ANSI2KNR=./ansi2knr - # Ensure some checks needed by ansi2knr itself. - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1504: checking for ANSI C header files" >&5 -+echo "configure:1503: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1509 "configure" -+#line 1508 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -1513,7 +1512,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1530,7 +1529,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1534 "configure" -+#line 1533 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -1548,7 +1547,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1552 "configure" -+#line 1551 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -1569,7 +1568,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 1573 "configure" -+#line 1572 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -1580,7 +1579,7 @@ - exit (0); } - - EOF --if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -1607,17 +1606,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:1611: checking for $ac_hdr" >&5 -+echo "configure:1610: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1616 "configure" -+#line 1615 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1646,12 +1645,12 @@ - fi - - echo $ac_n "checking for working const""... $ac_c" 1>&6 --echo "configure:1650: checking for working const" >&5 -+echo "configure:1649: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1655 "configure" -+#line 1654 "configure" - #include "confdefs.h" - - int main() { -@@ -1700,7 +1699,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:1704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_const=yes - else -@@ -1721,21 +1720,21 @@ - fi - - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:1725: checking for inline" >&5 -+echo "configure:1724: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_cv_c_inline=no - for ac_kw in inline __inline__ __inline; do - cat > conftest.$ac_ext <<EOF --#line 1732 "configure" -+#line 1731 "configure" - #include "confdefs.h" - - int main() { - } $ac_kw foo() { - ; return 0; } - EOF --if { (eval echo configure:1739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:1738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -1786,7 +1785,7 @@ - esac - - echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6 --echo "configure:1790: checking for syslog in -lsocket" >&5 -+echo "configure:1789: checking for syslog in -lsocket" >&5 - ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1794,7 +1793,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1798 "configure" -+#line 1797 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -1805,7 +1804,7 @@ - syslog() - ; return 0; } - EOF --if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1833,7 +1832,7 @@ - fi - - echo $ac_n "checking for syslog in -lbe""... $ac_c" 1>&6 --echo "configure:1837: checking for syslog in -lbe" >&5 -+echo "configure:1836: checking for syslog in -lbe" >&5 - ac_lib_var=`echo be'_'syslog | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1841,7 +1840,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lbe $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1845 "configure" -+#line 1844 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -1852,7 +1851,7 @@ - syslog() - ; return 0; } - EOF --if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1880,7 +1879,7 @@ - fi - - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 --echo "configure:1884: checking for gethostbyname in -lnsl" >&5 -+echo "configure:1883: checking for gethostbyname in -lnsl" >&5 - ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1888,7 +1887,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 1892 "configure" -+#line 1891 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -1899,7 +1898,7 @@ - gethostbyname() - ; return 0; } - EOF --if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -1928,12 +1927,12 @@ - - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:1932: checking for ANSI C header files" >&5 -+echo "configure:1931: checking for ANSI C header files" >&5 - if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 1937 "configure" -+#line 1936 "configure" - #include "confdefs.h" - #include <stdlib.h> - #include <stdarg.h> -@@ -1941,7 +1940,7 @@ - #include <float.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -1958,7 +1957,7 @@ - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1962 "configure" -+#line 1961 "configure" - #include "confdefs.h" - #include <string.h> - EOF -@@ -1976,7 +1975,7 @@ - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat > conftest.$ac_ext <<EOF --#line 1980 "configure" -+#line 1979 "configure" - #include "confdefs.h" - #include <stdlib.h> - EOF -@@ -1997,7 +1996,7 @@ - : - else - cat > conftest.$ac_ext <<EOF --#line 2001 "configure" -+#line 2000 "configure" - #include "confdefs.h" - #include <ctype.h> - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -2008,7 +2007,7 @@ - exit (0); } - - EOF --if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -2035,17 +2034,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2039: checking for $ac_hdr" >&5 -+echo "configure:2038: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2044 "configure" -+#line 2043 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2076,17 +2075,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2080: checking for $ac_hdr" >&5 -+echo "configure:2079: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2085 "configure" -+#line 2084 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2116,17 +2115,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2120: checking for $ac_hdr" >&5 -+echo "configure:2119: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2125 "configure" -+#line 2124 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2156,17 +2155,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2160: checking for $ac_hdr" >&5 -+echo "configure:2159: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2165 "configure" -+#line 2164 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2196,17 +2195,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2200: checking for $ac_hdr" >&5 -+echo "configure:2199: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2205 "configure" -+#line 2204 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2234,12 +2233,12 @@ - - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:2238: checking for size_t" >&5 -+echo "configure:2237: checking for size_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2243 "configure" -+#line 2242 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -2267,12 +2266,12 @@ - fi - - echo $ac_n "checking for mode_t""... $ac_c" 1>&6 --echo "configure:2271: checking for mode_t" >&5 -+echo "configure:2270: checking for mode_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2276 "configure" -+#line 2275 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -2300,12 +2299,12 @@ - fi - - echo $ac_n "checking for off_t""... $ac_c" 1>&6 --echo "configure:2304: checking for off_t" >&5 -+echo "configure:2303: checking for off_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2309 "configure" -+#line 2308 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -2334,12 +2333,12 @@ - - - echo $ac_n "checking for speed_t""... $ac_c" 1>&6 --echo "configure:2338: checking for speed_t" >&5 -+echo "configure:2337: checking for speed_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_speed_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2343 "configure" -+#line 2342 "configure" - #include "confdefs.h" - #include <sys/types.h> - #if STDC_HEADERS -@@ -2389,12 +2388,12 @@ - fi - - echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 --echo "configure:2393: checking for st_rdev in struct stat" >&5 -+echo "configure:2392: checking for st_rdev in struct stat" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2398 "configure" -+#line 2397 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/stat.h> -@@ -2402,7 +2401,7 @@ - struct stat s; s.st_rdev; - ; return 0; } - EOF --if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_st_rdev=yes - else -@@ -2423,12 +2422,12 @@ - fi - - echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:2427: checking whether time.h and sys/time.h may both be included" >&5 -+echo "configure:2426: checking whether time.h and sys/time.h may both be included" >&5 - if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2432 "configure" -+#line 2431 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/time.h> -@@ -2437,7 +2436,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_header_time=yes - else -@@ -2459,12 +2458,12 @@ - - - echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 --echo "configure:2463: checking for socklen_t" >&5 -+echo "configure:2462: checking for socklen_t" >&5 - if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2468 "configure" -+#line 2467 "configure" - #include "confdefs.h" - - #include "confdefs.h" -@@ -2480,7 +2479,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_socklen_t=yes - else -@@ -2505,12 +2504,12 @@ - fi - - echo $ac_n "checking whether sys/time.h and sys/select.h may both be included""... $ac_c" 1>&6 --echo "configure:2509: checking whether sys/time.h and sys/select.h may both be included" >&5 -+echo "configure:2508: checking whether sys/time.h and sys/select.h may both be included" >&5 - if eval "test \"`echo '$''{'lrzsz_cv_header_sys_select'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2514 "configure" -+#line 2513 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <sys/time.h> -@@ -2519,7 +2518,7 @@ - struct tm *tp; - ; return 0; } - EOF --if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - lrzsz_cv_header_sys_select=yes - else -@@ -2540,12 +2539,12 @@ - fi - - echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 --echo "configure:2544: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:2543: checking whether struct tm is in sys/time.h or time.h" >&5 - if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2549 "configure" -+#line 2548 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <time.h> -@@ -2553,7 +2552,7 @@ - struct tm *tp; tp->tm_sec; - ; return 0; } - EOF --if { (eval echo configure:2557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_struct_tm=time.h - else -@@ -2575,19 +2574,19 @@ - - - echo $ac_n "checking for errno declaration""... $ac_c" 1>&6 --echo "configure:2579: checking for errno declaration" >&5 -+echo "configure:2578: checking for errno declaration" >&5 - if eval "test \"`echo '$''{'lrzsz_cv_decl_errno'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2584 "configure" -+#line 2583 "configure" - #include "confdefs.h" - #include <errno.h> - int main() { - int i = errno; errno = 1; - ; return 0; } - EOF --if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - lrzsz_cv_decl_errno=yes - else -@@ -2610,7 +2609,7 @@ - - if test $cross_compiling = no ; then - echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 --echo "configure:2614: checking whether setvbuf arguments are reversed" >&5 -+echo "configure:2613: checking whether setvbuf arguments are reversed" >&5 - if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2618,7 +2617,7 @@ - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } - else - cat > conftest.$ac_ext <<EOF --#line 2622 "configure" -+#line 2621 "configure" - #include "confdefs.h" - #include <stdio.h> - /* If setvbuf has the reversed format, exit 0. */ -@@ -2632,7 +2631,7 @@ - exit(0); /* Non-reversed systems segv here. */ - } - EOF --if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_setvbuf_reversed=yes - else -@@ -2657,12 +2656,12 @@ - - fi - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:2661: checking return type of signal handlers" >&5 -+echo "configure:2660: checking return type of signal handlers" >&5 - if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2666 "configure" -+#line 2665 "configure" - #include "confdefs.h" - #include <sys/types.h> - #include <signal.h> -@@ -2679,7 +2678,7 @@ - int i; - ; return 0; } - EOF --if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -2701,17 +2700,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:2705: checking for $ac_hdr" >&5 -+echo "configure:2704: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2710 "configure" -+#line 2709 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -2740,12 +2739,12 @@ - for ac_func in getpagesize - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:2744: checking for $ac_func" >&5 -+echo "configure:2743: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2749 "configure" -+#line 2748 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -2768,7 +2767,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -2793,7 +2792,7 @@ - done - - echo $ac_n "checking for working mmap""... $ac_c" 1>&6 --echo "configure:2797: checking for working mmap" >&5 -+echo "configure:2796: checking for working mmap" >&5 - if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -2801,7 +2800,7 @@ - ac_cv_func_mmap_fixed_mapped=no - else - cat > conftest.$ac_ext <<EOF --#line 2805 "configure" -+#line 2804 "configure" - #include "confdefs.h" - - /* Thanks to Mike Haertel and Jim Avera for this test. -@@ -2941,7 +2940,7 @@ - } - - EOF --if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_func_mmap_fixed_mapped=yes - else -@@ -2966,19 +2965,19 @@ - # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works - # for constant arguments. Useless! - echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 --echo "configure:2970: checking for working alloca.h" >&5 -+echo "configure:2969: checking for working alloca.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 2975 "configure" -+#line 2974 "configure" - #include "confdefs.h" - #include <alloca.h> - int main() { - char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes - else -@@ -2999,12 +2998,12 @@ - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:3003: checking for alloca" >&5 -+echo "configure:3002: checking for alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3008 "configure" -+#line 3007 "configure" - #include "confdefs.h" - - #ifdef __GNUC__ -@@ -3032,7 +3031,7 @@ - char *p = (char *) alloca(1); - ; return 0; } - EOF --if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_alloca_works=yes - else -@@ -3064,12 +3063,12 @@ - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:3068: checking whether alloca needs Cray hooks" >&5 -+echo "configure:3067: checking whether alloca needs Cray hooks" >&5 - if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3073 "configure" -+#line 3072 "configure" - #include "confdefs.h" - #if defined(CRAY) && ! defined(CRAY2) - webecray -@@ -3094,12 +3093,12 @@ - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3098: checking for $ac_func" >&5 -+echo "configure:3097: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3103 "configure" -+#line 3102 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3122,7 +3121,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3149,7 +3148,7 @@ - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:3153: checking stack direction for C alloca" >&5 -+echo "configure:3152: checking stack direction for C alloca" >&5 - if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3157,7 +3156,7 @@ - ac_cv_c_stack_direction=0 - else - cat > conftest.$ac_ext <<EOF --#line 3161 "configure" -+#line 3160 "configure" - #include "confdefs.h" - find_stack_direction () - { -@@ -3176,7 +3175,7 @@ - exit (find_stack_direction() < 0); - } - EOF --if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_stack_direction=1 - else -@@ -3198,7 +3197,7 @@ - fi - - cat > conftest.$ac_ext <<EOF --#line 3202 "configure" -+#line 3201 "configure" - #include "confdefs.h" - #include <utime.h> - EOF -@@ -3216,12 +3215,12 @@ - for ac_func in gettimeofday settimeofday - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3220: checking for $ac_func" >&5 -+echo "configure:3219: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3225 "configure" -+#line 3224 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3244,7 +3243,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3271,12 +3270,12 @@ - for ac_func in strchr memcpy select vprintf - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3275: checking for $ac_func" >&5 -+echo "configure:3274: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3280 "configure" -+#line 3279 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3299,7 +3298,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3326,12 +3325,12 @@ - for ac_func in times rdchk utime syslog siginterrupt - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3330: checking for $ac_func" >&5 -+echo "configure:3329: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3335 "configure" -+#line 3334 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3354,7 +3353,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3381,12 +3380,12 @@ - for ac_func in mkdir mktime strerror strstr strdup strtoul strtol strpbrk - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3385: checking for $ac_func" >&5 -+echo "configure:3384: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3390 "configure" -+#line 3389 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3409,7 +3408,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3438,12 +3437,12 @@ - for ac_func in stpcpy strftime vasprintf - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3442: checking for $ac_func" >&5 -+echo "configure:3441: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3447 "configure" -+#line 3446 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3466,7 +3465,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3494,12 +3493,12 @@ - - - echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 --echo "configure:3498: checking for getopt_long" >&5 -+echo "configure:3497: checking for getopt_long" >&5 - if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3503 "configure" -+#line 3502 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char getopt_long(); below. */ -@@ -3522,7 +3521,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_getopt_long=yes" - else -@@ -3552,12 +3551,12 @@ - - - echo $ac_n "checking for ftime""... $ac_c" 1>&6 --echo "configure:3556: checking for ftime" >&5 -+echo "configure:3555: checking for ftime" >&5 - if eval "test \"`echo '$''{'ac_cv_func_ftime'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3561 "configure" -+#line 3560 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char ftime(); below. */ -@@ -3580,7 +3579,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_ftime=yes" - else -@@ -3595,7 +3594,7 @@ - if eval "test \"`echo '$ac_cv_func_'ftime`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking that ftime works correctly""... $ac_c" 1>&6 --echo "configure:3599: checking that ftime works correctly" >&5 -+echo "configure:3598: checking that ftime works correctly" >&5 - if eval "test \"`echo '$''{'lrzsz_cv_sys_ftime_ok'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3603,7 +3602,7 @@ - lrzsz_cv_sys_ftime_ok=runtime - else - cat > conftest.$ac_ext <<EOF --#line 3607 "configure" -+#line 3606 "configure" - #include "confdefs.h" - - #include <sys/types.h> -@@ -3632,7 +3631,7 @@ - } - - EOF --if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - lrzsz_cv_sys_ftime_ok=yes - else -@@ -3666,20 +3665,20 @@ - - - echo $ac_n "checking for timezone variable""... $ac_c" 1>&6 --echo "configure:3670: checking for timezone variable" >&5 -+echo "configure:3669: checking for timezone variable" >&5 - if eval "test \"`echo '$''{'libquark_cv_var_timezone'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3676 "configure" -+#line 3675 "configure" - #include "confdefs.h" - #include <time.h> - int main() { - return(int)(timezone/2); - ; return 0; } - EOF --if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - libquark_cv_var_timezone=yes - else -@@ -3705,13 +3704,13 @@ - : - else - echo $ac_n "checking for $lookup_facility""... $ac_c" 1>&6 --echo "configure:3709: checking for $lookup_facility" >&5 -+echo "configure:3708: checking for $lookup_facility" >&5 - if eval "test \"`echo '$''{'lrzsz_cv_lookup_facility'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - cat > conftest.$ac_ext <<EOF --#line 3715 "configure" -+#line 3714 "configure" - #include "confdefs.h" - - #ifdef HAVE_SYSLOG_H -@@ -3763,17 +3762,17 @@ - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:3767: checking for $ac_hdr" >&5 -+echo "configure:3766: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3772 "configure" -+#line 3771 "configure" - #include "confdefs.h" - #include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:3777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:3776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -3803,12 +3802,12 @@ - strdup __argz_count __argz_stringify __argz_next - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3807: checking for $ac_func" >&5 -+echo "configure:3806: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3812 "configure" -+#line 3811 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3831,7 +3830,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3860,12 +3859,12 @@ - for ac_func in stpcpy - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:3864: checking for $ac_func" >&5 -+echo "configure:3863: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3869 "configure" -+#line 3868 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -3888,7 +3887,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -3922,19 +3921,19 @@ - - if test $ac_cv_header_locale_h = yes; then - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 --echo "configure:3926: checking for LC_MESSAGES" >&5 -+echo "configure:3925: checking for LC_MESSAGES" >&5 - if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 3931 "configure" -+#line 3930 "configure" - #include "confdefs.h" - #include <locale.h> - int main() { - return LC_MESSAGES - ; return 0; } - EOF --if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - am_cv_val_LC_MESSAGES=yes - else -@@ -3955,7 +3954,7 @@ - fi - fi - echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 --echo "configure:3959: checking whether NLS is requested" >&5 -+echo "configure:3958: checking whether NLS is requested" >&5 - # Check whether --enable-nls or --disable-nls was given. - if test "${enable_nls+set}" = set; then - enableval="$enable_nls" -@@ -3975,7 +3974,7 @@ - EOF - - echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 --echo "configure:3979: checking whether included gettext is requested" >&5 -+echo "configure:3978: checking whether included gettext is requested" >&5 - # Check whether --with-included-gettext or --without-included-gettext was given. - if test "${with_included_gettext+set}" = set; then - withval="$with_included_gettext" -@@ -3994,17 +3993,17 @@ - - ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 --echo "configure:3998: checking for libintl.h" >&5 -+echo "configure:3997: checking for libintl.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4003 "configure" -+#line 4002 "configure" - #include "confdefs.h" - #include <libintl.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* -@@ -4021,19 +4020,19 @@ - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 --echo "configure:4025: checking for gettext in libc" >&5 -+echo "configure:4024: checking for gettext in libc" >&5 - if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4030 "configure" -+#line 4029 "configure" - #include "confdefs.h" - #include <libintl.h> - int main() { - return (int) gettext ("") - ; return 0; } - EOF --if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - gt_cv_func_gettext_libc=yes - else -@@ -4049,7 +4048,7 @@ - - if test "$gt_cv_func_gettext_libc" != "yes"; then - echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 --echo "configure:4053: checking for bindtextdomain in -lintl" >&5 -+echo "configure:4052: checking for bindtextdomain in -lintl" >&5 - ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4057,7 +4056,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lintl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4061 "configure" -+#line 4060 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4068,7 +4067,7 @@ - bindtextdomain() - ; return 0; } - EOF --if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4084,12 +4083,12 @@ - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 --echo "configure:4088: checking for gettext in libintl" >&5 -+echo "configure:4087: checking for gettext in libintl" >&5 - if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 --echo "configure:4093: checking for gettext in -lintl" >&5 -+echo "configure:4092: checking for gettext in -lintl" >&5 - ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4097,7 +4096,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lintl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4101 "configure" -+#line 4100 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4108,7 +4107,7 @@ - gettext() - ; return 0; } - EOF --if { (eval echo configure:4112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4147,7 +4146,7 @@ - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4151: checking for $ac_word" >&5 -+echo "configure:4150: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4181,12 +4180,12 @@ - for ac_func in dcgettext - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4185: checking for $ac_func" >&5 -+echo "configure:4184: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4190 "configure" -+#line 4189 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -4209,7 +4208,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -4236,7 +4235,7 @@ - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4240: checking for $ac_word" >&5 -+echo "configure:4239: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4272,7 +4271,7 @@ - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4276: checking for $ac_word" >&5 -+echo "configure:4275: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4304,7 +4303,7 @@ - fi - - cat > conftest.$ac_ext <<EOF --#line 4308 "configure" -+#line 4307 "configure" - #include "confdefs.h" - - int main() { -@@ -4312,7 +4311,7 @@ - return _nl_msg_cat_cntr - ; return 0; } - EOF --if { (eval echo configure:4316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - CATOBJEXT=.gmo - DATADIRNAME=share -@@ -4335,7 +4334,7 @@ - - if test "$CATOBJEXT" = "NONE"; then - echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 --echo "configure:4339: checking whether catgets can be used" >&5 -+echo "configure:4338: checking whether catgets can be used" >&5 - # Check whether --with-catgets or --without-catgets was given. - if test "${with_catgets+set}" = set; then - withval="$with_catgets" -@@ -4348,7 +4347,7 @@ - - if test "$nls_cv_use_catgets" = "yes"; then - echo $ac_n "checking for main in -li""... $ac_c" 1>&6 --echo "configure:4352: checking for main in -li" >&5 -+echo "configure:4351: checking for main in -li" >&5 - ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4356,14 +4355,14 @@ - ac_save_LIBS="$LIBS" - LIBS="-li $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4360 "configure" -+#line 4359 "configure" - #include "confdefs.h" - - int main() { - main() - ; return 0; } - EOF --if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4391,12 +4390,12 @@ - fi - - echo $ac_n "checking for catgets""... $ac_c" 1>&6 --echo "configure:4395: checking for catgets" >&5 -+echo "configure:4394: checking for catgets" >&5 - if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4400 "configure" -+#line 4399 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char catgets(); below. */ -@@ -4419,7 +4418,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_catgets=yes" - else -@@ -4441,7 +4440,7 @@ - # Extract the first word of "gencat", so it can be a program name with args. - set dummy gencat; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4445: checking for $ac_word" >&5 -+echo "configure:4444: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4477,7 +4476,7 @@ - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4481: checking for $ac_word" >&5 -+echo "configure:4480: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4514,7 +4513,7 @@ - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4518: checking for $ac_word" >&5 -+echo "configure:4517: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4549,7 +4548,7 @@ - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4553: checking for $ac_word" >&5 -+echo "configure:4552: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4607,7 +4606,7 @@ - # Extract the first word of "msgfmt", so it can be a program name with args. - set dummy msgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4611: checking for $ac_word" >&5 -+echo "configure:4610: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4641,7 +4640,7 @@ - # Extract the first word of "gmsgfmt", so it can be a program name with args. - set dummy gmsgfmt; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4645: checking for $ac_word" >&5 -+echo "configure:4644: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4677,7 +4676,7 @@ - # Extract the first word of "xgettext", so it can be a program name with args. - set dummy xgettext; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:4681: checking for $ac_word" >&5 -+echo "configure:4680: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4770,7 +4769,7 @@ - LINGUAS= - else - echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 --echo "configure:4774: checking for catalogs to be installed" >&5 -+echo "configure:4773: checking for catalogs to be installed" >&5 - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in -@@ -4798,17 +4797,17 @@ - if test "$CATOBJEXT" = ".cat"; then - ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 --echo "configure:4802: checking for linux/version.h" >&5 -+echo "configure:4801: checking for linux/version.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4807 "configure" -+#line 4806 "configure" - #include "confdefs.h" - #include <linux/version.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:4812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:4811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } - ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` - if test -z "$ac_err"; then - rm -rf conftest* ---- lrzsz-0.12.21.orig/debian/changelog -+++ lrzsz-0.12.21/debian/changelog -@@ -0,0 +1,80 @@ -+lrzsz (0.12.21-4) unstable; urgency=low -+ -+ * Updated for Standards-Version: 3.5.2. -+ * Added touch stamp-h.in before make invocation in order to stop -+ autoheader from running. -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 25 Mar 2001 19:48:18 +0200 -+ -+lrzsz (0.12.21-3) unstable; urgency=low -+ -+ * Newish upstream version, (990823 in CVS). -+ * Updated for Policy 3.x. -+ * Misc. fixes for debian/*. -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 19 Sep 1999 17:55:38 +0200 -+ -+lrzsz (0.12.21-2) unstable; urgency=low -+ -+ * Removed definition of strstr, advised by upstream maintainer, to -+ get it to compile on glibc2.1, as John Goerzen and Bart Warmerdam -+ noticed (fixes: #39429 #39812). -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 20 Jun 1999 21:38:07 +0200 -+ -+lrzsz (0.12.21-1) unstable; urgency=low -+ -+ * New upstream version (990604 in CVS). -+ * Cleaned up the diff by removing unneeded .deps/ files and not changing -+ aclocal et al. -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 6 Jun 1999 21:01:50 +0200 -+ -+lrzsz (0.12.20-2) unstable; urgency=low -+ -+ * Don't install ansi2knr.1 manpage, closing bug #33121 -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 7 Feb 1999 01:32:31 +0100 -+ -+lrzsz (0.12.20-1) unstable; urgency=low -+ -+ * New maintainer. -+ * Althought version number doesn't indicate that, this version is -+ today's CVS snapshot from ftp://tirka.ohse.de/uwe/cvs-trees -+ * This release fixes following bugs: #8373 #11208 #16170 #16744 #17210. -+ * Package is lintian clean. -+ -+ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 7 Feb 1999 01:32:31 +0100 -+ -+lrzsz (0.12.17) unstable; urgency=low -+ -+ * sorry, see ../ChangeLog. automagically generated debian/changelog -+ -+ -- Uwe Ohse <uwe@ohse.de> Mon, 02 Jun 1997 10:06:05 +0200 -+ -+lrzsz (0.12.16) unstable; urgency=low -+ -+ * sorry, see ../ChangeLog. changelog is here just to make -+ dpkg happy. -+ * initial release -+ -+ -- Uwe Ohse <uwe@ohse.de> Sun, 2 Jun 1997 21:00:00 +0200 -+ -+lrzsz (0.12b-1.1) unstable; urgency=low -+ -+ * Non-maintainer release. -+ * Libc6 compile. -+ -+ -- Martin Mitchell <martin@debian.org> Sat, 18 Oct 1997 01:58:54 +1000 -+ -+lrzsz (0.12b-1) unstable; urgency=low -+ -+ * Converted to new source packaging format. -+ * New upstream version. -+ -+ -- Michael Alan Dorman <mdorman@calder.med.miami.edu> Tue, 17 Sep 1996 13:39:23 -0400 -+ -+Local variables: -+mode: debian-changelog -+add-log-mailing-address: "jrodin@jagor.srce.hr" -+End: ---- lrzsz-0.12.21.orig/debian/control -+++ lrzsz-0.12.21/debian/control -@@ -0,0 +1,18 @@ -+Source: lrzsz -+Section: comm -+Priority: optional -+Maintainer: Josip Rodin <jrodin@jagor.srce.hr> -+Standards-Version: 3.5.2 -+Build-Depends: debhelper -+ -+Package: lrzsz -+Architecture: any -+Depends: ${shlibs:Depends} -+Suggests: minicom -+Description: Tools for zmodem/xmodem/ymodem file transfer -+ Lrzsz is a cosmetically modified zmodem/ymodem/xmodem package built -+ from the public-domain version of Chuck Forsberg's rzsz package. -+ . -+ These programs use error correcting protocols ({z,x,y}modem) to send -+ (sz, sx, sb) and receive (rz, rx, rb) files over a dial-in serial port -+ from a variety of programs running under various operating systems. ---- lrzsz-0.12.21.orig/debian/copyright -+++ lrzsz-0.12.21/debian/copyright -@@ -0,0 +1,31 @@ -+This is the lrzsz Debian GNU/Linux package. It was first maintained by -+Michael Alan Dorman <mdorman@debian.org>, with help of Martin Mitchell -+and current upstream maintainer, Uwe Ohse <uwe@ohse.de>. -+ -+Current maintainer is Josip Rodin <jrodin@jagor.srce.hr> -+ -+Original source was downloaded from: ftp://tirka.ohse.de/uwe/ -+ -+Copyright (C) until 1988 Chuck Forsberg (Omen Technology INC) -+Copyright (C) 1994 Matt Porter, Michael D. Black -+Copyright (C) 1996, 1997 Uwe Ohse -+ -+Please note that credit should be given to Chuck Forsberg (rzsz) and -+Stephen Satchell/Satchell Evaluations (crc routines) for this package. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; version 2 dated June, 1991. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ 02111-1307, USA. -+ -+On Debian systems, the complete text of the GNU General Public License -+can be found in /usr/share/common-licenses/GPL file. ---- lrzsz-0.12.21.orig/debian/rules -+++ lrzsz-0.12.21/debian/rules -@@ -0,0 +1,60 @@ -+#!/usr/bin/make -f -+# Derived from debhelper/dh_make example. -+ -+#export DH_VERBOSE=1 -+tmp := $(CURDIR)/debian/tmp -+ -+CFLAGS := -O2 -+ifneq "$(findstring debug,$(DEB_BUILD_OPTIONS))" "" -+CFLAGS += -g -+endif -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr \ -+ --mandir='$${prefix}/share/man' --program-transform-name=s/l// -+ touch stamp-h.in # to stop autoheader from running -+ $(MAKE) -+ touch $@ -+ -+clean: -+ dh_testdir -+ dh_testroot -+ [ ! -f Makefile ] || $(MAKE) distclean -+ dh_clean build-stamp -+ -+install: build-stamp -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ $(MAKE) install prefix=$(tmp)/usr -+ -+binary-indep: -+# We have nothing to do, no architecture independent packages here. -+ -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+ dh_installdocs NEWS README README.cvs README.isdn4linux TODO -+# dh_installmanpages ansi2knr.1 -+ dh_installchangelogs ChangeLog -+ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" "" -+ dh_strip -+endif -+ dh_compress -+ cd $(tmp)/usr/share/man/man1 ; \ -+ ln -s rz.1.gz rb.1.gz ; \ -+ ln -s rz.1.gz rx.1.gz ; \ -+ ln -s sz.1.gz sb.1.gz ; \ -+ ln -s sz.1.gz sx.1.gz -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- lrzsz-0.12.21.orig/lib/Makefile.in -+++ lrzsz-0.12.21/lib/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4a from Makefile.am -+# Makefile.in generated automatically by automake 1.4 from Makefile.am - - # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation -@@ -46,10 +46,9 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_FLAG = - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -127,7 +126,7 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - DEP_FILES = .deps/alloca.P .deps/error.P .deps/getopt.P .deps/getopt1.P \ - .deps/long-options.P .deps/mkdir.P .deps/mktime.P .deps/stpcpy.P \ -@@ -282,7 +281,7 @@ - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -@@ -343,7 +342,7 @@ - all-am: Makefile $(ANSI2KNR) $(LIBRARIES) $(HEADERS) - all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - - ---- lrzsz-0.12.21.orig/man/Makefile.in -+++ lrzsz-0.12.21/man/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4a from Makefile.am -+# Makefile.in generated automatically by automake 1.4 from Makefile.am - - # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation -@@ -46,10 +46,9 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_FLAG = - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -106,7 +105,7 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - all: all-redirect - .SUFFIXES: -@@ -173,7 +172,7 @@ - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -@@ -202,7 +201,7 @@ - all-am: Makefile $(MANS) - all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 - ---- lrzsz-0.12.21.orig/po/lrzsz.pot -+++ lrzsz-0.12.21/po/lrzsz.pot -@@ -6,7 +6,7 @@ - msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" --"POT-Creation-Date: 1999-08-22 21:00+0200\n" -+"POT-Creation-Date: 1999-09-19 19:34+0200\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" - "Language-Team: LANGUAGE <LL@li.org>\n" -@@ -14,311 +14,311 @@ - "Content-Type: text/plain; charset=CHARSET\n" - "Content-Transfer-Encoding: ENCODING\n" - --#: src/lsz.c:228 -+#: src/lsz.c:227 - msgid "io_mode(,2) in rbsb.c not implemented\n" - msgstr "" - --#: src/lrz.c:196 src/lsz.c:230 -+#: src/lrz.c:195 src/lsz.c:229 - #, c-format - msgid "caught signal %d; exiting" - msgstr "" - --#: src/lsz.c:400 -+#: src/lsz.c:399 - msgid "command tries" - msgstr "" - --#: src/lsz.c:422 -+#: src/lsz.c:421 - msgid "packetlength" - msgstr "" - --#: src/lsz.c:427 -+#: src/lsz.c:426 - #, c-format - msgid "packetlength out of range 24..%ld" - msgstr "" - --#: src/lsz.c:436 -+#: src/lsz.c:435 - msgid "framelength" - msgstr "" - --#: src/lsz.c:441 -+#: src/lsz.c:440 - #, c-format - msgid "framelength out of range 32..%ld" - msgstr "" - --#: src/lrz.c:318 src/lsz.c:450 -+#: src/lrz.c:317 src/lsz.c:449 - msgid "min_bps" - msgstr "" - --#: src/lsz.c:452 -+#: src/lsz.c:451 - msgid "min_bps must be >= 0" - msgstr "" - --#: src/lrz.c:324 src/lsz.c:458 -+#: src/lrz.c:323 src/lsz.c:457 - msgid "min_bps_time" - msgstr "" - --#: src/lrz.c:326 src/lsz.c:460 -+#: src/lrz.c:325 src/lsz.c:459 - msgid "min_bps_time must be > 1" - msgstr "" - --#: src/lrz.c:342 src/lsz.c:484 -+#: src/lrz.c:341 src/lsz.c:483 - msgid "hour to large (0..23)" - msgstr "" - --#: src/lrz.c:344 src/lsz.c:486 -+#: src/lrz.c:343 src/lsz.c:485 - msgid "unparsable stop time\n" - msgstr "" - --#: src/lrz.c:348 src/lsz.c:490 -+#: src/lrz.c:347 src/lsz.c:489 - msgid "minute to large (0..59)" - msgstr "" - --#: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507 -+#: src/lrz.c:357 src/lrz.c:364 src/lsz.c:499 src/lsz.c:506 - msgid "stop time to small" - msgstr "" - --#: src/lrz.c:363 src/lsz.c:505 -+#: src/lrz.c:362 src/lsz.c:504 - msgid "stop-at" - msgstr "" - --#: src/lrz.c:394 src/lsz.c:516 -+#: src/lrz.c:393 src/lsz.c:515 - msgid "timeout" - msgstr "" - --#: src/lrz.c:396 src/lsz.c:518 -+#: src/lrz.c:395 src/lsz.c:517 - msgid "timeout out of range 10..1000" - msgstr "" - --#: src/lrz.c:412 src/lsz.c:526 -+#: src/lrz.c:411 src/lsz.c:525 - msgid "security violation: can't do that under restricted shell\n" - msgstr "" - --#: src/lrz.c:402 src/lsz.c:533 -+#: src/lrz.c:401 src/lsz.c:532 - msgid "window size" - msgstr "" - --#: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563 -+#: src/lrz.c:426 src/lrz.c:433 src/lsz.c:555 src/lsz.c:562 - msgid "cannot turnoff syslog" - msgstr "" - --#: src/lrz.c:449 src/lsz.c:571 -+#: src/lrz.c:448 src/lsz.c:570 - msgid "startup delay" - msgstr "" - --#: src/lrz.c:465 src/lrz.c:483 src/lrz.c:760 src/lrz.c:1122 src/lrz.c:1244 --#: src/lrz.c:1292 src/lrz.c:1309 src/lrz.c:1324 src/lrz.c:1423 src/lsz.c:580 --#: src/lsz.c:596 src/lsz.c:693 src/lsz.c:828 src/lsz.c:1061 -+#: src/lrz.c:464 src/lrz.c:482 src/lrz.c:759 src/lrz.c:1121 src/lrz.c:1243 -+#: src/lrz.c:1291 src/lrz.c:1308 src/lrz.c:1323 src/lrz.c:1422 src/lsz.c:579 -+#: src/lsz.c:595 src/lsz.c:692 src/lsz.c:827 src/lsz.c:1060 - #: src/zreadline.c:127 - msgid "out of memory" - msgstr "" - --#: src/lrz.c:475 src/lsz.c:592 -+#: src/lrz.c:474 src/lsz.c:591 - msgid "this program was never intended to be used setuid\n" - msgstr "" - --#: src/lsz.c:612 src/lsz.c:627 -+#: src/lsz.c:611 src/lsz.c:626 - msgid "need at least one file to send" - msgstr "" - --#: src/lsz.c:629 -+#: src/lsz.c:628 - msgid "Can't send command in restricted mode\n" - msgstr "" - --#: src/lrz.c:527 src/lsz.c:656 -+#: src/lrz.c:526 src/lsz.c:655 - msgid "hostname too long\n" - msgstr "" - --#: src/lrz.c:542 src/lsz.c:671 -+#: src/lrz.c:541 src/lsz.c:670 - msgid "illegal server address\n" - msgstr "" - --#: src/lsz.c:710 -+#: src/lsz.c:709 - msgid "can read only one file from stdin" - msgstr "" - --#: src/lrz.c:574 src/lsz.c:803 -+#: src/lrz.c:573 src/lsz.c:802 - msgid "Transfer incomplete\n" - msgstr "" - --#: src/lrz.c:576 src/lsz.c:805 -+#: src/lrz.c:575 src/lsz.c:804 - msgid "Transfer complete\n" - msgstr "" - --#: src/lsz.c:838 -+#: src/lsz.c:837 - #, c-format - msgid "send_pseudo %s: cannot open tmpfile %s: %s" - msgstr "" - --#: src/lsz.c:851 -+#: src/lsz.c:850 - #, c-format - msgid "send_pseudo %s: cannot lstat tmpfile %s: %s" - msgstr "" - --#: src/lsz.c:859 -+#: src/lsz.c:858 - #, c-format - msgid "send_pseudo %s: avoiding symlink trap" - msgstr "" - --#: src/lsz.c:870 -+#: src/lsz.c:869 - #, c-format - msgid "send_pseudo %s: cannot write to tmpfile %s: %s" - msgstr "" - --#: src/lsz.c:879 -+#: src/lsz.c:878 - #, c-format - msgid "send_pseudo %s: failed" - msgstr "" - --#: src/lsz.c:882 -+#: src/lsz.c:881 - #, c-format - msgid "send_pseudo %s: ok" - msgstr "" - --#: src/lsz.c:916 -+#: src/lsz.c:915 - #, c-format - msgid "Answering TIMESYNC at %s" - msgstr "" - --#: src/lsz.c:921 -+#: src/lsz.c:920 - msgid "timezone" - msgstr "" - --#: src/lsz.c:924 -+#: src/lsz.c:923 - msgid "timezone unknown" - msgstr "" - --#: src/lsz.c:953 -+#: src/lsz.c:952 - msgid "Can't open any requested files." - msgstr "" - --#: src/lsz.c:1009 -+#: src/lsz.c:1008 - #, c-format - msgid "security violation: not allowed to upload from %s" - msgstr "" - --#: src/lrz.c:1384 src/lsz.c:1027 -+#: src/lrz.c:1383 src/lsz.c:1026 - #, c-format - msgid "cannot open %s" - msgstr "" - --#: src/lsz.c:1082 -+#: src/lsz.c:1081 - #, c-format - msgid "is not a file: %s" - msgstr "" - --#: src/lsz.c:1115 src/lsz.c:1130 -+#: src/lsz.c:1114 src/lsz.c:1129 - #, c-format - msgid "%s/%s: error occured" - msgstr "" - --#: src/lsz.c:1119 -+#: src/lsz.c:1118 - #, c-format - msgid "skipped: %s" - msgstr "" - --#: src/lsz.c:1122 -+#: src/lsz.c:1121 - #, c-format - msgid "%s/%s: skipped" - msgstr "" - --#: src/lsz.c:1149 -+#: src/lsz.c:1148 - #, c-format - msgid "Bytes Sent:%7ld BPS:%-8ld \n" - msgstr "" - --#: src/lsz.c:1178 -+#: src/lsz.c:1177 - #, c-format - msgid "Sending %s, %ld blocks: " - msgstr "" - --#: src/lsz.c:1181 -+#: src/lsz.c:1180 - msgid "Give your local XMODEM receive command now." - msgstr "" - --#: src/lsz.c:1224 -+#: src/lsz.c:1223 - #, c-format - msgid "Sending: %s\n" - msgstr "" - --#: src/lsz.c:1267 -+#: src/lsz.c:1266 - msgid "Timeout on pathname" - msgstr "" - --#: src/lsz.c:1314 -+#: src/lsz.c:1313 - msgid "Receiver Cancelled" - msgstr "" - --#: src/lsz.c:1340 -+#: src/lsz.c:1339 - msgid "No ACK on EOT" - msgstr "" - --#: src/lsz.c:1361 -+#: src/lsz.c:1360 - #, c-format - msgid "Xmodem sectors/kbytes sent: %3d/%2dk" - msgstr "" - --#: src/lsz.c:1363 -+#: src/lsz.c:1362 - #, c-format - msgid "Ymodem sectors/kbytes sent: %3d/%2dk" - msgstr "" - --#: src/lsz.c:1395 -+#: src/lsz.c:1394 - msgid "Cancelled" - msgstr "" - --#: src/lsz.c:1399 -+#: src/lsz.c:1398 - msgid "Timeout on sector ACK" - msgstr "" - --#: src/lsz.c:1404 -+#: src/lsz.c:1403 - msgid "NAK on sector" - msgstr "" - --#: src/lsz.c:1410 -+#: src/lsz.c:1409 - msgid "Got burst for sector ACK" - msgstr "" - --#: src/lsz.c:1412 -+#: src/lsz.c:1411 - #, c-format - msgid "Got %02x for sector ACK" - msgstr "" - --#: src/lsz.c:1424 -+#: src/lsz.c:1423 - msgid "Retry Count Exceeded" - msgstr "" - --#: src/lrz.c:596 src/lsz.c:1502 -+#: src/lrz.c:595 src/lsz.c:1501 - #, c-format - msgid "Try `%s --help' for more information.\n" - msgstr "" - --#: src/lrz.c:601 src/lsz.c:1507 -+#: src/lrz.c:600 src/lsz.c:1506 - #, c-format - msgid "%s version %s\n" - msgstr "" - --#: src/lsz.c:1510 -+#: src/lsz.c:1509 - #, c-format - msgid "Usage: %s [options] file ...\n" - msgstr "" - --#: src/lsz.c:1512 -+#: src/lsz.c:1511 - #, c-format - msgid " or: %s [options] -{c|i} COMMAND\n" - msgstr "" - --#: src/lsz.c:1513 -+#: src/lsz.c:1512 - msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n" - msgstr "" - --#: src/lrz.c:607 src/lsz.c:1515 -+#: src/lrz.c:606 src/lsz.c:1514 - msgid "" - " (X) = option applies to XMODEM only\n" - " (Y) = option applies to YMODEM only\n" - " (Z) = option applies to ZMODEM only\n" - msgstr "" - --#: src/lsz.c:1521 -+#: src/lsz.c:1520 - msgid "" - " -+, --append append to existing destination file (Z)\n" - " -2, --twostop use 2 stop bits\n" -@@ -345,7 +345,7 @@ - " -M, --min-bps-time N for at least N seconds (default: 120)\n" - msgstr "" - --#: src/lsz.c:1546 -+#: src/lsz.c:1545 - msgid "" - " -n, --newer send file if source newer (Z)\n" - " -N, --newer-or-longer send file if source newer or longer (Z)\n" -@@ -371,64 +371,64 @@ - "short options use the same arguments as the long ones\n" - msgstr "" - --#: src/lsz.c:1768 -+#: src/lsz.c:1767 - msgid "got ZRQINIT" - msgstr "" - --#: src/lrz.c:1079 src/lrz.c:1772 src/lsz.c:1774 -+#: src/lrz.c:1078 src/lrz.c:1771 src/lsz.c:1773 - msgid "got ZCAN" - msgstr "" - --#: src/lsz.c:1991 -+#: src/lsz.c:1990 - #, c-format - msgid "blklen now %d\n" - msgstr "" - --#: src/lsz.c:2053 -+#: src/lsz.c:2052 - #, c-format - msgid "zsendfdata: bps rate %ld below min %ld" - msgstr "" - --#: src/lsz.c:2070 -+#: src/lsz.c:2069 - msgid "zsendfdata: reached stop time" - msgstr "" - --#: src/lsz.c:2080 -+#: src/lsz.c:2079 - #, c-format - msgid "Bytes Sent:%7ld/%7ld BPS:%-8ld ETA %02d:%02d " - msgstr "" - --#: src/lsz.c:2223 -+#: src/lsz.c:2222 - #, c-format - msgid "calc_blklen: reduced to %d due to error\n" - msgstr "" - --#: src/lsz.c:2256 -+#: src/lsz.c:2255 - #, c-format - msgid "calc_blklen: returned old value %d due to low bpe diff\n" - msgstr "" - --#: src/lsz.c:2258 -+#: src/lsz.c:2257 - #, c-format - msgid "calc_blklen: old %ld, new %ld, d %ld\n" - msgstr "" - --#: src/lsz.c:2267 -+#: src/lsz.c:2266 - #, c-format - msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n" - msgstr "" - --#: src/lsz.c:2278 -+#: src/lsz.c:2277 - #, c-format - msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n" - msgstr "" - --#: src/lsz.c:2290 -+#: src/lsz.c:2289 - #, c-format - msgid "calc_blklen: returned %d as best\n" - msgstr "" - --#: src/lsz.c:2486 -+#: src/lsz.c:2485 - #, c-format - msgid "" - "\n" -@@ -444,7 +444,7 @@ - msgid "Sender Canceled" - msgstr "" - --#: src/lrz.c:1002 src/zm.c:586 src/zm.c:645 -+#: src/lrz.c:1001 src/zm.c:586 src/zm.c:645 - msgid "TIMEOUT" - msgstr "" - -@@ -470,40 +470,40 @@ - msgid "Retry %d: " - msgstr "" - --#: src/lrz.c:382 -+#: src/lrz.c:381 - msgid "don't have settimeofday, will not set time\n" - msgstr "" - --#: src/lrz.c:386 -+#: src/lrz.c:385 - msgid "not running as root (this is good!), can not set time\n" - msgstr "" - --#: src/lrz.c:441 -+#: src/lrz.c:440 - msgid "bytes_per_error" - msgstr "" - --#: src/lrz.c:443 -+#: src/lrz.c:442 - msgid "bytes-per-error should be >100" - msgstr "" - --#: src/lrz.c:455 -+#: src/lrz.c:454 - msgid "O_SYNC not supported by the kernel" - msgstr "" - --#: src/lrz.c:497 src/lrz.c:499 -+#: src/lrz.c:496 src/lrz.c:498 - msgid "garbage on commandline" - msgstr "" - --#: src/lrz.c:604 -+#: src/lrz.c:603 - #, c-format - msgid "Usage: %s [options] [filename.if.xmodem]\n" - msgstr "" - --#: src/lrz.c:605 -+#: src/lrz.c:604 - msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n" - msgstr "" - --#: src/lrz.c:612 -+#: src/lrz.c:611 - msgid "" - " -+, --append append to existing files\n" - " -a, --ascii ASCII transfer (change CR/LF to LF)\n" -@@ -543,152 +543,152 @@ - "short options use the same arguments as the long ones\n" - msgstr "" - --#: src/lrz.c:676 -+#: src/lrz.c:675 - #, c-format - msgid "%s waiting to receive." - msgstr "" - --#: src/lrz.c:730 src/lrz.c:1806 -+#: src/lrz.c:729 src/lrz.c:1805 - #, c-format - msgid "\rBytes received: %7ld/%7ld BPS:%-6ld \r\n" - msgstr "" - --#: src/lrz.c:772 -+#: src/lrz.c:771 - #, c-format - msgid "%s: ready to receive %s" - msgstr "" - --#: src/lrz.c:799 -+#: src/lrz.c:798 - #, c-format - msgid "\rBytes received: %7ld BPS:%-6ld \r\n" - msgstr "" - --#: src/lrz.c:825 -+#: src/lrz.c:824 - #, c-format - msgid "" - "\r\n" - "%s: %s removed.\r\n" - msgstr "" - --#: src/lrz.c:856 -+#: src/lrz.c:855 - msgid "Pathname fetch returned EOT" - msgstr "" - --#: src/lrz.c:903 -+#: src/lrz.c:902 - msgid "Received dup Sector" - msgstr "" - --#: src/lrz.c:917 -+#: src/lrz.c:916 - msgid "Sync Error" - msgstr "" - --#: src/lrz.c:965 -+#: src/lrz.c:964 - msgid "CRC" - msgstr "" - --#: src/lrz.c:976 -+#: src/lrz.c:975 - msgid "Checksum" - msgstr "" - --#: src/lrz.c:979 -+#: src/lrz.c:978 - msgid "Sector number garbled" - msgstr "" - --#: src/lrz.c:991 -+#: src/lrz.c:990 - msgid "Sender Cancelled" - msgstr "" - --#: src/lrz.c:1005 -+#: src/lrz.c:1004 - #, c-format - msgid "Got 0%o sector header" - msgstr "" - --#: src/lrz.c:1113 -+#: src/lrz.c:1112 - #, c-format - msgid "file name ends with a /, skipped: %s\n" - msgstr "" - --#: src/lrz.c:1127 -+#: src/lrz.c:1126 - #, c-format - msgid "zmanag=%d, Lzmanag=%d\n" - msgstr "" - --#: src/lrz.c:1128 -+#: src/lrz.c:1127 - #, c-format - msgid "zconv=%d\n" - msgstr "" - --#: src/lrz.c:1192 src/lrz.c:1226 -+#: src/lrz.c:1191 src/lrz.c:1225 - #, c-format - msgid "file exists, skipped: %s\n" - msgstr "" - --#: src/lrz.c:1267 -+#: src/lrz.c:1266 - #, c-format - msgid "TIMESYNC: here %ld, remote %ld, diff %ld seconds\n" - msgstr "" - --#: src/lrz.c:1276 -+#: src/lrz.c:1275 - #, c-format - msgid "TIMESYNC: cannot set time: %s\n" - msgstr "" - --#: src/lrz.c:1296 -+#: src/lrz.c:1295 - msgid "Topipe" - msgstr "" - --#: src/lrz.c:1314 -+#: src/lrz.c:1313 - #, c-format - msgid "Receiving: %s\n" - msgstr "" - --#: src/lrz.c:1545 -+#: src/lrz.c:1544 - #, c-format - msgid "Blocks received: %d" - msgstr "" - --#: src/lrz.c:1599 -+#: src/lrz.c:1598 - #, c-format - msgid "%s: %s exists\n" - msgstr "" - --#: src/lrz.c:1612 src/lrz.c:1620 -+#: src/lrz.c:1611 src/lrz.c:1619 - #, c-format - msgid "%s:\tSecurity Violation" - msgstr "" - --#: src/lrz.c:1730 -+#: src/lrz.c:1729 - msgid "remote command execution requested" - msgstr "" - --#: src/lrz.c:1737 -+#: src/lrz.c:1736 - msgid "not executed" - msgstr "" - --#: src/lrz.c:1768 -+#: src/lrz.c:1767 - msgid "got ZRINIT" - msgstr "" - --#: src/lrz.c:1817 -+#: src/lrz.c:1816 - msgid "Skipped" - msgstr "" - - #. too bad --#: src/lrz.c:2049 -+#: src/lrz.c:2048 - #, c-format - msgid "rzfile: bps rate %ld below min %ld" - msgstr "" - - #. too bad --#: src/lrz.c:2064 -+#: src/lrz.c:2063 - msgid "rzfile: reached stop time" - msgstr "" - --#: src/lrz.c:2071 -+#: src/lrz.c:2070 - #, c-format - msgid "\rBytes received: %7ld/%7ld BPS:%-6ld ETA %02d:%02d " - msgstr "" - --#: src/lrz.c:2215 -+#: src/lrz.c:2214 - msgid "file close error" - msgstr "" ---- lrzsz-0.12.21.orig/src/Makefile.in -+++ lrzsz-0.12.21/src/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4a from Makefile.am -+# Makefile.in generated automatically by automake 1.4 from Makefile.am - - # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation -@@ -45,10 +45,9 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_FLAG = - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -132,7 +131,7 @@ - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - DEP_FILES = .deps/canit.P .deps/crctab.P .deps/lrz.P .deps/lsyslog.P \ - .deps/lsz.P .deps/protname.P .deps/rbsb.P .deps/tcp.P .deps/timing.P \ -@@ -167,8 +166,8 @@ - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -@@ -292,7 +291,7 @@ - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -@@ -353,7 +352,7 @@ - all-am: Makefile $(ANSI2KNR) $(PROGRAMS) $(HEADERS) - all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - ---- lrzsz-0.12.21.orig/src/lrz.c -+++ lrzsz-0.12.21/src/lrz.c -@@ -44,7 +44,6 @@ - #ifndef STRICT_PROTOTYPES - extern time_t time(); - extern char *strerror(); --extern char *strstr(); - #endif - - #ifndef HAVE_ERRNO_DECLARATION ---- lrzsz-0.12.21.orig/src/lsz.c -+++ lrzsz-0.12.21/src/lsz.c -@@ -53,7 +53,6 @@ - #ifndef STRICT_PROTOTYPES - extern time_t time(); - extern char *strerror(); --extern char *strstr(); - #endif - - #ifndef HAVE_ERRNO_DECLARATION ---- lrzsz-0.12.21.orig/testsuite/Makefile.in -+++ lrzsz-0.12.21/testsuite/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated automatically by automake 1.4a from Makefile.am -+# Makefile.in generated automatically by automake 1.4 from Makefile.am - - # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation -@@ -46,10 +46,9 @@ - AUTOHEADER = @AUTOHEADER@ - - INSTALL = @INSTALL@ --INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ --INSTALL_STRIP_FLAG = - transform = @program_transform_name@ - - NORMAL_INSTALL = : -@@ -103,7 +102,7 @@ - DIST_COMMON = Makefile.am Makefile.in - - --TAR = gtar -+TAR = tar - GZIP_ENV = --best - EXPECT = expect - RUNTEST = runtest -@@ -133,7 +132,7 @@ - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ -- cp -pr $$d/$$file $(distdir)/$$file; \ -+ cp -pr $$/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -@@ -192,7 +191,7 @@ - all-am: Makefile - all-redirect: all-am - install-strip: -- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install -+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - - diff --git a/source/a/minicom/lrzsz_0.12.21-5.diff b/source/a/minicom/lrzsz_0.12.21-5.diff new file mode 100644 index 000000000..b2541a91b --- /dev/null +++ b/source/a/minicom/lrzsz_0.12.21-5.diff @@ -0,0 +1,4194 @@ +--- lrzsz-0.12.21.orig/po/de.po ++++ lrzsz-0.12.21/po/de.po +@@ -28,21 +28,21 @@ + + #: src/lsz.c:422 + msgid "packetlength" +-msgstr "Paketlänge" ++msgstr "Paketl?nge" + + #: src/lsz.c:427 + #, c-format + msgid "packetlength out of range 24..%ld" +-msgstr "Argument der Option L außerhalb des Bereichs 24..%ld" ++msgstr "Argument der Option L au?erhalb des Bereichs 24..%ld" + + #: src/lsz.c:436 + msgid "framelength" +-msgstr "Framelänge" ++msgstr "Framel?nge" + + #: src/lsz.c:441 + #, c-format + msgid "framelength out of range 32..%ld" +-msgstr "Argument der Option l außerhalb des Bereichs 32..%ld" ++msgstr "Argument der Option l au?erhalb des Bereichs 32..%ld" + + #: src/lrz.c:318 src/lsz.c:450 + msgid "min_bps" +@@ -50,7 +50,7 @@ + + #: src/lsz.c:452 + msgid "min_bps must be >= 0" +-msgstr "minimale BPS-Rate muß >= 0 sein" ++msgstr "minimale BPS-Rate mu? >= 0 sein" + + #: src/lrz.c:324 src/lsz.c:458 + msgid "min_bps_time" +@@ -58,7 +58,7 @@ + + #: src/lrz.c:326 src/lsz.c:460 + msgid "min_bps_time must be > 1" +-msgstr "Zeitfenster für minimale BPS-Rate muß > 1 Sekunde sein" ++msgstr "Zeitfenster f?r minimale BPS-Rate mu? > 1 Sekunde sein" + + #: src/lrz.c:342 src/lsz.c:484 + msgid "hour to large (0..23)" +@@ -70,7 +70,7 @@ + + #: src/lrz.c:348 src/lsz.c:490 + msgid "minute to large (0..59)" +-msgstr "Minute zu groß (0..59)" ++msgstr "Minute zu gro? (0..59)" + + #: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507 + msgid "stop time to small" +@@ -86,15 +86,15 @@ + + #: src/lrz.c:396 src/lsz.c:518 + msgid "timeout out of range 10..1000" +-msgstr "Argument der Option t außerhalb des Bereichs 10..1000" ++msgstr "Argument der Option t au?erhalb des Bereichs 10..1000" + + #: src/lrz.c:412 src/lsz.c:526 + msgid "security violation: can't do that under restricted shell\n" +-msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten\n" ++msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten\n" + + #: src/lrz.c:402 src/lsz.c:533 + msgid "window size" +-msgstr "Fenstergröße" ++msgstr "Fenstergr??e" + + #: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563 + msgid "cannot turnoff syslog" +@@ -102,7 +102,7 @@ + + #: src/lrz.c:449 src/lsz.c:571 + msgid "startup delay" +-msgstr "Startverzögerung" ++msgstr "Startverz?gerung" + + #: src/lrz.c:465 src/lrz.c:483 src/lrz.c:760 src/lrz.c:1122 src/lrz.c:1244 + #: src/lrz.c:1292 src/lrz.c:1309 src/lrz.c:1324 src/lrz.c:1423 src/lsz.c:580 +@@ -117,11 +117,11 @@ + + #: src/lsz.c:612 src/lsz.c:627 + msgid "need at least one file to send" +-msgstr "es muß mindestens ein Name einer zu sendenden Datei angegeben werden" ++msgstr "es mu? mindestens ein Name einer zu sendenden Datei angegeben werden" + + #: src/lsz.c:629 + msgid "Can't send command in restricted mode\n" +-msgstr "Im eingeschränkten Modus ist das Senden von Kommandos verboten\n" ++msgstr "Im eingeschr?nkten Modus ist das Senden von Kommandos verboten\n" + + #: src/lrz.c:527 src/lsz.c:656 + msgid "hostname too long\n" +@@ -137,21 +137,21 @@ + + #: src/lrz.c:574 src/lsz.c:803 + msgid "Transfer incomplete\n" +-msgstr "Übertragung nicht abgeschlossen\n" ++msgstr "?bertragung nicht abgeschlossen\n" + + #: src/lrz.c:576 src/lsz.c:805 + msgid "Transfer complete\n" +-msgstr "Übertragung abgeschlossen\n" ++msgstr "?bertragung abgeschlossen\n" + + #: src/lsz.c:838 + #, c-format + msgid "send_pseudo %s: cannot open tmpfile %s: %s" +-msgstr "send_pseudo %s: kann temporäre Datei %s nicht öffnen: %s" ++msgstr "send_pseudo %s: kann tempor?re Datei %s nicht ?ffnen: %s" + + #: src/lsz.c:851 + #, c-format + msgid "send_pseudo %s: cannot lstat tmpfile %s: %s" +-msgstr "send_pseudo %s: kann lstat nicht auf temporäre Datei %s anwenden: %s" ++msgstr "send_pseudo %s: kann lstat nicht auf tempor?re Datei %s anwenden: %s" + + #: src/lsz.c:859 + #, c-format +@@ -161,7 +161,7 @@ + #: src/lsz.c:870 + #, c-format + msgid "send_pseudo %s: cannot write to tmpfile %s: %s" +-msgstr "send_pseudo %s: kann nicht in temporäre Datei %s schreiben: %s" ++msgstr "send_pseudo %s: kann nicht in tempor?re Datei %s schreiben: %s" + + #: src/lsz.c:879 + #, c-format +@@ -188,17 +188,17 @@ + + #: src/lsz.c:953 + msgid "Can't open any requested files." +-msgstr "Kann keine der angeforderten Dateien öffnen" ++msgstr "Kann keine der angeforderten Dateien ?ffnen" + + #: src/lsz.c:1009 + #, c-format + msgid "security violation: not allowed to upload from %s" +-msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten" ++msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten" + + #: src/lrz.c:1384 src/lsz.c:1027 + #, c-format + msgid "cannot open %s" +-msgstr "kann %s nicht öffnen" ++msgstr "kann %s nicht ?ffnen" + + #: src/lsz.c:1082 + #, c-format +@@ -213,12 +213,12 @@ + #: src/lsz.c:1119 + #, c-format + msgid "skipped: %s" +-msgstr "übersprungen: %s" ++msgstr "?bersprungen: %s" + + #: src/lsz.c:1122 + #, c-format + msgid "%s/%s: skipped" +-msgstr "%s/%s: übersprungen" ++msgstr "%s/%s: ?bersprungen" + + #: src/lsz.c:1149 + #, c-format +@@ -228,7 +228,7 @@ + #: src/lsz.c:1178 + #, c-format + msgid "Sending %s, %ld blocks: " +-msgstr "Sende %s, %ld Blöcke:" ++msgstr "Sende %s, %ld Bl?cke:" + + #: src/lsz.c:1181 + msgid "Give your local XMODEM receive command now." +@@ -245,11 +245,11 @@ + + #: src/lsz.c:1314 + msgid "Receiver Cancelled" +-msgstr "Empfänger brach ab" ++msgstr "Empf?nger brach ab" + + #: src/lsz.c:1340 + msgid "No ACK on EOT" +-msgstr "Keine Bestätigung für Übertragungsende erhalten" ++msgstr "Keine Best?tigung f?r ?bertragungsende erhalten" + + #: src/lsz.c:1361 + #, c-format +@@ -267,11 +267,11 @@ + + #: src/lsz.c:1399 + msgid "Timeout on sector ACK" +-msgstr "Timeout bei Sektorbestätigung" ++msgstr "Timeout bei Sektorbest?tigung" + + #: src/lsz.c:1404 + msgid "NAK on sector" +-msgstr "Sektor nicht bestätigt" ++msgstr "Sektor nicht best?tigt" + + #: src/lsz.c:1410 + msgid "Got burst for sector ACK" +@@ -280,11 +280,11 @@ + #: src/lsz.c:1412 + #, c-format + msgid "Got %02x for sector ACK" +-msgstr "Erhielt %02x als Sektorbestätigung" ++msgstr "Erhielt %02x als Sektorbest?tigung" + + #: src/lsz.c:1424 + msgid "Retry Count Exceeded" +-msgstr "Maximale Wiederholungsanzahl überschritten" ++msgstr "Maximale Wiederholungsanzahl ?berschritten" + + #: src/lrz.c:596 src/lsz.c:1502 + #, c-format +@@ -308,7 +308,7 @@ + + #: src/lsz.c:1513 + msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n" +-msgstr "Dateien mit ZMODEM/YMODEM/XMODEM übertragen\n" ++msgstr "Dateien mit ZMODEM/YMODEM/XMODEM ?bertragen\n" + + # src/lrz.c:475 src/lsz.c:1330 xx + #: src/lrz.c:607 src/lsz.c:1515 +@@ -317,9 +317,9 @@ + " (Y) = option applies to YMODEM only\n" + " (Z) = option applies to ZMODEM only\n" + msgstr "" +-" (X) = Option gilt nur für XMODEM\n" +-" (Y) = Option gilt nur für YMODEM\n" +-" (Z) = Option gilt nur für ZMODEM\n" ++" (X) = Option gilt nur f?r XMODEM\n" ++" (Y) = Option gilt nur f?r YMODEM\n" ++" (Z) = Option gilt nur f?r ZMODEM\n" + + #: src/lsz.c:1521 + msgid "" +@@ -347,32 +347,32 @@ + " -m, --min-bps N stop transmission if BPS below N\n" + " -M, --min-bps-time N for at least N seconds (default: 120)\n" + msgstr "" +-" -+, --append an existierende Dateien anhängen (Z)\n" ++" -+, --append an existierende Dateien anh?ngen (Z)\n" + " -2, --twostop zwei Stopbits verwenden\n" +-" -4, --try-4k bis zu 4K Blockgröße verwenden\n" +-" --start-4k mit 4K Blockgröße starten (versucht nicht 8)\n" +-" -8, --try-8k bis zu 8K Blockgröße verwenden\n" +-" --start-8k mit 8K Blockgröße starten\n" ++" -4, --try-4k bis zu 4K Blockgr??e verwenden\n" ++" --start-4k mit 4K Blockgr??e starten (versucht nicht 8)\n" ++" -8, --try-8k bis zu 8K Blockgr??e verwenden\n" ++" --start-8k mit 8K Blockgr??e starten\n" + " -a, --ascii ASCII: NL nach CR/LF wandeln\n" +-" -b, --binary Binärübertragung erzwingen\n" ++" -b, --binary Bin?r?bertragung erzwingen\n" + " -B, --bufsize N N Bytes puffern (auto: ganze Datei puffern)\n" +-" -c, --command COMMAND Kommando KOMMANDO auf Gegenseite ausführen " ++" -c, --command COMMAND Kommando KOMMANDO auf Gegenseite ausf?hren " + "(Z)\n" +-" -C, --command-tries N N mal Kommandoausführung versuchen (Z)\n" ++" -C, --command-tries N N mal Kommandoausf?hrung versuchen (Z)\n" + " -d, --dot-to-slash C '.' in Dateinamen nach '/' wandeln (Y/Z)\n" + " --delay-startup N Bei Programmstart N Sek. schlafen (Debugging)\n" + " -e, --escape alle Steuerzeichen escapen (Z)\n" +-" -E, --rename Empfänger soll Datei umbenennen falls\n" ++" -E, --rename Empf?nger soll Datei umbenennen falls\n" + " Zieldatei schon existiert\n" + " -f, --full-path Dateien mit vollen Pfaden senden (Y/Z)\n" +-" -i, --immediate-command CMD wie `c', aber sofort zurückkehren (Z)\n" ++" -i, --immediate-command CMD wie `c', aber sofort zur?ckkehren (Z)\n" + " -h, --help diesen Hilfetext ausgeben\n" + " -k, --1k 1024 Bytes Pakete senden (Y)\n" +-" -L, --packetlen N Unterpaketlänge auf N Bytes beschränken (Z)\n" +-" -l, --framelen N Rahmenlänge auf N Bytes beschränken (l>=L) " ++" -L, --packetlen N Unterpaketl?nge auf N Bytes beschr?nken (Z)\n" ++" -l, --framelen N Rahmenl?nge auf N Bytes beschr?nken (l>=L) " + "(Z)\n" +-" -m, --min-bps N Übertragung abbrechen bei weniger als N BPS\n" +-" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" ++" -m, --min-bps N ?bertragung abbrechen bei weniger als N BPS\n" ++" -M, --min-bps-time N f?r mindestens N Sekunden (Default: 120)\n" + + #: src/lsz.c:1546 + msgid "" +@@ -400,28 +400,28 @@ + "short options use the same arguments as the long ones\n" + msgstr "" + " -n, --newer Datei senden wenn sie neuer ist (Z)\n" +-" -N, --newer-or-longer Datei senden wenn neuer oder länger (Z)\n" ++" -N, --newer-or-longer Datei senden wenn neuer oder l?nger (Z)\n" + " -o, --16-bit-crc 16Bit CRC statt 32Bit CRC verwenden (Z)\n" + " -O, --disable-timeouts Timeoutbehandlung abschalten\n" +-" -p, --protect existierende Dateien nicht verändern\n" +-" -r, --resume unterbrochene Übertragungen fortsetzen (Z)\n" +-" -R, --restricted eingeschränkter, sichererer Modus\n" ++" -p, --protect existierende Dateien nicht ver?ndern\n" ++" -r, --resume unterbrochene ?bertragungen fortsetzen (Z)\n" ++" -R, --restricted eingeschr?nkter, sichererer Modus\n" + " -q, --quiet leise, keine Ausgaben machen\n" +-" -s, --stop-at {HH:MM|+N} Übertragung um HH:MM oder in N Sek. abbrechen\n" +-" --tcp-server Socket öffnen und auf Verbindung warten\n" +-" --tcp-client ADDR:PORT Socket öffnen und verbindung mit ...\n" +-" -u, --unlink Datei nach Übertragung löschen\n" +-" -U, --unrestrict eingeschränkten Modus aufheben (falls " ++" -s, --stop-at {HH:MM|+N} ?bertragung um HH:MM oder in N Sek. abbrechen\n" ++" --tcp-server Socket ?ffnen und auf Verbindung warten\n" ++" --tcp-client ADDR:PORT Socket ?ffnen und verbindung mit ...\n" ++" -u, --unlink Datei nach ?bertragung l?schen\n" ++" -U, --unrestrict eingeschr?nkten Modus aufheben (falls " + "erlaubt)\n" + " -v, --verbose mehr ausgeben\n" +-" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" ++" -w, --windowsize N Fenstergr??e auf N Bytes setzen (Z)\n" + " -X --xmodem XMODEM-Protokoll benutzen\n" +-" -y, --overwrite existierende Dateien überschreiben\n" +-" -Y, --overwrite-or-skip wie `y', aber nicht existierende überspringen\n" ++" -y, --overwrite existierende Dateien ?berschreiben\n" ++" -Y, --overwrite-or-skip wie `y', aber nicht existierende ?berspringen\n" + " --ymodem YMODEM-Protokoll benutzen\n" + " -Z, --zmodem ZMODEM-Protokoll benutzen\n" + "\n" +-"Kurze Optionen benötigen dieselben Argumente wie Lange.\n" ++"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n" + + #: src/lsz.c:1768 + msgid "got ZRQINIT" +@@ -434,7 +434,7 @@ + #: src/lsz.c:1991 + #, c-format + msgid "blklen now %d\n" +-msgstr "Blockgröße nun %d\n" ++msgstr "Blockgr??e nun %d\n" + + #: src/lsz.c:2053 + #, c-format +@@ -453,7 +453,7 @@ + #: src/lsz.c:2223 + #, c-format + msgid "calc_blklen: reduced to %d due to error\n" +-msgstr "calc_blklen: Blockgrösse auf %d reduziert wegen Fehler\n" ++msgstr "calc_blklen: Blockgr?sse auf %d reduziert wegen Fehler\n" + + #: src/lsz.c:2256 + #, c-format +@@ -473,7 +473,7 @@ + #: src/lsz.c:2278 + #, c-format + msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n" +-msgstr "calc_blklen: Blocklänge %d, ok %ld, fehlgeschlagen %ld -> %lu\n" ++msgstr "calc_blklen: Blockl?nge %d, ok %ld, fehlgeschlagen %ld -> %lu\n" + + #: src/lsz.c:2290 + #, c-format +@@ -512,7 +512,7 @@ + + #: src/zm.c:712 + msgid "Garbage count exceeded" +-msgstr "Maximale Wiederholungsanzahl überschritten" ++msgstr "Maximale Wiederholungsanzahl ?berschritten" + + #: src/zm.c:773 + #, c-format +@@ -526,11 +526,11 @@ + + #: src/lrz.c:382 + msgid "don't have settimeofday, will not set time\n" +-msgstr "Zeitsynchronisation nicht ausführbar, settimeofday() fehlt\n" ++msgstr "Zeitsynchronisation nicht ausf?hrbar, settimeofday() fehlt\n" + + #: src/lrz.c:386 + msgid "not running as root (this is good!), can not set time\n" +-msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausführbar\n" ++msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausf?hrbar\n" + + #: src/lrz.c:441 + msgid "bytes_per_error" +@@ -542,16 +542,16 @@ + + #: src/lrz.c:455 + msgid "O_SYNC not supported by the kernel" +-msgstr "O_SYNC vom Kernel nicht unterstützt" ++msgstr "O_SYNC vom Kernel nicht unterst?tzt" + + #: src/lrz.c:497 src/lrz.c:499 + msgid "garbage on commandline" +-msgstr "Müll auf der Kommandozeile" ++msgstr "M?ll auf der Kommandozeile" + + #: src/lrz.c:604 + #, c-format + msgid "Usage: %s [options] [filename.if.xmodem]\n" +-msgstr "Benutzung: %s [Optionen] [Dateiname.für.xmodem]\n" ++msgstr "Benutzung: %s [Optionen] [Dateiname.f?r.xmodem]\n" + + #: src/lrz.c:605 + msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n" +@@ -596,44 +596,44 @@ + "\n" + "short options use the same arguments as the long ones\n" + msgstr "" +-" -+, --append an existierende Dateien anhängen\n" +-" -a, --ascii ASCII-Übertragung (CR/LF nach LF wandeln)\n" +-" -b, --binary Binärübertragung (keine Umwandlungen)\n" ++" -+, --append an existierende Dateien anh?ngen\n" ++" -a, --ascii ASCII-?bertragung (CR/LF nach LF wandeln)\n" ++" -b, --binary Bin?r?bertragung (keine Umwandlungen)\n" + " -B, --bufsize N N Bytes puffern (auto: ganze Datei puffern)\n" +-" -c, --with-crc 16bit CRC statt Prüfsumme verwenden (X)\n" +-" -C, --allow-remote-commands Ausführung von Kommandos erlauben (Z)\n" ++" -c, --with-crc 16bit CRC statt Pr?fsumme verwenden (X)\n" ++" -C, --allow-remote-commands Ausf?hrung von Kommandos erlauben (Z)\n" + " -D, --null empfangene Daten nach /dev/null schreiben\n" + " --delay-startup N Bei Programmstart N Sek. schlafen (Debugging)\n" + " -e, --escape Alle Steuerzeichen escapen (Z)\n" +-" -E, --rename Empfänger soll Datei umbenennen falls\n" ++" -E, --rename Empf?nger soll Datei umbenennen falls\n" + " Zieldatei schon existiert\n" + " --errors N Einen CRC-Fehler alle N Bytes erzeugen\n" + " -h, --help Diesen Hilfstext ausgeben\n" +-" -m, --min-bps N Übertragung abbrechen bei weniger als N BPS\n" +-" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" ++" -m, --min-bps N ?bertragung abbrechen bei weniger als N BPS\n" ++" -M, --min-bps-time N f?r mindestens N Sekunden (Default: 120)\n" + " -O, --disable-timeouts Timeoutbehandlung abschalten\n" + " --o-sync Ausgabedatei(en) im synchron schreiben\n" +-" -p, --protect existierende Dateien nicht verändern\n" ++" -p, --protect existierende Dateien nicht ver?ndern\n" + " -q, --quiet leise, keine Ausgaben machen\n" +-" -r, --resume unterbrochene Übertragungen fortsetzen (Z)\n" +-" -R, --restricted eingeschränkter, sichererer Modus\n" +-" -s, --stop-at {HH:MM|+N} Übertragung um HH:MM oder in N Sek. abbrechen\n" ++" -r, --resume unterbrochene ?bertragungen fortsetzen (Z)\n" ++" -R, --restricted eingeschr?nkter, sichererer Modus\n" ++" -s, --stop-at {HH:MM|+N} ?bertragung um HH:MM oder in N Sek. abbrechen\n" + " -S, --timesync Zeit anfordern (doppelt: lokale Zeit setzen)\n" +-" --syslog[=off] syslog an- oder ausschalten, wenn möglich\n" ++" --syslog[=off] syslog an- oder ausschalten, wenn m?glich\n" + " -t, --timeout N Timeout auf N Zehntelsekungen setzen\n" +-" --tcp-server Socket öffnen und auf Verbindung warten\n" +-" --tcp-client ADDR:PORT Socket öffnen und verbindung mit ...\n" ++" --tcp-server Socket ?ffnen und auf Verbindung warten\n" ++" --tcp-client ADDR:PORT Socket ?ffnen und verbindung mit ...\n" + " -u, --keep-uppercase GROSS geschrieben Dateinamen beibehalten\n" +-" -U, --unrestrict eingeschränkten Modus aufheben (falls " ++" -U, --unrestrict eingeschr?nkten Modus aufheben (falls " + "erlaubt)\n" + " -v, --verbose mehr ausgeben\n" +-" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" ++" -w, --windowsize N Fenstergr??e auf N Bytes setzen (Z)\n" + " -X --xmodem XMODEM-Protokoll benutzen\n" +-" -y, --overwrite existierende Dateien überschreiben\n" ++" -y, --overwrite existierende Dateien ?berschreiben\n" + " --ymodem YMODEM-Protokoll benutzen\n" + " -Z, --zmodem ZMODEM-Protokoll benutzen\n" + "\n" +-"Kurze Optionen benötigen dieselben Argumente wie Lange.\n" ++"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n" + + #: src/lrz.c:676 + #, c-format +@@ -662,11 +662,11 @@ + "%s: %s removed.\r\n" + msgstr "" + "\r\n" +-"%s: %s gelöscht\r\n" ++"%s: %s gel?scht\r\n" + + #: src/lrz.c:856 + msgid "Pathname fetch returned EOT" +-msgstr "Ende der Übertragung beim Warten auf Dateinamen" ++msgstr "Ende der ?bertragung beim Warten auf Dateinamen" + + #: src/lrz.c:903 + msgid "Received dup Sector" +@@ -682,7 +682,7 @@ + + #: src/lrz.c:976 + msgid "Checksum" +-msgstr "Prüfsummenfehler" ++msgstr "Pr?fsummenfehler" + + #: src/lrz.c:979 + msgid "Sector number garbled" +@@ -695,12 +695,12 @@ + #: src/lrz.c:1005 + #, c-format + msgid "Got 0%o sector header" +-msgstr "Erhielt %02x als Sektorbestätigung" ++msgstr "Erhielt %02x als Sektorbest?tigung" + + #: src/lrz.c:1113 + #, c-format + msgid "file name ends with a /, skipped: %s\n" +-msgstr "Dateiname endet mit /, übersprungen: %s\n" ++msgstr "Dateiname endet mit /, ?bersprungen: %s\n" + + #: src/lrz.c:1127 + #, c-format +@@ -715,7 +715,7 @@ + #: src/lrz.c:1192 src/lrz.c:1226 + #, c-format + msgid "file exists, skipped: %s\n" +-msgstr "Datei existiert, übersprungen: %s\n" ++msgstr "Datei existiert, ?bersprungen: %s\n" + + #: src/lrz.c:1267 + #, c-format +@@ -739,7 +739,7 @@ + #: src/lrz.c:1545 + #, c-format + msgid "Blocks received: %d" +-msgstr "Blöcke empfangen: %d" ++msgstr "Bl?cke empfangen: %d" + + #: src/lrz.c:1599 + #, c-format +@@ -749,15 +749,15 @@ + #: src/lrz.c:1612 src/lrz.c:1620 + #, c-format + msgid "%s:\tSecurity Violation" +-msgstr "%s:\tSicherheitsverstoß" ++msgstr "%s:\tSicherheitsversto?" + + #: src/lrz.c:1730 + msgid "remote command execution requested" +-msgstr "Gegenseite versucht Kommandoausführung" ++msgstr "Gegenseite versucht Kommandoausf?hrung" + + #: src/lrz.c:1737 + msgid "not executed" +-msgstr "nicht ausgeführt" ++msgstr "nicht ausgef?hrt" + + #: src/lrz.c:1768 + msgid "got ZRINIT" +@@ -765,7 +765,7 @@ + + #: src/lrz.c:1817 + msgid "Skipped" +-msgstr "Übersprungen" ++msgstr "?bersprungen" + + #. too bad + #: src/lrz.c:2049 +@@ -785,7 +785,7 @@ + + #: src/lrz.c:2215 + msgid "file close error" +-msgstr "Fehler beim Schließen der Datei" ++msgstr "Fehler beim Schlie?en der Datei" + + #~ msgid "tcp protocol init failed\n" + #~ msgstr "TCP Protokoll Initialisierung fehlgeschlagen\n" +@@ -797,7 +797,7 @@ + #~ msgstr "fgets() bei tcp Protokoll Synchronisation fehlgeschlagen: " + + #~ msgid "Transfer complete." +-#~ msgstr "Übertragung abgeschlossen" ++#~ msgstr "?bertragung abgeschlossen" + + #~ msgid "at" + #~ msgstr "um" +@@ -809,4 +809,4 @@ + #~ msgstr "Zeitsynchronisation: ok\n" + + #~ msgid "Falldown to %ld blklen" +-#~ msgstr "Blockgröße auf %ld gesenkt" ++#~ msgstr "Blockgr??e auf %ld gesenkt" +--- lrzsz-0.12.21.orig/debian/copyright ++++ lrzsz-0.12.21/debian/copyright +@@ -0,0 +1,31 @@ ++This is the lrzsz Debian GNU/Linux package. It was first maintained by ++Michael Alan Dorman <mdorman@debian.org>, with help of Martin Mitchell ++and current upstream maintainer, Uwe Ohse <uwe@ohse.de>. ++ ++Current maintainer is Josip Rodin <jrodin@jagor.srce.hr> ++ ++Original source was downloaded from: ftp://tirka.ohse.de/uwe/ ++ ++Copyright (C) until 1988 Chuck Forsberg (Omen Technology INC) ++Copyright (C) 1994 Matt Porter, Michael D. Black ++Copyright (C) 1996, 1997 Uwe Ohse ++ ++Please note that credit should be given to Chuck Forsberg (rzsz) and ++Stephen Satchell/Satchell Evaluations (crc routines) for this package. ++ ++ This program is free software; you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; version 2 dated June, 1991. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, ++ MA 02110-1301, USA. ++ ++On Debian systems, the complete text of the GNU General Public License ++can be found in /usr/share/common-licenses/GPL file. +--- lrzsz-0.12.21.orig/debian/control ++++ lrzsz-0.12.21/debian/control +@@ -0,0 +1,18 @@ ++Source: lrzsz ++Section: comm ++Priority: optional ++Maintainer: Martin A. Godisch <godisch@debian.org> ++Standards-Version: 3.8.3 ++Build-Depends: autotools-dev, gettext ++ ++Package: lrzsz ++Architecture: any ++Depends: ${shlibs:Depends} ++Suggests: minicom ++Description: Tools for zmodem/xmodem/ymodem file transfer ++ Lrzsz is a cosmetically modified zmodem/ymodem/xmodem package built ++ from the public-domain version of Chuck Forsberg's rzsz package. ++ . ++ These programs use error correcting protocols ({z,x,y}modem) to send ++ (sz, sx, sb) and receive (rz, rx, rb) files over a dial-in serial port ++ from a variety of programs running under various operating systems. +--- lrzsz-0.12.21.orig/debian/changelog ++++ lrzsz-0.12.21/debian/changelog +@@ -0,0 +1,104 @@ ++lrzsz (0.12.21-5) unstable; urgency=low ++ ++ * New maintainer upload, closes: #556238. ++ Thanks to Josip Rodin for his work. ++ * Removed build-dependency on debhelper. ++ * Added build-dependency on autotools-dev. ++ * Cut Debian diff.gz into pieces. ++ * Updated FSF address in copyright file. ++ * Updated German po file, added build-dependency on gettext. ++ Closes: #313992, thanks to Jens Seidel and Tobias Toedter. ++ * Fixed missing includes (compiler warnings). ++ * Fixed typo in sz manpage. ++ * Fixed linking to libnsl. ++ * Removed changelog emacs settings. ++ * Updated standards version. ++ ++ -- Martin A. Godisch <godisch@debian.org> Sun, 22 Nov 2009 09:35:13 +0100 ++ ++lrzsz (0.12.21-4.1) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Rebuilt with current debhelper, finishing the /usr/doc transition. ++ Closes: #322762 ++ * Rebuilt with a current toolchain, now it's prelinkable. ++ Closes: #288084 ++ * Appled man page typo fix patch from A Costa. Closes: #311459 ++ ++ -- Joey Hess <joeyh@debian.org> Tue, 10 Jan 2006 01:35:00 -0500 ++ ++lrzsz (0.12.21-4) unstable; urgency=low ++ ++ * Updated for Standards-Version: 3.5.2. ++ * Added touch stamp-h.in before make invocation in order to stop ++ autoheader from running. ++ ++ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 25 Mar 2001 19:48:18 +0200 ++ ++lrzsz (0.12.21-3) unstable; urgency=low ++ ++ * Newish upstream version, (990823 in CVS). ++ * Updated for Policy 3.x. ++ * Misc. fixes for debian/*. ++ ++ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 19 Sep 1999 17:55:38 +0200 ++ ++lrzsz (0.12.21-2) unstable; urgency=low ++ ++ * Removed definition of strstr, advised by upstream maintainer, to ++ get it to compile on glibc2.1, as John Goerzen and Bart Warmerdam ++ noticed (fixes: #39429 #39812). ++ ++ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 20 Jun 1999 21:38:07 +0200 ++ ++lrzsz (0.12.21-1) unstable; urgency=low ++ ++ * New upstream version (990604 in CVS). ++ * Cleaned up the diff by removing unneeded .deps/ files and not changing ++ aclocal et al. ++ ++ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 6 Jun 1999 21:01:50 +0200 ++ ++lrzsz (0.12.20-2) unstable; urgency=low ++ ++ * Don't install ansi2knr.1 manpage, closing bug #33121 ++ ++ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 7 Feb 1999 01:32:31 +0100 ++ ++lrzsz (0.12.20-1) unstable; urgency=low ++ ++ * New maintainer. ++ * Althought version number doesn't indicate that, this version is ++ today's CVS snapshot from ftp://tirka.ohse.de/uwe/cvs-trees ++ * This release fixes following bugs: #8373 #11208 #16170 #16744 #17210. ++ * Package is lintian clean. ++ ++ -- Josip Rodin <jrodin@jagor.srce.hr> Sun, 7 Feb 1999 01:32:31 +0100 ++ ++lrzsz (0.12.17) unstable; urgency=low ++ ++ * sorry, see ../ChangeLog. automagically generated debian/changelog ++ ++ -- Uwe Ohse <uwe@ohse.de> Mon, 02 Jun 1997 10:06:05 +0200 ++ ++lrzsz (0.12.16) unstable; urgency=low ++ ++ * sorry, see ../ChangeLog. changelog is here just to make ++ dpkg happy. ++ * initial release ++ ++ -- Uwe Ohse <uwe@ohse.de> Sun, 2 Jun 1997 21:00:00 +0200 ++ ++lrzsz (0.12b-1.1) unstable; urgency=low ++ ++ * Non-maintainer release. ++ * Libc6 compile. ++ ++ -- Martin Mitchell <martin@debian.org> Sat, 18 Oct 1997 01:58:54 +1000 ++ ++lrzsz (0.12b-1) unstable; urgency=low ++ ++ * Converted to new source packaging format. ++ * New upstream version. ++ ++ -- Michael Alan Dorman <mdorman@calder.med.miami.edu> Tue, 17 Sep 1996 13:39:23 -0400 +--- lrzsz-0.12.21.orig/debian/rules ++++ lrzsz-0.12.21/debian/rules +@@ -0,0 +1,80 @@ ++#!/usr/bin/make -f ++ ++testdir = test -f src/lrz.c && test -f debian/rules ++testroot = test x`whoami` = xroot ++ ++# FOR AUTOCONF 2.13 ONLY ++ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) ++ confflags += $(DEB_HOST_GNU_TYPE) ++else ++ $(error Cannot cross-compile this package out-of-the-box) ++endif ++ ++CFLAGS = -Wall -g ++ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" "" ++ CFLAGS += -O0 ++else ++ CFLAGS += -O2 ++endif ++export CFLAGS ++ ++build: build-stamp ++build-stamp: ++ $(testdir) ++ cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub . ++ -cat debian/patches/*.diff | patch -Ntp1 -r debian/rejected --no-backup-if-mismatch ++ ./configure $(CONFFLAGS) --prefix=/usr --mandir='$${prefix}/share/man' --program-transform-name=s/l// ++ touch stamp-h.in # to stop autoheader from running ++ touch -d yesterday aclocal.m4 # to stop automake from running ++ $(MAKE) ++ touch $@ ++ ++clean: ++ $(testdir) ++ $(testroot) ++ cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub . ++ touch stamp-h.in # to stop autoheader from running ++ touch -d yesterday aclocal.m4 # to stop automake from running ++ [ ! -f Makefile ] || $(MAKE) distclean ++ -cat `ls -r debian/patches/*.diff` /dev/null | patch -RNtp1 -r debian/rejected --no-backup-if-mismatch ++ rm -rf debian/tmp ++ rm -f build-stamp config.guess config.sub po/lrzsz.pot po/*.gmo debian/files debian/rejected debian/substvars ++ ++binary: binary-arch ++ ++binary-indep: ++ ++binary-arch: build ++ $(testdir) ++ $(testroot) ++ rm -rf debian/tmp ++ ++ $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install ++ ++ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" "" ++ strip -R .comment -R .note debian/tmp/usr/bin/* ++endif ++ ++ install -d -m 0755 debian/tmp/usr/share/doc/lrzsz ++ install -p -m 0644 NEWS README README.cvs README.isdn4linux TODO debian/copyright debian/tmp/usr/share/doc/lrzsz ++ install -p -m 0644 -D ChangeLog debian/tmp/usr/share/doc/lrzsz/changelog ++ install -p -m 0644 -D debian/changelog debian/tmp/usr/share/doc/lrzsz/changelog.Debian ++ ++ find debian/tmp/usr/share/man -type f -print0 | xargs -0 gzip -9 ++ find debian/tmp/usr/share/doc -type f ! -name copyright ! -name '*.html' \ ++ \( -name 'changelog*' -o -size +8 \) -print0 | xargs -0 gzip -9 ++ ++ ln -s rz.1.gz debian/tmp/usr/share/man/man1/rb.1.gz ++ ln -s rz.1.gz debian/tmp/usr/share/man/man1/rx.1.gz ++ ln -s sz.1.gz debian/tmp/usr/share/man/man1/sb.1.gz ++ ln -s sz.1.gz debian/tmp/usr/share/man/man1/sx.1.gz ++ ++ install -d -m 0755 debian/tmp/DEBIAN ++ install -p -m 0644 debian/control debian/tmp/DEBIAN ++ cd debian/tmp && find usr -type f -print0 | xargs -0 md5sum > DEBIAN/md5sums ++ ++ dpkg-shlibdeps debian/tmp/usr/bin/* ++ dpkg-gencontrol -isp -plrzsz ++ dpkg --build debian/tmp .. ++ ++.PHONY: build clean binary binary-indep binary-arch +--- lrzsz-0.12.21.orig/debian/patches/206648_dszlog.diff.unchecked ++++ lrzsz-0.12.21/debian/patches/206648_dszlog.diff.unchecked +@@ -0,0 +1,311 @@ ++diff -ur lrzsz-0.12.21/src/lrz.c newlrzsz/src/lrz.c ++--- lrzsz-0.12.21/src/lrz.c 2003-08-21 16:22:01.000000000 -0500 +++++ newlrzsz/src/lrz.c 2003-08-21 17:05:53.000000000 -0500 ++@@ -68,6 +68,7 @@ ++ unsigned Baudrate = 2400; ++ ++ FILE *fout; +++char *dszlogpath; ++ ++ ++ int Lastrx; ++@@ -192,6 +193,9 @@ ++ zmputs(Attn); ++ canit(STDOUT_FILENO); ++ io_mode(0,0); +++ if (dszlogpath) { +++ dszlog(dszlogpath, 'L', 0, 0, 0, errors, 0, 0); +++ } ++ error(128+n,0,_("caught signal %d; exiting"), n); ++ } ++ ++@@ -265,6 +269,13 @@ ++ if ((cp=getenv("ZMODEM_RESTRICTED"))!=NULL) ++ Restricted=2; ++ +++ dszlogpath = getenv("DSZLOG"); +++ if (access(dszlogpath, F_OK) == 0) { +++ if (unlink(dszlogpath) != 0) { +++ perror("unlink dszlog"); +++ } +++ } +++ ++ /* make temporary and unfinished files */ ++ umask(0077); ++ ++@@ -559,6 +570,7 @@ ++ signal(SIGINT, bibi); ++ signal(SIGTERM, bibi); ++ signal(SIGPIPE, bibi); +++ signal(SIGHUP, bibi); ++ if (wcreceive(npats, patts)==ERROR) { ++ exitcode=0200; ++ canit(STDOUT_FILENO); ++@@ -685,9 +697,9 @@ ++ #endif ++ if (c) ++ goto fubar; ++- } else { +++ } else { /* Not Xmodem, not Zmodem, so Ymodem */ ++ for (;;) { ++- if (Verbose > 1 +++ if (Verbose > 1 || dszlogpath ++ #ifdef ENABLE_SYSLOG ++ || enable_syslog ++ #endif ++@@ -712,7 +724,7 @@ ++ if (wcrx(&zi)==ERROR) ++ goto fubar; ++ ++- if (Verbose > 1 +++ if (Verbose > 1 || dszlogpath ++ #ifdef ENABLE_SYSLOG ++ || enable_syslog ++ #endif ++@@ -734,16 +746,19 @@ ++ lsyslog(LOG_INFO,"%s/%s: %ld Bytes, %ld BPS", ++ shortname,protname(),zi.bytes_received, bps); ++ #endif +++ if (dszlogpath) dszlog(dszlogpath, 'R', +++ zi.bytes_received, zi.fname, +++ bps, errors, 0, 0); ++ } ++ } ++ } ++- } else { +++ } else { /* Xmodem */ ++ char dummy[128]; ++ dummy[0]='\0'; /* pre-ANSI HPUX cc demands this */ ++ dummy[1]='\0'; /* procheader uses name + 1 + strlen(name) */ ++ zi.bytes_total = DEFBYTL; ++ ++- if (Verbose > 1 +++ if (Verbose > 1 || dszlogpath ++ #ifdef ENABLE_SYSLOG ++ || enable_syslog ++ #endif ++@@ -782,7 +797,7 @@ ++ if (wcrx(&zi)==ERROR) { ++ goto fubar; ++ } ++- if (Verbose > 1 +++ if (Verbose > 1 || dszlogpath ++ #ifdef ENABLE_SYSLOG ++ || enable_syslog ++ #endif ++@@ -803,6 +818,10 @@ ++ lsyslog(LOG_INFO,"%s/%s: %ld Bytes, %ld BPS", ++ shortname,protname(),zi.bytes_received, bps); ++ #endif +++ if (dszlogpath) dszlog(dszlogpath, 'R', +++ zi.bytes_received, zi.fname, +++ bps, errors, 0, 0); +++ ++ } ++ } ++ return OK; ++@@ -812,6 +831,13 @@ ++ lsyslog(LOG_ERR,"%s/%s: got error", ++ shortname ? shortname : "no.name", protname()); ++ #endif +++ if (dszlogpath) { +++ double d = timing(0,NULL); +++ dszlog(dszlogpath, 'E', zi.bytes_received, zi.fname, +++ (zi.bytes_received-zi.bytes_skipped)/((d) ? d : 0.5), +++ errors, 0, 0); +++ } +++ ++ canit(STDOUT_FILENO); ++ if (Topipe && fout) { ++ pclose(fout); return ERROR; ++@@ -1783,10 +1809,18 @@ ++ rzfiles(struct zm_fileinfo *zi) ++ { ++ register int c; +++ long bps; ++ ++ for (;;) { ++ timing(1,NULL); ++ c = rzfile(zi); +++ { +++ double d; +++ d=timing(0,NULL); +++ if (d==0) +++ d=0.5; /* can happen if timing uses time() */ +++ bps=(zi->bytes_received-zi->bytes_skipped)/d; +++ } ++ switch (c) { ++ case ZEOF: ++ if (Verbose > 1 ++@@ -1794,12 +1828,6 @@ ++ || enable_syslog ++ #endif ++ ) { ++- double d; ++- long bps; ++- d=timing(0,NULL); ++- if (d==0) ++- d=0.5; /* can happen if timing uses time() */ ++- bps=(zi->bytes_received-zi->bytes_skipped)/d; ++ if (Verbose > 1) { ++ vstringf( ++ _("\rBytes received: %7ld/%7ld BPS:%-6ld \r\n"), ++@@ -1807,6 +1835,8 @@ ++ } ++ DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: %ld Bytes, %ld BPS",shortname, ++ protname(), (long) zi->bytes_total,bps)); +++ if (dszlogpath) dszlog(dszlogpath, 'z', zi->bytes_received, +++ zi->fname, bps, errors, 0, 0); ++ } ++ /* FALL THROUGH */ ++ case ZSKIP: ++@@ -1815,6 +1845,8 @@ ++ if (Verbose) ++ vstringf(_("Skipped")); ++ DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: skipped",shortname,protname())); +++ if (dszlogpath) dszlog(dszlogpath, 'E', zi->bytes_received, +++ zi->fname, bps, errors, 0, 0); ++ } ++ switch (tryz()) { ++ case ZCOMPL: ++@@ -1829,6 +1861,8 @@ ++ return c; ++ case ERROR: ++ DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: error",shortname,protname())); +++ if (dszlogpath) dszlog(dszlogpath, 'E', zi->bytes_received, +++ zi->fname, bps, errors, 0, 0); ++ return ERROR; ++ } ++ } ++diff -ur lrzsz-0.12.21/src/lsyslog.c newlrzsz/src/lsyslog.c ++--- lrzsz-0.12.21/src/lsyslog.c 1998-12-29 11:27:55.000000000 -0600 +++++ newlrzsz/src/lsyslog.c 2003-08-21 16:47:53.000000000 -0500 ++@@ -26,6 +26,8 @@ ++ #include <string.h> ++ #endif ++ +++#include <stdio.h> +++ ++ #if __STDC__ ++ # include <stdarg.h> ++ # define VA_START(args, lastarg) va_start(args, lastarg) ++@@ -79,3 +81,23 @@ ++ #endif ++ } ++ +++void dszlog(char *logname, char status, unsigned long num_bytes, char *fname, +++ int cps, int retry_events, int flow_events, int blocksize) { +++ +++ FILE *mylog; +++ if ((mylog = fopen(logname, "a"))) { +++ fprintf(mylog, "%c %6ld %5ld bps %4ld cps %3d errors %5u %4d %s %ld\r\n", +++ status, +++ num_bytes, +++ cps*8, /* XXX where to get DTE from? */ +++ cps, +++ retry_events, +++ flow_events, /* XXX where is flow_control? */ +++ blocksize, +++ fname, +++ -1 /* serial number */ +++ ); +++ fclose(mylog); +++ } +++} +++ ++diff -ur lrzsz-0.12.21/src/lsz.c newlrzsz/src/lsz.c ++--- lrzsz-0.12.21/src/lsz.c 2003-08-21 16:22:01.000000000 -0500 +++++ newlrzsz/src/lsz.c 2003-08-21 17:02:18.000000000 -0500 ++@@ -59,6 +59,8 @@ ++ extern int errno; ++ #endif ++ +++char *dszlogpath; +++ ++ unsigned Baudrate=2400; /* Default, should be set by first mode() call */ ++ unsigned Txwindow; /* Control the size of the transmitted window */ ++ unsigned Txwspac; /* Spacing between zcrcq requests */ ++@@ -223,6 +225,9 @@ ++ canit(STDOUT_FILENO); ++ fflush (stdout); ++ io_mode (io_mode_fd,0); +++ if (dszlogpath) { +++ dszlog(dszlogpath, 'L', 0, 0, 0, errors, 0, 0); +++ } ++ if (n == 99) ++ error (0, 0, _ ("io_mode(,2) in rbsb.c not implemented\n")); ++ else ++@@ -332,6 +337,14 @@ ++ } ++ if ((cp=getenv("ZMODEM_RESTRICTED"))!=NULL) ++ Restricted=1; +++ +++ dszlogpath = getenv("DSZLOG"); +++ if (access(dszlogpath, F_OK) == 0) { +++ if (unlink(dszlogpath) != 0) { +++ perror("unlink dszlog"); +++ } +++ } +++ ++ from_cu(); ++ chkinvok(argv[0]); ++ ++@@ -1113,6 +1126,12 @@ ++ if (enable_syslog) ++ lsyslog(LOG_INFO, _("%s/%s: error occured"),protname(),shortname); ++ #endif +++ if (dszlogpath) { +++ double d = timing(0,NULL); +++ dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname, +++ zi.bytes_sent/((d) ? d : 0.5), +++ errors, 0, blklen); +++ } ++ return ERROR; ++ case ZSKIP: ++ error(0,0, _("skipped: %s"),name); ++@@ -1120,6 +1139,13 @@ ++ if (enable_syslog) ++ lsyslog(LOG_INFO, _("%s/%s: skipped"),protname(),shortname); ++ #endif +++ if (dszlogpath) { +++ double d = timing(0,NULL); +++ /* XXX is Zmodem skip really deserving a 'E' ? */ +++ dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname, +++ zi.bytes_sent/((d) ? d : 0.5), +++ errors, 0, blklen); +++ } ++ return OK; ++ } ++ if (!zmodem_requested && wctx(&zi)==ERROR) ++@@ -1128,12 +1154,18 @@ ++ if (enable_syslog) ++ lsyslog(LOG_INFO, _("%s/%s: error occured"),protname(),shortname); ++ #endif +++ if (dszlogpath) { +++ double d = timing(0,NULL); +++ dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname, +++ zi.bytes_sent/((d) ? d : 0.5), +++ errors, 0, blklen); +++ } ++ return ERROR; ++ } ++ if (Unlinkafter) ++ unlink(oname); ++ ++- if (Verbose > 1 +++ if (Verbose > 1 || dszlogpath ++ #ifdef ENABLE_SYSLOG ++ || enable_syslog ++ #endif ++@@ -1152,6 +1184,11 @@ ++ lsyslog(LOG_INFO, "%s/%s: %ld Bytes, %ld BPS",shortname, ++ protname(), (long) zi.bytes_sent,bps); ++ #endif +++ if (dszlogpath) { +++ char whichprot = (protocol==ZM_ZMODEM)? 'Z' : 'S'; +++ dszlog(dszlogpath, whichprot, zi.bytes_sent, +++ zi.fname, bps, errors, 0, blklen); +++ } ++ } ++ return 0; ++ } +--- lrzsz-0.12.21.orig/debian/patches/include.diff ++++ lrzsz-0.12.21/debian/patches/include.diff +@@ -0,0 +1,20 @@ ++--- lrzsz-0.12.21.orig/lib/long-options.c +++++ lrzsz-0.12.21/lib/long-options.c ++@@ -22,6 +22,7 @@ ++ #endif ++ ++ #include <stdio.h> +++#include <stdlib.h> ++ #include <getopt.h> ++ #include "long-options.h" ++ ++--- lrzsz-0.12.21.orig/src/lsyslog.c +++++ lrzsz-0.12.21/src/lsyslog.c ++@@ -22,6 +22,7 @@ ++ #ifdef ENABLE_SYSLOG ++ #include "zglobal.h" ++ #include <pwd.h> +++#include <stdio.h> ++ #include <stdlib.h> ++ #include <string.h> ++ #endif +--- lrzsz-0.12.21.orig/debian/patches/mantypos.diff ++++ lrzsz-0.12.21/debian/patches/mantypos.diff +@@ -0,0 +1,49 @@ ++--- lrzsz-0.12.21.orig/man/lsz.1 +++++ lrzsz-0.12.21/man/lsz.1 ++@@ -247,7 +247,7 @@ ++ Escape all control characters; ++ normally XON, XOFF, DLE, CR-@-CR, and Ctrl-X are escaped. ++ .TP ++-.B"-E, --rename" +++.B "-E, --rename" ++ Force the sender to rename the new file if a file with the same ++ name already exists. ++ .TP ++@@ -265,7 +265,7 @@ ++ .TP ++ .B "-i COMMAND, --immediate-command COMMAND" ++ Send COMMAND to the receiver for execution, return immediately ++-upon the receiving program's successful recption of the command. +++upon the receiving program's successful reception of the command. ++ .TP ++ .B "-k, --1k" ++ (XMODEM/YMODEM) Send files using 1024 byte blocks ++@@ -509,7 +509,7 @@ ++ .RB ( \-a ) ++ to end of line conventions appropriate to the receiving environment. ++ With ZMODEM AutoDownload enabled, Professional-YAM and ZCOMM ++-will automatically recieve +++will automatically receive ++ the files after performing a security check. ++ ++ .br ++@@ -592,8 +592,8 @@ ++ the source file. ++ .SH "VMS VERSION" ++ The VMS version does not support wild cards. ++-Because of VMS DCL, upper case option letters muse be represented ++-by \\ proceding the letter. +++Because of VMS DCL, upper case option letters must be represented +++by \\ preceding the letter. ++ ++ The current VMS version does not support XMODEM, XMODEM-1k, or YMODEM. ++ ++@@ -682,7 +682,7 @@ ++ The test mode leaves a zero length file on the receiving system. ++ ++ A few high speed modems have a firmware bug that drops characters when the ++-direction of high speed transmissson is reversed. +++direction of high speed transmission is reversed. ++ The environment variable ZNULLS may be used to specify the number of nulls to ++ send before a ZDATA frame. ++ Values of 101 for a 4.77 mHz PC and 124 for an AT are typical. +--- lrzsz-0.12.21.orig/debian/patches/strstr.diff ++++ lrzsz-0.12.21/debian/patches/strstr.diff +@@ -0,0 +1,20 @@ ++--- lrzsz-0.12.21.orig/src/lrz.c +++++ lrzsz-0.12.21/src/lrz.c ++@@ -44,7 +44,6 @@ ++ #ifndef STRICT_PROTOTYPES ++ extern time_t time(); ++ extern char *strerror(); ++-extern char *strstr(); ++ #endif ++ ++ #ifndef HAVE_ERRNO_DECLARATION ++--- lrzsz-0.12.21.orig/src/lsz.c +++++ lrzsz-0.12.21/src/lsz.c ++@@ -53,7 +53,6 @@ ++ #ifndef STRICT_PROTOTYPES ++ extern time_t time(); ++ extern char *strerror(); ++-extern char *strstr(); ++ #endif ++ ++ #ifndef HAVE_ERRNO_DECLARATION +--- lrzsz-0.12.21.orig/debian/patches/build.diff ++++ lrzsz-0.12.21/debian/patches/build.diff +@@ -0,0 +1,2115 @@ ++--- lrzsz-0.12.21.orig/Makefile.in +++++ lrzsz-0.12.21/Makefile.in ++@@ -1,4 +1,4 @@ ++-# Makefile.in generated automatically by automake 1.4a from Makefile.am +++# Makefile.in generated automatically by automake 1.4 from Makefile.am ++ ++ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++ # This Makefile.in is free software; the Free Software Foundation ++@@ -46,10 +46,9 @@ ++ AUTOHEADER = @AUTOHEADER@ ++ ++ INSTALL = @INSTALL@ ++-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ++ INSTALL_DATA = @INSTALL_DATA@ ++ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++-INSTALL_STRIP_FLAG = ++ transform = @program_transform_name@ ++ ++ NORMAL_INSTALL = : ++@@ -106,13 +105,13 @@ ++ ++ DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ ++ INSTALL Makefile.am Makefile.in NEWS Specfile.in THANKS TODO acconfig.h \ ++-acinclude.m4 aclocal.m4 config.guess config.h.in configure configure.in \ ++-install-sh missing mkinstalldirs systype.in +++acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \ +++configure.in install-sh missing mkinstalldirs systype.in ++ ++ ++ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ++ ++-TAR = gtar +++TAR = tar ++ GZIP_ENV = --best ++ all: all-redirect ++ .SUFFIXES: ++@@ -298,7 +297,7 @@ ++ @for file in $(DISTFILES); do \ ++ d=$(srcdir); \ ++ if test -d $$d/$$file; then \ ++- cp -pr $$d/$$file $(distdir)/$$file; \ +++ cp -pr $$/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++@@ -340,7 +339,7 @@ ++ all-am: Makefile $(SCRIPTS) config.h ++ all-redirect: all-recursive-am ++ install-strip: ++- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install +++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ installdirs: installdirs-recursive ++ installdirs-am: ++ ++--- lrzsz-0.12.21.orig/aclocal.m4 +++++ lrzsz-0.12.21/aclocal.m4 ++@@ -1,4 +1,4 @@ ++-dnl aclocal.m4 generated automatically by aclocal 1.4a +++dnl aclocal.m4 generated automatically by aclocal 1.4 ++ ++ dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++ dnl This file is free software; the Free Software Foundation ++@@ -117,8 +117,6 @@ ++ ++ AC_DEFUN(AM_INIT_AUTOMAKE, ++ [AC_REQUIRE([AC_PROG_INSTALL]) ++-dnl We require 2.13 because we rely on SHELL being computed by configure. ++-AC_PREREQ([2.13]) ++ PACKAGE=[$1] ++ AC_SUBST(PACKAGE) ++ VERSION=[$2] ++--- lrzsz-0.12.21.orig/configure +++++ lrzsz-0.12.21/configure ++@@ -703,7 +703,6 @@ ++ fi ++ ++ ++- ++ PACKAGE=lrzsz ++ ++ VERSION=0.12.21rc ++@@ -723,7 +722,7 @@ ++ ++ missing_dir=`cd $ac_aux_dir && pwd` ++ echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 ++-echo "configure:727: checking for working aclocal" >&5 +++echo "configure:726: checking for working aclocal" >&5 ++ # Run test in a subshell; some versions of sh will print an error if ++ # an executable is not found, even if stderr is redirected. ++ # Redirect stdin to placate older versions of autoconf. Sigh. ++@@ -736,7 +735,7 @@ ++ fi ++ ++ echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 ++-echo "configure:740: checking for working autoconf" >&5 +++echo "configure:739: checking for working autoconf" >&5 ++ # Run test in a subshell; some versions of sh will print an error if ++ # an executable is not found, even if stderr is redirected. ++ # Redirect stdin to placate older versions of autoconf. Sigh. ++@@ -749,7 +748,7 @@ ++ fi ++ ++ echo $ac_n "checking for working automake""... $ac_c" 1>&6 ++-echo "configure:753: checking for working automake" >&5 +++echo "configure:752: checking for working automake" >&5 ++ # Run test in a subshell; some versions of sh will print an error if ++ # an executable is not found, even if stderr is redirected. ++ # Redirect stdin to placate older versions of autoconf. Sigh. ++@@ -762,7 +761,7 @@ ++ fi ++ ++ echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 ++-echo "configure:766: checking for working autoheader" >&5 +++echo "configure:765: checking for working autoheader" >&5 ++ # Run test in a subshell; some versions of sh will print an error if ++ # an executable is not found, even if stderr is redirected. ++ # Redirect stdin to placate older versions of autoconf. Sigh. ++@@ -775,7 +774,7 @@ ++ fi ++ ++ echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 ++-echo "configure:779: checking for working makeinfo" >&5 +++echo "configure:778: checking for working makeinfo" >&5 ++ # Run test in a subshell; some versions of sh will print an error if ++ # an executable is not found, even if stderr is redirected. ++ # Redirect stdin to placate older versions of autoconf. Sigh. ++@@ -926,7 +925,7 @@ ++ # Extract the first word of "gcc", so it can be a program name with args. ++ set dummy gcc; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:930: checking for $ac_word" >&5 +++echo "configure:929: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -956,7 +955,7 @@ ++ # Extract the first word of "cc", so it can be a program name with args. ++ set dummy cc; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:960: checking for $ac_word" >&5 +++echo "configure:959: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -1007,7 +1006,7 @@ ++ # Extract the first word of "cl", so it can be a program name with args. ++ set dummy cl; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:1011: checking for $ac_word" >&5 +++echo "configure:1010: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -1039,7 +1038,7 @@ ++ fi ++ ++ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ++-echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +++echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++ ++ ac_ext=c ++ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ++@@ -1050,12 +1049,12 @@ ++ ++ cat > conftest.$ac_ext << EOF ++ ++-#line 1054 "configure" +++#line 1053 "configure" ++ #include "confdefs.h" ++ ++ main(){return(0);} ++ EOF ++-if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ ac_cv_prog_cc_works=yes ++ # If we can't run a trivial program, we are probably using a cross compiler. ++ if (./conftest; exit) 2>/dev/null; then ++@@ -1081,12 +1080,12 @@ ++ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } ++ fi ++ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ++-echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +++echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 ++ cross_compiling=$ac_cv_prog_cc_cross ++ ++ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ++-echo "configure:1090: checking whether we are using GNU C" >&5 +++echo "configure:1089: checking whether we are using GNU C" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -1095,7 +1094,7 @@ ++ yes; ++ #endif ++ EOF ++-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++ ac_cv_prog_gcc=yes ++ else ++ ac_cv_prog_gcc=no ++@@ -1114,7 +1113,7 @@ ++ ac_save_CFLAGS="$CFLAGS" ++ CFLAGS= ++ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ++-echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 +++echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -1146,7 +1145,7 @@ ++ fi ++ ++ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ++-echo "configure:1150: checking how to run the C preprocessor" >&5 +++echo "configure:1149: checking how to run the C preprocessor" >&5 ++ # On Suns, sometimes $CPP names a directory. ++ if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++@@ -1161,13 +1160,13 @@ ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. ++ cat > conftest.$ac_ext <<EOF ++-#line 1165 "configure" +++#line 1164 "configure" ++ #include "confdefs.h" ++ #include <assert.h> ++ Syntax Error ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ : ++@@ -1178,13 +1177,13 @@ ++ rm -rf conftest* ++ CPP="${CC-cc} -E -traditional-cpp" ++ cat > conftest.$ac_ext <<EOF ++-#line 1182 "configure" +++#line 1181 "configure" ++ #include "confdefs.h" ++ #include <assert.h> ++ Syntax Error ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ : ++@@ -1195,13 +1194,13 @@ ++ rm -rf conftest* ++ CPP="${CC-cc} -nologo -E" ++ cat > conftest.$ac_ext <<EOF ++-#line 1199 "configure" +++#line 1198 "configure" ++ #include "confdefs.h" ++ #include <assert.h> ++ Syntax Error ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ : ++@@ -1235,13 +1234,13 @@ ++ fi ++ if test $ac_cv_prog_gcc = yes; then ++ echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ++-echo "configure:1239: checking whether ${CC-cc} needs -traditional" >&5 +++echo "configure:1238: checking whether ${CC-cc} needs -traditional" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ ac_pattern="Autoconf.*'x'" ++ cat > conftest.$ac_ext <<EOF ++-#line 1245 "configure" +++#line 1244 "configure" ++ #include "confdefs.h" ++ #include <sgtty.h> ++ Autoconf TIOCGETP ++@@ -1259,7 +1258,7 @@ ++ ++ if test $ac_cv_prog_gcc_traditional = no; then ++ cat > conftest.$ac_ext <<EOF ++-#line 1263 "configure" +++#line 1262 "configure" ++ #include "confdefs.h" ++ #include <termio.h> ++ Autoconf TCGETA ++@@ -1283,7 +1282,7 @@ ++ # Extract the first word of "ranlib", so it can be a program name with args. ++ set dummy ranlib; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:1287: checking for $ac_word" >&5 +++echo "configure:1286: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -1311,7 +1310,7 @@ ++ fi ++ ++ echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 ++-echo "configure:1315: checking for POSIXized ISC" >&5 +++echo "configure:1314: checking for POSIXized ISC" >&5 ++ if test -d /etc/conf/kconfig.d && ++ grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 ++ then ++@@ -1332,9 +1331,9 @@ ++ fi ++ ++ echo $ac_n "checking for AIX""... $ac_c" 1>&6 ++-echo "configure:1336: checking for AIX" >&5 +++echo "configure:1335: checking for AIX" >&5 ++ cat > conftest.$ac_ext <<EOF ++-#line 1338 "configure" +++#line 1337 "configure" ++ #include "confdefs.h" ++ #ifdef _AIX ++ yes ++@@ -1357,17 +1356,17 @@ ++ ++ ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 ++-echo "configure:1361: checking for minix/config.h" >&5 +++echo "configure:1360: checking for minix/config.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 1366 "configure" +++#line 1365 "configure" ++ #include "confdefs.h" ++ #include <minix/config.h> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -1408,7 +1407,7 @@ ++ ++ ++ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 ++-echo "configure:1412: checking for ${CC-cc} option to accept ANSI C" >&5 +++echo "configure:1411: checking for ${CC-cc} option to accept ANSI C" >&5 ++ if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -1424,7 +1423,7 @@ ++ do ++ CC="$ac_save_CC $ac_arg" ++ cat > conftest.$ac_ext <<EOF ++-#line 1428 "configure" +++#line 1427 "configure" ++ #include "confdefs.h" ++ #include <stdarg.h> ++ #include <stdio.h> ++@@ -1461,7 +1460,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ am_cv_prog_cc_stdc="$ac_arg"; break ++ else ++@@ -1487,7 +1486,7 @@ ++ ++ ++ echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 ++-echo "configure:1491: checking for function prototypes" >&5 +++echo "configure:1490: checking for function prototypes" >&5 ++ if test "$am_cv_prog_cc_stdc" != no; then ++ echo "$ac_t""yes" 1>&6 ++ cat >> confdefs.h <<\EOF ++@@ -1500,12 +1499,12 @@ ++ U=_ ANSI2KNR=./ansi2knr ++ # Ensure some checks needed by ansi2knr itself. ++ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ++-echo "configure:1504: checking for ANSI C header files" >&5 +++echo "configure:1503: checking for ANSI C header files" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 1509 "configure" +++#line 1508 "configure" ++ #include "confdefs.h" ++ #include <stdlib.h> ++ #include <stdarg.h> ++@@ -1513,7 +1512,7 @@ ++ #include <float.h> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -1530,7 +1529,7 @@ ++ if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat > conftest.$ac_ext <<EOF ++-#line 1534 "configure" +++#line 1533 "configure" ++ #include "confdefs.h" ++ #include <string.h> ++ EOF ++@@ -1548,7 +1547,7 @@ ++ if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat > conftest.$ac_ext <<EOF ++-#line 1552 "configure" +++#line 1551 "configure" ++ #include "confdefs.h" ++ #include <stdlib.h> ++ EOF ++@@ -1569,7 +1568,7 @@ ++ : ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 1573 "configure" +++#line 1572 "configure" ++ #include "confdefs.h" ++ #include <ctype.h> ++ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++@@ -1580,7 +1579,7 @@ ++ exit (0); } ++ ++ EOF ++-if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +++if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++@@ -1607,17 +1606,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:1611: checking for $ac_hdr" >&5 +++echo "configure:1610: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 1616 "configure" +++#line 1615 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:1620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -1646,12 +1645,12 @@ ++ fi ++ ++ echo $ac_n "checking for working const""... $ac_c" 1>&6 ++-echo "configure:1650: checking for working const" >&5 +++echo "configure:1649: checking for working const" >&5 ++ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 1655 "configure" +++#line 1654 "configure" ++ #include "confdefs.h" ++ ++ int main() { ++@@ -1700,7 +1699,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:1704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_c_const=yes ++ else ++@@ -1721,21 +1720,21 @@ ++ fi ++ ++ echo $ac_n "checking for inline""... $ac_c" 1>&6 ++-echo "configure:1725: checking for inline" >&5 +++echo "configure:1724: checking for inline" >&5 ++ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ ac_cv_c_inline=no ++ for ac_kw in inline __inline__ __inline; do ++ cat > conftest.$ac_ext <<EOF ++-#line 1732 "configure" +++#line 1731 "configure" ++ #include "confdefs.h" ++ ++ int main() { ++ } $ac_kw foo() { ++ ; return 0; } ++ EOF ++-if { (eval echo configure:1739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:1738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_c_inline=$ac_kw; break ++ else ++@@ -1786,7 +1785,7 @@ ++ esac ++ ++ echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6 ++-echo "configure:1790: checking for syslog in -lsocket" >&5 +++echo "configure:1789: checking for syslog in -lsocket" >&5 ++ ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++@@ -1794,7 +1793,7 @@ ++ ac_save_LIBS="$LIBS" ++ LIBS="-lsocket $LIBS" ++ cat > conftest.$ac_ext <<EOF ++-#line 1798 "configure" +++#line 1797 "configure" ++ #include "confdefs.h" ++ /* Override any gcc2 internal prototype to avoid an error. */ ++ /* We use char because int might match the return type of a gcc2 ++@@ -1805,7 +1804,7 @@ ++ syslog() ++ ; return 0; } ++ EOF ++-if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++@@ -1832,108 +1831,14 @@ ++ echo "$ac_t""no" 1>&6 ++ fi ++ ++-echo $ac_n "checking for syslog in -lbe""... $ac_c" 1>&6 ++-echo "configure:1837: checking for syslog in -lbe" >&5 ++-ac_lib_var=`echo be'_'syslog | sed 'y%./+-%__p_%'` ++-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 ++-else ++- ac_save_LIBS="$LIBS" ++-LIBS="-lbe $LIBS" ++-cat > conftest.$ac_ext <<EOF ++-#line 1845 "configure" ++-#include "confdefs.h" ++-/* Override any gcc2 internal prototype to avoid an error. */ ++-/* We use char because int might match the return type of a gcc2 ++- builtin and then its argument prototype would still apply. */ ++-char syslog(); ++- ++-int main() { ++-syslog() ++-; return 0; } ++-EOF ++-if { (eval echo configure:1856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++- rm -rf conftest* ++- eval "ac_cv_lib_$ac_lib_var=yes" ++-else ++- echo "configure: failed program was:" >&5 ++- cat conftest.$ac_ext >&5 ++- rm -rf conftest* ++- eval "ac_cv_lib_$ac_lib_var=no" ++-fi ++-rm -f conftest* ++-LIBS="$ac_save_LIBS" ++- ++-fi ++-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++- echo "$ac_t""yes" 1>&6 ++- ac_tr_lib=HAVE_LIB`echo be | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++- cat >> confdefs.h <<EOF ++-#define $ac_tr_lib 1 ++-EOF ++- ++- LIBS="-lbe $LIBS" ++- ++-else ++- echo "$ac_t""no" 1>&6 ++-fi ++- ++-echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 ++-echo "configure:1884: checking for gethostbyname in -lnsl" >&5 ++-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` ++-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++- echo $ac_n "(cached) $ac_c" 1>&6 ++-else ++- ac_save_LIBS="$LIBS" ++-LIBS="-lnsl $LIBS" ++-cat > conftest.$ac_ext <<EOF ++-#line 1892 "configure" ++-#include "confdefs.h" ++-/* Override any gcc2 internal prototype to avoid an error. */ ++-/* We use char because int might match the return type of a gcc2 ++- builtin and then its argument prototype would still apply. */ ++-char gethostbyname(); ++- ++-int main() { ++-gethostbyname() ++-; return 0; } ++-EOF ++-if { (eval echo configure:1903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++- rm -rf conftest* ++- eval "ac_cv_lib_$ac_lib_var=yes" ++-else ++- echo "configure: failed program was:" >&5 ++- cat conftest.$ac_ext >&5 ++- rm -rf conftest* ++- eval "ac_cv_lib_$ac_lib_var=no" ++-fi ++-rm -f conftest* ++-LIBS="$ac_save_LIBS" ++- ++-fi ++-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++- echo "$ac_t""yes" 1>&6 ++- ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++- cat >> confdefs.h <<EOF ++-#define $ac_tr_lib 1 ++-EOF ++- ++- LIBS="-lnsl $LIBS" ++- ++-else ++- echo "$ac_t""no" 1>&6 ++-fi ++- ++ ++ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ++-echo "configure:1932: checking for ANSI C header files" >&5 +++echo "configure:1931: checking for ANSI C header files" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 1937 "configure" +++#line 1936 "configure" ++ #include "confdefs.h" ++ #include <stdlib.h> ++ #include <stdarg.h> ++@@ -1941,7 +1846,7 @@ ++ #include <float.h> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -1958,7 +1863,7 @@ ++ if test $ac_cv_header_stdc = yes; then ++ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. ++ cat > conftest.$ac_ext <<EOF ++-#line 1962 "configure" +++#line 1961 "configure" ++ #include "confdefs.h" ++ #include <string.h> ++ EOF ++@@ -1976,7 +1881,7 @@ ++ if test $ac_cv_header_stdc = yes; then ++ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. ++ cat > conftest.$ac_ext <<EOF ++-#line 1980 "configure" +++#line 1979 "configure" ++ #include "confdefs.h" ++ #include <stdlib.h> ++ EOF ++@@ -1997,7 +1902,7 @@ ++ : ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2001 "configure" +++#line 2000 "configure" ++ #include "confdefs.h" ++ #include <ctype.h> ++ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') ++@@ -2008,7 +1913,7 @@ ++ exit (0); } ++ ++ EOF ++-if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +++if { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ : ++ else ++@@ -2035,17 +1940,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:2039: checking for $ac_hdr" >&5 +++echo "configure:2038: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2044 "configure" +++#line 2043 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:2049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:2048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -2076,17 +1981,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:2080: checking for $ac_hdr" >&5 +++echo "configure:2079: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2085 "configure" +++#line 2084 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:2089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -2116,17 +2021,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:2120: checking for $ac_hdr" >&5 +++echo "configure:2119: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2125 "configure" +++#line 2124 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:2129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -2156,17 +2061,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:2160: checking for $ac_hdr" >&5 +++echo "configure:2159: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2165 "configure" +++#line 2164 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -2196,17 +2101,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:2200: checking for $ac_hdr" >&5 +++echo "configure:2199: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2205 "configure" +++#line 2204 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:2210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:2209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -2234,12 +2139,12 @@ ++ ++ ++ echo $ac_n "checking for size_t""... $ac_c" 1>&6 ++-echo "configure:2238: checking for size_t" >&5 +++echo "configure:2237: checking for size_t" >&5 ++ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2243 "configure" +++#line 2242 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #if STDC_HEADERS ++@@ -2267,12 +2172,12 @@ ++ fi ++ ++ echo $ac_n "checking for mode_t""... $ac_c" 1>&6 ++-echo "configure:2271: checking for mode_t" >&5 +++echo "configure:2270: checking for mode_t" >&5 ++ if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2276 "configure" +++#line 2275 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #if STDC_HEADERS ++@@ -2300,12 +2205,12 @@ ++ fi ++ ++ echo $ac_n "checking for off_t""... $ac_c" 1>&6 ++-echo "configure:2304: checking for off_t" >&5 +++echo "configure:2303: checking for off_t" >&5 ++ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2309 "configure" +++#line 2308 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #if STDC_HEADERS ++@@ -2334,12 +2239,12 @@ ++ ++ ++ echo $ac_n "checking for speed_t""... $ac_c" 1>&6 ++-echo "configure:2338: checking for speed_t" >&5 +++echo "configure:2337: checking for speed_t" >&5 ++ if eval "test \"`echo '$''{'ac_cv_type_speed_t'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2343 "configure" +++#line 2342 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #if STDC_HEADERS ++@@ -2389,12 +2294,12 @@ ++ fi ++ ++ echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 ++-echo "configure:2393: checking for st_rdev in struct stat" >&5 +++echo "configure:2392: checking for st_rdev in struct stat" >&5 ++ if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2398 "configure" +++#line 2397 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #include <sys/stat.h> ++@@ -2402,7 +2307,7 @@ ++ struct stat s; s.st_rdev; ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:2405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_struct_st_rdev=yes ++ else ++@@ -2423,12 +2328,12 @@ ++ fi ++ ++ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 ++-echo "configure:2427: checking whether time.h and sys/time.h may both be included" >&5 +++echo "configure:2426: checking whether time.h and sys/time.h may both be included" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2432 "configure" +++#line 2431 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #include <sys/time.h> ++@@ -2437,7 +2342,7 @@ ++ struct tm *tp; ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:2440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_header_time=yes ++ else ++@@ -2459,12 +2364,12 @@ ++ ++ ++ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 ++-echo "configure:2463: checking for socklen_t" >&5 +++echo "configure:2462: checking for socklen_t" >&5 ++ if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2468 "configure" +++#line 2467 "configure" ++ #include "confdefs.h" ++ ++ #include "confdefs.h" ++@@ -2480,7 +2385,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_type_socklen_t=yes ++ else ++@@ -2505,12 +2410,12 @@ ++ fi ++ ++ echo $ac_n "checking whether sys/time.h and sys/select.h may both be included""... $ac_c" 1>&6 ++-echo "configure:2509: checking whether sys/time.h and sys/select.h may both be included" >&5 +++echo "configure:2508: checking whether sys/time.h and sys/select.h may both be included" >&5 ++ if eval "test \"`echo '$''{'lrzsz_cv_header_sys_select'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2514 "configure" +++#line 2513 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #include <sys/time.h> ++@@ -2519,7 +2424,7 @@ ++ struct tm *tp; ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ lrzsz_cv_header_sys_select=yes ++ else ++@@ -2540,12 +2445,12 @@ ++ fi ++ ++ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 ++-echo "configure:2544: checking whether struct tm is in sys/time.h or time.h" >&5 +++echo "configure:2543: checking whether struct tm is in sys/time.h or time.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2549 "configure" +++#line 2548 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #include <time.h> ++@@ -2553,7 +2458,7 @@ ++ struct tm *tp; tp->tm_sec; ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_struct_tm=time.h ++ else ++@@ -2575,19 +2480,19 @@ ++ ++ ++ echo $ac_n "checking for errno declaration""... $ac_c" 1>&6 ++-echo "configure:2579: checking for errno declaration" >&5 +++echo "configure:2578: checking for errno declaration" >&5 ++ if eval "test \"`echo '$''{'lrzsz_cv_decl_errno'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2584 "configure" +++#line 2583 "configure" ++ #include "confdefs.h" ++ #include <errno.h> ++ int main() { ++ int i = errno; errno = 1; ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ lrzsz_cv_decl_errno=yes ++ else ++@@ -2610,7 +2515,7 @@ ++ ++ if test $cross_compiling = no ; then ++ echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 ++-echo "configure:2614: checking whether setvbuf arguments are reversed" >&5 +++echo "configure:2613: checking whether setvbuf arguments are reversed" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -2618,7 +2523,7 @@ ++ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2622 "configure" +++#line 2621 "configure" ++ #include "confdefs.h" ++ #include <stdio.h> ++ /* If setvbuf has the reversed format, exit 0. */ ++@@ -2632,7 +2537,7 @@ ++ exit(0); /* Non-reversed systems segv here. */ ++ } ++ EOF ++-if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +++if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_func_setvbuf_reversed=yes ++ else ++@@ -2657,12 +2562,12 @@ ++ ++ fi ++ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 ++-echo "configure:2661: checking return type of signal handlers" >&5 +++echo "configure:2660: checking return type of signal handlers" >&5 ++ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2666 "configure" +++#line 2665 "configure" ++ #include "confdefs.h" ++ #include <sys/types.h> ++ #include <signal.h> ++@@ -2679,7 +2584,7 @@ ++ int i; ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +++if { (eval echo configure:2682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ac_cv_type_signal=void ++ else ++@@ -2701,17 +2606,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:2705: checking for $ac_hdr" >&5 +++echo "configure:2704: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2710 "configure" +++#line 2709 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:2714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -2740,12 +2645,12 @@ ++ for ac_func in getpagesize ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:2744: checking for $ac_func" >&5 +++echo "configure:2743: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2749 "configure" +++#line 2748 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -2768,7 +2673,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -2793,7 +2698,7 @@ ++ done ++ ++ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 ++-echo "configure:2797: checking for working mmap" >&5 +++echo "configure:2796: checking for working mmap" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -2801,7 +2706,7 @@ ++ ac_cv_func_mmap_fixed_mapped=no ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2805 "configure" +++#line 2804 "configure" ++ #include "confdefs.h" ++ ++ /* Thanks to Mike Haertel and Jim Avera for this test. ++@@ -2941,7 +2846,7 @@ ++ } ++ ++ EOF ++-if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +++if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_func_mmap_fixed_mapped=yes ++ else ++@@ -2966,19 +2871,19 @@ ++ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works ++ # for constant arguments. Useless! ++ echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 ++-echo "configure:2970: checking for working alloca.h" >&5 +++echo "configure:2969: checking for working alloca.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 2975 "configure" +++#line 2974 "configure" ++ #include "confdefs.h" ++ #include <alloca.h> ++ int main() { ++ char *p = alloca(2 * sizeof(int)); ++ ; return 0; } ++ EOF ++-if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_header_alloca_h=yes ++ else ++@@ -2999,12 +2904,12 @@ ++ fi ++ ++ echo $ac_n "checking for alloca""... $ac_c" 1>&6 ++-echo "configure:3003: checking for alloca" >&5 +++echo "configure:3002: checking for alloca" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3008 "configure" +++#line 3007 "configure" ++ #include "confdefs.h" ++ ++ #ifdef __GNUC__ ++@@ -3032,7 +2937,7 @@ ++ char *p = (char *) alloca(1); ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ ac_cv_func_alloca_works=yes ++ else ++@@ -3064,12 +2969,12 @@ ++ ++ ++ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 ++-echo "configure:3068: checking whether alloca needs Cray hooks" >&5 +++echo "configure:3067: checking whether alloca needs Cray hooks" >&5 ++ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3073 "configure" +++#line 3072 "configure" ++ #include "confdefs.h" ++ #if defined(CRAY) && ! defined(CRAY2) ++ webecray ++@@ -3094,12 +2999,12 @@ ++ if test $ac_cv_os_cray = yes; then ++ for ac_func in _getb67 GETB67 getb67; do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3098: checking for $ac_func" >&5 +++echo "configure:3097: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3103 "configure" +++#line 3102 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3122,7 +3027,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3149,7 +3054,7 @@ ++ fi ++ ++ echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 ++-echo "configure:3153: checking stack direction for C alloca" >&5 +++echo "configure:3152: checking stack direction for C alloca" >&5 ++ if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -3157,7 +3062,7 @@ ++ ac_cv_c_stack_direction=0 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3161 "configure" +++#line 3160 "configure" ++ #include "confdefs.h" ++ find_stack_direction () ++ { ++@@ -3176,7 +3081,7 @@ ++ exit (find_stack_direction() < 0); ++ } ++ EOF ++-if { (eval echo configure:3180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +++if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ ac_cv_c_stack_direction=1 ++ else ++@@ -3198,7 +3103,7 @@ ++ fi ++ ++ cat > conftest.$ac_ext <<EOF ++-#line 3202 "configure" +++#line 3201 "configure" ++ #include "confdefs.h" ++ #include <utime.h> ++ EOF ++@@ -3216,12 +3121,12 @@ ++ for ac_func in gettimeofday settimeofday ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3220: checking for $ac_func" >&5 +++echo "configure:3219: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3225 "configure" +++#line 3224 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3244,7 +3149,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3271,12 +3176,12 @@ ++ for ac_func in strchr memcpy select vprintf ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3275: checking for $ac_func" >&5 +++echo "configure:3274: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3280 "configure" +++#line 3279 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3299,7 +3204,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3326,12 +3231,12 @@ ++ for ac_func in times rdchk utime syslog siginterrupt ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3330: checking for $ac_func" >&5 +++echo "configure:3329: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3335 "configure" +++#line 3334 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3354,7 +3259,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3381,12 +3286,12 @@ ++ for ac_func in mkdir mktime strerror strstr strdup strtoul strtol strpbrk ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3385: checking for $ac_func" >&5 +++echo "configure:3384: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3390 "configure" +++#line 3389 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3409,7 +3314,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3438,12 +3343,12 @@ ++ for ac_func in stpcpy strftime vasprintf ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3442: checking for $ac_func" >&5 +++echo "configure:3441: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3447 "configure" +++#line 3446 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3466,7 +3371,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3494,12 +3399,12 @@ ++ ++ ++ echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 ++-echo "configure:3498: checking for getopt_long" >&5 +++echo "configure:3497: checking for getopt_long" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3503 "configure" +++#line 3502 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char getopt_long(); below. */ ++@@ -3522,7 +3427,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_getopt_long=yes" ++ else ++@@ -3552,12 +3457,12 @@ ++ ++ ++ echo $ac_n "checking for ftime""... $ac_c" 1>&6 ++-echo "configure:3556: checking for ftime" >&5 +++echo "configure:3555: checking for ftime" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_ftime'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3561 "configure" +++#line 3560 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char ftime(); below. */ ++@@ -3580,7 +3485,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_ftime=yes" ++ else ++@@ -3595,7 +3500,7 @@ ++ if eval "test \"`echo '$ac_cv_func_'ftime`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ echo $ac_n "checking that ftime works correctly""... $ac_c" 1>&6 ++-echo "configure:3599: checking that ftime works correctly" >&5 +++echo "configure:3598: checking that ftime works correctly" >&5 ++ if eval "test \"`echo '$''{'lrzsz_cv_sys_ftime_ok'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -3603,7 +3508,7 @@ ++ lrzsz_cv_sys_ftime_ok=runtime ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3607 "configure" +++#line 3606 "configure" ++ #include "confdefs.h" ++ ++ #include <sys/types.h> ++@@ -3632,7 +3537,7 @@ ++ } ++ ++ EOF ++-if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +++if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++ then ++ lrzsz_cv_sys_ftime_ok=yes ++ else ++@@ -3666,20 +3571,20 @@ ++ ++ ++ echo $ac_n "checking for timezone variable""... $ac_c" 1>&6 ++-echo "configure:3670: checking for timezone variable" >&5 +++echo "configure:3669: checking for timezone variable" >&5 ++ if eval "test \"`echo '$''{'libquark_cv_var_timezone'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ ++ cat > conftest.$ac_ext <<EOF ++-#line 3676 "configure" +++#line 3675 "configure" ++ #include "confdefs.h" ++ #include <time.h> ++ int main() { ++ return(int)(timezone/2); ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ libquark_cv_var_timezone=yes ++ else ++@@ -3705,13 +3610,13 @@ ++ : ++ else ++ echo $ac_n "checking for $lookup_facility""... $ac_c" 1>&6 ++-echo "configure:3709: checking for $lookup_facility" >&5 +++echo "configure:3708: checking for $lookup_facility" >&5 ++ if eval "test \"`echo '$''{'lrzsz_cv_lookup_facility'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ ++ cat > conftest.$ac_ext <<EOF ++-#line 3715 "configure" +++#line 3714 "configure" ++ #include "confdefs.h" ++ ++ #ifdef HAVE_SYSLOG_H ++@@ -3763,17 +3668,17 @@ ++ do ++ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++-echo "configure:3767: checking for $ac_hdr" >&5 +++echo "configure:3766: checking for $ac_hdr" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3772 "configure" +++#line 3771 "configure" ++ #include "confdefs.h" ++ #include <$ac_hdr> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:3777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:3776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -3803,12 +3708,12 @@ ++ strdup __argz_count __argz_stringify __argz_next ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3807: checking for $ac_func" >&5 +++echo "configure:3806: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3812 "configure" +++#line 3811 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3831,7 +3736,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3860,12 +3765,12 @@ ++ for ac_func in stpcpy ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:3864: checking for $ac_func" >&5 +++echo "configure:3863: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3869 "configure" +++#line 3868 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -3888,7 +3793,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -3922,19 +3827,19 @@ ++ ++ if test $ac_cv_header_locale_h = yes; then ++ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 ++-echo "configure:3926: checking for LC_MESSAGES" >&5 +++echo "configure:3925: checking for LC_MESSAGES" >&5 ++ if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 3931 "configure" +++#line 3930 "configure" ++ #include "confdefs.h" ++ #include <locale.h> ++ int main() { ++ return LC_MESSAGES ++ ; return 0; } ++ EOF ++-if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ am_cv_val_LC_MESSAGES=yes ++ else ++@@ -3955,7 +3860,7 @@ ++ fi ++ fi ++ echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 ++-echo "configure:3959: checking whether NLS is requested" >&5 +++echo "configure:3958: checking whether NLS is requested" >&5 ++ # Check whether --enable-nls or --disable-nls was given. ++ if test "${enable_nls+set}" = set; then ++ enableval="$enable_nls" ++@@ -3975,7 +3880,7 @@ ++ EOF ++ ++ echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 ++-echo "configure:3979: checking whether included gettext is requested" >&5 +++echo "configure:3978: checking whether included gettext is requested" >&5 ++ # Check whether --with-included-gettext or --without-included-gettext was given. ++ if test "${with_included_gettext+set}" = set; then ++ withval="$with_included_gettext" ++@@ -3994,17 +3899,17 @@ ++ ++ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 ++-echo "configure:3998: checking for libintl.h" >&5 +++echo "configure:3997: checking for libintl.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 4003 "configure" +++#line 4002 "configure" ++ #include "confdefs.h" ++ #include <libintl.h> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:4007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++@@ -4021,19 +3926,19 @@ ++ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 ++-echo "configure:4025: checking for gettext in libc" >&5 +++echo "configure:4024: checking for gettext in libc" >&5 ++ if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 4030 "configure" +++#line 4029 "configure" ++ #include "confdefs.h" ++ #include <libintl.h> ++ int main() { ++ return (int) gettext ("") ++ ; return 0; } ++ EOF ++-if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:4036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ gt_cv_func_gettext_libc=yes ++ else ++@@ -4049,7 +3954,7 @@ ++ ++ if test "$gt_cv_func_gettext_libc" != "yes"; then ++ echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 ++-echo "configure:4053: checking for bindtextdomain in -lintl" >&5 +++echo "configure:4052: checking for bindtextdomain in -lintl" >&5 ++ ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++@@ -4057,7 +3962,7 @@ ++ ac_save_LIBS="$LIBS" ++ LIBS="-lintl $LIBS" ++ cat > conftest.$ac_ext <<EOF ++-#line 4061 "configure" +++#line 4060 "configure" ++ #include "confdefs.h" ++ /* Override any gcc2 internal prototype to avoid an error. */ ++ /* We use char because int might match the return type of a gcc2 ++@@ -4068,7 +3973,7 @@ ++ bindtextdomain() ++ ; return 0; } ++ EOF ++-if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++@@ -4084,12 +3989,12 @@ ++ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then ++ echo "$ac_t""yes" 1>&6 ++ echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 ++-echo "configure:4088: checking for gettext in libintl" >&5 +++echo "configure:4087: checking for gettext in libintl" >&5 ++ if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 ++-echo "configure:4093: checking for gettext in -lintl" >&5 +++echo "configure:4092: checking for gettext in -lintl" >&5 ++ ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++@@ -4097,7 +4002,7 @@ ++ ac_save_LIBS="$LIBS" ++ LIBS="-lintl $LIBS" ++ cat > conftest.$ac_ext <<EOF ++-#line 4101 "configure" +++#line 4100 "configure" ++ #include "confdefs.h" ++ /* Override any gcc2 internal prototype to avoid an error. */ ++ /* We use char because int might match the return type of a gcc2 ++@@ -4108,7 +4013,7 @@ ++ gettext() ++ ; return 0; } ++ EOF ++-if { (eval echo configure:4112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++@@ -4147,7 +4052,7 @@ ++ # Extract the first word of "msgfmt", so it can be a program name with args. ++ set dummy msgfmt; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4151: checking for $ac_word" >&5 +++echo "configure:4150: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4181,12 +4086,12 @@ ++ for ac_func in dcgettext ++ do ++ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++-echo "configure:4185: checking for $ac_func" >&5 +++echo "configure:4184: checking for $ac_func" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 4190 "configure" +++#line 4189 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $ac_func(); below. */ ++@@ -4209,7 +4114,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:4213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:4212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_$ac_func=yes" ++ else ++@@ -4236,7 +4141,7 @@ ++ # Extract the first word of "gmsgfmt", so it can be a program name with args. ++ set dummy gmsgfmt; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4240: checking for $ac_word" >&5 +++echo "configure:4239: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4272,7 +4177,7 @@ ++ # Extract the first word of "xgettext", so it can be a program name with args. ++ set dummy xgettext; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4276: checking for $ac_word" >&5 +++echo "configure:4275: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4304,7 +4209,7 @@ ++ fi ++ ++ cat > conftest.$ac_ext <<EOF ++-#line 4308 "configure" +++#line 4307 "configure" ++ #include "confdefs.h" ++ ++ int main() { ++@@ -4312,7 +4217,7 @@ ++ return _nl_msg_cat_cntr ++ ; return 0; } ++ EOF ++-if { (eval echo configure:4316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ CATOBJEXT=.gmo ++ DATADIRNAME=share ++@@ -4335,7 +4240,7 @@ ++ ++ if test "$CATOBJEXT" = "NONE"; then ++ echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 ++-echo "configure:4339: checking whether catgets can be used" >&5 +++echo "configure:4338: checking whether catgets can be used" >&5 ++ # Check whether --with-catgets or --without-catgets was given. ++ if test "${with_catgets+set}" = set; then ++ withval="$with_catgets" ++@@ -4348,7 +4253,7 @@ ++ ++ if test "$nls_cv_use_catgets" = "yes"; then ++ echo $ac_n "checking for main in -li""... $ac_c" 1>&6 ++-echo "configure:4352: checking for main in -li" >&5 +++echo "configure:4351: checking for main in -li" >&5 ++ ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` ++ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++@@ -4356,14 +4261,14 @@ ++ ac_save_LIBS="$LIBS" ++ LIBS="-li $LIBS" ++ cat > conftest.$ac_ext <<EOF ++-#line 4360 "configure" +++#line 4359 "configure" ++ #include "confdefs.h" ++ ++ int main() { ++ main() ++ ; return 0; } ++ EOF ++-if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_lib_$ac_lib_var=yes" ++ else ++@@ -4391,12 +4296,12 @@ ++ fi ++ ++ echo $ac_n "checking for catgets""... $ac_c" 1>&6 ++-echo "configure:4395: checking for catgets" >&5 +++echo "configure:4394: checking for catgets" >&5 ++ if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 4400 "configure" +++#line 4399 "configure" ++ #include "confdefs.h" ++ /* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char catgets(); below. */ ++@@ -4419,7 +4324,7 @@ ++ ++ ; return 0; } ++ EOF ++-if { (eval echo configure:4423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +++if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ rm -rf conftest* ++ eval "ac_cv_func_catgets=yes" ++ else ++@@ -4441,7 +4346,7 @@ ++ # Extract the first word of "gencat", so it can be a program name with args. ++ set dummy gencat; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4445: checking for $ac_word" >&5 +++echo "configure:4444: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4477,7 +4382,7 @@ ++ # Extract the first word of "gmsgfmt", so it can be a program name with args. ++ set dummy gmsgfmt; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4481: checking for $ac_word" >&5 +++echo "configure:4480: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4514,7 +4419,7 @@ ++ # Extract the first word of "msgfmt", so it can be a program name with args. ++ set dummy msgfmt; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4518: checking for $ac_word" >&5 +++echo "configure:4517: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4549,7 +4454,7 @@ ++ # Extract the first word of "xgettext", so it can be a program name with args. ++ set dummy xgettext; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4553: checking for $ac_word" >&5 +++echo "configure:4552: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4607,7 +4512,7 @@ ++ # Extract the first word of "msgfmt", so it can be a program name with args. ++ set dummy msgfmt; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4611: checking for $ac_word" >&5 +++echo "configure:4610: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4641,7 +4546,7 @@ ++ # Extract the first word of "gmsgfmt", so it can be a program name with args. ++ set dummy gmsgfmt; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4645: checking for $ac_word" >&5 +++echo "configure:4644: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4677,7 +4582,7 @@ ++ # Extract the first word of "xgettext", so it can be a program name with args. ++ set dummy xgettext; ac_word=$2 ++ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++-echo "configure:4681: checking for $ac_word" >&5 +++echo "configure:4680: checking for $ac_word" >&5 ++ if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++@@ -4770,7 +4675,7 @@ ++ LINGUAS= ++ else ++ echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 ++-echo "configure:4774: checking for catalogs to be installed" >&5 +++echo "configure:4773: checking for catalogs to be installed" >&5 ++ NEW_LINGUAS= ++ for lang in ${LINGUAS=$ALL_LINGUAS}; do ++ case "$ALL_LINGUAS" in ++@@ -4798,17 +4703,17 @@ ++ if test "$CATOBJEXT" = ".cat"; then ++ ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` ++ echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 ++-echo "configure:4802: checking for linux/version.h" >&5 +++echo "configure:4801: checking for linux/version.h" >&5 ++ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++ else ++ cat > conftest.$ac_ext <<EOF ++-#line 4807 "configure" +++#line 4806 "configure" ++ #include "confdefs.h" ++ #include <linux/version.h> ++ EOF ++ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++-{ (eval echo configure:4812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +++{ (eval echo configure:4811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++ if test -z "$ac_err"; then ++ rm -rf conftest* ++--- lrzsz-0.12.21.orig/lib/Makefile.in +++++ lrzsz-0.12.21/lib/Makefile.in ++@@ -1,4 +1,4 @@ ++-# Makefile.in generated automatically by automake 1.4a from Makefile.am +++# Makefile.in generated automatically by automake 1.4 from Makefile.am ++ ++ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++ # This Makefile.in is free software; the Free Software Foundation ++@@ -46,10 +46,9 @@ ++ AUTOHEADER = @AUTOHEADER@ ++ ++ INSTALL = @INSTALL@ ++-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ++ INSTALL_DATA = @INSTALL_DATA@ ++ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++-INSTALL_STRIP_FLAG = ++ transform = @program_transform_name@ ++ ++ NORMAL_INSTALL = : ++@@ -127,7 +126,7 @@ ++ ++ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ++ ++-TAR = gtar +++TAR = tar ++ GZIP_ENV = --best ++ DEP_FILES = .deps/alloca.P .deps/error.P .deps/getopt.P .deps/getopt1.P \ ++ .deps/long-options.P .deps/mkdir.P .deps/mktime.P .deps/stpcpy.P \ ++@@ -282,7 +281,7 @@ ++ @for file in $(DISTFILES); do \ ++ d=$(srcdir); \ ++ if test -d $$d/$$file; then \ ++- cp -pr $$d/$$file $(distdir)/$$file; \ +++ cp -pr $$/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++@@ -343,7 +342,7 @@ ++ all-am: Makefile $(ANSI2KNR) $(LIBRARIES) $(HEADERS) ++ all-redirect: all-am ++ install-strip: ++- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install +++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ installdirs: ++ ++ ++--- lrzsz-0.12.21.orig/man/Makefile.in +++++ lrzsz-0.12.21/man/Makefile.in ++@@ -1,4 +1,4 @@ ++-# Makefile.in generated automatically by automake 1.4a from Makefile.am +++# Makefile.in generated automatically by automake 1.4 from Makefile.am ++ ++ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++ # This Makefile.in is free software; the Free Software Foundation ++@@ -46,10 +46,9 @@ ++ AUTOHEADER = @AUTOHEADER@ ++ ++ INSTALL = @INSTALL@ ++-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ++ INSTALL_DATA = @INSTALL_DATA@ ++ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++-INSTALL_STRIP_FLAG = ++ transform = @program_transform_name@ ++ ++ NORMAL_INSTALL = : ++@@ -106,7 +105,7 @@ ++ ++ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ++ ++-TAR = gtar +++TAR = tar ++ GZIP_ENV = --best ++ all: all-redirect ++ .SUFFIXES: ++@@ -173,7 +172,7 @@ ++ @for file in $(DISTFILES); do \ ++ d=$(srcdir); \ ++ if test -d $$d/$$file; then \ ++- cp -pr $$d/$$file $(distdir)/$$file; \ +++ cp -pr $$/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++@@ -202,7 +201,7 @@ ++ all-am: Makefile $(MANS) ++ all-redirect: all-am ++ install-strip: ++- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install +++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ installdirs: ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ++ ++--- lrzsz-0.12.21.orig/src/Makefile.in +++++ lrzsz-0.12.21/src/Makefile.in ++@@ -1,4 +1,4 @@ ++-# Makefile.in generated automatically by automake 1.4a from Makefile.am +++# Makefile.in generated automatically by automake 1.4 from Makefile.am ++ ++ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++ # This Makefile.in is free software; the Free Software Foundation ++@@ -45,10 +45,9 @@ ++ AUTOHEADER = @AUTOHEADER@ ++ ++ INSTALL = @INSTALL@ ++-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ++ INSTALL_DATA = @INSTALL_DATA@ ++ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++-INSTALL_STRIP_FLAG = ++ transform = @program_transform_name@ ++ ++ NORMAL_INSTALL = : ++@@ -132,7 +131,7 @@ ++ ++ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) ++ ++-TAR = gtar +++TAR = tar ++ GZIP_ENV = --best ++ DEP_FILES = .deps/canit.P .deps/crctab.P .deps/lrz.P .deps/lsyslog.P \ ++ .deps/lsz.P .deps/protname.P .deps/rbsb.P .deps/tcp.P .deps/timing.P \ ++@@ -167,8 +166,8 @@ ++ $(mkinstalldirs) $(DESTDIR)$(bindir) ++ @list='$(bin_PROGRAMS)'; for p in $$list; do \ ++ if test -f $$p; then \ ++- echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ++- $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ +++ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ +++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ ++ else :; fi; \ ++ done ++ ++@@ -292,7 +291,7 @@ ++ @for file in $(DISTFILES); do \ ++ d=$(srcdir); \ ++ if test -d $$d/$$file; then \ ++- cp -pr $$d/$$file $(distdir)/$$file; \ +++ cp -pr $$/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++@@ -353,7 +352,7 @@ ++ all-am: Makefile $(ANSI2KNR) $(PROGRAMS) $(HEADERS) ++ all-redirect: all-am ++ install-strip: ++- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install +++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ installdirs: ++ $(mkinstalldirs) $(DESTDIR)$(bindir) ++ ++--- lrzsz-0.12.21.orig/testsuite/Makefile.in +++++ lrzsz-0.12.21/testsuite/Makefile.in ++@@ -1,4 +1,4 @@ ++-# Makefile.in generated automatically by automake 1.4a from Makefile.am +++# Makefile.in generated automatically by automake 1.4 from Makefile.am ++ ++ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ++ # This Makefile.in is free software; the Free Software Foundation ++@@ -46,10 +46,9 @@ ++ AUTOHEADER = @AUTOHEADER@ ++ ++ INSTALL = @INSTALL@ ++-INSTALL_PROGRAM = @INSTALL_PROGRAM@ +++INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) ++ INSTALL_DATA = @INSTALL_DATA@ ++ INSTALL_SCRIPT = @INSTALL_SCRIPT@ ++-INSTALL_STRIP_FLAG = ++ transform = @program_transform_name@ ++ ++ NORMAL_INSTALL = : ++@@ -103,7 +102,7 @@ ++ DIST_COMMON = Makefile.am Makefile.in ++ ++ ++-TAR = gtar +++TAR = tar ++ GZIP_ENV = --best ++ EXPECT = expect ++ RUNTEST = runtest ++@@ -133,7 +132,7 @@ ++ @for file in $(DISTFILES); do \ ++ d=$(srcdir); \ ++ if test -d $$d/$$file; then \ ++- cp -pr $$d/$$file $(distdir)/$$file; \ +++ cp -pr $$/$$file $(distdir)/$$file; \ ++ else \ ++ test -f $(distdir)/$$file \ ++ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ ++@@ -192,7 +191,7 @@ ++ all-am: Makefile ++ all-redirect: all-am ++ install-strip: ++- $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install +++ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ++ installdirs: ++ ++ +--- lrzsz-0.12.21.orig/debian/patches/cat-id-tbl.diff ++++ lrzsz-0.12.21/debian/patches/cat-id-tbl.diff +@@ -0,0 +1,118 @@ ++--- lrzsz-0.12.21.orig/po/cat-id-tbl.c +++++ lrzsz-0.12.21/po/cat-id-tbl.c ++@@ -141,22 +141,23 @@ ++ {"\ ++ \n\ ++ countem: Total %d %ld\n", 84}, ++- {"Bad escape sequence %x", 85}, ++- {"Sender Canceled", 86}, ++- {"TIMEOUT", 87}, ++- {"Bad data subpacket", 88}, ++- {"Data subpacket too long", 89}, ++- {"Garbage count exceeded", 90}, ++- {"Got %s", 91}, ++- {"Retry %d: ", 92}, ++- {"don't have settimeofday, will not set time\n", 93}, ++- {"not running as root (this is good!), can not set time\n", 94}, ++- {"bytes_per_error", 95}, ++- {"bytes-per-error should be >100", 96}, ++- {"O_SYNC not supported by the kernel", 97}, ++- {"garbage on commandline", 98}, ++- {"Usage: %s [options] [filename.if.xmodem]\n", 99}, ++- {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 100}, +++ {"Bad CRC", 85}, +++ {"Bad escape sequence %x", 86}, +++ {"Sender Canceled", 87}, +++ {"TIMEOUT", 88}, +++ {"Bad data subpacket", 89}, +++ {"Data subpacket too long", 90}, +++ {"Garbage count exceeded", 91}, +++ {"Got %s", 92}, +++ {"Retry %d: ", 93}, +++ {"don't have settimeofday, will not set time\n", 94}, +++ {"not running as root (this is good!), can not set time\n", 95}, +++ {"bytes_per_error", 96}, +++ {"bytes-per-error should be >100", 97}, +++ {"O_SYNC not supported by the kernel", 98}, +++ {"garbage on commandline", 99}, +++ {"Usage: %s [options] [filename.if.xmodem]\n", 100}, +++ {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 101}, ++ {"\ ++ -+, --append append to existing files\n\ ++ -a, --ascii ASCII transfer (change CR/LF to LF)\n\ ++@@ -193,41 +194,41 @@ ++ --ymodem use YMODEM protocol\n\ ++ -Z, --zmodem use ZMODEM protocol\n\ ++ \n\ ++-short options use the same arguments as the long ones\n", 101}, ++- {"%s waiting to receive.", 102}, ++- {"\rBytes received: %7ld/%7ld BPS:%-6ld \r\n", 103}, ++- {"%s: ready to receive %s", 104}, ++- {"\rBytes received: %7ld BPS:%-6ld \r\n", 105}, +++short options use the same arguments as the long ones\n", 102}, +++ {"%s waiting to receive.", 103}, +++ {"\rBytes received: %7ld/%7ld BPS:%-6ld \r\n", 104}, +++ {"%s: ready to receive %s", 105}, +++ {"\rBytes received: %7ld BPS:%-6ld \r\n", 106}, ++ {"\ ++ \r\n\ ++-%s: %s removed.\r\n", 106}, ++- {"Pathname fetch returned EOT", 107}, ++- {"Received dup Sector", 108}, ++- {"Sync Error", 109}, ++- {"CRC", 110}, ++- {"Checksum", 111}, ++- {"Sector number garbled", 112}, ++- {"Sender Cancelled", 113}, ++- {"Got 0%o sector header", 114}, ++- {"file name ends with a /, skipped: %s\n", 115}, ++- {"zmanag=%d, Lzmanag=%d\n", 116}, ++- {"zconv=%d\n", 117}, ++- {"file exists, skipped: %s\n", 118}, ++- {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 119}, ++- {"TIMESYNC: cannot set time: %s\n", 120}, ++- {"Topipe", 121}, ++- {"Receiving: %s\n", 122}, ++- {"Blocks received: %d", 123}, ++- {"%s: %s exists\n", 124}, ++- {"%s:\tSecurity Violation", 125}, ++- {"remote command execution requested", 126}, ++- {"not executed", 127}, ++- {"got ZRINIT", 128}, ++- {"Skipped", 129}, ++- {"rzfile: bps rate %ld below min %ld", 130}, ++- {"rzfile: reached stop time", 131}, ++- {"\rBytes received: %7ld/%7ld BPS:%-6ld ETA %02d:%02d ", 132}, ++- {"file close error", 133}, +++%s: %s removed.\r\n", 107}, +++ {"Pathname fetch returned EOT", 108}, +++ {"Received dup Sector", 109}, +++ {"Sync Error", 110}, +++ {"CRC", 111}, +++ {"Checksum", 112}, +++ {"Sector number garbled", 113}, +++ {"Sender Cancelled", 114}, +++ {"Got 0%o sector header", 115}, +++ {"file name ends with a /, skipped: %s\n", 116}, +++ {"zmanag=%d, Lzmanag=%d\n", 117}, +++ {"zconv=%d\n", 118}, +++ {"file exists, skipped: %s\n", 119}, +++ {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 120}, +++ {"TIMESYNC: cannot set time: %s\n", 121}, +++ {"Topipe", 122}, +++ {"Receiving: %s\n", 123}, +++ {"Blocks received: %d", 124}, +++ {"%s: %s exists\n", 125}, +++ {"%s:\tSecurity Violation", 126}, +++ {"remote command execution requested", 127}, +++ {"not executed", 128}, +++ {"got ZRINIT", 129}, +++ {"Skipped", 130}, +++ {"rzfile: bps rate %ld below min %ld", 131}, +++ {"rzfile: reached stop time", 132}, +++ {"\rBytes received: %7ld/%7ld BPS:%-6ld ETA %02d:%02d ", 133}, +++ {"file close error", 134}, ++ }; ++ ++-int _msg_tbl_length = 133; +++int _msg_tbl_length = 134; +--- lrzsz-0.12.21.orig/debian/patches/206499_ymodemg.diff.unchecked ++++ lrzsz-0.12.21/debian/patches/206499_ymodemg.diff.unchecked +@@ -0,0 +1,70 @@ ++--- org/lrz.c 1998-12-29 23:49:24.000000000 -0800 +++++ lrz.c 2003-08-21 15:15:15.000000000 -0700 ++@@ -73,6 +73,7 @@ ++ ++ int Lastrx; ++ int Crcflg; +++int Optiong; ++ int Firstsec; ++ int errors; ++ int Restricted=1; /* restricted; no /.. or ../ in filenames */ ++@@ -211,6 +212,7 @@ ++ {"allow-remote-commands", no_argument, NULL, 'C'}, ++ {"escape", no_argument, NULL, 'e'}, ++ {"rename", no_argument, NULL, 'E'}, +++ {"go", no_argument, NULL, 'g'}, ++ {"help", no_argument, NULL, 'h'}, ++ {"crc-check", no_argument, NULL, 'H'}, ++ {"junk-path", no_argument, NULL, 'j'}, ++@@ -288,7 +290,7 @@ ++ parse_long_options (argc, argv, show_version, usage1); ++ ++ while ((c = getopt_long (argc, argv, ++- "a+bB:cCDeEhm:M:OprRqs:St:uUvw:XZy", +++ "a+bB:cCDeEghm:M:OprRqs:St:uUvw:XZy", ++ long_options, (int *) 0)) != EOF) ++ { ++ unsigned long int tmp; ++@@ -313,6 +315,7 @@ ++ case 'D': Nflag = TRUE; break; ++ case 'E': Lzmanag = ZF1_ZMCHNG; break; ++ case 'e': Zctlesc = 1; break; +++ case 'g': Optiong = 1; break; ++ case 'h': usage(0,NULL); break; ++ case 'H': Lzmanag= ZF1_ZMCRC; break; ++ case 'j': junk_path=TRUE; break; ++@@ -617,6 +620,7 @@ ++ " -e, --escape Escape control characters (Z)\n" ++ " -E, --rename rename any files already existing\n" ++ " --errors N generate CRC error every N bytes (debugging)\n" +++" -g, --go use X/YMODEM-g protocol (with CRC)\n" ++ " -h, --help Help, print this usage message\n" ++ " -m, --min-bps N stop transmission if BPS below N\n" ++ " -M, --min-bps-time N for at least N seconds (default: 120)\n" ++@@ -843,7 +847,7 @@ ++ et_tu: ++ Firstsec=TRUE; ++ zi->eof_seen=FALSE; ++- sendline(Crcflg?WANTCRC:NAK); +++ sendline(Optiong?WANTG:(Crcflg?WANTCRC:NAK)); ++ flushmo(); ++ purgeline(0); /* Do read next time ... */ ++ while ((c = wcgetsec(&Blklen, rpn, 100)) != 0) { ++@@ -875,7 +879,7 @@ ++ ++ Firstsec=TRUE;sectnum=0; ++ zi->eof_seen=FALSE; ++- sendchar=Crcflg?WANTCRC:NAK; +++ sendchar=(Optiong?WANTG:(Crcflg?WANTCRC:NAK)); ++ ++ for (;;) { ++ sendline(sendchar); /* send it now, we're ready! */ ++@@ -1007,7 +1011,7 @@ ++ ; ++ } ++ if (Firstsec) { ++- sendline(Crcflg?WANTCRC:NAK); +++ sendline(Optiong?WANTG:(Crcflg?WANTCRC:NAK)); ++ flushmo(); ++ purgeline(0); /* Do read next time ... */ ++ } else { +--- lrzsz-0.12.21.orig/debian/patches/313992_de_po.diff ++++ lrzsz-0.12.21/debian/patches/313992_de_po.diff +@@ -0,0 +1,650 @@ ++--- lrzsz-0.12.21.orig/po/de.po +++++ lrzsz-0.12.21/po/de.po ++@@ -1,17 +1,18 @@ ++-# german translation of lrzsz output ++-# Copyright (C) 1997 Uwe Ohse ++-# Uwe Ohse <uwe@ohse.de>, 1997. +++# German translation of lrzsz +++# Copyright (C) Uwe Ohse <uwe@ohse.de>, 1997. +++# Copyright (C) Tobias Toedter <t.toedter@gmx.net>, 2005, 2006. ++ # ++ msgid "" ++ msgstr "" ++-"Project-Id-Version: PACKAGE VERSION\n" +++"Project-Id-Version: lrzsz 0.12.21\n" ++ "POT-Creation-Date: 1999-08-22 21:00+0200\n" ++-"PO-Revision-Date: 1997-06-01 19:00+0200\n" ++-"Last-Translator: FULL NAME <uwe@ohse.de>\n" ++-"Language-Team: none. try <uwe@ohse.de>\n" +++"PO-Revision-Date: 2006-01-12 10:23+0100\n" +++"Last-Translator: Tobias Toedter <t.toedter@gmx.net>\n" +++"Language-Team: German <debian-l10n-german@lists.debian.org>\n" ++ "MIME-Version: 1.0\n" ++-"Content-Type: text/plain; charset=iso-8859-1\n" +++"Content-Type: text/plain; charset=UTF-8\n" ++ "Content-Transfer-Encoding: 8bit\n" +++"X-Generator: KBabel 1.10.2\n" ++ ++ #: src/lsz.c:228 ++ msgid "io_mode(,2) in rbsb.c not implemented\n" ++@@ -28,21 +29,21 @@ ++ ++ #: src/lsz.c:422 ++ msgid "packetlength" ++-msgstr "Paketl?nge" +++msgstr "Paketlänge" ++ ++ #: src/lsz.c:427 ++ #, c-format ++ msgid "packetlength out of range 24..%ld" ++-msgstr "Argument der Option L au?erhalb des Bereichs 24..%ld" +++msgstr "Argument der Option L außerhalb des Bereichs 24..%ld" ++ ++ #: src/lsz.c:436 ++ msgid "framelength" ++-msgstr "Framel?nge" +++msgstr "Framelänge" ++ ++ #: src/lsz.c:441 ++ #, c-format ++ msgid "framelength out of range 32..%ld" ++-msgstr "Argument der Option l au?erhalb des Bereichs 32..%ld" +++msgstr "Argument der Option l außerhalb des Bereichs 32..%ld" ++ ++ #: src/lrz.c:318 src/lsz.c:450 ++ msgid "min_bps" ++@@ -50,27 +51,27 @@ ++ ++ #: src/lsz.c:452 ++ msgid "min_bps must be >= 0" ++-msgstr "minimale BPS-Rate mu? >= 0 sein" +++msgstr "minimale BPS-Rate muss >= 0 sein" ++ ++ #: src/lrz.c:324 src/lsz.c:458 ++ msgid "min_bps_time" ++-msgstr "" +++msgstr "Zeitfenster für minimale BPS-Rate" ++ ++ #: src/lrz.c:326 src/lsz.c:460 ++ msgid "min_bps_time must be > 1" ++-msgstr "Zeitfenster f?r minimale BPS-Rate mu? > 1 Sekunde sein" +++msgstr "Zeitfenster für minimale BPS-Rate muss > 1 Sekunde sein" ++ ++ #: src/lrz.c:342 src/lsz.c:484 ++ msgid "hour to large (0..23)" ++-msgstr "Stunde zu gross (0..23)" +++msgstr "Stunde zu groß (0..23)" ++ ++ #: src/lrz.c:344 src/lsz.c:486 ++ msgid "unparsable stop time\n" ++-msgstr "unparsbare Endzeit\n" +++msgstr "Endzeit nicht auszuwerten\n" ++ ++ #: src/lrz.c:348 src/lsz.c:490 ++ msgid "minute to large (0..59)" ++-msgstr "Minute zu gro? (0..59)" +++msgstr "Minute zu groß (0..59)" ++ ++ #: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507 ++ msgid "stop time to small" ++@@ -78,7 +79,7 @@ ++ ++ #: src/lrz.c:363 src/lsz.c:505 ++ msgid "stop-at" ++-msgstr "" +++msgstr "Stopp um" ++ ++ #: src/lrz.c:394 src/lsz.c:516 ++ msgid "timeout" ++@@ -86,15 +87,15 @@ ++ ++ #: src/lrz.c:396 src/lsz.c:518 ++ msgid "timeout out of range 10..1000" ++-msgstr "Argument der Option t au?erhalb des Bereichs 10..1000" +++msgstr "Argument der Option t außerhalb des Bereichs 10..1000" ++ ++ #: src/lrz.c:412 src/lsz.c:526 ++ msgid "security violation: can't do that under restricted shell\n" ++-msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten\n" +++msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten\n" ++ ++ #: src/lrz.c:402 src/lsz.c:533 ++ msgid "window size" ++-msgstr "Fenstergr??e" +++msgstr "Fenstergröße" ++ ++ #: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563 ++ msgid "cannot turnoff syslog" ++@@ -102,7 +103,7 @@ ++ ++ #: src/lrz.c:449 src/lsz.c:571 ++ msgid "startup delay" ++-msgstr "Startverz?gerung" +++msgstr "Startverzögerung" ++ ++ #: src/lrz.c:465 src/lrz.c:483 src/lrz.c:760 src/lrz.c:1122 src/lrz.c:1244 ++ #: src/lrz.c:1292 src/lrz.c:1309 src/lrz.c:1324 src/lrz.c:1423 src/lsz.c:580 ++@@ -117,11 +118,11 @@ ++ ++ #: src/lsz.c:612 src/lsz.c:627 ++ msgid "need at least one file to send" ++-msgstr "es mu? mindestens ein Name einer zu sendenden Datei angegeben werden" +++msgstr "es muss mindestens ein Name einer zu sendenden Datei angegeben werden" ++ ++ #: src/lsz.c:629 ++ msgid "Can't send command in restricted mode\n" ++-msgstr "Im eingeschr?nkten Modus ist das Senden von Kommandos verboten\n" +++msgstr "Im eingeschränkten Modus ist das Senden von Kommandos verboten\n" ++ ++ #: src/lrz.c:527 src/lsz.c:656 ++ msgid "hostname too long\n" ++@@ -129,7 +130,7 @@ ++ ++ #: src/lrz.c:542 src/lsz.c:671 ++ msgid "illegal server address\n" ++-msgstr "Illegale Serveraddresse\n" +++msgstr "Illegale Serveradresse\n" ++ ++ #: src/lsz.c:710 ++ msgid "can read only one file from stdin" ++@@ -137,21 +138,21 @@ ++ ++ #: src/lrz.c:574 src/lsz.c:803 ++ msgid "Transfer incomplete\n" ++-msgstr "?bertragung nicht abgeschlossen\n" +++msgstr "Ãœbertragung nicht abgeschlossen\n" ++ ++ #: src/lrz.c:576 src/lsz.c:805 ++ msgid "Transfer complete\n" ++-msgstr "?bertragung abgeschlossen\n" +++msgstr "Ãœbertragung abgeschlossen\n" ++ ++ #: src/lsz.c:838 ++ #, c-format ++ msgid "send_pseudo %s: cannot open tmpfile %s: %s" ++-msgstr "send_pseudo %s: kann tempor?re Datei %s nicht ?ffnen: %s" +++msgstr "send_pseudo %s: kann temporäre Datei %s nicht öffnen: %s" ++ ++ #: src/lsz.c:851 ++ #, c-format ++ msgid "send_pseudo %s: cannot lstat tmpfile %s: %s" ++-msgstr "send_pseudo %s: kann lstat nicht auf tempor?re Datei %s anwenden: %s" +++msgstr "send_pseudo %s: kann lstat nicht auf temporäre Datei %s anwenden: %s" ++ ++ #: src/lsz.c:859 ++ #, c-format ++@@ -161,7 +162,7 @@ ++ #: src/lsz.c:870 ++ #, c-format ++ msgid "send_pseudo %s: cannot write to tmpfile %s: %s" ++-msgstr "send_pseudo %s: kann nicht in tempor?re Datei %s schreiben: %s" +++msgstr "send_pseudo %s: kann nicht in temporäre Datei %s schreiben: %s" ++ ++ #: src/lsz.c:879 ++ #, c-format ++@@ -188,17 +189,17 @@ ++ ++ #: src/lsz.c:953 ++ msgid "Can't open any requested files." ++-msgstr "Kann keine der angeforderten Dateien ?ffnen" +++msgstr "Kann keine der angeforderten Dateien öffnen" ++ ++ #: src/lsz.c:1009 ++ #, c-format ++ msgid "security violation: not allowed to upload from %s" ++-msgstr "Sicherheitsversto?: Ausf?hrung unter eingeschr?nkter Shell verboten" +++msgstr "Sicherheitsverstoß: Hochladen von %s nicht erlaubt" ++ ++ #: src/lrz.c:1384 src/lsz.c:1027 ++ #, c-format ++ msgid "cannot open %s" ++-msgstr "kann %s nicht ?ffnen" +++msgstr "kann %s nicht öffnen" ++ ++ #: src/lsz.c:1082 ++ #, c-format ++@@ -213,12 +214,12 @@ ++ #: src/lsz.c:1119 ++ #, c-format ++ msgid "skipped: %s" ++-msgstr "?bersprungen: %s" +++msgstr "übersprungen: %s" ++ ++ #: src/lsz.c:1122 ++ #, c-format ++ msgid "%s/%s: skipped" ++-msgstr "%s/%s: ?bersprungen" +++msgstr "%s/%s: übersprungen" ++ ++ #: src/lsz.c:1149 ++ #, c-format ++@@ -228,7 +229,7 @@ ++ #: src/lsz.c:1178 ++ #, c-format ++ msgid "Sending %s, %ld blocks: " ++-msgstr "Sende %s, %ld Bl?cke:" +++msgstr "Sende %s, %ld Blöcke:" ++ ++ #: src/lsz.c:1181 ++ msgid "Give your local XMODEM receive command now." ++@@ -245,11 +246,11 @@ ++ ++ #: src/lsz.c:1314 ++ msgid "Receiver Cancelled" ++-msgstr "Empf?nger brach ab" +++msgstr "Empfänger brach ab" ++ ++ #: src/lsz.c:1340 ++ msgid "No ACK on EOT" ++-msgstr "Keine Best?tigung f?r ?bertragungsende erhalten" +++msgstr "Keine Bestätigung für Ãœbertragungsende erhalten" ++ ++ #: src/lsz.c:1361 ++ #, c-format ++@@ -267,24 +268,24 @@ ++ ++ #: src/lsz.c:1399 ++ msgid "Timeout on sector ACK" ++-msgstr "Timeout bei Sektorbest?tigung" +++msgstr "Timeout bei Sektorbestätigung" ++ ++ #: src/lsz.c:1404 ++ msgid "NAK on sector" ++-msgstr "Sektor nicht best?tigt" +++msgstr "Sektor nicht bestätigt" ++ ++ #: src/lsz.c:1410 ++ msgid "Got burst for sector ACK" ++-msgstr "" +++msgstr "Erhielt Bruch als Sektorbestätigung" ++ ++ #: src/lsz.c:1412 ++ #, c-format ++ msgid "Got %02x for sector ACK" ++-msgstr "Erhielt %02x als Sektorbest?tigung" +++msgstr "Erhielt %02x als Sektorbestätigung" ++ ++ #: src/lsz.c:1424 ++ msgid "Retry Count Exceeded" ++-msgstr "Maximale Wiederholungsanzahl ?berschritten" +++msgstr "Maximale Wiederholungsanzahl überschritten" ++ ++ #: src/lrz.c:596 src/lsz.c:1502 ++ #, c-format ++@@ -304,11 +305,11 @@ ++ #: src/lsz.c:1512 ++ #, c-format ++ msgid " or: %s [options] -{c|i} COMMAND\n" ++-msgstr " oder: %s [Optionen] -{c|i} KOMMANDO\n" +++msgstr " oder: %s [-2Ceqv] -{c|i} KOMMANDO\n" ++ ++ #: src/lsz.c:1513 ++ msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n" ++-msgstr "Dateien mit ZMODEM/YMODEM/XMODEM ?bertragen\n" +++msgstr "Dateien mit ZMODEM/YMODEM/XMODEM übertragen\n" ++ ++ # src/lrz.c:475 src/lsz.c:1330 xx ++ #: src/lrz.c:607 src/lsz.c:1515 ++@@ -317,9 +318,9 @@ ++ " (Y) = option applies to YMODEM only\n" ++ " (Z) = option applies to ZMODEM only\n" ++ msgstr "" ++-" (X) = Option gilt nur f?r XMODEM\n" ++-" (Y) = Option gilt nur f?r YMODEM\n" ++-" (Z) = Option gilt nur f?r ZMODEM\n" +++" (X) = Option gilt nur für XMODEM\n" +++" (Y) = Option gilt nur für YMODEM\n" +++" (Z) = Option gilt nur für ZMODEM\n" ++ ++ #: src/lsz.c:1521 ++ msgid "" ++@@ -347,32 +348,32 @@ ++ " -m, --min-bps N stop transmission if BPS below N\n" ++ " -M, --min-bps-time N for at least N seconds (default: 120)\n" ++ msgstr "" ++-" -+, --append an existierende Dateien anh?ngen (Z)\n" +++" -+, --append an existierende Dateien anhängen (Z)\n" ++ " -2, --twostop zwei Stopbits verwenden\n" ++-" -4, --try-4k bis zu 4K Blockgr??e verwenden\n" ++-" --start-4k mit 4K Blockgr??e starten (versucht nicht 8)\n" ++-" -8, --try-8k bis zu 8K Blockgr??e verwenden\n" ++-" --start-8k mit 8K Blockgr??e starten\n" +++" -4, --try-4k bis zu 4K Blockgröße verwenden\n" +++" --start-4k mit 4K Blockgröße starten (versucht nicht 8)\n" +++" -8, --try-8k bis zu 8K Blockgröße verwenden\n" +++" --start-8k mit 8K Blockgröße starten\n" ++ " -a, --ascii ASCII: NL nach CR/LF wandeln\n" ++-" -b, --binary Bin?r?bertragung erzwingen\n" +++" -b, --binary Binärübertragung erzwingen\n" ++ " -B, --bufsize N N Bytes puffern (auto: ganze Datei puffern)\n" ++-" -c, --command COMMAND Kommando KOMMANDO auf Gegenseite ausf?hren " +++" -c, --command COMMAND Kommando KOMMANDO auf Gegenseite ausführen " ++ "(Z)\n" ++-" -C, --command-tries N N mal Kommandoausf?hrung versuchen (Z)\n" +++" -C, --command-tries N N mal Kommandoausführung versuchen (Z)\n" ++ " -d, --dot-to-slash C '.' in Dateinamen nach '/' wandeln (Y/Z)\n" ++ " --delay-startup N Bei Programmstart N Sek. schlafen (Debugging)\n" ++ " -e, --escape alle Steuerzeichen escapen (Z)\n" ++-" -E, --rename Empf?nger soll Datei umbenennen falls\n" +++" -E, --rename Empfänger soll Datei umbenennen falls\n" ++ " Zieldatei schon existiert\n" ++ " -f, --full-path Dateien mit vollen Pfaden senden (Y/Z)\n" ++-" -i, --immediate-command CMD wie `c', aber sofort zur?ckkehren (Z)\n" +++" -i, --immediate-command CMD wie `c', aber sofort zurückkehren (Z)\n" ++ " -h, --help diesen Hilfetext ausgeben\n" ++ " -k, --1k 1024 Bytes Pakete senden (Y)\n" ++-" -L, --packetlen N Unterpaketl?nge auf N Bytes beschr?nken (Z)\n" ++-" -l, --framelen N Rahmenl?nge auf N Bytes beschr?nken (l>=L) " +++" -L, --packetlen N Unterpaketlänge auf N Bytes beschränken (Z)\n" +++" -l, --framelen N Rahmenlänge auf N Bytes beschränken (l>=L) " ++ "(Z)\n" ++-" -m, --min-bps N ?bertragung abbrechen bei weniger als N BPS\n" ++-" -M, --min-bps-time N f?r mindestens N Sekunden (Default: 120)\n" +++" -m, --min-bps N Ãœbertragung abbrechen bei weniger als N BPS\n" +++" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" ++ ++ #: src/lsz.c:1546 ++ msgid "" ++@@ -400,28 +401,28 @@ ++ "short options use the same arguments as the long ones\n" ++ msgstr "" ++ " -n, --newer Datei senden wenn sie neuer ist (Z)\n" ++-" -N, --newer-or-longer Datei senden wenn neuer oder l?nger (Z)\n" +++" -N, --newer-or-longer Datei senden wenn neuer oder länger (Z)\n" ++ " -o, --16-bit-crc 16Bit CRC statt 32Bit CRC verwenden (Z)\n" ++ " -O, --disable-timeouts Timeoutbehandlung abschalten\n" ++-" -p, --protect existierende Dateien nicht ver?ndern\n" ++-" -r, --resume unterbrochene ?bertragungen fortsetzen (Z)\n" ++-" -R, --restricted eingeschr?nkter, sichererer Modus\n" +++" -p, --protect existierende Dateien nicht verändern\n" +++" -r, --resume unterbrochene Ãœbertragungen fortsetzen (Z)\n" +++" -R, --restricted eingeschränkter, sichererer Modus\n" ++ " -q, --quiet leise, keine Ausgaben machen\n" ++-" -s, --stop-at {HH:MM|+N} ?bertragung um HH:MM oder in N Sek. abbrechen\n" ++-" --tcp-server Socket ?ffnen und auf Verbindung warten\n" ++-" --tcp-client ADDR:PORT Socket ?ffnen und verbindung mit ...\n" ++-" -u, --unlink Datei nach ?bertragung l?schen\n" ++-" -U, --unrestrict eingeschr?nkten Modus aufheben (falls " +++" -s, --stop-at {HH:MM|+N} Ãœbertragung um HH:MM oder in N Sek. abbrechen\n" +++" --tcp-server Socket öffnen, Verbindung abwarten (Z)\n" +++" --tcp-client ADDR:PORT Socket öffnen, verbinden mit ... (Z)\n" +++" -u, --unlink Datei nach Ãœbertragung löschen\n" +++" -U, --unrestrict eingeschränkten Modus aufheben (falls " ++ "erlaubt)\n" ++ " -v, --verbose mehr ausgeben\n" ++-" -w, --windowsize N Fenstergr??e auf N Bytes setzen (Z)\n" +++" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" ++ " -X --xmodem XMODEM-Protokoll benutzen\n" ++-" -y, --overwrite existierende Dateien ?berschreiben\n" ++-" -Y, --overwrite-or-skip wie `y', aber nicht existierende ?berspringen\n" +++" -y, --overwrite existierende Dateien überschreiben\n" +++" -Y, --overwrite-or-skip wie `y', aber nicht existierende überspringen\n" ++ " --ymodem YMODEM-Protokoll benutzen\n" ++ " -Z, --zmodem ZMODEM-Protokoll benutzen\n" ++ "\n" ++-"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n" +++"Kurze Optionen benötigen dieselben Argumente wie die langen.\n" ++ ++ #: src/lsz.c:1768 ++ msgid "got ZRQINIT" ++@@ -434,7 +435,7 @@ ++ #: src/lsz.c:1991 ++ #, c-format ++ msgid "blklen now %d\n" ++-msgstr "Blockgr??e nun %d\n" +++msgstr "Blockgröße nun %d\n" ++ ++ #: src/lsz.c:2053 ++ #, c-format ++@@ -453,7 +454,7 @@ ++ #: src/lsz.c:2223 ++ #, c-format ++ msgid "calc_blklen: reduced to %d due to error\n" ++-msgstr "calc_blklen: Blockgr?sse auf %d reduziert wegen Fehler\n" +++msgstr "calc_blklen: Blockgröße auf %d reduziert wegen Fehler\n" ++ ++ #: src/lsz.c:2256 ++ #, c-format ++@@ -468,12 +469,12 @@ ++ #: src/lsz.c:2267 ++ #, c-format ++ msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n" ++-msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%le, ec=%ld\n" +++msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%ld, ec=%ld\n" ++ ++ #: src/lsz.c:2278 ++ #, c-format ++ msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n" ++-msgstr "calc_blklen: Blockl?nge %d, ok %ld, fehlgeschlagen %ld -> %lu\n" +++msgstr "calc_blklen: Blocklänge %d, ok %ld, fehlgeschlagen %ld -> %lu\n" ++ ++ #: src/lsz.c:2290 ++ #, c-format ++@@ -512,7 +513,7 @@ ++ ++ #: src/zm.c:712 ++ msgid "Garbage count exceeded" ++-msgstr "Maximale Wiederholungsanzahl ?berschritten" +++msgstr "Maximale Wiederholungsanzahl überschritten" ++ ++ #: src/zm.c:773 ++ #, c-format ++@@ -526,11 +527,11 @@ ++ ++ #: src/lrz.c:382 ++ msgid "don't have settimeofday, will not set time\n" ++-msgstr "Zeitsynchronisation nicht ausf?hrbar, settimeofday() fehlt\n" +++msgstr "Zeitsynchronisation nicht ausführbar, settimeofday() fehlt\n" ++ ++ #: src/lrz.c:386 ++ msgid "not running as root (this is good!), can not set time\n" ++-msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausf?hrbar\n" +++msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausführbar\n" ++ ++ #: src/lrz.c:441 ++ msgid "bytes_per_error" ++@@ -542,16 +543,16 @@ ++ ++ #: src/lrz.c:455 ++ msgid "O_SYNC not supported by the kernel" ++-msgstr "O_SYNC vom Kernel nicht unterst?tzt" +++msgstr "O_SYNC vom Kernel nicht unterstützt" ++ ++ #: src/lrz.c:497 src/lrz.c:499 ++ msgid "garbage on commandline" ++-msgstr "M?ll auf der Kommandozeile" +++msgstr "Müll auf der Kommandozeile" ++ ++ #: src/lrz.c:604 ++ #, c-format ++ msgid "Usage: %s [options] [filename.if.xmodem]\n" ++-msgstr "Benutzung: %s [Optionen] [Dateiname.f?r.xmodem]\n" +++msgstr "Benutzung: %s [Optionen] [Dateiname.für.xmodem]\n" ++ ++ #: src/lrz.c:605 ++ msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n" ++@@ -596,44 +597,44 @@ ++ "\n" ++ "short options use the same arguments as the long ones\n" ++ msgstr "" ++-" -+, --append an existierende Dateien anh?ngen\n" ++-" -a, --ascii ASCII-?bertragung (CR/LF nach LF wandeln)\n" ++-" -b, --binary Bin?r?bertragung (keine Umwandlungen)\n" +++" -+, --append an existierende Dateien anhängen\n" +++" -a, --ascii ASCII-Ãœbertragung (CR/LF nach LF wandeln)\n" +++" -b, --binary Binärübertragung (keine Umwandlungen)\n" ++ " -B, --bufsize N N Bytes puffern (auto: ganze Datei puffern)\n" ++-" -c, --with-crc 16bit CRC statt Pr?fsumme verwenden (X)\n" ++-" -C, --allow-remote-commands Ausf?hrung von Kommandos erlauben (Z)\n" +++" -c, --with-crc 16bit CRC statt Prüfsumme verwenden (X)\n" +++" -C, --allow-remote-commands Ausführung von Kommandos erlauben (Z)\n" ++ " -D, --null empfangene Daten nach /dev/null schreiben\n" ++ " --delay-startup N Bei Programmstart N Sek. schlafen (Debugging)\n" ++ " -e, --escape Alle Steuerzeichen escapen (Z)\n" ++-" -E, --rename Empf?nger soll Datei umbenennen falls\n" +++" -E, --rename Empfänger soll Datei umbenennen, falls\n" ++ " Zieldatei schon existiert\n" ++ " --errors N Einen CRC-Fehler alle N Bytes erzeugen\n" ++ " -h, --help Diesen Hilfstext ausgeben\n" ++-" -m, --min-bps N ?bertragung abbrechen bei weniger als N BPS\n" ++-" -M, --min-bps-time N f?r mindestens N Sekunden (Default: 120)\n" +++" -m, --min-bps N Ãœbertragung abbrechen bei weniger als N BPS\n" +++" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" ++ " -O, --disable-timeouts Timeoutbehandlung abschalten\n" ++ " --o-sync Ausgabedatei(en) im synchron schreiben\n" ++-" -p, --protect existierende Dateien nicht ver?ndern\n" +++" -p, --protect existierende Dateien nicht verändern\n" ++ " -q, --quiet leise, keine Ausgaben machen\n" ++-" -r, --resume unterbrochene ?bertragungen fortsetzen (Z)\n" ++-" -R, --restricted eingeschr?nkter, sichererer Modus\n" ++-" -s, --stop-at {HH:MM|+N} ?bertragung um HH:MM oder in N Sek. abbrechen\n" +++" -r, --resume unterbrochene Ãœbertragungen fortsetzen (Z)\n" +++" -R, --restricted eingeschränkter, sichererer Modus\n" +++" -s, --stop-at {HH:MM|+N} Ãœbertragung um HH:MM oder in N Sek. abbrechen\n" ++ " -S, --timesync Zeit anfordern (doppelt: lokale Zeit setzen)\n" ++-" --syslog[=off] syslog an- oder ausschalten, wenn m?glich\n" ++-" -t, --timeout N Timeout auf N Zehntelsekungen setzen\n" ++-" --tcp-server Socket ?ffnen und auf Verbindung warten\n" ++-" --tcp-client ADDR:PORT Socket ?ffnen und verbindung mit ...\n" +++" --syslog[=off] syslog an- oder ausschalten, wenn möglich\n" +++" -t, --timeout N Timeout auf N Zehntelsekunden setzen\n" +++" --tcp-server Socket öffnen, Verbindung abwarten (Z)\n" +++" --tcp-client ADDR:PORT Socket öffnen, verbinden mit ... (Z)\n" ++ " -u, --keep-uppercase GROSS geschrieben Dateinamen beibehalten\n" ++-" -U, --unrestrict eingeschr?nkten Modus aufheben (falls " +++" -U, --unrestrict eingeschränkten Modus aufheben (falls " ++ "erlaubt)\n" ++ " -v, --verbose mehr ausgeben\n" ++-" -w, --windowsize N Fenstergr??e auf N Bytes setzen (Z)\n" +++" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" ++ " -X --xmodem XMODEM-Protokoll benutzen\n" ++-" -y, --overwrite existierende Dateien ?berschreiben\n" +++" -y, --overwrite existierende Dateien überschreiben\n" ++ " --ymodem YMODEM-Protokoll benutzen\n" ++ " -Z, --zmodem ZMODEM-Protokoll benutzen\n" ++ "\n" ++-"Kurze Optionen ben?tigen dieselben Argumente wie Lange.\n" +++"Kurze Optionen benötigen dieselben Argumente wie die langen.\n" ++ ++ #: src/lrz.c:676 ++ #, c-format ++@@ -662,11 +663,11 @@ ++ "%s: %s removed.\r\n" ++ msgstr "" ++ "\r\n" ++-"%s: %s gel?scht\r\n" +++"%s: %s gelöscht\r\n" ++ ++ #: src/lrz.c:856 ++ msgid "Pathname fetch returned EOT" ++-msgstr "Ende der ?bertragung beim Warten auf Dateinamen" +++msgstr "Ende der Ãœbertragung beim Warten auf Dateinamen" ++ ++ #: src/lrz.c:903 ++ msgid "Received dup Sector" ++@@ -682,7 +683,7 @@ ++ ++ #: src/lrz.c:976 ++ msgid "Checksum" ++-msgstr "Pr?fsummenfehler" +++msgstr "Prüfsummenfehler" ++ ++ #: src/lrz.c:979 ++ msgid "Sector number garbled" ++@@ -695,27 +696,27 @@ ++ #: src/lrz.c:1005 ++ #, c-format ++ msgid "Got 0%o sector header" ++-msgstr "Erhielt %02x als Sektorbest?tigung" +++msgstr "Erhielt %02x als Sektorbestätigung" ++ ++ #: src/lrz.c:1113 ++ #, c-format ++ msgid "file name ends with a /, skipped: %s\n" ++-msgstr "Dateiname endet mit /, ?bersprungen: %s\n" +++msgstr "Dateiname endet mit /, übersprungen: %s\n" ++ ++ #: src/lrz.c:1127 ++ #, c-format ++ msgid "zmanag=%d, Lzmanag=%d\n" ++-msgstr "" +++msgstr "zmanag=%d, Lzmanag=%d\n" ++ ++ #: src/lrz.c:1128 ++ #, c-format ++ msgid "zconv=%d\n" ++-msgstr "" +++msgstr "zconv=%d\n" ++ ++ #: src/lrz.c:1192 src/lrz.c:1226 ++ #, c-format ++ msgid "file exists, skipped: %s\n" ++-msgstr "Datei existiert, ?bersprungen: %s\n" +++msgstr "Datei existiert, übersprungen: %s\n" ++ ++ #: src/lrz.c:1267 ++ #, c-format ++@@ -739,7 +740,7 @@ ++ #: src/lrz.c:1545 ++ #, c-format ++ msgid "Blocks received: %d" ++-msgstr "Bl?cke empfangen: %d" +++msgstr "Blöcke empfangen: %d" ++ ++ #: src/lrz.c:1599 ++ #, c-format ++@@ -749,15 +750,15 @@ ++ #: src/lrz.c:1612 src/lrz.c:1620 ++ #, c-format ++ msgid "%s:\tSecurity Violation" ++-msgstr "%s:\tSicherheitsversto?" +++msgstr "%s:\tSicherheitsverstoß" ++ ++ #: src/lrz.c:1730 ++ msgid "remote command execution requested" ++-msgstr "Gegenseite versucht Kommandoausf?hrung" +++msgstr "Gegenseite versucht Kommandoausführung" ++ ++ #: src/lrz.c:1737 ++ msgid "not executed" ++-msgstr "nicht ausgef?hrt" +++msgstr "nicht ausgeführt" ++ ++ #: src/lrz.c:1768 ++ msgid "got ZRINIT" ++@@ -765,7 +766,7 @@ ++ ++ #: src/lrz.c:1817 ++ msgid "Skipped" ++-msgstr "?bersprungen" +++msgstr "Ãœbersprungen" ++ ++ #. too bad ++ #: src/lrz.c:2049 ++@@ -785,7 +786,7 @@ ++ ++ #: src/lrz.c:2215 ++ msgid "file close error" ++-msgstr "Fehler beim Schlie?en der Datei" +++msgstr "Fehler beim Schließen der Datei" ++ ++ #~ msgid "tcp protocol init failed\n" ++ #~ msgstr "TCP Protokoll Initialisierung fehlgeschlagen\n" ++@@ -796,17 +797,3 @@ ++ #~ msgid "fgets for tcp protocol synchronization failed: " ++ #~ msgstr "fgets() bei tcp Protokoll Synchronisation fehlgeschlagen: " ++ ++-#~ msgid "Transfer complete." ++-#~ msgstr "?bertragung abgeschlossen" ++- ++-#~ msgid "at" ++-#~ msgstr "um" ++- ++-#~ msgid "TIMESYNC: failed\n" ++-#~ msgstr "Zeitsynchronisation: fehlgeschlagen\n" ++- ++-#~ msgid "TIMESYNC: ok\n" ++-#~ msgstr "Zeitsynchronisation: ok\n" ++- ++-#~ msgid "Falldown to %ld blklen" ++-#~ msgstr "Blockgr??e auf %ld gesenkt" diff --git a/source/a/minicom/minicom.SlackBuild b/source/a/minicom/minicom.SlackBuild index 91e7baa9b..be060ec23 100755 --- a/source/a/minicom/minicom.SlackBuild +++ b/source/a/minicom/minicom.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.1 -BUILD=${BUILD:-4} +VERSION=2.5 +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -59,97 +61,99 @@ 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 *) +#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 || exit 1 + --sysconfdir=/etc \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || 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 -gzip -9 $PKG/usr/man/man?/*.? +printf "# Machine-generated file - use "minicom -s" to change parameters.\n" \ + > $PKG/etc/minirc.dfl.new + mkdir -p $PKG/usr/doc/minicom-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING ChangeLog FILE_ID.DIZ INSTALL NEWS README TODO \ - doc \ + AUTHORS COPYING* ChangeLog FILE_ID.DIZ INSTALL NEWS README* TODO doc \ $PKG/usr/doc/minicom-$VERSION +rm -f $PKG/usr/doc/minicom-$VERSION/doc/{ChangeLog.old,Makefile*} + +# 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 # lzrz -# If autoconf causes failure here (which it probably will), -# remove it temporarily and the build should work fine... +# If autotools causes failure here (which it probably will), temporarily +# move /usr/bin/auto{conf,header,make} out of the way and it should work... + cd $TMP -tar xzvf $CWD/lrzsz_0.12.21.orig.tar.gz || exit 1 +rm -rf lrzsz-990823 +tar xvf $CWD/lrzsz_0.12.21.orig.tar.gz || exit 1 cd lrzsz-990823 +chown -R root:root . + # 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 + +# Apply some of the debian patches +zcat $CWD/lrzsz_0.12.21-5.diff.gz | patch -p1 --verbose || exit 1 +rm -f debian/patches/{206499_ymodemg.diff.unchecked,206648_dszlog.diff.unchecked} +for i in debian/patches/* ; do patch -p1 < $i || exit 1 ; done + ./configure \ --prefix=/usr \ - $ARCH-slackware-linux -make -j3 || exit 1 -cd src -cat lrz > $PKG/usr/bin/lrz -cat lsz > $PKG/usr/bin/lsz -chmod 755 $PKG/usr/bin/l*z -cd ../man -for page in lrz.1 lsz.1 ; do - cat $page | gzip -9c > $PKG/usr/man/man1/$page.gz -done -echo '.so man1/lrz.1' | gzip -9c > $PKG/usr/man/man1/rz.1.gz -echo '.so man1/lsz.1' | gzip -9c > $PKG/usr/man/man1/sz.1.gz -cd ../po + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || exit 1 + +cp src/lrz src/lsz $PKG/usr/bin +chmod 0755 $PKG/usr/bin/{lrz,lsz} + +cp man/{lrz,lsz}.1 $PKG/usr/man/man1 +echo '.so man1/lrz.1' > $PKG/usr/man/man1/rz.1 +echo '.so man1/lsz.1' > $PKG/usr/man/man1/sz.1 + mkdir -p $PKG/usr/share/locale/de/LC_MESSAGES -cat de.gmo > $PKG/usr/share/locale/de/LC_MESSAGES/lrzsz.mo -cd .. -mkdir -p $PKG/usr/doc/lrzsz-0.12.21 -cp -a ABOUT-NLS AUTHORS COMPATABILITY COPYING INSTALL NEWS README-alpha \ - README.cvs README.gettext README.isdn4linux README.systems \ - README.tests THANKS TODO $PKG/usr/doc/lrzsz-0.12.21 +cat po/de.gmo > $PKG/usr/share/locale/de/LC_MESSAGES/lrzsz.mo +mkdir -p $PKG/usr/doc/lrzsz-0.12.21 +cp -a \ + AUTHORS COMPATABILITY COPYING* INSTALL NEWS README* THANKS TODO \ + $PKG/usr/doc/lrzsz-0.12.21 + +( cd $PKG/usr/bin + for i in lrb lrx rz ; do ln -s lrz $i ; done + for i in lsb lsx sz ; do ln -s lsz $i ; done + for i in rx rb ; do ln -s rz $i ; done + for i in sb sx ; do ln -s sz $i ; done +) ( cd $PKG - ( cd usr/bin ; rm -rf rx ) - ( cd usr/bin ; ln -sf rz rx ) - ( cd usr/bin ; rm -rf rb ) - ( cd usr/bin ; ln -sf rz rb ) - ( cd usr/bin ; rm -rf sb ) - ( cd usr/bin ; ln -sf sz sb ) - ( cd usr/bin ; rm -rf sx ) - ( cd usr/bin ; ln -sf sz sx ) - ( cd usr/bin ; rm -rf rz ) - ( cd usr/bin ; ln -sf lrz rz ) - ( cd usr/bin ; rm -rf lrb ) - ( cd usr/bin ; ln -sf lrz lrb ) - ( cd usr/bin ; rm -rf lrx ) - ( cd usr/bin ; ln -sf lrz lrx ) - ( cd usr/bin ; rm -rf sz ) - ( cd usr/bin ; ln -sf lsz sz ) - ( cd usr/bin ; rm -rf lsb ) - ( cd usr/bin ; ln -sf lsz lsb ) - ( cd usr/bin ; rm -rf lrx ) - ( cd usr/bin ; ln -sf lsz lrx ) 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 $PKG/usr/man -type f -exec gzip -9 {} \; + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - cd $PKG -makepkg -l y -c n $TMP/minicom-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/minicom-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/minicom/minirc.dfl b/source/a/minicom/minirc.dfl deleted file mode 100644 index 42e9d8fe4..000000000 --- a/source/a/minicom/minirc.dfl +++ /dev/null @@ -1 +0,0 @@ -# Machine-generated file - use "minicom -s" to change parameters. diff --git a/source/a/minicom/wintcap.diff b/source/a/minicom/wintcap.diff deleted file mode 100644 index 40d005b3f..000000000 --- a/source/a/minicom/wintcap.diff +++ /dev/null @@ -1,44 +0,0 @@ ---- minicom-2.1/src/window.c.orig 2003-05-17 00:06:26.000000000 +0400 -+++ minicom-2.1/src/window.c 2007-08-26 11:21:04.000000000 +0400 -@@ -62,7 +62,7 @@ - static char *CS, *SF, *SR, *VB, *BL; - static char *VE, *VI, *KS, *KE; - static char *CD, *CL, *IC, *DC; --static char *BC, *CR, *NL; -+static char *BCs, *CR, *NL; - #if ST_LINE - static char *TS, *FS, *DS; - #endif -@@ -322,8 +322,8 @@ - else if (NL != CNULL && x == 0 && x == curx && y == cury + 1) - outstr(NL); - #endif -- else if (BC != CNULL && y == cury && x == curx - 1) -- outstr(BC); -+ else if (BCs != CNULL && y == cury && x == curx - 1) -+ outstr(BCs); - else - outstr(tgoto(CM, x, y)); - curx = x; -@@ -1918,7 +1918,7 @@ - CL = tgetstr("cl", &_tptr); - IC = tgetstr("ic", &_tptr); - DC = tgetstr("dc", &_tptr); -- BC = tgetstr("bc", &_tptr); -+ BCs = tgetstr("bc", &_tptr); - CR = tgetstr("cr", &_tptr); - NL = tgetstr("nl", &_tptr); - AC = tgetstr("ac", &_tptr); -@@ -1967,10 +1967,10 @@ - _has_am = tgetflag("am"); - _mv_standout = tgetflag("ms"); - if (tgetflag("bs")) { -- if (BC == CNULL) BC = "\b"; -+ if (BCs == CNULL) BCs = "\b"; - } - else -- BC = CNULL; -+ BCs = CNULL; - - /* Special IBM box-drawing characters */ - D_UL = 201; diff --git a/source/a/mkinitrd/README.initrd b/source/a/mkinitrd/README.initrd index 86d77539b..ca95c3322 100644 --- a/source/a/mkinitrd/README.initrd +++ b/source/a/mkinitrd/README.initrd @@ -1,7 +1,7 @@ Slackware initrd mini HOWTO by Patrick Volkerding, volkerdi@slackware.com -Wed Jun 17 01:49:18 CDT 2009 +Thu Apr 7 06:02:26 CDT 2011 This document describes how to create and install an initrd, which may be required to use the 2.6 kernel. Also see "man mkinitrd". @@ -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, ext4, +required to support the filesystem used by the root partition (ext3, 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 @@ -33,15 +33,15 @@ flexible to ship a generic kernel and a set of kernel modules for it. The easiest way to make the initrd is to use the mkinitrd script included in Slackware's mkinitrd package. We'll walk through the process of -upgrading to the generic 2.6.29.5 Linux kernel using the packages +upgrading to the generic 2.6.37.6 Linux kernel using the packages found in Slackware's slackware/a/ directory. First, make sure the kernel, kernel modules, and mkinitrd package are installed (the current version numbers might be a little different, so this is just an example): - installpkg kernel-generic-2.6.29.5-i686-1.tgz - installpkg kernel-modules-2.6.29.5-i686-1.tgz + installpkg kernel-generic-2.6.37.6-i686-1.tgz + installpkg kernel-modules-2.6.37.6-i686-1.tgz installpkg mkinitrd-1.1.0-i486-1.tgz Change into the /boot directory: @@ -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.32.3 -m reiserfs + mkinitrd -c -k 2.6.37.6 -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,10 +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.32.3 -kernel modules for a system with an ext4 root partition on /dev/sdb3: +Here's another example: Build an initrd image using Linux 2.6.37.6 +kernel modules for a system with an ext3 root partition on /dev/sdb3: - mkinitrd -c -k 2.6.32.3 -m ext4 -f ext4 -r /dev/sdb3 + mkinitrd -c -k 2.6.37.6 -m ext3 -f ext3 -r /dev/sdb3 4. Now that I've built an initrd, how do I use it? @@ -76,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.32.3 +image = /boot/vmlinuz-generic-2.6.37.6 initrd = /boot/initrd.gz - root = /dev/sdb3 - label = Lnx26323 + root = /dev/sda6 + label = Lnx26376 read-only # Linux bootable partition config ends diff --git a/source/a/mkinitrd/busybox-dot-config b/source/a/mkinitrd/busybox-dot-config index 65e298b5f..35b32a4f9 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.15.3 -# Thu Dec 17 17:50:16 2009 +# Busybox version: 1.18.4 +# Fri Mar 25 23:08:06 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -14,6 +14,9 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_DESKTOP=y # CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE is not set +CONFIG_PLATFORM_LINUX=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 @@ -21,12 +24,23 @@ CONFIG_SHOW_USAGE=y CONFIG_FEATURE_VERBOSE_USAGE=y CONFIG_FEATURE_COMPRESS_USAGE=y CONFIG_FEATURE_INSTALLER=y +CONFIG_INSTALL_NO_USR=y CONFIG_LOCALE_SUPPORT=y -# CONFIG_FEATURE_ASSUME_UNICODE is not set +CONFIG_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set # CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_WTMP=y +CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_PIDFILE=y CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y @@ -59,12 +73,10 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set # CONFIG_EFENCE is not set -CONFIG_INCLUDE_SUSv2=y # -# Installation Options +# Installation Options ("make install" behavior) # -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 @@ -81,6 +93,7 @@ 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_USE_TERMIOS=y CONFIG_FEATURE_EDITING=y CONFIG_FEATURE_EDITING_MAX_LEN=1024 CONFIG_FEATURE_EDITING_VI=y @@ -104,12 +117,14 @@ CONFIG_IOCTL_HEX2STR_ERROR=y # # Archival Utilities # +CONFIG_FEATURE_SEAMLESS_XZ=y # 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_FEATURE_AR_CREATE is not set CONFIG_BUNZIP2=y CONFIG_BZIP2=y CONFIG_CPIO=y @@ -120,6 +135,7 @@ CONFIG_FEATURE_CPIO_P=y # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set CONFIG_GUNZIP=y CONFIG_GZIP=y +CONFIG_FEATURE_GZIP_LONG_OPTIONS=y CONFIG_LZOP=y CONFIG_LZOP_COMPR_HIGH=y CONFIG_RPM2CPIO=y @@ -132,31 +148,48 @@ 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_TO_COMMAND is not set CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set CONFIG_UNCOMPRESS=y CONFIG_UNLZMA=y CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y CONFIG_UNZIP=y # # Coreutils # CONFIG_BASENAME=y -CONFIG_CAL=y CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_BASE64=y +CONFIG_CAL=y CONFIG_CATV=y CONFIG_CHGRP=y CONFIG_CHMOD=y CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set CONFIG_CHROOT=y CONFIG_CKSUM=y CONFIG_COMM=y CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DD=y CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set CONFIG_FEATURE_DD_IBS_OBS=y CONFIG_DF=y CONFIG_FEATURE_DF_FANCY=y @@ -234,12 +267,7 @@ 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 @@ -271,7 +299,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -279,6 +307,7 @@ CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # Console Utilities # CONFIG_CHVT=y +CONFIG_FGCONSOLE=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y @@ -299,6 +328,12 @@ CONFIG_SETLOGCONS=y CONFIG_SHOWKEY=y # +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=y + +# # Debian Utilities # CONFIG_MKTEMP=y @@ -314,15 +349,14 @@ CONFIG_WHICH=y # # Editors # +CONFIG_PATCH=y CONFIG_AWK=y CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set 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 @@ -336,6 +370,7 @@ CONFIG_FEATURE_VI_READONLY=y CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_FEATURE_ALLOW_EXEC=y @@ -364,6 +399,7 @@ CONFIG_FEATURE_FIND_PRUNE=y CONFIG_FEATURE_FIND_PATH=y CONFIG_FEATURE_FIND_REGEX=y # CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_FEATURE_FIND_LINKS=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y @@ -377,6 +413,12 @@ CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y # # Init Utilities # +# CONFIG_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_HALT=y +# CONFIG_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_REMOVED=y @@ -386,33 +428,31 @@ 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_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" +CONFIG_INIT_TERMINAL_TYPE="linux" CONFIG_MESG=y # # Login/Password Management Utilities # +CONFIG_ADD_SHELL=y +CONFIG_REMOVE_SHELL=y 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_FEATURE_CHECK_NAMES=y CONFIG_FIRST_SYSTEM_ID=1000 CONFIG_LAST_SYSTEM_ID=12000 +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y CONFIG_DELUSER=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y CONFIG_LOGIN=y # CONFIG_PAM is not set CONFIG_LOGIN_SCRIPTS=y @@ -434,10 +474,12 @@ CONFIG_VLOCK=y CONFIG_CHATTR=y CONFIG_FSCK=y CONFIG_LSATTR=y +CONFIG_TUNE2FS=y # # Linux Module Utilities # +CONFIG_MODINFO=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 @@ -453,6 +495,7 @@ CONFIG_DEPMOD=y # Options common to multiple modutils # CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set @@ -467,6 +510,8 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities # +CONFIG_BLOCKDEV=y +CONFIG_REV=y CONFIG_ACPID=y CONFIG_FEATURE_ACPID_COMPAT=y CONFIG_BLKID=y @@ -484,16 +529,16 @@ CONFIG_FEATURE_FDISK_WRITABLE=y # CONFIG_FEATURE_SGI_LABEL is not set # CONFIG_FEATURE_SUN_LABEL is not set CONFIG_FEATURE_OSF_LABEL=y +CONFIG_FEATURE_GPT_LABEL=y CONFIG_FEATURE_FDISK_ADVANCED=y CONFIG_FINDFS=y +# CONFIG_FLOCK is not set CONFIG_FREERAMDISK=y CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set CONFIG_MKFS_VFAT=y CONFIG_GETOPT=y CONFIG_FEATURE_GETOPT_LONG=y @@ -506,6 +551,8 @@ CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y CONFIG_IPCRM=y CONFIG_IPCS=y CONFIG_LOSETUP=y +CONFIG_LSPCI=y +CONFIG_LSUSB=y CONFIG_MDEV=y CONFIG_FEATURE_MDEV_CONF=y CONFIG_FEATURE_MDEV_RENAME=y @@ -515,24 +562,6 @@ CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y CONFIG_MKSWAP=y CONFIG_FEATURE_MKSWAP_UUID=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 @@ -560,13 +589,42 @@ CONFIG_FEATURE_UMOUNT_ALL=y # Common options for mount/umount # CONFIG_FEATURE_MOUNT_LOOP=y +CONFIG_FEATURE_MOUNT_LOOP_CREATE=y CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +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 # # Miscellaneous Utilities # +# CONFIG_CONSPY is not set +# CONFIG_NANDWRITE is not set +# CONFIG_NANDDUMP is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set CONFIG_ADJTIMEX=y CONFIG_BBCONFIG=y +CONFIG_FEATURE_COMPRESS_BBCONFIG=y CONFIG_BEEP=y CONFIG_FEATURE_BEEP_FREQ=4000 CONFIG_FEATURE_BEEP_LENGTH_MS=30 @@ -595,6 +653,7 @@ CONFIG_DEVMEM=y CONFIG_EJECT=y CONFIG_FEATURE_EJECT_SCSI=y CONFIG_FBSPLASH=y +# CONFIG_FLASHCP is not set CONFIG_FLASH_LOCK=y CONFIG_FLASH_UNLOCK=y CONFIG_FLASH_ERASEALL=y @@ -628,6 +687,7 @@ CONFIG_MOUNTPOINT=y CONFIG_MT=y CONFIG_RAIDAUTORUN=y CONFIG_READAHEAD=y +# CONFIG_RFKILL is not set CONFIG_RUNLEVEL=y CONFIG_RX=y CONFIG_SETSID=y @@ -638,11 +698,17 @@ CONFIG_TIME=y CONFIG_TIMEOUT=y CONFIG_TTYSIZE=y CONFIG_VOLNAME=y +# CONFIG_WALL is not set CONFIG_WATCHDOG=y # # Networking Utilities # +CONFIG_NBDCLIENT=y +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set CONFIG_FEATURE_IPV6=y CONFIG_FEATURE_UNIX_LOCAL=y CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y @@ -657,6 +723,7 @@ CONFIG_ETHER_WAKE=y CONFIG_FAKEIDENTD=y CONFIG_FTPD=y CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y @@ -673,6 +740,7 @@ CONFIG_HOSTNAME=y # 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_FEATURE_HTTPD_GZIP is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y CONFIG_FEATURE_IFCONFIG_SLIP=y @@ -715,40 +783,49 @@ 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_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set CONFIG_PING=y CONFIG_PING6=y CONFIG_FEATURE_FANCY_PING=y CONFIG_PSCAN=y CONFIG_ROUTE=y CONFIG_SLATTACH=y +CONFIG_TCPSVD=y CONFIG_TELNET=y CONFIG_FEATURE_TELNET_TTYPE=y CONFIG_FEATURE_TELNET_AUTOLOGIN=y CONFIG_TELNETD=y CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set CONFIG_TFTP=y # CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# CONFIG_FEATURE_TFTP_GET=y CONFIG_FEATURE_TFTP_PUT=y CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y CONFIG_TFTP_DEBUG=y CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=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_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set CONFIG_DHCPD_LEASES_FILE="" -# CONFIG_APP_UDHCPC is not set +# CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 @@ -756,16 +833,14 @@ CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" +CONFIG_UDPSVD=y CONFIG_VCONFIG=y CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_LONG_OPTIONS=y +CONFIG_FEATURE_WGET_TIMEOUT=y CONFIG_ZCIP=y -CONFIG_TCPSVD=y -CONFIG_TUNCTL=y -CONFIG_FEATURE_TUNCTL_UG=y -CONFIG_UDPSVD=y # # Print Utilities @@ -788,6 +863,11 @@ CONFIG_FEATURE_REFORMIME_COMPAT=y # # Process Utilities # +CONFIG_IOSTAT=y +CONFIG_MPSTAT=y +CONFIG_PMAP=y +CONFIG_POWERTOP=y +# CONFIG_SMEMCAP is not set CONFIG_FREE=y CONFIG_FUSER=y CONFIG_KILL=y @@ -813,6 +893,7 @@ CONFIG_FEATURE_TOP_SMP_CPU=y CONFIG_FEATURE_TOP_DECIMALS=y CONFIG_FEATURE_TOP_SMP_PROCESS=y CONFIG_FEATURE_TOPMEM=y +CONFIG_FEATURE_SHOW_THREADS=y CONFIG_UPTIME=y CONFIG_WATCH=y @@ -849,14 +930,9 @@ CONFIG_SOFTLIMIT=y # # Shells # -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y 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_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y @@ -867,10 +943,13 @@ CONFIG_ASH_MAIL=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y CONFIG_ASH_RANDOM_SUPPORT=y CONFIG_ASH_EXPAND_PRMT=y +CONFIG_CTTYHACK=y # CONFIG_HUSH is not set # CONFIG_HUSH_BASH_COMPAT is not set +# CONFIG_HUSH_BRACE_EXPANSION is not set # CONFIG_HUSH_HELP is not set # CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_SAVEHISTORY is not set # CONFIG_HUSH_JOB is not set # CONFIG_HUSH_TICK is not set # CONFIG_HUSH_IF is not set @@ -878,15 +957,21 @@ CONFIG_ASH_EXPAND_PRMT=y # CONFIG_HUSH_CASE is not set # CONFIG_HUSH_FUNCTIONS is not set # CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set # CONFIG_HUSH_EXPORT_N is not set -# CONFIG_LASH is not set +# CONFIG_HUSH_MODE_X is not set # CONFIG_MSH is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y 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 -CONFIG_CTTYHACK=y # # System Logging Utilities @@ -895,9 +980,11 @@ CONFIG_SYSLOGD=y CONFIG_FEATURE_ROTATE_LOGFILE=y CONFIG_FEATURE_REMOTE_LOG=y # CONFIG_FEATURE_SYSLOGD_DUP is not set +CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 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_FEATURE_KLOGD_KLOGCTL=y CONFIG_LOGGER=y diff --git a/source/a/mkinitrd/busybox-dot-config.1.15.x b/source/a/mkinitrd/busybox-dot-config.1.15.x new file mode 100644 index 000000000..65e298b5f --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.15.x @@ -0,0 +1,903 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.15.3 +# Thu Dec 17 17:50:16 2009 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT 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_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 +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 is not set +# 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="" +CONFIG_EXTRA_CFLAGS="" + +# +# 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# 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_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 +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_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 +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_FANCY=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_FSYNC=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_SHA256SUM=y +CONFIG_SHA512SUM=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_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +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_LIBM=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_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_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +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_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 +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_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_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" + +# +# 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 +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_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=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_UUID=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_SCRIPTREPLAY=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_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 +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_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 +# 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_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 +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_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 +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_FTPD=y +CONFIG_FEATURE_FTP_WRITE=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_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 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_IFPLUGD=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_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_TFTP_DEBUG=y +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_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 +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 +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_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_NONE is not set +CONFIG_ASH=y +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_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_BASH_COMPAT 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_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 +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 +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 diff --git a/source/a/mkinitrd/busybox-dot-config.1.17.x b/source/a/mkinitrd/busybox-dot-config.1.17.x new file mode 100644 index 000000000..18cd5e6ee --- /dev/null +++ b/source/a/mkinitrd/busybox-dot-config.1.17.x @@ -0,0 +1,970 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.17.2 +# Sat Aug 28 23:13:46 2010 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +CONFIG_DESKTOP=y +# CONFIG_EXTRA_COMPAT is not set +CONFIG_INCLUDE_SUSv2=y +# CONFIG_USE_PORTABLE_CODE 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_UNICODE_SUPPORT=y +# CONFIG_UNICODE_USING_LOCALE is not set +# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set +CONFIG_SUBST_WCHAR=63 +CONFIG_LAST_SUPPORTED_WCHAR=767 +# CONFIG_UNICODE_COMBINING_WCHARS is not set +# CONFIG_UNICODE_WIDE_WCHARS is not set +# CONFIG_UNICODE_BIDI_SUPPORT is not set +# CONFIG_UNICODE_NEUTRAL_TABLE is not set +# CONFIG_UNICODE_PRESERVE_BROKEN is not set +CONFIG_LONG_OPTS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +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 is not set +# 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="" +CONFIG_EXTRA_CFLAGS="" + +# +# 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 + +# +# 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="/tmp/package-mkinitrd/usr/share/mkinitrd/initrd-tree" + +# +# 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_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 +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_FEATURE_SEAMLESS_XZ=y +# 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_FEATURE_AR_CREATE is not set +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_FEATURE_GZIP_LONG_OPTIONS=y +CONFIG_LZOP=y +CONFIG_LZOP_COMPR_HIGH=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_TO_COMMAND is not set +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y +# CONFIG_FEATURE_TAR_SELINUX is not set +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +CONFIG_FEATURE_LZMA_FAST=y +CONFIG_LZMA=y +CONFIG_UNXZ=y +CONFIG_XZ=y +CONFIG_UNZIP=y + +# +# Coreutils +# +CONFIG_BASENAME=y +CONFIG_CAT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +# CONFIG_FEATURE_DATE_NANO is not set +# CONFIG_FEATURE_DATE_COMPAT is not set +CONFIG_TEST=y +CONFIG_FEATURE_TEST_64=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_CAL=y +CONFIG_CATV=y +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set +CONFIG_CHROOT=y +CONFIG_CKSUM=y +CONFIG_COMM=y +CONFIG_CP=y +CONFIG_FEATURE_CP_LONG_OPTIONS=y +CONFIG_CUT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_FANCY=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_FSYNC=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_SHA256SUM=y +CONFIG_SHA512SUM=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_TOUCH=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, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_FGCONSOLE=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_FEATURE_SETFONT_TEXTUAL_MAP=y +CONFIG_DEFAULT_SETFONT_DIR="/usr/share/kbd/consolefonts" +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y +CONFIG_SHOWKEY=y + +# +# Common options for loadfont and setfont +# +# CONFIG_FEATURE_LOADFONT_PSF2 is not set +CONFIG_FEATURE_LOADFONT_RAW=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_LIBM=y +CONFIG_CMP=y +CONFIG_DIFF=y +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +CONFIG_FEATURE_DIFF_DIR=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_ASK_TERMINAL=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_FEATURE_FIND_LINKS=y +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_BOOTCHARTD is not set +# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set +# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set +CONFIG_INIT=y +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_FEATURE_CALL_TELINIT is not set +CONFIG_TELINIT_PATH="" +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_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_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 +CONFIG_TUNE2FS=y + +# +# Linux Module Utilities +# +CONFIG_MODINFO=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_INSMOD=y +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y +CONFIG_DEPMOD=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set +# 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" + +# +# Linux System Utilities +# +CONFIG_REV=y +CONFIG_ACPID=y +CONFIG_FEATURE_ACPID_COMPAT=y +CONFIG_BLKID=y +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_FLOCK is not set +CONFIG_FREERAMDISK=y +CONFIG_FSCK_MINIX=y +# CONFIG_MKFS_EXT2 is not set +CONFIG_MKFS_MINIX=y +CONFIG_FEATURE_MINIX2=y +# CONFIG_MKFS_REISER is not set +CONFIG_MKFS_VFAT=y +CONFIG_GETOPT=y +CONFIG_FEATURE_GETOPT_LONG=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_LSPCI=y +CONFIG_LSUSB=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_UUID=y +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=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_SCRIPTREPLAY=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_MOUNT_LOOP_CREATE=y +CONFIG_FEATURE_MTAB_SUPPORT=y +CONFIG_VOLUMEID=y + +# +# Filesystem/Volume identification +# +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_BTRFS is not set +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 + +# +# Miscellaneous Utilities +# +# CONFIG_CONSPY is not set +# CONFIG_UBIATTACH is not set +# CONFIG_UBIDETACH is not set +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 +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_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_FLASHCP is not set +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 +# 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_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 +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_RFKILL is not set +CONFIG_RUNLEVEL=y +CONFIG_RX=y +CONFIG_SETSID=y +CONFIG_STRINGS=y +CONFIG_TASKSET=y +CONFIG_FEATURE_TASKSET_FANCY=y +CONFIG_TIME=y +CONFIG_TIMEOUT=y +CONFIG_TTYSIZE=y +CONFIG_VOLNAME=y +# CONFIG_WALL is not set +CONFIG_WATCHDOG=y + +# +# Networking Utilities +# +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +# CONFIG_NC_110_COMPAT is not set +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 +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_FTPD=y +CONFIG_FEATURE_FTP_WRITE=y +CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=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_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 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_IFPLUGD=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_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_FEATURE_NETSTAT_PRG=y +CONFIG_NSLOOKUP=y +# CONFIG_NTPD is not set +# CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +CONFIG_PSCAN=y +CONFIG_ROUTE=y +CONFIG_SLATTACH=y +CONFIG_TCPSVD=y +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +CONFIG_FEATURE_TELNETD_STANDALONE=y +# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set +CONFIG_TFTP=y +# CONFIG_TFTPD is not set + +# +# Common options for tftp/tftpd +# +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y +CONFIG_TFTP_DEBUG=y +CONFIG_TRACEROUTE=y +CONFIG_TRACEROUTE6=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_TUNCTL=y +CONFIG_FEATURE_TUNCTL_UG=y +# CONFIG_UDHCPD is not set +# CONFIG_DHCPRELAY is not set +# CONFIG_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="" +# CONFIG_UDHCPC is not set +# CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCP_PORT is not set +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_UDPSVD=y +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 + +# +# 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_SMEMCAP is not set +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_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_FEATURE_SHOW_THREADS=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_ASH=y +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_ALIAS=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_BASH_COMPAT 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_HUSH_FUNCTIONS is not set +# CONFIG_HUSH_LOCAL is not set +# CONFIG_HUSH_EXPORT_N is not set +# CONFIG_HUSH_RANDOM_SUPPORT is not set +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +# CONFIG_FEATURE_BASH_IS_ASH is not set +# CONFIG_FEATURE_BASH_IS_HUSH is not set +CONFIG_FEATURE_BASH_IS_NONE=y +# CONFIG_LASH is not set +# CONFIG_MSH is not set +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 +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_SYSLOGD_READ_BUFFER_SIZE=256 +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 diff --git a/source/a/mkinitrd/init b/source/a/mkinitrd/init index a6f1091e8..2205a5928 100755 --- a/source/a/mkinitrd/init +++ b/source/a/mkinitrd/init @@ -56,12 +56,7 @@ # 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. +# A script that uses modprobe to load the desired modules. # # There's an example in here. To actually use it, you'll # need to make it executable: @@ -138,7 +133,7 @@ else # load modules (if any) in order: 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 - /sbin/insmod $module + /sbin/modprobe $module done unset module fi @@ -151,11 +146,9 @@ 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 control --property=STARTUP=1 + /sbin/udevd --daemon --resolve-names=never /sbin/udevadm trigger --subsystem-match=block --action=add /sbin/udevadm settle --timeout=10 - /sbin/udevadm control --property=STARTUP= else [ "$DEVTMPFS" != "1" ] && mdev -s fi @@ -170,7 +163,10 @@ if [ "$RESCUE" = "" ]; then # Initialize RAID: if [ -x /sbin/mdadm ]; then /sbin/mdadm -E -s >/etc/mdadm.conf + /sbin/mdadm -S -s /sbin/mdadm -A -s + # This seems to make the kernel see partitions more reliably: + fdisk -l /dev/md* 1> /dev/null 2> /dev/null fi # Unlock any encrypted partitions necessary to access the @@ -301,6 +297,7 @@ else fi if pgrep udevd >/dev/null ; then + /sbin/udevadm settle --timeout=30 pkill udevd fi diff --git a/source/a/mkinitrd/mkinitrd b/source/a/mkinitrd/mkinitrd index 4cd97296b..1a5b7731f 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, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -43,7 +43,14 @@ # load-kernel-modules if that file is executable. # Yada yada yada. -MKINITRD_VERSION=1.4.5 +MKINITRD_VERSION=1.4.6 + +# Don't include these things from /lib/udev/ in the initrd image +LIBUDEV_BLACKLIST="\ + ipod-set-info \ + check-mtp-camera \ + check-ptp-camera \ + udev-configure-printer" print_usage() { cat << EOF @@ -90,6 +97,7 @@ initrd, and the script is easy to modify. Be creative. :-) 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 + -M Add the files in /etc/modprobe.d/ to the initrd -R Add support for RAID partitions -V Display version number @@ -97,15 +105,15 @@ 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.6-smp kernel -modules for a system with an ext3 root partition on /dev/hdb3: +Another example: Build an initrd image using Linux 2.6.35.4-smp kernel +modules for a system with an ext4 root partition on /dev/sdb3: - mkinitrd -c -k 2.6.29.6-smp -m mbcache:jbd:ext3 -f ext3 -r /dev/hdb3 + mkinitrd -c -k 2.6.35.4-smp -m mbcache:jbd:ext4 -f ext4 -r /dev/sdb3 -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: +Note that if you are already logged in with /dev/sdb3 as your / +partition, and it is running ext4, this command works just the same: - mkinitrd -c -m ext3 + mkinitrd -c -m ext4 If run without options, mkinitrd will rebuild an initrd image using the contents of the $SOURCE_TREE directory, or, if that directory @@ -187,7 +195,7 @@ unify_libs() { 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/ + find /lib /lib64 -name "ld-*so*" -o -name "libnss_files*so*" -o -name "libnss_compat*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/ # Then copy all remaining libs our initrd files link against: COUNT=1 @@ -197,11 +205,18 @@ copy_libs() { 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 + 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 + if [ $(cat $TMPFILE ${PRFX}${COUNT} | sort |uniq -u | wc -l) -eq 0 ]; then + COUNT=0 + else + TMPFILE=${PRFX}${COUNT} + fi + # emergency eject lever: + if [ "$COUNT" = "42" ]; then + COUNT=0 + fi done for i in $(cat ${PRFX}* | sort -u) ; do @@ -218,6 +233,11 @@ copy_libs() { rm ${PRFX}* } +copy_modconf() { + mkdir -p $SOURCE_TREE/etc + cp -a /etc/modprobe.d $SOURCE_TREE/etc +} + # If --help is given, print_usage and exit: if echo $* | grep -wq '\--help' ; then print_usage @@ -302,10 +322,8 @@ while [ ! -z "$1" ]; do shift 2 ;; -o) - OUTPUT_IMAGE="$2" - if [ ! "$(echo $OUTPUT_IMAGE | cut -b1)" = "/" ]; then - OUTPUT_IMAGE=$(pwd)/$OUTPUT_IMAGE - fi + # canonicalize filename: + OUTPUT_IMAGE="$(readlink -m $2)" shift 2 ;; -r) @@ -313,7 +331,8 @@ while [ ! -z "$1" ]; do shift 2 ;; -s) - SOURCE_TREE="$2" + # canonicalize filename: + SOURCE_TREE="$(readlink -m $2)" shift 2 ;; -u) @@ -337,6 +356,10 @@ while [ ! -z "$1" ]; do LVM=1 shift ;; + -M) + MODCONF=1 + shift + ;; -R) RAID=1 shift @@ -449,6 +472,10 @@ fi if [ ! -z "$UDEV" ]; then cp /sbin/udev* $SOURCE_TREE/sbin/ cp -a /lib/udev $SOURCE_TREE/lib/ + # But we don't want all of /lib/udev + for file in $(echo $LIBUDEV_BLACKLIST) ; do + rm -f $SOURCE_TREE/lib/udev/$file ; + done fi # Include LVM support in initrd @@ -457,7 +484,7 @@ if [ ! -z "$LVM" ]; then mkdir -p $SOURCE_TREE/sbin 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/ + find /lib /lib64 -name "libdevmapper*so*" 2> /dev/null | xargs -I'{}' cp -P --parents '{}' $SOURCE_TREE/ ( cd $SOURCE_TREE/sbin ln -s lvm vgchange 2>/dev/null ln -s lvm vgscan 2>/dev/null ) @@ -505,12 +532,12 @@ fi # 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)" + MODULE_LIST="${MODULE_LIST}:$(cat $SOURCE_TREE/load_kernel_modules |grep "^modprobe" |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 + if grep -q "#modprobe reiserfs" $SOURCE_TREE/load_kernel_modules ; then rm -f $SOURCE_TREE/load_kernel_modules touch $SOURCE_TREE/load_kernel_modules chmod 755 $SOURCE_TREE/load_kernel_modules @@ -522,8 +549,7 @@ if [ ! -z "$MODULE_LIST" ]; then # 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 |tr -s ':' '\n' |awk '!x[$0]++' |tr '\n' ':') MODULE_LIST=$(echo ${MODULE_LIST%:}) # Weed out a trailing ':' # Count number of modules @@ -542,55 +568,63 @@ if [ ! -z "$MODULE_LIST" ]; then INDEX=$(expr $INDEX - 1) # Don't include the null value fi -# Wrap everything in a while loop -i=0 -while [ $i -ne $INDEX ]; do - i=$(( $i + 1 )) - - # FULL_MOD is the module plus any arguments (if any) - # MODULE is the module name - # ARGS is any optional arguments to be passed to the kernel - FULL_MOD="$(echo "$MODULE_LIST" | cut -d ':' -f $i)" - MODULE="$(echo "$FULL_MOD" | cut -d ' ' -f 1 )" - # Test for arguments - if echo "$FULL_MOD" | grep ' ' > /dev/null; then - ARGS=" $(echo "$FULL_MOD" | cut -d ' ' -f 2- )" - else - unset ARGS - fi + # Wrap everything in a while loop + i=0 + while [ $i -ne $INDEX ]; do + i=$(( $i + 1 )) + + # FULL_MOD is the module plus any arguments (if any) + # MODULE is the module name + # ARGS is any optional arguments to be passed to the kernel + FULL_MOD="$(echo "$MODULE_LIST" | cut -d ':' -f $i)" + MODULE="$(echo "$FULL_MOD" | cut -d ' ' -f 1 )" + # Test for arguments + if echo "$FULL_MOD" | grep ' ' > /dev/null; then + ARGS=" $(echo "$FULL_MOD" | cut -d ' ' -f 2- )" + else + unset ARGS + fi - # Get MODULE deps and prepare insmod lines + # Get MODULE deps and prepare modprobe lines /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 - LINE="$(echo "insmod -v $SRCMOD" | sed -e "s/$KERNEL_VERSION/\$(uname -r)/")" + if ! grep -q "$(basename $SRCMOD .ko)" $SOURCE_TREE/load_kernel_modules 2>/dev/null ; then + LINE="$(echo "modprobe -v $(basename $SRCMOD .ko)" )" - # Test to see if arguments should be passed - # Over-ride the previously defined LINE variable if so - if [ "$(basename $SRCMOD .ko)" = "$MODULE" ]; then - # SRCMOD and MODULE are same, ARGS can be passed - LINE="$LINE$ARGS" - fi + # Test to see if arguments should be passed + # Over-ride the previously defined LINE variable if so + if [ "$(basename $SRCMOD .ko)" = "$MODULE" ]; then + # SRCMOD and MODULE are same, ARGS can be passed + LINE="$LINE$ARGS" + fi - fi + fi - if ! grep -qx "$LINE" $SOURCE_TREE/load_kernel_modules ; then - echo "$LINE" >> $SOURCE_TREE/load_kernel_modules - fi + if ! grep -qx "$LINE" $SOURCE_TREE/load_kernel_modules ; then + echo "$LINE" >> $SOURCE_TREE/load_kernel_modules + fi - if [ ! -f ${SOURCE_TREE}${SRCMOD} ]; then - # We did not yet copy this module into the initrd-tree + # Try to add the module to the initrd-tree. This should be done + # even if it exists there already as we may have changed compilers + # or otherwise caused the modules in the initrd-tree to need + # replacement. 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 done -done + # Pregenerate the module dependency information + depmod -a -b $SOURCE_TREE ${KERNEL_VERSION} + + # Copy /etc/modprobe.d/* if desired + if [ ! -z $MODCONF ]; then + copy_modconf + fi fi diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index 7beba6c63..953d3cf87 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.4.5} -BB=1.15.3 -NUMJOBS=${NUMJOBS:--j7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.4.6} +BB=1.18.4 +BUILD=${BUILD:-11} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,6 +35,7 @@ if [ -z "$ARCH" ]; then esac fi +NUMJOBS=${NUMJOBS:--j7} CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mkinitrd @@ -51,14 +51,9 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf busybox-$BB -tar xvf $CWD/busybox-$BB.tar.bz2 || exit 1 +tar xvf $CWD/busybox-$BB.tar.?z* || exit 1 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 - chown -R root:root . sed -e \ 's#^CONFIG_PREFIX=.*#CONFIG_PREFIX="'$PKG'/usr/share/mkinitrd/initrd-tree"#' \ @@ -71,9 +66,12 @@ make install || exit 1 rm -f $PKG/usr/share/mkinitrd/initrd-tree/linuxrc # Copying additional files: -cp $CWD/mkinitrd_command_generator.sh $PKG/usr/share/mkinitrd +cp -a $CWD/mkinitrd_command_generator.sh $PKG/usr/share/mkinitrd +chown root:root $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh chmod 755 $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh -cp $CWD/keymaps.tar.gz $PKG/usr/share/mkinitrd +cp -a $CWD/keymaps.tar.gz $PKG/usr/share/mkinitrd +chown root:root $PKG/usr/share/mkinitrd/keymaps.tar.gz +chmod 644 $PKG/usr/share/mkinitrd/keymaps.tar.gz # Zip up the initrd-tree: ( cd $PKG/usr/share/mkinitrd/initrd-tree @@ -85,11 +83,16 @@ rm -rf $PKG/usr/share/mkinitrd/initrd-tree # Add busybox docs: mkdir -p $PKG/usr/doc/busybox-$BB -cp -a AUTHORS INSTALL LICENSE README \ +cp -a AUTHORS COPYING* INSTALL LICENSE README* \ $PKG/usr/doc/busybox-$BB +cp -a e2fsprogs/README $PKG/usr/doc/busybox-$BB/README.e2fsprogs +cp -a libbb/README $PKG/usr/doc/busybox-$BB/README.libbb +cp -a shell/README $PKG/usr/doc/busybox-$BB/README.shell +cp -a testsuite/README $PKG/usr/doc/busybox-$BB/README.testsuite mkdir -p $PKG/sbin -cat $CWD/mkinitrd > $PKG/sbin/mkinitrd +cp -a $CWD/mkinitrd $PKG/sbin/mkinitrd +chown root:root $PKG/sbin/mkinitrd chmod 755 $PKG/sbin/mkinitrd mkdir -p $PKG/usr/man/man{5,8} @@ -97,7 +100,9 @@ cat $CWD/mkinitrd.8 | gzip -9c > $PKG/usr/man/man8/mkinitrd.8.gz cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz mkdir -p $PKG/etc -cat $CWD/mkinitrd.conf.sample > $PKG/etc/mkinitrd.conf.sample +cp -a $CWD/mkinitrd.conf.sample $PKG/etc/mkinitrd.conf.sample +chown root:root $PKG/etc/mkinitrd.conf.sample +chmod 644 $PKG/etc/mkinitrd.conf.sample mkdir -p $PKG/usr/doc/mkinitrd-$VERSION cp -a $CWD/README.initrd $PKG/usr/doc/mkinitrd-$VERSION diff --git a/source/a/mkinitrd/mkinitrd.conf.5 b/source/a/mkinitrd/mkinitrd.conf.5 index 7b316d0f1..6cfef91ad 100644 --- a/source/a/mkinitrd/mkinitrd.conf.5 +++ b/source/a/mkinitrd/mkinitrd.conf.5 @@ -1,5 +1,5 @@ .\" mkinitrd.5 Robby Workman <rworkman@slackware.com> -.\" 19 December 2009 " +.\" 28 August 2010 " .TH MKINITRD.CONF 5 "27 March 2010" "Slackware 13.1" .SH NAME @@ -172,7 +172,11 @@ LVM="1" # Add LVM support to initrd .I UDEV Use UDEV in the initrd. .br -Example: UDEV="1" +Examples: +.br +UDEV="0" # Do not use udev in the initrd +.br +UDEV="1" # Use udev in the initrd (this is the default) .TP 5 .I WAIT @@ -188,6 +192,20 @@ The swap partition holding your hibernation image. .br Example: RESUMEDEV="/dev/sda2" +.TP 5 +.I MODCONF +This option defines whether to copy the module-init-tools config files +from /etc/modprobe.d/ into the initrd. This will not usually be necessary, +but if you need certain modules to be loaded with special options, and you +have this configured in a file in /etc/modprobe.d/, this is one way to +accomplish the desired goal. +.br +Examples: +.br +MODCONF="0" # Do not add /etc/modprobe.d/* to the initrd +.br +MODCONF="1" # Add /etc/modprobe.d/* to the initrd + .SH FILES .I /etc/mkinitrd.conf .br diff --git a/source/a/mkinitrd/mkinitrd.conf.sample b/source/a/mkinitrd/mkinitrd.conf.sample index 4838354b5..9bb9f14c6 100644 --- a/source/a/mkinitrd/mkinitrd.conf.sample +++ b/source/a/mkinitrd/mkinitrd.conf.sample @@ -6,7 +6,7 @@ #OUTPUT_IMAGE="/boot/initrd.gz" #KERNEL_VERSION="$(uname -r)" #KEYMAP="us" -#MODULE_LIST="ext3" +#MODULE_LIST="ext4" #LUKSDEV="/dev/sda2" #LUKSKEY="LABEL=TRAVELSTICK:/keys/alienbob.luks" #ROOTDEV="/dev/sda1" @@ -15,4 +15,5 @@ #RAID="0" #LVM="0" #UDEV="1" +#MODCONF="0" #WAIT="1" diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh index b26d9109c..04c0c2a03 100644 --- a/source/a/mkinitrd/mkinitrd_command_generator.sh +++ b/source/a/mkinitrd/mkinitrd_command_generator.sh @@ -1,7 +1,9 @@ #!/bin/sh -# $Id: mkinitrd_command_generator.sh,v 1.40 2008/12/18 23:32:56 eha Exp eha $ -# Copyright 2008, 2009 by Eric Hameleers <alien@slackware.com>, Eindhoven, Netherlands -# Copyright 2008, 2009 by PiterPUNK <piterpunk@slackware.com>, Sao Paulo, SP, Brazil +# $Id: mkinitrd_command_generator.sh,v 1.45 2011/02/17 09:27:05 eha Exp eha $ +# Copyright 2008, 2009, 2010, 2011 Eric Hameleers, Eindhoven, Netherlands +# Contact: <alien@slackware.com> +# Copyright 2008, 2009 PiterPUNK, Sao Paulo, SP, Brazil +# Contact: <piterpunk@slackware.com> # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -31,7 +33,7 @@ # ----------------------------------------------------------------------------- # The script's revision number will be displayed in the help text: -REV=$( echo "$Revision: 1.40 $" | cut -d' ' -f2 ) +REV=$( echo "$Revision: 1.45 $" | cut -d' ' -f2 ) # Define some essential parameter values: USING_LVM="" @@ -47,7 +49,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} +UDEV=${UDEV:-1} WAIT=${WAIT:-1} # A basic explanation of the commandline parameters: @@ -117,7 +119,7 @@ extended_usage() { EOT - echo " \$($(basename $0) --run /boot/vmlinuz-generic-smp-2.6.24.5-smp)" + echo " \$($(basename $0) --run /boot/vmlinuz-generic-smp-2.6.35.11-smp)" cat <<-EOT @@ -130,7 +132,7 @@ extended_usage() { EOT - echo " $(basename $0) --lilo /boot/vmlinuz-generic-smp-2.6.24.5-smp >>/etc/lilo.conf" + echo " $(basename $0) --lilo /boot/vmlinuz-generic-smp-2.6.35.11-smp >>/etc/lilo.conf" cat <<-EOT @@ -138,11 +140,11 @@ extended_usage() { '/etc/lilo.conf' file (example for my hardware): # Linux bootable partition config begins - # initrd created with 'mkinitrd -c -k 2.6.24.5-smp -m ata_generic:pata_amd:mbcache:jbd:ext3 -f ext3 -r /dev/hda7' - image = /boot/vmlinuz-generic-smp-2.6.24.5-smp + # initrd created with 'mkinitrd -c -k 2.6.35.11-smp -m ata_generic:pata_amd:mbcache:jbd:ext3 -f ext3 -r /dev/hda7' + image = /boot/vmlinuz-generic-smp-2.6.35.11-smp initrd = /boot/initrd.gz root = /dev/hda7 - label = 2.6.24.5-smp + label = 2.6.35.11-smp read-only # Linux bootable partition config ends @@ -156,7 +158,7 @@ extended_usage() { # Find the device that holds the root partition: get_root_device() { if [ -e $FSTAB ]; then - RD=$(cat $FSTAB | tr '\t' ' ' | tr -s ' ' | grep ' / ' | cut -f1 -d' ') + RD=$(cat $FSTAB |tr '\t' ' ' |grep -v '^ *#' |tr -s ' ' |grep ' / ' |cut -f1 -d' ') if [ "$(echo $RD | cut -f1 -d=)" = "LABEL" -o "$(echo $RD | cut -f1 -d=)" = "UUID" ]; then DKEY=$(echo $RD | cut -f1 -d=) # The value can be LABEL=foo or LABEL='foo' or LABEL="foo" @@ -171,11 +173,13 @@ get_root_device() { # Get the root fs information: get_rootfs_type() { - if $(type vol_id 1>/dev/null 2>&1) ; then - vol_id $ROOTDEV | grep ID_FS_TYPE | cut -f2 -d= + if $(type blkid 1>/dev/null 2>&1) ; then + blkid -s TYPE -o value $ROOTDEV + elif $(type vol_id 1>/dev/null 2>&1) ; then + vol_id $ROOTDEV | grep ID_FS_TYPE | cut -f2 -d= else - # Alternatively, use: - cat $FSTAB | tr '\t' ' ' | tr -s ' ' | grep ' / ' | cut -f3 -d' ' + # As a fallback, use: + cat $FSTAB |tr '\t' ' ' |grep -v '^ *#' |tr -s ' ' |grep ' / ' |cut -f3 -d' ' fi } @@ -195,14 +199,16 @@ add_rootfs_module() { determine_blockdev_drivers() { # Walk the /sys tree to find kernel modules that are # required for our storage devices. - # Thanks to PiterPUNK for this piece of code. + # Thanks to PiterPUNK for help with this code. local MLIST - MLIST=$(for i in $(find /sys/block -name "device" -exec ls -l {} \; | sed -ne 's:.*/\(devices.*\)/[a-zA-Z]\+[.0-9]\+/.*:/sys/\1:p' | sort -u); do - for j in $(find $i -name "modalias"); do - /sbin/modprobe --set-version $KVER --show-depends $(cat $j) 2>/dev/null | while read LINE ; do + MLIST=$(for i in $(find /sys/block/*/ -name "device" -print0 | xargs -0 -i'{}' readlink -f '{}' | sort -u); do + /sbin/udevadm info --query=all --path=$i --attribute-walk | \ + sed -ne 's/^[[:blank:]]\+DRIVER[S]*=="\([^"]\+\)"$/\1/p' | \ + xargs -I@ /sbin/modprobe --set-version $KVER --show-depends @ \ + 2>/dev/null | grep -v "builtin " | \ + while read LINE ; do echo $(basename $(echo $LINE | cut -d' ' -f2) .ko ) done - done done) MLIST=$( echo $MLIST | tr ' ' ':' ) echo $MLIST @@ -223,7 +229,7 @@ function add_usb_keyboard() { # Determine what USB Host Controller is in use function add_usb_hcd() { local USBMOD - for i in `ls -Ld /sys/module/*_hcd/drivers/*`; do + for i in $(ls -Ld /sys/module/*_hcd/drivers/*); do if ls -L $i | grep -q "[0-9a-f]*:" ; then USBMOD=$( echo $i | cut -f4 -d/ | tr "_" "-") [ -n "$MLIST" ] && MLIST="$MLIST:$USBMOD" \ @@ -239,7 +245,7 @@ check_luks_lvm_raid() { # Our root partition is on a LV: USING_LVM=1 # Search the Physical Volume of our Logical Volume: - MYVG=$( echo $(lvdisplay -c $ROOTDEV) | cut -d: -f2 ) + MYVG=$( echo $(lvdisplay -c $ROOTDEV 2>/dev/null) | cut -d: -f2 ) for LINE in $(pvdisplay -c) ; do VG=$(echo $LINE | cut -d: -f2) [ "$VG" = "$MYVG" ] && break @@ -260,7 +266,7 @@ check_luks_lvm_raid() { REALDEV=$( cryptsetup status $ROOTDEV | grep 'device: ' | tr -d ' ' | cut -d: -f2 ) ROOTDEV=$(basename $ROOTDEV) # Check for LVM: - for LV in $(lvdisplay -c | tr -d ' ' | cut -f1 -d:) ; do + for LV in $(lvdisplay -c 2>/dev/null | tr -d ' ' | cut -f1 -d:) ; do # Note: cryptsetup shows the real device, whereas # lvdisplay requires the /dev/<myvg>/... symlink to the real device. if [ "$(readlink $LV)" = "$REALDEV" ]; then @@ -272,7 +278,7 @@ check_luks_lvm_raid() { # Our root partition's LUKS device is on a LV: USING_LVM=1 # Search the Physical Volume of our Logical Volume: - MYVG=$( echo $(lvdisplay -c $REALDEV) | cut -d: -f2 ) + MYVG=$( echo $(lvdisplay -c $REALDEV 2>/dev/null) | cut -d: -f2 ) for LINE in $(pvdisplay -c) ; do VG=$(echo $LINE | cut -d: -f2) [ "$VG" = "$MYVG" ] && break @@ -312,7 +318,7 @@ while [ ! -z "$1" ]; do exit 0 ;; -a) - MKINIT_PARAMS=$2 + MKINIT_PARAMS="$2" shift 2 ;; -c|--conf) @@ -427,6 +433,12 @@ ROOTFS=$(get_rootfs_type) # Determine the list of kernel modules needed to support the root device: MLIST=$(determine_blockdev_drivers) +# Check if we are running in a kvm guest with virtio block device driver +# (add all virtio modules, we sort out the doubles later): +if echo $MLIST | grep -q "virtio"; then + MLIST="$MLIST:virtio:virtio_balloon:virtio_blk:virtio_ring:virtio_pci:virtio_net" +fi + # Determine if a USB keyboard is in use and include usbhid to module list MLIST=$(add_usb_keyboard) @@ -533,8 +545,8 @@ 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) +"UDEV" "Use UDEV in the initrd for device configuration" $(test $UDEV -eq 1 && echo on || echo off) \ +"WAIT" "Add delay to allow detection of slow disks at boot" $(test WAIT -gt 1 && echo on || echo off) ) if [ "$?" != "0" ]; then exit 1 fi @@ -786,8 +798,8 @@ if [ -n "$WAIT" -a $WAIT -ne 1 ]; then # Add non-default wait time: MKINIT="$MKINIT -w $WAIT" fi -if ! echo "$MKINIT_PARAMS" | grep -q ' -o ' ; then - # Add non-default output filename: +if ! echo "$MKINIT_PARAMS" | grep -q -- '-o ' ; then + # Add default output filename: MKINIT="$MKINIT -o $IMGFILE" fi if [ -n "$MKINIT_PARAMS" ]; then diff --git a/source/a/module-init-tools/doinst.sh b/source/a/module-init-tools/doinst.sh new file mode 100644 index 000000000..f455be891 --- /dev/null +++ b/source/a/module-init-tools/doinst.sh @@ -0,0 +1,7 @@ +# Remove/move obsolete configuration: +if [ -L etc/modprobe.d/modprobe.conf ]; then + rm -f etc/modprobe.d/modprobe.conf +fi +if [ -e etc/modprobe.conf ]; then + mv etc/modprobe.conf etc/modprobe.conf.obsolete +fi 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 a65fba0ad..5517502b7 100644 --- a/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff +++ b/source/a/module-init-tools/modprobe.ignore_some_suffixes.diff @@ -1,6 +1,6 @@ -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 +diff -Nur module-init-tools-3.12.orig//modprobe.c module-init-tools-3.12/modprobe.c +--- module-init-tools-3.12.orig//modprobe.c 2010-05-04 00:19:27.000000000 -0500 ++++ module-init-tools-3.12/modprobe.c 2010-06-08 04:32:46.655088739 -0500 @@ -38,6 +38,7 @@ #include <asm/unistd.h> #include <sys/wait.h> @@ -9,8 +9,8 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp #include "util.h" #include "elfops.h" -@@ -861,6 +862,20 @@ - options, commands, aliases, blacklist); +@@ -789,6 +790,20 @@ + return strsep(string, delim); } +/* Let's exclude a few file extensions */ @@ -28,9 +28,9 @@ diff -Nur module-init-tools-3.11.orig/modprobe.c module-init-tools-3.11.new/modp +} + static int parse_config_scan(const char *filename, - const char *name, + struct modprobe_conf *conf, int dump_only, -@@ -887,6 +902,8 @@ +@@ -1066,6 +1081,8 @@ while ((i = readdir(dir)) != NULL) { size_t len; 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 deleted file mode 100644 index 640ab3086..000000000 --- a/source/a/module-init-tools/modprobe.quit.whining.about.modprobe.conf.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- ./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 9b390d11a..a8dc73ab3 100755 --- a/source/a/module-init-tools/module-init-tools.SlackBuild +++ b/source/a/module-init-tools/module-init-tools.SlackBuild @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo module-init-tools-*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} @@ -58,11 +58,6 @@ find . \ # 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 || 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= \ ./configure \ @@ -106,6 +101,7 @@ if [ -r ChangeLog ]; then 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/mt-st/mt-st.SlackBuild b/source/a/mt-st/mt-st.SlackBuild index cbf44ec2f..a906438df 100755 --- a/source/a/mt-st/mt-st.SlackBuild +++ b/source/a/mt-st/mt-st.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,9 +22,18 @@ VERSION=${VERSION:-0.9b} -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-mt-st diff --git a/source/a/mtx/mtx.SlackBuild b/source/a/mtx/mtx.SlackBuild index c17d11769..6e648f039 100755 --- a/source/a/mtx/mtx.SlackBuild +++ b/source/a/mtx/mtx.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# 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 @@ -27,9 +27,18 @@ # ftp://ftp.badtux.net/pub/storage/mtx PACKAGE=mtx -VERSION=1.3.9 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=1.3.12 +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/ncompress/ncompress-4.2.4-bssUnderflow.patch b/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch deleted file mode 100644 index 0ae7ec59f..000000000 --- a/source/a/ncompress/ncompress-4.2.4-bssUnderflow.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ncompress-4.2.4/compress42.c.bssUnderflow 2006-08-10 11:40:03.000000000 +0200 -+++ ncompress-4.2.4/compress42.c 2006-08-10 11:40:31.000000000 +0200 -@@ -1689,6 +1689,10 @@ - - if (oldcode == -1) - { -+ if (code >= 256) { -+ fprintf(stderr, "uncompress: corrupt input\n"); -+ abort_compress(); -+ } - outbuf[outpos++] = (char_type)(finchar = (int)(oldcode = code)); - continue; - } diff --git a/source/a/ncompress/ncompress-4.2.4-endians.patch b/source/a/ncompress/ncompress-4.2.4-endians.patch deleted file mode 100644 index fdc966220..000000000 --- a/source/a/ncompress/ncompress-4.2.4-endians.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ncompress-4.2.4/compress42.c.endians 2006-09-19 13:53:58.000000000 +0200 -+++ ncompress-4.2.4/compress42.c 2006-09-19 13:57:54.000000000 +0200 -@@ -432,7 +432,7 @@ - - union bytes - { -- long word; -+ int word; - struct - { - #if BYTEORDER == 4321 diff --git a/source/a/ncompress/ncompress.2GB.diff b/source/a/ncompress/ncompress.2GB.diff deleted file mode 100644 index 8c545caf4..000000000 --- a/source/a/ncompress/ncompress.2GB.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ncompress-4.2.4/compress42.c.2GB 2004-07-14 12:16:19.000000000 -0400 -+++ ncompress-4.2.4/compress42.c 2004-07-14 12:16:59.000000000 -0400 -@@ -1329,7 +1329,7 @@ - REG11 int boff; - REG12 int n_bits; - REG13 int ratio; -- REG14 long checkpoint; -+ REG14 unsigned long long checkpoint; - REG15 code_int extcode; - union - { diff --git a/source/a/ncompress/ncompress.SlackBuild b/source/a/ncompress/ncompress.SlackBuild index e8b1c68fa..ba6f38d5c 100755 --- a/source/a/ncompress/ncompress.SlackBuild +++ b/source/a/ncompress/ncompress.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,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=4.2.4 -ARCH=${ARCH:-x86_64} +VERSION=4.2.4.3 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-ncompress @@ -42,14 +51,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/ncompress.make.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/ncompress.lfs2.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/ncompress.filenamelen.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/ncompress.2GB.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/ncompress.zerobyteforce.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/ncompress-${VERSION}-bssUnderflow.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/ncompress-${VERSION}-endians.patch.gz | patch -p1 --verbose || exit 1 - make ENDIAN=4321 || exit 1 mkdir -p $PKG/usr/bin cat compress > $PKG/usr/bin/compress diff --git a/source/a/ncompress/ncompress.filenamelen.diff b/source/a/ncompress/ncompress.filenamelen.diff deleted file mode 100644 index 67676c7a8..000000000 --- a/source/a/ncompress/ncompress.filenamelen.diff +++ /dev/null @@ -1,98 +0,0 @@ ---- ncompress-4.2.4/compress42.c.filenamelen Wed Nov 21 12:19:38 2001 -+++ ncompress-4.2.4/compress42.c Wed Nov 21 12:20:03 2001 -@@ -140,6 +140,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <errno.h> -+#include <string.h> - - #ifdef DIRENT - # include <dirent.h> -@@ -213,7 +214,7 @@ - # define OBUFSIZ BUFSIZ /* Default output buffer size */ - #endif - --#define MAXPATHLEN 1024 /* MAXPATHLEN - maximum length of a pathname we allow */ -+#define MAXPATHLEN PATH_MAX /* MAXPATHLEN - maximum length of a pathname we allow */ - #define SIZE_INNER_LOOP 256 /* Size of the inter (fast) compress loop */ - - /* Defines for third byte of header */ -@@ -641,13 +642,11 @@ - } ; - #endif - --void main ARGS((int,char **)); - void Usage ARGS((void)); - void comprexx ARGS((char **)); - void compdir ARGS((char *)); - void compress ARGS((int,int)); - void decompress ARGS((int,int)); --char *rindex ARGS((char *,int)); - void read_error ARGS((void)); - void write_error ARGS((void)); - void abort_compress ARGS((void)); -@@ -694,13 +693,15 @@ - * deterministic, and can be done on the fly. Thus, the decompression - * procedure needs no input table, but tracks the way the table was built. - */ --void -+int - main(argc, argv) - REG1 int argc; - REG2 char *argv[]; - { - REG3 char **filelist; - REG4 char **fileptr; -+ int i; -+ - - if (fgnd_flag = (signal(SIGINT, SIG_IGN) != SIG_IGN)) - signal(SIGINT, (SIG_TYPE)abort_compress); -@@ -714,7 +715,14 @@ - nomagic = 1; /* Original didn't have a magic number */ - #endif - -- filelist = fileptr = (char **)malloc(argc*sizeof(char *)); -+ for(i=0;i<argc;i++){ -+ if(strlen(argv[i])>(MAXPATHLEN-1)){ -+ fprintf(stderr,"Filename too long\n"); -+ exit(1); -+ } -+ } -+ -+ filelist = fileptr = (char **)malloc(argc*sizeof(char *)); - *filelist = NULL; - - if((progname = rindex(argv[0], '/')) != 0) -@@ -853,8 +861,9 @@ - else - decompress(0, 1); - } -- -+ - exit((exit_code== -1) ? 1:exit_code); -+ return 0; - } - - void -@@ -1801,20 +1810,6 @@ - write_error(); - } - --char * --rindex(s, c) /* For those who don't have it in libc.a */ -- REG1 char *s; -- REG2 int c; -- { -- char *p; -- -- for (p = NULL; *s; s++) -- if (*s == (char)c) -- p = s; -- -- return(p); -- } -- - void - read_error() - { diff --git a/source/a/ncompress/ncompress.lfs2.diff b/source/a/ncompress/ncompress.lfs2.diff deleted file mode 100644 index 9da42eb56..000000000 --- a/source/a/ncompress/ncompress.lfs2.diff +++ /dev/null @@ -1,52 +0,0 @@ ---- ncompress-4.2.4/compress42.c.lfs 2002-06-19 19:19:33.000000000 -0400 -+++ ncompress-4.2.4/compress42.c 2002-06-19 19:20:48.000000000 -0400 -@@ -130,6 +130,7 @@ - * Add variable bit length output. - * - */ -+#include <unistd.h> - #include <stdio.h> - #include <fcntl.h> - #include <ctype.h> -@@ -168,30 +169,6 @@ - # define SIG_TYPE void (*)() - #endif - --#ifndef NOFUNCDEF -- extern void *malloc LARGS((int)); -- extern void free LARGS((void *)); --#ifndef _IBMR2 -- extern int open LARGS((char const *,int,...)); --#endif -- extern int close LARGS((int)); -- extern int read LARGS((int,void *,int)); -- extern int write LARGS((int,void const *,int)); -- extern int chmod LARGS((char const *,int)); -- extern int unlink LARGS((char const *)); -- extern int chown LARGS((char const *,int,int)); -- extern int utime LARGS((char const *,struct utimbuf const *)); -- extern char *strcpy LARGS((char *,char const *)); -- extern char *strcat LARGS((char *,char const *)); -- extern int strcmp LARGS((char const *,char const *)); -- extern unsigned strlen LARGS((char const *)); -- extern void *memset LARGS((void *,char,unsigned int)); -- extern void *memcpy LARGS((void *,void const *,unsigned int)); -- extern int atoi LARGS((char const *)); -- extern void exit LARGS((int)); -- extern int isatty LARGS((int)); --#endif -- - #define MARK(a) { asm(" .globl M.a"); asm("M.a:"); } - - #ifdef DEF_ERRNO -@@ -535,8 +512,8 @@ - char ofname[MAXPATHLEN]; /* Output filename */ - int fgnd_flag = 0; /* Running in background (SIGINT=SIGIGN) */ - --long bytes_in; /* Total number of byte from input */ --long bytes_out; /* Total number of byte to output */ -+long long bytes_in; /* Total number of byte from input */ -+long long bytes_out; /* Total number of byte to output */ - - /* - * 8086 & 80286 Has a problem with array bigger than 64K so fake the array diff --git a/source/a/ncompress/ncompress.make.diff b/source/a/ncompress/ncompress.make.diff deleted file mode 100644 index 2a0acc1cc..000000000 --- a/source/a/ncompress/ncompress.make.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- ncompress-4.2.4/Makefile.orig Thu Oct 31 10:38:46 1996 -+++ ncompress-4.2.4/Makefile Thu Oct 31 10:39:12 1996 -@@ -0,0 +1,57 @@ -+# Makefile generated by build. -+ -+# C complier -+CC=cc $(RPM_OPT_FLAGS) -+ -+# Install directory for binarys -+BINDIR=/usr/bin -+ -+# Install directory for manual -+MANDIR=/usr/man/man1 -+ -+# compiler options: -+# options is a collection of: -+# -+# -DAMIGA=1 Amiga support. -+# -DNOFUNCDEF=1 Disable libary function definitions in -+# compress42.c -+# -DDIRENT=1 Use dirent.h -+# -DSYSDIR=1 Use sys/dir.h -+# -DLSTAT=1 Use lstat for finding symlinks. -+# -DUTIME_H=1 Use utime.h -+# -DUSERMEM=<size> Availble memory for compress (default 800k). -+# -DREGISTERS=<nbr> Number of registers (default 2). -+# -DIBUFSIZ=<size> Input buffer size (default BUFSIZ). -+# -DOBUFSIZ=<size> Output buffer size (default BUFSIZ) -+# -DBYTEORDER=<order> Byte order (default: unknown). -+# -DNOALLIGN=1 Data word allignment (default: yes). -+# -DDEF_ERRNO=1 Define error (not defined in errno.h). -+# -DMAXSEG_64K=1 -BITS=16 Support segment processsor like 80286. -+# -+options= -DDIRENT=1 -DSYSDIR=1 -DUTIME_H=1 -DUSERMEM=800000 -DREGISTERS=20 -DIBUFSIZ=1024 -DOBUFSIZ=1024 -DBYTEORDER=$(ENDIAN) -+ -+# libary options -+LBOPT= -+ -+ -+compress: Makefile compress42.c patchlevel.h -+ $(CC) -o compress $(options) "-DCOMPILE_DATE=\"`date`\"" compress42.c -+ -+install: compress -+ [ -f $(BINDIR)/compress ] && \ -+ { rm -f $(BINDIR)/compress.old ; \ -+ mv $(BINDIR)/compress $(BINDIR)/compress.old ; } -+ rm -f $(BINDIR)/uncompress $(BINDIR)/zcat -+ cp compress $(BINDIR)/compress -+ strip $(BINDIR)/compress -+ rm -f $(BINDIR)/uncompress -+ ln $(BINDIR)/compress $(BINDIR)/uncompress -+ rm -f $(BINDIR)/zcat -+ ln -f $(BINDIR)/compress $(BINDIR)/zcat -+ cp zcmp zdiff zmore $(BINDIR)/. -+ chmod 0755 $(BINDIR)/compress $(BINDIR)/zcmp $(BINDIR)/zdiff $(BINDIR)/zmore -+ cp compress.1 zcmp.1 zmore.1 $(MANDIR)/. -+ chmod 0644 $(MANDIR)/compress.1 $(MANDIR)/zcmp.1 $(MANDIR)/zmore.1 -+ -+cleanup: -+ rm -f compress compress.def comp.log diff --git a/source/a/ncompress/ncompress.zerobyteforce.diff b/source/a/ncompress/ncompress.zerobyteforce.diff deleted file mode 100644 index 465d67e3e..000000000 --- a/source/a/ncompress/ncompress.zerobyteforce.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- ncompress-4.2.4/compress42.c.zerobyteforce 2006-04-14 14:18:28.000000000 +0200 -+++ ncompress-4.2.4/compress42.c 2006-04-14 14:20:15.000000000 +0200 -@@ -1145,10 +1145,12 @@ - if (fdout != 1 && close(fdout)) - write_error(); - -- if (bytes_in == 0) -+ if ( (bytes_in == 0) && (force == 0 ) ) - { - if (remove_ofname) - { -+ if(!quiet) -+ fprintf(stderr, "No compression -- %s unchanged\n", ifname); - if (unlink(ofname)) /* Remove input file */ - { - fprintf(stderr, "\nunlink error (ignored) "); -@@ -1157,6 +1159,7 @@ - } - - remove_ofname = 0; -+ exit_code = 2; - } - } - else diff --git a/source/a/ntfs-3g/ntfs-3g.SlackBuild b/source/a/ntfs-3g/ntfs-3g.SlackBuild index 93612e0c3..ab5b1f717 100755 --- a/source/a/ntfs-3g/ntfs-3g.SlackBuild +++ b/source/a/ntfs-3g/ntfs-3g.SlackBuild @@ -99,10 +99,8 @@ cat $CWD/10-ntfs-3g-policy.fdi \ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( 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 -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done rm -rf $PKG/usr/share/doc mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/a/patch/patch.SlackBuild b/source/a/patch/patch.SlackBuild index fb0c06d98..1175620b6 100755 --- a/source/a/patch/patch.SlackBuild +++ b/source/a/patch/patch.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-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=2.5.4 -ARCH=${ARCH:-x86_64} +VERSION=2.6.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-patch @@ -31,23 +40,35 @@ PKG=$TMP/package-patch rm -rf $PKG mkdir -p $TMP $PKG +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 + cd $TMP rm -rf patch-${VERSION} -tar xzvf $CWD/patch-${VERSION}.tar.gz +tar xvf $CWD/patch-${VERSION}.tar.xz || exit 1 cd patch-${VERSION} chown -R root:root . -mkdir -p $PKG/usr/doc/patch-${VERSION} -cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/patch-${VERSION} -chmod 644 $PKG/usr/doc/patch-${VERSION}/* +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 \ - $ARCH-slackware-linux -make CFLAGS=-O2 || exit 1 -mkdir -p $PKG/usr/bin -cat patch > $PKG/usr/bin/patch -chmod 755 $PKG/usr/bin/patch -mkdir -p $PKG/usr/man/man1 -cat patch.man | gzip -9c > $PKG/usr/man/man1/patch.1.gz + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make -j4 || make || exit 1 +make install DESTDIR=$PKG # Strip everything for good measure: ( cd $PKG @@ -55,6 +76,34 @@ cat patch.man | gzip -9c > $PKG/usr/man/man1/patch.1.gz 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 + +mkdir -p $PKG/usr/doc/patch-${VERSION} +cp -a \ + AUTHORS COPYING* NEWS README* \ + $PKG/usr/doc/patch-${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/cpufrequtils/cpufrequtils-007.tar.bz2.sign b/source/a/pcmciautils/pcmciautils-017.tar.sign index 0f1c2d05a..cd492c77b 100644 --- a/source/a/cpufrequtils/cpufrequtils-007.tar.bz2.sign +++ b/source/a/pcmciautils/pcmciautils-017.tar.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBLUe7ryGugalF9Dw4RAjeTAJ0ZRX3DI6onTBY5uGhNP9xgOrI6TACfcVoa -+S69xcWuAKSnsqVPuZWZhDM= -=gD0S +iD8DBQBLRLP8yGugalF9Dw4RAn4EAJ96T5HaIjfdqhIfp2/GeL18BgylOwCfZA+R +sWw0NvzDaf3ZKhgHZHNmGLs= +=A5s6 -----END PGP SIGNATURE----- diff --git a/source/a/pcmciautils/pcmciautils.SlackBuild b/source/a/pcmciautils/pcmciautils.SlackBuild index dcf70895a..fa4581720 100755 --- a/source/a/pcmciautils/pcmciautils.SlackBuild +++ b/source/a/pcmciautils/pcmciautils.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for pcmciautils -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,11 +23,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-015} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-017} +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 + # parallel build will cause an error building ccdv: NUMJOBS=${NUMJOBS:-" -j1 "} -BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -37,7 +47,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf pcmciautils-$VERSION -tar xvf $CWD/pcmciautils-$VERSION.tar.bz2 +tar xvf $CWD/pcmciautils-$VERSION.tar.bz2 || exit 1 cd pcmciautils-$VERSION chown -R root.root . find . \ @@ -58,16 +68,19 @@ make install DESTDIR=$PKG || exit 1 # Add some firmware: ( cd $PKG - tar xvf $CWD/cis-cs-3.2.8.tar.gz + tar xvf $CWD/cis-cs-3.2.8.tar.gz || exit 1 chown -R root:root lib -) +) || exit 1 rm -rf $PKG/etc/* mkdir -p $PKG/etc/pcmcia $PKG/etc/rc.d $PKG/lib/udev/rules.d cp -a $CWD/config/rc.pcmcia $PKG/etc/rc.d/rc.pcmcia.new chown root:root $PKG/etc/rc.d/rc.pcmcia.new -chmod 0755 $PKG/etc/rc.d/rc.pcmcia.new +# PCMCIA is the exception rather than the rule in 2011. +# Don't activate /etc/rc.d/rc.pcmcia on a new package install, +# leave that for the admin. +chmod 0644 $PKG/etc/rc.d/rc.pcmcia.new cp -a $CWD/config/config.opts $PKG/etc/pcmcia/config.opts.new chown root:root $PKG/etc/pcmcia/config.opts.new @@ -77,12 +90,6 @@ cp -a udev/60-pcmcia.rules $PKG/lib/udev/rules.d/60-pcmcia.rules chown root:root $PKG/lib/udev/rules.d/60-pcmcia.rules chmod 0644 $PKG/lib/udev/rules.d/60-pcmcia.rules -# Create some symlinks that the udev rules file wants -( cd $PKG/lib/udev - ln -s ../../sbin/pcmcia-check-broken-cis . - ln -s ../../sbin/pcmcia-socket-startup . -) - mv $PKG/usr/share/man $PKG/usr rmdir $PKG/usr/share @@ -102,7 +109,7 @@ if [ -d $PKG/usr/man ]; then fi mkdir -p $PKG/usr/doc/pcmciautils-$VERSION -cp COPYING* $PKG/usr/doc/pcmciautils-$VERSION +cp -a COPYING* README* doc/*.txt $PKG/usr/doc/pcmciautils-$VERSION mkdir $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/a/pkgtools/manpages/installpkg.8 b/source/a/pkgtools/manpages/installpkg.8 index 2d77f10e7..534f20849 100644 --- a/source/a/pkgtools/manpages/installpkg.8 +++ b/source/a/pkgtools/manpages/installpkg.8 @@ -28,6 +28,9 @@ installpkg \- install Slackware packages. .B \--menu ] [ +.B \--terse +] +[ .B \--ask ] [ @@ -47,9 +50,9 @@ for use with the Slackware Linux distribution onto your system. .SH OPTIONS .TP .B \--warn packagename -Generate a report to the standard output about which files and directories -would be removed or overwritten if you install the package, but do not -actually install it. +Generate a list of files that would be overwritten to the standard output, but do +not actually install the package. The list is formatted in a suitable fashion to +use as a list of files to backup. .TP .B \--md5sum packagename Record the package md5sum in the metadata written in /var/log/packages. @@ -67,6 +70,9 @@ Primarily used when installpkg is called from other scripts. Use /bin/dialog to display a menu asking the user if they would like to install the package(s) or not. Generally used when installpkg is called from other scripts. .TP +.B \--terse +Install the package displaying only a single description line to stdout. +.TP .B \--ask Used with -menu mode. When selected, always ask if a package should be installed regardless of what the package's priority is. @@ -81,6 +87,20 @@ the values set in the tagfile for the entire package list. .B \--tagfile /somedir/tagfile Specify a different file to use for package priorities (in this example, /somedir/tagfile will be used). The default is "tagfile" in the package's directory. +.SH EXAMPLES +.TP +.B Install a font package for X: +.P +installpkg font-bh-ttf-1.0.3-noarch-1.txz +.P +Note that if a package is already installed, upgradepkg(8) should be used instead. +.TP +.B Create a backup of the files that would be overwritten if the package is installed: +.P +.nf +tar czvf /tmp/backup.tar.gz \\ + $(installpkg --warn font-bh-ttf-1.0.3-noarch-1.txz) +.fi .SH AUTHOR Patrick J. Volkerding <volkerdi@slackware.com> .SH "SEE ALSO" diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 46235e16e..4d3a07bfc 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, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.1 +VERSION=13.37 ARCH=${ARCH:-noarch} -BUILD=1 +BUILD=9 if [ ! -d $TMP ]; then mkdir -p $TMP # location to build the source diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index 31bb0b717..2d3f208d2 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 1994, 1998, 2000 Patrick Volkerding, Concord, CA, USA # Copyright 2001, 2003 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2009 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2009, 2011 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,6 +21,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Fri Apr 22 20:45:45 UTC 2011 +# A stronger formula is needed to regularize output that will be parsed. +unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \ + LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \ + LC_IDENTIFICATION LC_ALL +LANG=C +export LANG +# +# Thu Apr 21 17:31:29 UTC 2011 +# Set LC_MESSAGES=C to avoid output parsing issues. +# Might as well do that right now. +#LC_MESSAGES=C +#export LC_MESSAGES +# # Sat Apr 25 21:18:53 UTC 2009 # Converted to use new pkgbase() function to remove pathname and # valid package extensions. @@ -120,6 +134,7 @@ Installpkg is used to install a .t{gz,bz,lz,xz} package like this: options: --warn (warn if files will be overwritten, but do not install) --root /mnt (install someplace else, like /mnt) --infobox (use dialog to draw an info box) + --terse (display a one-line short description for install) --menu (confirm package installation with a menu, unless the priority is [required] or ADD) --ask (used with menu mode: always ask if a package should be @@ -183,6 +198,9 @@ while [ 0 ]; do elif [ "$1" = "-infobox" -o "$1" = "--infobox" ]; then MODE=infobox shift 1 + elif [ "$1" = "-terse" -o "$1" = "--terse" ]; then + MODE=terse + shift 1 elif [ "$1" = "-menu" -o "$1" = "--menu" ]; then MODE=menu shift 1 @@ -247,7 +265,6 @@ fi # If -warn mode was requested, produce the output and then exit: if [ "$MODE" = "warn" ]; then while [ -f "$1" ]; do - echo "#### Scanning the contents of $1..." mkdir -p $TMP/scan$$ # Determine extension: packageext="$( echo $1 | rev | cut -f 1 -d . | rev)" @@ -270,21 +287,24 @@ if [ "$MODE" = "warn" ]; then if [ -r $TMP/scan$$/install/doinst.sh ]; then if cat $TMP/scan$$/install/doinst.sh | grep ' rm -rf ' 1>/dev/null 2>/dev/null ; then cat $TMP/scan$$/install/doinst.sh | grep ' rm -rf ' > $TMP/scan$$/install/delete - echo "The following locations will be completely WIPED OUT to allow symbolic" - echo "links to be made. (We're talking 'rm -rf') These locations may be files," - echo "or entire directories. Be sure you've backed up anything at these" - echo "locations that you want to save before you install this package:" - cat $TMP/scan$$/install/delete | cut -f 3,7 -d ' ' | tr ' ' '/' + for f in `cat $TMP/scan$$/install/delete | cut -f 3,7 -d ' ' | tr ' ' '/'`; do + f="/$f" + if [ -f "$f" -o -L "$f" ]; then + echo "$f" + fi + done fi if [ -d $TMP/scan$$ ]; then ( cd $TMP/scan$$ ; rm -rf install ) 2> /dev/null ( cd $TMP ; rmdir scan$$ ) 2> /dev/null fi fi - echo "The following files will be overwritten when installing this package." - echo "Be sure they aren't important before you install this package:" - ( $packagecompression -dc | $TAR tvvf - ) < $1 | grep -v 'drwx' - echo + for f in `( $packagecompression -dc | $TAR tf - ) < $1 | grep -v 'drwx'`; do + f="/$f" + if [ -f "$f" -o -L "$f" ]; then + echo "$f" + fi + done shift 1 done exit @@ -385,7 +405,7 @@ for package in $* ; do # Figure out some package information, like the compressed and uncompressed # sizes, and where to find the package description: - COMPRESSED="$(du -s $package | cut -f 1)K" + COMPRESSED="$(/bin/du -sh "$(readlink -f $package)" | cut -f 1)" DESCRIPTION="" # First check for .txt file next to the package, since this is faster: if grep "^$packagebase:" "$packagedir/$shortname.txt" 1> /dev/null 2> /dev/null ; then @@ -408,7 +428,14 @@ for package in $* ; do rm -f $TMP/tmplist$$ $TMP/tmpsize$$ continue fi - UNCOMPRESSED="$(expr $(cat $TMP/tmpsize$$ | head -n 1 | cut -f 1 -d +) / 2)K" + UNCOMPRESSED="$(expr $(cat $TMP/tmpsize$$ | head -n 1 | cut -f 1 -d +) / 2)" + if [ $UNCOMPRESSED -lt 1024 ]; then + UNCOMPRESSED="${UNCOMPRESSED}K" + elif [ $UNCOMPRESSED -lt 10239 ]; then + UNCOMPRESSED="$(expr $UNCOMPRESSED \* 1000 / 1024 | cut -b1).$(expr $UNCOMPRESSED \* 1000 / 1024 | cut -b2)M" + else + UNCOMPRESSED="$(expr $UNCOMPRESSED / 1024)M" + fi rm -f $TMP/tmpsize$$ # If we still don't have a package description, look inside the package. @@ -472,6 +499,8 @@ EOF if [ "$shortname" != "$packagebase" ]; then cat $DESCRIPTION | grep "^$shortname:" | uniq | sed "s/^$shortname:/#/g" fi + elif [ "$MODE" = "terse" ]; then # emit a single description line + printf "%-72s %-6s\n" "$(echo $shortname: $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) | cut -b1-72)" "[${UNCOMPRESSED}]" | cut -b1-80 elif [ "$MODE" = "infobox" ]; then # install infobox package dialog --title "Installing package $shortname $PMSG" --infobox "$(cat $TMP/tmpmsg$$)" 0 0 elif [ "$MODE" = "menu" -a "$PRIORITY" = "ADD" -a ! "$ALWAYSASK" = "yes" ]; then # ADD overrides menu mode unless -ask was used diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool index c0a2a9730..a64ef09c0 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, 2010 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2009, 2010, 2011 Patrick Volkerding, Sebeka, MN, USA # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -79,13 +79,15 @@ if [ -L /bin/chmod -a -L /bin/chown ]; then # probably on the bootdisk using bus echo echo 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 "partitions beneath /mnt. Here are some examples:" echo - echo "If your root partition is /dev/sda1, and is using ext2fs, you would type:" - echo "mount /dev/sda1 /mnt -t ext2" + echo "If your root partition is /dev/sda1 you would type:" + echo "mount /dev/sda1 /mnt" + echo + echo "Now you can find a list of all your partitions in /mnt/etc/fstab." echo echo "Then, supposing your /usr partition is /dev/sda2, you must do this:" - echo "mount /dev/sda2 /mnt/usr -t ext2" + echo "mount /dev/sda2 /mnt/usr" echo echo "Please mount your Linux partitions and then run pkgtool again." echo @@ -210,7 +212,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.1)" \ + dialog --title "Slackware Package Tool (pkgtool version 13.37)" \ --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/procps/procps-3.2.7-ps-cgroup.patch b/source/a/procps/procps-3.2.7-ps-cgroup.patch new file mode 100644 index 000000000..de5c6b269 --- /dev/null +++ b/source/a/procps/procps-3.2.7-ps-cgroup.patch @@ -0,0 +1,65 @@ +diff -burN procps-3.2.8/ps/output.c procps-3.2.8.cgroups/ps/output.c +--- procps-3.2.8/ps/output.c 2009-05-10 14:24:50.000000000 -0500 ++++ procps-3.2.8.cgroups/ps/output.c 2010-12-04 12:35:56.000000000 -0600 +@@ -1099,6 +1099,39 @@ + return snprintf(outbuf, COLWID, "*"); + } + ++static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){ ++ char filename[48]; ++ FILE *fd; ++ int counter = 0; ++ int c; ++ int is_cgroup = 0; ++ ++ outbuf[0]='\0'; ++ snprintf(filename, sizeof filename, "/proc/%d/cgroup", pp->tgid); ++ fd = fopen(filename, "r"); ++ if (likely(fd == NULL)) goto fail; ++ while (( (c = fgetc(fd)) != EOF) && (counter<665)) { ++ if (is_cgroup == 0) { ++ if (c == ':') { ++ is_cgroup = 1; ++ if (counter>0) ++ outbuf[counter++]=';'; ++ } ++ }else ++ if ((c == '\n') || (c == '\0')) ++ is_cgroup = 0; ++ else ++ outbuf[counter++]=c; ++ } ++ outbuf[counter]='\0'; ++ close(fd); ++ if (counter>0) ++ return counter; ++fail: ++ outbuf[0] = '-'; ++ outbuf[1] = '\0'; ++ return 1; ++} + + /****************** FLASK & seLinux security stuff **********************/ + // move the bulk of this to libproc sometime +@@ -1293,6 +1326,7 @@ + {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT}, + {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT}, + {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/ ++{"cgroup", "CGROUP", pr_cgroup, sr_nop, 35, 0, LNX, PO|LEFT}, /* cgroups*/ + {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT}, + {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/ + {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT}, +diff -burN procps-3.2.8/ps/ps.1 procps-3.2.8.cgroups/ps/ps.1 +--- procps-3.2.8/ps/ps.1 2009-05-10 14:38:17.000000000 -0500 ++++ procps-3.2.8.cgroups/ps/ps.1 2010-12-04 12:43:12.000000000 -0600 +@@ -904,6 +904,10 @@ + displayed. (alias\ \fBsig_catch\fR,\ \fBsigcatch\fR). + T} + ++cgroup CGROUP T{ ++display control groups to which the process belongs. ++T} ++ + class CLS T{ + scheduling class of the process. (alias\ \fBpolicy\fR,\ \fBcls\fR). + Field's possible values are: diff --git a/source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch b/source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch new file mode 100644 index 000000000..4b192c1fb --- /dev/null +++ b/source/a/procps/procps-3.2.8-ps-cgroup-suppress-root-group.patch @@ -0,0 +1,36 @@ +--- procps-3.2.8/ps/output.c 2010-05-18 06:00:18.000000000 +0200 ++++ procps-3.2.8.lennart/ps/output.c 2010-05-18 05:59:46.000000000 +0200 +@@ -1109,7 +1109,7 @@ + static int pr_cgroup(char *restrict const outbuf, const proc_t *restrict const pp){ + char filename[48]; + FILE *fd; +- int counter = 0; ++ int counter = 0, last_begin = 0, slash = 0; + int c; + int is_cgroup = 0; + +@@ -1121,15 +1121,22 @@ + if (is_cgroup == 0) { + if (c == ':') { + is_cgroup = 1; ++ slash = 0; + if (counter>0) + outbuf[counter++]=';'; + } + }else +- if ((c == '\n') || (c == '\0')) +- is_cgroup = 0; ++ if ((c == '\n') || (c == '\0')){ ++ if (slash) /* if the last char was a / this process is in the root cgroup which we should suppress */ ++ counter = last_begin; + else ++ last_begin = counter; ++ is_cgroup = 0; ++ } else { ++ slash = c == '/'; + outbuf[counter++]=c; + } ++ } + outbuf[counter]='\0'; + close(fd); + if (counter>0) diff --git a/source/a/procps/procps-3.2.8.unknown.hz.value.diff b/source/a/procps/procps-3.2.8.unknown.hz.value.diff new file mode 100644 index 000000000..be283814e --- /dev/null +++ b/source/a/procps/procps-3.2.8.unknown.hz.value.diff @@ -0,0 +1,32 @@ +--- procps-3.2.8.orig/proc/sysinfo.c 2008-03-24 04:33:43.000000000 +0000 ++++ procps-3.2.8.orig/proc/sysinfo.c 2011-02-07 18:14:16.476982472 +0000 +@@ -212,6 +212,7 @@ static int check_for_privs(void){ + static void init_libproc(void) __attribute__((constructor)); + static void init_libproc(void){ + have_privs = check_for_privs(); ++ init_Linux_version(); + // ought to count CPUs in /proc/stat instead of relying + // on glibc, which foolishly tries to parse /proc/cpuinfo + // +--- procps-3.2.8.orig/proc/version.c 2003-01-29 01:11:43.000000000 +0000 ++++ procps-3.2.8.orig/proc/version.c 2011-02-07 18:13:12.283649138 +0000 +@@ -33,8 +33,7 @@ void display_version(void) { + + int linux_version_code; + +-static void init_Linux_version(void) __attribute__((constructor)); +-static void init_Linux_version(void) { ++void init_Linux_version(void) { + static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ + +--- procps-3.2.8.orig/proc/version.h 2002-12-15 00:08:32.000000000 +0000 ++++ procps-3.2.8.orig/proc/version.h 2011-02-07 18:14:20.263649138 +0000 +@@ -14,6 +14,7 @@ + + EXTERN_C_BEGIN + ++extern void init_Linux_version(void); + extern void display_version(void); /* display suite version */ + extern const char procps_version[]; /* global buf for suite version */ + diff --git a/source/a/procps/procps.SlackBuild b/source/a/procps/procps.SlackBuild index a5163bbc2..e5e85ffc4 100755 --- a/source/a/procps/procps.SlackBuild +++ b/source/a/procps/procps.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,13 +21,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.2.7 +VERSION=3.2.8 # Sometimes this number lags behind... -SOVER=3.2.7 -PSMISCVER=22.3 -ARCH=${ARCH:-x86_64} +SOVER=3.2.8 +PSMISCVER=22.13 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} PKG=$TMP/package-procps @@ -52,8 +61,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf procps-$VERSION -tar xzvf $CWD/procps-$VERSION.tar.gz -cd procps-$VERSION +tar xvf $CWD/procps-$VERSION.tar.?z* || exit 1 +cd procps-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -62,9 +71,10 @@ find . \ -exec chmod 644 {} \; mkdir -p $PKG/usr/doc/procps-$VERSION -cp -a BUGS COPYING COPYING.LIB NEWS TODO $PKG/usr/doc/procps-$VERSION +cp -a BUGS COPYING* NEWS TODO $PKG/usr/doc/procps-$VERSION chown root:root $PKG/usr/doc/procps-$VERSION/* chmod 644 $PKG/usr/doc/procps-$VERSION/* + # While I don't agree this is a harmful patch, I will defer to the # maintainer's judgement on this one. Besides, I quit using the '-' # with ps years ago. It wasn't that hard to change. @@ -83,7 +93,14 @@ if [ "$ARCH" = "x86_64" ]; then zcat $CWD/procps-3.2.7-ps-eip64.diff.gz | patch -p1 --verbose || exit 1 fi -make OPT="$SLKCFLAGS" +# Add support for cgroups display: +zcat $CWD/procps-3.2.7-ps-cgroup.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/procps-3.2.8-ps-cgroup-suppress-root-group.patch.gz | patch -p1 --verbose || exit 1 + +# Init contructors in correct order to avoid "Unknown HZ value!": +zcat $CWD/procps-3.2.8.unknown.hz.value.diff.gz | patch -p1 --verbose || exit 1 + +make OPT="$SLKCFLAGS" || make OPT="$SLKCFLAGS" || exit 1 mkdir -p $PKG/lib${LIBDIRSUFFIX} $PKG/bin $PKG/sbin $PKG/usr/bin cat free > $PKG/bin/free cat ps/ps> $PKG/bin/ps @@ -123,7 +140,7 @@ echo "| psmisc-$PSMISCVER |" echo "+=============+" cd $TMP rm -rf psmisc-$PSMISCVER -tar xzvf $CWD/psmisc-$PSMISCVER.tar.gz +tar xvf $CWD/psmisc-$PSMISCVER.tar.?z* || exit 1 cd psmisc-$PSMISCVER # Maybe we'll turn on NLS when it supports more than # just US English. :) @@ -135,7 +152,7 @@ mkdir -p $PKG/usr/doc/psmisc-$PSMISCVER cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/psmisc-$PSMISCVER chmod 644 $PKG/usr/doc/psmisc-$PSMISCVER/* chown root:root $PKG/usr/doc/psmisc-$PSMISCVER/* -make +make || make || exit 1 cd src strip fuser pstree killall cat fuser > $PKG/usr/bin/fuser @@ -182,10 +199,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG makepkg -l y -c n $TMP/procps-$VERSION-$ARCH-$BUILD.txz -# Clean up the extra stuff: -if [ "$1" = "--cleanup" ]; then - rm -rf $TMP/procps-$VERSION - rm -rf $TMP/procinfo-18 - rm -rf $TMP/psmisc-$PSMISCVER - rm -rf $PKG -fi diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild index 0ae450b90..67717b11b 100755 --- a/source/a/quota/quota.SlackBuild +++ b/source/a/quota/quota.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,9 +22,18 @@ VERSION=3.17 -ARCH=${ARCH:-x86_64} 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-quota diff --git a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild b/source/a/reiserfsprogs/reiserfsprogs.SlackBuild index c56d8f13f..fc38990da 100755 --- a/source/a/reiserfsprogs/reiserfsprogs.SlackBuild +++ b/source/a/reiserfsprogs/reiserfsprogs.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,9 +21,18 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=3.6.21 -ARCH=${ARCH:-x86_64} 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:-" -j7 "} CWD=$(pwd) @@ -64,7 +73,7 @@ if [ "$ARCH" = "x86_64" ]; then sed -i -e 's?#define HAVE_ASM_UNALIGNED_H 1?/* & */?' config.h fi -make $NUMJOBS || make || exit1 +make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch b/source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch new file mode 100644 index 000000000..2a8c0537c --- /dev/null +++ b/source/a/rpm2tgz/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch @@ -0,0 +1,62 @@ +From 9399788e2b36fc5e345d679f650f8387376987af Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Thu, 5 Aug 2010 02:09:56 +0400 +Subject: [PATCH 07/09] Add support for .txz packages and rpm2txz symlink + +--- + rpm2targz | 20 +++++++++++++++----- + rpm2tgz.SlackBuild | 1 + + 2 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/rpm2targz b/rpm2targz +index cc25407..45ac1d7 100644 +--- a/rpm2targz ++++ b/rpm2targz +@@ -23,6 +23,7 @@ + # + + CWD=$(pwd) ++NAME="$(basename $0)" + + # Breaking the help out into it's own deal + usage() { +@@ -31,9 +32,13 @@ usage() { + echo " with \"installpkg\", \"removepkg\", \"pkgtool\", or manually" + echo " with \"tar\")" + echo +- if [ "$(basename $0)" = "rpm2tgz" ]; then ++ if [ "$NAME" = "rpm2tgz" -o "$NAME" = "rpm2txz" ]; then + echo "Usage: $0 [OPTION] <file.rpm>" +- echo " (Outputs \"file.tgz\")" ++ if [ "$NAME" = "rpm2tgz" ]; then ++ echo " (Outputs \"file.tgz\")" ++ else ++ echo " (Outputs \"file.txz\")" ++ fi + echo + echo " -s extract the install scripts to /usr/doc/\$PRGNAM-\$VERSION/" + echo " for review." +@@ -210,15 +215,20 @@ for i in $* ; do + # 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 ++ if [ "$NAME" = "rpm2tgz" -o "$NAME" = "rpm2txz" ]; then ++ if [ "$NAME" = "rpm2tgz" ]; then ++ EXT=tgz ++ else ++ EXT=txz ++ fi + ( + 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}.$EXT + else + cd $TMPDIR +- /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).tgz ++ /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).$EXT + fi + ) + else diff --git a/source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch b/source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch new file mode 100644 index 000000000..575f2bb52 --- /dev/null +++ b/source/a/rpm2tgz/patches/0008-Avoid-none-values-in-slack-desc.patch @@ -0,0 +1,36 @@ +From 31205a87c10659e5e4534825e8aece34c5b6dba8 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Thu, 5 Aug 2010 11:22:31 +0400 +Subject: [PATCH 08/09] Avoid (none) values in slack-desc + +--- + rpm2targz | 13 ++++++++++++- + 1 files changed, 12 insertions(+), 1 deletions(-) + +diff --git a/rpm2targz b/rpm2targz +index 45ac1d7..d9d6a8b 100644 +--- a/rpm2targz ++++ b/rpm2targz +@@ -209,7 +209,18 @@ for i in $* ; do + if [ "$DESC" = "true" ]; then + get_meta_data $i + 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 ++ if [ "$(rpm -qp --qf %{SUMMARY} $i )" != '(none)' ] ; then ++ rpm -qp --qf "$PRGNAM (%{SUMMARY})\n\n" $i > $TMPDIR/install/slack-desc ++ else ++ echo -en "$PRGNAM\n\n" > $TMPDIR/install/slack-desc ++ fi ++ if [ "$(rpm -qp --qf %{DESCRIPTION} $i )" != '(none)' ] ; then ++ rpm -qp --qf "%{DESCRIPTION}\n\n" $i >> $TMPDIR/install/slack-desc ++ fi ++ if [ "$(rpm -qp --qf %{URL} $i )" != '(none)' ] ; then ++ rpm -qp --qf " %{URL}\n" $i >> $TMPDIR/install/slack-desc ++ fi ++ sed -ri "s/^/$PRGNAM: /;11q" $TMPDIR/install/slack-desc + fi + + # If this program was called as "rpm2targz", then repack as a plain +-- +1.7.1 + diff --git a/source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch b/source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch new file mode 100644 index 000000000..6768401aa --- /dev/null +++ b/source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch @@ -0,0 +1,70 @@ +From 7664b10014e4ca5b0f498d5c774653a44fdaf0e1 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Fri, 6 Aug 2010 01:05:41 +0400 +Subject: [PATCH 09/09] Add -c option (just as makepkg -c y) + +--- + rpm2targz | 17 ++++++++++++++--- + 1 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/rpm2targz b/rpm2targz +index d9d6a8b..f3e51d6 100644 +--- a/rpm2targz ++++ b/rpm2targz +@@ -49,6 +49,7 @@ usage() { + 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 " -c reset all directory permissions to 755 and ownership to root:root." + echo + else + echo "Usage: $0 <file.rpm>" +@@ -98,7 +99,7 @@ if [ "$1" = "" ]; then + usage + fi + +-ARGS=$(getopt "hsSndr" $* ) ++ARGS=$(getopt "hsSndrc" $* ) + set -- ${ARGS} + for i; do + case "$1" in +@@ -122,6 +123,10 @@ for i; do + META_NAME="true" + shift + ;; ++ -c) ++ CHOWN="true" ++ shift ++ ;; + --) + shift + break +@@ -223,6 +228,12 @@ for i in $* ; do + sed -ri "s/^/$PRGNAM: /;11q" $TMPDIR/install/slack-desc + fi + ++ # Supply -c y to makepkg if asked ++ COPT="n" ++ if [ "$CHOWN" = "true" ]; then ++ COPT="y" ++ 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: +@@ -236,10 +247,10 @@ for i in $* ; do + if [ "$META_NAME" = "true" ]; then + get_meta_data $i + cd $TMPDIR +- /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.$EXT ++ /sbin/makepkg -l y -c $COPT $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.$EXT + else + cd $TMPDIR +- /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).$EXT ++ /sbin/makepkg -l y -c $COPT $CWD/$(basename $i .rpm).$EXT + fi + ) + else +-- +1.7.1 + diff --git a/source/a/rpm2tgz/rpm2tgz.SlackBuild b/source/a/rpm2tgz/rpm2tgz.SlackBuild index c6d766093..c32e490cd 100755 --- a/source/a/rpm2tgz/rpm2tgz.SlackBuild +++ b/source/a/rpm2tgz/rpm2tgz.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=1.2.1 +VERSION=1.2.2 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -61,11 +61,18 @@ cat $CWD/rpm2targz > $PKG/usr/bin/rpm2targz # 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: + # OK, I will take this version of the patch, as it doesn't change the + # default behaviour of rpm2tgz. + # mv the script back (wow, this is rather random ;-) mv rpm2tgz rpm2targz + zcat $CWD/patches/0007-Add-support-for-.txz-packages-and-rpm2txz-symlink.patch.gz | patch -p1 || exit 1 + zcat $CWD/patches/0008-Avoid-none-values-in-slack-desc.patch.gz | patch -p1 || exit 1 + zcat $CWD/patches/0009-Add-c-option-just-as-makepkg-c-y.patch.gz | patch -p1 || exit 1 ) || exit 1 ( cd $PKG/usr/bin ; ln -sf rpm2targz rpm2tgz ) +( cd $PKG/usr/bin ; ln -sf rpm2targz rpm2txz ) + chmod 755 $PKG/usr/bin/{rpmoffset,rpm2targz} mkdir -p $PKG/usr/doc/rpm2targz cp -a $CWD/rpm2targz.README $PKG/usr/doc/rpm2targz/rpm2targz.README diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser index 038a0a949..5b674a852 100644 --- a/source/a/shadow/adduser +++ b/source/a/shadow/adduser @@ -36,7 +36,7 @@ # History # ########### # v1.13 - 13/01/10 -# * Fix bug that removed underscore characters from group names. +# * Fixed bug that removed underscore characters from UNIX 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 diff --git a/source/a/shadow/patches/README_PATCHES b/source/a/shadow/patches/README_PATCHES new file mode 100644 index 000000000..0c639d1a2 --- /dev/null +++ b/source/a/shadow/patches/README_PATCHES @@ -0,0 +1,9 @@ + +r3054.diff: Fixed wrong format string +r3055.diff: Help output to stderr not stdout. +r3060.diff: Fix memory leaks +r3062.diff: Avoid memzero() on a possibly NULL pointer. +r3096.diff: Fix parsing of gshadow entries. +r3160.diff: Fixed limits support (non PAM enabled versions only) +r3194.diff: shell's name must be -su when a su fakes a login. +r3299.diff: man/ru/Makefile.am: Remove double inclusion of $(man_nopam) diff --git a/source/a/shadow/patches/r3054.diff b/source/a/shadow/patches/r3054.diff new file mode 100644 index 000000000..dc1eab13b --- /dev/null +++ b/source/a/shadow/patches/r3054.diff @@ -0,0 +1,27 @@ +* src/useradd.c: Fixed wrong format string. +* lib/gshadow.c: Removed declaration of unused variable. + +=================================================================== +--- src/useradd.c (revision 3052) ++++ src/useradd.c (revision 3054) +@@ -684,7 +684,7 @@ + static void usage (void) + { + (void) fprintf (stderr, +- _("Usage: useradd [options] LOGIN\n" ++ _("Usage: %s [options] LOGIN\n" + "\n" + "Options:\n"), + Prog); + +=================================================================== +--- lib/gshadow.c (revision 3052) ++++ lib/gshadow.c (revision 3054) +@@ -216,7 +216,6 @@ + static char *buf = NULL; + + char *cp; +- struct sgrp *ret; + + if (0 == buflen) { + buf = (char *) malloc (BUFSIZ); diff --git a/source/a/shadow/patches/r3055.diff b/source/a/shadow/patches/r3055.diff new file mode 100644 index 000000000..a2af6f39f --- /dev/null +++ b/source/a/shadow/patches/r3055.diff @@ -0,0 +1,1515 @@ +=================================================================== +--- src/userdel.c (revision 3054) ++++ src/userdel.c (revision 3055) +@@ -94,7 +94,7 @@ + static bool spw_locked = false; + + /* local function prototypes */ +-static void usage (void); ++static void usage (int status); + static void update_groups (void); + static void close_files (void); + static void fail_exit (int); +@@ -111,7 +111,7 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { + fputs (_("Usage: userdel [options] LOGIN\n" + "\n" +@@ -120,8 +120,8 @@ + " even if not owned by user\n" + " -h, --help display this help message and exit\n" + " -r, --remove remove home directory and mail spool\n" +- "\n"), stderr); +- exit (E_USAGE); ++ "\n"), status ? stderr : stdout); ++ exit (status); + } + + /* +@@ -774,17 +774,19 @@ + case 'f': /* force remove even if not owned by user */ + fflg = true; + break; ++ case 'h': ++ usage (E_SUCCESS); + case 'r': /* remove home dir and mailbox */ + rflg = true; + break; + default: +- usage (); ++ usage (E_USAGE); + } + } + } + + if ((optind + 1) != argc) { +- usage (); ++ usage (E_USAGE); + } + + OPENLOG ("userdel"); +Index: src/lastlog.c +=================================================================== +--- src/lastlog.c (revision 3054) ++++ src/lastlog.c (revision 3055) +@@ -71,7 +71,7 @@ + + #define NOW (time ((time_t *) 0)) + +-static void usage (void) ++static void usage (int status) + { + fputs (_("Usage: lastlog [options]\n" + "\n" +@@ -80,8 +80,8 @@ + " -h, --help display this help message and exit\n" + " -t, --time DAYS print only lastlog records more recent than DAYS\n" + " -u, --user LOGIN print lastlog record of the specified LOGIN\n" +- "\n"), stderr); +- exit (EXIT_FAILURE); ++ "\n"), status ? stderr : stdout); ++ exit (status); + } + + static void print_one (/*@null@*/const struct passwd *pw) +@@ -208,7 +208,7 @@ + NULL)) != -1) { + switch (c) { + case 'h': +- usage (); ++ usage (EXIT_SUCCESS); + break; + case 't': + { +@@ -267,7 +267,7 @@ + break; + } + default: +- usage (); ++ usage (EXIT_FAILURE); + break; + } + } +@@ -275,7 +275,7 @@ + fprintf (stderr, + _("lastlog: unexpected argument: %s\n"), + argv[optind]); +- usage(); ++ usage (EXIT_FAILURE); + } + } + +Index: src/gpasswd.c +=================================================================== +--- src/gpasswd.c (revision 3054) ++++ src/gpasswd.c (revision 3055) +@@ -94,7 +94,7 @@ + #endif + + /* local function prototypes */ +-static void usage (void); ++static void usage (int status); + static RETSIGTYPE catch_signals (int killed); + static bool is_valid_user_list (const char *users); + static void process_flags (int argc, char **argv); +@@ -128,14 +128,15 @@ + /* + * usage - display usage message + */ +-static void usage (void) ++static void usage (int status) + { +- fprintf (stderr, ++ fprintf (status ? stderr : stdout, + _("Usage: %s [option] GROUP\n" + "\n" + "Options:\n" + " -a, --add USER add USER to GROUP\n" + " -d, --delete USER remove USER from GROUP\n" ++ " -h, --help display this help message and exit\n" + " -r, --remove-password remove the GROUP's password\n" + " -R, --restrict restrict access to GROUP to its members\n" + " -M, --members USER,... set the list of members of GROUP\n" +@@ -150,7 +151,7 @@ + _("The options cannot be combined.\n") + #endif + ); +- exit (E_USAGE); ++ exit (status); + } + + /* +@@ -235,6 +236,7 @@ + static struct option long_options[] = { + {"add", required_argument, NULL, 'a'}, + {"delete", required_argument, NULL, 'd'}, ++ {"help", no_argument, NULL, 'h'}, + {"remove-password", no_argument, NULL, 'r'}, + {"restrict", no_argument, NULL, 'R'}, + {"administrators", required_argument, NULL, 'A'}, +@@ -242,7 +244,7 @@ + {NULL, 0, NULL, '\0'} + }; + +- while ((flag = getopt_long (argc, argv, "a:A:d:gM:rR", long_options, &option_index)) != -1) { ++ while ((flag = getopt_long (argc, argv, "a:A:d:ghM:rR", long_options, &option_index)) != -1) { + switch (flag) { + case 'a': /* add a user */ + aflg = true; +@@ -276,6 +278,8 @@ + break; + case 'g': /* no-op from normal password */ + break; ++ case 'h': ++ usage (E_SUCCESS); + case 'M': /* set the list of members */ + members = optarg; + if (!is_valid_user_list (members)) { +@@ -290,7 +294,7 @@ + Rflg = true; + break; + default: +- usage (); ++ usage (E_USAGE); + } + } + +@@ -325,14 +329,14 @@ + exclusive++; + } + if (exclusive > 1) { +- usage (); ++ usage (E_USAGE); + } + + /* + * Make sure one (and only one) group was provided + */ + if ((argc != (opt_index+1)) || (NULL == group)) { +- usage (); ++ usage (E_USAGE); + } + } + +Index: src/newusers.c +=================================================================== +--- src/newusers.c (revision 3054) ++++ src/newusers.c (revision 3055) +@@ -92,7 +92,7 @@ + static bool spw_locked = false; + + /* local function prototypes */ +-static void usage (void); ++static void usage (int status); + static void fail_exit (int); + static int add_group (const char *, const char *, gid_t *, gid_t); + static int get_user_id (const char *, uid_t *); +@@ -110,15 +110,16 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { +- (void) fprintf (stderr, ++ FILE *usageout = status ? stderr : stdout; ++ (void) fprintf (usageout, + _("Usage: %s [options]\n" + "\n" + "Options:\n"), + Prog); + #ifndef USE_PAM +- (void) fprintf (stderr, ++ (void) fprintf (usageout, + _(" -c, --crypt-method the crypt method (one of %s)\n"), + #ifndef USE_SHA_CRYPT + "NONE DES MD5" +@@ -127,18 +128,18 @@ + #endif /* USE_SHA_CRYPT */ + ); + #endif /* !USE_PAM */ +- (void) fputs (_(" -h, --help display this help message and exit\n"), stderr); +- (void) fputs (_(" -r, --system create system accounts\n"), stderr); ++ (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); ++ (void) fputs (_(" -r, --system create system accounts\n"), usageout); + #ifndef USE_PAM + #ifdef USE_SHA_CRYPT + (void) fputs (_(" -s, --sha-rounds number of SHA rounds for the SHA*\n" + " crypt algorithms\n"), +- stderr); ++ usageout); + #endif /* USE_SHA_CRYPT */ + #endif /* !USE_PAM */ +- (void) fputs ("\n", stderr); ++ (void) fputs ("\n", usageout); + +- exit (EXIT_FAILURE); ++ exit (status); + } + + /* +@@ -548,7 +549,7 @@ + long_options, &option_index)) != -1) { + switch (c) { + case 'h': +- usage (); ++ usage (EXIT_SUCCESS); + break; + case 'r': + rflg = true; +@@ -565,13 +566,13 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (EXIT_FAILURE); + } + break; + #endif /* USE_SHA_CRYPT */ + #endif /* !USE_PAM */ + default: +- usage (); ++ usage (EXIT_FAILURE); + break; + } + } +@@ -602,7 +603,7 @@ + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-s", "-c"); +- usage (); ++ usage (EXIT_FAILURE); + } + #endif /* USE_SHA_CRYPT */ + +@@ -618,7 +619,7 @@ + fprintf (stderr, + _("%s: unsupported crypt method: %s\n"), + Prog, crypt_method); +- usage (); ++ usage (EXIT_FAILURE); + } + } + #endif /* !USE_PAM */ +Index: src/chpasswd.c +=================================================================== +--- src/chpasswd.c (revision 3054) ++++ src/chpasswd.c (revision 3055) +@@ -74,7 +74,7 @@ + + /* local function prototypes */ + static void fail_exit (int code); +-static void usage (void); ++static void usage (int status); + static void process_flags (int argc, char **argv); + static void check_flags (void); + static void check_perms (void); +@@ -112,15 +112,16 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { +- (void) fprintf (stderr, ++ FILE *usageout = status ? stderr : stdout; ++ (void) fprintf (usageout, + _("Usage: %s [options]\n" + "\n" + "Options:\n"), + Prog); + #ifndef USE_PAM +- (void) fprintf (stderr, ++ (void) fprintf (usageout, + _(" -c, --crypt-method the crypt method (one of %s)\n"), + #ifndef USE_SHA_CRYPT + "NONE DES MD5" +@@ -128,22 +129,22 @@ + "NONE DES MD5 SHA256 SHA512" + #endif /* USE_SHA_CRYPT */ + ); +- (void) fputs (_(" -e, --encrypted supplied passwords are encrypted\n"), stderr); ++ (void) fputs (_(" -e, --encrypted supplied passwords are encrypted\n"), usageout); + #endif /* !USE_PAM */ +- (void) fputs (_(" -h, --help display this help message and exit\n"), stderr); ++ (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); + #ifndef USE_PAM + (void) fputs (_(" -m, --md5 encrypt the clear text password using\n" + " the MD5 algorithm\n"), +- stderr); ++ usageout); + #ifdef USE_SHA_CRYPT + (void) fputs (_(" -s, --sha-rounds number of SHA rounds for the SHA*\n" + " crypt algorithms\n"), +- stderr); ++ usageout); + #endif /* USE_SHA_CRYPT */ + #endif /* !USE_PAM */ +- (void) fputs ("\n", stderr); ++ (void) fputs ("\n", usageout); + +- exit (E_USAGE); ++ exit (status); + } + + /* +@@ -181,7 +182,7 @@ + long_options, &option_index)) != -1) { + switch (c) { + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + #ifndef USE_PAM + case 'c': +@@ -201,13 +202,13 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + #endif /* USE_SHA_CRYPT */ + #endif /* !USE_PAM */ + default: +- usage (); ++ usage (E_USAGE); + break; + } + } +@@ -229,7 +230,7 @@ + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-s", "-c"); +- usage (); ++ usage (E_USAGE); + } + #endif + +@@ -238,7 +239,7 @@ + fprintf (stderr, + _("%s: the -c, -e, and -m flags are exclusive\n"), + Prog); +- usage (); ++ usage (E_USAGE); + } + + if (cflg) { +@@ -253,7 +254,7 @@ + fprintf (stderr, + _("%s: unsupported crypt method: %s\n"), + Prog, crypt_method); +- usage (); ++ usage (E_USAGE); + } + } + #endif /* USE_PAM */ +Index: src/groupmems.c +=================================================================== +--- src/groupmems.c (revision 3054) ++++ src/groupmems.c (revision 3055) +@@ -88,7 +88,7 @@ + const struct group *grp); + static void purge_members (const struct group *grp); + static void display_members (const char *const *members); +-static void usage (void); ++static void usage (int status); + static void process_flags (int argc, char **argv); + static void check_perms (void); + static void fail_exit (int code); +@@ -361,7 +361,7 @@ + } + } + +-static void usage (void) ++static void usage (int status) + { + (void) fputs (_("Usage: groupmems [options] [action]\n" + "\n" +@@ -372,10 +372,11 @@ + "Actions:\n" + " -a, --add username add username to the members of the group\n" + " -d, --delete username remove username from the members of the group\n" ++ " -h, --help display this help message and exit\n" + " -p, --purge purge all members from the group\n" + " -l, --list list the members of the group\n" +- "\n"), stderr); +- fail_exit (EXIT_USAGE); ++ "\n"), status ? stderr : stdout); ++ fail_exit (status); + } + + /* +@@ -389,12 +390,13 @@ + {"add", required_argument, NULL, 'a'}, + {"delete", required_argument, NULL, 'd'}, + {"group", required_argument, NULL, 'g'}, ++ {"help", no_argument, NULL, 'h'}, + {"list", no_argument, NULL, 'l'}, + {"purge", no_argument, NULL, 'p'}, + {NULL, 0, NULL, '\0'} + }; + +- while ((arg = getopt_long (argc, argv, "a:d:g:lp", long_options, ++ while ((arg = getopt_long (argc, argv, "a:d:g:hlp", long_options, + &option_index)) != EOF) { + switch (arg) { + case 'a': +@@ -408,6 +410,8 @@ + case 'g': + thisgroup = xstrdup (optarg); + break; ++ case 'h': ++ usage (EXIT_SUCCESS); + case 'l': + list = true; + ++exclusive; +@@ -417,12 +421,12 @@ + ++exclusive; + break; + default: +- usage (); ++ usage (EXIT_USAGE); + } + } + + if ((exclusive > 1) || (optind < argc)) { +- usage (); ++ usage (EXIT_USAGE); + } + + /* local, no need for xgetpwnam */ +Index: src/usermod.c +=================================================================== +--- src/usermod.c (revision 3054) ++++ src/usermod.c (revision 3055) +@@ -149,7 +149,7 @@ + static void date_to_str (char *buf, size_t maxsize, + long int date, const char *negativ); + static int get_groups (char *); +-static void usage (void); ++static void usage (int status); + static void new_pwent (struct passwd *); + #ifdef WITH_SELINUX + static void selinux_update_mapping (void); +@@ -300,9 +300,9 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { +- fprintf (stderr, ++ fprintf (status ? stderr : stdout, + _("Usage: usermod [options] LOGIN\n" + "\n" + "Options:\n" +@@ -334,7 +334,7 @@ + "" + #endif + ); +- exit (E_USAGE); ++ exit (status); + } + + /* +@@ -815,7 +815,7 @@ + bool anyflag = false; + + if ((1 == argc) || ('-' == argv[argc - 1][0])) { +- usage (); ++ usage (E_USAGE); + } + + { +@@ -955,7 +955,7 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + fflg = true; + break; +@@ -976,6 +976,8 @@ + } + Gflg = true; + break; ++ case 'h': ++ usage (E_SUCCESS); + case 'l': + if (!is_valid_user_name (optarg)) { + fprintf (stderr, +@@ -1036,7 +1038,7 @@ + break; + #endif + default: +- usage (); ++ usage (E_USAGE); + } + anyflag = true; + } +@@ -1092,14 +1094,14 @@ + } + + if (optind != argc - 1) { +- usage (); ++ usage (E_USAGE); + } + + if (aflg && (!Gflg)) { + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-a", "-G"); +- usage (); ++ usage (E_USAGE); + exit (E_USAGE); + } + +@@ -1107,7 +1109,7 @@ + fprintf (stderr, + _("%s: the -L, -p, and -U flags are exclusive\n"), + Prog); +- usage (); ++ usage (E_USAGE); + exit (E_USAGE); + } + +@@ -1115,7 +1117,7 @@ + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-o", "-u"); +- usage (); ++ usage (E_USAGE); + exit (E_USAGE); + } + +@@ -1123,7 +1125,7 @@ + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-m", "-d"); +- usage (); ++ usage (E_USAGE); + exit (E_USAGE); + } + +Index: src/chgpasswd.c +=================================================================== +--- src/chgpasswd.c (revision 3054) ++++ src/chgpasswd.c (revision 3055) +@@ -78,7 +78,7 @@ + + /* local function prototypes */ + static void fail_exit (int code); +-static void usage (void); ++static void usage (int status); + static void process_flags (int argc, char **argv); + static void check_flags (void); + static void check_perms (void); +@@ -114,9 +114,10 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { +- fprintf (stderr, _("Usage: %s [options]\n" ++ fprintf (status ? stderr : stdout, ++ _("Usage: %s [options]\n" + "\n" + "Options:\n" + " -c, --crypt-method the crypt method (one of %s)\n" +@@ -135,7 +136,7 @@ + " crypt algorithms\n") + #endif + ); +- exit (E_USAGE); ++ exit (status); + } + + /* +@@ -174,7 +175,7 @@ + eflg = true; + break; + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 'm': + md5flg = true; +@@ -186,12 +187,12 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + #endif + default: +- usage (); ++ usage (E_USAGE); + break; + } + } +@@ -212,7 +213,7 @@ + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-s", "-c"); +- usage (); ++ usage (E_USAGE); + } + #endif + +@@ -221,7 +222,7 @@ + fprintf (stderr, + _("%s: the -c, -e, and -m flags are exclusive\n"), + Prog); +- usage (); ++ usage (E_USAGE); + } + + if (cflg) { +@@ -236,7 +237,7 @@ + fprintf (stderr, + _("%s: unsupported crypt method: %s\n"), + Prog, crypt_method); +- usage (); ++ usage (E_USAGE); + } + } + } +Index: src/vipw.c +=================================================================== +--- src/vipw.c (revision 3054) ++++ src/vipw.c (revision 3055) +@@ -1,7 +1,7 @@ + /* + vipw, vigr edit the password or group file + with -s will edit shadow or gshadow file +- ++ + Copyright (c) 1997 , Guy Maor <maor@ece.utexas.edu> + Copyright (c) 1999 - 2000, Marek MichaÅ‚kiewicz + Copyright (c) 2002 - 2006, Tomasz KÅ‚oczko +@@ -29,8 +29,8 @@ + + #include <errno.h> + #include <getopt.h> +-#ifdef WITH_SELINUX +-#include <selinux/selinux.h> ++#ifdef WITH_SELINUX ++#include <selinux/selinux.h> + #endif + #include <signal.h> + #include <stdio.h> +@@ -64,7 +64,7 @@ + static bool quiet = false; + + /* local function prototypes */ +-static void usage (void); ++static void usage (int status); + static int create_backup_file (FILE *, const char *, struct stat *); + static void vipwexit (const char *msg, int syserr, int ret); + static void vipwedit (const char *, int (*)(void), int (*)(void)); +@@ -72,9 +72,9 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { +- (void) ++ (void) + fputs (_("Usage: vipw [options]\n" + "\n" + "Options:\n" +@@ -83,8 +83,8 @@ + " -p, --passwd edit passwd database\n" + " -q, --quiet quiet mode\n" + " -s, --shadow edit shadow or gshadow database\n" +- "\n"), stderr); +- exit (E_USAGE); ++ "\n"), status ? stderr : stdout); ++ exit (status); + } + + /* +@@ -285,8 +285,8 @@ + if (st1.st_mtime == st2.st_mtime) { + vipwexit (0, 0, 0); + } +-#ifdef WITH_SELINUX +- /* unset the fscreatecon */ ++#ifdef WITH_SELINUX ++ /* unset the fscreatecon */ + if (is_selinux_enabled ()) { + if (setfscreatecon (NULL)) { + vipwexit (_("setfscreatecon () failed"), errno, 1); +@@ -353,7 +353,7 @@ + do_vipw = false; + break; + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 'p': + do_vipw = true; +@@ -365,7 +365,7 @@ + editshadow = true; + break; + default: +- usage (); ++ usage (E_USAGE); + } + } + } +Index: src/useradd.c +=================================================================== +--- src/useradd.c (revision 3054) ++++ src/useradd.c (revision 3055) +@@ -179,7 +179,7 @@ + static void show_defaults (void); + static int set_defaults (void); + static int get_groups (char *); +-static void usage (void); ++static void usage (int status); + static void new_pwent (struct passwd *); + #ifdef WITH_SELINUX + static void selinux_update_mapping (void); +@@ -681,45 +681,46 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { +- (void) fprintf (stderr, ++ FILE *usageout = status ? stderr : stdout; ++ (void) fprintf (usageout, + _("Usage: %s [options] LOGIN\n" + "\n" + "Options:\n"), + Prog); + (void) fputs (_(" -b, --base-dir BASE_DIR base directory for the home directory of the\n" +- " new account\n"), stderr); +- (void) fputs (_(" -c, --comment COMMENT GECOS field of the new account\n"), stderr); +- (void) fputs (_(" -d, --home-dir HOME_DIR home directory of the new account\n"), stderr); +- (void) fputs (_(" -D, --defaults print or change default useradd configuration\n"), stderr); +- (void) fputs (_(" -e, --expiredate EXPIRE_DATE expiration date of the new account\n"), stderr); +- (void) fputs (_(" -f, --inactive INACTIVE password inactivity period of the new account\n"), stderr); ++ " new account\n"), usageout); ++ (void) fputs (_(" -c, --comment COMMENT GECOS field of the new account\n"), usageout); ++ (void) fputs (_(" -d, --home-dir HOME_DIR home directory of the new account\n"), usageout); ++ (void) fputs (_(" -D, --defaults print or change default useradd configuration\n"), usageout); ++ (void) fputs (_(" -e, --expiredate EXPIRE_DATE expiration date of the new account\n"), usageout); ++ (void) fputs (_(" -f, --inactive INACTIVE password inactivity period of the new account\n"), usageout); + (void) fputs (_(" -g, --gid GROUP name or ID of the primary group of the new\n" +- " account\n"), stderr); ++ " account\n"), usageout); + (void) fputs (_(" -G, --groups GROUPS list of supplementary groups of the new\n" +- " account\n"), stderr); +- (void) fputs (_(" -h, --help display this help message and exit\n"), stderr); +- (void) fputs (_(" -k, --skel SKEL_DIR use this alternative skeleton directory\n"), stderr); +- (void) fputs (_(" -K, --key KEY=VALUE override /etc/login.defs defaults\n"), stderr); ++ " account\n"), usageout); ++ (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); ++ (void) fputs (_(" -k, --skel SKEL_DIR use this alternative skeleton directory\n"), usageout); ++ (void) fputs (_(" -K, --key KEY=VALUE override /etc/login.defs defaults\n"), usageout); + (void) fputs (_(" -l, --no-log-init do not add the user to the lastlog and\n" +- " faillog databases\n"), stderr); +- (void) fputs (_(" -m, --create-home create the user's home directory\n"), stderr); +- (void) fputs (_(" -M, --no-create-home do not create the user's home directory\n"), stderr); ++ " faillog databases\n"), usageout); ++ (void) fputs (_(" -m, --create-home create the user's home directory\n"), usageout); ++ (void) fputs (_(" -M, --no-create-home do not create the user's home directory\n"), usageout); + (void) fputs (_(" -N, --no-user-group do not create a group with the same name as\n" +- " the user\n"), stderr); ++ " the user\n"), usageout); + (void) fputs (_(" -o, --non-unique allow to create users with duplicate\n" +- " (non-unique) UID\n"), stderr); +- (void) fputs (_(" -p, --password PASSWORD encrypted password of the new account\n"), stderr); +- (void) fputs (_(" -r, --system create a system account\n"), stderr); +- (void) fputs (_(" -s, --shell SHELL login shell of the new account\n"), stderr); +- (void) fputs (_(" -u, --uid UID user ID of the new account\n"), stderr); +- (void) fputs (_(" -U, --user-group create a group with the same name as the user\n"), stderr); ++ " (non-unique) UID\n"), usageout); ++ (void) fputs (_(" -p, --password PASSWORD encrypted password of the new account\n"), usageout); ++ (void) fputs (_(" -r, --system create a system account\n"), usageout); ++ (void) fputs (_(" -s, --shell SHELL login shell of the new account\n"), usageout); ++ (void) fputs (_(" -u, --uid UID user ID of the new account\n"), usageout); ++ (void) fputs (_(" -U, --user-group create a group with the same name as the user\n"), usageout); + #ifdef WITH_SELINUX +- (void) fputs (_(" -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user mapping\n"), stderr); ++ (void) fputs (_(" -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user mapping\n"), usageout); + #endif +- (void) fputs ("\n", stderr); +- exit (E_USAGE); ++ (void) fputs ("\n", usageout); ++ exit (status); + } + + /* +@@ -989,9 +990,9 @@ + }; + while ((c = getopt_long (argc, argv, + #ifdef WITH_SELINUX +- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:", ++ "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:UZ:", + #else +- "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U", ++ "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:U", + #endif + long_options, NULL)) != -1) { + switch (c) { +@@ -1029,7 +1030,7 @@ + break; + case 'D': + if (anyflag) { +- usage (); ++ usage (E_USAGE); + } + Dflg = true; + break; +@@ -1066,7 +1067,7 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + /* + * -f -1 is allowed +@@ -1106,7 +1107,7 @@ + Gflg = true; + break; + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 'k': + def_template = optarg; +@@ -1201,7 +1202,7 @@ + break; + #endif + default: +- usage (); ++ usage (E_USAGE); + } + anyflag = true; + } +@@ -1220,31 +1221,31 @@ + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-o", "-u"); +- usage (); ++ usage (E_USAGE); + } + if (kflg && !mflg) { + fprintf (stderr, + _("%s: %s flag is only allowed with the %s flag\n"), + Prog, "-k", "-m"); +- usage (); ++ usage (E_USAGE); + } + if (Uflg && gflg) { + fprintf (stderr, + _("%s: options %s and %s conflict\n"), + Prog, "-U", "-g"); +- usage (); ++ usage (E_USAGE); + } + if (Uflg && Nflg) { + fprintf (stderr, + _("%s: options %s and %s conflict\n"), + Prog, "-U", "-N"); +- usage (); ++ usage (E_USAGE); + } + if (mflg && Mflg) { + fprintf (stderr, + _("%s: options %s and %s conflict\n"), + Prog, "-m", "-M"); +- usage (); ++ usage (E_USAGE); + } + + /* +@@ -1253,15 +1254,15 @@ + */ + if (Dflg) { + if (optind != argc) { +- usage (); ++ usage (E_USAGE); + } + + if (uflg || oflg || Gflg || dflg || cflg || mflg) { +- usage (); ++ usage (E_USAGE); + } + } else { + if (optind != argc - 1) { +- usage (); ++ usage (E_USAGE); + } + + user_name = argv[optind]; +Index: src/su.c +=================================================================== +--- src/su.c (revision 3054) ++++ src/su.c (revision 3055) +@@ -323,7 +323,7 @@ + /* + * usage - print command line syntax and exit + */ +-static void usage (void) ++static void usage (int status) + { + fputs (_("Usage: su [options] [LOGIN]\n" + "\n" +@@ -335,8 +335,8 @@ + " --preserve-environment do not reset environment variables, and\n" + " keep the same shell\n" + " -s, --shell SHELL use SHELL instead of the default in passwd\n" +- "\n"), stderr); +- exit (E_USAGE); ++ "\n"), status ? stderr : stdout); ++ exit (status); + } + + /* +@@ -421,7 +421,7 @@ + command = optarg; + break; + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 'l': + fakelogin = true; +@@ -438,7 +438,7 @@ + shellstr = optarg; + break; + default: +- usage (); /* NOT REACHED */ ++ usage (E_USAGE); /* NOT REACHED */ + } + } + +Index: src/groupmod.c +=================================================================== +--- src/groupmod.c (revision 3054) ++++ src/groupmod.c (revision 3055) +@@ -93,7 +93,7 @@ + pflg = false; /* new encrypted password */ + + /* local function prototypes */ +-static void usage (void); ++static void usage (int status); + static void new_grent (struct group *); + + #ifdef SHADOWGRP +@@ -113,21 +113,22 @@ + * usage - display usage message and exit + */ + +-static void usage (void) ++static void usage (int status) + { +- (void) fprintf (stderr, ++ FILE *usageout = status ? stderr : stdout; ++ (void) fprintf (usageout, + _("Usage: %s [options] GROUP\n" + "\n" + "Options:\n"), + Prog); +- (void) fputs (_(" -g, --gid GID change the group ID to GID\n"), stderr); +- (void) fputs (_(" -h, --help display this help message and exit\n"), stderr); +- (void) fputs (_(" -n, --new-name NEW_GROUP change the name to NEW_GROUP\n"), stderr); +- (void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), stderr); ++ (void) fputs (_(" -g, --gid GID change the group ID to GID\n"), usageout); ++ (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); ++ (void) fputs (_(" -n, --new-name NEW_GROUP change the name to NEW_GROUP\n"), usageout); ++ (void) fputs (_(" -o, --non-unique allow to use a duplicate (non-unique) GID\n"), usageout); + (void) fputs (_(" -p, --password PASSWORD change the password to this (encrypted)\n" +- " PASSWORD\n"), stderr); +- (void) fputs ("\n", stderr); +- exit (E_USAGE); ++ " PASSWORD\n"), usageout); ++ (void) fputs ("\n", usageout); ++ exit (status); + } + + /* +@@ -362,6 +363,8 @@ + exit (E_BAD_ARG); + } + break; ++ case 'h': ++ usage (E_SUCCESS); + case 'n': + nflg = true; + group_newname = optarg; +@@ -374,16 +377,16 @@ + pflg = true; + break; + default: +- usage (); ++ usage (E_USAGE); + } + } + + if (oflg && !gflg) { +- usage (); ++ usage (E_USAGE); + } + + if (optind != (argc - 1)) { +- usage (); ++ usage (E_USAGE); + } + + group_name = argv[argc - 1]; +Index: src/passwd.c +=================================================================== +--- src/passwd.c (revision 3054) ++++ src/passwd.c (revision 3055) +@@ -180,7 +180,7 @@ + " -w, --warndays WARN_DAYS set expiration warning days to WARN_DAYS\n" + " -x, --maxdays MAX_DAYS set maximum number of days before password\n" + " change to MAX_DAYS\n" +- "\n"), stderr); ++ "\n"), status ? stderr : stdout); + exit (status); + } + +@@ -811,7 +811,7 @@ + {NULL, 0, NULL, '\0'} + }; + +- while ((c = getopt_long (argc, argv, "adei:kln:qr:Suw:x:", ++ while ((c = getopt_long (argc, argv, "adehi:kln:qr:Suw:x:", + long_options, &option_index)) != -1) { + switch (c) { + case 'a': +@@ -897,6 +897,8 @@ + xflg = true; + anyflag = true; + break; ++ case 'h': ++ usage (E_SUCCESS); + default: + usage (E_BAD_ARG); + } +Index: src/groupadd.c +=================================================================== +--- src/groupadd.c (revision 3054) ++++ src/groupadd.c (revision 3055) +@@ -88,7 +88,7 @@ + #endif + + /* local function prototypes */ +-static void usage (void); ++static void usage (int status); + static void new_grent (struct group *grent); + + #ifdef SHADOWGRP +@@ -105,24 +105,25 @@ + /* + * usage - display usage message and exit + */ +-static void usage (void) ++static void usage (int status) + { +- (void) fprintf (stderr, ++ FILE *usageout = status ? stderr : stdout; ++ (void) fprintf (usageout, + _("Usage: %s [options] GROUP\n" + "\n" + "Options:\n"), + Prog); + (void) fputs (_(" -f, --force exit successfully if the group already exists,\n" +- " and cancel -g if the GID is already used\n"), stderr); +- (void) fputs (_(" -g, --gid GID use GID for the new group\n"), stderr); +- (void) fputs (_(" -h, --help display this help message and exit\n"), stderr); +- (void) fputs (_(" -K, --key KEY=VALUE override /etc/login.defs defaults\n"), stderr); ++ " and cancel -g if the GID is already used\n"), usageout); ++ (void) fputs (_(" -g, --gid GID use GID for the new group\n"), usageout); ++ (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); ++ (void) fputs (_(" -K, --key KEY=VALUE override /etc/login.defs defaults\n"), usageout); + (void) fputs (_(" -o, --non-unique allow to create groups with duplicate\n" +- " (non-unique) GID\n"), stderr); +- (void) fputs (_(" -p, --password PASSWORD use this encrypted password for the new group\n"), stderr); +- (void) fputs (_(" -r, --system create a system account\n"), stderr); +- (void) fputs ("\n", stderr); +- exit (E_USAGE); ++ " (non-unique) GID\n"), usageout); ++ (void) fputs (_(" -p, --password PASSWORD use this encrypted password for the new group\n"), usageout); ++ (void) fputs (_(" -r, --system create a system account\n"), usageout); ++ (void) fputs ("\n", usageout); ++ exit (status); + } + + /* +@@ -412,7 +413,7 @@ + } + break; + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 'K': + /* +@@ -444,7 +445,7 @@ + rflg = true; + break; + default: +- usage (); ++ usage (E_USAGE); + } + } + +@@ -452,7 +453,7 @@ + * Check the flags consistency + */ + if (optind != argc - 1) { +- usage (); ++ usage (E_USAGE); + } + group_name = argv[optind]; + +@@ -468,7 +469,7 @@ + { + /* -o does not make sense without -g */ + if (oflg && !gflg) { +- usage (); ++ usage (E_USAGE); + } + + check_new_name (); +Index: src/chage.c +=================================================================== +--- src/chage.c (revision 3054) ++++ src/chage.c (revision 3055) +@@ -91,7 +91,7 @@ + + /* local function prototypes */ + static bool isnum (const char *s); +-static void usage (void); ++static void usage (int status); + static void date_to_str (char *buf, size_t maxsize, time_t date); + static int new_fields (void); + static void print_date (time_t date); +@@ -152,7 +152,7 @@ + /* + * usage - print command line syntax and exit + */ +-static void usage (void) ++static void usage (int status) + { + fputs (_("Usage: chage [options] [LOGIN]\n" + "\n" +@@ -168,8 +168,8 @@ + " -M, --maxdays MAX_DAYS set maximim number of days before password\n" + " change to MAX_DAYS\n" + " -W, --warndays WARN_DAYS set expiration warning days to WARN_DAYS\n" +- "\n"), stderr); +- exit (E_USAGE); ++ "\n"), status ? stderr : stdout); ++ exit (status); + } + + static void date_to_str (char *buf, size_t maxsize, time_t date) +@@ -413,7 +413,7 @@ + fprintf (stderr, + _("%s: invalid date '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + case 'E': +@@ -425,11 +425,11 @@ + fprintf (stderr, + _("%s: invalid date '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 'I': + Iflg = true; +@@ -438,7 +438,7 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + case 'l': +@@ -451,7 +451,7 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + case 'M': +@@ -461,7 +461,7 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + case 'W': +@@ -471,11 +471,11 @@ + fprintf (stderr, + _("%s: invalid numeric argument '%s'\n"), + Prog, optarg); +- usage (); ++ usage (E_USAGE); + } + break; + default: +- usage (); ++ usage (E_USAGE); + } + } + +@@ -495,14 +495,14 @@ + */ + + if (argc != opt_index + 1) { +- usage (); ++ usage (E_USAGE); + } + + if (lflg && (mflg || Mflg || dflg || Wflg || Iflg || Eflg)) { + fprintf (stderr, + _("%s: do not include \"l\" with other flags\n"), + Prog); +- usage (); ++ usage (E_USAGE); + } + } + +Index: src/faillog.c +=================================================================== +--- src/faillog.c (revision 3054) ++++ src/faillog.c (revision 3055) +@@ -47,6 +47,17 @@ + /*@-exitarg@*/ + #include "exitcodes.h" + ++/* local function prototypes */ ++static void usage (int status); ++static void print_one (/*@null@*/const struct passwd *pw, bool force); ++static void set_locktime (long locktime); ++static bool set_locktime_one (uid_t uid, long locktime); ++static void setmax (int max); ++static bool setmax_one (uid_t uid, int max); ++static void print (void); ++static bool reset_one (uid_t uid); ++static void reset (void); ++ + /* + * Global variables + */ +@@ -69,24 +80,25 @@ + + #define NOW (time((time_t *) 0)) + +-static void usage (void) ++static void usage (int status) + { +- (void) fprintf (stderr, ++ FILE *usageout = status ? stderr : stdout; ++ (void) fprintf (usageout, + _("Usage: %s [options]\n" + "\n" + "Options:\n"), + "faillog"); +- (void) fputs (_(" -a, --all display faillog records for all users\n"), stderr); +- (void) fputs (_(" -h, --help display this help message and exit\n"), stderr); +- (void) fputs (_(" -l, --lock-time SEC after failed login lock account for SEC seconds\n"), stderr); +- (void) fputs (_(" -m, --maximum MAX set maximum failed login counters to MAX\n"), stderr); +- (void) fputs (_(" -r, --reset reset the counters of login failures\n"), stderr); +- (void) fputs (_(" -t, --time DAYS display faillog records more recent than DAYS\n"), stderr); ++ (void) fputs (_(" -a, --all display faillog records for all users\n"), usageout); ++ (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); ++ (void) fputs (_(" -l, --lock-time SEC after failed login lock account for SEC seconds\n"), usageout); ++ (void) fputs (_(" -m, --maximum MAX set maximum failed login counters to MAX\n"), usageout); ++ (void) fputs (_(" -r, --reset reset the counters of login failures\n"), usageout); ++ (void) fputs (_(" -t, --time DAYS display faillog records more recent than DAYS\n"), usageout); + (void) fputs (_(" -u, --user LOGIN/RANGE display faillog record or maintains failure\n" + " counters and limits (if used with -r, -m,\n" +- " or -l) only for the specified LOGIN(s)\n"), stderr); +- (void) fputs ("\n", stderr); +- exit (E_USAGE); ++ " or -l) only for the specified LOGIN(s)\n"), usageout); ++ (void) fputs ("\n", usageout); ++ exit (status); + } + + static void print_one (/*@null@*/const struct passwd *pw, bool force) +@@ -495,7 +507,7 @@ + aflg = true; + break; + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 'l': + if (getlong (optarg, &fail_locktime) == 0) { +@@ -561,16 +573,16 @@ + break; + } + default: +- usage (); ++ usage (E_USAGE); + } + } + } + + if (aflg && uflg) { +- usage (); ++ usage (E_USAGE); + } + if (tflg && (lflg || mflg || rflg)) { +- usage (); ++ usage (E_USAGE); + } + + /* Open the faillog database */ +Index: src/chsh.c +=================================================================== +--- src/chsh.c (revision 3054) ++++ src/chsh.c (revision 3055) +@@ -72,7 +72,7 @@ + + /* local function prototypes */ + static void fail_exit (int code); +-static void usage (void); ++static void usage (int status); + static void new_fields (void); + static bool shell_is_listed (const char *); + static bool is_restricted_shell (const char *); +@@ -101,15 +101,15 @@ + /* + * usage - print command line syntax and exit + */ +-static void usage (void) ++static void usage (int status) + { + fputs (_("Usage: chsh [options] [LOGIN]\n" + "\n" + "Options:\n" + " -h, --help display this help message and exit\n" + " -s, --shell SHELL new login shell for the user account\n" +- "\n"), stderr); +- exit (E_USAGE); ++ "\n"), status ? stderr : stdout); ++ exit (status); + } + + /* +@@ -217,14 +217,14 @@ + &option_index)) != -1) { + switch (c) { + case 'h': +- usage (); ++ usage (E_SUCCESS); + break; + case 's': + sflg = true; + STRFCPY (loginsh, optarg); + break; + default: +- usage (); ++ usage (E_USAGE); + } + } + +@@ -233,7 +233,7 @@ + * be the user's name. + */ + if (argc > (optind + 1)) { +- usage (); ++ usage (E_USAGE); + } + } + +Index: man/groupmems.8.xml +=================================================================== +--- man/groupmems.8.xml (revision 3054) ++++ man/groupmems.8.xml (revision 3055) +@@ -114,6 +114,12 @@ + </listitem> + </varlistentry> + <varlistentry> ++ <term><option>-h</option>, <option>--help</option></term> ++ <listitem> ++ <para>Display help message and exit.</para> ++ </listitem> ++ </varlistentry> ++ <varlistentry> + <term><option>-l</option>, <option>--list</option></term> + <listitem> + <para>List the group membership list.</para> +Index: man/gpasswd.1.xml +=================================================================== +--- man/gpasswd.1.xml (revision 3054) ++++ man/gpasswd.1.xml (revision 3055) +@@ -1,7 +1,7 @@ + <?xml version="1.0" encoding="UTF-8"?> + <!-- + Copyright (c) 1996 , Rafal Maszkowski +- Copyright (c) 2007 - 2008, Nicolas François ++ Copyright (c) 2007 - 2009, Nicolas François + All rights reserved. + + Redistribution and use in source and binary forms, with or without +@@ -148,6 +148,14 @@ + </variablelist> + <variablelist remap='IP'> + <varlistentry> ++ <term><option>-h</option>, <option>--help</option></term> ++ <listitem> ++ <para>Display help message and exit.</para> ++ </listitem> ++ </varlistentry> ++ </variablelist> ++ <variablelist remap='IP'> ++ <varlistentry> + <term> + <option>-r</option>, <option>--remove-password</option> + </term> +Index: NEWS +=================================================================== +--- NEWS (revision 3054) ++++ NEWS (revision 3055) +@@ -1,5 +1,11 @@ + $Id$ + ++shadow-4.1.4.1 -> shadow-4.1.4.2 UNRELEASED ++ ++- general ++ * report usage error to stderr, but report usage help to stdout (and return ++ zero) when explicitly requested (e.g. with --help). ++ + shadow-4.1.4.1 -> shadow-4.1.4.2 2009-07-24 + + - general diff --git a/source/a/shadow/patches/r3060.diff b/source/a/shadow/patches/r3060.diff new file mode 100644 index 000000000..8ece64300 --- /dev/null +++ b/source/a/shadow/patches/r3060.diff @@ -0,0 +1,116 @@ +* libmisc/copydir.c, lib/shadowmem.c, lib/groupmem.c, lib/pwmem.c: +Fix some memory leaks. + +Index: libmisc/copydir.c +=================================================================== +--- libmisc/copydir.c (revision 3059) ++++ libmisc/copydir.c (revision 3060) +@@ -443,6 +443,7 @@ + nchars = readlink (filename, buffer, size); + + if (nchars < 0) { ++ free(buffer); + return NULL; + } + + +Index: lib/shadowmem.c +=================================================================== +--- lib/shadowmem.c (revision 3059) ++++ lib/shadowmem.c (revision 3060) +@@ -52,10 +52,13 @@ + *sp = *spent; + sp->sp_namp = strdup (spent->sp_namp); + if (NULL == sp->sp_namp) { ++ free(sp); + return NULL; + } + sp->sp_pwdp = strdup (spent->sp_pwdp); + if (NULL == sp->sp_pwdp) { ++ free(sp->sp_namp); ++ free(sp); + return NULL; + } + +Index: lib/groupmem.c +=================================================================== +--- lib/groupmem.c (revision 3059) ++++ lib/groupmem.c (revision 3060) +@@ -51,10 +51,13 @@ + *gr = *grent; + gr->gr_name = strdup (grent->gr_name); + if (NULL == gr->gr_name) { ++ free(gr); + return NULL; + } + gr->gr_passwd = strdup (grent->gr_passwd); + if (NULL == gr->gr_passwd) { ++ free(gr->gr_name); ++ free(gr); + return NULL; + } + +@@ -62,11 +65,21 @@ + + gr->gr_mem = (char **) malloc ((i + 1) * sizeof (char *)); + if (NULL == gr->gr_mem) { ++ free(gr->gr_passwd); ++ free(gr->gr_name); ++ free(gr); + return NULL; + } + for (i = 0; grent->gr_mem[i]; i++) { + gr->gr_mem[i] = strdup (grent->gr_mem[i]); + if (NULL == gr->gr_mem[i]) { ++ int j; ++ for (j=0; j<i; j++) ++ free(gr->gr_mem[j]); ++ free(gr->gr_mem); ++ free(gr->gr_passwd); ++ free(gr->gr_name); ++ free(gr); + return NULL; + } + } +Index: lib/pwmem.c +=================================================================== +--- lib/pwmem.c (revision 3059) ++++ lib/pwmem.c (revision 3060) +@@ -51,22 +51,37 @@ + *pw = *pwent; + pw->pw_name = strdup (pwent->pw_name); + if (NULL == pw->pw_name) { ++ free(pw); + return NULL; + } + pw->pw_passwd = strdup (pwent->pw_passwd); + if (NULL == pw->pw_passwd) { ++ free(pw->pw_name); ++ free(pw); + return NULL; + } + pw->pw_gecos = strdup (pwent->pw_gecos); + if (NULL == pw->pw_gecos) { ++ free(pw->pw_passwd); ++ free(pw->pw_name); ++ free(pw); + return NULL; + } + pw->pw_dir = strdup (pwent->pw_dir); + if (NULL == pw->pw_dir) { ++ free(pw->pw_gecos); ++ free(pw->pw_passwd); ++ free(pw->pw_name); ++ free(pw); + return NULL; + } + pw->pw_shell = strdup (pwent->pw_shell); + if (NULL == pw->pw_shell) { ++ free(pw->pw_dir); ++ free(pw->pw_gecos); ++ free(pw->pw_passwd); ++ free(pw->pw_name); ++ free(pw); + return NULL; + } + diff --git a/source/a/shadow/patches/r3062.diff b/source/a/shadow/patches/r3062.diff new file mode 100644 index 000000000..00d9ba3af --- /dev/null +++ b/source/a/shadow/patches/r3062.diff @@ -0,0 +1,139 @@ +Index: lib/shadowmem.c +=================================================================== +--- lib/shadowmem.c (revision 3061) ++++ lib/shadowmem.c (revision 3062) +@@ -49,8 +49,14 @@ + if (NULL == sp) { + return NULL; + } +- *sp = *spent; +- sp->sp_namp = strdup (spent->sp_namp); ++ sp->sp_lstchg = spent->sp_lstchg; ++ sp->sp_min = spent->sp_min; ++ sp->sp_max = spent->sp_max; ++ sp->sp_warn = spent->sp_warn; ++ sp->sp_inact = spent->sp_inact; ++ sp->sp_expire = spent->sp_expire; ++ sp->sp_flag = spent->sp_flag; ++ sp->sp_namp = strdup (spent->sp_namp); + if (NULL == sp->sp_namp) { + free(sp); + return NULL; +@@ -68,8 +74,10 @@ + void spw_free (/*@out@*/ /*@only@*/struct spwd *spent) + { + free (spent->sp_namp); +- memzero (spent->sp_pwdp, strlen (spent->sp_pwdp)); +- free (spent->sp_pwdp); ++ if (NULL != spent->sp_pwdp) { ++ memzero (spent->sp_pwdp, strlen (spent->sp_pwdp)); ++ free (spent->sp_pwdp); ++ } + free (spent); + } + +Index: lib/groupmem.c +=================================================================== +--- lib/groupmem.c (revision 3061) ++++ lib/groupmem.c (revision 3062) +@@ -48,7 +48,7 @@ + if (NULL == gr) { + return NULL; + } +- *gr = *grent; ++ gr->gr_gid = grent->gr_gid; + gr->gr_name = strdup (grent->gr_name); + if (NULL == gr->gr_name) { + free(gr); +@@ -90,13 +90,18 @@ + + void gr_free (/*@out@*/ /*@only@*/struct group *grent) + { ++ size_t i; + free (grent->gr_name); +- memzero (grent->gr_passwd, strlen (grent->gr_passwd)); +- free (grent->gr_passwd); +- while (*(grent->gr_mem)) { +- free (*(grent->gr_mem)); +- grent->gr_mem++; ++ if (NULL != grent->gr_passwd) { ++ memzero (grent->gr_passwd, strlen (grent->gr_passwd)); ++ free (grent->gr_passwd); + } ++ if (NULL != grent->gr_mem) { ++ for (i = 0; NULL != grent->gr_mem[i]; i++) { ++ free (grent->gr_mem[i]); ++ } ++ free (grent->gr_mem); ++ } + free (grent); + } + +Index: lib/sgroupio.c +=================================================================== +--- lib/sgroupio.c (revision 3061) ++++ lib/sgroupio.c (revision 3062) +@@ -51,7 +51,6 @@ + if (NULL == sg) { + return NULL; + } +- *sg = *sgent; + sg->sg_name = strdup (sgent->sg_name); + if (NULL == sg->sg_name) { + free (sg); +@@ -137,17 +136,20 @@ + + void sgr_free (/*@out@*/ /*@only@*/struct sgrp *sgent) + { ++ size_t i; + free (sgent->sg_name); +- memzero (sgent->sg_passwd, strlen (sgent->sg_passwd)); +- free (sgent->sg_passwd); +- while (NULL != *(sgent->sg_adm)) { +- free (*(sgent->sg_adm)); +- sgent->sg_adm++; ++ if (NULL != sgent->sg_passwd) { ++ memzero (sgent->sg_passwd, strlen (sgent->sg_passwd)); ++ free (sgent->sg_passwd); + } +- while (NULL != *(sgent->sg_mem)) { +- free (*(sgent->sg_mem)); +- sgent->sg_mem++; ++ for (i = 0; NULL != sgent->sg_adm[i]; i++) { ++ free (sgent->sg_adm[i]); + } ++ free (sgent->sg_adm); ++ for (i = 0; NULL != sgent->sg_mem[i]; i++) { ++ free (sgent->sg_mem[i]); ++ } ++ free (sgent->sg_mem); + free (sgent); + } + +Index: lib/pwmem.c +=================================================================== +--- lib/pwmem.c (revision 3061) ++++ lib/pwmem.c (revision 3062) +@@ -48,7 +48,8 @@ + if (NULL == pw) { + return NULL; + } +- *pw = *pwent; ++ pw->pw_uid = pwent->pw_uid; ++ pw->pw_gid = pwent->pw_gid; + pw->pw_name = strdup (pwent->pw_name); + if (NULL == pw->pw_name) { + free(pw); +@@ -91,8 +92,10 @@ + void pw_free (/*@out@*/ /*@only@*/struct passwd *pwent) + { + free (pwent->pw_name); +- memzero (pwent->pw_passwd, strlen (pwent->pw_passwd)); +- free (pwent->pw_passwd); ++ if (pwent->pw_passwd) { ++ memzero (pwent->pw_passwd, strlen (pwent->pw_passwd)); ++ free (pwent->pw_passwd); ++ } + free (pwent->pw_gecos); + free (pwent->pw_dir); + free (pwent->pw_shell); diff --git a/source/a/shadow/patches/r3096.diff b/source/a/shadow/patches/r3096.diff new file mode 100644 index 000000000..0e77ce6fe --- /dev/null +++ b/source/a/shadow/patches/r3096.diff @@ -0,0 +1,27 @@ + +* lib/gshadow.c: Fix parsing of gshadow entries. + +Index: lib/gshadow.c +=================================================================== +--- lib/gshadow.c (revision 3095) ++++ lib/gshadow.c (revision 3096) +@@ -222,6 +222,7 @@ + if (NULL == buf) { + return NULL; + } ++ buflen = BUFSIZ; + } + + if (NULL == fp) { +@@ -229,9 +230,9 @@ + } + + #ifdef USE_NIS +- while (fgetsx (buf, (int) sizeof buf, fp) == buf) ++ while (fgetsx (buf, (int) buflen, fp) == buf) + #else +- if (fgetsx (buf, (int) sizeof buf, fp) == buf) ++ if (fgetsx (buf, (int) buflen, fp) == buf) + #endif + { + while ( ((cp = strrchr (buf, '\n')) == NULL) diff --git a/source/a/shadow/patches/r3160.diff b/source/a/shadow/patches/r3160.diff new file mode 100644 index 000000000..5aabbaa9e --- /dev/null +++ b/source/a/shadow/patches/r3160.diff @@ -0,0 +1,239 @@ +Index: libmisc/limits.c +=================================================================== +--- libmisc/limits.c (revision 3159) ++++ libmisc/limits.c (revision 3160) +@@ -33,6 +33,7 @@ + /* + * Separated from setup.c. --marekm + * Resource limits thanks to Cristian Gafton. ++ * Enhancements of resource limit code by Thomas Orgis <thomas@orgis.org> ("thor"). + */ + + #include <config.h> +@@ -44,6 +45,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <stdio.h> ++#include <ctype.h> + #include "prototypes.h" + #include "defines.h" + #include <pwd.h> +@@ -69,17 +71,37 @@ + unsigned int multiplier) + { + struct rlimit rlim; +- long limit; ++ rlim_t limit; + +- if (getlong (value, &limit) == 0) { +- return 0; ++ /* The "-" is special, not belonging to a strange negative limit. ++ It is infinity, in a controlled way. --thor */ ++ if(value[0] == '-') { ++ limit = RLIM_INFINITY; + } +- limit *= multiplier; +- if (limit != (rlim_t) limit) { +- return 0; ++ else { ++ /* We cannot use getlong here because it fails when there ++ is more to the value than just this number! ++ Also, we are limited to base 10 here (hex numbers will not ++ work with the limit string parser as is anyway) --thor */ ++ char *endptr; ++ long longlimit = strtol(value, &endptr, 10); ++ if ((0 == longlimit) && (value == endptr)) { ++ /* No argument at all. No-op. ++ We could instead throw an error, though. --thor */ ++ return 0; ++ } ++ longlimit *= multiplier; ++ limit = (rlim_t)longlimit; ++ if(longlimit != limit) ++ { ++ /* Again, silent error handling... I left it that way. ++ Wouldn't screaming make more sense? --thor */ ++ return 0; ++ } + } +- rlim.rlim_cur = (rlim_t) limit; +- rlim.rlim_max = (rlim_t) limit; ++ ++ rlim.rlim_cur = limit; ++ rlim.rlim_max = limit; + if (setrlimit (resource, &rlim) != 0) { + return LOGIN_ERROR_RLIMIT; + } +@@ -199,6 +221,9 @@ + * [Ii]: i = RLIMIT_NICE max nice value (0..39 translates to 20..-19) + * [Oo]: o = RLIMIT_RTPRIO max real time priority (linux/sched.h 0..MAX_RT_PRIO) + * ++ * Remember to extend the "no-limits" string below when adding a new limit... ++ * --thor ++ * + * Return value: + * 0 = okay, of course + * LOGIN_ERROR_RLIMIT = error setting some RLIMIT +@@ -214,7 +239,20 @@ + bool reported = false; + + pp = buf; ++ /* Skip leading whitespace. --thor */ ++ while(*pp == ' ' || *pp == '\t') ++pp; + ++ /* The special limit string "-" results in no limit for all known limits. ++ We achieve that by parsing a full limit string, parts of it being ignored ++ if a limit type is not known to the system. ++ Though, there will be complaining for unknown limit types. --thor */ ++ if(strcmp(pp, "-") == 0) { ++ /* Remember to extend this, too, when adding new limits! ++ Oh... but "unlimited" does not make sense for umask, or does it? ++ --thor */ ++ pp = "A- C- D- F- M- N- R- S- T- P- I- O-"; ++ } ++ + while ('\0' != *pp) { + switch (*pp++) { + #ifdef RLIMIT_AS +@@ -316,6 +354,10 @@ + break; + default: + /* Only report invalid strings once */ ++ /* Note: A string can be invalid just because a specific (theoretically ++ valid) setting is not supported by this build. ++ It is just a warning in syslog anyway. The line is still processed ++ --thor */ + if (!reported) { + SYSLOG ((LOG_WARN, + "Invalid limit string: '%s'", +@@ -324,13 +366,51 @@ + retval |= LOGIN_ERROR_RLIMIT; + } + } ++ /* After parsing one limit setting (or just complaining about it), ++ one still needs to skip its argument to prevent a bogus warning on ++ trying to parse that as limit specification. ++ So, let's skip all digits, "-" and our limited set of whitespace. ++ --thor */ ++ while(isdigit(*pp) || *pp == '-' || *pp == ' ' || *pp == '\t') { ++ ++pp; ++ } + } + return retval; + } + ++/* Check if user uname is in the group gname. ++ * Can I be sure that gr_mem contains no UID as string? ++ * Returns true when user is in the group, false when not. ++ * Any error is treated as false. --thor ++ */ ++static bool user_in_group (const char *uname, const char *gname) ++{ ++ struct group *groupdata; ++ char **member; ++ if(uname == NULL || gname == NULL){ ++ return false; ++ } ++ /* We are not claiming to be re-entrant! ++ * In case of paranoia or a multithreaded login program, ++ * one needs to add some mess for getgrnam_r. */ ++ groupdata = getgrnam(gname); ++ if(groupdata == NULL) { ++ SYSLOG ((LOG_WARN, "Nonexisting group `%s' in limits file.", gname)); ++ return false; ++ } ++ /* Now look for our user in the list of members. */ ++ member = groupdata->gr_mem; ++ while(*member != NULL) { ++ if(strcmp(*member, uname) == 0) { ++ return true; ++ } ++ ++member; ++ } ++ return false; ++} ++ + static int setup_user_limits (const char *uname) + { +- /* TODO: allow and use @group syntax --cristiang */ + FILE *fil; + char buf[1024]; + char name[1024]; +@@ -352,7 +432,7 @@ + } + /* The limits file have the following format: + * - '#' (comment) chars only as first chars on a line; +- * - username must start on first column ++ * - username must start on first column (or *, or @group --thor) + * A better (smarter) checking should be done --cristiang */ + while (fgets (buf, 1024, fil) != NULL) { + if (('#' == buf[0]) || ('\n' == buf[0])) { +@@ -367,6 +447,13 @@ + * Imposing a limit should be done with care, so a wrong + * entry means no care anyway :-). A '-' as a limits + * strings means no limits --cristiang */ ++ /* In addition to the handling of * as name which was alrady present, ++ I added handling of the @group syntax. ++ To clarify: The first entry with matching user name rules, ++ everything after it is ignored. If there is no user entry, ++ the last encountered entry for a matching group rules. ++ If there is no matching group entry, the default limits rule. ++ --thor. */ + if (sscanf (buf, "%s%[ACDFMNRSTULPIOacdfmnrstulpio0-9 \t-]", + name, tempbuf) == 2) { + if (strcmp (name, uname) == 0) { +@@ -374,6 +461,12 @@ + break; + } else if (strcmp (name, "*") == 0) { + strcpy (deflimits, tempbuf); ++ } else if (name[0] == '@') { ++ /* If the user is in the group, the group limits apply unless ++ later a line for the specific user is found. --thor */ ++ if(user_in_group(uname, name+1)) { ++ strcpy (limits, tempbuf); ++ } + } + } + } +Index: man/limits.5.xml +=================================================================== +--- man/limits.5.xml (revision 3159) ++++ man/limits.5.xml (revision 3160) +@@ -64,7 +64,13 @@ + <emphasis remap='I'>user LIMITS_STRING</emphasis> + </para> + ++ <para>or in the form:</para> ++ + <para> ++ <emphasis remap='I'>@group LIMITS_STRING</emphasis> ++ </para> ++ ++ <para> + The <emphasis>LIMITS_STRING</emphasis> is a string of a concatenated + list of resource limits. Each limit consists of a letter identifier + followed by a numerical limit. +@@ -125,11 +131,23 @@ + </para> + + <para> ++ The limits specified in the form "<replaceable>@group</replaceable>" ++ apply to the members of the specified ++ <replaceable>group</replaceable>. ++ </para> ++ ++ <para> + To completely disable limits for a user, a single dash + "<emphasis>-</emphasis>" will do. + </para> + + <para> ++ To disable a limit for a user, a single dash ++ "<replaceable>-</replaceable>" can be used instead of the numerical ++ value for this limit. ++ </para> ++ ++ <para> + Also, please note that all limit settings are set PER LOGIN. They are + not global, nor are they permanent. Perhaps global limits will come, + but for now this will have to do ;) diff --git a/source/a/shadow/patches/r3194.diff b/source/a/shadow/patches/r3194.diff new file mode 100644 index 000000000..0eff631bb --- /dev/null +++ b/source/a/shadow/patches/r3194.diff @@ -0,0 +1,15 @@ +* src/su.c: shell's name must be -su when a su fakes a login. + +=================================================================== +--- src/su.c (revision 3193) ++++ src/su.c (revision 3194) +@@ -1021,7 +1021,7 @@ + * Use the shell and create an argv + * with the rest of the command line included. + */ +- argv[-1] = shellstr; ++ argv[-1] = cp; + #ifndef USE_PAM + execve_shell (shellstr, &argv[-1], environ); + err = errno; + diff --git a/source/a/shadow/patches/r3299.diff b/source/a/shadow/patches/r3299.diff new file mode 100644 index 000000000..a46b18f05 --- /dev/null +++ b/source/a/shadow/patches/r3299.diff @@ -0,0 +1,12 @@ +Index: man/ru/Makefile.am +=================================================================== +--- man/ru/Makefile.am (revision 3298) ++++ man/ru/Makefile.am (revision 3299) +@@ -1,7 +1,6 @@ + mandir = @mandir@/ru + + man_MANS = \ +- $(man_nopam) \ + chage.1 \ + chfn.1 \ + chgpasswd.8 \ diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index 77e34089c..c3d2e9c72 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=4.1.4.2 -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:--j6} +PKGNAM=shadow +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -35,6 +34,8 @@ if [ -z "$ARCH" ]; then esac fi +NUMJOBS=${NUMJOBS:--j6} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-shadow @@ -56,6 +57,15 @@ rm -rf shadow-$VERSION tar xvf $CWD/shadow-$VERSION.tar.?z* || exit 1 cd shadow-$VERSION +# Apply some patches taken from the svn trunk that +# fix some of the more serious bugs in 4.1.4.3: +for patch in $CWD/patches/*.diff.gz ; do + zcat $patch | patch -p0 --verbose || exit 1 +done + +# Re-run automake because of r3299 patch to man/ru/Makefile.am: +automake -f + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -115,9 +125,8 @@ touch $PKG/var/log/faillog.new ln -s ../sbin/lastlog ) -# Fixup a few permissions: -chmod 4711 $PKG/bin/su -chmod 4711 $PKG/usr/bin/* +# Use 4711 rather than 4755 permissions where setuid root is required: +find $PKG -type f -perm 4755 -exec chmod 4711 "{}" \; # Compress and if needed symlink the man pages: if [ -d $PKG/usr/man ]; then @@ -136,13 +145,16 @@ fi mkdir -p $PKG/usr/doc/shadow-$VERSION cp -a \ - COPYING ChangeLog NEWS README TODO doc/{README*,HOWTO,WISHLIST,*.txt} \ + COPYING* NEWS README* TODO doc/{README*,HOWTO,WISHLIST,*.txt} \ $PKG/usr/doc/shadow-$VERSION -#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 +# 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 diff --git a/source/a/shadow/shadow.url b/source/a/shadow/shadow.url new file mode 100644 index 000000000..b18864a85 --- /dev/null +++ b/source/a/shadow/shadow.url @@ -0,0 +1 @@ +ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow diff --git a/source/a/sharutils/sharutils.SlackBuild b/source/a/sharutils/sharutils.SlackBuild index 0d8bd6f07..5c1997ca2 100755 --- a/source/a/sharutils/sharutils.SlackBuild +++ b/source/a/sharutils/sharutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +21,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=4.7 -ARCH=${ARCH:-x86_64} +PKGNAM=sharutils +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-sharutils @@ -45,8 +55,8 @@ mkdir -p $TMP $PKG cd $TMP rm -rf sharutils-$VERSION -tar xjvf $CWD/sharutils-$VERSION.tar.bz2 -cd sharutils-$VERSION +tar xvf $CWD/sharutils-$VERSION.tar.?z* || exit 1 +cd sharutils-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -54,15 +64,23 @@ find . \ \( -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 \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --infodir=/usr/info \ - $ARCH-slackware-linux -make -j3 -make install DESTDIR=$PKG -make install-man DESTDIR=$PKG + --build=$ARCH-slackware-linux + +make -j3 || make || exit 1 +make install DESTDIR=$PKG || exit 1 +make install-man DESTDIR=$PKG || exit 1 + +# I'm not aware of any reason for these include files to exist outside +# of the sharutils sources: +if [ -d $PKG/usr/include ]; then + rm -rf $PKG/usr/include +fi rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* $PKG/usr/man/man?/*.? @@ -74,9 +92,17 @@ gzip -9 $PKG/usr/info/* $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/sharutils-$VERSION cp -a \ - AUTHORS COPYING INSTALL NEWS README README-alpha THANKS TODO \ + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \ $PKG/usr/doc/sharutils-$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/slocate/slocate.SlackBuild b/source/a/slocate/slocate.SlackBuild index 3fec40f26..eef2fd1f6 100755 --- a/source/a/slocate/slocate.SlackBuild +++ b/source/a/slocate/slocate.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,9 +22,18 @@ VERSION=3.1 -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 + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-slocate diff --git a/source/a/smartmontools/smartmontools.SlackBuild b/source/a/smartmontools/smartmontools.SlackBuild index 5ebed962e..1113e40af 100755 --- a/source/a/smartmontools/smartmontools.SlackBuild +++ b/source/a/smartmontools/smartmontools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -58,6 +58,7 @@ chown -R root:root . --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --sysconfdir=/etc \ + --docdir=/usr/doc/smartmontools-$VERSION \ --build=$ARCH-slackware-linux make || exit 1 @@ -68,9 +69,6 @@ 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/smartd.conf ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -81,6 +79,12 @@ mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc +# These have already been copyed, but it is nice to keep the original +# timestamps if possible, so we will copy over: +cp -a \ + AUTHORS CHANGELOG COPYING* INSTALL NEWS README* TODO WARNINGS \ + $PKG/usr/doc/smartmontools-$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 diff --git a/source/a/splitvt/splitvt.SlackBuild b/source/a/splitvt/splitvt.SlackBuild index f643a825c..79a628aff 100755 --- a/source/a/splitvt/splitvt.SlackBuild +++ b/source/a/splitvt/splitvt.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,9 +22,18 @@ VERSION=1.6.5 -ARCH=${ARCH:-x86_64} 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-splitvt diff --git a/source/a/sysfsutils/sysfsutils.SlackBuild b/source/a/sysfsutils/sysfsutils.SlackBuild index 0534b3e29..4d1822ecf 100755 --- a/source/a/sysfsutils/sysfsutils.SlackBuild +++ b/source/a/sysfsutils/sysfsutils.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,9 +22,18 @@ VERSION=2.1.0 -ARCH=${ARCH:-x86_64} 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 diff --git a/source/a/sysklogd/config/rc.syslog.new b/source/a/sysklogd/config/rc.syslog.new new file mode 100644 index 000000000..46208fab8 --- /dev/null +++ b/source/a/sysklogd/config/rc.syslog.new @@ -0,0 +1,49 @@ +#!/bin/sh +# Start/stop/restart the system logging daemons. +# +# Written for Slackware Linux by Patrick J. Volkerding <volkerdi@slackware.com>. + +syslogd_start() { + if [ -x /usr/sbin/syslogd -a -x /usr/sbin/klogd ]; then + echo -n "Starting sysklogd daemons: " + echo -n "/usr/sbin/syslogd " + /usr/sbin/syslogd + # prevent syslogd/klogd race condition on SMP kernels + if ps acx | grep -q udevd ; then + while [ ! -e /dev/log ] ; do + sleep 0 + done + else + sleep 1 + fi + echo "/usr/sbin/klogd -c 3 -x" + # '-c 3' = display level 'error' or higher messages on console + # '-x' = turn off broken EIP translation + /usr/sbin/klogd -c 3 -x + fi +} + +syslogd_stop() { + killall syslogd 2> /dev/null + killall klogd 2> /dev/null +} + +syslogd_restart() { + syslogd_stop + sleep 1 + syslogd_start +} + +case "$1" in +'start') + syslogd_start + ;; +'stop') + syslogd_stop + ;; +'restart') + syslogd_restart + ;; +*) + echo "usage $0 start|stop|restart" +esac diff --git a/source/a/sysklogd/config/syslog.conf.new b/source/a/sysklogd/config/syslog.conf.new new file mode 100644 index 000000000..15bc5ee41 --- /dev/null +++ b/source/a/sysklogd/config/syslog.conf.new @@ -0,0 +1,46 @@ +# /etc/syslog.conf +# For info about the format of this file, see "man syslog.conf" +# and /usr/doc/sysklogd/README.linux. Note the '-' prefixing some +# of these entries; this omits syncing the file after every logging. +# In the event of a crash, some log information might be lost, so +# if this is a concern to you then you might want to remove the '-'. +# Be advised this will cause a performation loss if you're using +# programs that do heavy logging. + +# Uncomment this to see kernel messages on the console. +#kern.* /dev/console + +# Log anything 'info' or higher, but lower than 'warn'. +# Exclude authpriv, cron, mail, and news. These are logged elsewhere. +*.info;*.!warn;\ + authpriv.none;cron.none;mail.none;news.none -/var/log/messages + +# Log anything 'warn' or higher. +# Exclude authpriv, cron, mail, and news. These are logged elsewhere. +*.warn;\ + authpriv.none;cron.none;mail.none;news.none -/var/log/syslog + +# Debugging information is logged here. +*.=debug -/var/log/debug + +# Private authentication message logging: +authpriv.* -/var/log/secure + +# Cron related logs: +cron.* -/var/log/cron + +# Mail related logs: +mail.* -/var/log/maillog + +# Emergency level messages go to all users: +*.emerg * + +# This log is for news and uucp errors: +uucp,news.crit -/var/log/spooler + +# Uncomment these if you'd like INN to keep logs on everything. +# You won't need this if you don't run INN (the InterNetNews daemon). +#news.=crit -/var/log/news/news.crit +#news.=err -/var/log/news/news.err +#news.notice -/var/log/news/news.notice + diff --git a/source/a/sysklogd/config/syslog.logrotate b/source/a/sysklogd/config/syslog.logrotate new file mode 100644 index 000000000..031e68df0 --- /dev/null +++ b/source/a/sysklogd/config/syslog.logrotate @@ -0,0 +1,6 @@ +/var/log/cron /var/log/debug /var/log/maillog /var/log/messages /var/log/secure /var/log/spooler /var/log/syslog { + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslogd.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/source/a/sysklogd/doinst.sh b/source/a/sysklogd/doinst.sh new file mode 100644 index 000000000..fcaf830d6 --- /dev/null +++ b/source/a/sysklogd/doinst.sh @@ -0,0 +1,31 @@ +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.d/syslog.new +config etc/syslog.conf.new +config etc/rc.d/rc.syslog.new +config var/log/cron.new +config var/log/debug.new +config var/log/maillog.new +config var/log/messages.new +config var/log/secure.new +config var/log/spooler.new +config var/log/syslog.new + +# Remove any leftover empty files: +rm -f var/log/cron.new +rm -f var/log/debug.new +rm -f var/log/maillog.new +rm -f var/log/messages.new +rm -f var/log/secure.new +rm -f var/log/spooler.new +rm -f var/log/syslog.new + diff --git a/source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff b/source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff deleted file mode 100644 index 268309297..000000000 --- a/source/a/sysklogd/sysklogd-1.4.1-owl-syslogd-crunch_list.diff +++ /dev/null @@ -1,90 +0,0 @@ ---- ./syslogd.c.orig 2007-04-09 18:17:05.000000000 -0500 -+++ ./syslogd.c 2007-04-09 18:25:22.000000000 -0500 -@@ -1273,61 +1273,55 @@ - crunch_list(list) - char *list; - { -- int count, i; -+ int i, m, n; - char *p, *q; - char **result = NULL; - - p = list; - - /* strip off trailing delimiters */ -- while (p[strlen(p)-1] == LIST_DELIMITER) { -- count--; -+ while (*p && p[strlen(p)-1] == LIST_DELIMITER) - p[strlen(p)-1] = '\0'; -- } - /* cut off leading delimiters */ -- while (p[0] == LIST_DELIMITER) { -- count--; -- p++; -- } -- -- /* count delimiters to calculate elements */ -- for (count=i=0; p[i]; i++) -- if (p[i] == LIST_DELIMITER) count++; -- -- if ((result = (char **)malloc(sizeof(char *) * (count+2))) == NULL) { -+ while (p[0] == LIST_DELIMITER) -+ p++; -+ -+ /* count delimiters to calculate the number of elements */ -+ for (n = i = 0; p[i]; i++) -+ if (p[i] == LIST_DELIMITER) n++; -+ -+ if ((result = (char **)malloc(sizeof(char *) * (n + 2))) == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } -- -+ - /* - * We now can assume that the first and last - * characters are different from any delimiters, - * so we don't have to care about this. - */ -- count = 0; -- while ((q=strchr(p, LIST_DELIMITER))) { -- result[count] = (char *) malloc((q - p + 1) * sizeof(char)); -- if (result[count] == NULL) { -+ m = 0; -+ while ((q = strchr(p, LIST_DELIMITER)) && m < n) { -+ result[m] = (char *) malloc((q - p + 1) * sizeof(char)); -+ if (result[m] == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } -- strncpy(result[count], p, q - p); -- result[count][q - p] = '\0'; -+ memcpy(result[m], p, q - p); -+ result[m][q - p] = '\0'; - p = q; p++; -- count++; -+ m++; - } -- if ((result[count] = \ -- (char *)malloc(sizeof(char) * strlen(p) + 1)) == NULL) { -+ if ((result[m] = strdup(p)) == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); -- exit(0); -+ exit(1); - } -- strcpy(result[count],p); -- result[++count] = NULL; -+ result[++m] = NULL; - - #if 0 -- count=0; -- while (result[count]) -- dprintf ("#%d: %s\n", count, StripDomains[count++]); -+ m = 0; -+ while (result[m]) -+ dprintf ("#%d: %s\n", m, result[m++]); - #endif - return result; - } diff --git a/source/a/sysklogd/sysklogd-1.4.1.lsm b/source/a/sysklogd/sysklogd-1.4.1.lsm deleted file mode 100644 index 0c3b75f8f..000000000 --- a/source/a/sysklogd/sysklogd-1.4.1.lsm +++ /dev/null @@ -1,23 +0,0 @@ -Begin3 -Title: sysklogd -Version: 1.4.1 -Entered-date: 2001-03-11 -Description: The sysklogd package implements two system log daemons. The - syslogd daemon is the general system logging daemon which - is responsible for handling requests for syslog services. - This version of syslogd is similar to the standard Berkeley - product but with a number of compatible extensions. The - klogd daemon runs either standalone or as a client of syslogd. - Klogd 'listens' to kernel log messages, prioritizes them and - routes them to either output files or to syslogd. This - version of klogd will optionally translate kernel addresses - to their symbolic equivalents if provided with a system map. -Keywords: logging, remote, kernel, syslogd, proc, daemon, klogd -Author: greg@wind.enjellic.com (Dr. G.W. Wettstein) -Maintained-by: joey@infodrom.ffis.de (Martin Schulze) -Primary-site: www.infodrom.ffis.de /projects/sysklogd - 82kB sysklogd-1.4.1.tar.gz - 1kB sysklogd-1.4.1.lsm -Alternate-site: metalab.unc.edu /pub/Linux/system/daemons -Copying-policy: syslogd is under Berkeley copyright, klogd is under GPL. -End diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild index 110659e4c..a5cd75e26 100755 --- a/source/a/sysklogd/sysklogd.SlackBuild +++ b/source/a/sysklogd/sysklogd.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=1.4.1 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-10} +VERSION=1.5 +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -31,17 +40,10 @@ PKG=$TMP/package-sysklogd rm -rf $PKG mkdir -p $TMP $PKG - -# Explode the package framework: -cd $PKG -explodepkg $CWD/_sysklogd.tar.gz - cd $TMP rm -rf sysklogd-$VERSION -tar xzvf $CWD/sysklogd-$VERSION.tar.gz || exit 1 +tar xvf $CWD/sysklogd-$VERSION.tar.gz || exit 1 cd sysklogd-$VERSION -zcat $CWD/sysklogd_1.4.1-20.diff.gz | patch -p1 --verbose || exit 1 -#zcat $CWD/sysklogd-1.4.1-owl-syslogd-crunch_list.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -49,29 +51,53 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make -j4 || exit 1 -make syslog_tst || exit 1 +# Use memmove() instead of strcpy() in syslogd.c +zcat $CWD/use_memmove_not_strcpy.diff.gz | patch -p1 --verbose || exit 1 + +make all syslog_tst $NUMJOBS || make || exit 1 + +mkdir -p $PKG/usr/sbin cat klogd > $PKG/usr/sbin/klogd cat syslog_tst > $PKG/usr/sbin/syslog_tst cat syslogd > $PKG/usr/sbin/syslogd -for page in klogd.8 sysklogd.8 ; do - cat $page | gzip -9c > $PKG/usr/man/man8/$page.gz -done +chmod 0755 $PKG/usr/sbin/* + +mkdir -p $PKG/usr/man/man{5,8} cat syslog.conf.5 | gzip -9c > $PKG/usr/man/man5/syslog.conf.5.gz +cat klogd.8 | gzip -9c > $PKG/usr/man/man8/klogd.8.gz +cat sysklogd.8 | gzip -9c > $PKG/usr/man/man8/sysklogd.8.gz +( cd $PKG/usr/man/man8 ; ln -s sysklogd.8.gz syslogd.8.gz ) + +mkdir -p $PKG/etc +cat $CWD/config/syslog.conf.new > $PKG/etc/syslog.conf.new + +mkdir -p $PKG/etc/logrotate.d +cat $CWD/config/syslog.logrotate > $PKG/etc/logrotate.d/syslog.new + +mkdir -p $PKG/etc/rc.d +cat $CWD/config/rc.syslog.new > $PKG/etc/rc.d/rc.syslog.new +chmod 0755 $PKG/etc/rc.d/rc.syslog.new + +mkdir -p $PKG/var/log +for i in cron debug maillog messages secure spooler syslog ; + do touch $PKG/var/log/$i.new ; +done + +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/sysklogd-$VERSION -cp -a ANNOUNCE CHANGES COPYING INSTALL MANIFEST NEWS README.1st \ - README.linux $PKG/usr/doc/sysklogd-$VERSION -chmod 644 $PKG/usr/doc/sysklogd-$VERSION/* -( 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 -) +cp -a \ + ANNOUNCE CHANGES COPYING INSTALL MANIFEST NEWS README.1st README.linux \ + $PKG/usr/doc/sysklogd-$VERSION +chmod 0644 $PKG/usr/doc/sysklogd-$VERSION/* + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh > $PKG/install/doinst.sh -# Build the package: cd $PKG -makepkg -l y -c n $TMP/sysklogd-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/sysklogd-$VERSION-$ARCH-$BUILD.txz # Clean up the extra stuff: if [ "$1" = "--cleanup" ]; then diff --git a/source/a/sysklogd/sysklogd_1.4.1-20.diff b/source/a/sysklogd/sysklogd_1.4.1-20.diff deleted file mode 100644 index 9bb27bbb6..000000000 --- a/source/a/sysklogd/sysklogd_1.4.1-20.diff +++ /dev/null @@ -1,2555 +0,0 @@ ---- sysklogd-1.4.1.orig/CHANGES -+++ sysklogd-1.4.1/CHANGES -@@ -30,3 +30,4 @@ - . Olaf Kirch <okir@caldera.de> - - Remove Unix Domain Sockets and switch to Datagram Unix Sockets - . Several bugfixes and improvements, please refer to the .c files -+ ---- sysklogd-1.4.1.orig/README.linux -+++ sysklogd-1.4.1/README.linux -@@ -44,8 +44,8 @@ - mail to Majordomo@Infodrom.North.DE with a line "subscribe sysklogd" - in the message body. - --New versions of this package will be available at Joey's ftp server. --ftp://ftp.infodrom.north.de/pub/people/joey/sysklogd/ -+New versions of this package will be available at Joey's server. -+ http://www.infodrom.org/projects/sysklogd/ - - Best regards, - -@@ -67,6 +67,6 @@ - - Martin Schulze - Infodrom Oldenburg --joey@linux.de -+joey@infodrom.org - - And a host of bug reporters whose contributions cannot be underestimated. ---- sysklogd-1.4.1.orig/klogd.8 -+++ sysklogd-1.4.1/klogd.8 -@@ -321,7 +321,7 @@ - .B klogd - to reload the module symbol information whenever a protection fault - is detected. Caution should be used before invoking the program in --\'paranoid\' mode. The stability of the kernel and the operating -+\&'paranoid\&' mode. The stability of the kernel and the operating - environment is always under question when a protection fault occurs. - Since the klogd daemon must execute system calls in order to read the - module symbol information there is the possibility that the system may ---- sysklogd-1.4.1.orig/ksym_mod.c -+++ sysklogd-1.4.1/ksym_mod.c -@@ -78,6 +78,11 @@ - * - * Tue Sep 12 23:11:13 CEST 2000: Martin Schulze <joey@infodrom.ffis.de> - * Changed llseek() to lseek64() in order to skip a libc warning. -+ * -+ * Wed Mar 31 17:35:01 CEST 2004: Martin Schulze <joey@infodrom.org> -+ * Removed references to <linux/module.h> since it doesn't work -+ * anymore with its recent content from Linux 2.4/2.6, created -+ * module.h locally instead. - */ - - -@@ -89,11 +94,12 @@ - #include <errno.h> - #include <sys/fcntl.h> - #include <sys/stat.h> -+#include "module.h" - #if !defined(__GLIBC__) - #include <linux/time.h> --#include <linux/module.h> -+#include <linux/linkage.h> - #else /* __GLIBC__ */ --#include <linux/module.h> -+#include <linux/linkage.h> - extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence)); - extern int get_kernel_syms __P ((struct kernel_sym *__table)); - #endif /* __GLIBC__ */ ---- sysklogd-1.4.1.orig/module.h -+++ sysklogd-1.4.1/module.h -@@ -0,0 +1,90 @@ -+/* -+ module.h - Miscellaneous module definitions -+ Copyright (c) 1996 Richard Henderson <rth@tamu.edu> -+ Copyright (c) 2004 Martin Schulze <joey@infodrom.org> -+ -+ This file is part of the sysklogd package. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+*/ -+ -+/* ChangeLog: -+ * -+ * Wed Mar 31 17:35:01 CEST 2004: Martin Schulze <joey@infodrom.org> -+ * Created local copy of module.h based on the content of Linux -+ * 2.2 since <linux/module.h> doesn't work anymore with its -+ * recent content from Linux 2.4/2.6. -+ * Thu May 25 09:14:33 CEST 2006: Martin Schulze <joey@infodrom.org> -+ * Removed asm/atomic.h since it is not needed anymore. -+ */ -+ -+#define MODULE_NAME_LEN 60 -+ -+struct kernel_sym -+{ -+ unsigned long value; -+ char name[MODULE_NAME_LEN]; -+}; -+ -+ -+struct list_head { -+ struct list_head *next, *prev; -+}; -+ -+ -+struct module_info -+{ -+ unsigned long addr; -+ unsigned long size; -+ unsigned long flags; -+ long usecount; -+}; -+ -+ -+struct module -+{ -+ unsigned long size_of_struct; /* == sizeof(module) */ -+ struct module *next; -+ const char *name; -+ unsigned long size; -+ -+ union -+ { -+ int usecount; -+ long pad; -+ } uc; /* Needs to keep its size - so says rth */ -+ -+ unsigned long flags; /* AUTOCLEAN et al */ -+ -+ unsigned nsyms; -+ unsigned ndeps; -+ -+ struct module_symbol *syms; -+ struct module_ref *deps; -+ struct module_ref *refs; -+ int (*init)(void); -+ void (*cleanup)(void); -+ const struct exception_table_entry *ex_table_start; -+ const struct exception_table_entry *ex_table_end; -+#ifdef __alpha__ -+ unsigned long gp; -+#endif -+ /* Members past this point are extensions to the basic -+ module support and are optional. Use mod_opt_member() -+ to examine them. */ -+ const struct module_persist *persist_start; -+ const struct module_persist *persist_end; -+ int (*can_unload)(void); -+}; ---- sysklogd-1.4.1.orig/pidfile.c -+++ sysklogd-1.4.1/pidfile.c -@@ -87,7 +87,7 @@ - int fd; - int pid; - -- if ( ((fd = open(pidfile, O_RDWR|O_CREAT, 0644)) == -1) -+ if ( ((fd = open(pidfile, O_RDWR|O_CREAT|O_TRUNC, 0644)) == -1) - || ((f = fdopen(fd, "r+")) == NULL) ) { - fprintf(stderr, "Can't open or create %s.\n", pidfile); - return 0; ---- sysklogd-1.4.1.orig/syslog.conf.5 -+++ sysklogd-1.4.1/syslog.conf.5 -@@ -64,7 +64,7 @@ - The - .I facility - is one of the following keywords: --.BR auth ", " authpriv ", " cron ", " daemon ", " kern ", " lpr ", " -+.BR auth ", " authpriv ", " cron ", " daemon ", " ftp ", " kern ", " lpr ", " - .BR mail ", " mark ", " news ", " security " (same as " auth "), " - .BR syslog ", " user ", " uucp " and " local0 " through " local7 . - The keyword -@@ -122,7 +122,7 @@ - This - .BR syslogd (8) - has a syntax extension to the original BSD source, that makes its use --more intuitively. You may precede every priority with an equation sign -+more intuitive. You may precede every priority with an equation sign - (``='') to specify only this single priority and not any of the - above. You may also (both is valid, too) precede the priority with an - exclamation mark (``!'') to ignore all that priorities, either exact -@@ -300,7 +300,7 @@ - .B syslogd - log all messages that come with either the - .BR info " or the " notice --facility into the file -+priority into the file - .IR /var/log/messages , - except for all messages that use the - .B mail ---- sysklogd-1.4.1.orig/syslogd.c -+++ sysklogd-1.4.1/syslogd.c -@@ -890,11 +890,11 @@ - dprintf("Checking pidfile.\n"); - if (!check_pid(PidFile)) - { -+ signal (SIGTERM, doexit); - if (fork()) { - /* - * Parent process - */ -- signal (SIGTERM, doexit); - sleep(300); - /* - * Not reached unless something major went wrong. 5 -@@ -1074,9 +1074,9 @@ - (fd_set *) NULL, (struct timeval *) NULL); - if ( restart ) - { -+ restart = 0; - dprintf("\nReceived SIGHUP, reloading syslogd.\n"); - init(); -- restart = 0; - continue; - } - if (nfds == 0) { -@@ -1141,13 +1141,13 @@ - */ - printchopped(from, line, \ - i + 2, finet); -- } else if (i < 0 && errno != EINTR) { -+ } else if (i < 0 && errno != EINTR && errno != EAGAIN) { - dprintf("INET socket error: %d = %s.\n", \ - errno, strerror(errno)); - logerror("recvfrom inet"); - /* should be harmless now that we set - * BSDCOMPAT on the socket */ -- sleep(10); -+ sleep(1); - } - } - #endif -@@ -1216,6 +1216,7 @@ - { - int fd, on = 1; - struct sockaddr_in sin; -+ int sockflags; - - fd = socket(AF_INET, SOCK_DGRAM, 0); - if (fd < 0) { -@@ -1241,6 +1242,24 @@ - close(fd); - return -1; - } -+ /* We must not block on the network socket, in case a packet -+ * gets lost between select and recv, otherise the process -+ * will stall until the timeout, and other processes trying to -+ * log will also stall. -+ */ -+ if ((sockflags = fcntl(fd, F_GETFL)) != -1) { -+ sockflags |= O_NONBLOCK; -+ /* -+ * SETFL could fail too, so get it caught by the subsequent -+ * error check. -+ */ -+ sockflags = fcntl(fd, F_SETFL, sockflags); -+ } -+ if (sockflags == -1) { -+ logerror("fcntl(O_NONBLOCK), suspending inet"); -+ close(fd); -+ return -1; -+ } - if (bind(fd, (struct sockaddr *) &sin, sizeof(sin)) < 0) { - logerror("bind, suspending inet"); - close(fd); -@@ -1275,7 +1294,7 @@ - for (count=i=0; p[i]; i++) - if (p[i] == LIST_DELIMITER) count++; - -- if ((result = (char **)malloc(sizeof(char *) * count+2)) == NULL) { -+ if ((result = (char **)malloc(sizeof(char *) * (count+2))) == NULL) { - printf ("Sorry, can't get enough memory, exiting.\n"); - exit(0); - } -@@ -1539,20 +1558,37 @@ - int fac, prilev, lognum; - int msglen; - char *timestamp; -+#ifdef __gnu_linux__ -+ sigset_t mask; -+#else -+#ifndef SYSV -+ sigset_t omask; -+#endif -+#endif - - dprintf("logmsg: %s, flags %x, from %s, msg %s\n", textpri(pri), flags, from, msg); - -+#ifdef __gnu_linux__ -+ sigemptyset(&mask); -+ sigaddset(&mask, SIGHUP); -+ sigaddset(&mask, SIGALRM); -+ sigprocmask(SIG_BLOCK, &mask, NULL); -+#else - #ifndef SYSV - omask = sigblock(sigmask(SIGHUP)|sigmask(SIGALRM)); - #endif -+#endif - - /* - * Check to see if msg looks non-standard. - */ - msglen = strlen(msg); -- if (msglen < 16 || msg[3] != ' ' || msg[6] != ' ' || -- msg[9] != ':' || msg[12] != ':' || msg[15] != ' ') -- flags |= ADDDATE; -+ flags |= ADDDATE; -+ if ( !(msglen < 16 || msg[3] != ' ' || msg[6] != ' ' || -+ msg[9] != ':' || msg[12] != ':' || msg[15] != ' ')) { -+ msg += 16; -+ msglen -= 16; -+ } - - (void) time(&now); - if (flags & ADDDATE) -@@ -1581,9 +1617,13 @@ - (void) close(f->f_file); - f->f_file = -1; - } -+#ifdef __gnu_linux__ -+ sigprocmask(SIG_UNBLOCK, &mask, NULL); -+#else - #ifndef SYSV - (void) sigsetmask(omask); - #endif -+#endif - return; - } - #ifdef SYSV -@@ -1646,9 +1686,13 @@ - } - } - } -+#ifdef __gnu_linux__ -+ sigprocmask(SIG_UNBLOCK, &mask, NULL); -+#else - #ifndef SYSV - (void) sigsetmask(omask); - #endif -+#endif - } - #if FALSE - } /* balance parentheses for emacs */ -@@ -1839,7 +1883,7 @@ - #else - && e == EBADF) { - #endif -- f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY); -+ f->f_file = open(f->f_un.f_fname, O_WRONLY|O_APPEND|O_NOCTTY|O_NONBLOCK); - if (f->f_file < 0) { - f->f_type = F_UNUSED; - logerror(f->f_un.f_fname); -@@ -2640,7 +2684,7 @@ - f->f_file = open(++p, O_RDWR|O_NONBLOCK); - f->f_type = F_PIPE; - } else { -- f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY, -+ f->f_file = open(p, O_WRONLY|O_APPEND|O_CREAT|O_NOCTTY|O_NONBLOCK, - 0644); - f->f_type = F_FILE; - } ---- sysklogd-1.4.1.orig/debian/NMU-Disclaimer -+++ sysklogd-1.4.1/debian/NMU-Disclaimer -@@ -0,0 +1,45 @@ -+Non Maintainer Upload of this Package -+------------------------------------- -+ -+If you plan to work on an NMU for this package, read the following -+closely. It can save you and me some grief. -+ -+ 1. At first, contact the maintainer (i.e. send a mail to -+ joey@debian.org, do not cc or bounce a mail, send a plain mail, -+ not copied to any mailing list or the BTS) and ask about the -+ status of the bug you are considering to work on. -+ -+ 2. In this mail include all information relevant for this problem, -+ i.e. include a description of the bug and not only its bug -+ number. -+ -+ 3. If the maintainer is not able or willing to fix the problem or -+ does not respond within four days, continue with step 4. -+ -+ 4. Work on the bug and prepare a patch. Do not upload into the -+ Debian archive. -+ -+ 5. Send the entire patch, together with enough explanations, to the -+ maintainer for reviewing and ask him for permission of an NMU -+ using this patch. -+ -+ 6. IF AND ONLY IF the maintainer approves the patch (or doesn't -+ respond within four days), upload the NMU to the incoming -+ directory and send the patch to the BTS. If the NMU is not -+ approved, go back to 4. or add the NMU to your homepage, but do -+ not upload it to the Debian archive. -+ -+ 7. Properly sized and well-written patches sent to the BTS are always -+ appreciated, even if they are rejected later. They demonstrate a -+ potential solution which could probably improved into a real -+ solution. -+ -+ 8. NEVER change the way a package is maintained in an NMU, i.e. don't -+ remove dh_* stuff or switch to dh_* respectively. This rule -+ applies to all NMU's, not only to an NMU for this package. -+ -+These rules always apply. They even apply if somebody declares NMUs -+as ok and reduces regular NMU rules to a delay of zero days. Unless -+I'm on vacation or on a show I am reachable via mail, so there is -+hardly a reason not to contact me. -+ ---- sysklogd-1.4.1.orig/debian/changelog -+++ sysklogd-1.4.1/debian/changelog -@@ -0,0 +1,694 @@ -+sysklogd (1.4.1-20) unstable; urgency=low -+ -+ * Added a missing whitespace to the rc file (Closes: Bug#388787, -+ Bug#388378, Bug#388260) -+ * Corrected typo in syslog.conf(5) (Closes: Bug#327200) -+ -+ -- Martin Schulze <joey@infodrom.org> Thu, 28 Sep 2006 20:46:41 +0200 -+ -+sysklogd (1.4.1-19) unstable; urgency=high -+ -+ * Converted init.d scripts to LSB style -+ - accidently closes: Bug#211858 -+ * Removed code that's not required anymore in cron.daily/sysklogd -+ * Fix initial permission (closes: Bug#285500) -+ * Added a special exception for when /var/log/news is a file (closes: -+ Bug#266555) -+ * Tidy up the postinst script -+ * Added devfs awarenes for /dev/xconsole creation (closes: Bug#206066) -+ * Move daemon stop logic into klogd's postinst -+ * Removed both preinst scripts from the distribution -+ -+ -- Martin Schulze <joey@infodrom.org> Mon, 18 Sep 2006 13:15:59 +0200 -+ -+sysklogd (1.4.1-18) unstable; urgency=medium -+ -+ * Removed asm/atomic.h since it is not needed anymore. (closes: -+ Bug#350764) -+ * Fixed typo in NMU-Disclaimer (closes: Bug#225895) -+ * Corrected getconf call in debian/rules to fix lagefile support -+ (closes: Bug#320119) -+ * Applied patch by Joey Hess to prevent klogd to be stopped/started too -+ fast (closes: Bug#284914) -+ * Finish /usr/share/doc transition with patch by Julien Cristau (closes: -+ Bug#337712, Bug#322769, Bug#255590) -+ * Reset the 'restart' flag immediately after entering the restart code. -+ Thanks to Dean Gaudet (closes: Bug#154805) -+ * Added support for /etc/default/{syslogd,klogd} files to contain -+ commandline arguments for syslogd and klogd (closes: Bug#98631, -+ Bug#127579, Bug#241350, Bug#266985) -+ * Added a description of system log level and link to sysctl(8) (closes: -+ Bug#164153) -+ * Acknowledging Joey's NMUs (closes: Bug#347333) -+ -+ -- Martin Schulze <joey@infodrom.org> Thu, 25 May 2006 11:07:52 +0200 -+ -+sysklogd (1.4.1-17) unstable; urgency=high -+ -+ * Use $(getconf LFS_CFLAGS) for large file support -+ * Applied adjusted patch by Miquel van Smoorenburg to fix spurious -+ hanging syslogd in connection with futex and NPTL introduced in recent -+ glibc versions and Linux 2.6 (closes: Bug#301511) -+ -+ -- Martin Schulze <joey@infodrom.org> Wed, 25 May 2005 20:10:31 +0200 -+ -+sysklogd (1.4.1-16) unstable; urgency=medium -+ -+ * applied patch by cph -+ * Applied patch by Colin Phipps so that syslogd doesn't block on the -+ network socket, in case a packet gets lost between select and -+ recv. (closes: Bug#275578) -+ * Applied patch by Anders Henke so that syslog calculates the time for -+ each message (closes: Bug#207619) -+ * Don't create /var/log/news if it's not needed (closes: Bug#266555) -+ -+ -- Martin Schulze <joey@infodrom.org> Sun, 7 Nov 2004 13:10:03 +0100 -+ -+sysklogd (1.4.1-15) unstable; urgency=low -+ -+ * Applied patch by Steve Grubb <linux_4ever@yahoo.com> to adjust memory -+ calculation in crunch_list(). -+ * Removed atomic_t in the usecount field of the module struct for -+ compatibility reasons (closes: Bug#245513) -+ -+ -- Martin Schulze <joey@infodrom.org> Tue, 27 Jul 2004 17:28:49 +0200 -+ -+sysklogd (1.4.1-14) unstable; urgency=medium -+ -+ * Added more trailing newlines to init.d programs (closes: Bug#216110) -+ * Adjusted the use of head to the new behaviour for GNU coreutils -+ (closes: Bug#205535, Bug#172655) -+ * Install /usr/share/sysklogd/dummy to replace /usr/share/doc/sysklogd, -+ since /usr/share/doc should be removable by an admin (Policy 12.3). -+ (closes: Bug#237724) -+ * Added a private module.h with extracted data from Linux 2.2 to replace -+ <linux/module.h> which creates a number parse errors. (closes: Bug#223210) -+ * Added support for invoke-rc.d as written in policy 9.3.3 (closes: -+ Bug#213211, Bug#213585, Bug#216858, Bug#214912) -+ -+ -- Martin Schulze <joey@debian.org> Wed, 31 Mar 2004 18:18:54 +0200 -+ -+sysklogd (1.4.1-13) unstable; urgency=medium -+ -+ * Updated some text in the cronjobs -+ * Direct output of reloading to /dev/null so that no cron log mails will -+ be created defaultly (closes: Bug#213717, Bug#213646) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 2 Oct 2003 19:51:34 +0200 -+ -+sysklogd (1.4.1-12) unstable; urgency=low -+ -+ * On heavily loaded system syslog will not spit out error messages -+ anymore when recvfrom() results in EAGAIN (closes: Bug#188194) -+ * Applied patch by Ryan Murray to make this package build on mipsel -+ again (closes: Bug#191969) -+ * Added O_NONBLOCK to two more locations, since Andreas Barth -+ <aba@not.so.argh.org> believes that it fixes this bug. However, -+ according to the note in open(2) this does not have to have any effect -+ on files other than pipes... (closes: Bug#45245) -+ * Permissions on empty files should also be corrected (closes: Bug#135485) -+ * Corrected the number of bytes denoting 1GB for large logfiles (closes: Bug#138234) -+ * Corrected the handling of the skip pattern (closes: Bug#152247) -+ * Don't cut non-newline trailing characters from the last line anymore -+ (closes: Bug#152248) -+ * Improved init.d scripts so non-existing pid directories are not -+ touched anymore (see Bug#165472) -+ * Whoops, looks like O_TRUNC was missing when opening the pidfile for writing, -+ increasing the chance of left-overs from older pid contents in the -+ file. (closes: Bug#165472) -+ * Don't send SIGHUP to klogd anymore. Only restart it in case the old -+ process got lost somehow. (closes: Bug#168851) -+ * Improved init.d script output (closes: Bug#190328) -+ * Adjusted the use of chown to the new behaviour for GNU coreutils -+ (closes: Bug#205364) -+ * Adjusted the use of head to the new behaviour for GNU coreutils -+ (closes: Bug#205535) -+ * Moved the installation of the signal handler up a little bit so it -+ guaranteed to be available when the child is forked, hence, fixing a -+ race condition. This used to create problems with UML and fast -+ machines. Thanks to Jon Burgess <Jon_Burgess@eur.3com.com> (closes: -+ Bug#211993) -+ -+ -- Martin Schulze <joey@kyllikki.infodrom.north.de> Sun, 28 Sep 2003 12:34:31 +0200 -+ -+sysklogd (1.4.1-11) unstable; urgency=low -+ -+ * Added a disclaimer for those people who plan to NMU this package -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 17 Oct 2002 08:26:04 +0200 -+ -+sysklogd (1.4.1-10) unstable; urgency=low -+ -+ * Removed bashism from rc files (closes: Bug#127406, Bug#127407, -+ Bug#127578, Bug#127372) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 3 Jan 2002 18:22:13 +0100 -+ -+sysklogd (1.4.1-9) unstable; urgency=low -+ -+ * Use a newer Standards-Version -+ * Corrected dependency of sysklogd (closes: Bug#123908) -+ * Transfer section/priority into .deb (closes: Bug#123908) -+ * Fix typo in syslog.conf(5) (closes: Bug#126899) -+ * Added ``-e'' to weekly and daily cron scripts. Beware, from now on -+ they will fail if an error occurs and leave /var/log in an undefined -+ state, not signalling syslogd to reopen files as well. (closes: Bug#123281) -+ * Added some intelligence into /etc/init.d/sysklogd and klogd so the -+ daemons will be restarted when they should only be reloaded but are -+ not running. This could be helpful if after an OOM situation syslogd -+ or klogd were killed by init but cron wasn't. (closes: Bug#126749, Bug#126750) -+ * Create /dev/xconsole in init.d script if it doesn't exist. Hence -+ removing this out of the postinst script. This should help situations -+ when devfs is installed and /dev/ get's removed on system boot, thus -+ /dev/xconsole gets removed as well. (closes: Bug#106535) -+ * Added ftp facility (closes: Bug#100437) -+ * Added missing documentation to syslogd-listfiles(8) (fixes: Bug#48326) -+ * Added a PATH= statement to all init.d files (closes: Bug#47901) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Tue, 1 Jan 2002 13:44:42 +0100 -+ -+sysklogd (1.4.1-8) unstable; urgency=low -+ -+ * Added special code to find out if a logfile was rotated within the -+ last 5 hours already, hence should not be rotated again. Hope this -+ satisfies Craig Sanders' request properly. (closes: Bug#39198) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 6 Dec 2001 11:06:53 +0100 -+ -+sysklogd (1.4.1-7) unstable; urgency=low -+ -+ * Fixed override disparity -+ * Added more defines so files larger than 2GB can be created, approved -+ by the glibc maintainer (closes: Bug#120574) -+ * Closing old bug reports (closes: Bug#95230, Bug#34391, Bug#72892) -+ * Added `--large nnn' as argument to syslogd-listfiles so people can -+ decide on their own what a large file is (closes: Bug#39198) -+ * Increased the default definition for large files -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Wed, 5 Dec 2001 22:01:23 +0100 -+ -+sysklogd (1.4.1-6) unstable; urgency=low -+ -+ * Corrected path for syslogd in cron scripts (closes: Bug#122261, -+ Bug#121680, Bug#120809) -+ * Already fixed bugs (closes: Bug#121784) -+ * Improved package description (closes: Bug#120755) -+ * Added an improved pattern for news.*, thanks Takuo (closes: Bug#103999) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Tue, 4 Dec 2001 09:46:46 +0100 -+ -+sysklogd (1.4.1-5) unstable; urgency=low -+ -+ * Fix the override disparity -+ * Removed superflous Priority -+ * Removed =VER= string from syslogd-listfiles (closes: Bug#102998) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Wed, 21 Nov 2001 23:00:29 +0100 -+ -+sysklogd (1.4.1-4) unstable; urgency=low -+ -+ * Added convenience code to support $DEB_BUILD_OPTIONS -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Wed, 21 Nov 2001 18:41:23 +0100 -+ -+sysklogd (1.4.1-3) unstable; urgency=medium -+ -+ * Be more anal about whether sysklogd is installed or not in our cron -+ scripts (closes: Bug#100319) -+ * Added missing newline in init.d script upon restart (closes: Bug#95554) -+ * Moved stop code to prerm (closes: Bug#120249, Bug#96355, Bug#105441, -+ Bug#105442, Bug#109470) -+ * Corrected broken character in klogd.8 (closes: Bug#75932) [repeat, due -+ to typo] -+ * Added dependency to klogd so people who upgrade their sysklogd package -+ won't lose it anymore (closes: Bug#93729) [repeat, another bug#] -+ * auth.* files are only rotated daily (closes: Bug#102138) -+ * Changed -p to -s in documentation (closes: Bug#108473) -+ * Updated documentation to reflect the current location of the mailing -+ list -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Tue, 20 Nov 2001 20:48:32 +0100 -+ -+sysklogd (1.4.1-2) unstable; urgency=low -+ -+ * Corrected location of GPL (closes: Bug#90582) -+ * Added section and priority for binary packages -+ * Added dependency to klogd so people who upgrade their sysklogd package -+ won't lose it anymore (closes: Bug#93922) -+ * Added code snipped to stop klogd/syslogd upon removal (closes: -+ Bug#90534, Bug#90970) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Sat, 21 Apr 2001 15:06:02 +0200 -+ -+sysklogd (1.4.1-1) unstable; urgency=low -+ -+ * New upstream source (closes: Bug#87819, Bug#70790, Bug#32580, -+ Bug#62358, Bug#71631) -+ * Upstream: Doesn't re-set log-level if not requested (closes: -+ Bug#76170, Bug#76170, Bug#85289) -+ * Upstream: Ignore zero bytes (closes: Bug#85478, Bug#85478, Bug#41068) -+ * Upstream: Corrected documentation for `-s' (closes: Bug#87020) -+ * Upstream: test for existence of syslogd-listfiles before calling -+ them. This got lost due to 1.4.0 brokennes which was packaged and -+ removed some hours later (closes: Bug#84872, Bug#66712) -+ * Applied patch by Tommi Virtanen <tv@debian.org> splitting the package -+ into `sysklogd' and `klogd' (closes:Bug#35586, Bug#72043, Bug#74864, -+ Bug#72122) -+ * Provide / depend on virtual packages system-log-daemon -+ and linux-kernel-log-daemon (closes: Bug#67604) -+ * Applied patch from Tim Janik <timj@gtk.org> to support `-s pattern' in -+ syslogd-listfiles -+ * Transition to FHS, i.e. /usr/share/doc instead of /usr/doc and -+ /usr/share/man instead of /usr/man (closes: Bug#79250, Bug#80771) -+ * Use --exec for stopping services (closes: Bug#76757) -+ * Corrected broken character in klogd.8 (cloes: Bug#75932) -+ * Only rotate logfiles with size greater than zero. This got lost due -+ to 1.4.0 brokennes which was packaged and removed some hours later -+ (closes: Bug#74993, Bug#49824) -+ * Added another note about modificability of cronjobs (closes: -+ Bug#88741) -+ * Since klogd replaces parts of sysklogd a proper Replaces line is there -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Sun, 11 Mar 2001 22:30:53 +0100 -+ -+sysklogd (1.4-1) stable unstable; urgency=medium, closes=70790 32580 49824 62358 66712 71631 -+ -+ * Added paragraph to binary target -+ * New upstream version (closes: Bug#70790, Bug#32580, Bug#62358, -+ Bug#71631) -+ * Only rotate logfiles that have a size greater than zero (closes: -+ Bug#49824) -+ * Test for existence of syslogd-listfiles before calling it (closes: -+ Bug#66712) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Mon, 18 Sep 2000 16:02:05 +0200 -+ -+sysklogd (1.3-33) unstable; urgency=medium, closes=38977 -+ -+ * chmod 0640 /dev/xconsole regardless of its existence (closes: Bug#38977) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Sun, 12 Sep 1999 20:47:53 +0200 -+ -+sysklogd (1.3-32) unstable; urgency=low, closes=35408 34733 36198 -+ -+ * Fixed typo in syslogd-listfiles (closes: Bug#35408) -+ * Removed superflous call to utmpname() (closes: Bug#34733) -+ * Added --ignore-size and limit for rotating log files at 2MB to -+ syslogd-listfiles (closes: Bug#36198) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Sun, 23 May 1999 10:40:33 +0200 -+ -+sysklogd (1.3-31) frozen unstable; urgency=low, closes=28629 30093 31494 30462 -+ -+ * ``-m 0'' turns off -- MARK -- now. (closes: Bug#28629, Bug#31494) -+ * Changed Greg's e-mail address to represent his current one. -+ * Shortened line length for kernel logging slightly. -+ * Corrected return value of AddModule (closes: Bug#30093) -+ * Finally fixed an error with `-a' processing, thanks to Topi Miettinen -+ <tom@medialab.sonera.net> (closes: Bug#30462) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Tue, 19 Jan 1999 23:56:07 +0100 -+ -+sysklogd (1.3-30) unstable; urgency=low, closes=28128 28122 24893 -+ -+ * Contains more patches from Topi Miettinen. -+ * Fixed two mistakes from the most recent version -+ * Fixed fd leak problem. Thanks to Topi for detecting it -+ * Ouch! Looks like the released package again is broken. It worked -+ locally. -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Sun, 18 Oct 1998 20:38:22 +0200 -+ -+sysklogd (1.3-29) unstable; urgency=low, closes=24893 -+ -+ * Re-Applied patch provided vom Topi Miettinen with regard to the people -+ from OpenBSD. This provides the additional '-a' argument used for -+ specifying additional UNIX domain sockets to listen to. This is been -+ used with chroot()'ed named's for example. An example is described at -+ http://www.psionic.com/papers/dns.html. This time the patch doesn't -+ stall syslogd. Thanks to Topi Miettinen <tom@medialab.sonera.net> -+ (closes: Bug#24893) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Sat, 17 Oct 1998 20:23:00 +0200 -+ -+sysklogd (1.3-28) unstable; urgency=low -+ -+ * Added manpage for syslog-facility, also written by Raphaël Hertzog -+ * Reverted support for multiple Unix domain sockets since it caused -+ syslogd to not accept more sockets after a certain (undefinitve) -+ time. (opens: Bug#24893) -+ * The complete code is still present, search for `Bug#24893' -+ * Commented out `-a' in the syslogd.8 manpage -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 15 Oct 1998 19:35:26 +0200 -+ -+sysklogd (1.3-27) frozen unstable; urgency=low, closes=21212 11917 21606 24609 25835 26015 24648 20135 23502 24893 24894 -+ -+ * Postinst will create files with correct file modes (closes: Bug#21212) -+ * Made /dev/xconsole mode 0640 and root.adm (closes: Bug#11917) -+ * Changed priority of exit message from LOG_ERR to LOG_INFO (closes -+ Bug#21606) -+ * The code now is compilable without SYSLOG_INET again. Thanks to -+ Enrik Berkhan <enrik@rzstud1.akk.org>. -+ * Added support for TESTING define which will turn syslogd into -+ stdio-mode used for debugging. -+ * Reworked the initialization/fork code. Now the parent -+ process activates a signal handler which the daughter process will -+ raise if it is initialized. Only after that one the parent process -+ may exit. Otherwise klogd might try to flush its log cache while -+ syslogd can't receive the messages yet. (closes: Bug#24609) -+ * Fixed typo in /etc/syslog.conf (closes: Bug#25835) -+ * Modified pre- and postinst scripts to set +e before executing external -+ scripts. This is a workaround against a bug in bash (Bug#23857). -+ Bash exports the errexit (-e) flag if allexport (-a) has been set. The -+ bug occurs even if allexport is being _re_set. (closes: Bug#26015) -+ * Modified ksym::CheckVersion() -+ . Use shift to decode the kernel version -+ . Compare integers of kernel version -+ . extract major.minor.patch from utsname.release via sscanf() -+ The reason lays in possible use of kernel flavours which modify -+ utsname.release but no the Version_ symbol. (closes: Bug#20135) -+ * Corrected klogd.c in order to support the new address space for late -+ 2.1 kernels. Some support for unsigned long in contrary to int was -+ missing. (closes: Bug#23502) -+ * Applied patch provided vom Topi Miettinen with regard to the people -+ from OpenBSD. This provides the additional '-a' argument used for -+ specifying additional UNIX domain sockets to listen to. This is been -+ used with chroot()'ed named's for example. An example is described at -+ http://www.psionic.com/papers/dns.html. Thanks to Topi Miettinen -+ <tom@medialab.sonera.net> (closes: Bug#24893) -+ * Added support for `ftp' log facility which was introduced by glibc -+ version 2. Thanks to netgod and Flood from #Debian. -+ * Code cleanups with regard to bsd -> posix transition and stronger -+ security (buffer length checking). Thanks to Topi Miettinen -+ <tom@medialab.sonera.net> (closes: Bug#24894) -+ . index() --> strchr() -+ . sprintf() --> snprintf() -+ . bcopy() --> memcpy() -+ . bzero() --> memset() -+ . UNAMESZ --> UT_NAMESIZE -+ . sys_errlist --> strerror() -+ * Added support for setutent()/getutent()/endutend() instead of binary -+ reading the UTMP file. This is the the most portable way. Thanks to -+ Topi Miettinen <tom@medialab.sonera.net>. -+ * Avoid logging of SIGCHLD when syslogd is in the process of exiting and -+ closing its files. Again thanks to Topi. -+ * Added /usr/sbin/syslog-facility, written by Raphaël Hertzog -+ <hertzog@debian.org>. It opens a way for other packages to add and -+ remove logfiles/facilities. -+ * Modified printline() to support 8bit characters - such as russion -+ letters. Thanks to Vladas Lapinskas <lapinskas@mail.iae.lt>. -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Mon, 12 Oct 1998 22:24:04 +0200 -+ -+sysklogd (1.3-26) frozen unstable; urgency=low, closes=20903 20765 20556 20507 20647 20220 -+ -+ * Fixed typos in syslogd-listfiles(1), thanks to Francesco Potorti` -+ <F.Potorti@cnuce.cnr.it> (closes: Bug#20903) -+ * Corrected email address for Shane Alderton (closes: Bug#20765) -+ * Fixed manpage to not reflect reverse implementated SIGALRM signal -+ handler (closes: Bug#20647) -+ * Modified behaviour with including <sys/module.h> (closes: Bug#20556) -+ * Added correct prototype for llseek() (closes: Bug#20507, Bug#20220) -+ * Added more log information if problems occurr while reading a system -+ map file. -+ * Modified System.map read function to try all possible map files until -+ a file with matching version is found. -+ * Added Debian release to klogd -+ * Switched to fgets() as gets() is not buffer overrun secure. -+ * Modified loop for detecting the correct system map. -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 16 Apr 1998 19:28:05 +0200 -+ -+sysklogd (1.3-25) unstable; urgency=low, closes=19454 19145 1914 -+ -+ * Corrected permissions on packaging control files (closes: Bug#19414) -+ * Removed kill statements from rc file (closes: Bug#19454, Bug#19145) -+ * Applied patch from Pedro Manuel Rodrigues <pmanuel@cindy.fe.up.pt> to -+ let klogd work togther with >2GB address space. -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 19 Mar 1998 23:56:09 +0100 -+ -+sysklogd (1.3-24) unstable; urgency=low, closes=18124 -+ -+ * Fixed tiny mistake which refused the MARK facility to work properly -+ (closes: Bug#18124) -+ * Corrected Topi's patch as it prevented forwarding during startup due -+ to an unknown LogPort. -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Wed, 25 Feb 1998 13:19:27 +0100 -+ -+sysklogd (1.3-23) unstable; urgency=low -+ -+ * Corrected FSF's address (lintian) -+ * Implemented force-reload (lintian) -+ * Standards-Version: 2.4.0.0 -+ * Applied patch from Topi Miettinen <Topi.Miettinen@ml.tele.fi> to open -+ the UDP socket only if it is really needed. -+ * Updated sysklogd(8) manpage -+ * Added notes to mailing list -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Tue, 24 Feb 1998 00:39:10 +0100 -+ -+sysklogd (1.3-22) unstable; urgency=low, closes=17192 17385 17601 -+ -+ * Included a real fix to the %'s problem (fixes: Bug#17192) -+ * Another patch for Linux/alpha by Christopher C Chimelis -+ <chris@classnet.med.miami.edu> (fixes: Bug#17385) -+ * Removed killall-statement from postinst. Thanks to James Troup for -+ reporting it. -+ * Added chdir("/") to both daemons (fixes: Bug#17601) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 29 Jan 1998 21:56:40 +0100 -+ -+sysklogd (1.3-21) unstable; urgency=low, closes=17159 -+ -+ * Fixed small typo in syslogd-listfiles (Bug#17159) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 15 Jan 1998 23:22:57 +0100 -+ -+sysklogd (1.3-20) unstable; urgency=low, closes=17000 -+ -+ * Corrected some code that caused klogd to dump core when receiving some -+ special messages from 2.1.78. Thanks to Chu-yeon Park -+ <kokids@doit.ajou.ac.kr> for informing me. -+ * Fixed bug that caused klogd to die if there is no System.map -+ available. -+ * Added -x switch to omit EIP translation and System.map evaluation. -+ Thanks to Florian La Roche <florian@knorke.saar.de> -+ * Fixed small bugs in F_FORW_UNKN meachanism. Thanks to Torsten Neumann -+ <torsten@londo.rhein-main.de> for pointing me to it. -+ * Fixed problem with klogd not being able to be built on a kernel newer -+ than 2.1.18. Worked in a patch from Alessandro Suardi <asuardi@uninetcom.it> -+ * Fixed small typo in syslogd-listfiles -+ * Corrected debug output concerning remote receiption -+ * Removed race condition in syslogd-listfiles -+ * Modified logfile detection routine to take care of double listed -+ logfiles. Thanks to Roman Hodek <roman@debian.org> for providing an -+ appropriate patch. (Bug#17000) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Tue, 13 Jan 1998 01:59:56 +0100 -+ -+sysklogd (1.3-19) unstable; urgency=low, closes=16643 16769 16796 16828 16148 14776 -+ -+ * Used better regexp for detecting sensitive data. Thanks a lot to -+ Susanne Schmidt <banshee@linux.de> for providing it. -+ * Fixed ownership of /usr/doc/sysklogd/copyright and readme (Bug#16643) -+ * Corrected Standards-Version to 2.3.0.1 (Bug#16769) -+ * Reworked one line of an older patch because it prevented syslogd from -+ binding the socket with the result that no messages were forwarded to -+ other hosts. -+ * Changed the behaviour of klogd when receiving a terminate signal. Now -+ the program terminates immediately instead of completing the receipt of -+ a kernel message. (Bug#16796, Bug#16828, Bug#16148) -+ * Noticed a bug which was closed by 1.3-18 (Bug#14776) -+ * Changed Maintainer address to joey@debian.org -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Fri, 9 Jan 1998 00:58:36 +0100 -+ -+sysklogd (1.3-18) unstable; urgency=low, closes=11731 12009 13506 14329 14521 14610 15840 15336 -+ -+ * Added test in postinst if user and group exist. Christoph Lameter run -+ into trouble upgrading a RedHat system. -+ * Fixed little mistake which prevented klogd from accepting a console -+ log level of 8 to get <7> alias KERN_DEBUG displayed. -+ * Linked against libc6 (Bug#11731) -+ * Added SHELL=/bin/bash to rules as Herbert Xu suggested -+ * Corrected syslog.conf(5) manpage -+ * syslogd resets the ignore priority flag now. Thanks to Herbert -+ Thielen. (Bug#12009) -+ * Fixed bug that caused syslogd to write into wrong files under some -+ race conditions. Thanks to Herbet Xu. (Bug#13506) -+ * /var/log/auth.log will only be touch if needed (Bug#14329) -+ * debian/conffiles is treated like a document (Bug#14521) -+ * Added script for generic logfile detection and rotation and included -+ that in cron scripts, included also its manpage (Bug#14610) -+ * Modified restart messages in /etc/init.d/sysklogd (Bug#15840) -+ * klogd will first try to load /boot/System.map-$ver, then -+ /boot/System.map, then /System.map-$ver and after that /System.map -+ * Modified ExpandKadds() because there were some problems accessing -+ memory r/w. (Bug#15336) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Fri, 2 Jan 1998 03:31:09 +0100 -+ -+sysklogd (1.3-17) unstable; urgency=low -+ -+ * Fixed stupid bug which caused klogd to eat up 90% cpu time. -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Wed, 25 Jun 1997 15:22:29 +0200 -+ -+sysklogd (1.3-16) unstable; urgency=low -+ -+ * Included Miquel's patches which allows continuation line support -+ for syslogd. Corrected syslog.conf(5) manpage. Improved -+ syslog.conf file. Thanks to Miquel van Smoorenburg -+ <miquels@cistron.nl> for dropping in these patches. -+ * Added /var/log/syslog as a daily rotated logfile which contains -+ everything except auth.* -+ * ksym.c: Added #1 and #2 to some error messages in order to being able -+ to divide them (ulmo@Q.Net) -+ * Improved postinst script (Thanks to Miquel van Smorrenborg for ideas) -+ * klogd now also reads /System.map-<version> and -+ /boot/System.map-<version> (Bug#7210) -+ * syslogd,klogd: made DEBRELEASE optional to support a non-Debian -+ release as well. -+ * Corrected freeing of logfiles. -+ * Removed delay of 10 seconds. (Bug#8104, Bug#8400) -+ * Modified permissions of logfiles from 644 to 640 and 640 to 600 for -+ security aspects. -+ * Corrected syslog.conf(5) manpage (Bug#9779) -+ * Found upstream patches for 1.3.1 to 1.3.3 which are now included. -+ These also include some patches for glibc and Alpha. -+ * Included patch to modules package to support better debugging -+ * Added patch from Leland Olds which fixes a buffer overrun and improved -+ symbol lookup. (Bug#4875) -+ * Some more glibc patches made by Michael Alan Dorman -+ <mdorman@debian.org>. (Bug#8362, Bug#8763) -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Sun, 15 Jun 1997 19:37:13 +0200 -+ -+sysklogd (1.3-15) unstable; urgency=low -+ -+ * Added /var/log/mail.log as a logfile -+ * Corrected Description field (Bug#7624) -+ * Added read statement in postinst script (Bug#8243) -+ -+ -- Martin Schulze <joey@infodrom.north.de> Wed, 26 Mar 1997 13:32:24 +0100 -+ -+sysklogd (1.3-14) unstable; urgency=low -+ -+ * Debugging syslogd now shows facility.priority -+ * Minor fixes -+ * Modified syslogd.c to not kill itself which confuses bash 2.0 -+ -+ -- Martin Schulze <joey@infodrom.north.de> Sun, 23 Feb 1997 12:23:55 +0100 -+ -+sysklogd (1.3-13) stable; urgency=low -+ -+ * Made /etc/init.d/sysklogd more verbose -+ * Minor fixes -+ * Uncompressed copyright, but compressed /usr/doc/sysklogd-1.3.16/readme -+ -+ -- Martin Schulze <joey@debian.org> Sat, 8 Feb 1997 14:12:29 +0100 -+ -+sysklogd (1.3-12) stable; urgency=HIGH -+ -+ * Converted to Standards-Version 2.1.1.2 -+ * init.d/sysklogd: added "sleep 1" -+ * syslogd won't hassle anymore if it can't access logfils. Patched by -+ me. This adresses Bug#5865. -+ * /etc/init.d/sysklogd: Modified so that one can use commandline -+ arguments for both syslogd and klogd. -+ * debian.rules: Installed ChangeLog -+ -+ -- Martin Schulze <joey@finlandia.infodrom.north.de> Thu, 30 Jan 1997 22:48:59 +0100 -+ -+Mon Now 25 10:36:01 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * modified preinst to work if /etc/init.d/sysklogd doesn't exist -+ because of a failure -+ -+Mon Sep 10 10:36:01 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * ksyms.c: klogd will first look at /System.map (Bug#4403, #4459) -+ -+Fri Aug 16 21:36:01 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * debian.rules: Changed permissions for syslogd and klogd to 755 -+ (Bug#4049) -+ -+Mon Aug 12 10:40:05 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * Corrected permissions of documentation. Thanks to Dan -+ Quinlan. (Bug#4090) -+ -+Mon Aug 5 22:47:40 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * syslogd.c: If you haven't set your domainname, syslogd will dump -+ core upon startup. Fixed. Thanks to Leeland Lucius -+ <llucius@millcomm.com> for reporting and patching it. (Bug#3526) -+ -+ * /etc/init.d/sysklogd, /etc/cron.weekly/sysklogd: slight -+ improvements. Thanks to Bernd Eckenfels <ecki@tapac.inka.de>. -+ -+Fri Aug 2 11:03:30 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * modified weekly cron script, thanks to Todd Tyrone Fries <todd@miango.com> -+ -+Fri Jun 14 10:42:26 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * ksyms.c: increased the size of vstring, because since Linux -+ major versions are decoded with n * 65536 and we now have 2.0, the -+ field was too short. -+ -+Tue May 28 01:02:01 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * syslogd.c: Corrected behaviour of blocking pipes - i.e. the -+ whole system hung. Michael Nonweiler <mrn20@hermes.cam.ac.uk> has -+ sent us a patch to correct this. A new logfile type F_PIPE has -+ been introduced. -+ -+Thu May 23 08:39:54 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * postinst: Corrected killall-statement, Thanks to Miquel van -+ Smoorenborg for the hint -+ -+Mon May 20 00:14:35 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * postinst: added a killall to remove an existing syslogd. It -+ could exist because of Bug#2836. -+ -+Sun May 12 13:36:55 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * removed auth.* from /dev/xconsole -+ -+ * klogd won't log old messages anymore (Bug#2337) -+ I have applied the patch from Chris Hanson. -+ -+ * I have put another start-stop-daemon call in the startup script -+ so the configs are reloaded on startup. This should -+ help. (Bug#2552) -+ -+ * Sysklogd takes care of this and createst /dev/xconsole if it -+ doesn't exist during installation. (Bug#2683) -+ -+ * I have corrected permissions of /dev/xconsole. (Bug#2837) -+ -+ * defined /etc/cron.weekly/sysklogd as a conffile (Bug#2950, Bug#2960) -+ -+ * introduced two binary packages: syslogd and sysklogd which -+ exclude each other -+ -+Sun Apr 21 17:56:03 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * Corrected preinst (Bug#2722, Bug#2725, Bug#2726) -+ -+ * Linked against libc 5.2.18 (Bug#2723, Bug#2725) -+ -+ * Corrected control file to fit with newer dpkgs -+ -+Wed Apr 17 21:40:56 1996 Martin Schulze <joey@finlandia.infodrom.north.de> -+ -+ * Added Debian packaging information -+ -+ ---- sysklogd-1.4.1.orig/debian/conffiles -+++ sysklogd-1.4.1/debian/conffiles -@@ -0,0 +1,5 @@ -+/etc/default/syslogd -+/etc/syslog.conf -+/etc/init.d/sysklogd -+/etc/cron.daily/sysklogd -+/etc/cron.weekly/sysklogd ---- sysklogd-1.4.1.orig/debian/conffiles.klogd -+++ sysklogd-1.4.1/debian/conffiles.klogd -@@ -0,0 +1,2 @@ -+/etc/default/klogd -+/etc/init.d/klogd ---- sysklogd-1.4.1.orig/debian/control -+++ sysklogd-1.4.1/debian/control -@@ -0,0 +1,32 @@ -+Source: sysklogd -+Section: admin -+Priority: important -+Maintainer: Martin Schulze <joey@debian.org> -+Standards-Version: 3.5.6.0 -+ -+Package: sysklogd -+Architecture: any -+Section: admin -+Depends: ${shlibs:Depends}, klogd | linux-kernel-log-daemon -+Conflicts: syslogd -+Provides: syslogd, system-log-daemon -+Replaces: syslogd -+Description: System Logging Daemon -+ This package implements the system log daemon, which is an enhanced -+ version of the standard Berkeley utility program. It is responsible -+ for providing logging of messages received from programs and facilities -+ on the local host as well as from remote hosts. -+ -+Package: klogd -+Architecture: any -+Section: admin -+Depends: ${shlibs:Depends}, sysklogd | system-log-daemon -+Conflicts: sysklogd (<= 1.3-33) -+Provides: linux-kernel-log-daemon -+Replaces: sysklogd -+Description: Kernel Logging Daemon -+ The klogd daemon listens to kernel message sources and is responsible -+ for prioritizing and processing operating system messages. The klogd -+ daemon can run as a client of syslogd or optionally as a standalone -+ program. Klogd can now be used to decode EIP addresses if it can -+ determine a System.map file. ---- sysklogd-1.4.1.orig/debian/copyright -+++ sysklogd-1.4.1/debian/copyright -@@ -0,0 +1,50 @@ -+This is the Debian GNU/Linux prepackaged version of Linux' system and -+kernel logging daemons. -+ -+This package was put together by Martin Schulze <joey@debian.org>, -+from sources obtained from: -+ -+ http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.4.1.tar.gz -+ -+Recent versions are Debian versions that may be also be found at -+ -+ http://www.infodrom.org/projects/sysklogd/ -+ -+syslogd is under Berkeley copyright, klogd is under GPL. -+ -+ Copyright (C) 1994-96 Greg Wettstein <greg@wind.enjellic.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; version 2 dated June, 1991. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ -+On Debian GNU/Linux systems, the complete text of the GNU General -+Public License can be found in `/usr/share/common-licenses/GPL'. -+ -+There is a mailing list covering this package and syslog in general. -+The lists address is infodrom-sysklogd@lists.infodrom.org . -+ -+To subscribe to this list, -+ -+ . send a mail to infodrom-sysklogd-request@lists.infodrom.org with -+ the word "subscribe" as subject, or -+ -+ . send a mail to majordomo@lists.infodrom.org with the body of -+ "subscribe infodrom-sysklogd". -+ -+The list will be archived publically at -+<http://www.infodrom.org/Mail-Archive/infodrom-sysklogd>. -+ -+The source of the Debian package is managed through CVS. It is publically -+available at <http://cvs.infodrom.org/sysklogd/?cvsroot=debian> or as -+<:pserver:anonymous@cvs.infodrom.org/var/cvs/debian/sysklogd/>. -+ ---- sysklogd-1.4.1.orig/debian/cron.daily -+++ sysklogd-1.4.1/debian/cron.daily -@@ -0,0 +1,39 @@ -+#! /bin/sh -+ -+# sysklogd Cron script to rotate system log files daily. -+# -+# If you want to rotate other logfiles daily, edit -+# this script. An easy way is to add files manually, -+# to add -a (for all log files) to syslogd-listfiles and -+# add some grep stuff, or use the -s pattern argument to -+# specify files that must not be listed. -+# -+# This is a configration file. You are invited to edit -+# it and maintain it on your own. You'll have to do -+# that if you don't like the default policy -+# wrt. rotating logfiles (i.e. with large logfiles -+# weekly and daily rotation may interfere). If you edit -+# this file and don't let dpkg upgrade it, you have full -+# control over it. Please read the manpage to -+# syslogd-listfiles. -+# -+# Written by Martin Schulze <joey@debian.org>. -+# $Id: cron.daily,v 1.13 2006-09-18 09:42:30 joey Exp $ -+ -+test -x /usr/sbin/syslogd-listfiles || exit 0 -+test -x /sbin/syslogd || exit 0 -+test -f /usr/share/sysklogd/dummy || exit 0 -+ -+set -e -+ -+cd /var/log -+for LOG in `syslogd-listfiles` -+do -+ if [ -s $LOG ]; then -+ savelog -g adm -m 640 -u root -c 7 $LOG >/dev/null -+ fi -+done -+ -+# Restart syslogd -+# -+/etc/init.d/sysklogd reload-or-restart > /dev/null ---- sysklogd-1.4.1.orig/debian/cron.daily.klogd -+++ sysklogd-1.4.1/debian/cron.daily.klogd -@@ -0,0 +1,47 @@ -+#! /bin/sh -+ -+binpath=/sbin/klogd -+pidfile=/var/run/klogd.pid -+ -+test -x $binpath || exit 0 -+ -+ -+running() -+{ -+ # No pidfile, probably no daemon present -+ # -+ if [ ! -f $pidfile ] -+ then -+ return 1 -+ fi -+ -+ pid=`cat $pidfile` -+ -+ # No pid, probably no daemon present -+ # -+ if [ -z "$pid" ] -+ then -+ return 1 -+ fi -+ -+ if [ ! -d /proc/$pid ] -+ then -+ return 1 -+ fi -+ -+ cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1` -+ -+ # No syslogd? -+ # -+ if [ "$cmd" != "$binpath" ] -+ then -+ return 1 -+ fi -+ -+ return 0 -+} -+ -+if ! running -+then -+ sh /etc/init.d/klogd start > /dev/null -+fi ---- sysklogd-1.4.1.orig/debian/cron.weekly -+++ sysklogd-1.4.1/debian/cron.weekly -@@ -0,0 +1,38 @@ -+#! /bin/sh -+ -+# sysklogd Cron script to rotate system log files weekly. -+# -+# If you want to rotate logfiles daily, edit -+# this script and /etc/cron.daily/sysklogd to get -+# the logfiles in sync (they must not occur in both -+# files). -+# -+# This is a configration file. You are invited to edit -+# it and maintain it on your own. You'll have to do -+# that if you don't like the default policy -+# wrt. rotating logfiles (i.e. with large logfiles -+# weekly and daily rotation may interfere). If you edit -+# this file and don't let dpkg upgrade it, you have full -+# control over it. Please read the manpage to -+# syslogd-listfiles. -+# -+# Written by Ian A. Murdock <imurdock@debian.org>. -+# $Id: cron.weekly,v 1.10 2004-03-31 16:18:15 joey Exp $ -+ -+test -x /usr/sbin/syslogd-listfiles || exit 0 -+test -x /sbin/syslogd || exit 0 -+test -f /usr/share/sysklogd/dummy || exit 0 -+ -+set -e -+ -+cd /var/log -+for LOG in `syslogd-listfiles --weekly` -+do -+ if [ -s $LOG ]; then -+ savelog -g adm -m 640 -u root -c 4 $LOG >/dev/null -+ fi -+done -+ -+# Restart syslogd -+# -+/etc/init.d/sysklogd reload-or-restart > /dev/null ---- sysklogd-1.4.1.orig/debian/default -+++ sysklogd-1.4.1/debian/default -@@ -0,0 +1,13 @@ -+# -+# Top configuration file for syslogd -+# -+ -+# -+# Full documentation of possible arguments are found in the manpage -+# syslogd(8). -+# -+ -+# -+# For remote UDP logging use SYSLOGD="-r" -+# -+SYSLOGD="" ---- sysklogd-1.4.1.orig/debian/default.klogd -+++ sysklogd-1.4.1/debian/default.klogd -@@ -0,0 +1,15 @@ -+# -+# top configuration file for klogd -+# -+ -+# -+# Full documentation of possible arguments are found in the manpage -+# klogd(8). -+# -+ -+# -+# Use KLOGD="-k /boot/System.map-$(uname -r)" to specify System.map -+# -c 4 to alter the kernel console log level (deprecated) -+# use sysctl instead -+# -+KLOGD="-x" ---- sysklogd-1.4.1.orig/debian/dummy -+++ sysklogd-1.4.1/debian/dummy -@@ -0,0 +1,4 @@ -+Do not remove this file or your log files won't be rotated anymore. -+This is a control file to ensure that the sysklogd package is -+installed so that the cronjobs don't have to parse the dpkg database -+for each run. ---- sysklogd-1.4.1.orig/debian/postinst -+++ sysklogd-1.4.1/debian/postinst -@@ -0,0 +1,83 @@ -+#! /bin/sh -+ -+set -e -+ -+if [ "$1" = "configure" ] -+then -+ case $2 in -+ 1.2-*) -+cat<<EOT -+The default behaviour of syslogd has altered from 1.2 to 1.3. By default -+*no* messages from the UDP port are accepted. -+ -+Read the documentation in /usr/doc/sysklogd carefully. Some important -+things have been changed! -+ -+Press [Enter] to continue -+EOT -+ read xyz -+ ;; -+ esac -+fi -+ -+if [ "$1" = "configure" ] -+then -+ -+ # Prepare for takeover of the host -+ if [ -z "$2" ] -+ then -+ if [ ! -e /var/log/news ] \ -+ && grep -q '^[^#].*/var/log/news/' /etc/syslog.conf \ -+ && grep -q ^news: /etc/passwd \ -+ && grep -q ^news: /etc/group -+ then -+ mkdir /var/log/news -+ chmod 2755 /var/log/news -+ chown news:news /var/log/news -+ fi -+ -+ # Create logfiles with correct file modes -+ if [ -z "$2" ] -+ then -+ for LOG in `syslogd-listfiles --all` -+ do -+ if [ ! -f $LOG ] -+ then -+ touch $LOG -+ fi -+ chown root:adm $LOG -+ chmod 640 $LOG -+ done -+ fi -+ fi -+ -+ if [ -f /etc/init.d/sysklogd -a -n "$2" ] -+ then -+ set +e -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d sysklogd stop -+ else -+ sh /etc/init.d/sysklogd stop -+ fi -+ set -e -+ fi -+ -+ update-rc.d sysklogd defaults 10 90 >/dev/null -+ -+ # restarting daemon -+ # -+ if [ -f /etc/init.d/sysklogd ] -+ then -+ set +e -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d sysklogd start -+ else -+ sh /etc/init.d/sysklogd start -+ fi -+ set -e -+ fi -+fi -+ -+exit 0 ---- sysklogd-1.4.1.orig/debian/postinst.klogd -+++ sysklogd-1.4.1/debian/postinst.klogd -@@ -0,0 +1,36 @@ -+#! /bin/sh -+ -+set -e -+ -+if [ "$1" = "configure" ] -+then -+ if [ -f /etc/init.d/klogd -a -n "$2" ] -+ then -+ set +e -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d klogd stop -+ else -+ sh /etc/init.d/klogd stop -+ fi -+ set -e -+ fi -+ -+ update-rc.d klogd defaults 11 89 >/dev/null -+ -+ # restarting daemon -+ # -+ if [ -f /etc/init.d/klogd ] -+ then -+ set +e -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d klogd start -+ else -+ sh /etc/init.d/klogd start -+ fi -+ set -e -+ fi -+fi -+ -+exit 0 ---- sysklogd-1.4.1.orig/debian/postrm -+++ sysklogd-1.4.1/debian/postrm -@@ -0,0 +1,8 @@ -+#! /bin/sh -+ -+set -e -+ -+if [ "$1" = "purge" ] -+then -+ update-rc.d sysklogd remove >/dev/null -+fi ---- sysklogd-1.4.1.orig/debian/postrm.klogd -+++ sysklogd-1.4.1/debian/postrm.klogd -@@ -0,0 +1,8 @@ -+#! /bin/sh -+ -+set -e -+ -+if [ "$1" = "purge" ] -+then -+ update-rc.d klogd remove >/dev/null -+fi ---- sysklogd-1.4.1.orig/debian/preinst -+++ sysklogd-1.4.1/debian/preinst -@@ -0,0 +1,21 @@ -+#! /bin/sh -+ -+set -e -+ -+dpkg --assert-support-predepends -+ -+if [ "$1" = "upgrade" -a -f /etc/init.d/sysklogd ]; then -+ if [ -f /etc/init.d/sysklogd ] -+ then -+ set +e -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d sysklogd stop -+ else -+ sh /etc/init.d/sysklogd stop -+ fi -+ set -e -+ fi -+fi -+ -+exit 0 ---- sysklogd-1.4.1.orig/debian/preinst.klogd -+++ sysklogd-1.4.1/debian/preinst.klogd -@@ -0,0 +1,21 @@ -+#! /bin/sh -+ -+set -e -+ -+dpkg --assert-support-predepends -+ -+if [ "$1" = "upgrade" -a -f /etc/init.d/klogd ]; then -+ if [ -f /etc/init.d/klogd ] -+ then -+ set +e -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d klogd stop -+ else -+ sh /etc/init.d/klogd stop -+ fi -+ set -e -+ fi -+fi -+ -+exit 0 ---- sysklogd-1.4.1.orig/debian/prerm -+++ sysklogd-1.4.1/debian/prerm -@@ -0,0 +1,19 @@ -+#! /bin/sh -+ -+set -e -+ -+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/sysklogd ] -+then -+ rm -f /usr/doc/sysklogd -+fi -+ -+if [ "$1" = "purge" -o "$1" = "remove" ] -+then -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d sysklogd stop -+ else -+ sh /etc/init.d/sysklogd stop -+ fi -+fi -+ ---- sysklogd-1.4.1.orig/debian/prerm.klogd -+++ sysklogd-1.4.1/debian/prerm.klogd -@@ -0,0 +1,19 @@ -+#! /bin/sh -+ -+set -e -+ -+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/klogd ] -+then -+ rm -f /usr/doc/klogd -+fi -+ -+if [ "$1" = "purge" -o "$1" = "remove" ] -+then -+ if [ -x /usr/sbin/invoke-rc.d ] -+ then -+ invoke-rc.d klogd stop -+ else -+ sh /etc/init.d/klogd stop -+ fi -+fi -+ ---- sysklogd-1.4.1.orig/debian/rc -+++ sysklogd-1.4.1/debian/rc -@@ -0,0 +1,112 @@ -+#! /bin/sh -+# /etc/init.d/sysklogd: start the system log daemon. -+ -+### BEGIN INIT INFO -+# Provides: syslog -+# Required-Start: $local_fs $network $time -+# Required-Stop: $local_fs $network $time -+# Default-Start: 2 3 4 5 -+# Default-Stop: S 0 1 6 -+# Short-Description: System logger -+### END INIT INFO -+ -+PATH=/bin:/usr/bin:/sbin:/usr/sbin -+ -+pidfile=/var/run/syslogd.pid -+binpath=/sbin/syslogd -+ -+test -x $binpath || exit 0 -+ -+test ! -r /etc/default/syslogd || . /etc/default/syslogd -+ -+. /lib/lsb/init-functions -+ -+create_xconsole() -+{ -+ # Only proceed if not using devfsd -+ if [ -e /dev/.devfsd ] \ -+ || ! grep -q '^[^#].*/dev/xconsole' /etc/syslog.conf -+ then -+ return -+ fi -+ -+ if [ ! -e /dev/xconsole ]; then -+ mknod -m 640 /dev/xconsole p -+ else -+ chmod 0640 /dev/xconsole -+ fi -+ chown root:adm /dev/xconsole -+} -+ -+running() -+{ -+ # No pidfile, probably no daemon present -+ # -+ if [ ! -f $pidfile ] -+ then -+ return 1 -+ fi -+ -+ pid=`cat $pidfile` -+ -+ # No pid, probably no daemon present -+ # -+ if [ -z "$pid" ] -+ then -+ return 1 -+ fi -+ -+ if [ ! -d /proc/$pid ] -+ then -+ return 1 -+ fi -+ -+ cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1` -+ -+ # No syslogd? -+ # -+ if [ "$cmd" != "$binpath" ] -+ then -+ return 1 -+ fi -+ -+ return 0 -+} -+ -+case "$1" in -+ start) -+ log_begin_msg "Starting system log daemon..." -+ create_xconsole -+ start-stop-daemon --start --quiet --pidfile $pidfile --name syslogd --startas $binpath -- $SYSLOGD -+ log_end_msg $? -+ ;; -+ stop) -+ log_begin_msg "Stopping system log daemon..." -+ start-stop-daemon --stop --quiet --pidfile $pidfile --name syslogd -+ log_end_msg $? -+ ;; -+ reload|force-reload) -+ log_begin_msg "Reloading system log daemon..." -+ start-stop-daemon --stop --quiet --signal 1 --pidfile $pidfile --name syslogd -+ log_end_msg $? -+ ;; -+ restart) -+ log_begin_msg "Restarting system log daemon..." -+ start-stop-daemon --stop --retry 5 --quiet --pidfile $pidfile --name syslogd -+ start-stop-daemon --start --quiet --pidfile $pidfile --name syslogd --startas $binpath -- $SYSLOGD -+ log_end_msg $? -+ ;; -+ reload-or-restart) -+ if running -+ then -+ $0 reload -+ else -+ $0 start -+ fi -+ ;; -+ *) -+ echo "Usage: /etc/init.d/sysklogd {start|stop|reload|restart|force-reload|reload-or-restart}" -+ exit 1 -+esac -+ -+exit 0 ---- sysklogd-1.4.1.orig/debian/rc.klogd -+++ sysklogd-1.4.1/debian/rc.klogd -@@ -0,0 +1,46 @@ -+#! /bin/sh -+# /etc/init.d/klogd: start the kernel log daemon. -+ -+### BEGIN INIT INFO -+# Provides: klogd -+# Required-Start: $time syslog -+# Required-Stop: $time syslog -+# Default-Start: 2 3 4 5 -+# Default-Stop: S 0 1 6 -+# Short-Description: kernel logger -+### END INIT INFO -+ -+PATH=/bin:/usr/bin:/sbin:/usr/sbin -+ -+pidfile=/var/run/klogd.pid -+binpath=/sbin/klogd -+ -+test -f $binpath || exit 0 -+ -+test ! -r /etc/default/klogd || . /etc/default/klogd -+ -+. /lib/lsb/init-functions -+ -+case "$1" in -+ start) -+ log_begin_msg "Starting kernel log daemon..." -+ start-stop-daemon --start --quiet --pidfile $pidfile --name klogd --startas $binpath -- $KLOGD -+ log_end_msg $? -+ ;; -+ stop) -+ log_begin_msg "Stopping kernel log daemon..." -+ start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --pidfile $pidfile --name klogd -+ log_end_msg $? -+ ;; -+ restart|force-reload) -+ log_begin_msg "Reloading kernel log daemon..." -+ start-stop-daemon --stop --retry TERM/1/TERM/1/TERM/4/KILL --quiet --pidfile $pidfile --name klogd -+ start-stop-daemon --start --quiet --pidfile $pidfile --name klogd --startas $binpath -- $KLOGD -+ log_end_msg $? -+ ;; -+ *) -+ echo "Usage: /etc/init.d/klogd {start|stop|restart|force-reload}" -+ exit 1 -+esac -+ -+exit 0 ---- sysklogd-1.4.1.orig/debian/readme -+++ sysklogd-1.4.1/debian/readme -@@ -0,0 +1,44 @@ -+ -+Additional information about system logging -+------------------------------------------- -+ -+ . When logging into a fifo syslogd will stop loggin into this -+ logfile if no process is reading it and thus the buffer is filled -+ up. Buffer size can be adjusted through the kernel. -+ -+ . When using the Perl5 Sys::Syslog module (use Sys::Syslog;) to -+ provide logging to your Perl programs, please notice that since it -+ will open a UDP connection to the local syslogd you'll need to have -+ remote receiption enabled. -+ -+ Joey Hess teaches us how to change this behaviour and switch to -+ using the Unix domain socket. After the opening with "use" you -+ have to add "Sys::Syslog::setlogsock('unix');". -+ -+ The default behaviour might change in future releases of Perl. -+ -+Modifying the kernel console log level -+-------------------------------------- -+ -+ There are two ways to alter the kernel console log level. This -+ setting controls whether log messages from the kernel should appear -+ on the system console or not. -+ -+ In the past, klogd had to do this with the -c parameter. Using '-c -+ 4' will set the log level of console messages to 4 and only display -+ warnings and errors but not regular debug or information messages. -+ -+ This behaviour is deprecated and hencely not enforced anymore via -+ the RC script of klogd. Instead sysctl(8) should be used as -+ interface to various kernel variables. These can be stored -+ non-volatile in /etc/sysctl.conf. -+ -+ The prevent the kernel to flood the system console and to achieve -+ the same behaviour of '-c 4' simply add the following to the -+ configuration file and let sysctl set this kernel parameter upon -+ system boot. -+ -+ kernel/printk = 4 4 1 7 -+ -+ More information can be found in Documentation/sysctl/kernel.txt in -+ the kernel source and proc(5). ---- sysklogd-1.4.1.orig/debian/rules -+++ sysklogd-1.4.1/debian/rules -@@ -0,0 +1,172 @@ -+#! /usr/bin/make -f -+ -+# Copyright 1994-98,2001 joey@infodrom.org (Martin Schulze) -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; version 2 dated June, 1991. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA -+# -+SHELL=/bin/bash -+ -+# The name and version of the source -+# -+source = $(shell grep "^Source: " debian/control|head -n 1|sed 's/Source: \(.*\)/\1/g') -+package = $(shell grep "^Package: " debian/control|head -n 1|sed 's/Package: \(.*\)/\1/g') -+version = $(shell grep "^$(source) " debian/changelog|head -n 1 |sed 's/.*(\(.*\)\-[^\-]*).*/\1/g') -+revision = $(shell grep "^$(source) " debian/changelog|head -n 1 |sed 's/.*([^\-]*\-\(.*\)).*/\1/g') -+ -+installbin = install -g root -o root -m 755 -+installdoc = install -g root -o root -m 644 -+ -+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -+CFLAGS = -g -O2 -Wall $(shell getconf LFS_CFLAGS) -+else -+CFLAGS = -O2 -Wall $(shell getconf LFS_CFLAGS) -+endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+STRIP = -s -+endif -+ -+build: -+ $(MAKE) DEB="-DDEBRELEASE=\\\"$(revision)\\\"" \ -+ CFLAGS="$(CFLAGS) -DSYSV -fomit-frame-pointer -fno-strength-reduce" \ -+ LDFLAGS="" -+ pod2man --section=8 --lax --center="Debian GNU/Linux" \ -+ --release="Debian Project" debian/syslog-facility.pod \ -+ > syslog-facility.8 -+ (cat README.linux; printf "\n\n"; cat README.1st; \ -+ printf "\n\nThe following important changes have been reported by the developers:\n\n"; \ -+ cat NEWS debian/readme) \ -+ > readme.txt -+ (cat debian/copyright; \ -+ printf "Syslogd stays under the following copyright:\n\n"; \ -+ sed -e '/^$$/,$$d' < syslogd.c; \ -+ printf "\nKlogd has the following copyright notice:\n\n"; \ -+ sed -e '/^$$/,$$d' < klogd.c ) \ -+ > copyright -+ touch stamp-build -+ -+clean: debclean -+ rm -f stamp-build -+ $(MAKE) clobber -+ rm -rf *~ debian/*~ syslog-facility.8 readme.txt copyright -+ -+debclean: -+# Cleans debian binary directories to allow binary creation -+ rm -rf debian/tmp.sysklogd debian/tmp.klogd -+ rm -f debian/{files,substvars} -+ -+binary-indep: -+# Nothing to be done here -+ -+binary-arch-sysklogd: debclean -+ test -f stamp-build || $(MAKE) -f debian/rules build -+ $(installbin) -d debian/tmp.sysklogd/DEBIAN -+ chown -R root:root debian/tmp.sysklogd -+ chmod -R g-ws debian/tmp.sysklogd -+ $(installbin) -d debian/tmp.sysklogd/usr/share/doc/$(package) -+ $(installbin) debian/{postinst,postrm,prerm} debian/tmp.sysklogd/DEBIAN/ -+ $(installdoc) debian/conffiles debian/tmp.sysklogd/DEBIAN/ -+ $(installdoc) debian/changelog debian/tmp.sysklogd/usr/share/doc/$(package)/changelog.Debian -+ # -+ $(installbin) -d debian/tmp.sysklogd/usr/share/$(package) -+ $(installdoc) debian/dummy debian/tmp.sysklogd/usr/share/$(package) -+ # -+ $(installdoc) copyright debian/tmp.sysklogd/usr/share/doc/$(package)/ -+ $(installdoc) readme.txt debian/tmp.sysklogd/usr/share/doc/$(package)/ -+ $(installdoc) CHANGES debian/tmp.sysklogd/usr/share/doc/$(package)/changelog -+ gzip -9f debian/tmp.sysklogd/usr/share/doc/$(package)/{changelog.Debian,changelog,readme.txt} -+ # -+ $(installbin) -d debian/tmp.sysklogd/{usr/,}sbin -+ $(installbin) $(STRIP) syslogd debian/tmp.sysklogd/sbin -+ $(installbin) debian/syslogd-listfiles debian/tmp.sysklogd/usr/sbin -+ $(installbin) debian/syslog-facility debian/tmp.sysklogd/usr/sbin -+ # -+ $(installbin) -d debian/tmp.sysklogd/etc/{init.d,cron.{daily,weekly},default} -+ $(installbin) debian/default debian/tmp.sysklogd/etc/default/syslogd -+ $(installbin) debian/rc debian/tmp.sysklogd/etc/init.d/sysklogd -+ $(installbin) debian/cron.weekly debian/tmp.sysklogd/etc/cron.weekly/sysklogd -+ $(installbin) debian/cron.daily debian/tmp.sysklogd/etc/cron.daily/sysklogd -+ $(installdoc) debian/syslog.conf debian/tmp.sysklogd/etc/syslog.conf -+ $(installbin) -d debian/tmp.sysklogd/var/log -+ # -+ $(installbin) -d debian/tmp.sysklogd/usr/share/man/man{5,8} -+ $(installdoc) syslog.conf.5 debian/tmp.sysklogd/usr/share/man/man5 -+ $(installdoc) {sysklogd,syslogd,debian/syslogd-listfiles}.8 debian/tmp.sysklogd/usr/share/man/man8 -+ $(installdoc) syslog-facility.8 debian/tmp.sysklogd/usr/share/man/man8 -+ gzip -9 debian/tmp.sysklogd/usr/share/man/man?/* -+ # -+ dpkg-shlibdeps debian/tmp.sysklogd/sbin/syslogd -+ dpkg-gencontrol -psysklogd -Pdebian/tmp.sysklogd -isp -+ dpkg --build debian/tmp.sysklogd .. -+ -+binary-arch-klogd: debclean -+ test -f stamp-build || $(MAKE) -f debian/rules build -+ $(installbin) -d debian/tmp.klogd/DEBIAN -+ chown -R root:root debian/tmp.klogd -+ chmod -R g-ws debian/tmp.klogd -+ $(installbin) -d debian/tmp.klogd/usr/share/doc/klogd -+ $(installbin) debian/postinst.klogd debian/tmp.klogd/DEBIAN/postinst -+ $(installbin) debian/postrm.klogd debian/tmp.klogd/DEBIAN/postrm -+ $(installbin) debian/prerm.klogd debian/tmp.klogd/DEBIAN/prerm -+ $(installdoc) debian/conffiles.klogd debian/tmp.klogd/DEBIAN/conffiles -+ $(installdoc) debian/changelog debian/tmp.klogd/usr/share/doc/klogd/changelog.Debian -+ # -+ $(installdoc) copyright debian/tmp.klogd/usr/share/doc/klogd/ -+ $(installdoc) readme.txt debian/tmp.klogd/usr/share/doc/klogd/ -+ $(installdoc) CHANGES debian/tmp.klogd/usr/share/doc/klogd/changelog -+ gzip -9f debian/tmp.klogd/usr/share/doc/klogd/{changelog.Debian,changelog,readme.txt} -+ $(installdoc) modutils.patch debian/tmp.klogd/usr/share/doc/klogd -+ # -+ $(installbin) -d debian/tmp.klogd/sbin -+ $(installbin) $(STRIP) klogd debian/tmp.klogd/sbin -+ # -+ $(installbin) -d debian/tmp.klogd/etc/{init.d,default} -+ $(installbin) debian/default.klogd debian/tmp.klogd/etc/default/klogd -+ $(installbin) debian/rc.klogd debian/tmp.klogd/etc/init.d/klogd -+ # -+ $(installbin) -d debian/tmp.klogd/usr/share/man/man8 -+ $(installdoc) klogd.8 debian/tmp.klogd/usr/share/man/man8 -+ gzip -9 debian/tmp.klogd/usr/share/man/man?/* -+ # -+ dpkg-shlibdeps debian/tmp.klogd/sbin/klogd -+ dpkg-gencontrol -pklogd -Pdebian/tmp.klogd -isp -+ dpkg --build debian/tmp.klogd .. -+ -+binary-arch: binary-arch-sysklogd binary-arch-klogd -+ -+binary: binary-indep binary-arch -+ -+source diff: -+ @echo >&2 'source and diff are obsolete - use dpkg-source -b' or dsc; false -+ -+dsc: -+ -test -d debian/tmp.sysklogd -o -d debian/tmp.klogd \ -+ && $(MAKE) -f debian/rules clean -+ if [ ! -f ../$(source)_$(version).orig.tar.gz -a -f ../orig/$(source)_$(version).orig.tar.gz ]; \ -+ then \ -+ ln -s orig/$(source)_$(version).orig.tar.gz ../$(source)_$(version).orig.tar.gz; \ -+ touch /tmp/stamp-$(source)-link; \ -+ fi; \ -+ cd .. && dpkg-source -b $(source)-$(version) -+ if [ -f /tmp/stamp-$(source)-link ]; then \ -+ rm ../$(source)_$(version).orig.tar.gz /tmp/stamp-$(source)-link; \ -+ fi -+ -+checkroot: -+ $(checkdir) -+ test root = "`whoami`" -+ -+dist: binary dsc -+ -+.PHONY: binary binary-arch binary-indep clean checkroot -+ ---- sysklogd-1.4.1.orig/debian/syslog-facility -+++ sysklogd-1.4.1/debian/syslog-facility -@@ -0,0 +1,140 @@ -+#! /usr/bin/perl -w -+ -+# Copyright 1998 Hertzog Raphaël -+# You can use this script under the term of the GPL v2 or later. -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ -+my $conf_file = '/etc/syslog.conf'; -+ -+## BUGS : -+# . This script doesn't know about multi-lines configuration (ie with '\') -+# . With a line like that "mail,local0.* /anything" -+# "syslog-facility remove local0" would remove the entire line -+# => should not be a problem since lines installed by this script -+# cannot use such syntax -+## -+ -+## Nothing to modify after this line ## -+ -+my $command = lc(shift); -+ -+usage() if ($command !~ /^(?:set|remove)$/); -+usage() if (not scalar(@ARGV)); -+ -+if ($command eq "set") -+{ -+ usage() if (int(scalar(@ARGV) / 2) != scalar(@ARGV) / 2); -+ # find a free localx facility -+ my $facility = get_first_free_facility(); -+ # if none stop immediately -+ if ($facility eq "none") { -+ print "none\n"; -+ exit 1; -+ } -+ # ok append the lines asked -+ open (CONF, ">>$conf_file") || -+ die "Can't open $conf_file in write mode: $!\n"; -+ my ($pri,$file,$line); -+ while (defined($pri = shift)) { -+ $file = shift; -+ $line = ""; -+ foreach (split(/;/,$pri)) { -+ $_ =~ s/all/*/g; -+ $line .= ";" if ($line); -+ $line .= "$facility.$_"; -+ } -+ $line .= "\t\t$file\n"; -+ print CONF $line; -+ } -+ close CONF; -+ print "$facility\n"; -+ exit 0; -+ -+} elsif ($command eq "remove") { -+ -+ my $facility = lc(shift); -+ my ($left,$file,$line); -+ open (CONF, $conf_file) || die "Can't open $conf_file: $!\n"; -+ open (CONFNEW, ">$conf_file.new") || -+ die "Can't open $conf_file.new in write mode: $!\n"; -+ while (defined($_=<CONF>)) { -+ # Write all "simple" lines like empty lines and comments -+ if (/^\s*$/ or /^\s*#/ or /\\$/) { -+ print CONFNEW $_; -+ next; -+ } -+ # Otherwise look if the facility to remove appears in the line -+ if (/^\s*(\S+)\s+(\S+)\s*/) { -+ $left = $1; $file = $2; chomp $file; -+ # It doesn't appers => write -+ if ($left !~ /$facility/i) { -+ print CONFNEW $_; -+ next; -+ } -+ # It appears => write a new line without the localx facility -+ $line = ""; -+ foreach (split(/;/,$left)) { -+ if (not /$facility/i) { -+ $line .= ";" if ($line); -+ $line .= $_; -+ } -+ } -+ next if ($line eq ""); -+ $line .= "\t\t$file\n"; -+ print CONFNEW $line; -+ } -+ } -+ close CONFNEW; -+ close CONF; -+ rename ("$conf_file.new", "$conf_file"); -+} -+ -+sub get_first_free_facility { -+ -+ my @facility = (0) x 8; -+ my ($left,$fac); -+ open(CONF, $conf_file) || die "Can't open $conf_file: $!\n"; -+ while(defined($_=<CONF>)) -+ { -+ next if (/^\s*$/); -+ next if (/^\s*#/); -+ next if (/\\$/); -+ next if (not /^\s*(\S+)\s+(\S+)\s*$/); -+ $left = $1; -+ foreach $fac (split(/;/,$left)) { -+ $facility[$1]++ if ($fac =~ /local(\d)/i); -+ } -+ } -+ foreach $fac (0..7) { -+ return "local$fac" if ($facility[$fac] == 0); -+ } -+ return "none"; -+} -+ -+sub usage { -+ -+ die "syslog-facility - Copyright (c) 1998 Hertzog Raphaël\n" -+ ."Usage : $0 set <set_of_priority> <logfile> ... \n" -+ ." it returns the 'LOCALx' string you have the right to use.\n" -+ ." $0 remove <facility>\n" -+ ."Example: $0 set all /var/log/all\n" -+ ." $0 set all\\;\\!=info /var/log/all-without-info\n" -+ ." $0 set =err /var/log/errors =warning /var/log/warn\n" -+ ." $0 remove LOCAL1\n"; -+} -+ -+ -+ ---- sysklogd-1.4.1.orig/debian/syslog-facility.pod -+++ sysklogd-1.4.1/debian/syslog-facility.pod -@@ -0,0 +1,58 @@ -+=head1 NAME -+ -+syslog-facility - Setup and remove LOCALx facility for sysklogd -+ -+=head1 SYNOPSIS -+ -+B<syslog-facility> B<set> I<set_of_priority> I<log_file> ... -+ -+B<syslog-facility> B<remove> I<facility> -+ -+=head1 DESCRIPTION -+ -+B<syslog-facility> can be used to setup a syslog facility and to remove -+it. The primary use of this perl script is to allow packages to -+automatically setup (and remove) a LOCALx facility. With the -+first argument beeing I<set>, it will output a string containing -+the first free LOCALx facility that has been assigned to your request : -+ -+ # syslog-facility set all /var/log/sympa -+ local0 -+ -+This does mean that a line "local0.* /var/log/sympa" has been -+added to the syslog.conf file. If no free LOCALx facility has been -+found, then it outputs "none" (with a end of line). -+ -+You can use different set of priorities (most of what syslogd supports) : -+ -+ # syslog-facility set 'all;!=debug;' /var/log/sympa '=debug' /var/log/sympa-d -+ local1 -+ -+Pay particular attention to shell escapes since ';','!' have special -+meanings for them. The syntax is similar to syslog.conf except that -+'*' must be replaced by 'all'. -+ -+In that case you will have two lines added two the syslog.conf file : -+ -+ local1.*;local1.!=debug /var/log/sympa -+ local1.=debug /var/log/sympa-d -+ -+If the first argument is I<remove>, then it will remove all references -+to a precise LOCALx facility. Example : -+ -+ # syslog-facility remove local1 -+ -+It will remove all references to the local1 facility. -+ -+=head1 BUGS -+ -+The script doesn't know about multi-lines configuration (ie with '\'). -+ -+With a line like that "mail,local0.* /anything", "syslog-facility remove -+local0" would remove the entire line. It should not be a problem since -+lines installed by this script cannot use this syntax. -+ -+=head1 SEE ALSO -+ -+B<syslog.conf>(5), B<sysklogd>(8). -+ ---- sysklogd-1.4.1.orig/debian/syslog.conf -+++ sysklogd-1.4.1/debian/syslog.conf -@@ -0,0 +1,71 @@ -+# /etc/syslog.conf Configuration file for syslogd. -+# -+# For more information see syslog.conf(5) -+# manpage. -+ -+# -+# First some standard logfiles. Log by facility. -+# -+ -+auth,authpriv.* /var/log/auth.log -+*.*;auth,authpriv.none -/var/log/syslog -+#cron.* /var/log/cron.log -+daemon.* -/var/log/daemon.log -+kern.* -/var/log/kern.log -+lpr.* -/var/log/lpr.log -+mail.* -/var/log/mail.log -+user.* -/var/log/user.log -+uucp.* /var/log/uucp.log -+ -+# -+# Logging for the mail system. Split it up so that -+# it is easy to write scripts to parse these files. -+# -+mail.info -/var/log/mail.info -+mail.warn -/var/log/mail.warn -+mail.err /var/log/mail.err -+ -+# Logging for INN news system -+# -+news.crit /var/log/news/news.crit -+news.err /var/log/news/news.err -+news.notice -/var/log/news/news.notice -+ -+# -+# Some `catch-all' logfiles. -+# -+*.=debug;\ -+ auth,authpriv.none;\ -+ news.none;mail.none -/var/log/debug -+*.=info;*.=notice;*.=warn;\ -+ auth,authpriv.none;\ -+ cron,daemon.none;\ -+ mail,news.none -/var/log/messages -+ -+# -+# Emergencies are sent to everybody logged in. -+# -+*.emerg * -+ -+# -+# I like to have messages displayed on the console, but only on a virtual -+# console I usually leave idle. -+# -+#daemon,mail.*;\ -+# news.=crit;news.=err;news.=notice;\ -+# *.=debug;*.=info;\ -+# *.=notice;*.=warn /dev/tty8 -+ -+# The named pipe /dev/xconsole is for the `xconsole' utility. To use it, -+# you must invoke `xconsole' with the `-file' option: -+# -+# $ xconsole -file /dev/xconsole [...] -+# -+# NOTE: adjust the list below, or you'll go crazy if you have a reasonably -+# busy site.. -+# -+daemon.*;mail.*;\ -+ news.crit;news.err;news.notice;\ -+ *.=debug;*.=info;\ -+ *.=notice;*.=warn |/dev/xconsole -+ ---- sysklogd-1.4.1.orig/debian/syslogd-listfiles -+++ sysklogd-1.4.1/debian/syslogd-listfiles -@@ -0,0 +1,146 @@ -+#! /usr/bin/perl -+ -+# Copyright (c) 1998,9,2001,3 by Martin Schulze <joey@infodrom.org> -+ -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ -+$conf = "/etc/syslog.conf"; -+$opt_daily = 1; -+$opt_all = 0; -+$opt_auth = 0; -+$opt_ign_size = 0; -+$opt_news = 0; -+$opt_skip = ''; -+$opt_large = 1024*1024; -+ -+sub usage -+{ -+ print STDERR -+" -+Debian GNU/Linux syslogd-listfiles. Copyright (c) 1997,2001 -+Martin Schulze. This is free software; see the GNU General Public Licence -+version 2 or later for copying conditions. There is NO warranty. -+ -+Usage: syslogd-listfiles <options> -+Options: -f file specifies another syslog.conf file -+ -a | --all list all files (including news) -+ --auth list all files containing auth.<some prio> -+ --ignore-size don't rotate files which got too large -+ --large nnn define what is large in bytes (default: 10MB) -+ --news include news logfiles, too -+ -w | --weekly use weekly pattern instead of daily -+ -s pattern skip files matching pattern -+"; -+} -+ -+# Test if the file was already rotated within the last n hours -+# with n=5 -+# -+sub rotated -+{ -+ my $file = shift; -+ my $nfile; -+ my $delta = 5 * 60 * 60; -+ my $now = time(); -+ -+ # /var/log/file -> /var/log/file.0 -+ $nfile = $file . ".0"; -+ if (-r $nfile) { -+ if (($now - (stat $nfile)[9]) > $delta) { -+ return 0; -+ } else { -+ return 1; -+ } -+ } -+ -+ # /var/log/file -> /var/log/OLD/file.0 -+ $nfile =~ s,(.*)/([^/]+),$1/OLD/$2,; -+ if (-r $nfile) { -+ if (($now - (stat $nfile)[9]) > $delta) { -+ return 0; -+ } else { -+ return 1; -+ } -+ } -+ -+ return 0; -+} -+ -+while (@ARGV) { -+ $_=shift(@ARGV); -+ if (m/^-f$/) { -+ $conf = shift(@ARGV); -+ } elsif (m/^-s$/) { -+ $opt_skip = shift(@ARGV); -+ } elsif (m/^--large$/) { -+ $opt_large = shift(@ARGV); -+ } elsif (m/^(--weekly|-w)$/) { -+ $opt_daily = 0; -+ } elsif (m/^(-a|--all)$/) { -+ $opt_all = 1; -+ } elsif (m/^--auth$/) { -+ $opt_auth = 1; -+ } elsif (m/^--ignore-size/) { -+ $opt_ign_size = 1; -+ } elsif (m/^--news$/) { -+ $opt_news = 1; -+ } else { -+ &usage();exit (0); -+ } -+} -+ -+open (C, $conf) || die "Can't open $conf, $!"; -+while (<C>) { -+ next if (/^(\#|$)/); -+ chomp; -+ -+ s/\s*(\S.*)$/$1/ if ($line); -+ -+ $line .= $_; -+ chop ($line) if (/\\$/); -+ if (!/\\$/) { -+ $line =~ s/\s+/\t/; -+ $line =~ s/\t-/\t/; -+ push (@lines, $line) if ($line =~ /\t\/(?!dev\/)/); -+ $line = ""; -+ } -+} -+close (C); -+ -+foreach $line (@lines) { -+ ($pat,$file) = split (/\t/,$line); -+ -+ # These files are handled by news.daily from INN, so we ignore them -+ next if (!$opt_news && ($pat =~ /news\.(\*|crit|err|info|notice)/)); -+ -+ if ($opt_all) { -+ $output{$file} = 1; -+ } elsif ($opt_auth) { -+ $output{$file} = 1 if ($pat =~ /auth[^\.]*\.(?!none).*/); -+ } else { -+ $everything = ($pat =~ /\*\.\*/); -+ $output{$file} = 1 if (($everything && $opt_daily) -+ || (!$everything && !$opt_daily && !rotated ($file)) -+ || (!$opt_ign_size && ((stat $file)[7] >= $opt_large) && $opt_daily) -+ ); -+ } -+} -+ -+foreach $file (keys (%output)) { -+ $skip = $file; -+ if (!length($opt_skip) || $skip !~ /$opt_skip/) { -+ printf "%s\n", $file; -+ } -+} ---- sysklogd-1.4.1.orig/debian/syslogd-listfiles.8 -+++ sysklogd-1.4.1/debian/syslogd-listfiles.8 -@@ -0,0 +1,95 @@ -+.\" syslogd-listfiles.8 - generic routine for /etc/syslog.conf -+.\" Copyright (c) 1997,8,2001 Martin Schulze <joey@debian.org> -+.\" -+.\" This program is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; either version 2 of the License, or -+.\" (at your option) any later version. -+.\" -+.\" This program is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License -+.\" along with this program; if not, write to the Free Software -+.\" Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+.\" -+.TH SYSLOGD-LISTFILES 8 "December 5th, 2001" "Debian Project" "Debian GNU/Linux" -+.SH NAME -+syslogd-listfiles \- list system logfiles -+.SH SYNOPSIS -+.B syslogd-listfiles -+.RB [ " \-a " | " \-\-all " ] -+.RB [ " \-\-auth " ] -+.RB [ " \-f " -+.I config file -+] -+.RB [ " \-s " -+.I pattern -+] -+.RB [ " \-\-large " -+.I nnn -+] -+.RB [ " \-\-news " ] -+.RB [ " \-w " | " \-\-weekly " ] -+.SH DESCRIPTION -+.B Sysklogd -+provides a modern mechanism to log system messages. This mechanism is -+controlled by the file -+.IR /etc/syslog.conf . -+Messages are divided into logfiles which can grow quite big. -+Therefore the logfiles need to be rotated once per day, per week or -+per month. On a Debian GNU/Linux system most of the files are rotated -+once per week. -+ -+This program helps the rotation script to determine which logfiles -+need to be rotated and when. It takes care of news logfiles that are -+handled by the -+.B news.daily -+script from INN. In conjunction with the scripts in -+.IR /etc/cron.daily " and " /etc/cron.weekly -+it takes care of files with sensitive information. -+ -+By default a list of files for daily rotation is generated. At the -+moment this option only reflects entries that contain "*.*" as -+facility.priority. -+ -+.SH OPTIONS -+.TP -+.BR "\-a" ", " "\-\-all" -+List all logfiles and ignore all other rules. -+.TP -+.BI "\-f " "config file" -+Specify an alternative configuration file instead of -+.IR /etc/syslog.conf "," -+which is the default. -+.TP -+.BI "\-s " "pattern" -+Specify a regular expression for files that must not be listed. -+.TP -+.B "\-\-auth" -+Only list files containing sensitive information such as the one -+containing auth.*. -+.TP -+.BI "\-\-large " "nnn" -+Define the filesize for a large file. The size is provided in bytes. -+This value defaults to 1 megabyte. -+.TP -+.B \-\-ignore\-size -+Don't rotate files whose file size is larger than the regular limit -+(see above). This option is useful if you are postprocessing logfiles -+which would break if log files are rotated at a different date/time. -+.TP -+.B "\-\-news" -+Don't exclude news logfiles which are normally handled by the -+.B news.daily -+script from INN. -+.TP -+.BR "\-w" ", " "\-\-weekly" -+Generate the list for weekly rotation. -+.LP -+.SH SEE ALSO -+.BR syslog.conf (5), -+.BR syslogd (8), -+.BR savelog (8). ---- sysklogd-1.4.1.orig/debian/technical -+++ sysklogd-1.4.1/debian/technical -@@ -0,0 +1,10 @@ -+ Some technical information - unsorted -+ ------------------------------------- -+ -+ 1. Logfiles in syslogd -+ -+ As of version 1.3 syslogd doesn't come with a static array of -+ logfiles. Although the logfiles are still organized in an array. -+ This array is initialized when the configuration file (default is -+ /etc/syslog.conf) is read. Whenever a new line is read the -+ length of the array it prolongued. diff --git a/source/a/sysklogd/use_memmove_not_strcpy.diff b/source/a/sysklogd/use_memmove_not_strcpy.diff new file mode 100644 index 000000000..8fb7c5045 --- /dev/null +++ b/source/a/sysklogd/use_memmove_not_strcpy.diff @@ -0,0 +1,15 @@ +Adapted from this upstream git commit: 2a80f8117f40dc6a3fce30c6d0f15f3c5af55ccf +http://git.infodrom.org/?p=infodrom/sysklogd;a=commit;h=2a80f8117f40dc6a3fce30c6d0f15f3c5af55ccf + +diff -Nur sysklogd-1.5.orig//syslogd.c sysklogd-1.5/syslogd.c +--- sysklogd-1.5.orig//syslogd.c 2007-07-04 14:04:01.000000000 -0500 ++++ sysklogd-1.5/syslogd.c 2010-10-14 13:12:15.808000011 -0500 +@@ -2392,7 +2392,7 @@ + if (*p == '\0' || *p == '#') + continue; + #if CONT_LINE +- strcpy(cline, p); ++ memmove(cline, p, strlen(p)+1); + #endif + for (p = strchr(cline, '\0'); isspace(*--p);); + #if CONT_LINE diff --git a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild index 9af7f9ec3..909f8320e 100755 --- a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild +++ b/source/a/sysvinit-functions/sysvinit-functions.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 @@ -22,9 +22,18 @@ VERSION=${VERSION:-8.53} -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-sysvinit-functions diff --git a/source/a/sysvinit-scripts/doinst.sh b/source/a/sysvinit-scripts/doinst.sh index ff0ffc285..28fe719ad 100644 --- a/source/a/sysvinit-scripts/doinst.sh +++ b/source/a/sysvinit-scripts/doinst.sh @@ -18,6 +18,7 @@ config etc/rc.d/rc.K.new config etc/rc.d/rc.M.new config etc/rc.d/rc.S.new config etc/rc.d/rc.local.new +config etc/rc.d/rc.loop.new config etc/rc.d/rc.sysvinit.new ( cd etc/rc.d ; rm -rf rc.0 ) diff --git a/source/a/sysvinit-scripts/scripts/inittab b/source/a/sysvinit-scripts/scripts/inittab index 862f704c1..9f8b422d1 100644 --- a/source/a/sysvinit-scripts/scripts/inittab +++ b/source/a/sysvinit-scripts/scripts/inittab @@ -6,6 +6,7 @@ # 2.10 02/10/95 PV # 3.00 02/06/1999 PV # 4.00 04/10/2002 PV +# 13.37 2011-03-25 PJV # # Author: Miquel van Smoorenburg, <miquels@drinkel.nl.mugnet.org> # Modified by: Patrick J. Volkerding, <volkerdi@slackware.com> @@ -48,11 +49,11 @@ pf::powerfail:/sbin/genpowerfail start pg::powerokwait:/sbin/genpowerfail stop # These are the standard console login getties in multiuser mode: -c1:1235:respawn:/sbin/agetty 38400 tty1 linux -c2:1235:respawn:/sbin/agetty 38400 tty2 linux -c3:1235:respawn:/sbin/agetty 38400 tty3 linux -c4:1235:respawn:/sbin/agetty 38400 tty4 linux -c5:1235:respawn:/sbin/agetty 38400 tty5 linux +c1:12345:respawn:/sbin/agetty 38400 tty1 linux +c2:12345:respawn:/sbin/agetty 38400 tty2 linux +c3:12345:respawn:/sbin/agetty 38400 tty3 linux +c4:12345:respawn:/sbin/agetty 38400 tty4 linux +c5:12345:respawn:/sbin/agetty 38400 tty5 linux c6:12345:respawn:/sbin/agetty 38400 tty6 linux # Local serial lines: @@ -63,12 +64,8 @@ c6:12345:respawn:/sbin/agetty 38400 tty6 linux #d1:12345:respawn:/sbin/agetty -mt60 38400,19200,9600,2400,1200 ttyS0 vt100 #d2:12345:respawn:/sbin/agetty -mt60 38400,19200,9600,2400,1200 ttyS1 vt100 -# Runlevel 4 used to be for an X window only system, until we discovered -# that it throws init into a loop that keeps your load avg at least 1 all -# the time. Thus, there is now one getty opened on tty6. Hopefully no one -# will notice. ;^) -# It might not be bad to have one text console anyway, in case something -# happens to X. +# Runlevel 4 also starts /etc/rc.d/rc.4 to run a display manager for X. +# Display managers are preferred in this order: gdm, kdm, xdm x1:4:respawn:/etc/rc.d/rc.4 # End of /etc/inittab diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index e49160161..ca1b4c8eb 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -98,9 +98,23 @@ if [ -x /etc/rc.d/rc.messagebus ]; then sh /etc/rc.d/rc.messagebus stop fi +# Kill any processes (typically gam) that would otherwise prevent +# unmounting NFS volumes: +unset FUSER_DELAY +for dir in $(/bin/mount | grep 'type nfs' | cut -d ' ' -f 3 ) ; do + echo "Killing processes holding NFS mount $dir open..." + # Background this to prevent fuser from also blocking shutdown: + /usr/bin/fuser -k -m $dir & + FUSER_DELAY=5 +done +# If fuser was run, let it have some delay: +if [ ! -z "$FUSER_DELAY" ]; then + sleep $FUSER_DELAY +fi + # Unmount any NFS, SMB, or CIFS filesystems: echo "Unmounting remote filesystems." -/bin/umount -v -a -r -t nfs,smbfs,cifs +/bin/umount -v -a -l -f -r -t nfs,smbfs,cifs # Try to shut down pppd: PS="$(ps ax)" @@ -186,12 +200,6 @@ echo "Turning off swap." /sbin/swapoff -a /bin/sync -# Umount any LVM volumes: -if /bin/mount | /bin/grep -q '^/dev/mapper/' ; then - echo "Unmounting LVM volumes." - /bin/umount -v $(/bin/mount | /bin/grep '^/dev/mapper/' | /bin/cut -d ' ' -f 3 | /bin/tac) -fi - echo "Unmounting local file systems." /bin/umount -v -a -t no,proc,sysfs diff --git a/source/a/sysvinit-scripts/scripts/rc.K b/source/a/sysvinit-scripts/scripts/rc.K index 68609753a..8fc63fdf8 100644 --- a/source/a/sysvinit-scripts/scripts/rc.K +++ b/source/a/sysvinit-scripts/scripts/rc.K @@ -57,9 +57,23 @@ if [ -x /etc/rc.d/rc.nfsd ]; then /etc/rc.d/rc.nfsd stop fi +# Kill any processes (typically gam) that would otherwise prevent +# unmounting NFS volumes: +unset FUSER_DELAY +for dir in $(/bin/mount | grep 'type nfs' | cut -d ' ' -f 3 ) ; do + echo "Killing processes holding NFS mount $dir open..." + # Background this to prevent fuser from also blocking shutdown: + /usr/bin/fuser -k -m $dir & + FUSER_DELAY=5 +done +# If fuser was run, let it have some delay: +if [ ! -z "$FUSER_DELAY" ]; then + sleep $FUSER_DELAY +fi + # Unmount any NFS, SMB, or CIFS filesystems: echo "Unmounting remote filesystems." -umount -a -r -t nfs,smbfs,cifs +/bin/umount -v -a -l -f -r -t nfs,smbfs,cifs # Shut down PCMCIA devices: if [ -x /etc/rc.d/rc.pcmcia ] ; then diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index ccdcb6f30..8772409ed 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -33,6 +33,17 @@ else /bin/hostname darkstar fi +# Set the permissions on /var/log/dmesg according to whether the kernel +# permits non-root users to access kernel dmesg information: +if [ -r /proc/sys/kernel/dmesg_restrict ]; then + if [ $(cat /proc/sys/kernel/dmesg_restrict) = 1 ]; then + touch /var/log/dmesg + chmod 640 /var/log/dmesg + fi +else + touch /var/log/dmesg + chmod 644 /var/log/dmesg +fi # Save the contents of 'dmesg': /bin/dmesg -s 65536 > /var/log/dmesg @@ -100,6 +111,11 @@ fi # Mount any additional filesystem types that haven't already been mounted: mount -a -v 2> /dev/null | grep -v "already mounted" +# Start the Control Script for automounter: +if [ -x /etc/rc.d/rc.autofs ]; then + sh /etc/rc.d/rc.autofs start +fi + # Start the Network Time Protocol daemon: if [ -x /etc/rc.d/rc.ntpd ]; then sh /etc/rc.d/rc.ntpd start @@ -156,6 +172,11 @@ if [ -x /etc/rc.d/rc.messagebus ]; then sh /etc/rc.d/rc.messagebus start fi +# Start console-kit-daemon: +if [ -x /etc/rc.d/rc.consolekit ]; then + sh /etc/rc.d/rc.consolekit start +fi + # Start HAL: if [ -x /etc/rc.d/rc.hald ]; then sh /etc/rc.d/rc.hald start @@ -249,9 +270,9 @@ fi # Start crond (Dillon's crond): # If you want cron to actually log activity to /var/log/cron, then change -# -l10 to -l8 to increase the logging level. +# -l notice to -l info to increase the logging level. if [ -x /usr/sbin/crond ]; then - /usr/sbin/crond -l10 >>/var/log/cron 2>&1 + /usr/sbin/crond -l notice fi # Start atd (manages jobs scheduled with 'at'): diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index 7c5c43edb..c02f1e276 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -19,6 +19,11 @@ if [ -d /sys ]; then fi fi +# Load the loop device kernel module: +if [ -x /etc/rc.d/rc.loop ]; then + . /etc/rc.d/rc.loop start +fi + # Initialize udev to manage /dev entries and hotplugging for 2.6.x kernels. # You may turn off udev by making the /etc/rc.d/rc.udev file non-executable # or giving the "nohotplug" option at boot, but in the 2.6.x+ kernels udev @@ -37,6 +42,16 @@ if grep -wq sysfs /proc/mounts && grep -q tmpfs /proc/filesystems ; then fi fi +# Mount Control Groups filesystem interface: +if grep -wq cgroup /proc/filesystems ; then + if [ -d /sys/fs/cgroup ]; then + mount -t cgroup cgroup /sys/fs/cgroup + else + mkdir -p /dev/cgroup + mount -t cgroup cgroup /dev/cgroup + fi +fi + # Initialize the Logical Volume Manager. # This won't start unless we find /etc/lvmtab (LVM1) or # /etc/lvm/backup/ (LVM2). This is created by /sbin/vgscan, so to @@ -77,7 +92,7 @@ if [ -f /etc/crypttab -a -x /sbin/cryptsetup ]; then if echo $OPTS | grep -wq ro ; then LUKSOPTS="${LUKSOPTS} --readonly" ; fi # Skip LUKS volumes that were already unlocked (in the initrd): - /sbin/cryptsetup status $LUKS 1>/dev/null 2>/dev/null && continue + /sbin/cryptsetup status $LUKS 2>/dev/null | head -n 1 | grep -q "is active" && continue if /sbin/cryptsetup isLuks $DEV 2>/dev/null ; then echo "Unlocking LUKS crypt volume '${LUKS}' on device '$DEV':" if [ -n "${PASS}" ]; then @@ -293,12 +308,10 @@ if [ ! -r /etc/fastboot ]; then /sbin/fsck $FORCEFSCK -C -R -A -a fi -# Mount usbfs: +# Mount usbfs only if it is found in /etc/fstab: if grep -wq usbfs /proc/filesystems; then if ! grep -wq usbfs /proc/mounts ; then - if ! grep -wq usbfs /etc/fstab; then - /sbin/mount -v usbfs /proc/bus/usb -t usbfs - else + if grep -wq usbfs /etc/fstab; then /sbin/mount -v /proc/bus/usb fi fi diff --git a/source/a/sysvinit-scripts/scripts/rc.loop b/source/a/sysvinit-scripts/scripts/rc.loop new file mode 100644 index 000000000..942fc5447 --- /dev/null +++ b/source/a/sysvinit-scripts/scripts/rc.loop @@ -0,0 +1,11 @@ +#!/bin/sh +# +# Load the loop device kernel module. +# + +if modinfo loop 1> /dev/null 2> /dev/null ; then + if ! lsmod | grep -wq "^loop" ; then + modprobe loop + fi +fi + diff --git a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh index 4378e208a..5ef34d4d8 100644 --- a/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh +++ b/source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh @@ -3,7 +3,7 @@ # scsi add-single-device mechanism # (c) 1998--2008 Kurt Garloff <kurt@garloff.de>, GNU GPL v2 or later # (c) 2006--2008 Hannes Reinecke, GNU GPL v2 or later -# $Id: rescan-scsi-bus.sh,v 1.29 2008/10/29 10:03:04 garloff Exp $ +# $Id: rescan-scsi-bus.sh,v 1.48 2010/08/10 19:32:22 garloff Exp $ setcolor () { @@ -20,26 +20,50 @@ unsetcolor () yellow=""; norm="" } +# Output some text and return cursor to previous position +# (only works for simple strings) +# Stores length of string in LN and returns it +print_and_scroll_back () +{ + STRG="$1" + LN=${#STRG} + BK="" + declare -i cntr=0 + while test $cntr -lt $LN; do BK="$BK\e[D"; let cntr+=1; done + echo -en "$STRG$BK" + return $LN +} + +# Overwrite a text of length $1 (fallback to $LN) with whitespace +white_out () +{ + BK=""; WH="" + if test -n "$1"; then LN=$1; fi + declare -i cntr=0 + while test $cntr -lt $LN; do BK="$BK\e[D"; WH="$WH "; let cntr+=1; done + echo -en "$WH$BK" +} + # Return hosts. sysfs must be mounted findhosts_26 () { hosts= - if ! ls /sys/class/scsi_host/host* >/dev/null 2>&1; then - echo "No SCSI host adapters found in sysfs" - exit 1; - fi for hostdir in /sys/class/scsi_host/host*; do hostno=${hostdir#/sys/class/scsi_host/host} if [ -f $hostdir/isp_name ] ; then - hostname="qla2xxx" + hostname="qla2xxx" elif [ -f $hostdir/lpfc_drvr_version ] ; then - hostname="lpfc" + hostname="lpfc" else - hostname=`cat $hostdir/proc_name` + hostname=`cat $hostdir/proc_name` fi hosts="$hosts $hostno" echo "Host adapter $hostno ($hostname) found." - done + done + if [ -z "$hosts" ] ; then + echo "No SCSI host adapters found in sysfs" + exit 1; + fi hosts=`echo $hosts | sed 's/ /\n/g' | sort -n` } @@ -65,59 +89,74 @@ findhosts () done } +printtype () +{ + local type=$1 + + case "$type" in + 0) echo "Direct-Access " ;; + 1) echo "Sequential-Access" ;; + 2) echo "Printer " ;; + 3) echo "Processor " ;; + 4) echo "WORM " ;; + 5) echo "CD-ROM " ;; + 6) echo "Scanner " ;; + 7) echo "Optical Device " ;; + 8) echo "Medium Changer " ;; + 9) echo "Communications " ;; + 10) echo "Unknown " ;; + 11) echo "Unknown " ;; + 12) echo "RAID " ;; + 13) echo "Enclosure " ;; + 14) echo "Direct-Access-RBC" ;; + *) echo "Unknown " ;; + esac +} + +print02i() +{ + if [ "$1" = "*" ] ; then + echo "00" + else + printf "%02i" "$1" + fi +} + # Get /proc/scsi/scsi info for device $host:$channel:$id:$lun # Optional parameter: Number of lines after first (default = 2), # result in SCSISTR, return code 1 means empty. procscsiscsi () { if test -z "$1"; then LN=2; else LN=$1; fi - CHANNEL=`printf "%02i" $channel` - ID=`printf "%02i" $id` - LUN=`printf "%02i" $lun` + CHANNEL=`print02i "$channel"` + ID=`print02i "$id"` + LUN=`print02i "$lun"` if [ -d /sys/class/scsi_device ]; then - SCSIPATH="/sys/class/scsi_device/${host}:${channel}:${id}:${lun}" - if [ -d "$SCSIPATH" ] ; then - SCSISTR="Host: scsi${host} Channel: $CHANNEL Id: $ID Lun: $LUN" - if [ "$LN" -gt 0 ] ; then - IVEND=$(cat ${SCSIPATH}/device/vendor) - IPROD=$(cat ${SCSIPATH}/device/model) - IPREV=$(cat ${SCSIPATH}/device/rev) - SCSIDEV=$(printf ' Vendor: %-08s Model: %-16s Rev: %-4s' "$IVEND" "$IPROD" "$IPREV") - SCSISTR="$SCSISTR + SCSIPATH="/sys/class/scsi_device/${host}:${channel}:${id}:${lun}" + if [ -d "$SCSIPATH" ] ; then + SCSISTR="Host: scsi${host} Channel: $CHANNEL Id: $ID Lun: $LUN" + if [ "$LN" -gt 0 ] ; then + IVEND=$(cat ${SCSIPATH}/device/vendor) + IPROD=$(cat ${SCSIPATH}/device/model) + IPREV=$(cat ${SCSIPATH}/device/rev) + SCSIDEV=$(printf ' Vendor: %-08s Model: %-16s Rev: %-4s' "$IVEND" "$IPROD" "$IPREV") + SCSISTR="$SCSISTR $SCSIDEV" - fi - if [ "$LN" -gt 1 ] ; then - ILVL=$(cat ${SCSIPATH}/device/scsi_level) - type=$(cat ${SCSIPATH}/device/type) - case "$type" in - 0) ITYPE="Direct-Access " ;; - 1) ITYPE="Sequential-Access" ;; - 2) ITYPE="Printer " ;; - 3) ITYPE="Processor " ;; - 4) ITYPE="WORM " ;; - 5) ITYPE="CD-ROM " ;; - 6) ITYPE="Scanner " ;; - 7) ITYPE="Optical Device " ;; - 8) ITYPE="Medium Changer " ;; - 9) ITYPE="Communications " ;; - 10) ITYPE="Unknown " ;; - 11) ITYPE="Unknown " ;; - 12) ITYPE="RAID " ;; - 13) ITYPE="Enclosure " ;; - 14) ITYPE="Direct-Access-RBC" ;; - *) ITYPE="Unknown " ;; - esac - SCSITMP=$(printf ' Type: %-16s ANSI SCSI revision: %02d' "$ITYPE" "$((ILVL - 1))") - SCSISTR="$SCSISTR + fi + if [ "$LN" -gt 1 ] ; then + ILVL=$(cat ${SCSIPATH}/device/scsi_level) + type=$(cat ${SCSIPATH}/device/type) + ITYPE=$(printtype $type) + SCSITMP=$(printf ' Type: %-16s ANSI SCSI revision: %02d' "$ITYPE" "$((ILVL - 1))") + SCSISTR="$SCSISTR $SCSITMP" - fi - - else - return 1 fi + else + return 1 + fi else - grepstr="scsi$host Channel: $CHANNEL Id: $ID Lun: $LUN" - SCSISTR=`cat /proc/scsi/scsi | grep -A$LN -e"$grepstr"` + grepstr="scsi$host Channel: $CHANNEL Id: $ID Lun: $LUN" + SCSISTR=`cat /proc/scsi/scsi | grep -A$LN -e"$grepstr"` fi if test -z "$SCSISTR"; then return 1; else return 0; fi } @@ -148,6 +187,7 @@ sgdevice24 () } # Find sg device that belongs to SCSI device $host $channel $id $lun +# and return in SGDEV sgdevice () { SGDEV= @@ -169,21 +209,38 @@ sgdevice () echo "scsi report-devs 0" >/proc/scsi/scsi fi fi -} +} # Test if SCSI device is still responding to commands testonline () { : testonline + RC=0 if test ! -x /usr/bin/sg_turs; then return 0; fi sgdevice if test -z "$SGDEV"; then return 0; fi sg_turs /dev/$SGDEV >/dev/null 2>&1 RC=$? + # Handle in progress of becoming ready and unit attention -- wait at max 11s + declare -i ctr=0 + if test $RC = 2 -o $RC = 6; then + RMB=`sg_inq /dev/$SGDEV | grep 'RMB=' | sed 's/^.*RMB=\(.\).*$/\1/'` + print_and_scroll_back "$host:$channel:$id:$lun $SGDEV ($RMB) " + fi + while test $RC = 2 -o $RC = 6 && test $ctr -le 8; do + if test $RC = 2 -a "$RMB" != "1"; then echo -n "."; let $LN+=1; sleep 1 + else usleep 20000; fi + let ctr+=1 + sg_turs /dev/$SGDEV >/dev/null 2>&1 + RC=$? + done + if test $ctr != 0; then white_out; fi # echo -e "\e[A\e[A\e[A${yellow}Test existence of $SGDEV = $RC ${norm} \n\n\n" if test $RC = 1; then return $RC; fi + # Reset RC (might be !=0 for passive paths) + RC=0 # OK, device online, compare INQUIRY string - INQ=`sg_inq $sg_len_arg /dev/$SGDEV` + INQ=`sg_inq $sg_len_arg /dev/$SGDEV 2>/dev/null` IVEND=`echo "$INQ" | grep 'Vendor identification:' | sed 's/^[^:]*: \(.*\)$/\1/'` IPROD=`echo "$INQ" | grep 'Product identification:' | sed 's/^[^:]*: \(.*\)$/\1/'` IPREV=`echo "$INQ" | grep 'Product revision level:' | sed 's/^[^:]*: \(.*\)$/\1/'` @@ -191,31 +248,33 @@ testonline () IPTYPE=`echo "$INQ" | sed -n 's/.* Device_type=\([0-9]*\) .*/\1/p'` IPQUAL=`echo "$INQ" | sed -n 's/ *PQual=\([0-9]*\) Device.*/\1/p'` if [ "$IPQUAL" != 0 ] ; then - echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nLU not available (PQual $IPQUAL)${norm}\n\n\n" - return 1 + echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}LU not available (PQual $IPQUAL)${norm} \n\n\n" + return 2 fi + TYPE=$(printtype $IPTYPE) procscsiscsi TMPSTR=`echo "$SCSISTR" | grep 'Vendor:'` if [ "$TMPSTR" != "$STR" ]; then - echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR#* } \nto: $STR ${norm}\n\n\n" + echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${SCSISTR#* } \nto: $STR ${norm} \n\n\n" return 1 fi TMPSTR=`echo "$SCSISTR" | sed -n 's/.*Type: *\(.*\) *ANSI.*/\1/p'` if [ $TMPSTR != $TYPE ] ; then - echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR} \nto: $TYPE ${norm}\n\n\n" - return 1 - fi + echo -e "\e[A\e[A\e[A\e[A${red}$SGDEV changed: ${bold}\nfrom:${TMPSTR} \nto: $TYPE ${norm} \n\n\n" + return 1 + fi return $RC } # Test if SCSI device $host $channen $id $lun exists -# Outputs description from /proc/scsi/scsi, returns SCSISTR +# Outputs description from /proc/scsi/scsi (unless arg passed) +# Returns SCSISTR (empty if no dev) testexist () { : testexist SCSISTR= - if procscsiscsi; then + if procscsiscsi && test -z "$1"; then echo "$SCSISTR" | head -n1 echo "$SCSISTR" | tail -n2 | pr -o4 -l1 fi @@ -230,6 +289,7 @@ chanlist () local tmpchan for dev in /sys/class/scsi_device/${host}:* ; do + [ -d $dev ] || continue; hcil=${dev##*/} cil=${hcil#*:} chan=${cil%%:*} @@ -242,6 +302,7 @@ chanlist () channelsearch="$channelsearch $chan" fi done + if test -z "$channelsearch"; then channelsearch="0"; fi } # Returns the list of existing targets per host @@ -254,6 +315,7 @@ idlist () local tmpid for dev in /sys/class/scsi_device/${host}:${channel}:* ; do + [ -d $dev ] || continue; hcil=${dev##*/} cil=${hcil#*:} il=${cil#*:} @@ -261,6 +323,7 @@ idlist () for tmpid in $idsearch ; do if test "$target" -eq $tmpid ; then target= + break fi done if test -n "$target" ; then @@ -269,53 +332,83 @@ idlist () done } -# Returns the list of existing LUNs -getluns () +# Returns the list of existing LUNs from device $host $channel $id $lun +# and returns list to stdout +getluns() { - if test ! -x /usr/bin/sg_luns; then return; fi sgdevice if test -z "$SGDEV"; then return; fi - sg_luns -d /dev/$SGDEV | sed -n 's/.*lun=\(.*\)/\1/p' + if test ! -x /usr/bin/sg_luns; then echo 0; return; fi + LLUN=`sg_luns -d /dev/$SGDEV 2>/dev/null` + if test $? != 0; then echo 0; return; fi + echo "$LLUN" | sed -n 's/.*lun=\(.*\)/\1/p' +} + +# Wait for udev to settle (create device nodes etc.) +udevadm_settle() +{ + if test -x /sbin/udevadm; then + print_and_scroll_back " Calling udevadm settle (can take a while) " + /sbin/udevadm settle + white_out + else + usleep 20000 + fi } -# Perform scan on a single lun +# Perform scan on a single lun $host $channel $id $lun dolunscan() { SCSISTR= devnr="$host $channel $id $lun" - echo "Scanning for device $devnr ..." + echo "Scanning for device $devnr ... " printf "${yellow}OLD: $norm" testexist + # Special case: lun 0 just got added (for reportlunscan), + # so make sure we correctly treat it as new + if test "$lun" = "0" -a "$1"; then + SCSISTR="" + printf "\r\e[A\e[A\e[A" + fi : f $remove s $SCSISTR if test "$remove" -a "$SCSISTR"; then # Device exists: Test whether it's still online # (testonline returns 1 if it's gone or has changed) testonline - if test $? = 1 -o ! -z "$forceremove"; then + RC=$? + if test $RC != 0 -o ! -z "$forceremove"; then echo -en "\r\e[A\e[A\e[A${red}REM: " echo "$SCSISTR" | head -n1 echo -e "${norm}\e[B\e[B" if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/delete - # Try reading, should fail if device is gone - echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan + if test $RC -eq 1 -o $lun -eq 0 ; then + # Try readding, should fail if device is gone + echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan + fi + # FIXME: Can we skip udevadm settle for removal? + #udevadm_settle + usleep 20000 else echo "scsi remove-single-device $devnr" > /proc/scsi/scsi - # Try reading, should fail if device is gone - echo "scsi add-single-device $devnr" > /proc/scsi/scsi + if test $RC -eq 1 -o $lun -eq 0 ; then + # Try readding, should fail if device is gone + echo "scsi add-single-device $devnr" > /proc/scsi/scsi + fi fi fi - if test $RC = 0 ; then + if test $RC = 0 -o "$forcerescan" ; then if test -e /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device; then echo 1 > /sys/class/scsi_device/${host}:${channel}:${id}:${lun}/device/rescan + udevadm_settle fi fi - - printf "\r\x1b[A\x1b[A\x1b[A${yellow}OLD: $norm" + printf "\r\e[A\e[A\e[A${yellow}OLD: $norm" testexist if test -z "$SCSISTR"; then printf "\r${red}DEL: $norm\r\n\n" let rmvd+=1; + return 1 fi fi if test -z "$SCSISTR"; then @@ -323,13 +416,14 @@ dolunscan() printf "\r${green}NEW: $norm" if test -e /sys/class/scsi_host/host${host}/scan; then echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null + udevadm_settle else echo "scsi add-single-device $devnr" > /proc/scsi/scsi fi testexist if test -z "$SCSISTR"; then # Device not present - printf "\r\x1b[A"; + printf "\r\e[A"; # Optimization: if lun==0, stop here (only if in non-remove mode) if test $lun = 0 -a -z "$remove" -a $optscan = 1; then break; @@ -340,60 +434,74 @@ dolunscan() fi } -# Perform report lun scan +# Perform report lun scan on $host $channel $id using REPORT_LUNS doreportlun() { lun=0 SCSISTR= devnr="$host $channel $id $lun" - echo "Scanning for device $devnr ..." - printf "${yellow}OLD: $norm" - testexist + echo -en "Scanning for device $devnr ...\r" + lun0added= + #printf "${yellow}OLD: $norm" + # Phase one: If LUN0 does not exist, try to add + testexist -q if test -z "$SCSISTR"; then # Device does not exist, try to add - printf "\r${green}NEW: $norm" + #printf "\r${green}NEW: $norm" if test -e /sys/class/scsi_host/host${host}/scan; then echo "$channel $id $lun" > /sys/class/scsi_host/host${host}/scan 2> /dev/null + udevadm_settle else echo "scsi add-single-device $devnr" > /proc/scsi/scsi fi - testexist - if test -z "$SCSISTR"; then + testexist -q + if test -n "$SCSISTR"; then + lun0added=1 + #testonline + else # Device not present - printf "\r\x1b[A"; - lunsearch= - return + # return + # Find alternative LUN to send getluns to + for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do + [ -d "$dev" ] || continue + lun=${dev##*:} + break + done fi fi - lunsearch=`getluns` + targetluns=`getluns` lunremove= + #echo "getluns reports " $targetluns # Check existing luns - for dev in /sys/class/scsi_device/$host\:$channel\:$id\:*; do + for dev in /sys/class/scsi_device/${host}:${channel}:${id}:*; do + [ -d "$dev" ] || continue lun=${dev##*:} newsearch= - oldsearch="$lunsearch" - for tmplun in $lunsearch; do + inlist= + # OK, is existing $lun (still) in reported list + for tmplun in $targetluns; do if test $tmplun -eq $lun ; then - # Optimization: don't scan lun 0 again - if [ $lun -ne 0 ]; then - dolunscan - fi + inlist=1 + dolunscan $lun0added else newsearch="$newsearch $tmplun" fi done - if [ "${#oldsearch}" = "${#newsearch}" ] ; then - # Stale lun - lunremove="$lunremove $lun" + # OK, we have now done a lunscan on $lun and + # $newsearch is the old $targetluns without $lun + if [ -z "$inlist" ]; then + # Stale lun + lunremove="$lunremove $lun" fi - lunsearch="$newsearch" + # $lun removed from $lunsearch (echo for whitespace cleanup) + targetluns=`echo $newsearch` done # Add new ones and check stale ones - for lun in $lunsearch $lunremove; do - dolunscan + for lun in $targetluns $lunremove; do + dolunscan $lun0added done } - + # Perform search (scan $host) dosearch () { @@ -405,7 +513,7 @@ dosearch () idlist fi for id in $idsearch; do - if test -z "$lunsearch"; then + if test -z "$lunsearch" ; then doreportlun else for lun in $lunsearch; do @@ -416,18 +524,40 @@ dosearch () done } +expandlist () +{ + list=$1 + result="" + first=${list%%,*} + rest=${list#*,} + while test ! -z "$first"; do + beg=${first%%-*}; + if test "$beg" = "$first"; then + result="$result $beg"; + else + end=${first#*-} + result="$result `seq $beg $end`" + fi + test "$rest" = "$first" && rest="" + first=${rest%%,*} + rest=${rest#*,} + done + echo $result +} + # main if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then echo "Usage: rescan-scsi-bus.sh [options] [host [host ...]]" echo "Options:" - echo " -l activates scanning for LUNs 0-7 [default: 0]" + echo " -l activates scanning for LUNs 0--7 [default: 0]" echo " -L NUM activates scanning for LUNs 0--NUM [default: 0]" - echo " -w scan for target device IDs 0 .. 15 [default: 0-7]" - echo " -c enables scanning of channels 0 1 [default: 0]" + echo " -w scan for target device IDs 0--15 [default: 0--7]" + echo " -c enables scanning of channels 0 1 [default: 0 / all detected ones]" echo " -r enables removing of devices [default: disabled]" echo " -i issue a FibreChannel LIP reset [default: disabled]" echo "--remove: same as -r" echo "--issue-lip: same as -i" + echo "--forcerescan: Rescan existing devices" echo "--forceremove: Remove and readd every device (DANGEROUS)" echo "--nooptscan: don't stop looking for LUNs is 0 is not found" echo "--color: use coloured prefixes OLD/NEW/DEL" @@ -435,6 +565,11 @@ if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then echo "--channels=LIST: Scan only channel(s) in LIST" echo "--ids=LIST: Scan only target ID(s) in LIST" echo "--luns=LIST: Scan only lun(s) in LIST" + echo "--sync/nosync: Issue a sync / no sync [default: sync if remove]" + echo "--attachpq3: Tell kernel to attach sg to LUN 0 that reports PQ=3" + echo "--reportlun2: Tell kernel to try REPORT_LUN even on SCSI2 devices" + echo "--largelun: Tell kernel to support LUNs > 7 even on SCSI2 devs" + echo "--sparselun: Tell kernel to support sparse LUN numbering" echo " Host numbers may thus be specified either directly on cmd line (deprecated) or" echo " or with the --hosts=LIST parameter (recommended)." echo "LIST: A[-B][,C[-D]]... is a comma separated list of single values and ranges" @@ -442,27 +577,6 @@ if test @$1 = @--help -o @$1 = @-h -o @$1 = @-?; then exit 0 fi -expandlist () -{ - list=$1 - result="" - first=${list%%,*} - rest=${list#*,} - while test ! -z "$first"; do - beg=${first%%-*}; - if test "$beg" = "$first"; then - result="$result $beg"; - else - end=${first#*-} - result="$result `seq $beg $end`" - fi - test "$rest" = "$first" && rest="" - first=${rest%%,*} - rest=${rest#*,} - done - echo $result -} - if test ! -d /sys/class/scsi_host/ -a ! -d /proc/scsi/; then echo "Error: SCSI subsystem not active" exit 1 @@ -471,22 +585,27 @@ fi # Make sure sg is there modprobe sg >/dev/null 2>&1 -sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) -sg_version=${sg_version##0.} -if [ "$sg_version" -lt 70 ] ; then - sg_len_arg="-36" -else - sg_len_arg="--len=36" -fi +if test -x /usr/bin/sg_inq; then + sg_version=$(sg_inq -V 2>&1 | cut -d " " -f 3) + sg_version=${sg_version##0.} + #echo "\"$sg_version\"" + if [ -z "$sg_version" -o "$sg_version" -lt 70 ] ; then + sg_len_arg="-36" + else + sg_len_arg="--len=36" + fi +fi # defaults unsetcolor -lunsearch="" -idsearch=`seq 0 7` -channelsearch="0" +lunsearch= +opt_idsearch=`seq 0 7` +opt_channelsearch= remove= forceremove= optscan=1 +sync=1 +declare -i scan_flags=0 if test -d /sys/class/scsi_host; then findhosts_26 else @@ -500,19 +619,26 @@ while test ! -z "$opt" -a -z "${opt##-*}"; do case "$opt" in l) lunsearch=`seq 0 7` ;; L) lunsearch=`seq 0 $2`; shift ;; - w) idsearch=`seq 0 15` ;; - c) channelsearch="0 1" ;; + w) opt_idsearch=`seq 0 15` ;; + c) opt_channelsearch="0 1" ;; r) remove=1 ;; i) lipreset=1 ;; -remove) remove=1 ;; + -forcerescan) remove=1; forcerescan=1 ;; -forceremove) remove=1; forceremove=1 ;; -hosts=*) arg=${opt#-hosts=}; hosts=`expandlist $arg` ;; - -channels=*) arg=${opt#-channels=};channelsearch=`expandlist $arg` ;; - -ids=*) arg=${opt#-ids=}; idsearch=`expandlist $arg` ;; + -channels=*) arg=${opt#-channels=};opt_channelsearch=`expandlist $arg` ;; + -ids=*) arg=${opt#-ids=}; opt_idsearch=`expandlist $arg` ;; -luns=*) arg=${opt#-luns=}; lunsearch=`expandlist $arg` ;; -color) setcolor ;; -nooptscan) optscan=0 ;; -issue-lip) lipreset=1 ;; + -sync) sync=2 ;; + -nosync) sync=0 ;; + -attachpq3) scan_flags=$(($scan_flags|0x1000000)) ;; + -reportlun2) scan_flags=$(($scan_flags|0x20000)) ;; + -largelun) scan_flags=$(($scan_flags|0x200)) ;; + -sparselun) scan_flags=$((scan_flags|0x40)) ;; *) echo "Unknown option -$opt !" ;; esac shift @@ -521,9 +647,26 @@ done # Hosts given ? if test "@$1" != "@"; then - hosts=$*; + hosts=$* fi +if [ -d /sys/class/scsi_host -a ! -w /sys/class/scsi_host ]; then + echo "You need to run scsi-rescan-bus.sh as root" + exit 2 +fi +if test "$sync" = 1 -a "$remove" = 1; then sync=2; fi +if test "$sync" = 2; then echo "Syncing file systems"; sync; fi +if test -w /sys/module/scsi_mod/parameters/default_dev_flags -a $scan_flags != 0; then + OLD_SCANFLAGS=`cat /sys/module/scsi_mod/parameters/default_dev_flags` + NEW_SCANFLAGS=$(($OLD_SCANFLAGS|$scan_flags)) + if test "$OLD_SCANFLAGS" != "$NEW_SCANFLAGS"; then + echo -n "Temporarily setting kernel scanning flags from " + printf "0x%08x to 0x%08x\n" $OLD_SCANFLAGS $NEW_SCANFLAGS + echo $NEW_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags + else + unset OLD_SCANFLAGS + fi +fi echo "Scanning SCSI subsystem for new devices" test -z "$remove" || echo " and remove devices that have disappeared" declare -i found=0 @@ -534,25 +677,33 @@ for host in $hosts; do # It's pointless to do a target scan on FC if test -n "$lipreset" ; then echo 1 > /sys/class/fc_host/host$host/issue_lip 2> /dev/null; - echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; fi - channelsearch="" - idsearch="" + # Always trigger a rescan for FC to update channels and targets + echo "- - -" > /sys/class/scsi_host/host$host/scan 2> /dev/null; + channelsearch= + idsearch= + udevadm_settle + else + channelsearch=$opt_channelsearch + idsearch=$opt_idsearch fi [ -n "$channelsearch" ] && echo -n "channels $channelsearch " echo -n "for " if [ -n "$idsearch" ] ; then - echo -n " SCSI target IDs " $idsearch + echo -n " SCSI target IDs " $idsearch else - echo -n " all SCSI target IDs" + echo -n " all SCSI target IDs" fi if [ -n "$lunsearch" ] ; then - echo ", LUNs " $lunsearch + echo ", LUNs " $lunsearch else - echo ", all LUNs" + echo ", all LUNs" fi - dosearch; + dosearch done +if test -n "$OLD_SCANFLAGS"; then + echo $OLD_SCANFLAGS > /sys/module/scsi_mod/parameters/default_dev_flags +fi echo "$found new device(s) found. " echo "$rmvd device(s) removed. " diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 537d8be98..c0b17ad83 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-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2011 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:-32} +BUILD=${BUILD:-43} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -34,7 +34,7 @@ mkdir -p $TMP $PKG # Install Slackware scripts and config files from $CWD/scripts/: mkdir -p $PKG/etc/rc.d -for file in rc.{4,6,K,M,S} rc.local rc.sysvinit ; do +for file in rc.{4,6,K,M,S} rc.local rc.loop rc.sysvinit ; do cp -a $CWD/scripts/$file $PKG/etc/rc.d/${file}.new chmod 755 $PKG/etc/rc.d/${file}.new chown root:root $PKG/etc/rc.d/${file}.new diff --git a/source/a/sysvinit/sysvinit.SlackBuild b/source/a/sysvinit/sysvinit.SlackBuild index 4916e695e..194ebf144 100755 --- a/source/a/sysvinit/sysvinit.SlackBuild +++ b/source/a/sysvinit/sysvinit.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 @@ -22,9 +22,18 @@ VERSION=${VERSION:-2.86} -ARCH=${ARCH:-x86_64} BUILD=${BUILD:-6} +# 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-sysvinit diff --git a/source/a/tar/tar-1.23-support_txz.diff b/source/a/tar/tar-1.2x.support_txz.diff index efd720b55..efd720b55 100644 --- a/source/a/tar/tar-1.23-support_txz.diff +++ b/source/a/tar/tar-1.2x.support_txz.diff diff --git a/source/a/tar/tar.1 b/source/a/tar/tar.1 index 1d7e02faf..8fe4f8b5a 100644 --- a/source/a/tar/tar.1 +++ b/source/a/tar/tar.1 @@ -45,6 +45,9 @@ tar \- The GNU version of the tar archiving utility .B -i, --ignore-zeros ] [ +.B -J, --xz +] +[ .B -j, --bzip2 ] [ diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild index 21484f4cc..ea608f0b3 100755 --- a/source/a/tar/tar.SlackBuild +++ b/source/a/tar/tar.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # Slackware build script for tar -VERSION=1.23 +VERSION=1.26 BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -99,8 +99,9 @@ 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.23-support_txz.diff.gz | patch -p1 --verbose || exit1 +zcat $CWD/tar-1.2x.support_txz.diff.gz | patch -p1 --verbose || exit 1 +FORCE_UNSAFE_CONFIGURE=1 \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/a/tar/tar.nolonezero.diff b/source/a/tar/tar.nolonezero.diff index 0209c692a..e1316beb3 100644 --- a/source/a/tar/tar.nolonezero.diff +++ b/source/a/tar/tar.nolonezero.diff @@ -1,22 +1,21 @@ -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 @@ +--- ./src/list.c.orig 2010-11-01 15:34:59.000000000 -0500 ++++ ./src/list.c 2010-11-08 13:42:14.000000000 -0600 +@@ -212,6 +212,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 (¤t_header, ¤t_stat_info, -@@ -147,6 +155,7 @@ + status = read_header (¤t_header, ¤t_stat_info, +@@ -221,6 +229,7 @@ WARNOPT (WARN_ALONE_ZERO_BLOCK, (0, 0, _("A lone zero block at %s"), STRINGIFY_BIGINT (current_block_ordinal (), buf))); diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild index 653964787..8cf4feb47 100755 --- a/source/a/tcsh/tcsh.SlackBuild +++ b/source/a/tcsh/tcsh.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=6.15.00 -ARCH=${ARCH:-x86_64} +VERSION=6.17.00 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-tcsh @@ -41,7 +50,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf tcsh-$VERSION -tar xjvf $CWD/tcsh-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/tcsh-$VERSION.tar.?z* || exit 1 cd tcsh-$VERSION # The LS_COLORS variable shared by tcsh has new options in recent diff --git a/source/a/time/time.SlackBuild b/source/a/time/time.SlackBuild index 108e7a8b6..f095088e1 100755 --- a/source/a/time/time.SlackBuild +++ b/source/a/time/time.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,9 +22,18 @@ VERSION=1.7 -ARCH=${ARCH:-x86_64} 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-time diff --git a/source/a/tree/tree.SlackBuild b/source/a/tree/tree.SlackBuild index d20c3c1eb..540b20472 100755 --- a/source/a/tree/tree.SlackBuild +++ b/source/a/tree/tree.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2007-2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2007-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=1.5.2.2 -ARCH=${ARCH:-x86_64} +VERSION=1.5.3 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-tree @@ -50,7 +59,7 @@ mkdir -p $PKG/usr/man/man1 cat man/tree.1 | gzip -9c > $PKG/usr/man/man1/tree.1.gz mkdir -p $PKG/usr/doc/tree-$VERSION cp -a \ - CHANGES LICENSE README \ + CHANGES LICENSE README* \ $PKG/usr/doc/tree-$VERSION ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/udev/config/rc.d/rc.udev.new index 40f38d1de..6a6218f6e 100644 --- a/source/a/udev/config/rc.d/rc.udev.new +++ b/source/a/udev/config/rc.d/rc.udev.new @@ -35,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 "27" ]; then - echo "Sorry, but you need a 2.6.27+ kernel to use udev." + if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "32" ]; then + echo "Sorry, but you need a 2.6.32+ kernel to use this udev." echo "Your kernel version is only $(uname -r)." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." @@ -48,7 +48,7 @@ case "$1" in # is not there, this will also shut off this script to prevent further # problems: if [ ! -x /sbin/udevd ]; then - chmod 644 /etc/rc.d/rc.udev + chmod 0644 /etc/rc.d/rc.udev echo "No udevd daemon found." echo "Turning off udev: chmod 644 /etc/rc.d/rc.udev" echo "FATAL: Refusing to run /etc/rc.d/rc.udev." @@ -104,29 +104,21 @@ case "$1" in ) else # udev is just now being started, so we'll do some initial setup: - # Set STARTUP=1 in the environment - /sbin/udevadm control --property=STARTUP=1 - - # 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)) MINORNUMBER=$(($DEVICENUMBER % 256)) - echo 'ACTION=="add|change", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules + echo 'ACTION!="remove", SUBSYSTEM=="block", ENV{MAJOR}=="'$MAJORNUMBER'", ENV{MINOR}=="'$MINORNUMBER'", SYMLINK+="root"' > /dev/.udev/rules.d/61-dev-root-link.rules + + # Set OPT="--action=add" to generate add events on coldplug + OPT="--action=add" fi 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) diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/udev/config/rules.d/40-slackware.rules index 29b6071e0..6883f5268 100644 --- a/source/a/udev/config/rules.d/40-slackware.rules +++ b/source/a/udev/config/rules.d/40-slackware.rules @@ -14,3 +14,6 @@ # input devices KERNEL=="mice", SYMLINK+="mouse" +# Set rfkill device writable by netdev group +KERNEL=="rfkill", GROUP:="netdev", MODE:="0664" + diff --git a/source/a/udev/config/udev.conf b/source/a/udev/config/udev.conf index b0421a08b..c8506e4b0 100644 --- a/source/a/udev/config/udev.conf +++ b/source/a/udev/config/udev.conf @@ -9,6 +9,6 @@ udev_root="/dev/" # udev_log - The initial syslog(3) priority: "err", "info", "debug" or # its numerical equivalent. For runtime debugging, the daemons -# internal state can be changed with: udevcontrol log_priority=<value> +# internal state can be changed with: udevadm control log_priority=<value> udev_log="err" diff --git a/source/a/udev/doinst.sh b/source/a/udev/doinst.sh index 5e737ca0c..5b7f5f902 100644 --- a/source/a/udev/doinst.sh +++ b/source/a/udev/doinst.sh @@ -37,3 +37,5 @@ config etc/modprobe.d/isapnp.conf.new config etc/modprobe.d/psmouse.conf.new config etc/modprobe.d/usb-controller.conf.new +/sbin/udevadm info --convert-db 1>/dev/null 2>/dev/null + diff --git a/source/a/udev/rule_generator.diff b/source/a/udev/rule_generator.diff index f3f67516d..212c09f17 100644 --- a/source/a/udev/rule_generator.diff +++ b/source/a/udev/rule_generator.diff @@ -1,17 +1,17 @@ -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 +diff -Nur udev-159.orig//extras/rule_generator/write_cd_rules udev-159/extras/rule_generator/write_cd_rules +--- udev-159.orig//extras/rule_generator/write_cd_rules 2010-06-25 04:37:36.000000000 -0500 ++++ udev-159/extras/rule_generator/write_cd_rules 2010-07-07 02:44:14.501947041 -0500 @@ -3,7 +3,8 @@ # This script is run if an optical drive lacks a rule for persistent naming. # # It adds symlinks for optical drives based on the device class determined -# by cdrom_id and used ID_PATH to identify the device. -+# by cdrom_id and used ID_PATH or ID_SERIAL or ID_MODEL and ID_REVISION -+# to identify the device. - # ++# by cdrom_id and uses ID_PATH or ID_SERIAL or ID_MODEL and ID_REVISION to ++# identify the device. + # (C) 2006 Marco d'Itri <md@Linux.IT> # -@@ -96,18 +97,57 @@ +@@ -105,18 +106,57 @@ choose_rules_file link_num=$(find_next_available 'cdrom[0-9]*') diff --git a/source/a/udev/udev.SlackBuild b/source/a/udev/udev.SlackBuild index e891fca35..c6f83a0e4 100755 --- a/source/a/udev/udev.SlackBuild +++ b/source/a/udev/udev.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -58,6 +58,14 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# So this is a major bug. At least, it triggers one in the kernel. +# We'll revert it for now. If left in place, machines using ATA +# (especially PATA) are liable to randomly crash on reboot. +# The last little bit of this patch fails to reverse but it won't matter. +if [ $VERSION = 165 ]; then + zcat $CWD/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch.gz | patch -p1 -R +fi + # Fixup the rule generator for our use zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1 @@ -73,7 +81,7 @@ zcat $CWD/rule_generator.diff.gz | patch -p1 || exit 1 --disable-introspection \ --mandir=/usr/man \ --docdir=/usr/doc/udev-$VERSION \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -106,6 +114,8 @@ find $PKG/etc -type d -exec chmod 755 {} \; chmod 0755 $PKG/etc/rc.d/rc.udev.new # Add extra device nodes to the package that udev doesn't make: +# As of 156, some of these aren't be needed any more: +# removed core@ fd@ stderr@ stdin@ stdout@ tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG # Add various helper scripts: @@ -113,18 +123,15 @@ for file in $CWD/config/scripts/* ; do cp -a $file $PKG/lib/udev/ done chown -R root:root $PKG/lib/udev -chmod 755 $PKG/lib/udev/* +chmod 0755 $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* README* TODO \ + COPYING* README* TODO extras/keymap/README.keymap.txt \ $PKG/usr/doc/udev-$VERSION # Don't package the API docs: diff --git a/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch new file mode 100644 index 000000000..fc991b9af --- /dev/null +++ b/source/a/udev/udev.git-560de575148b7efda3b34a7f7073abd483c5f08e.patch @@ -0,0 +1,305 @@ +From 560de575148b7efda3b34a7f7073abd483c5f08e Mon Sep 17 00:00:00 2001 +From: David Zeuthen <davidz@redhat.com> +Date: Thu, 4 Nov 2010 08:55:58 -0400 +Subject: [PATCH 1/1] Use ata_id, not scsi_id, on ATAPI devices + +The major benefit here, is that we get the ATAPI device serial +number. With SCSI ID we didn't get this since it's not part of the +SCSI INQUIRY command. Specifically this means that we get symlinks to +empty optical drives, e.g. + + /dev/disk/by-id/ata-VBOX_CD-ROM_VB2-01700376 + +which we didn't get earlier. So this is a major win. + +Also make ata_id work on CD-ROM devices when using /dev/bsg nodes so +this works on both the scsi_device as well as the block device. We do +this, basically, by issuing the ATA IDENTIFY PACKET DEVICE command +instead of the ATA IDENTIFY command. We also use 16-byte pass-through +ATA passthrough instead of 12-byte passthrough to avoid clashing with +the MMC BLANK command. + +This means that we get this output + + # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 + P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 + E: UDEV_LOG=3 + E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 + E: DEVTYPE=scsi_device + E: DRIVER=sr + E: MODALIAS=scsi:t-0x05 + E: SUBSYSTEM=scsi + E: ID_ATA=1 + E: ID_TYPE=cd + E: ID_BUS=ata + E: ID_MODEL=VBOX_CD-ROM + E: ID_MODEL_ENC=VBOX\x20CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x 20\x20\x20\x20\x20\x20\x20 + E: ID_REVISION=1.0 + E: ID_SERIAL=VBOX_CD-ROM_VB2-01700376 + E: ID_SERIAL_SHORT=VB2-01700376 + +instead of just + + # udevadm info -q all -p /sys/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 + P: /devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 + E: UDEV_LOG=3 + E: DEVPATH=/devices/pci0000:00/0000:00:01.1/host3/target3:0:0/3:0:0:0 + E: DEVTYPE=scsi_device + E: DRIVER=sr + E: MODALIAS=scsi:t-0x05 + E: SUBSYSTEM=scsi + E: ID_SCSI=1 + E: ID_VENDOR=VBOX + E: ID_VENDOR_ENC=VBOX\x20\x20\x20\x20 + E: ID_MODEL=CD-ROM + E: ID_MODEL_ENC=CD-ROM\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20 + E: ID_REVISION=1.0 + E: ID_TYPE=cd + +Signed-off-by: David Zeuthen <davidz@redhat.com> +--- + extras/ata_id/ata_id.c | 122 ++++++++++++++++++++++++++--- + rules/rules.d/60-persistent-storage.rules | 4 + + 2 files changed, 114 insertions(+), 12 deletions(-) + +diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c +index 41544e9..92387e5 100644 +--- a/extras/ata_id/ata_id.c ++++ b/extras/ata_id/ata_id.c +@@ -202,6 +202,89 @@ static int disk_identify_command(int fd, + return ret; + } + ++static int disk_identify_packet_device_command(int fd, ++ void *buf, ++ size_t buf_len) ++{ ++ struct sg_io_v4 io_v4; ++ uint8_t cdb[16]; ++ uint8_t sense[32]; ++ uint8_t *desc = sense+8; ++ int ret; ++ ++ /* ++ * ATA Pass-Through 16 byte command, as described in ++ * ++ * T10 04-262r8 ATA Command Pass-Through ++ * ++ * from http://www.t10.org/ftp/t10/document.04/04-262r8.pdf ++ */ ++ memset(cdb, 0, sizeof(cdb)); ++ cdb[0] = 0x85; /* OPERATION CODE: 16 byte pass through */ ++ cdb[1] = 4 << 1; /* PROTOCOL: PIO Data-in */ ++ cdb[2] = 0x2e; /* OFF_LINE=0, CK_COND=1, T_DIR=1, BYT_BLOK=1, T_LENGTH=2 */ ++ cdb[3] = 0; /* FEATURES */ ++ cdb[4] = 0; /* FEATURES */ ++ cdb[5] = 0; /* SECTORS */ ++ cdb[6] = 1; /* SECTORS */ ++ cdb[7] = 0; /* LBA LOW */ ++ cdb[8] = 0; /* LBA LOW */ ++ cdb[9] = 0; /* LBA MID */ ++ cdb[10] = 0; /* LBA MID */ ++ cdb[11] = 0; /* LBA HIGH */ ++ cdb[12] = 0; /* LBA HIGH */ ++ cdb[13] = 0; /* DEVICE */ ++ cdb[14] = 0xA1; /* Command: ATA IDENTIFY PACKET DEVICE */; ++ cdb[15] = 0; /* CONTROL */ ++ memset(sense, 0, sizeof(sense)); ++ ++ memset(&io_v4, 0, sizeof(struct sg_io_v4)); ++ io_v4.guard = 'Q'; ++ io_v4.protocol = BSG_PROTOCOL_SCSI; ++ io_v4.subprotocol = BSG_SUB_PROTOCOL_SCSI_CMD; ++ io_v4.request_len = sizeof (cdb); ++ io_v4.request = (uintptr_t) cdb; ++ io_v4.max_response_len = sizeof (sense); ++ io_v4.response = (uintptr_t) sense; ++ io_v4.din_xfer_len = buf_len; ++ io_v4.din_xferp = (uintptr_t) buf; ++ io_v4.timeout = COMMAND_TIMEOUT_MSEC; ++ ++ ret = ioctl(fd, SG_IO, &io_v4); ++ if (ret != 0) { ++ /* could be that the driver doesn't do version 4, try version 3 */ ++ if (errno == EINVAL) { ++ struct sg_io_hdr io_hdr; ++ ++ memset(&io_hdr, 0, sizeof(struct sg_io_hdr)); ++ io_hdr.interface_id = 'S'; ++ io_hdr.cmdp = (unsigned char*) cdb; ++ io_hdr.cmd_len = sizeof (cdb); ++ io_hdr.dxferp = buf; ++ io_hdr.dxfer_len = buf_len; ++ io_hdr.sbp = sense; ++ io_hdr.mx_sb_len = sizeof (sense); ++ io_hdr.dxfer_direction = SG_DXFER_FROM_DEV; ++ io_hdr.timeout = COMMAND_TIMEOUT_MSEC; ++ ++ ret = ioctl(fd, SG_IO, &io_hdr); ++ if (ret != 0) ++ goto out; ++ } else { ++ goto out; ++ } ++ } ++ ++ if (!(sense[0] == 0x72 && desc[0] == 0x9 && desc[1] == 0x0c)) { ++ errno = EIO; ++ ret = -1; ++ goto out; ++ } ++ ++ out: ++ return ret; ++} ++ + /** + * disk_identify_get_string: + * @identify: A block of IDENTIFY data +@@ -256,31 +339,36 @@ static void disk_identify_fixup_uint16 (uint8_t identify[512], unsigned int offs + * @udev: The libudev context. + * @fd: File descriptor for the block device. + * @out_identify: Return location for IDENTIFY data. ++ * @out_is_packet_device: Return location for whether returned data is from a IDENTIFY PACKET DEVICE. + * +- * Sends the IDENTIFY DEVICE command to the device represented by +- * @fd. If successful, then the result will be copied into +- * @out_identify. ++ * Sends the IDENTIFY DEVICE or IDENTIFY PACKET DEVICE command to the ++ * device represented by @fd. If successful, then the result will be ++ * copied into @out_identify and @out_is_packet_device. + * + * This routine is based on code from libatasmart, Copyright 2008 + * Lennart Poettering, LGPL v2.1. + * +- * Returns: 0 if the IDENTIFY data was successfully obtained, +- * otherwise non-zero with errno set. ++ * Returns: 0 if the data was successfully obtained, otherwise ++ * non-zero with errno set. + */ + static int disk_identify (struct udev *udev, + int fd, +- uint8_t out_identify[512]) ++ uint8_t out_identify[512], ++ int *out_is_packet_device) + { + int ret; + uint8_t inquiry_buf[36]; + int peripheral_device_type; + int all_nul_bytes; + int n; ++ int is_packet_device; + + assert (out_identify != NULL); ++ + /* init results */ + ret = -1; + memset (out_identify, '\0', 512); ++ is_packet_device = 0; + + /* If we were to use ATA PASS_THROUGH (12) on an ATAPI device + * we could accidentally blank media. This is because MMC's BLANK +@@ -309,6 +397,12 @@ static int disk_identify (struct udev *udev, + + /* SPC-4, section 6.4.2: Standard INQUIRY data */ + peripheral_device_type = inquiry_buf[0] & 0x1f; ++ if (peripheral_device_type == 0x05) ++ { ++ is_packet_device = 1; ++ ret = disk_identify_packet_device_command(fd, out_identify, 512); ++ goto check_nul_bytes; ++ } + if (peripheral_device_type != 0x00) { + ret = -1; + errno = EIO; +@@ -320,6 +414,7 @@ static int disk_identify (struct udev *udev, + if (ret != 0) + goto out; + ++ check_nul_bytes: + /* Check if IDENTIFY data is all NUL bytes - if so, bail */ + all_nul_bytes = 1; + for (n = 0; n < 512; n++) { +@@ -336,6 +431,8 @@ static int disk_identify (struct udev *udev, + } + + out: ++ if (out_is_packet_device != NULL) ++ *out_is_packet_device = is_packet_device; + return ret; + } + +@@ -350,7 +447,7 @@ int main(int argc, char *argv[]) + { + struct udev *udev; + struct hd_driveid id; +- uint8_t identify[512]; ++ uint8_t identify[512]; + char model[41]; + char model_enc[256]; + char serial[21]; +@@ -358,8 +455,9 @@ int main(int argc, char *argv[]) + const char *node = NULL; + int export = 0; + int fd; +- uint16_t word; ++ uint16_t word; + int rc = 0; ++ int is_packet_device = 0; + static const struct option options[] = { + { "export", no_argument, NULL, 'x' }, + { "help", no_argument, NULL, 'h' }, +@@ -408,7 +506,7 @@ int main(int argc, char *argv[]) + goto exit; + } + +- if (disk_identify(udev, fd, identify) == 0) { ++ if (disk_identify(udev, fd, identify, &is_packet_device) == 0) { + /* + * fix up only the fields from the IDENTIFY data that we are going to + * use and copy it into the hd_driveid struct for convenience +@@ -416,7 +514,7 @@ int main(int argc, char *argv[]) + disk_identify_fixup_string (identify, 10, 20); /* serial */ + disk_identify_fixup_string (identify, 23, 6); /* fwrev */ + disk_identify_fixup_string (identify, 27, 40); /* model */ +- disk_identify_fixup_uint16 (identify, 0); /* configuration */ ++ disk_identify_fixup_uint16 (identify, 0); /* configuration */ + disk_identify_fixup_uint16 (identify, 75); /* queue depth */ + disk_identify_fixup_uint16 (identify, 75); /* SATA capabilities */ + disk_identify_fixup_uint16 (identify, 82); /* command set supported */ +@@ -457,8 +555,8 @@ int main(int argc, char *argv[]) + udev_util_replace_chars(revision, NULL); + + if (export) { +- /* Set this to convey the disk speaks the ATA protocol */ +- printf("ID_ATA=1\n"); ++ /* Set this to convey the disk speaks the ATA protocol */ ++ printf("ID_ATA=1\n"); + + if ((id.config >> 8) & 0x80) { + /* This is an ATAPI device */ +diff --git a/rules/rules.d/60-persistent-storage.rules b/rules/rules.d/60-persistent-storage.rules +index d3f2f73..8baabc2 100644 +--- a/rules/rules.d/60-persistent-storage.rules ++++ b/rules/rules.d/60-persistent-storage.rules +@@ -12,6 +12,8 @@ ACTION=="remove", GOTO="persistent_storage_end" + + # run scsi_id and ata_id on the actual SCSI device + SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{vendor}=="ATA", IMPORT{program}="ata_id --export $root/bsg/$kernel" ++# ATA/ATAPI devices is of type 0x05 and vendor is usually not ATA ++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", ATTR{type}=="5", IMPORT{program}="ata_id --export $root/bsg/$kernel" + SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --whitelisted --export --device $root/bsg/$kernel" + + # from this point on, only care about block devices +@@ -40,6 +42,8 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="ata", IMPORT{program}="ata_id --export $tempnode" + # ATA devices using the "scsi" subsystem + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{vendor}=="ATA", IMPORT{program}="ata_id --export $tempnode" ++# ATA/ATAPI devices using the "scsi" subsystem ++KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}=="5", IMPORT{program}="ata_id --export $tempnode" + # scsi devices + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="scsi" + KERNEL=="cciss*", ENV{DEVTYPE}=="disk", ENV{ID_SERIAL}!="?*", IMPORT{program}="scsi_id --export --whitelisted -d $tempnode", ENV{ID_BUS}="cciss" +-- +1.7.3.4 + diff --git a/source/a/unarj/unarj.SlackBuild b/source/a/unarj/unarj.SlackBuild index 56097eb2c..2444052e6 100755 --- a/source/a/unarj/unarj.SlackBuild +++ b/source/a/unarj/unarj.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,9 +22,18 @@ VERSION=265 -ARCH=${ARCH:-x86_64} 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-unarj diff --git a/source/a/usb_modeswitch/device_reference.txt b/source/a/usb_modeswitch/device_reference.txt new file mode 100644 index 000000000..10fb5fe85 --- /dev/null +++ b/source/a/usb_modeswitch/device_reference.txt @@ -0,0 +1,2102 @@ +# +# Device and Configuration Reference (UTF-8 encoding used) +# +# Last modified: 2010-08-26 +# +# Collection of configurations for usb_modeswitch, a mode switching +# tool for controlling flip flop (multiple mode) USB devices +# +# Detailed instructions and a friendly forum on the homepage: +# http://www.draisberghof.de/usb_modeswitch +# +# You may want to check for a newer version of this file at: +# http://www.draisberghof.de/usb_modeswitch/device_reference.txt + + +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # +# +# Important! This file is just a reference! Use the data package! +# +# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + + +# In order to activate a device included here you might remove the +# comment signs (";") from the respective entry. +# +# It is rather recommended to copy device information to a different +# file, to ease editing work and oversight and to avoid possible +# conflicts by activating multiple entries. +# There is no guarantee that this file is error-free! +# +# The actual entries are further down, after the command reference. + + +# For custom settings: +# Numbers can be decimal or hexadecimal, MessageStrings MUST be +# hexadecimal without prepended "0x". Digits 9-16 in the known +# MessageStrings are arbitrary; I set them to "12345678" + +# What it all means (short command line flags appended): +# +# +# * DefaultVendor -v <hex number> +# * DefaultProduct -p <hex number> +# +# This is the ID the USB device shows after having been plugged in. +# The program needs this; if not found -> no action. +# +# +# * TargetVendor -V <hex number> +# * TargetProduct -P <hex number> +# +# These are the IDs of the USB device after successful mode switching. +# They are optional, but I recommend to provide them for better analysis. +# You definitely need them if you enable CheckSuccess (see below) +# +# +# * TargetProductList (file only) <comma separated hex strings> +# +# Like TargetProduct, but more than one possibility. Only used in automated +# config files (in /etc/usb_modeswitch.d). +# +# +# * TargetClass -C <hex number> +# +# Some weird devices don't change IDs. They only switch the device class. +# If the device has the target class -> no action (and vice versa) +# +# +# * MessageEndpoint -m <hex number> +# +# A kind of address inside the interface to which the "message" +# (the sequence that does the actual switching) is directed. +# Starting from version 0.9.7 the MessageEndpoint is autodetected +# if not given +# +# +# * MessageContent -M <hex string> +# +# A hex string containing the "message" sequence; it will be +# sent as a USB bulk transfer +# +# +# * MessageContent2, ...3 -2/-3 <hex string> +# +# Additional "messages". Use with "NeedResponse"! +# +# +# * ReleaseDelay -w <milliseconds> +# +# Waiting time after message transfers. Helps with some sensitive devices +# +# +# * ResponseEndpoint -r <hex number> +# * NeedResponse <0/1> -n +# +# Some devices were reported to require receiving the response of the +# bulk transfer to do the switching properly. Usually not needed. +# Starting from version 1.0.0 the ResponseEndpoint is autodetected +# if not given +# +# +# * DetachStorageOnly <0/1> -d +# +# Some devices just need to be detached from the usb-storage +# driver to initiate the mode switching. Using this feature +# instead of removing the whole usbstorage module keeps other +# storage devices working. +# +# +# * HuaweiMode <0/1> -H +# +# Some Huawei devices can be switched by a special control +# message. +# +# +# * SierraMode <0/1> -S +# +# Some Sierra devices can be switched by a special control +# message. +# +# +# * SonyMode <0/1> -O +# +# Some Sony-Ericsson devices can be switched by a special control +# message. This is experimental and might not have a stable result +# +# * KobilMode <0/1> -T +# +# Some Kobil devices can be switched by a special control +# message. +# +# +# * ResetUSB <0/1> -R +# +# Some devices need a rougher treatment. If the switching seems +# to do something (run udevmonitor), but your system does not reflect +# it, try this somewhat brutal method to do a reset after switching. +# Mind that if your device switched OK before, this will probably set +# it back to storage mode ... +# +# +# * Interface -i <hex number> +# * Configuration -u <hex number> +# * AltSetting -a <hex number> +# +# More USB parameter to help with tricky devices and for doing lots +# of cruel experiments ... +# +## Note: +## AltSetting/Configuration changes and ResetUSB are executed after all +## other steps and can be combined or used on their own (e.g. a reset +## might have the same effect as a manual replug) +# +# +# * InquireDevice <0|1> -I (disables inquiry) +# +# The standard since 1.0.0 is to do a SCSI inquiry on the default device +# before other actions. This might be a future way to identify a device +# without ambiguities. If it causes trouble with your device, just disable. +# +# +# * CheckSuccess -s <number> +# +# Check continuously if the switch succeeded for max <number> seconds. +# First, an interface access test: most devices vanish after +# switching and can't be accessed anymore. +# Second, a recount of target devices: one more than at the initial +# count, at the same bus with a higher device number -> device +# switched fine. +# It's safe to give a higher value than needed; checking stops as +# soon as the target device is found +# +# +# * NoDriverLoading <0|1> (no command line parameter) +# +# The binary tells the wrapper script NOT to check for and initiate +# binding of the serial driver after switching. +# Mostly useful for non-modem devices +# +# +# -> All other entries are just ignored <- + +# Additional command line flags: +# +# Verbose output -W +# No output at all -q +# Other config file -c <file> + +# For filling in all this information for an unknown device, +# see instructions and links on the homepage: +# http://www.draisberghof.de/usb_modeswitch +# +# If you find working codes and configurations, please contribute +# them! + + +####################################################### +# Option GlobeSurfer Icon (aka "Vodafone EasyBox") +# +# The message SHOULD be the same for all Option devices + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x0af0 +;TargetProduct= 0x6600 + +;MessageContent="55534243123456780000000000000601000000000000000000000000000000" + + +####################################################### +# Option GlobeSurfer Icon 7.2 +# +# Contributor: The Pharscape Forum + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x0af0 +;TargetProduct= 0x6901 + +;MessageContent="55534243123456780000000000000601000000000000000000000000000000" + + +######################################################## +# Option GlobeTrotter GT MAX 3.6 (aka "T-Mobile Web'n'walk Card Compact II") +# +# Contributor: Bernd Holzmüller + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x0af0 +;TargetProduct= 0x6600 + +;MessageContent="55534243123456780000000000000601000000000000000000000000000000" + +# ResponseEndpoint=0x84 + +;NeedResponse=1 + + +######################################################## +# Option GlobeTrotter GT MAX "7.2 Ready" +# +# Contributors: Lucas Benedicic, Morgwai Kotarbinski + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x0af0 +;TargetProduct= 0x6701 + +;MessageContent="55534243123456780000000000000601000000000000000000000000000000" + + +######################################################## +# Option GlobeTrotter EXPRESS 7.2 (aka "T-Mobile wnw Express II") +# +# Contributor: Fridtjof Busse + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x0af0 +;TargetProduct= 0x6701 + +;MessageContent="55534243123456780000000000000601000000000000000000000000000000" + +# Response reading needed according to one (1) report +;NeedResponse=1 + + +####################################################### +# Option GlobeSurfer Icon 7.2, new firmware (HSO driver) +# +# Vendor/ProductID don't change when switching, only the device +# class does. Most new Option devices work with this. Just adapt IDs! +# HSO driver support is available at Pharscape (www.pharscape.org) +# +# Contributor: Paul Hardwick + +;DefaultVendor= 0x0af0 +;DefaultProduct= 0x6911 + +;TargetClass= 0xff + +;MessageContent="55534243123456780000000000000601000000000000000000000000000000" + + +######################################################## +# Option iCON 210 +# PROLiNK PHS100 (various looks) +# Hyundai Mobile MB-810 +# +# One report of switching with DetachStorageOnly. Needs at least +# a second to settle before binding to usbserial +# +# Contributor: wahlm, Peter Kraker, Pakdhetimin Sekum + +;DefaultVendor= 0x1e0e +;DefaultProduct= 0xf000 + +;TargetVendor= 0x1e0e +;TargetProduct= 0x9000 + +;MessageContent="555342431234567800000000000006bd000000020000000000000000000000" + +;NeedResponse=1 + + +####################################################### +# Option iCON 225 HSDPA +# +# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org) +# +# Contributor: Matti Viljanen + +;DefaultVendor= 0x0af0 +;DefaultProduct= 0x6971 + +;TargetClass= 0xff + +;MessageContent="555342431223456780100000080000601000000000000000000000000000000" + + +####################################################### +# Option GlobeTrotter HSUPA Modem (aka "T-Mobile Web'n'walk Card Compact III') +# +# New Firmware. HSO driver support is available at Pharscape (www.pharscape.org) +# +# Contributor: Gerold Gruber + +;DefaultVendor= 0x0af0 +;DefaultProduct= 0x7011 + +;TargetClass= 0xff + +;MessageContent="55534243785634120100000080000601000000000000000000000000000000" + + +###################################################### +# Option iCON 401 +# +# HSO driver +# +# Contributor: Vincent Teoh + +;DefaultVendor= 0x0af0 +;DefaultProduct= 0x7401 + +;TargetClass= 0xff + +;MessageContent="55534243785634120100000080000601000000000000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Vodafone K3760 (made by Option, HSO driver) +# +# Contributor: The Solutor + +;DefaultVendor= 0x0af0 +;DefaultProduct= 0x7501 + +;TargetClass= 0xff + +;MessageContent="55534243785634120100000080000601000000000000000000000000000000" + + +######################################################## +# AT&T USBConnect Quicksilver (made by Option, HSO driver) +# +# Contributor: sissie from Bullteam + +;DefaultVendor= 0x0af0 +;DefaultProduct= 0xd033 + +;TargetClass= 0xff + +;MessageContent="55534243785634120100000080000601000000000000000000000000000000" + + +######################################################## +# Huawei devices +# +# Contributor: Hans Kurent, Denis Sutter, Vincent Teoh + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1003 + +;TargetClass= 0xff + +;HuaweiMode=1 + + +######################################################## +# Huawei E169 +# +# Contributor: Dale Lane + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1001 + +;TargetClass= 0xff + +# choose one of these: +;DetachStorageOnly=1 +;HuaweiMode=1 + + +######################################################## +# Huawei E180 +# +# Contributor: Tom Dawahare + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1414 + +;TargetClass= 0xff + +;HuaweiMode=1 + + +######################################################## +# Huawei E630 +# +# There seem to be modem-only variants around - no storage, +# no switching +# +# Contributor: Joakim Wenrgren + +;DefaultVendor= 0x1033 +;DefaultProduct= 0x0035 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x1003 + +;HuaweiMode=1 + + +######################################################## +# ZTE MF620 (aka "Onda MH600HS") +# +# Probably works with DetachStorageOnly too +# +# Contributor: Flávio Moringa and others + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProductList="0001" + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE MF622 (aka "Onda MDC502HS"), MF100 and others +# +# Contributor: andylog + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0002 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE MF628 +# +# Captured with "usbmon". Has a micro SD slot which can be +# activated alternatively +# +# Contributor: Alvaro Lopes <alvieboy at alvie dot com> + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + + +# To modem mode: + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0015 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + +# To SD slot mode: + +;TargetVendor= 0x05c6 +;TargetProduct= 0x2001 + +;MessageContent="55534243123456782000000080000a86010101180101010101000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE MF622 (aka "Onda MDC502HS") +# ZTE MF626 +# ZTE MF628+ (tested version from Telia / Sweden) +# ZTE MF633 +# ZTE MF636 (aka "Telstra / BigPond 7.2 Mobile Card") +# ZTE MF637 +# +# Contributor: Joakim Wennergren and others + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0031 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE MF638 (aka "Onda MDC525UP") +# +# Contributor: andylog + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0037 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE AC8710 +# ZTE AC2726 +# and others +# +# Many new ZTE devices use this sequence. There are +# several ID combinations; check your default +# +# Contributor: Michael Khurtsiya, Amit Pundir and others + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0xfff5 + +;TargetVendor= 0x19d2 +;TargetProduct= 0xffff + +# No. 2 + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0xfff6 + +;TargetVendor= 0x19d2 +;TargetProduct= 0xfff1 + +# No. 3 + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0xfff5 + +;TargetVendor= 0x19d2 +;TargetProduct= 0xfff1 + +;MessageContent="5553424312345678c00000008000069f030000000000000000000000000000" + + +######################################################## +# ZTE AC2710 (EVDO) +# +# Contributor: Wasim Baig + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0xfff5 + +;TargetVendor= 0x19d2 +;TargetProduct= 0xffff + +;MessageContent="5553424312345678c00000008000069f010000000000000000000000000000" + +# Just for information: try it with the message from the AC8710 ... + + +######################################################## +# ZTE 6535-Z +# +# Contributor: David Taillandier + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0052 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ONDA MT503HS +# +# Contributor: Lucio Asnaghi a.k.a. kRAkEn/gORe + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0002 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ONDA MT505UP (most likely a ZTE model) +# +# Contributor: Alex Scortegagna + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0002 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Novatel Wireless Ovation MC950D HSUPA +# Novatel Wireless Merlin XU950D +# Novatel Wireless Ovation 930D +# +# Contributor: Razvan Dragomirescu, Mike Kirk + +;DefaultVendor= 0x1410 +;DefaultProduct= 0x5010 + +;TargetVendor= 0x1410 +;TargetProduct= 0x4400 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +;NeedResponse=1 + + +######################################################## +# Novatel U727 USB modem +# +# Modem only versions (no switching required) are around. +# +# Contributor: Chris Thielen + +;DefaultVendor= 0x1410 +;DefaultProduct= 0x5010 + +;TargetVendor= 0x1410 +;TargetProduct= 0x4100 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +;NeedResponse=1 + + +######################################################## +# Novatel MC990D +# +# Contributor: Joakim Wennergren + +;DefaultVendor= 0x1410 +;DefaultProduct= 0x5020 + +;Interface= 5 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +;NeedResponse=1 + + +######################################################## +# Novatel U760 USB modem +# +# Contributor: Richard Laager + +;DefaultVendor= 0x1410 +;DefaultProduct= 0x5030 + +;TargetVendor= 0x1410 +;TargetProduct= 0x6000 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +;NeedResponse=1 + + +######################################################## +# Alcatel One Touch X020 (aka OT-X020, aka MBD-100HU, aka Nuton 3.5G), works with Emobile D11LC +# Alcatel One Touch X030 (aka OT-X030, aka Nuton NT36HD) +# +# Contributor: Aleksandar Samardzic, Marcelo Fernandez + +;DefaultVendor= 0x1c9e +;DefaultProduct= 0x1001 + +;TargetVendor= 0x1c9e +;TargetProduct= 0x6061 + +;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" + + +######################################################## +# Alcatel X200/X060S + +;DefaultVendor= 0x1bbb +;DefaultProduct= 0xf000 + +;TargetVendor= 0x1bbb +;TargetProduct= 0x0000 + +;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# AnyDATA ADU-500A, ADU-510A, ADU-510L, ADU-520A +# +# This ID gets an "Option" treatment by newer kernels. +# Use module option "option_zero_cd=2" with usb-storage. +# A kernel patch to fix the problem is pending +# +# Contributor: Vladimir Poluektov, Gabriel Smolar + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x16d5 +;TargetProduct= 0x6502 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +;NeedResponse=1 + + +######################################################## +# BandLuxe C120 +# +# Reportedly needs several switch calls in a certain order. See +# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=71 +# This might be a case to try the new ResetUSB function +# +# Contributor: Alexander Czigler + +;DefaultVendor= 0x1a8d +;DefaultProduct= 0x1000 + +;TargetVendor= 0x1a8d +;TargetProduct= 0x1002 + +;MessageContent="55534243123456781200000080000603000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Solomon S3Gm-660 +# +# Same notes apply as with the BandLuxe C120 above +# +# Contributor: Alexander Czigler + +;DefaultVendor= 0x1dd6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x1dd6 +;TargetProduct= 0x1002 + +;MessageContent="55534243123456781200000080000603000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# C-motech D-50 (aka "CDU-680") +# +# Interesting notes about the device in the forum post at +# http://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=69 +# +# Contributor: Alexander Czigler + +;DefaultVendor= 0x16d8 +;DefaultProduct= 0x6803 + +;TargetVendor= 0x16d8 +;TargetProduct= 0x680a + +;MessageContent="555342431234567824000000800008ff524445564348470000000000000000" + + +######################################################## +# C-motech CGU-628 (aka "Franklin Wireless CGU-628A" aka "4G Systems XS Stick W12") +# +# Contributor: Mathias Picker + +;DefaultVendor= 0x16d8 +;DefaultProduct= 0xf000 + +;TargetVendor= 0x16d8 +;TargetProduct= 0x6006 + +;MessageContent="55534243d85dd88524000000800008ff524445564348470000000000000000" + + +######################################################## +# Toshiba G450 +# +# Contributor: Mijail Anton + +;DefaultVendor= 0x0930 +;DefaultProduct= 0x0d46 + +;TargetVendor= 0x0930 +;TargetProduct= 0x0d45 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# UTStarcom UM175 (distributor "Alltel") +# +# Contributor: Mark A. Ziesemer + +;DefaultVendor= 0x106c +;DefaultProduct= 0x3b03 + +;TargetVendor= 0x106c +;TargetProduct= 0x3715 + +;MessageContent="555342431234567824000000800008ff024445564348470000000000000000" + + +######################################################## +# Hummer DTM5731 +# +# Contributor: "paul" + +;DefaultVendor= 0x1ab7 +;DefaultProduct= 0x5700 + +;TargetVendor= 0x1ab7 +;TargetProduct= 0x5731 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# A-Link 3GU +# +# Contributor: A-Link Europe Ltd. + +;DefaultVendor= 0x1e0e +;DefaultProduct= 0xf000 + +;TargetVendor= 0x1e0e +;TargetProduct= 0x9200 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Sierra Wireless Compass 597 +# +# Contributor: Vincent Teoh + +;DefaultVendor= 0x1199 +;DefaultProduct= 0x0fff + +;TargetVendor= 0x1199 +;TargetProduct= 0x0023 + +;SierraMode=1 + + +######################################################## +# Sierra Wireless AirCard 881U (most likely 880U too) +# +# Contributor: Vincent Teoh + +;DefaultVendor= 0x1199 +;DefaultProduct= 0x0fff + +;TargetVendor= 0x1199 +;TargetProduct= 0x6856 + +;SierraMode=1 + + +######################################################## +# Sony Ericsson MD400 +# +# Special procedure, takes around 25 secs. on the whole + +;DefaultVendor= 0x0fce +;DefaultProduct= 0xd0e1 + +;TargetClass= 0x02 + +;SonyMode=1 +;Configuration=2 + + +######################################################## +# LG LDU-1900D EV-DO (Rev. A) +# +# Recommended init command: ATE0V1&D2&C1S0=0 +# +# Contributor: Jérôme Oufella + +;DefaultVendor= 0x1004 +;DefaultProduct= 0x1000 + +;MessageContent="55534243123456780000000000000aff554d53434847000000000000000000" + + +######################################################## +# Samsung SGH-Z810 USB (with microSD card) +# +# This ID gets a wrong "Option" treatment by newer kernels +# from 2.6.29 to 2.6.31 +# Use module option "option_zero_cd=2" with usb-storage. +# Problem fixed in 2.6.32 +# +# Contributor: A Friend + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x04e8 +;TargetProduct= 0x6601 + +;MessageContent="55534243123456780000000000000616000000000000000000000000000000" + + +######################################################## +# MobiData MBD-200HU +# +# Contributor: Stefan Olejnik + +;DefaultVendor= 0x1c9e +;DefaultProduct= 0xf000 + +;TargetVendor= 0x1c9e +;TargetProduct= 0x9000 + +;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# ST Mobile Connect HSUPA USB Modem +# +# Use /dev/ttyUSB2 for connecting +# +# Contributor: Vincent Teoh + +;DefaultVendor= 0x1c9e +;DefaultProduct= 0xf000 + +;TargetVendor= 0x1c9e +;TargetProduct= 0x9063 + +;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# MyWave SW006 Sport Phone/Modem Combination +# +# Has a card reader too, working fine +# +# Contributor: Aaron Guidazzi + +;DefaultVendor= 0x1c9e +;DefaultProduct= 0x9200 + +;TargetVendor= 0x1c9e +;TargetProduct= 0x9202 + +;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" + + +######################################################## +# Cricket A600 +# +# Switches to ACM device. Might need a ResetUSB after switching - or not +# +# Contributor: Jeffrey Hoogland + +;DefaultVendor= 0x1f28 +;DefaultProduct= 0x0021 + +;TargetVendor= 0x1f28 +;TargetProduct= 0x0020 + +;MessageContent="555342431234567824000000800108df200000000000000000000000000000" + +# Afterwards (optional): "usb_modeswitch -v 0x1f28 -p 0x0020 -R" + + +######################################################## +# EpiValley SEC-7089 (featured by Alegro and Starcomms / iZAP) +# +# Contributor: Chris Wright + +;DefaultVendor= 0x1b7d +;DefaultProduct= 0x0700 + +;TargetVendor= 0x1b7d +;TargetProduct= 0x0001 + +;MessageContent="555342431234567824000000800008FF05B112AEE102000000000000000000" + + +######################################################## +# Samsung U209 +# +# Has a modem and a storage device after switching +# +# Contributor: Arif Ahmed + +;DefaultVendor= 0x04e8 +;DefaultProduct= 0xf000 + +;TargetVendor= 0x04e8 +;TargetProduct= 0x6601 + +;MessageContent="55534243123456780000000000000616000000000000000000000000000000" + + +######################################################## +# Huawei E270+ (HSPA+ modem) +# Huawei E1762 +# Huawei E1820 +# +# Contributor: Paranoid Paranoia + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1446 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x14ac + +;MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################################## +# Huawei E1550 +# Huawei E1750 +# +# Contributor: Anders Blomdell, Ahmed Soliman + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1446 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x1001 + +;MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################################## +# ZTE K3520-Z +# +# Contributor: Paul McDermott + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0055 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# MobiData MBD-200HU (aka 4G XS Stick W10/W14, aka Micromax MMX 300G, +# aka ChinaBird CBCPL68) +# +# Contributor: Chris + +;DefaultVendor= 0x1c9e +;DefaultProduct= 0xf000 + +;TargetVendor= 0x1c9e +;TargetProduct= 0x9603 + +;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# D-Link DWM-162-U5, Micromax MMX 300c +# +# Contributor: Zhang Le + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x2001 + +;TargetVendor= 0x1e0e +;TargetProductList="ce16,cefe" + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Novatel MC760 3G +# +# Contributor: Matt Roberds + +;DefaultVendor= 0x1410 +;DefaultProduct= 0x5031 + +;TargetVendor= 0x1410 +;TargetProduct= 0x6002 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE MF110 (Variant) +# +# Contributor: Moritz Grosse-Wentrup + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x0053 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0031 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" + +;NeedResponse=1 + + +######################################################## +# Philips TalkTalk (NXP Semiconductors "Dragonfly") +# + +;DefaultVendor= 0x0471 +;DefaultProduct= 0x1237 + +;TargetVendor= 0x0471 +;TargetProduct= 0x1234 + +;MessageContent="5553424312345678000000000000061b000000030000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# HuaXing E600 (NXP Semiconductors "Dragonfly") +# +# Contributor: Emfox Zhou + +;DefaultVendor= 0x0471 +;DefaultProduct= 0x1237 + +;TargetVendor= 0x0471 +;TargetProduct= 0x1206 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + +;Configuration=2 + + +######################################################## +# ZTE K3565 +# + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0063 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Motorola 802.11 bg WLAN (TER/GUSB3-E) +# +# Contributor: Prashad Prashant + +;DefaultVendor= 0x148f +;DefaultProduct= 0x2578 + +;TargetVendor= 0x148f +;TargetProduct= 0x9021 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Huawei E1612 +# +# Contributor: Genar Codina + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1446 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x1406 + +;MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################################## +# Huawei E1690 +# Huawei E1692 +# Huawei E1762 +# +# Contributor: Carolin Latze and others + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1446 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x140c + +;MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################################## +# C-motech CHU-629S +# + +;DefaultVendor= 0x16d8 +;DefaultProduct= 0x700a + +;TargetClass=0xff + +;MessageContent="55534243123456782400000080000dfe524445564348473d4e444953000000" + + +######################################################## +# Sagem F@ST 9520-35-GLR +# +# Contributor: Yaroslav Levandovskiy + +;DefaultVendor= 0x1076 +;DefaultProduct= 0x7f40 + +;TargetVendor= 0x1076 +;TargetProduct= 0x7f00 + +;GCTMode=1 + + +######################################################## +# Nokia CS-15 +# +# Contributor: Antti Turunen + +;DefaultVendor= 0x0421 +;DefaultProduct= 0x0610 + +;TargetVendor= 0x0421 +;TargetProduct= 0x0612 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Huawei K3765 +# +# Contributor: Felix Schwarz + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1520 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x1465 + +;MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################################## +# Huawei K4505 +# +# Contributor: Nikolaos Koutsianas + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x1521 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x1464 + +;MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################### +# Vodafone MD950 (Wisue Technology) +# +# Contributor: Bob Williams + +;DefaultVendor= 0x0471 +;DefaultProduct= 0x1210 + +# The report said that giving the target IDs prevented +# the device from switching. Got to try it out ... + +#TargetVendor= 0x1dbc +#TargetProduct= 0x0005 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Siptune LM-75 ("LinuxModem") +# +# Contributor: Antti Turunen + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0xf000 + +;TargetVendor= 0x05c6 +;TargetProduct= 0x9000 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# Zydas ZD1211RW WLAN USB, Sphairon HomeLink 1202 (Variant 1) +# +# WLAN devices from Linux kernel + +;DefaultVendor= 0x0ace +;DefaultProduct= 0x2011 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Zydas ZD1211RW WLAN USB, Sphairon HomeLink 1202 (Variant 2) +# +# WLAN devices from Linux kernel + +;DefaultVendor= 0x0ace +;DefaultProduct= 0x20ff + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Vertex Wireless 100 Series +# +# Contributor: Reinis Danne + +;DefaultVendor= 0x05c6 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x1fe7 +;TargetProduct= 0x0100 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# AVM Fritz!Wlan USB Stick N +# + +;DefaultVendor= 0x057c +;DefaultProduct= 0x84ff + +;TargetVendor= 0x057c +;TargetProduct= 0x8401 + +;MessageContent="5553424312345678000000000000061b000000ff0000000000000000000000" + + +######################################################## +# InfoCert Business Key (SmartCard/Reader emulation) +# +# Contributor: Bicio + +;DefaultVendor= 0x072f +;DefaultProduct= 0x100d + +;TargetVendor= 0x072f +;TargetProduct= 0x90cc + +;MessageContent="01b0000000000000000000000000000000000000000000000000000000000000" + + +######################################################## +# UTStarcom UM185E (distributor "Alltel") +# +# Contributor: Jason Smith + +;DefaultVendor= 0x106c +;DefaultProduct= 0x3b06 + +;TargetVendor= 0x106c +;TargetProduct= 0x3717 + +;MessageContent="555342431234567824000000800008ff020000000000000000000000000000 + + +######################################################## +# ZTE AC581 +# +# Contributor: Alberto Maurizi + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x0026 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0094 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Huawei U7510 / U7517 +# +# Contributor: Isaac Salgado + +;DefaultVendor= 0x12d1 +;DefaultProduct= 0x101e + +;TargetClass=0xff + +;MessageContent="55534243123456780600000080000601000000000000000000000000000000" + + +######################################################## +# Beceem BCSM250 +# +# Contributor: Alexander Gordeev + +;DefaultVendor= 0x198f +;DefaultProduct=0xbccd + +;TargetVendor= 0x198f +;TargetProduct= 0x0220 + +MessageContent="555342431234567824000000800006bc626563240000000000000000000000" + + +######################################################## +# LG HDM-2100 (EVDO Rev.A USB modem) +# +# Contributor: Jérôme Oufella + +;DefaultVendor= 0x1004 +;DefaultProduct=0x607f + +;TargetVendor= 0x1004 +;TargetProduct= 0x6114 + +;MessageContent="1201100102000040041014610000010200018006000100001200" + + +######################################################## +# Kyocera W06K CDMA modem +# +# Contributor: Ying-Hung Lo + +;DefaultVendor= 0x0482 +;DefaultProduct=0x024d + +;Configuration=2 + + +######################################################## +# Digicom 8E4455 +# +# Contributor: Alberto Ciampini + +;DefaultVendor= 0x1266 +;DefaultProduct=0x1000 + +;TargetVendor= 0x1266 +;TargetProduct= 0x1009 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Sony Ericsson MD300 +# +# Contributor: Betavine Project + +;DefaultVendor= 0x0fce +;DefaultProduct=0xd0cf + +;TargetClass=0x02 + +;DetachStorageOnly=1 +;Configuration=3 + + +######################################################## +# Vodafone (ZTE) K3805-Z +# +# Contributor: Betavine Project +# +# Note: +# This device has multiple USB profiles. Depending upon how it is flipped +# from storage mode to modem mode determines its final PID and the packages +# shown on its ISO CD image. + +DefaultVendor= 0x19d2 +DefaultProduct=0x1001 + +TargetVendor= 0x19d2 +TargetProduct= 0x1003 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +NeedResponse=1 + + +######################################################## +# Franklin Wireless U210 +# +# Contributor: Adam J. Porter + +;DefaultVendor= 0x1fac +;DefaultProduct=0x0130 + +;TargetVendor= 0x1fac +;TargetProduct= 0x0131 + +;CheckSuccess=20 + +;MessageContent="555342431234567824000000800108df200000000000000000000000000000" + + +######################################################## +# Alcatel X220L, X215S +# +# Contributor: John Watt + +;DefaultVendor= 0x1bbb +;DefaultProduct= 0xf000 + +;TargetVendor= 0x1bbb +;TargetProduct= 0x0017 + +;MessageContent="55534243123456788000000080000606f50402527000000000000000000000" + + +######################################################## +# ZTE MF112 +# +# Contributors: Akos Ladanyi, John Talbut + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x0103 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0031 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" +;MessageContent2="55534243876543212000000080000c85010101180101010101000000000000" + +;NeedResponse=1 + + +######################################################## +# Olivetti Olicard 100 and others +# +# Contributor: Nils Radtke + +;DefaultVendor= 0x0b3c +;DefaultProduct= 0xc700 + +;TargetVendor= 0x0b3c +;TargetProductList="c000,c001,c002" + +;MessageContent="5553424312345678000000000000061b000000030000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE MF110 (Variant) +# +# Contributor: uusrlnx + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x0083 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0124 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# ZTE MU351 + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x0003 + +;TargetClass=0xff + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# LG L-05A + +;DefaultVendor= 0x1004 +;DefaultProduct= 0x613a + +;TargetVendor= 0x1004 +;TargetProduct= 0x6124 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# LG LUU-2100TI (aka AT&T USBConnect Turbo) +# +# Contributor: Chris Jager + +;DefaultVendor= 0x1004 +;DefaultProduct= 0x613f + +;TargetVendor= 0x1004 +;TargetProduct= 0x6141 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# LG KP500 Cookie Phone - UNTESTED! Please report! +# +# Contributor: Oliver Mattos + +;DefaultVendor= 0x1004 +;DefaultProduct=0x607f + +;TargetVendor= 0x1004 +;TargetProduct= 0x6000 + +;MessageContent="555342431234567803000000800006f1022000000000000000000000000000" +;MessageContent2="555342438765432103000000800006f1010100000000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Royaltek Q110 - UNCONFIRMED! + +;DefaultVendor= 0x1266 +;DefaultProduct= 0x1000 + +;TargetVendor= 0x1266 +;TargetProduct= 0x1009 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424387654321000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# Rogers Rocket Stick (a Sony Ericsson device) + +;DefaultVendor= 0x0fce +;DefaultProduct= 0xd103 + +;TargetClass= 0x02 + +;SonyMode=1 + + +######################################################## +# BandRich BandLuxe C170, BandLuxe C270 + +;DefaultVendor= 0x1a8d +;DefaultProduct=0x1000 + +;TargetVendor= 0x1a8d +;TargetProduct= 0x1009 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" +;ReleaseDelay=4000 + +;NeedResponse=1 + + +######################################################## +# Vodafone (Huawei) K4605 +# +# Contributor: Betavine Project + +DefaultVendor= 0x12d1 +DefaultProduct=0x14c1 + +TargetVendor= 0x12d1 +TargetProduct= 0x14c6 + +CheckSuccess=20 + +MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################################## +# Huawei R201 +# +# Contributor: Betavine Project + +DefaultVendor= 0x12d1 +DefaultProduct=0x1523 + +TargetVendor= 0x12d1 +TargetProduct= 0x1491 + +CheckSuccess=20 + +MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +######################################################## +# Atheros Wireless / Netgear WNDA3200 +# +# Contributor: Sujith Manoharan (Atheros) + +DefaultVendor= 0x0cf3 +DefaultProduct=0x20ff + +TargetVendor= 0x0cf3 +TargetProduct= 0x7010 + +CheckSuccess=10 +NoDriverLoading=1 + +MessageContent="5553424329000000000000000000061b000000020000000000000000000000" +NeedResponse=1 + + +######################################################## +# Onda MW833UP +# +# Contributor: Riccardo Sepe aka zeroidle + +DefaultVendor= 0x1ee8 +DefaultProduct=0x0013 + +TargetVendor= 0x1ee8 +TargetProduct= 0x0012 + +CheckSuccess=20 + +MessageContent="555342431234567800000000000010ff000000000000000000000000000000" +ResponseNeeded=1 + + +######################################################## +# Huawei U8110 / Joy, Vodafone 845 (Android smartphone) +# +# Contributor: David Erosa GarcÃa + +DefaultVendor= 0x12d1 +DefaultProduct=0x1031 + +TargetVendor= 0x12d1 +TargetProduct= 0x1035 + +CheckSuccess=20 + +MessageContent="55534243123456780600000080010a11060000000000000000000000000000" + +# for Android SDK +NoDriverLoading=1 + + +######################################################## +# Nokia CS-10 +# +# Contributor: WacÅ‚aw Sierek + +DefaultVendor= 0x0421 +DefaultProduct=0x060c + +TargetVendor= 0x0421 +TargetProduct= 0x060e + +CheckSuccess=20 + +MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +######################################################## +# ZTE WCDMA Stick from BNSL +# +# Contributor: Anoop John + +;DefaultVendor= 0x19d2 +;DefaultProduct= 0x2000 + +;TargetVendor= 0x19d2 +;TargetProduct= 0x0108 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NeedResponse=1 + + +######################################################## +# BSNL Capitel + +;DefaultVendor= 0x1c9e +;DefaultProduct= 0x9e00 + +;TargetClass=0xff + +;MessageContent="55534243123456780000000000000606f50402527000000000000000000000" + + +####################################################### +# Samsung GT-B3730 +# +# Contributor: Per Øyvind Karlsen + +;DefaultVendor= 0x04e8 +;DefaultProduct=0x689a + +;TargetVendor= 0x04e8 +;TargetProduct= 0x6889 + +;MessageContent="55534243785634120100000080000601000000000000000000000000000000" + +####################################################### +# Kobil mIdentity 3G (1) +# +# Contributor: Filip Aben + +DefaultVendor= 0x0d46 +DefaultProduct=0x45a1 + +TargetVendor= 0x0d46 +TargetProduct= 0x45a9 + +KobilMode=1 + + +####################################################### +# Kobil mIdentity 3G (2) +# +# Contributor: Filip Aben + +DefaultVendor= 0x0d46 +DefaultProduct=0x45a5 + +TargetVendor= 0x0d46 +TargetProduct= 0x45ad + +KobilMode=1 + + +######################################################## +# Onda MW833UP +# +# Contributor: Enrico Mioso + +;DefaultVendor= 0x1ee8 +;DefaultProduct=0x0009 + +;TargetVendor= 0x1ee8 +;TargetProduct= 0x000b + +;MessageContent="555342431234567800000000000010ff000000000000000000000000000000" +;NeedResponse=1 + + +######################################################## +# Olivetti Olicard 145 +# +# Contributor: Pierre-Andre Cornillon + +;DefaultVendor= 0x0b3c +;DefaultProduct=0xf000 + +;TargetVendor= 0x0b3c +;TargetProduct= 0xc003 + +;MessageContent="5553424312345678c000000080010606f50402527000000000000000000000" +;NeedResponse=1 + + +####################################################### +# Huawei EC168C (from Zantel) +# +# Contributor: Ã…smund Hjulstad + +;DefaultVendor= 0x12d1 +;DefaultProduct=0x1446 + +;TargetVendor= 0x12d1 +;TargetProduct= 0x1412 + +;MessageContent="55534243123456780000000000000011060000000000000000000000000000" + + +####################################################### +# Nokia CS-17 +# +# Contributor: Juho Frits + +;DefaultVendor= 0x0421 +;DefaultProduct=0x0622 + +;TargetVendor= 0x0421 +;TargetProduct= 0x0623 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Nokia CS-18 +# +# Contributor: Thomas Behan + +;DefaultVendor= 0x0421 +;DefaultProduct=0x0627 + +;TargetVendor= 0x0421 +;TargetProduct= 0x0612 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Qtronix EVDO 3G Modem (for TianYi) +# +# Contributor: Alexey Charkov + +;DefaultVendor= 0x05c7 +;DefaultProduct=0x1000 + +;TargetVendor= 0x05c7 +;TargetProduct= 0x6000 + +;MessageContent="5553424312345678c00000008000069f140000000000000000000000000000" + + +####################################################### +# GW D301 (Advinne AMC) +# + +;DefaultVendor= 0x0fd1 +;DefaultProduct=0x1000 + +;TargetClass=0xff + +;Configuration=3 + + +####################################################### +# LG AD600 +# +# Contributor: Shawn J. Goff + +;DefaultVendor= 0x1004 +;DefaultProduct=0x6190 + +;TargetVendor= 0x1004 +;TargetProduct= 0x61a7 + +;MessageContent="5553424312345678000000000000061b000000020000000000000000000000" + + +####################################################### +# Pantech / UTStarcom UMW190 (Verizon) +# +# Contributor: Noel J. Bergman, Gus Esquivel + +;DefaultVendor= 0x106c +;DefaultProduct=0x3b05 + +;TargetVendor= 0x106c +;TargetProduct= 0x3716 + +;MessageContent="555342431234567824000000800008ff020000000000000000000000000000" + + +####################################################### +# AirPlus MCD-800 +# + +;DefaultVendor= 0x1edf +;DefaultProduct=0x6003 + +;TargetClass=0xff + +;Configuration=3 + + +####################################################### +# Linktop LW272/LW273 (BSNL Teracom) +# +# Contributor: Amit Mendapara + +;DefaultVendor= 0x230d +;DefaultProduct=0x0001 + +;TargetClass=0xff + +;Configuration=3 + + +######################################################## +# MediaTek Wimax USB Card +# + +;DefaultVendor= 0x0e8d +;DefaultProduct=0x7109 + +;TargetVendor= 0x0e8d +;TargetProduct= 0x7118 + +;MessageContent="5553424312345678000000000000061e000000000000000000000000000000" +;MessageContent2="5553424312345679000000000000061b000000020000000000000000000000" + +;NoDriverLoading=1 + + +######################################################## +# C-motech CHU-628S + +;DefaultVendor= 0x16d8 +;DefaultProduct=0x6281 + +;TargetClass=0xff + +;MessageContent="555342431234567824000000800008ff524445564348470000000000000000" + diff --git a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild index f4e6569ef..67b2070ab 100755 --- a/source/a/usb_modeswitch/usb_modeswitch.SlackBuild +++ b/source/a/usb_modeswitch/usb_modeswitch.SlackBuild @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=usb_modeswitch -VERSION=${VERSION:-1.1.2} -DATAVER=${DATAVER:-20100418} +VERSION=${VERSION:-1.1.6} +DATAVER=${DATAVER:-20101222} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -83,6 +83,8 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ COPYING* README* \ $PKG/usr/doc/$PKGNAM-$VERSION +# http://www.draisberghof.de/usb_modeswitch/device_reference.txt.gz +cat $CWD/device_reference.txt.gz > $PKG/usr/doc/$PKGNAM-$VERSION/device_reference.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: diff --git a/source/a/usbutils/usbutils-002.tar.bz2.sign b/source/a/usbutils/usbutils-002.tar.bz2.sign new file mode 100644 index 000000000..9d96e9bef --- /dev/null +++ b/source/a/usbutils/usbutils-002.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBNgpmUyGugalF9Dw4RAkkCAJ9AOpNKjFebxdbPfj3LYK+roL7UaACgiKtR +7L3j4M7iAo15yh6B4WP6uCI= +=fb1T +-----END PGP SIGNATURE----- diff --git a/source/a/usbutils/usbutils.SlackBuild b/source/a/usbutils/usbutils.SlackBuild index 7263b8647..163b53783 100755 --- a/source/a/usbutils/usbutils.SlackBuild +++ b/source/a/usbutils/usbutils.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-$(echo usbutils-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo usbutils-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -58,7 +58,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf usbutils-$VERSION -tar xvf $CWD/usbutils-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/usbutils-$VERSION.tar.bz2 || exit 1 cd usbutils-$VERSION || exit 1 chown -R root:root . diff --git a/source/a/utempter/utempter.SlackBuild b/source/a/utempter/utempter.SlackBuild index 7d0d24b75..5d6f054f0 100755 --- a/source/a/utempter/utempter.SlackBuild +++ b/source/a/utempter/utempter.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=1.1.4 -ARCH=${ARCH:-x86_64} +VERSION=1.1.5 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 diff --git a/source/a/util-linux-ng/slack-desc b/source/a/util-linux-ng/slack-desc deleted file mode 100644 index e149d7b84..000000000 --- a/source/a/util-linux-ng/slack-desc +++ /dev/null @@ -1,19 +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------------------------------------------------| -util-linux-ng: util-linux-ng (a huge collection of essential utilities) -util-linux-ng: -util-linux-ng: The util-linux package is a huge collection of random utilities -util-linux-ng: that are essential to run a Linux system. This is a fork of -util-linux-ng: the original util-linux, based on version 2.13-pre7. -util-linux-ng: -util-linux-ng: http://kernel.org/~kzak/util-linux-ng/ -util-linux-ng: -util-linux-ng: -util-linux-ng: -util-linux-ng: diff --git a/source/a/util-linux-ng/adjtimex_1.23-1.diff b/source/a/util-linux/adjtimex_1.23-1.diff index 8c250157e..8c250157e 100644 --- a/source/a/util-linux-ng/adjtimex_1.23-1.diff +++ b/source/a/util-linux/adjtimex_1.23-1.diff diff --git a/source/a/util-linux-ng/doinst.sh b/source/a/util-linux/doinst.sh index 678c228f1..678c228f1 100644 --- a/source/a/util-linux-ng/doinst.sh +++ b/source/a/util-linux/doinst.sh diff --git a/source/a/util-linux-ng/net-tools.diff b/source/a/util-linux/net-tools.diff index a19af2026..a19af2026 100644 --- a/source/a/util-linux-ng/net-tools.diff +++ b/source/a/util-linux/net-tools.diff diff --git a/source/a/util-linux-ng/net-tools_1.60-19.diff b/source/a/util-linux/net-tools_1.60-19.diff index f754f02d5..f754f02d5 100644 --- a/source/a/util-linux-ng/net-tools_1.60-19.diff +++ b/source/a/util-linux/net-tools_1.60-19.diff diff --git a/source/a/util-linux-ng/scsi_ioctl.h b/source/a/util-linux/scsi_ioctl.h index edb952538..edb952538 100644 --- a/source/a/util-linux-ng/scsi_ioctl.h +++ b/source/a/util-linux/scsi_ioctl.h diff --git a/source/a/util-linux-ng/setserial-rc.serial.diff b/source/a/util-linux/setserial-rc.serial.diff index 248d253bd..248d253bd 100644 --- a/source/a/util-linux-ng/setserial-rc.serial.diff +++ b/source/a/util-linux/setserial-rc.serial.diff diff --git a/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff b/source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff index 97f078437..97f078437 100644 --- a/source/a/util-linux-ng/setserial-undef_TIOCGHAYESESP.diff +++ b/source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff diff --git a/source/a/util-linux/slack-desc b/source/a/util-linux/slack-desc new file mode 100644 index 000000000..efa70e344 --- /dev/null +++ b/source/a/util-linux/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------------------------------------------------| +util-linux: util-linux (a huge collection of essential utilities) +util-linux: +util-linux: The util-linux package is a huge collection of random utilities +util-linux: that are essential to run a Linux system. +util-linux: +util-linux: http://kernel.org/~kzak/util-linux/ +util-linux: +util-linux: +util-linux: +util-linux: +util-linux: diff --git a/source/a/util-linux-ng/util-linux-ng.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 386487aba..424199144 100755 --- a/source/a/util-linux-ng/util-linux-ng.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Slackware build script for util-linux-ng +# Slackware build script for util-linux -VERSION=${VERSION:-$(echo util-linux-ng*.tar.?z* | cut -d - -f 4 | rev | cut -f 3- -d . | rev)} +VERSION=${VERSION:-$(echo util-linux*.tar.?z* | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} ADJTIMEXVERS=1.23 @@ -55,14 +55,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-util-linux-ng +PKG=$TMP/package-util-linux 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.xz || exit 1 -cd util-linux-ng-$VERSION || exit 1 +rm -rf util-linux-$VERSION +tar xvf $CWD/util-linux-$VERSION.tar.xz || exit 1 +cd util-linux-$VERSION || exit 1 chown -R root.root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -85,7 +85,7 @@ find . \ # Changing the fdisk -l output (this was done prior to util-linux-ng) broke # our installation scripts, so we have changed the name of partition type # 83 back to "Linux swap": -zcat $CWD/util-linux-ng.fdisk-no-solaris.diff.gz | patch -p1 || exit 1 +zcat $CWD/util-linux.fdisk-no-solaris.diff.gz | patch -p1 || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -95,15 +95,15 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - --docdir=/usr/doc/util-linux-ng-$VERSION \ + --docdir=/usr/doc/util-linux-$VERSION \ --disable-static \ --enable-arch \ --enable-agetty \ --disable-init \ --enable-kill \ - --enable-rdev \ --disable-last \ --enable-mesg \ + --enable-partx \ --enable-raw \ --enable-rename \ --enable-reset \ @@ -113,6 +113,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-write \ --enable-use-tty-group \ --enable-libblkid \ + --enable-libmount \ --enable-libuuid \ --disable-uuidd \ --build=$ARCH-slackware-linux \ @@ -121,14 +122,16 @@ CFLAGS="$SLKCFLAGS" \ make || exit 1 make install DESTDIR=$PKG || make install DESTDIR=$PKG -# Move the libblkid and libuuid libraries to /lib${LIBSUFFIX} +# Move the libblkid, libmount, and libuuid libraries to /lib${LIBSUFFIX} mkdir -p $PKG/lib${LIBDIRSUFFIX} ( cd $PKG/usr/lib${LIBDIRSUFFIX} mv libblkid.so.1* $PKG/lib${LIBDIRSUFFIX} + mv libmount.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 + rm -f libblkid.so libmount.so libuuid.so + ln -sf ../../lib${LIBDIRSUFFIX}/libblkid.so.1 libblkid.so + ln -sf ../../lib${LIBDIRSUFFIX}/libmount.so.1 libmount.so + ln -sf ../../lib${LIBDIRSUFFIX}/libuuid.so.1 libuuid.so ) # Moving things around that have been in the same place @@ -145,11 +148,6 @@ if [ -r $PKG/usr/sbin/fdformat ]; then ) fi -# Install (probably obsolete) rdev manually: -cat ./sys-utils/rdev > $PKG/sbin/rdev -chown root:root $PKG/sbin/rdev -chmod 755 $PKG/sbin/rdev - # Build ziptool cd $TMP || exit 1 rm -rf ziptool-$ZIPTOOLVERS @@ -251,7 +249,7 @@ cat setserial.8 | gzip -9c > $PKG/usr/man/man8/setserial.8.gz ln -s ../../bin/setterm . ) -cd $TMP/util-linux-ng-$VERSION # Go back home :) +cd $TMP/util-linux-$VERSION # Go back home :) # Now let's add some important symlinks :) ( cd $PKG/sbin @@ -296,15 +294,15 @@ fi rm $PKG/usr/info/dir gzip -9 $PKG/usr/info/* -mkdir -p $PKG/usr/doc/util-linux-ng-$VERSION +mkdir -p $PKG/usr/doc/util-linux-$VERSION cp -a AUTHORS COPYING DEPRECATED NEWS README* TODO \ docs/v${VERSION}-ReleaseNotes \ - $PKG/usr/doc/util-linux-ng-$VERSION + $PKG/usr/doc/util-linux-$VERSION mkdir $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/util-linux-ng-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/util-linux-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff b/source/a/util-linux/util-linux.fdisk-no-solaris.diff index a3aa100e9..a3aa100e9 100644 --- a/source/a/util-linux-ng/util-linux-ng.fdisk-no-solaris.diff +++ b/source/a/util-linux/util-linux.fdisk-no-solaris.diff diff --git a/source/a/util-linux-ng/ziptool-fix_build.patch b/source/a/util-linux/ziptool-fix_build.patch index a2d3d5157..a2d3d5157 100644 --- a/source/a/util-linux-ng/ziptool-fix_build.patch +++ b/source/a/util-linux/ziptool-fix_build.patch diff --git a/source/a/which/which.SlackBuild b/source/a/which/which.SlackBuild index f86fd1da8..08ae4616c 100755 --- a/source/a/which/which.SlackBuild +++ b/source/a/which/which.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,9 +22,18 @@ VERSION=2.20 -ARCH=${ARCH:-x86_64} 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-which diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild index cf832cfb9..27af8245e 100755 --- a/source/a/xfsprogs/xfsprogs.SlackBuild +++ b/source/a/xfsprogs/xfsprogs.SlackBuild @@ -90,6 +90,7 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DIST_ROOT=$PKG make install-dev DIST_ROOT=$PKG +make install-qa DIST_ROOT=$PKG mv $PKG/usr/share/doc $PKG/usr mv $PKG/usr/doc/xfsprogs $PKG/usr/doc/xfsprogs-$VERSION diff --git a/source/a/xz/xz.SlackBuild b/source/a/xz/xz.SlackBuild index 205a12ef6..dd996f489 100755 --- a/source/a/xz/xz.SlackBuild +++ b/source/a/xz/xz.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Permission to use, copy, modify, and distribute this software for @@ -21,8 +21,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. -PRGNAM=xz -VERSION=${VERSION:-4.999.9beta} +PKGNAM=xz +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -57,21 +57,23 @@ case "$ARCH" in armel) SLKCFLAGS="-O2 -march=armv4t" LIBDIRSUFFIX="" ;; - + *) SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ;; esac CWD=$(pwd) # Temporary build location. This should *NOT* be a directory # path a non-root user could create later... TMP=${TMP:-/xz-tmp-$(mcookie)} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -133,15 +135,22 @@ if [ -d $PKG/usr/man ]; then ) fi -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* ChangeLog INSTALL NEWS README* THANKS doc/* \ - $PKG/usr/doc/$PRGNAM-$VERSION -find $PKG/usr/doc -type f -exec chmod 644 {} \; + ABOUT-NLS AUTHORS COPYING* INSTALL* NEWS PACKAGERS README* THANKS \ + $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}.tgz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz diff --git a/source/a/zoo/zoo.SlackBuild b/source/a/zoo/zoo.SlackBuild index c667b076e..177ac4a8b 100755 --- a/source/a/zoo/zoo.SlackBuild +++ b/source/a/zoo/zoo.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,19 @@ VERSION=2.10 -DEBPATCH=18 -ARCH=${ARCH:-x86_64} +DEBPATCH=22 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-zoo @@ -45,10 +54,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/zoo_${VERSION}-${DEBPATCH}.diff.gz | patch -p1 -E --verbose --backup --suffix=.orig || exit 1 -for diff in debian/patches/*.dpatch ; do +tar xf $CWD/zoo_${VERSION}-${DEBPATCH}.debian.tar.gz +for diff in debian/patches/*patch ; do cat $diff | patch -p1 --verbose --backup --suffix=.orig || exit 1 done + make linux || exit 1 mkdir -p $PKG/usr/bin cat fiz > $PKG/usr/bin/fiz @@ -74,5 +84,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg -l y -c n $TMP/zoo-$VERSION-$ARCH-$BUILD.txz +makepkg -l y -c n $TMP/zoo-${VERSION}_${DEBPATCH}-$ARCH-$BUILD.txz diff --git a/source/a/zoo/zoo_2.10-18.diff b/source/a/zoo/zoo_2.10-18.diff deleted file mode 100644 index b0c741347..000000000 --- a/source/a/zoo/zoo_2.10-18.diff +++ /dev/null @@ -1,1285 +0,0 @@ ---- zoo-2.10.orig/debian/patches/01_old_fixes.dpatch -+++ zoo-2.10/debian/patches/01_old_fixes.dpatch -@@ -0,0 +1,597 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 01_old_fixes.dpatch by Jose Carlos Medeiros <debian@psabs.com.br> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Old fixes, that were made before this package has changed to use dpatch. -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" -+ -+if [ $# -lt 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+ -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1;; -+esac -+ -+exit 0 -+ -+@DPATCH@ -+diff -urNad zoo-2.10~/ar.h zoo-2.10/ar.h -+--- zoo-2.10~/ar.h 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/ar.h 2005-11-16 17:28:23.308950960 -0200 -+@@ -7,6 +7,7 @@ -+ ***********************************************************/ -+ -+ #include <stdio.h> -++#include <sys/types.h> -+ -+ #ifdef ANSI_HDRS -+ # include <limits.h> -+@@ -15,9 +16,11 @@ -+ /* uchar should be 8 bits or more */ -+ /* typedef unsigned char uchar; -- already in zoo.h */ -+ -++#ifndef _SYS_TYPES_H -+ typedef unsigned int uint; /* 16 bits or more */ -+ typedef unsigned short ushort; /* 16 bits or more */ -+ typedef unsigned long ulong; /* 32 bits or more */ -++#endif -+ -+ /* T_UINT16 must be #defined in options.h to be -+ a 16-bit unsigned integer type */ -+diff -urNad zoo-2.10~/basename.c zoo-2.10/basename.c -+--- zoo-2.10~/basename.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/basename.c 2005-11-16 17:28:23.308950960 -0200 -+@@ -18,7 +18,7 @@ -+ -+ /* This function strips device/directory information from -+ a pathname and returns just the plain filename */ -+-void basename (pathname, fname) -++void zoo_basename (pathname, fname) -+ char *pathname; -+ char fname[]; -+ { -+diff -urNad zoo-2.10~/fiz.1 zoo-2.10/fiz.1 -+--- zoo-2.10~/fiz.1 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/fiz.1 2005-11-16 17:28:23.309950808 -0200 -+@@ -5,7 +5,7 @@ -+ .\" -+ .TH FIZ 1 "Jan 31, 1988" -+ .SH NAME -+-fiz \- analyze damaged zoo archive for data revovery -++fiz \- analyze damaged zoo archive for data recovery -+ .SH SYNOPSIS -+ .I fiz -+ .RB archive[ .zoo ] -+diff -urNad zoo-2.10~/linux.c zoo-2.10/linux.c -+--- zoo-2.10~/linux.c 1969-12-31 21:00:00.000000000 -0300 -++++ zoo-2.10/linux.c 2005-11-16 17:28:23.310950656 -0200 -+@@ -0,0 +1,73 @@ -++/* machine.c for Linux. */ -++ -++/* Basically code stolen from bsd.c, and adjusted for Linux. */ -++ -++#include <sys/stat.h> -++#include <sys/time.h> -++#include <unistd.h> -++ -++/* Function isadir() returns 1 if the supplied handle is a directory, -++ * else it returns 0. */ -++ -++int isadir (ZOOFILE f) -++{ -++ struct stat buffer; /* buffer to hold file information */ -++ -++ if (fstat (fileno (f), &buffer) == -1) -++ return (0); /* inaccessible -- assume not dir */ -++ else -++ { -++ if (buffer.st_mode & S_IFDIR) -++ return (1); -++ else -++ return (0); -++ } -++} -++ -++ -++/* Standard UNIX-compatible time routines */ -++#include "nixtime.i" -++ -++/* Standard UNIX-specific file attribute routines */ -++#include "nixmode.i" -++ -++/* Function gettz() returns the offset from GMT in seconds */ -++long gettz() -++{ -++#define SEC_IN_DAY (24L * 60L * 60L) -++#define INV_VALUE (SEC_IN_DAY + 1L) -++ -++ static long retval = INV_VALUE; /* cache, init to impossible value */ -++ struct timeval tp; -++ struct timezone tzp; -++ -++ if (retval != INV_VALUE) /* if have cached value, return it */ -++ return retval; -++ -++ gettimeofday (&tp, &tzp); -++ -++ retval = tzp.tz_minuteswest * 60 - tzp.tz_dsttime * 3600L; -++ return retval; -++} -++ -++/* Function fixfname() converts the supplied filename to a syntax -++ * legal for the host system. It is used during extraction. -++ * Undocumented */ -++ -++char *fixfname(char *fname) -++{ -++ return fname; /* default is no-op */ -++} -++ -++/* Function zootrunc() truncates the file passed to it. -++ * Undocumented. */ -++ -++int zootrunc(FILE *f) -++{ -++ long seekpos; -++ int fd = fileno(f); -++ -++ seekpos = lseek(fd, 0L, SEEK_CUR); -++ if (seekpos >= 0) -++ return ftruncate(fd, seekpos); -++} -+diff -urNad zoo-2.10~/machine.c zoo-2.10/machine.c -+--- zoo-2.10~/machine.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/machine.c 2005-11-16 17:28:23.310950656 -0200 -+@@ -48,6 +48,10 @@ -+ /* PART 2. FOR EACH SPECIFIC SYSTEM, INCLUDE A C FILE HERE. */ -+ /***********************************************************************/ -+ -++#ifdef LINUX -++#include "linux.c" -++#endif -++ -+ #ifdef SYS_V -+ #include "sysv.c" -+ #endif -+diff -urNad zoo-2.10~/makefile zoo-2.10/makefile -+--- zoo-2.10~/makefile 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/makefile 2005-11-16 17:28:23.311950504 -0200 -+@@ -23,7 +23,7 @@ -+ MODEL = -+ EXTRA = -DBIG_MEM -DNDEBUG -+ LINTFLAGS = -DLINT -+-OPTIM = -O -++OPTIM = -O -Wall -+ DESTDIR = /usr/local/bin -+ -+ #List of all object files created for Zoo -+@@ -53,6 +53,7 @@ -+ @echo "ultrix: ULTRIX 4.1" -+ @echo "convex: Convex C200 series" -+ @echo "sysv: System V Release 2 or 3; or SCO Xenix" -++ @echo "linux: Linux" -+ @echo "scodos: Cross-compiler under SCO Xenix/UNIX for MS-DOS" -+ @echo "xenix286: Older Xenix/286 (not tested)" -+ @echo "xenix68k: Xenix/68000 (not tested)" -+@@ -94,6 +95,10 @@ -+ bsd: -+ $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3" $(TARGETS) -+ -++# Linux -++linux: -++ $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" $(TARGETS) -++ -+ # ULTRIX 4.1 -+ ultrix: -+ $(MAKE) CFLAGS="-c $(OPTIM) -DULTRIX" $(TARGETS) -+@@ -235,7 +240,11 @@ -+ parse.o: zoofns.h zooio.h -+ portable.o: /usr/include/stdio.h assert.h debug.h machine.h options.h -+ portable.o: portable.h various.h zoo.h zoofns.h zooio.h -+-prterror.o: /usr/include/stdio.h /usr/include/varargs.h options.h various.h -++ -++# I deleted varags.h dependancy from prterror.o since that is a -++# dependancy covered by a #ifdef, and in Debian's case #undef'ed -++ -++prterror.o: /usr/include/stdio.h options.h various.h -+ prterror.o: zoofns.h zooio.h -+ sysv.o: /usr/include/sys/stat.h /usr/include/sys/types.h /usr/include/time.h -+ sysv.o: nixmode.i nixtime.i -+diff -urNad zoo-2.10~/makelist.c zoo-2.10/makelist.c -+--- zoo-2.10~/makelist.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/makelist.c 2005-11-16 17:28:23.311950504 -0200 -+@@ -21,6 +21,8 @@ -+ -+ char *nameptr PARMS((char *)); -+ void modpath PARMS((char *)); -++int isadir PARMS((ZOOFILE)); -++int isfdir PARMS((char *)); -+ -+ /*******************/ -+ /* -+diff -urNad zoo-2.10~/misc.c zoo-2.10/misc.c -+--- zoo-2.10~/misc.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/misc.c 2005-11-16 17:28:23.313950200 -0200 -+@@ -8,6 +8,7 @@ -+ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved -+ (C) Copyright 1988 Rahul Dhesi -- All rights reserved -+ */ -++#include <signal.h> -+ #include "options.h" -+ /* Miscellaneous functions needed by Zoo but not by Ooz */ -+ -+@@ -201,7 +202,7 @@ -+ ZOOFILE zoo_file; -+ { -+ #ifndef NOSIGNAL -+- T_SIGNAL (*oldsignal)(); -++ T_SIGNAL (*oldsignal)(int); -+ oldsignal = signal (SIGINT, SIG_IGN); -+ #endif -+ if (fwr_dir (direntry, zoo_file) == -1) -+diff -urNad zoo-2.10~/misc2.c zoo-2.10/misc2.c -+--- zoo-2.10~/misc2.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/misc2.c 2005-11-16 17:28:23.312950352 -0200 -+@@ -7,6 +7,10 @@ -+ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved -+ (C) Copyright 1988 Rahul Dhesi -- All rights reserved -+ */ -++#include <sys/stat.h> -++#include <sys/types.h> -++#include <fcntl.h> -++#include <unistd.h> -+ #include "options.h" -+ /* Miscellaneous routines */ -+ #include "portable.h" -+diff -urNad zoo-2.10~/nixtime.i zoo-2.10/nixtime.i -+--- zoo-2.10~/nixtime.i 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/nixtime.i 2005-11-16 17:28:23.313950200 -0200 -+@@ -10,6 +10,9 @@ -+ -+ -- Rahul Dhesi 1986/12/31 -+ */ -++#include <sys/types.h> -++#include <time.h> -++#include <utime.h> -+ -+ struct tm *localtime(); -+ -+@@ -51,9 +54,10 @@ -+ { -+ long mstonix(); -+ long gettz(); -+- long utimbuf[2]; -+- utimbuf[0] = utimbuf[1] = gettz() + mstonix (date, time); -+- return (utime (path, utimbuf)); -++ struct utimbuf utbf; -++ -++ utbf.actime = utbf.modtime = gettz() + mstonix (date, time); -++ return (utime (path, &utbf)); -+ } -+ -+ /**************** -+diff -urNad zoo-2.10~/options.h zoo-2.10/options.h -+--- zoo-2.10~/options.h 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/options.h 2005-11-16 17:28:23.314950048 -0200 -+@@ -13,6 +13,32 @@ -+ -+ -+ /***********************************************************************/ -++/* Linux */ -++/***********************************************************************/ -++ -++#ifdef LINUX -++#define FILTER -++#define IO_MACROS -++#define EXISTS(f) (access(f, 00) == 0) -++#define FNLIMIT 1023 -++#define CHEKDIR -++#define NIXTIME -++#define NIXFNAME -++#define NEEDCTYP -++#define NOENUM -++#define REN_STDC -++#define SETBUF -++#define GETTZ -++#define FATTR -++#define T_SIGNAL void -++#define STDARG -++#define HAVE_ISATTY /* undocumented #define option */ -++#define ANSI_PROTO -++#define VOIDPTR void * -++#define NO_STDIO_FN /* Do we need this? RUARI QUINN */ -++#endif /* Linux */ -++ -++/***********************************************************************/ -+ /* SYSTEM V (should be compatible with most releases) */ -+ /***********************************************************************/ -+ -+diff -urNad zoo-2.10~/portable.h zoo-2.10/portable.h -+--- zoo-2.10~/portable.h 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/portable.h 2005-11-16 17:28:23.314950048 -0200 -+@@ -90,6 +90,12 @@ -+ #define MKDIR(x) mkdir(x, 0777) -+ #endif -+ -++/* Linux */ -++#ifdef LINUX -++#define NIX_IO /* standard **IX I/O */ -++#define MKDIR(x) mkdir(x, 0777) -++#endif -++ -+ /* Amiga */ -+ #ifdef MCH_AMIGA -+ # include "MCH_AMIGA NEEDS REVISION" -+diff -urNad zoo-2.10~/zoo.1 zoo-2.10/zoo.1 -+--- zoo-2.10~/zoo.1 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zoo.1 2005-11-16 17:33:56.112357152 -0200 -+@@ -955,7 +955,7 @@ -+ 2526: DIR [changes] ==> 95 -+ 2587: DATA -+ **************** -+- 3909: DIR [copyrite] ==> 1478 -++ 3909: DIR [copyright] ==> 1478 -+ 3970: DATA -+ 4769: DATA -+ **************** -+@@ -1041,7 +1041,7 @@ -+ Matches any sequence of zero or more characters. -+ .PP -+ .TP -+-.B \? -++.B ? -+ Matches any single character. -+ .sp 1 -+ Arbitrary combinations of -+@@ -1466,23 +1466,12 @@ -+ .I zoo -+ on all systems. So far as I can tell, this -+ upward compatibility (all manipulations) and downward -+-compatiblity (ability to extract and list) -++compatibility (ability to extract and list) -+ is maintained by -+ .I zoo -+ versions up to 2.01. Version 2.1 adds the incompatibility -+ that if high-performance compression is used, earlier -+ versions cannot extract files compressed with version 2.1. -+-This is the only incompatibility that is permissible. -+-You are forbidden, with the force of -+-copyright law, to create from the -+-.I zoo -+-source code any derivative work -+-that violates this compatibility goal, -+-whether knowingly or through negligence. -+-If any violation of this -+-compatibility goal is observed, -+-this should be -+-considered a serious problem and reported to me. -+ .SH CHANGES -+ Here is a list of changes occurring from version 1.50 to -+ version 2.01. In parentheses is given the version in which each -+@@ -1581,7 +1570,7 @@ -+ .TP -+ \- -+ (2.01) Blanks around equal signs in commands given to "make" -+-were removed from the mk* scripts for better compatiblity -++were removed from the mk* scripts for better compatibility -+ with more **IX implementations including Sun's. -+ .TP -+ \- -+diff -urNad zoo-2.10~/zoo.c zoo-2.10/zoo.c -+--- zoo-2.10~/zoo.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zoo.c 2005-11-16 17:28:23.319949288 -0200 -+@@ -15,6 +15,7 @@ -+ (C) Copyright 1988 Rahul Dhesi -- All rights reserved -+ (C) Copyright 1991 Rahul Dhesi -- All rights reserved -+ */ -++#include <unistd.h> -+ #include "options.h" -+ #include "zooio.h" -+ #include "various.h" -+diff -urNad zoo-2.10~/zoo.h zoo-2.10/zoo.h -+--- zoo-2.10~/zoo.h 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zoo.h 2005-11-16 17:28:23.321948984 -0200 -+@@ -1,5 +1,6 @@ -+ /* derived from: zoo.h 2.16 88/01/27 23:21:36 */ -+- -++#ifndef ZOO_H -++#define ZOO_H -+ /* -+ The contents of this file are hereby released to the public domain. -+ -+@@ -240,3 +241,4 @@ -+ #define MAXGEN 0x0f -+ /* version mask to prune down to correct size on large-word machines */ -+ #define VER_MASK 0xffff -++#endif -+diff -urNad zoo-2.10~/zooadd.c zoo-2.10/zooadd.c -+--- zoo-2.10~/zooadd.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zooadd.c 2005-11-16 17:28:23.318949440 -0200 -+@@ -9,11 +9,13 @@ -+ (C) Copyright 1988 Rahul Dhesi -- All rights reserved -+ (C) Copyright 1991 Rahul Dhesi -- All rights reserved -+ */ -++#include <unistd.h> -+ #include "options.h" -+ /* Adds files specified in parameter-list to archive zoo_path. */ -+ -+ #define LONGEST 20 /* assumed length of longest filename */ -+ #include "zoomem.h" /* to define MAXADD */ -++#undef PORTABLE -+ #include "zoo.h" -+ #include "zooio.h" -+ #include "various.h" -+@@ -37,6 +39,7 @@ -+ void copyfields PARMS ((struct direntry *, struct tiny_header *)); -+ void storefname PARMS ((struct direntry *, char *, int)); -+ char *choosefname PARMS ((struct direntry *)); -++int isadir PARMS((ZOOFILE)); -+ -+ extern struct zoo_header zoo_header; -+ -+@@ -132,7 +135,7 @@ -+ -+ if (zoo_file == NOFILE) -+ prterror ('f', could_not_open, zoo_path); -+-basename(zoo_path, zoo_fname); /* get basename of archive */ -++zoo_basename(zoo_path, zoo_fname); /* get basename of archive */ -+ rootname (zoo_path, zoo_bak); /* name without extension */ -+ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ -+ -+@@ -222,7 +225,7 @@ -+ break; -+ } -+ -+- basename (this_path, this_fname); /* get just filename for later */ -++ zoo_basename (this_path, this_fname); /* get just filename for later */ -+ -+ this_file = zooopen(this_path, Z_READ); -+ if (this_file == NOFILE) { -+diff -urNad zoo-2.10~/zooadd2.c zoo-2.10/zooadd2.c -+--- zoo-2.10~/zooadd2.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zooadd2.c 2005-11-16 17:28:23.317949592 -0200 -+@@ -7,7 +7,9 @@ -+ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved -+ (C) Copyright 1988 Rahul Dhesi -- All rights reserved -+ */ -++#include <unistd.h> -+ #include "options.h" -++#undef PORTABLE -+ #include "zoo.h" -+ #ifndef OK_STDIO -+ #include <stdio.h> -+@@ -20,7 +22,7 @@ -+ #include "assert.h" -+ #include "debug.h" -+ #include "parse.h" -+- -++int isfdir PARMS((char *)); -+ /* -+ Miscellaneous routines to support zooadd(). -+ */ -+diff -urNad zoo-2.10~/zooext.c zoo-2.10/zooext.c -+--- zoo-2.10~/zooext.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zooext.c 2005-11-16 17:28:23.320949136 -0200 -+@@ -14,7 +14,8 @@ -+ /* Extract file from archive. Extracts files specified in parameter-list -+ from archive zoo_path. If none specified, extracts all files from -+ archive. */ -+- -++#include <unistd.h> -++#include <signal.h> -+ #include "options.h" -+ #include "zoo.h" -+ #include "parse.h" /* defines struct for parse() */ -+@@ -62,7 +63,7 @@ -+ char *whichname; /* which name to extract */ -+ char matchname[PATHSIZE]; /* for pattern matching only */ -+ #ifndef NOSIGNAL -+-T_SIGNAL (*oldsignal)(); /* to save previous SIGINT handler */ -++T_SIGNAL (*oldsignal)(int); /* to save previous SIGINT handler */ -+ #endif -+ ZOOFILE zoo_file; /* open archive */ -+ long next_ptr; /* pointer to within archive */ -+@@ -626,7 +627,7 @@ -+ -+ /* Ctrl_c() is called if ^C is hit while a file is being extracted. -+ It closes the files, deletes it, and exits. */ -+-T_SIGNAL ctrl_c() -++T_SIGNAL ctrl_c(int dummy) -+ { -+ #ifndef NOSIGNAL -+ signal (SIGINT, SIG_IGN); /* ignore any more */ -+diff -urNad zoo-2.10~/zoofns.h zoo-2.10/zoofns.h -+--- zoo-2.10~/zoofns.h 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zoofns.h 2005-11-16 17:28:23.320949136 -0200 -+@@ -42,12 +42,12 @@ -+ int cfactor PARMS ((long, long)); -+ int chname PARMS ((char *, char *)); -+ int cmpnum PARMS ((unsigned int, unsigned int, unsigned int, unsigned int)); -+-T_SIGNAL ctrl_c PARMS ((void)); -++T_SIGNAL ctrl_c PARMS ((int)); -+ int exists PARMS ((char *)); -+ int getfile PARMS ((ZOOFILE, ZOOFILE, long, int)); -+ int getutime PARMS ((char *, unsigned *, unsigned *)); -+ int gettime PARMS ((ZOOFILE, unsigned *, unsigned *)); -+-T_SIGNAL handle_break PARMS ((void)); -++T_SIGNAL handle_break PARMS ((int)); -+ -+ #ifdef USE_ASCII -+ int isupper PARMS ((int)); -+@@ -85,7 +85,7 @@ -+ void addfname PARMS ((char *, long, unsigned int, unsigned int, -+ unsigned, unsigned)); -+ void add_version PARMS ((char *, struct direntry *)); -+-void basename PARMS ((char *, char [])); -++void zoo_basename PARMS ((char *, char [])); -+ void break_off PARMS ((void)); -+ void close_file PARMS ((ZOOFILE)); -+ void comment PARMS ((char *, char *)); -+diff -urNad zoo-2.10~/zooio.h zoo-2.10/zooio.h -+--- zoo-2.10~/zooio.h 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zooio.h 2005-11-16 17:28:23.321948984 -0200 -+@@ -7,6 +7,7 @@ -+ -+ -- Rahul Dhesi 1988/01/24 -+ */ -++#include "zoo.h" -+ #ifndef OK_STDIO -+ #include <stdio.h> -+ #define OK_STDIO -+diff -urNad zoo-2.10~/zoolist.c zoo-2.10/zoolist.c -+--- zoo-2.10~/zoolist.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zoolist.c 2005-11-16 17:28:23.322948832 -0200 -+@@ -47,6 +47,7 @@ -+ int ver_too_high PARMS((struct zoo_header *)); -+ int needed PARMS((char *, struct direntry *, struct zoo_header *)); -+ void printtz PARMS((int)); -++int fputchar PARMS ((int)); -+ -+ void zoolist (argv, option, argc) -+ char **argv, *option; -+@@ -414,7 +415,7 @@ -+ if (direntry.fattr == 0) -+ printf ("--- "); -+ else if ((direntry.fattr >> 22) == 1) -+- printf ("%03o ", direntry.fattr & 0x1ff); -++ printf ("%03lo ", direntry.fattr & 0x1ff); -+ else -+ printf ("??? "); -+ } -+diff -urNad zoo-2.10~/zoopack.c zoo-2.10/zoopack.c -+--- zoo-2.10~/zoopack.c 2005-11-16 17:11:21.000000000 -0200 -++++ zoo-2.10/zoopack.c 2005-11-16 17:28:23.323948680 -0200 -+@@ -10,6 +10,7 @@ -+ Copyright (C) 1986, 1987 Rahul Dhesi -- All rights reserved -+ (C) Copyright 1988 Rahul Dhesi -- All rights reserved -+ */ -++#include <unistd.h> -+ #include "options.h" -+ /* Packs an archive. The sequence is: -+ 1. Copy all files from current archive to new one. -+@@ -171,7 +172,7 @@ -+ } else { -+ strcpy (temp_file, xes); -+ } -+-mktemp (temp_file); /* ... and make unique */ -++mkstemp (temp_file); /* ... and make unique */ -+ new_file = zoocreate (temp_file); -+ if (new_file == NOFILE) -+ prterror ('f', "Could not create temporary file %s.\n", temp_file); -+@@ -388,7 +389,7 @@ -+ -+ /* handle_break() */ -+ /* Sets break_hit to 1 when called */ -+-T_SIGNAL handle_break() -++T_SIGNAL handle_break(int dummy) -+ { -+ #ifndef NOSIGNAL -+ signal (SIGINT, SIG_IGN); /* ignore future control ^Cs for now */ ---- zoo-2.10.orig/debian/patches/00options -+++ zoo-2.10/debian/patches/00options -@@ -0,0 +1 @@ -+DPEP_OPTION_EXEC_TEMPLATE=1 ---- zoo-2.10.orig/debian/patches/00list -+++ zoo-2.10/debian/patches/00list -@@ -0,0 +1,5 @@ -+01_old_fixes -+02_traversal_directory -+03_fix_manage_archive_under_AMD64 -+04_fix_fullpath_buffer_overflow -+05_CVE-2006-1269.dpatch ---- zoo-2.10.orig/debian/patches/00template -+++ zoo-2.10/debian/patches/00template -@@ -0,0 +1,43 @@ -+#!/bin/sh -+# Sample debian/patches/00template script -+# era Thu May 15 23:24:07 2003 -+ -+# This simply creates the equivalent of the hard-coded template. -+# Adapt and hack to suit your needs. -+ -+file="$1" -+shift -+description="$@" -+ -+fullnameguess="$(getent passwd $(id -un) | cut -f5 -d: | cut -f1 -d,)" -+domainguess=$([ -f /etc/mailname ] && cat /etc/mailname || hostname -f) -+emailguess="${DEBEMAIL:-${EMAIL:-$(logname)@${domainguess}}}" -+ -+cat <<EOF -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## ${file} by ${DEBFULLNAME:-$fullnameguess} <$emailguess> -+## -+## All lines beginning with \`## DP:' are a description of the patch. -+## DP: ${description:-No description} -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="\${patch_opts:--f --no-backup-if-mismatch \${2:+-d \$2}}" -+ -+if [ \$# -lt 1 ]; then -+ echo >&2 "\`basename \$0\`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+ -+case "\$1" in -+ -patch) patch \$patch_opts -p1 < \$0;; -+ -unpatch) patch \$patch_opts -p1 -R < \$0;; -+ *) -+ echo >&2 "\`basename \$0\`: script expects -patch|-unpatch as argument" -+ exit 1;; -+esac -+ -+exit 0 -+ -+@DPATCH@ -+EOF -+ ---- zoo-2.10.orig/debian/patches/02_traversal_directory.dpatch -+++ zoo-2.10/debian/patches/02_traversal_directory.dpatch -@@ -0,0 +1,70 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 02_traversal_directory.dpatch by Jose Carlos Medeiros <debian@psabs.com.br> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: patch to solve problem with "directory traversal bug" CVE id CAN-2005-2349 -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" -+ -+if [ $# -lt 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+ -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1;; -+esac -+ -+exit 0 -+ -+@DPATCH@ -+diff -urNad zoo-2.10/portable.c /tmp/dpep.W7Aoaj/zoo-2.10/portable.c -+--- zoo-2.10/portable.c 2005-07-22 15:34:22.000000000 -0300 -++++ /tmp/dpep.W7Aoaj/zoo-2.10/portable.c 2005-07-25 14:43:57.757855384 -0300 -+@@ -364,6 +364,41 @@ -+ show_dir(direntry); -+ } -+ #endif -++ /* ######################################################################### -++ * -++ * THIS CODE WAS WRITTEN TO SOLVE PROBLEM WITH DIRECTORY TRAVERSAL SECURITY -++ * BUG (CVE id CAN-2005-2349). -++ * -++ * ######################################################################## -++ */ -++ char *p; -++ /* take off '../' */ -++ while ((p = strstr( direntry->dirname, "../" )) != NULL) { -++ while (*(p+3) != '\0') { -++ *p = *(p + 3); -++ p++; -++ } -++ *p = *(p+3); /* move last null */ -++ //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); -++ } -++ /* take off '/' */ -++ if ( direntry->dirname[0] == '/' ) { -++ p = direntry->dirname; -++ while (*p != '\0') { -++ *p = *(p + 1); -++ p++; -++ } -++ *p = *(p+1); /* move last null */ -++ //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); -++ } -++ /* direntry->dirlen = strlen(direntry->dirname); */ -++ -++ /* ################################################################## -++ * -++ * END -++ * -++ * ################################################################### -++ */ -+ return (0); -+ } -+ ---- zoo-2.10.orig/debian/patches/03_fix_manage_archive_under_AMD64.dpatch -+++ zoo-2.10/debian/patches/03_fix_manage_archive_under_AMD64.dpatch -@@ -0,0 +1,107 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 03_fix_manage_archive_under_AMD64.dpatch by Jose Carlos Medeiros <debian@psabs.com.br> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: patch to solve problems managing files under AMD64 and maybe under others 64 archs. -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" -+ -+if [ $# -lt 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+ -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1;; -+esac -+ -+exit 0 -+ -+@DPATCH@ -+diff -urNad zoo-2.10~/makefile zoo-2.10/makefile -+--- zoo-2.10~/makefile 2005-11-16 12:10:06.773065688 -0200 -++++ zoo-2.10/makefile 2005-11-16 12:12:50.816127352 -0200 -+@@ -54,6 +54,7 @@ -+ @echo "convex: Convex C200 series" -+ @echo "sysv: System V Release 2 or 3; or SCO Xenix" -+ @echo "linux: Linux" -++ @echo "linux64: Linux with 64 bit long" -+ @echo "scodos: Cross-compiler under SCO Xenix/UNIX for MS-DOS" -+ @echo "xenix286: Older Xenix/286 (not tested)" -+ @echo "xenix68k: Xenix/68000 (not tested)" -+@@ -99,6 +100,10 @@ -+ linux: -+ $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" $(TARGETS) -+ -++# Linux64 -++linux64: -++ $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DLONG64 -DANSI_HDRS" $(TARGETS) -++ -+ # ULTRIX 4.1 -+ ultrix: -+ $(MAKE) CFLAGS="-c $(OPTIM) -DULTRIX" $(TARGETS) -+diff -urNad zoo-2.10~/misc.c zoo-2.10/misc.c -+--- zoo-2.10~/misc.c 2005-11-16 12:10:06.775065384 -0200 -++++ zoo-2.10/misc.c 2005-11-16 12:20:48.366528656 -0200 -+@@ -173,7 +173,11 @@ -+ -+ frd_zooh (header, zoo_file); -+ -++#ifdef LONG64 -++ if ((int)(header->zoo_start = header->zoo_minus) != 0) -++#else -+ if ((header->zoo_start + header->zoo_minus) != 0L) -++#endif -+ prterror ('f', failed_consistency); -+ if (ver_too_high (header)) -+ prterror ('f', wrong_version, header->major_ver, header->minor_ver); -+diff -urNad zoo-2.10~/zoodel.c zoo-2.10/zoodel.c -+--- zoo-2.10~/zoodel.c 1991-07-05 13:00:00.000000000 -0300 -++++ zoo-2.10/zoodel.c 2005-11-16 12:20:19.776874944 -0200 -+@@ -138,7 +138,11 @@ -+ -+ /* read archive header */ -+ frd_zooh (&zoo_header, zoo_file); -++#ifdef LONG64 -++ if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0) -++#else -+ if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L) -++#endif -+ prterror ('f', failed_consistency); -+ if (ver_too_high (&zoo_header)) -+ prterror ('f', wrong_version, zoo_header.major_ver, zoo_header.minor_ver); -+diff -urNad zoo-2.10~/zooext.c zoo-2.10/zooext.c -+--- zoo-2.10~/zooext.c 2005-11-16 12:10:06.783064168 -0200 -++++ zoo-2.10/zooext.c 2005-11-16 12:22:08.373365768 -0200 -+@@ -164,7 +164,11 @@ -+ } else { -+ /* read header */ -+ frd_zooh (&zoo_header, zoo_file); -++#ifdef LONG64 -++ if ((int)(zoo_header.zoo_start + zoo_header.zoo_minus) != 0) { -++#else -+ if ((zoo_header.zoo_start + zoo_header.zoo_minus) != 0L) { -++#endif -+ prterror ('w', failed_consistency); -+ bad_header++; -+ exit_status = 1; -+diff -urNad zoo-2.10~/zoopack.c zoo-2.10/zoopack.c -+--- zoo-2.10~/zoopack.c 2005-11-16 12:10:06.786063712 -0200 -++++ zoo-2.10/zoopack.c 2005-11-16 12:23:01.145343208 -0200 -+@@ -140,7 +140,11 @@ -+ /* Read the header of the old archive. */ -+ frd_zooh(&old_zoo_header, zoo_file); -+ -++#ifdef LONG64 -++if ((int)(old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0) { -++#else -+ if ((old_zoo_header.zoo_start + old_zoo_header.zoo_minus) != 0L) { -++#endif -+ prterror ('w', failed_consistency); -+ ++bad_header; /* remember for future error message */ -+ } ---- zoo-2.10.orig/debian/patches/04_fix_fullpath_buffer_overflow.dpatch -+++ zoo-2.10/debian/patches/04_fix_fullpath_buffer_overflow.dpatch -@@ -0,0 +1,44 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 04_fix_fullpath_buffer_overflow.dpatch by Jose Carlos Medeiros <debian@psabs.com.br> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: Fix "fullpath()" File Name Handling Buffer Overflow, CAN-2006-0855 -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" -+ -+if [ $# -lt 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+ -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1;; -+esac -+ -+exit 0 -+ -+@DPATCH@ -+diff -urNad zoo-2.10~/misc.c zoo-2.10/misc.c -+--- zoo-2.10~/misc.c 2006-03-03 18:51:31.000000000 -0300 -++++ zoo-2.10/misc.c 2006-03-03 18:54:29.000000000 -0300 -+@@ -136,11 +136,14 @@ -+ char *fullpath (direntry) -+ struct direntry *direntry; -+ { -+- static char result[PATHSIZE]; -++ static char result[PATHSIZE+PATHSIZE+12]; // Room for enough space -+ combine (result, -+ direntry->dirlen != 0 ? direntry->dirname : "", -+ (direntry->namlen != 0) ? direntry->lfname : direntry->fname -+ ); -++ if (strlen (result) >= PATHSIZE) { -++ prterror ('f', "Combined dirname and filename too long\n"); -++ } -+ return (result); -+ } -+ ---- zoo-2.10.orig/debian/patches/05_CVE-2006-1269.dpatch -+++ zoo-2.10/debian/patches/05_CVE-2006-1269.dpatch -@@ -0,0 +1,37 @@ -+#! /bin/sh /usr/share/dpatch/dpatch-run -+## 05_CVE-2006-1269.dpatch by Alec Berryman <alec@thened.net> -+## -+## All lines beginning with `## DP:' are a description of the patch. -+## DP: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=183426 -+ -+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -+patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" -+ -+if [ $# -lt 1 ]; then -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1 -+fi -+ -+case "$1" in -+ -patch) patch $patch_opts -p1 < $0;; -+ -unpatch) patch $patch_opts -p1 -R < $0;; -+ *) -+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" -+ exit 1;; -+esac -+ -+exit 0 -+ -+@DPATCH@ -+diff -urNad zoo-2.10~/parse.c zoo-2.10/parse.c -+--- zoo-2.10~/parse.c 1991-07-05 17:00:00.000000000 +0100 -++++ zoo-2.10/parse.c 2006-05-18 14:16:32.000000000 +0100 -+@@ -39,7 +39,7 @@ -+ char *namep; /* points to relevant part of tempname */ -+ -+ char *p; -+- strcpy (tempname, fname); -++ strncpy (tempname, fname, LFNAMESIZE); -+ -+ #ifdef DEBUG -+ printf ("parse: supplied name is [%s].\n", tempname); ---- zoo-2.10.orig/debian/compat -+++ zoo-2.10/debian/compat -@@ -0,0 +1 @@ -+5 ---- zoo-2.10.orig/debian/changelog -+++ zoo-2.10/debian/changelog -@@ -0,0 +1,139 @@ -+zoo (2.10-18) unstable; urgency=low -+ -+ * Added patch to solve "CVE-2006-1269: local arbitrary code execution", -+ thanks to Alec Berryman <alec@thened.net> (closes: #367858) -+ * Updated to DH_COMPAT 5 -+ -+ -- Jose Carlos Medeiros <debian@psabs.com.br> Fri, 19 May 2006 19:23:24 -0300 -+ -+zoo (2.10-17) unstable; urgency=low -+ -+ * Added 04_fix_fullpath_buffer_overflow patch to fix a Buffer Overflow, -+ CAN-2006-0855. Thanks to Jean-SébastienGuay-Leroux -+ <jean-sebastien_at_guay-leroux.com>, (closes: #354461) -+ -+ -- Jose Carlos Medeiros <debian@psabs.com.br> Fri, 3 Mar 2006 18:56:02 -0300 -+ -+zoo (2.10-16) unstable; urgency=low -+ -+ * Added 03_fix_manage_archive_under_AMD64 patch, thanks to carlj -+ <Carl.Johnson.carlj@peak.org>. (closes: #335114) -+ * Updated debian/rules to test and compile to AMD64. -+ * Updated to Standards-Version 3.6.2. -+ * Changed 01_old_fixes dpatch to solve problem "missing \?" in zoo.1. -+ -+ -- Jose Carlos Medeiros <debian@psabs.com.br> Wed, 16 Nov 2005 16:48:24 -0200 -+ -+zoo (2.10-15) unstable; urgency=low -+ -+ * Added dpatch as Build-Depends in debian/control. -+ * Added debian/watch file. (closes: #322246) -+ * Updated linux.c in 01_old_fixes. (closes: #322194) -+ Thanks to Robert Millan <rmh@aybabtu.com> -+ -+ -- Jose Carlos Medeiros <debian@psabs.com.br> Tue, 9 Aug 2005 15:07:48 -0300 -+ -+zoo (2.10-14) unstable; urgency=low -+ -+ * Changed call from "mktemp" to "mkstemp" in zoopack.c file. -+ * Added debian/patches/00options, debian/patches/00list and -+ debian/patches/00template files. -+ * Updated rules and control to use dpatch. -+ * Added 01_old_fixes.dpatch file with old changes. -+ * Added 02_traversal_directory.dpatch to solve problem with "directory -+ traversal security bug - CVE id CAN-2005-2349". Thanks to -+ Jorge Ventura <jorge.ventura@fusemail.com> (closes: #309594) -+ * Changed upstream source link in copyright file. -+ -+ -- Jose Carlos Medeiros <debian@psabs.com.br> Fri, 22 Jul 2005 12:59:07 -0300 -+ -+zoo (2.10-13) unstable; urgency=low -+ -+ * Updated zoo.1 file (thanks to A Costa <agcosta@gis.net>). (closes: #302817) -+ * Changed email of Mantainer in control file. -+ * Updated fiz.1 file (thanks to A Costa <agcosta@gis.net>). (closes: #309874) -+ -+ -- Jose Carlos Medeiros <debian@psabs.com.br> Tue, 7 Jun 2005 20:47:51 -0300 -+ -+zoo (2.10-12) unstable; urgency=low -+ -+ * New maintainer (closes: #302895) -+ * Created compat file. -+ * Deleted debian/docs unused file. -+ * Changed rules to complain debhelper > 4.0. -+ * Changed README.compilers to README.debian. -+ -+ -- Jose Carlos Medeiros <jose@psabs.com.br> Wed, 13 Apr 2005 18:39:14 -0300 -+ -+zoo (2.10-11) unstable; urgency=low -+ -+ * New maintainer (closes: #258470) -+ * Move to main from non-free (zoo is now in public domain). -+ * Updated copyright file -+ * Updated zoo.1 file -+ * Removed unnecessary, compile related files from the binary package. -+ * Standards-Version: 3.6.1.0 -+ -+ -- Niklas Vainio <nvainio+deb@iki.fi> Sat, 10 Jul 2004 21:29:26 +0300 -+ -+zoo (2.10-10) unstable; urgency=low -+ -+ * Recompile to allow prelinking (closes: #231547). -+ -+ -- Petr Cech <cech@debian.org> Mon, 9 Feb 2004 12:02:32 +0100 -+ -+zoo (2.10-9) unstable; urgency=low -+ -+ * Fix build with new glibc-2.2 (closes: #94865) -+ -+ -- Petr Cech <cech@debian.org> Sun, 22 Apr 2001 22:17:14 +0200 -+ -+zoo (2.10-8) unstable; urgency=low -+ -+ * Added README.compilers. -+ * Standards-version: 3.2.1. -+ * Glibc-2.2 build. -+ * Fix long utibuf[2] to struct utimbuf. -+ -+ -- Petr Cech <cech@debian.org> Tue, 17 Oct 2000 15:07:50 +0200 -+ -+zoo (2.10-7) unstable; urgency=low -+ -+ * Don't know how, but the copyright was gone -+ * Added documentation from source package -+ -+ -- Petr Cech <cech@debian.org> Sat, 16 May 1998 11:32:30 +0200 -+ -+zoo (2.10-6) frozen unstable; urgency=low -+ -+ * Use debhelper. -+ * Added some includes and prototypes to have less warnings -+ * New maintainer. -+ * updated to 2.4.1 -+ -+ -- Petr CECH <Petr.Cech@st.mff.cuni.cz> Fri, 8 May 1998 01:06:39 +0200 -+ -+zoo (2.10-5) unstable; urgency=low -+ -+ * Orphaned the package. -+ * debian/control (Standards-Version): updated to 2.4.0.0 [#16772]. -+ * debian/control (Section): changed to non-free/utils [fails #3 of DFSG]. -+ * debian/control (Maintainer): set to debian-qa list. -+ * debian/rules: rewritten. -+ -+ -- James Troup <jjtroup@comp.brad.ac.uk> Wed, 4 Mar 1998 02:17:57 +0000 -+ -+zoo (2.10-4) unstable; urgency=low -+ -+ * Rebuilt for libc6. -+ -+ -- James Troup <jjtroup@comp.brad.ac.uk> Wed, 25 Jun 1997 17:04:23 +0000 -+ -+zoo (2.10-3) unstable; urgency=low -+ -+ * New maintainer. -+ * Updated package to standards version 2.1.1.2. -+ * Removed executables from source package. -+ * Added better linux support, fixes bug #3961 and #4904. -+ -+ -- James Troup <jjtroup@comp.brad.ac.uk> Wed, 22 Jan 1997 02:18:51 +0000 ---- zoo-2.10.orig/debian/watch -+++ zoo-2.10/debian/watch -@@ -0,0 +1,3 @@ -+version=3 -+opts=dversionmangle=s/\.// \ -+ http://www.ibiblio.org/pub/packages/ccic/software/unix/utils/zoo(.*)\.tar\.gz ---- zoo-2.10.orig/debian/control -+++ zoo-2.10/debian/control -@@ -0,0 +1,20 @@ -+Source: zoo -+Section: utils -+Priority: optional -+Build-Depends: debhelper (>= 5.0.0), dpatch (>= 2.0.10) -+Maintainer: Jose Carlos Medeiros <debian@psabs.com.br> -+Uploaders: Ola Lundqvist <opal@debian.org> -+Standards-Version: 3.6.2 -+ -+Package: zoo -+Architecture: any -+Depends: ${shlibs:Depends} -+Description: manipulate zoo archives -+ Zoo is used to create and maintain collections of files in compressed -+ form. It uses a Lempel-Ziv compression algorithm that gives space -+ savings in the range of 20% to 80% depending on the type of file data. -+ Zoo can store and selectively extract multiple generations of the same -+ file. -+ . -+ This package exists for its historical value. If you are looking for -+ a compression tool for serious use, check tar and gzip. ---- zoo-2.10.orig/debian/rules -+++ zoo-2.10/debian/rules -@@ -0,0 +1,94 @@ -+#!/usr/bin/make -f -+# debian/rules file - for zoo (2.1). -+# Based on sample debian.rules file - for GNU Hello (1.3). -+# Copyright 1994,1995 by Ian Jackson. -+# Copyright 1997,1998 by James Troup. -+# Copyright 1998,1999,2000 by Petr Èech. -+# Copyright 2005 by Jose Carlos N. Medeiros. -+# I hereby give you perpetual unlimited permission to copy, -+# modify and relicense this file, provided that you do not remove -+# my name from the file itself. (I assert my moral right of -+# paternity under the Copyright, Designs and Patents Act 1988.) -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# This has to be exported to make some magic below work. -+#export DH_OPTIONS -+ -+CFLAGS = -Wall -+ -+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -O0 -+else -+ CFLAGS += -O2 -+endif -+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) -+ CFLAGS += -g -+endif -+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) -+ INSTALL += -s -+endif -+ -+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -+PACKAGE = zoo -+ -+# Include dpatch stuff. -+include /usr/share/dpatch/dpatch.make -+ -+configure: configure-stamp -+configure-stamp: -+ dh_testdir -+ touch configure-stamp -+ -+build: build-stamp -+ -+build-stamp: configure-stamp patch -+ dh_testdir -+ -+ echo $(DEB_HOST_ARCH) -+ifeq ($(DEB_HOST_ARCH),amd64) -+ $(MAKE) OPTIM="$(CFLAGS)" linux64 -+else -+ $(MAKE) OPTIM="$(CFLAGS)" linux -+endif -+ touch build-stamp -+ -+clean: unpatch -+ dh_testdir -+ dh_testroot -+ -$(MAKE) -i clean -+ dh_clean build-stamp configure-stamp zoo fiz -+ -+install: build -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ # Add here commands to install the package into debian/zoo. -+ install -m 755 -s zoo fiz debian/zoo/usr/bin -+ -+# Build architecture-independent files here. -+binary-indep: build install -+# We have nothing to do by default. -+ -+# Build architecture-dependent files here. -+binary-arch: build install -+ dh_testdir -+ dh_testroot -+ dh_installchangelogs -+ dh_installdocs -+ dh_installman fiz.1 zoo.1 -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+ dh_installdeb -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install configure -+ ---- zoo-2.10.orig/debian/copyright -+++ zoo-2.10/debian/copyright -@@ -0,0 +1,64 @@ -+This is Debian GNU/Linux's prepackaged version of the zoo archiver. -+ -+This package was put together by James Troup from the original -+source obtained from: -+ http://www.ibiblio.org/pub/packages/ccic/software/unix/utils/zoo210.tar.gz -+ -+From May 1998 to July 2004 it was maintained by Petr Èech and -+currently it is maintained by Niklas Vainio <nvainio+deb@iki.fi> -+ -+Copyright and license: -+ -+Zoo was written by Rahul Dhesi. He has now released it into the public -+domain: -+ -+ -+Return-Path: <dhesi@rahul.net> -+Date: Sat, 19 Jun 2004 13:50:26 -0700 (PDT) -+From: dhesi@rahul.net -+To: Niklas Vainio <nvainio@iki.fi> -+Subject: Re: License of Zoo -+ -+Hi, the last release of the zoo archive program was marked entirely -+public domain, with no restrictions. I'm sure this statement will be -+found somewhere in the files in the sources. If not, I hope this email -+will suffice: everything in the zoo package is entirely public domain, -+with no restrictions whatsoever. -+ -+Rahul -+ -+ -+On Sat, 19 Jun 2004, Niklas Vainio wrote: -+ -+> Dear Rahul Dhesi, -+> -+> The Zoo archiving program you wrote, is part of the Debian GNU/Linux system, -+> in its unofficial section called "non-free". I'm asking you to relax licence -+> conditions of Zoo a bit to make it free software and allow it to move into -+> the official Debian distribution. -+> -+> Zoo licensing conditions have two clauses that make it non-free software. -+> Those clauses are the following: -+> -+> "(b) do not create, whether deliberately or through negligence, any -+> derivative work that violates the compatibility goals describe in the -+> reference manual for zoo 2.1," -+> -+> "(d) make the fully commented source code of the derivative work available -+> to me at no cost if I so request, and make no attempt to restrict the -+> distribution or use of this source code." -+> -+> Of course this is more of historical interest than any actual need, but -+> would you please consider licensing Zoo under a free license? -+> -+> Best regards, -+> - Nikke, a Debian volunteer -+> -+> -- -+> Niklas Vainio <niklas.vainio@iki.fi> -+> -+ -+ -+ -+ -+ ---- zoo-2.10.orig/debian/dirs -+++ zoo-2.10/debian/dirs -@@ -0,0 +1 @@ -+usr/bin ---- zoo-2.10.orig/debian/README.debian -+++ zoo-2.10/debian/README.debian -@@ -0,0 +1,11 @@ -+The linux target I created was based on the bsd 4.3 target, with the -+following differences :- -+ -+ Linux has strchr(). -+ Linux signal handler returns void data type. -+ (Debian GNU/)Linux uses stdarg.h in preference to varags.h. -+ Linux has memmove(). -+ (Debian GNU/)Linux uses ansi C compilers (required for stdarg.h). -+ Linux malloc() returns a void pointer. -+ Linux has vprintf(). -+ |
