diff options
Diffstat (limited to 'source/n')
181 files changed, 4514 insertions, 3007 deletions
diff --git a/source/n/alpine/alpine.SlackBuild b/source/n/alpine/alpine.SlackBuild index 6ed64d10d..1dd64e6a6 100755 --- a/source/n/alpine/alpine.SlackBuild +++ b/source/n/alpine/alpine.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 @@ -23,12 +23,22 @@ PKGNAM=alpine VERSION=${VERSION:-2.00} -ARCH=${ARCH:-x86_64} -ALPINEBUILD=${ALPINEBUILD:-2} +ALPINEBUILD=${ALPINEBUILD:-3} IMAPDBUILD=${IMAPDBUILD:-2} PINEPGP=${PINEPGP:-0.18.0} -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 + +# There are reports that > 1 won't work here: +NUMJOBS=${NUMJOBS:-" -j1 "} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -86,11 +96,6 @@ zcat $CWD/alpine.tech-notes.txt.diff.gz | patch -p1 --verbose || exit 1 # Build and install: # Since we build non-compliant to RFC3501 we have to answer 'y' half-way: -echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix -echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix -echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix -echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix -echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix echo y | make $NUMJOBS EXTRACFLAGS="-fPIC" SSLTYPE=unix || exit 1 make install SSLTYPE=unix DESTDIR=$PKG || exit 1 diff --git a/source/n/autofs/autofs-3.1.7.diff b/source/n/autofs/autofs-3.1.7.diff deleted file mode 100644 index 7849eae95..000000000 --- a/source/n/autofs/autofs-3.1.7.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./modules/lookup_program.c.orig Sat Mar 24 14:16:45 2001 -+++ ./modules/lookup_program.c Sat Mar 24 14:18:18 2001 -@@ -16,7 +16,7 @@ - - #include <ctype.h> - #include <errno.h> --#include <limits.h> -+#include <linux/limits.h> - #include <malloc.h> - #include <stdio.h> - #include <string.h> diff --git a/source/n/autofs/autofs-3.1.7.tar.bz2.sign b/source/n/autofs/autofs-3.1.7.tar.bz2.sign deleted file mode 100644 index 8f80176b7..000000000 --- a/source/n/autofs/autofs-3.1.7.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.0.4 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQA6A7VZyGugalF9Dw4RAkieAJ96c+Si+lGnoSf0OJCanmwE7dilBwCgieKQ -SshwUTt1sSA9Iu3meWUm2yk= -=1kDE ------END PGP SIGNATURE----- diff --git a/source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch b/source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch new file mode 100644 index 000000000..197ac6bd3 --- /dev/null +++ b/source/n/autofs/autofs-5.0.5-fix-libxml2-workaround-configure.patch @@ -0,0 +1,61 @@ +autofs-5.0.5 - fix libxml2 workaround configure + +From: Ian Kent <raven@themaw.net> + +The configure logic related to work around the libxml2 library +reload issues is not quite right. The xml code is needed if +ldap is used so it is sufficient to require inclusion of the +workaround code if autofs is being built with LDAP support. +--- + +diff --git a/daemon/Makefile b/daemon/Makefile +index 371ec72..9e9d635 100644 +--- a/daemon/Makefile ++++ b/daemon/Makefile +@@ -23,10 +23,8 @@ LDFLAGS += -rdynamic + LIBS = -ldl + + ifeq ($(LDAP), 1) +- ifeq ($(SASL), 1) + CFLAGS += $(XML_FLAGS) + LIBS += $(XML_LIBS) +- endif + endif + + all: automount +diff --git a/daemon/automount.c b/daemon/automount.c +index 979ecd6..7c44d4b 100644 +--- a/daemon/automount.c ++++ b/daemon/automount.c +@@ -38,10 +38,12 @@ + #include <sys/utsname.h> + + #include "automount.h" +-#ifdef LIBXML2_WORKAROUND ++#if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) + #include <dlfcn.h> ++#ifdef WITH_LDAP + #include <libxml/parser.h> + #endif ++#endif + + const char *program; /* Initialized with argv[0] */ + const char *version = VERSION_STRING; /* Program version */ +@@ -2110,7 +2112,7 @@ int main(int argc, char *argv[]) + exit(1); + } + +-#ifdef LIBXML2_WORKAROUND ++#if defined(WITH_LDAP) && defined(LIBXML2_WORKAROUND) + void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW); + if (!dh_xml2) + dh_xml2 = dlopen("libxml2.so.2", RTLD_NOW); +@@ -2158,7 +2160,7 @@ int main(int argc, char *argv[]) + if (dh_tirpc) + dlclose(dh_tirpc); + #endif +-#ifdef LIBXML2_WORKAROUND ++#if defined(WITH_LDAP) && defined( LIBXML2_WORKAROUND) + if (dh_xml2) { + xmlCleanupParser(); + dlclose(dh_xml2); diff --git a/source/n/autofs/autofs.SlackBuild b/source/n/autofs/autofs.SlackBuild index 8886f3f1e..7fb29caeb 100755 --- a/source/n/autofs/autofs.SlackBuild +++ b/source/n/autofs/autofs.SlackBuild @@ -1,6 +1,7 @@ + #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,34 +22,49 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.1.7 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +PKGNAM=autofs +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -if [ "$ARCH" = "x86_64" ]; then +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +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-autofs +PKG=$TMP/package-$PKGNAM rm -rf $PKG -mkdir -p $TMP $PKG/usr/{sbin,man/man{5,8}} +mkdir -p $TMP $PKG cd $TMP -tar xvf $CWD/autofs-$VERSION.tar.bz2 || exit 1 -cd autofs-$VERSION || exit 1 -zcat $CWD/autofs-$VERSION.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Allow x86_64 arch: -zcat $CWD/autofs.x86_64.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Compensate for modern compiler requirements: -zcat $CWD/autofs.gcc.fix.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -sed -i -e "s/OPEN_MAX/NR_OPEN/" $(grep -lr OPEN_MAX *) +rm -rf $PKGNAM-$VERSION +tar xf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +zcat $CWD/autofs-5.0.5-fix-libxml2-workaround-configure.patch.gz | patch -p1 || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -56,22 +72,54 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# SASL requires krb5: + +CFLAGS="$SLKCFLAGS" \ +CPPFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --mandir=/usr/man \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-openldap \ + --without-sasl \ --build=$ARCH-slackware-linux -make || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 -make install INSTALLROOT=$PKG || exit 1 +mv $PKG/etc/init.d $PKG/etc/rc.d +mv $PKG/etc/rc.d/autofs $PKG/etc/rc.d/rc.autofs.new +chmod 644 $PKG/etc/rc.d/rc.autofs.new -strip $PKG/usr/sbin/* -gzip -9 $PKG/usr/man/man*/* +# Prep the config files: +( cd $PKG/etc + for file in auto.master auto.misc autofs_ldap_auth.conf default/autofs ; do + mv $file ${file}.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 + +# 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/autofs-$VERSION cp -a \ - COPYING COPYRIGHT NEWS README README.options TODO \ - multiserver_mount.patch samples \ + COPYING* COPYRIGHT CREDITS INSTALL README* \ + samples \ $PKG/usr/doc/autofs-$VERSION ( cd $PKG/usr/doc/autofs-$VERSION find . \( -name Makefile -o -name *.in \) -exec rm -f {} \; @@ -79,10 +127,18 @@ cp -a \ find . -type f -exec chmod 644 {} \; ) +# If there's a CHANGELOG, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGELOG ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG + touch -r CHANGELOG $DOCSDIR/CHANGELOG +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -# Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/autofs-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/autofs/autofs.gcc.fix.diff b/source/n/autofs/autofs.gcc.fix.diff deleted file mode 100644 index 8b30019f7..000000000 --- a/source/n/autofs/autofs.gcc.fix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur autofs-3.1.7/modules/lookup_file.c autofs-3.1.7-gcc/modules/lookup_file.c ---- autofs-3.1.7/modules/lookup_file.c 2000-11-04 07:05:17.000000000 +0000 -+++ autofs-3.1.7-gcc/modules/lookup_file.c 2006-08-16 18:21:21.000000000 +0100 -@@ -197,7 +197,7 @@ - } - break; - } -- next_char: /* End of loop, since we can't continue; -+ next_char:; /* End of loop, since we can't continue; - inside a switch */ - } - diff --git a/source/n/autofs/autofs.x86_64.diff b/source/n/autofs/autofs.x86_64.diff deleted file mode 100644 index 8c4bf677c..000000000 --- a/source/n/autofs/autofs.x86_64.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- autofs-3.1.7/include/linux/auto_fs.h 2000-11-04 07:05:18.000000000 +0000 -+++ auto_fs.h 2006-10-19 13:46:21.000000000 +0000 -@@ -45,7 +45,7 @@ - * If so, 32-bit user-space code should be backwards compatible. - */ - --#if defined(__sparc__) || defined(__mips__) -+#if defined(__sparc__) || defined(__mips__) || defined(__s390__) || defined(__x86_64__) - typedef unsigned int autofs_wqt_t; - #else - typedef unsigned long autofs_wqt_t; diff --git a/source/n/autofs/doinst.sh b/source/n/autofs/doinst.sh new file mode 100644 index 000000000..0b0d80309 --- /dev/null +++ b/source/n/autofs/doinst.sh @@ -0,0 +1,26 @@ +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.autofs.new: +if [ -e etc/rc.d/rc.autofs ]; then + cp -a etc/rc.d/rc.autofs etc/rc.d/rc.autofs.new.incoming + cat etc/rc.d/rc.autofs.new > etc/rc.d/rc.autofs.new.incoming + mv etc/rc.d/rc.autofs.new.incoming etc/rc.d/rc.autofs.new +fi + +config etc/auto.master.new +config etc/auto.misc.new +config etc/autofs_ldap_auth.conf.new +config etc/default/autofs.new + +config etc/rc.d/rc.autofs.new + diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild index afcde9e1b..73b7d2ff2 100755 --- a/source/n/bind/bind.SlackBuild +++ b/source/n/bind/bind.SlackBuild @@ -22,11 +22,19 @@ PKGNAM=bind -VERSION=${VERSION:-9.4.3-P3} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-9.4.3-P4} NUMJOBS=${NUMJOBS:-" -j7 "} 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=/bind-$(mcookie) diff --git a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild index 0bef3fb99..ac2a8442c 100755 --- a/source/n/bluez-hcidump/bluez-hcidump.SlackBuild +++ b/source/n/bluez-hcidump/bluez-hcidump.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,17 +23,32 @@ PKGNAM=bluez-hcidump VERSION=${VERSION:-1.42} -ARCH=${ARCH:-x86_64} +BUILD=${BUILD:-3} + NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + 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) @@ -55,6 +70,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Patch to build with bluez+>4.61 +zcat $CWD/hci.c_for_bluez-4.61.patch.gz | patch -p1 || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -98,9 +116,17 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ + AUTHORS COPYING* INSTALL NEWS README* \ $PKG/usr/doc/${PKGNAM}-$VERSION +# 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 diff --git a/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch b/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch new file mode 100644 index 000000000..bcd6b4a0a --- /dev/null +++ b/source/n/bluez-hcidump/hci.c_for_bluez-4.61.patch @@ -0,0 +1,21 @@ +diff -Nur bluez-hcidump-1.42.orig//parser/hci.c bluez-hcidump-1.42/parser/hci.c +--- bluez-hcidump-1.42.orig//parser/hci.c 2008-06-15 07:46:13.000000000 -0500 ++++ bluez-hcidump-1.42/parser/hci.c 2010-03-02 23:15:35.171713301 -0600 +@@ -1973,7 +1973,7 @@ + + static inline void read_inquiry_transmit_power_level_dump(int level, struct frame *frm) + { +- read_inquiry_transmit_power_level_rp *rp = frm->ptr; ++ read_inq_response_tx_power_level_rp *rp = frm->ptr; + + p_indent(level, frm); + printf("status 0x%2.2x level %d\n", rp->status, rp->level); +@@ -2325,7 +2325,7 @@ + case OCF_READ_EXT_INQUIRY_RESPONSE: + read_ext_inquiry_response_dump(level, frm); + return; +- case OCF_READ_INQUIRY_TRANSMIT_POWER_LEVEL: ++ case OCF_READ_INQ_RESPONSE_TX_POWER_LEVEL: + read_inquiry_transmit_power_level_dump(level, frm); + return; + case OCF_READ_DEFAULT_ERROR_DATA_REPORTING: diff --git a/source/n/bluez-hcidump/slack-desc b/source/n/bluez-hcidump/slack-desc index e4c8205c2..591118373 100644 --- a/source/n/bluez-hcidump/slack-desc +++ b/source/n/bluez-hcidump/slack-desc @@ -6,10 +6,10 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -bluez-hcidump: bluez-hcidump (Linux Bluetooth(TM) analyzer) +bluez-hcidump: bluez-hcidump (Bluetooth analyzer) bluez-hcidump: -bluez-hcidump: The bluez-hcidump package contains a network analyzer for -bluez-hcidump: Bluetooth(TM). The hcidump utility reads raw HCI data coming from and +bluez-hcidump: The bluez-hcidump package contains a network analyzer for Bluetooth. +bluez-hcidump: This utility (hcidump) utility reads raw HCI data coming from and bluez-hcidump: going to a Bluetooth device and prints commands, events and data. bluez-hcidump: bluez-hcidump: For more info, visit: http://www.bluez.org diff --git a/source/n/bluez-libs/slack-desc b/source/n/bluez-libs/slack-desc deleted file mode 100644 index f9a57e285..000000000 --- a/source/n/bluez-libs/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------------------------------------------------------| -bluez-libs: bluez-libs (Bluetooth(TM) wireless libraries) -bluez-libs: -bluez-libs: The bluez-libs package contains an implementation of the Bluetooth(TM) -bluez-libs: wireless standards specifications for Linux. -bluez-libs: -bluez-libs: For more info, visit: http://www.bluez.org -bluez-libs: -bluez-libs: -bluez-libs: -bluez-libs: -bluez-libs: diff --git a/source/n/bluez-utils/60-bluetooth.rules b/source/n/bluez-utils/60-bluetooth.rules deleted file mode 100644 index 0957225fd..000000000 --- a/source/n/bluez-utils/60-bluetooth.rules +++ /dev/null @@ -1,35 +0,0 @@ -# Brain Boxes BL-620 Bluetooth Adapter -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Brain Boxes", SYSFS{prod_id2}=="Bluetooth PC Card", ENV{HCIOPTS}="bboxes", RUN+="bluetooth_serial" - -# Xircom CreditCard Bluetooth Adapter -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial" - -# Xircom RealPort2 Bluetooth Adapter -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Xircom", SYSFS{prod_id3}=="CBT", ENV{HCIOPTS}="xircom", RUN+="bluetooth_serial" - -# IBM Bluetooth PC Card II -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="IBM", SYSFS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial" - -# TDK Bluetooth PC Card -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="TDK", SYSFS{prod_id2}=="Bluetooth PC Card II", ENV{HCIOPTS}="tdk", RUN+="bluetooth_serial" - -# AmbiCom BT2000C Bluetooth PC/CF Card -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="AmbiCom BT2000C", SYSFS{prod_id2}=="Bluetooth PC/CF Card", ENV{HCIOPTS}="bt2000c", RUN+="bluetooth_serial" - -# COM One Platinium Bluetooth PC Card -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="COM1 SA", SYSFS{prod_id2}=="MC310 CARD", ENV{HCIOPTS}="comone", RUN+="bluetooth_serial" - -# Sphinx PICO Card -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="SPHINX", SYSFS{prod_id2}=="BT-CARD", ENV{HCIOPTS}="picocard", RUN+="bluetooth_serial" - -# H-Soft blue+Card -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="H-Soft", SYSFS{prod_id2}=="Blue+CARD", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial" - -# Compaq iPAQ Bluetooth Sleeve, Belkin F8T020, any other muppet who used an OXCF950 and didn't bother to program it appropriately. -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="CF CARD", SYSFS{prod_id2}=="GENERIC", ENV{HCIOPTS}="$sysfs{manf_id},$sysfs{card_id}", RUN+="bluetooth_serial" - -# Zoom Bluetooth Card and Sitecom CN-504 Card -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="PCMCIA", SYSFS{prod_id2}=="Bluetooth Card", ENV{HCIOPTS}="zoom", RUN+="bluetooth_serial" - -# CC&C BT0100M -SUBSYSTEM=="tty", BUS=="pcmcia", SYSFS{prod_id1}=="Bluetooth BT0100M", ENV{HCIOPTS}="bcsp 115200", RUN+="bluetooth_serial" diff --git a/source/n/bluez-utils/README.SLACKWARE b/source/n/bluez-utils/README.SLACKWARE deleted file mode 100644 index 795c8c5a2..000000000 --- a/source/n/bluez-utils/README.SLACKWARE +++ /dev/null @@ -1,18 +0,0 @@ -PIN (or passkey) management ---------------------------- -since bluez 3.0 the old pin_helper script has been replaced by -the dbus interface. To add a default passkey for every outgoing -request (e.g. the old /etc/bluetooth/pin file) drop it into -/etc/bluetooth/passkeys/default. (e.g. echo -n "1234" > -/etc/bluetooth/passkeys/default ) -To add a passkey for a specific outgoing connection replace default -with the device's address. ( /etc/bluetooth/passkeys/aa:bb:cc:dd:ee:ff -will contain passkey for aa:bb:cc:dd:ee:ff ). -After adding a passkey you should restart bluetooth with - -/etc/init.d/bluetooth restart - -and the new passkeys will be registered. - - -(This behaviour has been copied from Debian) diff --git a/source/n/bluez-utils/bluetooth.conf b/source/n/bluez-utils/bluetooth.conf deleted file mode 100644 index c0476237a..000000000 --- a/source/n/bluez-utils/bluetooth.conf +++ /dev/null @@ -1,24 +0,0 @@ -<!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. --> - -<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- ../system.conf have denied everything, so we just punch some holes --> - - <policy user="root"> - <allow own="org.bluez"/> - <allow send_destination="org.bluez"/> - <allow send_interface="org.bluez.Agent"/> - </policy> - - <policy at_console="true"> - <allow send_destination="org.bluez"/> - </policy> - - <policy context="default"> - <deny send_destination="org.bluez"/> - </policy> - -</busconfig> diff --git a/source/n/bluez-utils/bluez-utils.SlackBuild b/source/n/bluez-utils/bluez-utils.SlackBuild deleted file mode 100755 index 7f8b95746..000000000 --- a/source/n/bluez-utils/bluez-utils.SlackBuild +++ /dev/null @@ -1,188 +0,0 @@ -#!/bin/sh -# -# SlackBuild for bluez-utils -# http://www.bluez.org -# By SukkoPera <enjoy.the.silence@iol.it> -# Thanks a lot to CAT for his Slackware package cration -# guide (http://www.slacky.it/misto/tutorial/spunleashed.txt) -# -# Check out -# - http://www.sukkopera.tk -# - http://www.slacky.it -# - http://www.nyft.org -# -# Notes: -# - Many files and the whole PIN management system have been stolen from the -# Debian package. Thanks. -# -# Rewritten for Slackware 2007-05 <pjv> - -NAME=bluez-utils -VERSION=${VERSION:-3.36} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-7} - - -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" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$NAME - -rm -rf $PKG -mkdir -p $TMP $PKG -mkdir -p $PKG/etc/rc.d \ - $PKG/etc/bluetooth/passkeys \ - $PKG/usr/lib${LIBDIRSUFFIX}/bluetooth -# Is there any reason for a non-root user to be able to see these? -chmod 700 $PKG/etc/bluetooth/passkeys -cd $TMP -rm -rf $NAME-$VERSION -tar xvf $CWD/${NAME}-${VERSION}.tar.bz2 || exit 1 -cd $NAME-$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" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --mandir=/usr/man \ - --localstatedir=/var \ - --enable-tools\ - --enable-bccmd \ - --enable-hid2hci \ - --enable-dfutool \ - --enable-hidd \ - --enable-pand \ - --enable-dund \ - --enable-cups \ - --enable-manpages \ - --enable-configfiles \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG - -mkdir -p $PKG/lib/udev -cp -a scripts/bluetooth_serial $PKG/lib/udev/bluetooth_serial || exit 1 -chmod 755 $PKG/lib/udev/bluetooth_serial - -mkdir -p $PKG/lib/udev/rules.d -cp -a scripts/bluetooth.rules $PKG/lib/udev/rules.d/60-bluetooth.rules || exit 1 -chmod 644 $PKG/lib/udev/rules.d/60-bluetooth.rules - -# This appears to be gone/obsolete: -#if [ ! -e $PKG/etc/bluetooth/transfer.service ]; then -# cat transfer/transfer.service > $PKG/etc/bluetooth/transfer.service -#fi -#if [ ! -e $PKG/usr/lib${LIBDIRSUFFIX}/bluetooth/bluetoothd-service-transfer -a -e transfer/bluetoothd-service-transfer ]; then -# cat transfer/bluetoothd-service-transfer > $PKG/usr/lib${LIBDIRSUFFIX}/bluetooth/bluetoothd-service-transfer -# chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/bluetooth/bluetoothd-service-transfer -#fi - -# Install Debian's add-passkey program: -DEBDEST=/usr/lib${LIBDIRSUFFIX}/bluetooth -gcc $(pkg-config --libs --cflags dbus-1) -DDBUS_API_SUBJECT_TO_CHANGE \ - $CWD/add-passkey.c -o $PKG/$DEBDEST/add-passkey || exit 1 -cp $CWD/register-passkeys $PKG/$DEBDEST -if [ "$ARCH" = "x86_64" ]; then - sed -i "s,/usr/lib/,/usr/lib${LIBDIRSUFFIX}/,g" $PKG/$DEBDEST/register-passkeys -fi -chmod a+x $PKG/$DEBDEST/* - -# Default PIN (wow, does this seem insecure!) -#echo "1234" > $PKG/etc/bluetooth/passkeys/default -touch $PKG/etc/bluetooth/passkeys/default - -mkdir -p $PKG/usr/doc/$NAME-$VERSION -cp -a \ - AUTHORS ChangeLog COPYING* INSTALL NEWS README $CWD/README.SLACKWARE \ - $PKG/usr/doc/$NAME-$VERSION -( cd $PKG/etc/bluetooth - ln -sf /usr/doc/$NAME-$VERSION/README.SLACKWARE . -) - -# Arrange init scripts and config files: -CONF=/etc/rc.d/rc.bluetooth.conf -mkdir -p $PKG/etc/rc.d -cp $CWD/rc.bluetooth $PKG/etc/rc.d/rc.bluetooth -if [ "$ARCH" = "x86_64" ]; then - sed -i "s,/usr/lib/,/usr/lib${LIBDIRSUFFIX}/,g" $PKG/etc/rc.d/rc.bluetooth -fi -cp -a $CWD/rc.bluetooth.conf $PKG/etc/rc.d/rc.bluetooth.conf -sed -i "s:\(HIDD_ENABLE=\).*:\1false:" $PKG/$CONF || exit 1 -sed -i "s:\(HID2HCI_ENABLE=\).*:\1false:" $PKG/$CONF || exit 1 - -mkdir -p $PKG/etc/bluetooth -cp -a audio/audio.conf $PKG/etc/bluetooth -cp -a audio/asound.conf $PKG/etc/bluetooth -cp -a input/input.conf $PKG/etc/bluetooth -cp -a hcid/hcid.conf $PKG/etc/bluetooth -cp -a network/network.conf $PKG/etc/bluetooth -cp -a rfcomm/rfcomm.conf $PKG/etc/bluetooth -chmod 644 $PKG/etc/bluetooth/*.conf - -# Do not overwrite configuration -# Well, let the dbus file be overwritten, as it is not usually user-edited. -( cd $PKG - for file in \ - etc/bluetooth/audio.conf \ - etc/asound.conf \ - etc/bluetooth/asound.conf \ - etc/bluetooth/input.conf \ - etc/bluetooth/hcid.conf \ - etc/bluetooth/network.conf \ - etc/bluetooth/rfcomm.conf \ - etc/bluetooth/passkeys/default \ - etc/rc.d/rc.bluetooth \ - etc/rc.d/rc.bluetooth.conf ; do - mv ${file} ${file}.new - done -) - -# Replace the bluetooth.conf file with one from BlueZ4 that works with the newest dbus: -cat $CWD/bluetooth.conf > $PKG/etc/dbus-1/system.d/bluetooth.conf - -# 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 | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$NAME-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/bluez-utils/doinst.sh b/source/n/bluez-utils/doinst.sh deleted file mode 100644 index e738d14bd..000000000 --- a/source/n/bluez-utils/doinst.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/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... -} -if [ ! -e etc/rc.d/rc.bluetooth -o ! -x etc/rc.d/rc.bluetooth ]; then - chmod 644 etc/rc.d/rc.bluetooth.new -else - chmod 755 etc/rc.d/rc.bluetooth.new -fi -config etc/rc.d/rc.bluetooth.new -config etc/rc.d/rc.bluetooth.conf.new -config etc/bluetooth/asound.conf.new -config etc/bluetooth/audio.conf.new -config etc/bluetooth/hcid.conf.new -config etc/bluetooth/input.conf.new -config etc/bluetooth/network.conf.new -config etc/bluetooth/rfcomm.conf.new -config etc/bluetooth/passkeys/default.new - -if [ ! -e etc/asound.conf ]; then - ( cd etc ; ln -sf bluetooth/asound.conf . ) -fi diff --git a/source/n/bluez-utils/rc.bluetooth b/source/n/bluez-utils/rc.bluetooth deleted file mode 100644 index cf891dcf9..000000000 --- a/source/n/bluez-utils/rc.bluetooth +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh -# -# Start/stop the Bluetooth daemons -# -# This version has been modified by SukkoPera, taking inspiration from then -# Debian init script, to add support for register-passkeys. Modified by -# Patrick Volkerding to add "restart" support, and cleaned up a tiny bit. - -set -e - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="Bluetooth subsystem" - -# The register-passkeys script was originally written by Debian: -REGISTER_PASSKEYS=/usr/lib/bluetooth/register-passkeys - -HCID_NAME=hcid -HIDD_NAME=hidd -HID2HCI_NAME=hid2hci -RFCOMM_NAME=rfcomm -PAND_NAME=pand -DUND_NAME=dund - -HCID_EXEC="`which $HCID_NAME || true`" -HIDD_EXEC="`which $HIDD_NAME || true`" -HID2HCI_EXEC="`which $HID2HCI_NAME || true`" -RFCOMM_EXEC="`which $RFCOMM_NAME || true`" -PAND_EXEC="`which $PAND_NAME || true`" -DUND_EXEC="`which $DUND_NAME || true`" - -HCID_CONFIG="/etc/bluetooth/hcid.conf" -RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" - -# Source rc.bluetooth.conf -. /etc/rc.d/rc.bluetooth.conf - -bluetooth_start() { - echo -n "Starting $DESC: " - if [ -x "$HIDD_EXEC" ] ; then - if $HIDD_ENABLE && [ -x "$HIDD_EXEC" -a -n "$HIDD_OPTIONS" ] ; then - $HIDD_EXEC $HIDD_OPTIONS || true - echo -n " $HIDD_NAME" - fi - else - echo "BlueZ does not appear to be installed!" - exit - fi - # Separate sdp daemon is depreciated, now internal function. - if $SDPD_ENABLE ; then - $HCID_EXEC -s -f $HCID_CONFIG - echo -n " $HCID_NAME sdp" - else - $HCID_EXEC -f $HCID_CONFIG - echo -n " $HCID_NAME" - fi - if $HID2HCI_ENABLE && [ -x "$HID2HCI_EXEC" ] ; then - $HID2HCI_EXEC --tohci > /dev/null 2>&1 || true - echo -n " $HID2HCI_NAME" - fi - if $RFCOMM_ENABLE && [ -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ] ; then - $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all || true - echo -n " $RFCOMM_NAME" - fi - if $DUND_ENABLE && [ -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ] ; then - $DUND_EXEC $DUND_OPTIONS - echo -n " $DUND_NAME" - fi - if $PAND_ENABLE && [ -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ] ; then - $PAND_EXEC $PAND_OPTIONS - echo -n " $PAND_NAME" - fi - if [ -x $REGISTER_PASSKEYS ]; then - $REGISTER_PASSKEYS - echo -n " passkeys" - fi - echo "." -} - -bluetooth_stop() { - echo -n "Stopping $DESC: " - killall $PAND_NAME > /dev/null 2>&1 || true - echo -n " $PAND_NAME" - killall $DUND_NAME > /dev/null 2>&1 || true - echo -n " $DUND_NAME" - if [ -x "$RFCOMM_EXEC" ] ; then - $RFCOMM_EXEC release all > /dev/null 2>&1 || true - echo -n " $RFCOMM_NAME" - fi - killall $HIDD_NAME > /dev/null 2>&1 || true - echo -n " $HIDD_NAME" - killall $HCID_NAME > /dev/null 2>&1 || true - echo -n " $HCID_NAME" - echo "." -} - -case "$1" in - start) - bluetooth_start - ;; - stop) - bluetooth_stop - ;; - restart) - bluetooth_stop - sleep 1 - bluetooth_start - ;; - *) - echo "Usage: $0 start|stop|restart" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/source/n/bluez-utils/rc.bluetooth.conf b/source/n/bluez-utils/rc.bluetooth.conf deleted file mode 100644 index 09df405fb..000000000 --- a/source/n/bluez-utils/rc.bluetooth.conf +++ /dev/null @@ -1,33 +0,0 @@ -# /etc/rc.d/rc.bluetooth.conf -# -# This file contains the configuration for the Bluetooth subsystem, BlueZ. - -# The lines below allow you to configure which BlueZ daemons will be started, -# along with any daemon-specific options. - -# Allowed values for each (unless otherwise noted) are "true" and "false" - -# ============================================================================= - -# The SDP daemon allows clients to detect supported Bluetooth services -SDPD_ENABLE=true - -# The HID daemon supports Bluetooth Human Interface Devices -HIDD_ENABLE=false -HIDD_OPTIONS="--server" - -# This switches your Bluetooth device into HCI mode, use this if your input -# device does not support Bluetooth HID -HID2HCI_ENABLE=false - -# The RFCOMM daemon is used to simulate serial connections over Bluetooth -RFCOMM_ENABLE=true - -# The DUN daemon is used for Dial Up Networking over Bluetooth -DUND_ENABLE=false -DUND_OPTIONS="--listen --persist --msdun call dun" - -# The PAN daemon is used to setup a Bluetooth network. -PAND_ENABLE=false -PAND_OPTIONS="--listen --role NAP" - diff --git a/source/n/bluez-utils/register-passkeys b/source/n/bluez-utils/register-passkeys deleted file mode 100644 index f57042c3c..000000000 --- a/source/n/bluez-utils/register-passkeys +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# register every passkey found in $PASSKEYS_DIR - -PASSKEYS_DIR="/etc/bluetooth/passkeys/" -PASSKEY_AGENT="/usr/lib/bluetooth/add-passkey" - -cd $PASSKEYS_DIR - -for f in $(ls -1 ${PASSKEYS_DIR}); do - if [ ! -r "$f" ]; then continue; fi - - # default passkey - if [ "$f" == "default" ]; then - cat "$f" | $PASSKEY_AGENT --default > /dev/null 2>&1 & - # specific passkey - elif echo "$f" | egrep -q '([0-9a-fA-F]{1,2}:){5}[0-9a-fA-F]{1,2}'; then - cat "$f" | $PASSKEY_AGENT "$f" > /dev/null 2>&1 & - fi -done diff --git a/source/n/bluez-utils/slack-desc b/source/n/bluez-utils/slack-desc deleted file mode 100644 index 159f02466..000000000 --- a/source/n/bluez-utils/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------------------------------------------------------| -bluez-utils: bluez-utils (Utilities for working with Bluetooth(TM)) -bluez-utils: -bluez-utils: The bluez-utils package contains utilities for supporting -bluez-utils: Bluetooth(TM) on Linux. -bluez-utils: -bluez-utils: For more info, visit: http://www.bluez.org -bluez-utils: -bluez-utils: -bluez-utils: -bluez-utils: -bluez-utils: diff --git a/source/n/bluez/bluez.SlackBuild b/source/n/bluez/bluez.SlackBuild new file mode 100755 index 000000000..ec5cba262 --- /dev/null +++ b/source/n/bluez/bluez.SlackBuild @@ -0,0 +1,196 @@ +#!/bin/sh + +# Slackware build script for bluez-utils - http://www.bluez.org + +# Copyright 2009, 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=bluez +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +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 {} \; + +# Fixup the dbus config file for our usage: +zcat $CWD/patches/bluez-dbus-config.patch.gz | patch -p1 --verbose || exit 1 + +# Use a wrapper to check rc.bluetooth mode before starting bluetoothd +zcat $CWD/patches/bluez-run_udev_helper.patch.gz | patch -p1 --verbose || exit 1 + +# Unbreak a Dell USB mouse +# https://bugzilla.novell.com/show_bug.cgi?id=522287 +# https://bugzilla.redhat.com/show_bug.cgi?id=517088 +zcat $CWD/patches/bluez-unbreak_dell_mouse.patch.gz | patch -p1 --verbose || exit 1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --localstatedir=/var \ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-netlink \ + --enable-tools\ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + --enable-hidd \ + --enable-pand \ + --enable-dund \ + --enable-cups \ + --enable-service \ + --enable-udevrules \ + --enable-configfiles \ + --disable-silent-rules \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG + +# I'm don't think we need this, but I'll leave it commented just in case: +# http://bugs.archlinux.org/task/4930 +# The dbus-1 and bluetooth linkages are obvious, but I had to get the rt and +# pthread ones from the old bluez-utils (VERSION=3.36) tests/Makefile +#gcc $SLKCFLAGS $(pkg-config --cflags dbus-1) -DVERSION=3.36 \ +# -L$(pwd)/lib/.libs -ldbus-1 -lbluetooth -lpthread -lrt \ +# $CWD/passkey-agent.c -o $PKG/usr/bin/passkey-agent || exit 1 + +cp -a scripts/bluetooth_serial $PKG/lib/udev/bluetooth_serial || exit 1 +chmod 0755 $PKG/lib/udev/bluetooth_serial + +cat $CWD/config/bluetooth.sh > $PKG/lib/udev/bluetooth.sh +chmod 0755 $PKG/lib/udev/bluetooth.sh + +# SuSE says this is safe... :-) +mkdir -p $PKG/etc/modprobe.d +cat $CWD/config/bluetooth.modprobe > $PKG/etc/modprobe.d/bluetooth.conf + +mkdir -p $PKG/etc/bluetooth +cp -a audio/audio.conf $PKG/etc/bluetooth +cp -a input/input.conf $PKG/etc/bluetooth +cp -a network/network.conf $PKG/etc/bluetooth +cp -a serial/serial.conf $PKG/etc/bluetooth +cp -a tools/rfcomm.conf $PKG/etc/bluetooth +chmod 644 $PKG/etc/bluetooth/*.conf + +# Do not overwrite configuration +# Well, let the dbus file be overwritten, as it is not usually user-edited. +( cd $PKG + for file in \ + etc/alsa/bluetooth.conf \ + etc/bluetooth/audio.conf \ + etc/bluetooth/input.conf \ + etc/bluetooth/network.conf \ + etc/bluetooth/serial.conf \ + etc/bluetooth/rfcomm.conf \ + etc/bluetooth/main.conf \ + etc/modprobe.d/bluetooth.conf ; do + mv ${file} ${file}.new + done +) + +# Add an init script +mkdir -p $PKG/etc/rc.d +cat $CWD/config/rc.bluetooth > $PKG/etc/rc.d/rc.bluetooth.new + +# 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 | 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/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${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 +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/n/bluez/config/bluetooth.modprobe b/source/n/bluez/config/bluetooth.modprobe new file mode 100644 index 000000000..3072d7885 --- /dev/null +++ b/source/n/bluez/config/bluetooth.modprobe @@ -0,0 +1,3 @@ +# use "reset=1" as default, since it should be safe for recent devices and +# solves all kind of problems. +options btusb reset=1 diff --git a/source/n/bluez/config/bluetooth.sh b/source/n/bluez/config/bluetooth.sh new file mode 100644 index 000000000..22034551c --- /dev/null +++ b/source/n/bluez/config/bluetooth.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# Check whether /etc/rc.d/rc.bluetooth is executable before starting +# the bluetooth subsystem for hotplugged bluetooth devices +[ -x /etc/rc.d/rc.bluetooth ] && exec /usr/sbin/bluetoothd --udev +exit 0 + diff --git a/source/n/bluez/config/rc.bluetooth b/source/n/bluez/config/rc.bluetooth new file mode 100644 index 000000000..12540d833 --- /dev/null +++ b/source/n/bluez/config/rc.bluetooth @@ -0,0 +1,30 @@ +#!/bin/sh + +bluez_start() { + # bluetoothd requires dbus, but dbus isn't started early enough during + # system boot, so we have to re-trigger the events now + udevadm trigger --subsystem-match=bluetooth --action=add +} + +bluez_stop() { + pkill -TERM bluetoothd 1>/dev/null 2>/dev/null +} + +case "$1" in + start) + bluez_start + ;; + stop) + bluez_stop + ;; + restart) + bluez_stop + sleep 1 + bluez_start + ;; + *) + printf "Usage: $N {start|stop|restart}\n" + exit 1 + ;; +esac + diff --git a/source/n/bluez/doinst.sh b/source/n/bluez/doinst.sh new file mode 100644 index 000000000..1711435e0 --- /dev/null +++ b/source/n/bluez/doinst.sh @@ -0,0 +1,29 @@ +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.bluetooth.new: +if [ -e etc/rc.d/rc.bluetooth ]; then + cp -a etc/rc.d/rc.bluetooth etc/rc.d/rc.bluetooth.new.incoming + cat etc/rc.d/rc.bluetooth.new > etc/rc.d/rc.bluetooth.new.incoming + mv etc/rc.d/rc.bluetooth.new.incoming etc/rc.d/rc.bluetooth.new +fi + +config etc/alsa/bluetooth.conf.new +config etc/rc.d/rc.bluetooth.new +config etc/bluetooth/audio.conf.new +config etc/bluetooth/input.conf.new +config etc/bluetooth/main.conf.new +config etc/bluetooth/network.conf.new +config etc/bluetooth/serial.conf.new +config etc/bluetooth/rfcomm.conf.new +config etc/modprobe.d/bluetooth.conf.new + diff --git a/source/n/bluez-utils/add-passkey.c b/source/n/bluez/passkey-agent.c index b9dcbb517..8ac91d27d 100644 --- a/source/n/bluez-utils/add-passkey.c +++ b/source/n/bluez/passkey-agent.c @@ -1,11 +1,8 @@ /* - * add-passkey.c: - * registers as an agent for the bluez bluetooth linux stack, the code is - * shamelessly stolen from bluez source found at http://bluez.sf.net * * BlueZ - Bluetooth protocol stack for Linux * - * Copyright (C) 2005-2006 Marcel Holtmann <marcel@holtmann.org> + * Copyright (C) 2004-2008 Marcel Holtmann <marcel@holtmann.org> * * * This program is free software; you can redistribute it and/or modify @@ -40,12 +37,11 @@ #define INTERFACE "org.bluez.Security" -// FIXME assumption -#define PASSKEYMAXLENGTH 255 - static char *passkey = NULL; static char *address = NULL; +static int do_reject = 0; + static volatile sig_atomic_t __io_canceled = 0; static volatile sig_atomic_t __io_terminated = 0; @@ -70,6 +66,7 @@ static DBusHandlerResult agent_filter(DBusConnection *conn, } if (!strcmp(name, "org.bluez") && *new == '\0') { + fprintf(stderr, "Passkey service has been terminated\n"); __io_terminated = 1; } @@ -81,25 +78,36 @@ static DBusHandlerResult request_message(DBusConnection *conn, { DBusMessage *reply; const char *path, *address; + dbus_bool_t numeric; if (!passkey) return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &path, - DBUS_TYPE_STRING, &address, DBUS_TYPE_INVALID)) { + if (!dbus_message_get_args(msg, NULL, + DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address, + DBUS_TYPE_BOOLEAN, &numeric, DBUS_TYPE_INVALID)) { fprintf(stderr, "Invalid arguments for passkey Request method"); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + if (do_reject) { + reply = dbus_message_new_error(msg, + "org.bluez.Error.Rejected", ""); + goto send; + } + reply = dbus_message_new_method_return(msg); if (!reply) { fprintf(stderr, "Can't create reply message\n"); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + return DBUS_HANDLER_RESULT_NEED_MEMORY; } + printf("Passkey request for device %s\n", address); + dbus_message_append_args(reply, DBUS_TYPE_STRING, &passkey, DBUS_TYPE_INVALID); +send: dbus_connection_send(conn, reply, NULL); dbus_connection_flush(conn); @@ -109,35 +117,63 @@ static DBusHandlerResult request_message(DBusConnection *conn, return DBUS_HANDLER_RESULT_HANDLED; } -static DBusHandlerResult release_message(DBusConnection *conn, +static DBusHandlerResult cancel_message(DBusConnection *conn, DBusMessage *msg, void *data) { DBusMessage *reply; + const char *path, *address; - if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) { - fprintf(stderr, "Invalid arguments for passkey Release method"); + if (!dbus_message_get_args(msg, NULL, + DBUS_TYPE_STRING, &path, DBUS_TYPE_STRING, &address, + DBUS_TYPE_INVALID)) { + fprintf(stderr, "Invalid arguments for passkey Confirm method"); return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } + printf("Request canceled for device %s\n", address); + reply = dbus_message_new_method_return(msg); if (!reply) { fprintf(stderr, "Can't create reply message\n"); - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + return DBUS_HANDLER_RESULT_NEED_MEMORY; } - dbus_message_append_args(reply, DBUS_TYPE_INVALID); - dbus_connection_send(conn, reply, NULL); dbus_connection_flush(conn); dbus_message_unref(reply); + return DBUS_HANDLER_RESULT_HANDLED; +} + +static DBusHandlerResult release_message(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + DBusMessage *reply; + + if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) { + fprintf(stderr, "Invalid arguments for passkey Release method"); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + if (!__io_canceled) fprintf(stderr, "Passkey service has been released\n"); __io_terminated = 1; + reply = dbus_message_new_method_return(msg); + if (!reply) { + fprintf(stderr, "Can't create reply message\n"); + return DBUS_HANDLER_RESULT_NEED_MEMORY; + } + + dbus_connection_send(conn, reply, NULL); + + dbus_connection_flush(conn); + + dbus_message_unref(reply); + return DBUS_HANDLER_RESULT_HANDLED; } @@ -147,6 +183,9 @@ static DBusHandlerResult agent_message(DBusConnection *conn, if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Request")) return request_message(conn, msg, data); + if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Cancel")) + return cancel_message(conn, msg, data); + if (dbus_message_is_method_call(msg, "org.bluez.PasskeyAgent", "Release")) return release_message(conn, msg, data); @@ -166,7 +205,7 @@ static int register_agent(DBusConnection *conn, const char *agent_path, if (!dbus_connection_register_object_path(conn, agent_path, &agent_table, NULL)) { - fprintf(stderr, "Can't register path object path for agent\n"); + fprintf(stderr, "Can't register object path for agent\n"); return -1; } @@ -231,7 +270,7 @@ static int unregister_agent(DBusConnection *conn, const char *agent_path, msg = dbus_message_new_method_call("org.bluez", path, INTERFACE, method); if (!msg) { fprintf(stderr, "Can't allocate new method call\n"); - dbus_connection_close(conn); + dbus_connection_unref(conn); exit(1); } @@ -268,21 +307,16 @@ static int unregister_agent(DBusConnection *conn, const char *agent_path, static void usage(void) { -// printf("Bluetooth passkey agent ver %s\n\n", VERSION); + printf("Bluetooth passkey agent ver %s\n\n", VERSION); printf("Usage:\n" - "\tadd-passkey [--passkey-fd n] [--default] [--path agent-path] [address]\n" - "\n" - "add-passkey will read from passkey-fd (default: stdin) adding a default passkey\n" - "if --default is given, or for a specific address if supplied on commandline.\n\n" - "--default or address are mandatory.\n" - "this program is based on bluez passkey-agent.c from http://bluez.sf.net\n" + "\tpasskey-agent [--default] [--path agent-path] <passkey> [address]\n" "\n"); } static struct option main_options[] = { - { "passkey-fd", 1, 0, 'f'}, { "default", 0, 0, 'd' }, + { "reject", 0, 0, 'r' }, { "path", 1, 0, 'p' }, { "help", 0, 0, 'h' }, { 0, 0, 0, 0 } @@ -293,19 +327,19 @@ int main(int argc, char *argv[]) struct sigaction sa; DBusConnection *conn; char match_string[128], default_path[128], *agent_path = NULL; - int opt, use_default = 0, passkey_fd = 0; - char *tmppasskey; + int opt, use_default = 0; snprintf(default_path, sizeof(default_path), "/org/bluez/passkey_agent_%d", getpid()); - while ((opt = getopt_long(argc, argv, "+fdp:h", main_options, NULL)) != EOF) { + while ((opt = getopt_long(argc, argv, "+dp:h", main_options, NULL)) != EOF) { switch(opt) { - case 'f': - passkey_fd = atoi(optarg); case 'd': use_default = 1; break; + case 'r': + do_reject = 1; + break; case 'p': if (optarg[0] != '/') { fprintf(stderr, "Invalid path\n"); @@ -324,24 +358,14 @@ int main(int argc, char *argv[]) argc -= optind; argv += optind; optind = 0; - - if (argc < 1 && !use_default) { + + if (argc < 1) { usage(); exit(1); } - - passkey = malloc(PASSKEYMAXLENGTH * sizeof(char)); - - if (!read(passkey_fd, passkey, PASSKEYMAXLENGTH)) { - fprintf(stderr, "Unable to read passkey from fd %d\n", passkey_fd); - exit(1); - } - - if (tmppasskey = index(passkey, '\n')) { - *tmppasskey = '\0'; - } - address = (argc > 0) ? strdup(argv[0]) : NULL; + passkey = strdup(argv[0]); + address = (argc > 1) ? strdup(argv[1]) : NULL; if (!use_default && !address) { usage(); @@ -358,7 +382,7 @@ int main(int argc, char *argv[]) } if (register_agent(conn, agent_path, address, use_default) < 0) { - dbus_connection_close(conn); + dbus_connection_unref(conn); exit(1); } @@ -378,7 +402,7 @@ int main(int argc, char *argv[]) sigaction(SIGINT, &sa, NULL); while (!__io_canceled && !__io_terminated) { - if (dbus_connection_read_write_dispatch(conn, 100) != TRUE) + if (dbus_connection_read_write_dispatch(conn, 500) != TRUE) break; } @@ -388,7 +412,7 @@ int main(int argc, char *argv[]) if (passkey) free(passkey); - dbus_connection_close(conn); + dbus_connection_unref(conn); return 0; } diff --git a/source/n/bluez/patches/bluez-dbus-config.patch b/source/n/bluez/patches/bluez-dbus-config.patch new file mode 100644 index 000000000..4160600a5 --- /dev/null +++ b/source/n/bluez/patches/bluez-dbus-config.patch @@ -0,0 +1,25 @@ +Use the plugdev group for bluetooth on Slackware, and allow this to + work as expected with our current setup. + +diff -Nur bluez-4.61.orig//src/bluetooth.conf bluez-4.61/src/bluetooth.conf +--- bluez-4.61.orig//src/bluetooth.conf 2010-02-18 17:48:50.434527785 -0600 ++++ bluez-4.61/src/bluetooth.conf 2010-02-18 17:47:30.727431004 -0600 +@@ -11,11 +11,16 @@ + <allow own="org.bluez"/> + <allow send_destination="org.bluez"/> + <allow send_interface="org.bluez.Agent"/> ++ <allow send_interface="org.bluez.Adapter"/> + <allow send_interface="org.bluez.HandsfreeAgent"/> + </policy> + +- <policy at_console="true"> +- <allow send_destination="org.bluez"/> ++ <policy group="plugdev"> ++ <allow send_destination="org.bluez"/> ++ <allow send_interface="org.bluez.Agent"/> ++ <allow send_interface="org.bluez.Adapter"/> ++ <allow send_destination="org.bluez" ++ send_interface="org.freedesktop.DBus.Introspectable"/> + </policy> + + <!-- allow users of lp group (printing subsystem) to diff --git a/source/n/bluez/patches/bluez-run_udev_helper.patch b/source/n/bluez/patches/bluez-run_udev_helper.patch new file mode 100644 index 000000000..188607453 --- /dev/null +++ b/source/n/bluez/patches/bluez-run_udev_helper.patch @@ -0,0 +1,12 @@ +Instead of automatically starting the bluetooth subsystem when devices + are added, let's invoke a wrapper script in /lib/udev and have that + wrapper check whether /etc/rc.d/rc.bluetooth is executable first. + +diff -Nur bluez-4.59.orig/scripts/bluetooth.rules.in bluez-4.59/scripts/bluetooth.rules.in +--- bluez-4.59.orig/scripts/bluetooth.rules.in 2009-07-06 15:21:40.000000000 -0500 ++++ bluez-4.59/scripts/bluetooth.rules.in 2009-12-30 11:50:37.069164823 -0600 +@@ -1,3 +1,3 @@ + # Run helper every time a Bluetooth device appears + # On remove actions, bluetoothd should go away by itself +-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev" ++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluetooth.sh" diff --git a/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch b/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch new file mode 100644 index 000000000..ec0b4a96b --- /dev/null +++ b/source/n/bluez/patches/bluez-unbreak_dell_mouse.patch @@ -0,0 +1,14 @@ +One of the Dell USB mice gets broken by this rule, so we'll unbreak it. + +diff -Nur bluez-4.59.orig/scripts/bluetooth-hid2hci.rules bluez-4.59/scripts/bluetooth-hid2hci.rules +--- bluez-4.59.orig/scripts/bluetooth-hid2hci.rules 2009-05-19 04:04:10.000000000 -0500 ++++ bluez-4.59/scripts/bluetooth-hid2hci.rules 2009-12-30 12:34:14.165164370 -0600 +@@ -8,7 +8,7 @@ + # 413c:8154 + # 413c:8158 + # 413c:8162 +-ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" ++# ACTION=="add", ENV{ID_VENDOR}=="413c", ENV{ID_CLASS}=="mouse", ATTRS{bmAttributes}=="e0", KERNEL=="mouse*", RUN+="/usr/sbin/hid2hci --method dell -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" + + # Logitech devices + ACTION=="add", ENV{ID_VENDOR}=="046d", ENV{ID_MODEL}=="c703" RUN+="/usr/sbin/hid2hci --method logitech -v $env{ID_VENDOR} -p $env{ID_MODEL} --mode hci" diff --git a/source/n/bluez/slack-desc b/source/n/bluez/slack-desc new file mode 100644 index 000000000..607fa4d96 --- /dev/null +++ b/source/n/bluez/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------------------------------------------------------| +bluez: bluez (Bluetooth libraries and utilities) +bluez: +bluez: Bluez is the Bluetooth stack for Linux, allowing Bluetooth adaptors +bluez: and devices to be used with Linux. This package contains the Bluez +bluez: libraries, utilities, and other support files. +bluez: +bluez: For more info, visit: http://www.bluez.org +bluez: +bluez: +bluez: +bluez: diff --git a/source/n/crda/crda.SlackBuild b/source/n/crda/crda.SlackBuild index b055ab520..93ffcd64a 100755 --- a/source/n/crda/crda.SlackBuild +++ b/source/n/crda/crda.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2009 Robby Workman, Northport, AL, USA -# 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 @@ -22,11 +22,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.0.1} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.1.1} +BUILD=${BUILD:-1} -REGDBVERS=git_20090222 +# 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 + +REGDBVERS=git_20100502 CWD=$(pwd) TMP=${TMP:-/tmp} @@ -42,6 +51,8 @@ elif [ "$ARCH" = "arm" ]; then SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" elif [ "$ARCH" = "armel" ]; then SLKCFLAGS="-O2 -march=armv4t" +else + SLKCFLAGS="-O2" fi rm -rf $PKG diff --git a/source/n/curl/cacert.pem b/source/n/curl/cacert.pem index 2feb1e8a2..d7d20b626 100644 --- a/source/n/curl/cacert.pem +++ b/source/n/curl/cacert.pem @@ -1,7 +1,7 @@ ## -## cacert.pem-foo -- Bundle of CA Root Certificates +## ca-bundle.crt -- Bundle of CA Root Certificates ## -## Converted at: Thu Mar 26 21:23:06 2009 UTC +## Converted at: Tue Sep 22 09:25:27 2009 UTC ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates @@ -49,7 +49,7 @@ # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** -# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.51 $ $Date: 2009/01/15 22:35:15 $ +# @(#) $RCSfile: certdata.txt,v $ $Revision: 1.53 $ $Date: 2009/05/21 19:50:28 $ Verisign/RSA Secure Server CA ============================= @@ -3152,3 +3152,358 @@ BQUHAwIwDAYDVR0TAQH/BAIwADANBgkqhkiG9w0BAQQFAAOBgQCnIQKN0Q6igHcl/UNgFY/s75BH 1IRCFSYRHM3CPBApqbbfq1d1kdrlK7OQRRwwY1Y/itlQ+u1YbMBlrGZX3hzGdjv1AA6ORc5/TJDs K8bNs7SPYtD+t8UmckTt9phbrsvRlfXaCL5oRrF1yOwdjx56lPGqU3iiRa5U6tGedMh2Zw== -----END CERTIFICATE----- + +IGC/A +===== +-----BEGIN CERTIFICATE----- +MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD +VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE +Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy +MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI +EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT +STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB +IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2 +TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW +So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy +HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd +frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ +tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB +egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC +iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK +q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q +MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg +Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI +lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF +0mBWWg== +-----END CERTIFICATE----- + +Security Communication EV RootCA1 +================================= +-----BEGIN CERTIFICATE----- +MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc +U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh +dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE +BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl +Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO +/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX +WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z +ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4 +bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK +9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG +SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm +iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG +Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW +mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW +T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490 +-----END CERTIFICATE----- + +OISTE WISeKey Global Root GA CA +=============================== +-----BEGIN CERTIFICATE----- +MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE +BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG +A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH +bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD +VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw +IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5 +IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9 +Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg +Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD +d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ +/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R +LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw +AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ +KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm +MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4 ++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa +hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY +okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0= +-----END CERTIFICATE----- + +S-TRUST Authentication and Encryption Root CA 2005 PN +===================================================== +-----BEGIN CERTIFICATE----- +MIIEezCCA2OgAwIBAgIQNxkY5lNUfBq1uMtZWts1tzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE +BhMCREUxIDAeBgNVBAgTF0JhZGVuLVd1ZXJ0dGVtYmVyZyAoQlcpMRIwEAYDVQQHEwlTdHV0dGdh +cnQxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMT4wPAYDVQQDEzVT +LVRSVVNUIEF1dGhlbnRpY2F0aW9uIGFuZCBFbmNyeXB0aW9uIFJvb3QgQ0EgMjAwNTpQTjAeFw0w +NTA2MjIwMDAwMDBaFw0zMDA2MjEyMzU5NTlaMIGuMQswCQYDVQQGEwJERTEgMB4GA1UECBMXQmFk +ZW4tV3VlcnR0ZW1iZXJnIChCVykxEjAQBgNVBAcTCVN0dXR0Z2FydDEpMCcGA1UEChMgRGV1dHNj +aGVyIFNwYXJrYXNzZW4gVmVybGFnIEdtYkgxPjA8BgNVBAMTNVMtVFJVU1QgQXV0aGVudGljYXRp +b24gYW5kIEVuY3J5cHRpb24gUm9vdCBDQSAyMDA1OlBOMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEA2bVKwdMz6tNGs9HiTNL1toPQb9UY6ZOvJ44TzbUlNlA0EmQpoVXhOmCTnijJ4/Ob +4QSwI7+Vio5bG0F/WsPoTUzVJBY+h0jUJ67m91MduwwA7z5hca2/OnpYH5Q9XIHV1W/fuJvS9eXL +g3KSwlOyggLrra1fFi2SU3bxibYs9cEv4KdKb6AwajLrmnQDaHgTncovmwsdvs91DSaXm8f1Xgqf +eN+zvOyauu9VjxuapgdjKRdZYgkqeQd3peDRF2npW932kKvimAoA0SVtnteFhy+S8dF2g08LOlk3 +KC8zpxdQ1iALCvQm+Z845y2kuJuJja2tyWp9iRe79n+Ag3rm7QIDAQABo4GSMIGPMBIGA1UdEwEB +/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMCkGA1UdEQQiMCCkHjAcMRowGAYDVQQDExFTVFJv +bmxpbmUxLTIwNDgtNTAdBgNVHQ4EFgQUD8oeXHngovMpttKFswtKtWXsa1IwHwYDVR0jBBgwFoAU +D8oeXHngovMpttKFswtKtWXsa1IwDQYJKoZIhvcNAQEFBQADggEBAK8B8O0ZPCjoTVy7pWMciDMD +pwCHpB8gq9Yc4wYfl35UvbfRssnV2oDsF9eK9XvCAPbpEW+EoFolMeKJ+aQAPzFoLtU96G7m1R08 +P7K9n3frndOMusDXtk3sU5wPBG7qNWdX4wple5A64U8+wwCSersFiXOMy6ZNwPv2AtawB6MDwidA +nwzkhYItr5pCHdDHjfhA7p0GVxzZotiAFP7hYy0yh9WUUpY6RsZxlj33mA6ykaqP2vROJAA5Veit +F7nTNCtKqUDMFypVZUF0Qn71wK/Ik63yGFs9iQzbRzkk+OBM8h+wPQrKBU6JIRrjKpms/H+h8Q8b +Hz2eBIPdltkdOpQ= +-----END CERTIFICATE----- + +Microsec e-Szigno Root CA +========================= +-----BEGIN CERTIFICATE----- +MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE +BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL +EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0 +MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz +dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT +GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG +d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N +oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc +QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ +PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb +MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG +IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD +VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3 +LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A +dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn +AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA +4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg +AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA +egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6 +Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO +PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv +c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h +cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw +IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT +WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV +MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER +MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp +Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal +HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT +nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE +aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a +86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK +yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB +S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU= +-----END CERTIFICATE----- + +Certigna +======== +-----BEGIN CERTIFICATE----- +MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw +EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3 +MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI +Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q +XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH +GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p +ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg +DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf +Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ +tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ +BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J +SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA +hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+ +ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu +PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY +1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw +WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg== +-----END CERTIFICATE----- + +AC Ra+¡z Certic+ímara S.A. +========================== +-----BEGIN CERTIFICATE----- +MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT +AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg +LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w +HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+ +U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh +IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN +yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU +2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3 +4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP +2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm +8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf +HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa +Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK +5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b +czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g +ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF +BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug +cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf +AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX +EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v +/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3 +MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4 +3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk +eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f +/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h +RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU +Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ== +-----END CERTIFICATE----- + +TC TrustCenter Class 2 CA II +============================ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy +IENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYw +MTEyMTQzODQzWhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 +c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UE +AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jftMjWQ+nEdVl//OEd+DFw +IxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKguNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2 +xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2JXjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQ +Xa7pIXSSTYtZgo+U4+lK8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7u +SNQZu+995OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3kUrL84J6E1wIqzCB +7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 +Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU +cnVzdENlbnRlciUyMENsYXNzJTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i +SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iSGNn3Bzn1LL4G +dXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprtZjluS5TmVfwLG4t3wVMTZonZ +KNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8au0WOB9/WIFaGusyiC2y8zl3gK9etmF1Kdsj +TYjKUCjLhdLTEKJZbtOTVAB6okaVhgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kP +JOzHdiEoZa5X6AeIdUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfk +vQ== +-----END CERTIFICATE----- + +TC TrustCenter Class 3 CA II +============================ +-----BEGIN CERTIFICATE----- +MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy +IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw +MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1 +c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE +AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W +yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo +6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ +uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk +2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB +/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB +7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90 +Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU +cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i +SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u +TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE +O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8 +yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9 +IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal +092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc +5A== +-----END CERTIFICATE----- + +TC TrustCenter Universal CA I +============================= +-----BEGIN CERTIFICATE----- +MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTELMAkGA1UEBhMC +REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNVBAsTG1RDIFRydXN0Q2VudGVy +IFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcN +MDYwMzIyMTU1NDI4WhcNMjUxMjMxMjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMg +VHJ1c3RDZW50ZXIgR21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYw +JAYDVQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcNAQEBBQAD +ggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSRJJZ4Hgmgm5qVSkr1YnwC +qMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3TfCZdzHd55yx4Oagmcw6iXSVphU9VDprv +xrlE4Vc93x9UIuVvZaozhDrzznq+VZeujRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtw +ag+1m7Z3W0hZneTvWq3zwZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9O +gdwZu5GQfezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYDVR0j +BBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC +AYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0GCSqGSIb3DQEBBQUAA4IBAQAo0uCG +1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X17caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/Cy +vwbZ71q+s2IhtNerNXxTPqYn8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3 +ghUJGooWMNjsydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT +ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/2TYcuiUaUj0a +7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY +-----END CERTIFICATE----- + +Deutsche Telekom Root CA 2 +========================== +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT +RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG +A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5 +MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G +A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS +b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5 +bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI +KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY +AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK +Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV +jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV +HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr +E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy +zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8 +rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G +dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU +Cm26OWMohpLzGITY+9HPBVZkVw== +-----END CERTIFICATE----- + +ComSign CA +========== +-----BEGIN CERTIFICATE----- +MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0MRMwEQYDVQQD +EwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTMy +MThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMTCkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNp +Z24xCzAJBgNVBAYTAklMMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49q +ROR+WCf4C9DklBKK8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTy +P2Q298CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb2CEJKHxN +GGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxCejVb7Us6eva1jsz/D3zk +YDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7KpiXd3DTKaCQeQzC6zJMw9kglcq/QytNuEM +rkvF7zuZ2SOzW120V+x0cAwqTwIDAQABo4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAy +oDCgLoYsaHR0cDovL2ZlZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0P +AQH/BAQDAgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRLAZs+ +VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWdfoPPbrxHbvUanlR2 +QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0McXS6hMTXcpuEfDhOZAYnKuGntewI +mbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb +/627HOkthIDYIb6FUtnUdLlphbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VG +zT2ouvDzuFYkRes3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U +AGegcQCCSA== +-----END CERTIFICATE----- + +ComSign Secured CA +================== +-----BEGIN CERTIFICATE----- +MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAwPDEbMBkGA1UE +AxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0w +NDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwxGzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBD +QTEQMA4GA1UEChMHQ29tU2lnbjELMAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw +ggEKAoIBAQDGtWhfHZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs +49ohgHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sWv+bznkqH +7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ueMv5WJDmyVIRD9YTC2LxB +kMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d1 +9guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUw +AwEB/zBEBgNVHR8EPTA7MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29t +U2lnblNlY3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58ADsA +j8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkqhkiG9w0BAQUFAAOC +AQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7piL1DRYHjZiM/EoZNGeQFsOY3wo3a +BijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtCdsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtp +FhpFfTMDZflScZAmlaxMDPWLkz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP +51qJThRv4zdLhfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz +OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw== +-----END CERTIFICATE----- + +Cybertrust Global Root +====================== +-----BEGIN CERTIFICATE----- +MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li +ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4 +MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD +ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA ++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW +0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL +AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin +89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT +8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP +BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2 +MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G +A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO +lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi +5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2 +hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T +X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW +WL1WMRJOEcgh4LMRkWXbtKaIOM5V +-----END CERTIFICATE----- diff --git a/source/n/curl/curl.SlackBuild b/source/n/curl/curl.SlackBuild index 5775024a6..1249dcb82 100755 --- a/source/n/curl/curl.SlackBuild +++ b/source/n/curl/curl.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,10 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=7.19.6 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo curl-*.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) @@ -43,6 +52,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG diff --git a/source/n/dhcp/dhclient-script.PATH.diff b/source/n/dhcp/dhclient-script.PATH.diff new file mode 100644 index 000000000..5dfe9f09c --- /dev/null +++ b/source/n/dhcp/dhclient-script.PATH.diff @@ -0,0 +1,13 @@ +diff -Nur dhcp-4.1.1.orig//client/scripts/linux dhcp-4.1.1/client/scripts/linux +--- dhcp-4.1.1.orig//client/scripts/linux 2009-04-21 09:21:09.000000000 -0500 ++++ dhcp-4.1.1/client/scripts/linux 2010-03-03 09:14:33.261713322 -0600 +@@ -22,6 +22,9 @@ + # 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious + # of the $1 in its args. + ++PATH=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin ++export PATH ++ + # 'ip' just looks too weird. /sbin/ip looks less weird. + ip=/sbin/ip + diff --git a/source/n/dhcp/dhcp.SlackBuild b/source/n/dhcp/dhcp.SlackBuild index 10c211ce2..6baf041a7 100755 --- a/source/n/dhcp/dhcp.SlackBuild +++ b/source/n/dhcp/dhcp.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,22 +20,38 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.1.2p1 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} + +VERSION=${VERSION:-$(echo dhcp-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-dhcp if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -43,27 +59,55 @@ mkdir -p $TMP $PKG cd $TMP rm -rf dhcp-$VERSION -tar xvf $CWD/dhcp-$VERSION.tar.gz || exit 1 +tar xvf $CWD/dhcp-$VERSION.tar.?z* || exit 1 cd dhcp-$VERSION || exit 1 -./configure -make DEBUG="$SLKCFLAGS" || exit 1 -make DEBUG="$SLKCFLAGS" install DESTDIR=$PKG || 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 {} \; + +# Add PATH setting to /sbin/dhclient-script +zcat $CWD/dhclient-script.PATH.diff.gz | patch -p1 || exit 1 + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --docdir=/usr/doc/dhcp-$VERSION \ + --build=$ARCH-slackware-linux \ + --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \ + --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \ + --with-cli-lease-file=/var/state/dhcp/dhclient.leases \ + --with-cli6-lease-file=/var/state/dhcp/dhclient6.leases +# Default pid dir is still /var/run, so no need to declare it + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# DHCP libraries need not be included, yet. +rm -rf $PKG/usr/{include,lib${LIBDIRSUFFIX}} + +# We need this in /sbin +mkdir -p $PKG/sbin +mv $PKG/usr/sbin/dhclient $PKG/sbin + +# Install the dhclient-script for linux +cat client/scripts/linux > $PKG/sbin/dhclient-script +chmod 700 $PKG/sbin/dhclient-script mkdir -p $PKG/var/state/dhcp -rm -f $PKG/var/state/dhcp/dhcpd.leases -touch $PKG/var/state/dhcp/dhcpd.leases.new - -rm -rf $PKG/usr/local - -mkdir -p $PKG/usr/doc/dhcp-$VERSION -cp -a \ - LICENSE README RELNOTES \ - $PKG/usr/doc/dhcp-$VERSION -mkdir -p $PKG/usr/doc/dhcp-$VERSION/examples -cp -a client/dhclient.conf server/dhcpd.conf \ - $PKG/usr/doc/dhcp-$VERSION/examples -chown -R root:root $PKG/usr/doc/dhcp-$VERSION +# The daemon should create these automatically as needed +#touch $PKG/var/state/dhcp/dhcpd.leases.new +#touch $PKG/var/state/dhcp/dhcpd6.leases.new +#touch $PKG/var/state/dhcp/dhclient.leases.new +#touch $PKG/var/state/dhcp/dhclient6.leases.new cat << EOF > $PKG/etc/dhcpd.conf.new # dhcpd.conf @@ -79,37 +123,35 @@ cat << EOF > $PKG/etc/dhclient.conf.new # EOF -cat client/scripts/linux > $PKG/sbin/dhclient-script -chmod 700 $PKG/sbin/dhclient-script - -gzip -9 $PKG/usr/man/man?/* -find $PKG/usr/man -type f -exec chmod 644 {} \; +# 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 | 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/dhcp-$VERSION/examples +cp -a \ + LICENSE README RELNOTES \ + $PKG/usr/doc/dhcp-$VERSION +mv $PKG/etc/dhcpd.conf $PKG/etc/dhclient.conf \ + $PKG/usr/doc/dhcp-$VERSION/examples + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat << EOF > $PKG/install/doinst.sh -#!/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... -} -config etc/dhcpd.conf.new -config etc/dhclient.conf.new -config var/state/dhcp/dhcpd.leases.new -rm -f var/state/dhcp/dhcpd.leases.new -EOF +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -# Build the package: cd $PKG /sbin/makepkg -l y -c n $TMP/dhcp-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/dhcp/doinst.sh b/source/n/dhcp/doinst.sh new file mode 100644 index 000000000..88d284f65 --- /dev/null +++ b/source/n/dhcp/doinst.sh @@ -0,0 +1,21 @@ +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/dhcpd.conf.new +config etc/dhclient.conf.new +#config var/state/dhcp/dhcpd.leases.new +#config var/state/dhcp/dhcpd6.leases.new +#config var/state/dhcp/dhclient.leases.new +#config var/state/dhcp/dhclient6.leases.new +#rm -f var/state/dhcp/*.leases.new + diff --git a/source/n/dhcpcd/50-ntp.conf.diff b/source/n/dhcpcd/50-ntp.conf.diff new file mode 100644 index 000000000..d86c299e2 --- /dev/null +++ b/source/n/dhcpcd/50-ntp.conf.diff @@ -0,0 +1,19 @@ +diff -Nur dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf +--- dhcpcd-5.1.0.orig/dhcpcd-hooks/50-ntp.conf 2009-09-02 15:21:11.000000000 -0500 ++++ dhcpcd-5.1.0/dhcpcd-hooks/50-ntp.conf 2009-09-12 00:36:04.447859980 -0500 +@@ -8,14 +8,8 @@ + # NTP_CONF=/usr/pkg/etc/ntpd.conf + # to use openntpd from pkgsrc instead of the system provided ntp. + +-# Detect OpenRC or BSD rc +-# Distributions may want to just have their command here instead of this +-if type rc-service >/dev/null 2>&1 && rc-service --exists ntpd; then +- ntpd_restart_cmd="rc-service ntpd -- -Ds restart" +-elif [ -x /etc/rc.d/ntpd ]; then ++if [ -x /etc/rc.d/ntpd ]; then + ntpd_restart_cmd="/etc/rc.d/ntpd status >/dev/null 2>&1 && /etc/rc.d/ntpd restart" +-elif [ -x /usr/local/etc/rc.d/ntpd ]; then +- ntpd_restart_cmd="/usr/local/etc/rc.d/ntpd status >/dev/null 2>&1 && /usr/local/etc/rc.d/ntpd restart" + fi + + ntp_conf_dir="$state_dir/ntp.conf" diff --git a/source/n/dhcpcd/dhcpcd.SlackBuild b/source/n/dhcpcd/dhcpcd.SlackBuild index 409118746..3ee95a902 100755 --- a/source/n/dhcpcd/dhcpcd.SlackBuild +++ b/source/n/dhcpcd/dhcpcd.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,27 +21,44 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-3.2.3} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo dhcpcd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-dhcpcd if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf dhcpcd-$VERSION -tar xvf $CWD/dhcpcd-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/dhcpcd-$VERSION.tar.?z* || exit 1 cd dhcpcd-$VERSION chown -R root:root . find . \ @@ -50,65 +67,49 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# This changes the default locations where *.pid and other files are -# written - instead of various locations, use /etc/dhcpc -# The latter directory was long traditional, and (more importantly) -# you can't be sure that /var is mounted yet when dhcpcd is invoked. -zcat $CWD/patches/config.h.diff.gz | patch -p1 || exit 1 - -# Fixup the sample dhcpcd.sh script to reflect our changes -zcat $CWD/patches/dhcpcd.sh.diff.gz | patch -p1 || exit 1 +# At this point, it should be safe to assume that /var will be mounted by the +# time dhcpcd is called, as all non-root local filesystems are mounted from +# /etc/rc.d/rc.S, and /var should not be on a network filesystem. As such, +# we'll use the FHS layout instead of putting things in /etc/dhcpc -# Fix a typo in the manpage -zcat $CWD/patches/dhcpcd.8.in.diff.gz | patch -p1 || exit 1 - -# Disable zeroconf support -# I'm not sure if this is necessary, to be honest. If we do this though, -# I think we'll want to edit the man page to remove references to it. -#sed -i 's%#define ENABLE_IPV4LL%#undef ENABLE_IPV4LL%' config.h - -# Fix segfaulting on x86_64. Apparently i?86 is more forgiving -#zcat $CWD/dhcpcd.vararg.diff.gz | patch -p1 --verbose || exit 1 +# Fixup the 50-ntp.conf hook with our init script location +zcat $CWD/50-ntp.conf.diff.gz | patch -p1 || exit 1 +# Yes, /lib/dhcpcd is correct, even on x86_64. CFLAGS="$SLKCFLAGS" \ - make INFODIR=/etc/dhcpc || exit 1 - -# We'll install this manually, as the only thing "make install" actually -# installs is the executable and the man page, and the man page goes to -# the wrong place :-) -mkdir -p $PKG/sbin -cp -a dhcpcd $PKG/sbin - -mkdir -p $PKG/usr/man/man8 -gzip -9c dhcpcd.8 > $PKG/usr/man/man8/dhcpcd.8.gz - -# This script (or its equivalent) has been installed non-executable for -# several dhcpcd releases leading me to believe this is intentional on the -# part of the developers. Indeed, the script is called a "sample" in the -# included comments, and there's been at least one security issue related -# to its use in the past, so it's probably a safer bet to not install it so -# that it works "out of the box". However, making it non-executable is not -# the best solution for this as it leads to error messages in the system -# logs which I hear about from time to time. Instead, we'll make it -# executable, but will give it a suffix of -sample so that dhcpcd won't -# attempt to run it unless the admin specifically configure it to do so. -# As far as I can tell it does nothing more than add some extra verbosity -# to the logs anyway, and rc.inet1 already does that. There's really no -# need that I can see to enable the script. -mkdir -p $PKG/etc/dhcpc -cp -a dhcpcd.sh $PKG/etc/dhcpc/dhcpcd.sh-sample -chmod 755 $PKG/etc/dhcpc/dhcpcd.sh-sample +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --dbdir=/var/lib/dhcpcd \ + --libexecdir=/lib/dhcpcd \ + --mandir=/usr/man \ + --with-hooks="50-ntp.conf 50-yp.conf" \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG HOOKSCRIPTS="50-ntp.conf 50-yp.conf" || 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 +# Let's not clobber the config file +mv $PKG/etc/dhcpcd.conf $PKG/etc/dhcpcd.conf.new + +# Compress manpages +( cd $PKG/usr/man + find . -type f -exec gzip -9 {} \; + for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +) + mkdir -p $PKG/usr/doc/dhcpcd-$VERSION cp -a README $PKG/usr/doc/dhcpcd-$VERSION zcat $CWD/COPYRIGHT.gz > $PKG/usr/doc/dhcpcd-$VERSION/COPYRIGHT mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/dhcpcd-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/n/dhcpcd/dhcpcd.vararg.diff b/source/n/dhcpcd/dhcpcd.vararg.diff deleted file mode 100644 index b3ac81ca5..000000000 --- a/source/n/dhcpcd/dhcpcd.vararg.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- dhcpcd-2.0.8.orig/src/logger.c 2008-11-07 00:10:23.000000000 +0000 -+++ dhcpcd-2.0.8/src/logger.c 2008-11-07 00:13:46.000000000 +0000 -@@ -46,21 +46,25 @@ - { - va_list p; - va_list p2; -+ va_list p3; - FILE *f = stderr; - - va_start(p, fmt); - va_copy(p2, p); -+ va_copy(p3, p); - /* The default to send debug to stderr is just WAY too much console noise, IMHO */ - if(!Daemonized && strcmp(syslog_level_msg[level],"Info")) { - f = stdout; - /* fprintf(f, "%s, ", syslog_level_msg[level]); */ - vfprintf(f, fmt, p); - fputc('\n', f); -- vsyslog(level, fmt, p); -+ vsyslog(level, fmt, p2); - } - if ( level <= LogLevel ) -- vsyslog(level, fmt, p2); -+ vsyslog(level, fmt, p3); - va_end(p); -+ va_end(p2); -+ va_end(p3); - } - - // vim: set ts=4 : diff --git a/source/n/dhcpcd/doinst.sh b/source/n/dhcpcd/doinst.sh new file mode 100644 index 000000000..a1a93b209 --- /dev/null +++ b/source/n/dhcpcd/doinst.sh @@ -0,0 +1,15 @@ +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/dhcpcd.conf.new + diff --git a/source/n/dhcpcd/patches/config.h.diff b/source/n/dhcpcd/patches/config.h.diff deleted file mode 100644 index 7bdefb600..000000000 --- a/source/n/dhcpcd/patches/config.h.diff +++ /dev/null @@ -1,17 +0,0 @@ -diff -Nur dhcpcd-3.2.3.orig/config.h dhcpcd-3.2.3/config.h ---- dhcpcd-3.2.3.orig/config.h 2008-02-25 02:28:19.000000000 -0600 -+++ dhcpcd-3.2.3/config.h 2009-03-06 14:55:01.998436374 -0600 -@@ -71,10 +71,10 @@ - - #define OPENNTPFILE ETCDIR "/ntpd.conf" - --#define DEFAULT_SCRIPT ETCDIR "/" PACKAGE ".sh" -+#define DEFAULT_SCRIPT INFODIR "/" PACKAGE ".sh" - --#define STATEDIR "/var" --#define PIDFILE STATEDIR "/run/" PACKAGE "-%s.pid" -+#define STATEDIR INFODIR -+#define PIDFILE INFODIR "/" PACKAGE "-%s.pid" - - #ifndef INFODIR - # define INFODIR "/var/lib/dhcpcd" diff --git a/source/n/dhcpcd/patches/dhcpcd.8.in.diff b/source/n/dhcpcd/patches/dhcpcd.8.in.diff deleted file mode 100644 index 7486c769a..000000000 --- a/source/n/dhcpcd/patches/dhcpcd.8.in.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur dhcpcd-3.2.3.orig/dhcpcd.8.in dhcpcd-3.2.3/dhcpcd.8.in ---- dhcpcd-3.2.3.orig/dhcpcd.8.in 2008-02-25 02:28:19.000000000 -0600 -+++ dhcpcd-3.2.3/dhcpcd.8.in 2009-03-06 19:36:02.207109931 -0600 -@@ -117,7 +117,7 @@ - up, down or new depending on the state of - .Nm . - .Nm --ignores the exist code of the script. -+ignores the exit code of the script. - .Ss Fine tuning - You can fine tune the behaviour of - .Nm diff --git a/source/n/dhcpcd/patches/dhcpcd.sh.diff b/source/n/dhcpcd/patches/dhcpcd.sh.diff deleted file mode 100644 index 290665a98..000000000 --- a/source/n/dhcpcd/patches/dhcpcd.sh.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- a/dhcpcd.sh 2009-03-06 19:22:41.247171672 -0600 -+++ b/dhcpcd.sh 2009-03-06 19:24:19.186014526 -0600 -@@ -1,10 +1,10 @@ - #!/bin/sh - # --# This is a sample /etc/dhcpcd.sh script. --# /etc/dhcpcd.sh script is executed by dhcpcd daemon -+# This is a sample /etc/dhcpc/dhcpcd.sh script. -+# /etc/dhcpc/dhcpcd.sh script is executed by dhcpcd daemon - # any time it configures or shuts down interface. --# The following parameters are passed to dhcpcd.exe script: --# $1 = HostInfoFilePath, e.g "/var/lib/dhcpcd/dhcpcd-eth0.info" -+# The following parameters are passed to the dhcpcd.sh script: -+# $1 = HostInfoFilePath, e.g "/etc/dhcpc/dhcpcd-eth0.info" - # $2 = "up" if interface has been configured with the same - # IP address as before reboot; - # $2 = "down" if interface has been shut down; diff --git a/source/n/dirmngr/dirmngr.SlackBuild b/source/n/dirmngr/dirmngr.SlackBuild index d893aeb3d..1fb2e89c0 100755 --- a/source/n/dirmngr/dirmngr.SlackBuild +++ b/source/n/dirmngr/dirmngr.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006-2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=dirmngr -VERSION=1.0.3 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +PKGNAM=dirmngr +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 + 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 "} @@ -38,18 +47,21 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/pkg-$PRGNAM +PKG=$TMP/pkg-$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 || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -66,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-static=no \ --enable-shared=yes \ --build=$ARCH-slackware-linux \ @@ -86,14 +98,22 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ rm $PKG/usr/info/dir gzip -9 $PKG/usr/info/* -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING INSTALL NEWS README* THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/dnsmasq/dnsmasq.SlackBuild b/source/n/dnsmasq/dnsmasq.SlackBuild index 170cfab47..7b89d3efd 100755 --- a/source/n/dnsmasq/dnsmasq.SlackBuild +++ b/source/n/dnsmasq/dnsmasq.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,11 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.49 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo dnsmasq-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-dnsmasq @@ -34,7 +44,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf dnsmasq-$VERSION -tar xvf $CWD/dnsmasq-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/dnsmasq-$VERSION.tar.?*z || exit 1 cd dnsmasq-$VERSION || exit 1 chown -R root:root . find . \ @@ -45,6 +55,7 @@ find . \ zcat $CWD/dnsmasq.leasedir.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# Default CFLAGS are "-W -Wall -O2" - that's good enough. make $NUMJOBS all-i18n PREFIX=/usr MANDIR=/usr/man || exit 1 make install-i18n PREFIX=/usr DESTDIR=$PKG MANDIR=/usr/man || exit 1 chmod 0755 $PKG/usr/sbin/dnsmasq @@ -77,9 +88,17 @@ zcat $CWD/rc.dnsmasq.gz > $PKG/etc/rc.d/rc.dnsmasq.new mkdir -p $PKG/usr/doc/dnsmasq-$VERSION cp -a \ - CHANGELOG COPYING FAQ doc.html setup.html \ + COPYING FAQ doc.html setup.html \ $PKG/usr/doc/dnsmasq-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGELOG ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG + touch -r CHANGELOG $DOCSDIR/CHANGELOG +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/n/dnsmasq/dnsmasq.leasedir.diff b/source/n/dnsmasq/dnsmasq.leasedir.diff index d0a4dafd7..9fec6b439 100644 --- a/source/n/dnsmasq/dnsmasq.leasedir.diff +++ b/source/n/dnsmasq/dnsmasq.leasedir.diff @@ -1,17 +1,7 @@ ---- ./src/config.h.orig 2009-02-05 06:14:24.000000000 -0600 -+++ ./src/config.h 2009-02-19 17:51:07.000000000 -0600 -@@ -45,7 +45,7 @@ - # elif defined(__sun__) || defined (__sun) - # define LEASEFILE "/var/cache/dnsmasq.leases" - # else --# define LEASEFILE "/var/lib/misc/dnsmasq.leases" -+# define LEASEFILE "/var/state/dnsmasq/dnsmasq.leases" - # endif - #endif - ---- ./dnsmasq.conf.example.orig 2009-01-03 14:28:51.000000000 -0600 -+++ ./dnsmasq.conf.example 2009-02-19 17:50:29.000000000 -0600 -@@ -381,7 +381,7 @@ +diff -Nur dnsmasq-2.52.orig/dnsmasq.conf.example dnsmasq-2.52/dnsmasq.conf.example +--- dnsmasq-2.52.orig/dnsmasq.conf.example 2009-11-25 06:55:16.000000000 -0600 ++++ dnsmasq-2.52/dnsmasq.conf.example 2010-01-22 15:32:41.137807274 -0600 +@@ -415,7 +415,7 @@ # The DHCP server needs somewhere on disk to keep its lease database. # This defaults to a sane location, but if you want to change it, use # the line below. @@ -20,3 +10,15 @@ # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, +diff -Nur dnsmasq-2.52.orig/src/config.h dnsmasq-2.52/src/config.h +--- dnsmasq-2.52.orig/src/config.h 2010-01-21 08:22:06.000000000 -0600 ++++ dnsmasq-2.52/src/config.h 2010-01-22 15:32:41.136833058 -0600 +@@ -47,7 +47,7 @@ + # elif defined(__sun__) || defined (__sun) + # define LEASEFILE "/var/cache/dnsmasq.leases" + # else +-# define LEASEFILE "/var/lib/misc/dnsmasq.leases" ++# define LEASEFILE "/var/state/dnsmasq/dnsmasq.leases" + # endif + #endif + diff --git a/source/n/dnsmasq/doinst.sh b/source/n/dnsmasq/doinst.sh index 5a1ca426a..9aadc3e55 100644 --- a/source/n/dnsmasq/doinst.sh +++ b/source/n/dnsmasq/doinst.sh @@ -1,16 +1,26 @@ 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... } +preserve_perms() { + NEW="$1" + OLD="$(dirname ${NEW})/$(basename ${NEW} .new)" + if [ -e ${OLD} ]; then + cp -a ${OLD} ${NEW}.incoming + cat ${NEW} > ${NEW}.incoming + mv ${NEW}.incoming ${NEW} + fi + config ${NEW} +} config etc/dnsmasq.conf.new -config etc/rc.d/rc.dnsmasq.new +preserve_perms etc/rc.d/rc.dnsmasq.new # This should be mostly useless... rm -f etc/rc.d/rc.dnsmasq.new diff --git a/source/n/epic4/epic4.SlackBuild b/source/n/epic5/epic5.SlackBuild index 0143b6eb2..fb7aa1fdd 100755 --- a/source/n/epic4/epic4.SlackBuild +++ b/source/n/epic5/epic5.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,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.8 -HELPFILE=20070509 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=1.1.2 +EPICVER=5 +HELPFILE=current +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 "} @@ -33,18 +43,20 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-epic4 +PKG=$TMP/package-epic${EPICVER} rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf epic4-$VERSION -tar xvf $CWD/epic4-$VERSION.tar.bz2 || exit 1 -cd epic4-$VERSION || exit 1 +rm -rf epic${EPICVER}-$VERSION +tar xvf $CWD/epic${EPICVER}-$VERSION.tar.?z* || exit 1 +cd epic${EPICVER}-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -60,19 +72,26 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install IP=$PKG || exit 1 -( cd $PKG/usr/share/epic - tar xvf $CWD/epic4-help-${HELPFILE}.tar.bz2 || exit 1 +( cd $PKG/usr/share/epic${EPICVER} + tar xvf $CWD/epic-help-${HELPFILE}.tar.?z* || exit 1 chown -R root:root . ) || 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 -mkdir -p $PKG/usr/doc/epic4-$VERSION +mkdir -p $PKG/usr/doc/epic${EPICVER}-$VERSION cp -a \ BUG_FORM COPYRIGHT INSTALL KNOWNBUGS README* UPDATES VOTES doc \ - $PKG/usr/doc/epic4-$VERSION -rm -f $PKG/usr/doc/epic4-$VERSION/doc/*.1 + $PKG/usr/doc/epic${EPICVER}-$VERSION +rm -f $PKG/usr/doc/epic${EPICVER}-$VERSION/doc/*.1 + +# This is way too much. See the source if you care. +if [ -r UPDATES ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat UPDATES | head -n 1000 > $DOCSDIR/UPDATES + touch -r UPDATES $DOCSDIR/UPDATES +fi gzip -9 $PKG/usr/man/man?/*.? @@ -84,5 +103,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/epic4-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/epic${EPICVER}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/epic4/slack-desc b/source/n/epic5/slack-desc index c17b4b549..43cb81a36 100644 --- a/source/n/epic4/slack-desc +++ b/source/n/epic5/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -epic4: epic4 (Internet Relay Chat client) -epic4: -epic4: EPIC is the (E)nhanced (P)rogrammable (I)RC-II (C)lient. -epic4: -epic4: The EPIC home page is: http://www.epicsol.org/ -epic4: The EPIC main ftp site is: ftp://ftp.epicsol.org/ -epic4: The EPIC IRC channel is: #epic on EFNet -epic4: -epic4: -epic4: -epic4: +epic5: epic5 (Internet Relay Chat client) +epic5: +epic5: EPIC is the (E)nhanced (P)rogrammable (I)RC-II (C)lient. +epic5: +epic5: The EPIC home page is: http://www.epicsol.org/ +epic5: The EPIC main ftp site is: ftp://ftp.epicsol.org/ +epic5: The EPIC IRC channel is: #epic on EFNet +epic5: +epic5: +epic5: +epic5: diff --git a/source/n/ethtool/ethtool.SlackBuild b/source/n/ethtool/ethtool.SlackBuild index e485e8d31..ebe0919fd 100755 --- a/source/n/ethtool/ethtool.SlackBuild +++ b/source/n/ethtool/ethtool.SlackBuild @@ -21,10 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=6 -ARCH=${ARCH:-x86_64} +VERSION=2.6.33 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-ethtool @@ -37,14 +46,16 @@ rm -rf ethtool-$VERSION tar xzf $CWD/ethtool-$VERSION.tar.gz || exit 1 cd ethtool-$VERSION || exit 1 chown -R root:root . -./configure --prefix=/usr +./configure \ + --prefix=/usr \ + --mandir=/usr/man make || exit 1 make install DESTDIR=$PKG strip $PKG/usr/sbin/ethtool gzip -9 $PKG/usr/man/man8/ethtool.8 mkdir -p $PKG/usr/doc/ethtool-$VERSION cp -a \ - AUTHORS COPYING ChangeLog NEWS README \ + AUTHORS COPYING* ChangeLog LICENSE NEWS README* \ $PKG/usr/doc/ethtool-$VERSION chmod 644 $PKG/usr/doc/ethtool-$VERSION/* diff --git a/source/n/fetchmail/fetchmail.SlackBuild b/source/n/fetchmail/fetchmail.SlackBuild index 11145cc9e..a69cef4d4 100755 --- a/source/n/fetchmail/fetchmail.SlackBuild +++ b/source/n/fetchmail/fetchmail.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,19 +20,32 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=6.3.11 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +PKGNAM=fetchmail +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 + 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 +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-fetchmail @@ -78,7 +91,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/fetchmail-$VERSION cp -a \ - ABOUT-NLS COPYING* FAQ FEATURES INSTALL NEWS NOTES README* TODO \ + ABOUT-NLS COPYING* FAQ FEATURES INSTALL NEWS* NOTES* README* TODO \ *.html contrib *.lsm \ $PKG/usr/doc/fetchmail-$VERSION diff --git a/source/n/getmail/getmail.SlackBuild b/source/n/getmail/getmail.SlackBuild index 14885943a..5a550bce6 100755 --- a/source/n/getmail/getmail.SlackBuild +++ b/source/n/getmail/getmail.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,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.11.0 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo getmail-*.tar.gz | 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-getmail diff --git a/source/n/gnupg/gnupg.SlackBuild b/source/n/gnupg/gnupg.SlackBuild index 9fab5b935..3a0a5b8ab 100755 --- a/source/n/gnupg/gnupg.SlackBuild +++ b/source/n/gnupg/gnupg.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,19 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.4.9 -ARCH=${ARCH:-x86_64} +VERSION=1.4.10 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,6 +45,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi rm -rf $PKG @@ -78,6 +89,14 @@ cp -a \ ln -sf /usr/share/gnupg/FAQ . ln -sf /usr/share/gnupg/faq.html . ) +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + # Add slack-desc files: mkdir -p $PKG/install cat $CWD/slack-desc.gnupg > $PKG/install/slack-desc diff --git a/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch b/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch new file mode 100644 index 000000000..26c798ee6 --- /dev/null +++ b/source/n/gnupg2/gnupg-2.0.14-encode-s2k.patch @@ -0,0 +1,65 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 +NotDashEscaped: You need GnuPG to verify this message + +#! /bin/sh +patch -p0 -f $* < $0 +exit $? + +agent/ +2010-01-26 Werner Koch <wk@g10code.com> + + * protect.c (do_encryption): Encode the s2kcount and do not use a + static value of 96. + +--- agent/protect.c (revision 5231) ++++ agent/protect.c (working copy) +@@ -360,19 +360,25 @@ + + in canoncical format of course. We use asprintf and %n modifier + and dummy values as placeholders. */ +- p = xtryasprintf +- ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)", +- (int)strlen (modestr), modestr, +- &saltpos, +- blklen, &ivpos, blklen, "", +- enclen, &encpos, enclen, ""); +- if (!p) +- { +- gpg_error_t tmperr = out_of_core (); +- xfree (iv); +- xfree (outbuf); +- return tmperr; +- } ++ { ++ char countbuf[35]; ++ ++ snprintf (countbuf, sizeof countbuf, "%lu", get_standard_s2k_count ()); ++ p = xtryasprintf ++ ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)", ++ (int)strlen (modestr), modestr, ++ &saltpos, ++ (unsigned int)strlen (countbuf), countbuf, ++ blklen, &ivpos, blklen, "", ++ enclen, &encpos, enclen, ""); ++ if (!p) ++ { ++ gpg_error_t tmperr = out_of_core (); ++ xfree (iv); ++ xfree (outbuf); ++ return tmperr; ++ } ++ } + *resultlen = strlen (p); + *result = (unsigned char*)p; + memcpy (p+saltpos, iv+2*blklen, 8); + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.1.0-svn5201 (GNU/Linux) + +iJwEAQECAAYFAktmpLoACgkQU7Yg0BzgxjCj5wQAyZjQbZM77wdcXIgPgeLsG99W +esWR89/5VM34dY5tOG+McCAiA4/0hl6CYUkkK/394wcfUXbvbZYARPjJg5wMoZsG +VufEL+Uz+eLgkejYPVakOWzK00i7MHqDSjttOqHg0d8wSiy3LKk6CN6N19uPqxbI +/1Io5f3gcroLGfEZlN0= +=oP/V +-----END PGP SIGNATURE----- diff --git a/source/n/gnupg2/gnupg2.SlackBuild b/source/n/gnupg2/gnupg2.SlackBuild index 3f3b4ccf0..1faf1666d 100755 --- a/source/n/gnupg2/gnupg2.SlackBuild +++ b/source/n/gnupg2/gnupg2.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2006-2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006-2010 Robby Workman, Northport, AL, USA +# Copyright 2007-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PKGNAME=gnupg2 -VERSION=2.0.12 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +PKGNAM=gnupg2 +VERSION=${VERSION:-$(echo gnupg-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-gnupg @@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -49,8 +61,11 @@ mkdir -p $TMP $PKG cd $TMP rm -rf gnupg-$VERSION -tar xvf $CWD/gnupg-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/gnupg-$VERSION.tar.?z* || exit 1 cd gnupg-$VERSION + +zcat $CWD/gnupg-2.0.14-encode-s2k.patch.gz | patch -p0 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -62,18 +77,21 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --sysconfdir=/etc \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --infodir=/usr/info \ --docdir=/usr/doc/gnupg2-$VERSION \ --program-prefix="" \ --program-suffix="" \ - --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux + --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Create directory for global gpg.conf: +mkdir -p $PKG/etc/gnupg + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -114,14 +132,22 @@ mv Controlling-gpg_002dconnect_002dagent.html Controlling-gpg_connect_agent.html mv Agent-GET_005fPASSPHRASE.html Agent-GET_PASSPHRASE.html mv option-_002d_002dhomedir.html option-homedir.html mv PKCS_002315-Card.html PKCS-15-Card.html +mv option-_002d_002dexport_002downertrust.html option-export_ownertrust.html ) # Move html doc to the proper location mv $PKG/usr/doc/gnupg2-$VERSION/faq.html $PKG/usr/doc/gnupg2-$VERSION/html/ +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAME-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/gnutls/gnutls.SlackBuild b/source/n/gnutls/gnutls.SlackBuild index 0aea48b1c..34343b734 100755 --- a/source/n/gnutls/gnutls.SlackBuild +++ b/source/n/gnutls/gnutls.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Robby Workman (http://rlworkman.net) -# Copyright 2007, 2008, 2009 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=gnutls -VERSION=2.6.6 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=gnutls +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 "} @@ -38,31 +47,34 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -if [ -r $CWD/$PRGNAM-$VERSION.tar.gz ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -elif [ -r $CWD/$PRGNAM-$VERSION.tar.bz2 ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -elif [ -r $CWD/$PRGNAM-$VERSION.tar.xz ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1 -elif [ -r $CWD/$PRGNAM-$VERSION.tar.lzma ]; then - tar xf $CWD/$PRGNAM-$VERSION.tar.lzma || exit 1 +rm -rf $PKGNAM-$VERSION +if [ -r $CWD/$PKGNAM-$VERSION.tar.gz ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 +elif [ -r $CWD/$PKGNAM-$VERSION.tar.bz2 ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +elif [ -r $CWD/$PKGNAM-$VERSION.tar.xz ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +elif [ -r $CWD/$PKGNAM-$VERSION.tar.lzma ]; then + tar xf $CWD/$PKGNAM-$VERSION.tar.lzma || exit 1 else exit 1 fi -cd $PRGNAM-$VERSION +cd $PKGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -99,14 +111,22 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ gzip -9 *.info* ) -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n -p $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n -p $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild index 55afc5d74..a83c158d0 100755 --- a/source/n/gpgme/gpgme.SlackBuild +++ b/source/n/gpgme/gpgme.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006-2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,16 +21,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=gpgme -VERSION=1.1.8 -ARCH=${ARCH:-x86_64} +PKGNAM=gpgme +VERSION=1.2.0 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/pkg-$PRGNAM +PKG=$TMP/pkg-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -41,14 +50,17 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -76,14 +88,22 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ rm $PKG/usr/info/dir gzip -9 $PKG/usr/info/* -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING* INSTALL NEWS README THANKS TODO VERSION \ - $PKG/usr/doc/$PRGNAM-$VERSION + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/httpd/httpd.SlackBuild b/source/n/httpd/httpd.SlackBuild index 2cdce1d87..009537769 100755 --- a/source/n/httpd/httpd.SlackBuild +++ b/source/n/httpd/httpd.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 @@ -25,11 +25,20 @@ PKGNAM=httpd -VERSION=${VERSION:-2.2.13} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-2.2.15} 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} @@ -46,6 +55,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi cd $TMP diff --git a/source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff b/source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff new file mode 100644 index 000000000..fe5b1abc4 --- /dev/null +++ b/source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff @@ -0,0 +1,34 @@ +diff -Nur iproute2-2.6.33.orig//Makefile iproute2-2.6.33/Makefile +--- iproute2-2.6.33.orig//Makefile 2010-02-24 21:56:50.000000000 -0600 ++++ iproute2-2.6.33/Makefile 2010-02-24 23:00:52.614825494 -0600 +@@ -1,14 +1,14 @@ + DESTDIR=/usr/ + ROOTDIR=$(DESTDIR) +-LIBDIR=/usr/lib/ ++LIBDIR=@LIBDIR@ + SBINDIR=/sbin + CONFDIR=/etc/iproute2 +-DOCDIR=/share/doc/iproute2 +-MANDIR=/share/man ++DOCDIR=/doc/iproute2-@VERSION@ ++MANDIR=/man + ARPDDIR=/var/lib/arpd + + # Path to db_185.h include +-DBM_INCLUDE:=$(ROOTDIR)/usr/include ++DBM_INCLUDE:=$(ROOTDIR)/usr/include/db44 + + SHARED_LIBS = y + +diff -Nur iproute2-2.6.33.orig//include/iptables.h iproute2-2.6.33/include/iptables.h +--- iproute2-2.6.33.orig//include/iptables.h 2010-02-24 21:56:50.000000000 -0600 ++++ iproute2-2.6.33/include/iptables.h 2010-02-24 23:02:21.891841749 -0600 +@@ -5,7 +5,7 @@ + #include "libiptc/libiptc.h" + + #ifndef IPT_LIB_DIR +-#define IPT_LIB_DIR "/usr/local/lib/iptables" ++#define IPT_LIB_DIR "@LIBDIR@" + #endif + + #ifndef IPPROTO_SCTP diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild index 2a97fd43d..d9e8622cd 100755 --- a/source/n/iproute2/iproute2.SlackBuild +++ b/source/n/iproute2/iproute2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,20 @@ # Build this against 2.6.x kernel source and headers... -VERSION=2.6.29-1 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +VERSION=2.6.33 +BUILD=${BUILD:-1} + +#NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -36,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -49,16 +62,6 @@ rm -rf iproute2-$VERSION tar xvf $CWD/iproute2-$VERSION.tar.bz2 || exit 1 cd iproute2-$VERSION -# Fix up path to bdb -zcat $CWD/iproute2.dbpath.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -# Fix up iptables lib path -zcat $CWD/iproute2.iptablespath.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -if [ "$ARCH" = "x86_64" ]; then - sed -i -e "s#/lib/tc#/lib${LIBDIRSUFFIX}/tc#" $(grep -lr '/lib/tc' *) || exit 1 - sed -i -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" include/iptables.h || exit 1 - sed -i -e "s#/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" tc/m_ipt.c || exit 1 -fi - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -66,14 +69,23 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -export CFLAGS="$SLKCFLAGS" -make $NUMJOBS DOCDIR=doc/iproute2-$VERSION MANDIR=man/ || exit 1 +# Fix up path to bdb and iptables libs +zcat $CWD/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff.gz | sed \ + -e "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX},g" \ + -e "s,@VERSION@,$VERSION,g" | patch -p1 || exit 1 + +# Use our custom SLKCFLAGS +sed -i "s/-O2 /-O2 -fPIC /" Makefile + +./configure # This is okay, really :-) +make $NUMJOBS || exit 1 -# This doesn't embed any $TMP or $PKG paths in anything -# Have a look at what the Makefile does for why :) mkdir -p $PKG/usr -make install DOCDIR=doc/iproute2-$VERSION MANDIR=man/ DESTDIR=$PKG/usr/ \ - || exit 1 +make install LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG/usr/ || exit 1 + +# I can't seem to make this go to the right place on x86_64, but all the +# relevant stuff looks correct :/ +[ "$ARCH" = "x86_64" ] && mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} # This stuff has always been installed under /sbin rather than # /usr/sbin, as the latter could possibly be network-mounted, and @@ -96,6 +108,7 @@ done # Remove junk: [ -d $PKG/usr/usr ] && rm -r $PKG/usr/usr +[ -d $PKG/usr/var ] && rm -r $PKG/usr/var mkdir -p $PKG/var/lib/arpd diff --git a/source/n/iproute2/iproute2.dbpath.diff b/source/n/iproute2/iproute2.dbpath.diff deleted file mode 100644 index b6ad2b0f9..000000000 --- a/source/n/iproute2/iproute2.dbpath.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur orig/Makefile new/Makefile ---- orig/Makefile 2008-07-25 15:46:07.000000000 -0500 -+++ new/Makefile 2008-10-03 20:32:41.237630954 -0500 -@@ -5,7 +5,7 @@ - MANDIR=/share/man - - # Path to db_185.h include --DBM_INCLUDE:=/usr/include -+DBM_INCLUDE:=/usr/include/db44 - - DEFINES= -DRESOLVE_HOSTNAMES -DDESTDIR=\"$(DESTDIR)\" - diff --git a/source/n/iproute2/iproute2.iptablespath.diff b/source/n/iproute2/iproute2.iptablespath.diff deleted file mode 100644 index 89f61b65d..000000000 --- a/source/n/iproute2/iproute2.iptablespath.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur orig/include/iptables.h new/include/iptables.h ---- orig/include/iptables.h 2008-07-25 15:46:07.000000000 -0500 -+++ new/include/iptables.h 2008-10-03 20:35:56.731284537 -0500 -@@ -5,7 +5,7 @@ - #include "libiptc/libiptc.h" - - #ifndef IPT_LIB_DIR --#define IPT_LIB_DIR "/usr/local/lib/iptables" -+#define IPT_LIB_DIR "/usr/lib/iptables" - #endif - - #ifndef IPPROTO_SCTP diff --git a/source/n/iptables/iptables.SlackBuild b/source/n/iptables/iptables.SlackBuild index fcf80a1ab..a9dc37bd5 100755 --- a/source/n/iptables/iptables.SlackBuild +++ b/source/n/iptables/iptables.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,12 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.4.3.2 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo iptables-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-iptables @@ -33,19 +42,22 @@ PKG=$TMP/package-iptables if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf iptables-$VERSION -tar xvf $CWD/iptables-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/iptables-$VERSION.tar.?z* || exit 1 cd iptables-$VERSION chown -R root:root . find . \ diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild index a5e3691a7..c7a77a4a9 100755 --- a/source/n/iputils/iputils.SlackBuild +++ b/source/n/iputils/iputils.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,28 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=s20070202 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=s20100418 +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" = "i486" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX="64" +else + LIBDIRSUFFIX="" +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -37,8 +56,7 @@ cd $TMP rm -rf iputils-$VERSION tar xvf $CWD/iputils-$VERSION.tar.bz2 || exit 1 cd iputils-$VERSION || exit 1 -# Modern compiler... -sed -i -e "s/OPEN_MAX/NR_OPEN/" $(grep -lr OPEN_MAX *) + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -46,7 +64,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -make || exit 1 +make VPATH=/usr/lib${LIBDIRSUFFIX} || exit 1 ( cd doc ; make man || exit 1 ) || exit 1 strip arping clockdiff ping ping6 rarpd rdisc tracepath tracepath6 traceroute6 diff --git a/source/n/ipw2200-fw/ipw2200-fw.SlackBuild b/source/n/ipw2200-fw/ipw2200-fw.SlackBuild index 9aac28a68..e6c5a3141 100755 --- a/source/n/ipw2200-fw/ipw2200-fw.SlackBuild +++ b/source/n/ipw2200-fw/ipw2200-fw.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,9 @@ PKGNAM=ipw2200-fw -VERSION=${VERSION:-3.0} +VERSION=${VERSION:-3.1} ARCH=${ARCH:-fw} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} CWD=$(pwd) @@ -35,7 +35,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: diff --git a/source/n/irssi/irssi.SlackBuild b/source/n/irssi/irssi.SlackBuild index 828ab8748..367587973 100755 --- a/source/n/irssi/irssi.SlackBuild +++ b/source/n/irssi/irssi.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 @@ -25,11 +25,20 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-irssi -VERSION=0.8.14 -DIRCD=0.8.14 -ARCH=${ARCH:-x86_64} +VERSION=0.8.15 +DIRCD=0.8.15 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 @@ -41,6 +50,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -57,8 +69,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix an error in the manual page -zcat $CWD/irsi-0.8.14.manpage_fix.diff.gz | patch -p1 || exit 1 +# Fix an error in the manual page: +zcat $CWD/irssi.manpage_fix.diff.gz | patch -p1 --verbose || exit 1 + +# Fix an SSL proxy bug in 0.8.15: +zcat $CWD/irssi.ssl_proxy.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -83,17 +98,9 @@ make install \ # This removes our DESTDIR from the packlist filenames, to keep perl's # internal inventories consistent and correct. find $PKG -name .packlist | while read plist ; do - sed -e "s%/share/man%/man%g" \ - -e "s%$PKG%%g" \ - -e "s%\.1$%\.1\.gz%g" \ - -e "s%\.2$%\.2\.gz%g" \ - -e "s%\.3$%\.3\.gz%g" \ - -e "s%\.3pm$%\.3pm\.gz%g" \ - -e "s%\.4$%\.4\.gz%g" \ - -e "s%\.5$%\.5\.gz%g" \ - -e "s%\.6$%\.6\.gz%g" \ - -e "s%\.7$%\.7\.gz%g" \ - -e "s%\.8$%\.8\.gz%g" \ + sed -e "s%$PKG%%g" \ + -e "s%/share/man%/man%g" \ + -re "s%\.([1-9]n?|3pm)$%&.gz%g # extend man filenames for .gz" \ ${plist} > ${plist}.new mv -f ${plist}.new ${plist} done @@ -126,6 +133,14 @@ cp -a \ $PKG/usr/doc/irssi-$VERSION ( cd $PKG/usr/doc/irssi-$VERSION ; ln -sf /usr/share/irssi/help . ) +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/n/irssi/irsi-0.8.14.manpage_fix.diff b/source/n/irssi/irssi.manpage_fix.diff index 2219652df..2219652df 100644 --- a/source/n/irssi/irsi-0.8.14.manpage_fix.diff +++ b/source/n/irssi/irssi.manpage_fix.diff diff --git a/source/n/irssi/irssi.ssl_proxy.diff b/source/n/irssi/irssi.ssl_proxy.diff new file mode 100644 index 000000000..401e07173 --- /dev/null +++ b/source/n/irssi/irssi.ssl_proxy.diff @@ -0,0 +1,24 @@ +Index: irssi-0.8.14/src/core/servers.c +=================================================================== +--- irssi-0.8.14.orig/src/core/servers.c ++++ irssi-0.8.14/src/core/servers.c +@@ -209,6 +209,7 @@ + char *errmsg2; + char ipaddr[MAX_IP_LEN]; + int port; ++ char *hostname; + + g_return_if_fail(ip != NULL || unix_socket != NULL); + +@@ -223,8 +224,10 @@ + server->connrec->own_ip4); + port = server->connrec->proxy != NULL ? + server->connrec->proxy_port : server->connrec->port; ++ hostname = server->connrec->proxy != NULL ? ++ server->connrec->proxy : server->connrec->address; + handle = server->connrec->use_ssl ? +- net_connect_ip_ssl(ip, port, server->connrec->address, own_ip, server->connrec->ssl_cert, server->connrec->ssl_pkey, ++ net_connect_ip_ssl(ip, port, hostname, own_ip, server->connrec->ssl_cert, server->connrec->ssl_pkey, + server->connrec->ssl_cafile, server->connrec->ssl_capath, server->connrec->ssl_verify) : + net_connect_ip(ip, port, own_ip); + } else { diff --git a/source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild b/source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild new file mode 100755 index 000000000..80db4c100 --- /dev/null +++ b/source/n/iwlwifi-1000-ucode/iwlwifi-1000-ucode.SlackBuild @@ -0,0 +1,57 @@ +#!/bin/sh + +# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# 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=iwlwifi-1000-ucode +#VERSION will be determined automatically, and the package will use the last version found. +ARCH=${ARCH:-fw} +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +for file in $CWD/${PKGNAM}-*.tar.?z* ; do + VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - ) + rm -rf ${PKGNAM}-${VERSION} + tar xvf $file || exit 1 + cd ${PKGNAM}-$VERSION || exit 1 + # Make sure ownerships and permissions are sane: + chown -R root:root . + chmod 644 * + # install: + mkdir -p $PKG/lib/firmware + cp -a iwlwifi-*.ucode $PKG/lib/firmware + # Add a documentation directory: + mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION} + cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION} +done + +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/n/iwlwifi-1000-ucode/slack-desc b/source/n/iwlwifi-1000-ucode/slack-desc new file mode 100644 index 000000000..e0c939e8c --- /dev/null +++ b/source/n/iwlwifi-1000-ucode/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------------------------------------------------------| +iwlwifi-1000-ucode: iwlwifi-1000-ucode (Intel 1000 wireless microcode) +iwlwifi-1000-ucode: +iwlwifi-1000-ucode: The microcode provided in this package is required for the Intel +iwlwifi-1000-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate. +iwlwifi-1000-ucode: +iwlwifi-1000-ucode: Visit Intel's Linux wireless website at this address: +iwlwifi-1000-ucode: http://intellinuxwireless.org/ +iwlwifi-1000-ucode: +iwlwifi-1000-ucode: +iwlwifi-1000-ucode: +iwlwifi-1000-ucode: diff --git a/source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild b/source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild new file mode 100755 index 000000000..251f7e619 --- /dev/null +++ b/source/n/iwlwifi-6000-ucode/iwlwifi-6000-ucode.SlackBuild @@ -0,0 +1,57 @@ +#!/bin/sh + +# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# 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=iwlwifi-6000-ucode +#VERSION will be determined automatically, and the package will use the last version found. +ARCH=${ARCH:-fw} +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +for file in $CWD/${PKGNAM}-*.tar.?z* ; do + VERSION=$(echo $file | rev | cut -f 3- -d . | cut -f 1 -d / | rev | cut -f 4- -d - ) + rm -rf ${PKGNAM}-${VERSION} + tar xvf $file || exit 1 + cd ${PKGNAM}-$VERSION || exit 1 + # Make sure ownerships and permissions are sane: + chown -R root:root . + chmod 644 * + # install: + mkdir -p $PKG/lib/firmware + cp -a iwlwifi-*.ucode $PKG/lib/firmware + # Add a documentation directory: + mkdir -p $PKG/usr/doc/${PKGNAM}-${VERSION} + cp -a LICENSE* README* $PKG/usr/doc/${PKGNAM}-${VERSION} +done + +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/n/iwlwifi-6000-ucode/slack-desc b/source/n/iwlwifi-6000-ucode/slack-desc new file mode 100644 index 000000000..50d56c38f --- /dev/null +++ b/source/n/iwlwifi-6000-ucode/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------------------------------------------------------| +iwlwifi-6000-ucode: iwlwifi-6000-ucode (Intel 6000 wireless microcode) +iwlwifi-6000-ucode: +iwlwifi-6000-ucode: The microcode provided in this package is required for the Intel +iwlwifi-6000-ucode: Wireless WiFi Link AGN driver for Linux (iwlagn) to operate. +iwlwifi-6000-ucode: +iwlwifi-6000-ucode: Visit Intel's Linux wireless website at this address: +iwlwifi-6000-ucode: http://intellinuxwireless.org/ +iwlwifi-6000-ucode: +iwlwifi-6000-ucode: +iwlwifi-6000-ucode: +iwlwifi-6000-ucode: diff --git a/source/n/lftp/lftp.SlackBuild b/source/n/lftp/lftp.SlackBuild index 82b42993b..9e75153a6 100755 --- a/source/n/lftp/lftp.SlackBuild +++ b/source/n/lftp/lftp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.7.14 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo lftp-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-lftp @@ -40,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG @@ -61,7 +73,9 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --localstatedir=/var \ --mandir=/usr/man \ + --infodir=/usr/info \ --docdir=/usr/doc/lftp-$VERSION \ --with-openssl \ --build=${ARCH}-slackware-linux @@ -91,10 +105,18 @@ fi mkdir -p $PKG/usr/doc/lftp-$VERSION cp -a \ - ABOUT-NLS BUGS COPYING* ChangeLog FAQ FEATURES INSTALL MIRRORS NEWS \ + BUGS COPYING* FAQ FEATURES INSTALL MIRRORS NEWS \ README* THANKS TODO lftp.lsm \ $PKG/usr/doc/lftp-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/n/libassuan/libassuan.SlackBuild b/source/n/libassuan/libassuan.SlackBuild index 32cf41723..6d49096f1 100755 --- a/source/n/libassuan/libassuan.SlackBuild +++ b/source/n/libassuan/libassuan.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006-2007 Robby Workman (http://rlworkman.net) -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,15 +21,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SCRIPT, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libassuan -VERSION=1.0.4 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +PKGNAM=libassuan +VERSION=1.0.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 + +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/pkg-$PRGNAM +PKG=$TMP/pkg-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -40,14 +50,17 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.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 \) \ @@ -73,15 +86,22 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ gzip -9 $PKG/usr/info/*.info rm -rf $PKG/usr/info/dir -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING INSTALL NEWS README* THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/libgcrypt/libgcrypt.SlackBuild b/source/n/libgcrypt/libgcrypt.SlackBuild index bb4723948..720314cac 100755 --- a/source/n/libgcrypt/libgcrypt.SlackBuild +++ b/source/n/libgcrypt/libgcrypt.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006-2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,16 +22,25 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libgcrypt -VERSION=${VERSION:-1.4.4} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +PKGNAM=libgcrypt +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | 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 + 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/pkg-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -42,14 +51,17 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.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 \) \ @@ -74,21 +86,39 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG +# Move the shared library to $PKG/lib${LIBDIRSUFFIX}: +mkdir -p $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.??.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.?? ../../lib${LIBDIRSUFFIX} +) + find $PKG | xargs file | grep -e "executable" -e "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/* -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS BUGS COPYING* ChangeLog INSTALL NEWS \ - README README.SVN THANKS TODO VERSION \ - $PKG/usr/doc/$PRGNAM-$VERSION + README* THANKS TODO VERSION \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/libgpg-error/libgpg-error.SlackBuild b/source/n/libgpg-error/libgpg-error.SlackBuild index 62f1df43b..4d0384afe 100755 --- a/source/n/libgpg-error/libgpg-error.SlackBuild +++ b/source/n/libgpg-error/libgpg-error.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006, 2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,16 +22,25 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libgpg-error -VERSION=1.7 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +PKGNAM=libgpg-error +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 + 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-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -42,14 +51,17 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -63,7 +75,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-shared=yes \ --enable-static=yes \ --build=$ARCH-slackware-linux \ @@ -72,17 +84,35 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG +# Move the shared library to $PKG/lib${LIBDIRSUFFIX}: +mkdir -p $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) + 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/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README THANKS VERSION \ - $PKG/usr/doc/$PRGNAM-$VERSION + ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* THANKS VERSION \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/libksba/libksba.SlackBuild b/source/n/libksba/libksba.SlackBuild index 0b42f53f8..5cbc4093a 100755 --- a/source/n/libksba/libksba.SlackBuild +++ b/source/n/libksba/libksba.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006,2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,16 +21,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SCRIPT, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libksba -VERSION=1.0.6 -ARCH=${ARCH:-x86_64} +PKGNAM=libksba +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/pkg-$PRGNAM +PKG=$TMP/pkg-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -41,14 +50,17 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.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 \) \ @@ -64,7 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-shared=yes \ --enable-static=no \ --build=$ARCH-slackware-linux \ @@ -79,14 +91,22 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING INSTALL NEWS README THANKS TODO VERSION \ - $PKG/usr/doc/$PRGNAM-$VERSION + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild index fd55faea5..c8839ebd0 100755 --- a/source/n/links/links.SlackBuild +++ b/source/n/links/links.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.2 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=2.3pre1 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-links @@ -35,6 +45,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi rm -rf $PKG @@ -80,6 +92,14 @@ find $PKG/usr/doc/links-$VERSION -type f -exec chmod 644 {} \; find $PKG/usr/doc/links-$VERSION -type d -exec chmod 755 {} \; chmod 0755 $PKG/usr/doc/links-$VERSION/mailcap.pl +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + find $PKG | 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/n/lynx/lynx.SlackBuild b/source/n/lynx/lynx.SlackBuild index 109c89621..5a298547d 100755 --- a/source/n/lynx/lynx.SlackBuild +++ b/source/n/lynx/lynx.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,16 +21,33 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SRCVER=2.8.6rel.5 -PKGVER=2.8.6rel.5 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +SRCVER=2.8.7 +PKGVER=2.8.7 +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "x86_64" ]; then +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else + SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi @@ -39,24 +56,13 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-lynx rm -rf $PKG -mkdir -p $PKG -# Add libdir to package: -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/lynx - +mkdir -p $TMP $PKG/usr/lib${LIBDIRSUFFIX}/lynx cd $TMP -rm -rf lynx2-8-6 -tar xvf $CWD/lynx${SRCVER}.tar.bz2 || exit 1 -cd lynx2-8-6 -# Fix /usr/local paths: -zcat $CWD/lynx.path.diff.gz | sed -e "s#usr/lib/#usr/lib${LIBDIRSUFFIX}/#g" | patch -p1 --verbose || exit 1 -# Apply recolorizing patch: -zcat $CWD/lynx.cfg.diff.gz | patch -p1 --verbose --backup || exit 1 +rm -rf lynx2-8-7 +tar xvf $CWD/lynx${SRCVER}.tar.?z* || exit 1 +cd lynx2-8-7 -## Apply official patches: -#zcat $CWD/2.8.5rel.4.patch.gz | patch -p1 --verbose || exit -#zcat $CWD/2.8.5rel.5.patch.gz | patch -p1 --verbose || exit - -find . -name "*~" | xargs rm +find . -name "*~" -exec rm -f {} \; chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -64,6 +70,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix /usr/local paths and libdir paths +zcat $CWD/lynx.path.diff.gz | \ + sed -e "s#@SLACK_LIBDIR@#/usr/lib${LIBDIRSUFFIX}/#g" | \ + patch -p1 --verbose || exit 1 + +# Apply recolorizing patch: +zcat $CWD/lynx.cfg.diff.gz | patch -p1 --verbose --backup || exit 1 + +CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -121,6 +136,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ ln -sf /usr/share/lynx/lynx_help . ) +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r CHANGES ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES + touch -r CHANGES $DOCSDIR/CHANGES +fi + gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/install diff --git a/source/n/lynx/lynx.cfg.diff b/source/n/lynx/lynx.cfg.diff index 4a52fcc5b..c7ab6257f 100644 --- a/source/n/lynx/lynx.cfg.diff +++ b/source/n/lynx/lynx.cfg.diff @@ -1,6 +1,7 @@ ---- ./lynx.cfg.orig Tue Feb 26 23:18:35 2002 -+++ ./lynx.cfg Tue Feb 26 23:24:09 2002 -@@ -2841,8 +2841,18 @@ +diff -Nur lynx2-8-7.orig/lynx.cfg lynx2-8-7/lynx.cfg +--- lynx2-8-7.orig/lynx.cfg 2009-06-23 18:53:58.000000000 -0500 ++++ lynx2-8-7/lynx.cfg 2009-12-03 15:35:18.744461098 -0600 +@@ -3025,8 +3025,18 @@ #COLOR:4:magenta:white #COLOR:5:blue:white #COLOR:6:red:white @@ -19,4 +20,4 @@ +COLOR:7:magenta:cyan - .h2 ASSUMED_COLOR + .h2 COLOR_STYLE diff --git a/source/n/lynx/lynx.path.diff b/source/n/lynx/lynx.path.diff index 1ee216edf..045405c95 100644 --- a/source/n/lynx/lynx.path.diff +++ b/source/n/lynx/lynx.path.diff @@ -1,6 +1,7 @@ ---- ./userdefs.h.orig Tue Feb 26 22:32:08 2002 -+++ ./userdefs.h Tue Feb 26 22:39:53 2002 -@@ -277,7 +277,7 @@ +diff -Nur lynx2-8-7.orig/userdefs.h lynx2-8-7/userdefs.h +--- lynx2-8-7.orig/userdefs.h 2009-06-06 19:30:35.000000000 -0500 ++++ lynx2-8-7/userdefs.h 2009-12-03 15:47:54.596486242 -0600 +@@ -289,7 +289,7 @@ #ifdef DOSPATH #define LYNX_CFG_FILE "./lynx.cfg" #else @@ -9,30 +10,30 @@ #endif /* DOSPATH */ #endif /* LYNX_CFG_FILE */ #endif /* HAVE_CONFIG_H */ -@@ -289,7 +289,7 @@ +@@ -305,7 +305,7 @@ * Mappings in these global and personal files override any SUFFIX * definitions in lynx.cfg and built-in defaults from src/HTInit.c. */ --#define GLOBAL_EXTENSION_MAP "/usr/local/lib/mosaic/mime.types" -+#define GLOBAL_EXTENSION_MAP "/usr/lib/lynx/mime.types" - #define PERSONAL_EXTENSION_MAP ".mime.types" +-#define GLOBAL_EXTENSION_MAP MIME_LIBDIR "mime.types" ++#define GLOBAL_EXTENSION_MAP "@SLACK_LIBDIR@/lynx/mime.types" + #define PERSONAL_EXTENSION_MAP "~/.mime.types" /************************** -@@ -299,7 +299,7 @@ +@@ -315,7 +315,7 @@ * Mappings in these global and personal files override any VIEWER * definitions in lynx.cfg and built-in defaults from src/HTInit.c. */ --#define GLOBAL_MAILCAP "/usr/local/lib/mosaic/mailcap" -+#define GLOBAL_MAILCAP "/usr/lib/lynx/mailcap" - #define PERSONAL_MAILCAP ".mailcap" +-#define GLOBAL_MAILCAP MIME_LIBDIR "mailcap" ++#define GLOBAL_MAILCAP MIME_LIBDIR "/etc/mailcap" + #define PERSONAL_MAILCAP "~/.mailcap" /************************** -@@ -434,7 +434,7 @@ +@@ -445,7 +445,7 @@ * -lss command line switch will override these definitions. */ #ifndef LYNX_LSS_FILE -#define LYNX_LSS_FILE "/usr/local/lib/lynx.lss" -+#define LYNX_LSS_FILE "/usr/lib/lynx/lynx.lss" ++#define LYNX_LSS_FILE "/etc/lynx.lss" #endif /* LYNX_LSS_FILE */ #endif /* VMS OR UNIX */ diff --git a/source/n/mcabber/mcabber.SlackBuild b/source/n/mcabber/mcabber.SlackBuild index f23c3bef4..db46ac67a 100755 --- a/source/n/mcabber/mcabber.SlackBuild +++ b/source/n/mcabber/mcabber.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,12 +22,20 @@ PKGNAM=mcabber -VERSION=${VERSION:-0.9.9} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -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} @@ -37,15 +45,21 @@ mkdir -p $TMP $PKG 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 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: @@ -60,6 +74,7 @@ find . \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ @@ -93,13 +108,21 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING* ChangeLog NEWS README* TODO mcabberrc.example \ + AUTHORS COPYING* NEWS README* TODO mcabberrc.example \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install #zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/mtr/mtr-0.73.configure.error.diff b/source/n/mtr/mtr-0.73.configure.error.diff deleted file mode 100644 index 896a5216d..000000000 --- a/source/n/mtr/mtr-0.73.configure.error.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- ./configure.orig 2008-04-07 11:32:49.000000000 -0500 -+++ ./configure 2008-07-24 12:57:20.000000000 -0500 -@@ -6737,17 +6737,6 @@ - - - rm -f conf.gtktest -- -- else -- AM_PATH_GTK(1.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS" -- LIBS="$LIBS $GTK_LIBS", -- { echo "$as_me:$LINENO: WARNING: Building without GTK+ display support" >&5 --echo "$as_me: WARNING: Building without GTK+ display support" >&2;} -- cat >>confdefs.h <<\_ACEOF --#define NO_GTK 1 --_ACEOF -- -- GTK_OBJ="") - fi - else - cat >>confdefs.h <<\_ACEOF diff --git a/source/n/mtr/mtr.SlackBuild b/source/n/mtr/mtr.SlackBuild index 91ed7be9d..4f53c5876 100755 --- a/source/n/mtr/mtr.SlackBuild +++ b/source/n/mtr/mtr.SlackBuild @@ -22,10 +22,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=mtr -VERSION=0.73 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=mtr +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 "} @@ -35,19 +44,20 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) TMP=${TMP:-/tmp} -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} || exit 1 -zcat $CWD/mtr-0.73.configure.error.diff.gz | patch -p1 --verbose || exit 1 +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z* || exit 1 +cd ${PKGNAM}-${VERSION} || exit 1 chown -R root.root * find . \ @@ -70,11 +80,19 @@ make DESTDIR=$PKG install || exit 1 chmod -s $PKG/usr/sbin/mtr -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* FORMATS INSTALL NEWS README* SECURITY TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* + $PKG/usr/doc/$PKGNAM-$VERSION +chmod -R a-w $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 # Compress the man page(s) find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; @@ -88,5 +106,6 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/n/ncftp/ncftp.SlackBuild b/source/n/ncftp/ncftp.SlackBuild index 81cc729a6..f859b0878 100755 --- a/source/n/ncftp/ncftp.SlackBuild +++ b/source/n/ncftp/ncftp.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,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.2.2 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=ncftp +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 2 -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 "} @@ -33,6 +43,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) @@ -43,7 +55,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ncftp-$VERSION -tar xvf $CWD/ncftp-$VERSION-src.tar.bz2 || exit 1 +tar xvf $CWD/ncftp-$VERSION-src.tar.?z* || exit 1 cd ncftp-$VERSION || exit 1 chown -R root:root . find . \ @@ -90,6 +102,14 @@ cp -a doc/* $PKG/usr/doc/ncftp-$VERSION # Useless redundancy: rm -r $PKG/usr/doc/ncftp-$VERSION/{html,man} +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r doc/CHANGELOG.txt ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat doc/CHANGELOG.txt | head -n 1000 > $DOCSDIR/CHANGELOG.txt + touch -r doc/CHANGELOG.txt $DOCSDIR/CHANGELOG.txt +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/n/net-snmp/net-snmp.SlackBuild b/source/n/net-snmp/net-snmp.SlackBuild index a102b0e56..c9ca3e71e 100755 --- a/source/n/net-snmp/net-snmp.SlackBuild +++ b/source/n/net-snmp/net-snmp.SlackBuild @@ -22,10 +22,18 @@ PKGNAM=net-snmp -VERSION=${VERSION:-5.4.2.1} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-5.5} 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} @@ -42,11 +50,14 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION # Make sure ownerships and permissions are sane: @@ -129,6 +140,24 @@ fi # Remove perllocal files: ( cd $PKG ; find . -name perllocal.pod -exec rm "{}" \; ) +# This removes our DESTDIR from the packlist filenames, to keep perl's +# internal inventories consistent and correct. +find $PKG -name .packlist | while read plist ; do + sed -e "s%/share/man%/man%g" \ + -e "s%$PKG%%g" \ + -e "s%\.1$%\.1\.gz%g" \ + -e "s%\.2$%\.2\.gz%g" \ + -e "s%\.3$%\.3\.gz%g" \ + -e "s%\.3pm$%\.3pm\.gz%g" \ + -e "s%\.4$%\.4\.gz%g" \ + -e "s%\.5$%\.5\.gz%g" \ + -e "s%\.6$%\.6\.gz%g" \ + -e "s%\.7$%\.7\.gz%g" \ + -e "s%\.8$%\.8\.gz%g" \ + ${plist} > ${plist}.new + mv -f ${plist}.new ${plist} +done + # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ @@ -136,6 +165,14 @@ cp -a \ INSTALL NEWS PORTING README* TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/n/netatalk/netatalk.SlackBuild b/source/n/netatalk/netatalk.SlackBuild index 1bffea9f0..467825108 100755 --- a/source/n/netatalk/netatalk.SlackBuild +++ b/source/n/netatalk/netatalk.SlackBuild @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.0.4 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -46,7 +58,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf netatalk-$VERSION -tar xvf $CWD/netatalk-$VERSION.tar.xz || exit 1 +tar xvf $CWD/netatalk-$VERSION.tar.?z* || exit 1 cd netatalk-$VERSION || exit 1 chown -R root:root . find . \ @@ -59,11 +71,11 @@ find . \ zcat $CWD/netatalk.etc2ps.diff.gz | patch -p1 || exit 1 # Allow building without xfs quota support -zcat $CWD/netatalk-2.0.4-without_xfs.diff.gz | patch -p1 || exit 1 +zcat $CWD/netatalk.without_xfs.diff.gz | patch -p1 || exit 1 # Disallow transmission of passwords via cleartext and with old version 1 of # the Diffie-Hellman protocol -zcat $CWD/netatalk-2.0.4-afpdconf.diff.gz | patch -p1 || exit 1 +zcat $CWD/netatalk.afpdconf.diff.gz | patch -p1 || exit 1 autoreconf -vif CFLAGS="$SLKCFLAGS" \ diff --git a/source/n/netatalk/netatalk-2.0.4-afpdconf.diff b/source/n/netatalk/netatalk.afpdconf.diff index b2cf5df6f..b2cf5df6f 100644 --- a/source/n/netatalk/netatalk-2.0.4-afpdconf.diff +++ b/source/n/netatalk/netatalk.afpdconf.diff diff --git a/source/n/netatalk/netatalk-2.0.4-without_xfs.diff b/source/n/netatalk/netatalk.without_xfs.diff index 75f97a038..75f97a038 100644 --- a/source/n/netatalk/netatalk-2.0.4-without_xfs.diff +++ b/source/n/netatalk/netatalk.without_xfs.diff diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild index 319ca5e01..9cd6a4e7d 100755 --- a/source/n/network-scripts/network-scripts.SlackBuild +++ b/source/n/network-scripts/network-scripts.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 @@ -23,13 +23,13 @@ PKGNAM=network-scripts VERSION=${VERSION:-13.0} -ARCH=${ARCH:-noarch} -BUILD=${BUILD:-2} - +ARCH=noarch +BUILD=${BUILD:-3} CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} + rm -rf $PKG mkdir -p $TMP $PKG/etc/rc.d ( cd $PKG/etc/rc.d diff --git a/source/n/network-scripts/scripts/rc.inet1 b/source/n/network-scripts/scripts/rc.inet1 index 0080f7dac..4e6c7aa00 100644 --- a/source/n/network-scripts/scripts/rc.inet1 +++ b/source/n/network-scripts/scripts/rc.inet1 @@ -106,12 +106,12 @@ if_up() { fi if [ "${USE_DHCP[$i]}" = "yes" ]; then # use DHCP to bring interface up [ ${DHCP_HOSTNAME[$i]} ] && DHCP_OPTIONS="-h ${DHCP_HOSTNAME[$i]}" - [ "${DHCP_KEEPRESOLV[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -R" - [ "${DHCP_KEEPNTP[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -N" + [ "${DHCP_KEEPRESOLV[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -C resolv.conf" + [ "${DHCP_KEEPNTP[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -C ntp.conf" [ "${DHCP_KEEPGW[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -G" [ "${DHCP_DEBUG[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -d" [ "${DHCP_NOIPV4LL[$i]}" = "yes" ] && DHCP_OPTIONS="$DHCP_OPTIONS -L" - [ ${DHCP_IPADDR[$i]} ] && DHCP_OPTIONS="$DHCP_OPTIONS -s ${DHCP_IPADDR[$i]}" + [ ${DHCP_IPADDR[$i]} ] && DHCP_OPTIONS="$DHCP_OPTIONS -r ${DHCP_IPADDR[$i]}" echo "Polling for DHCP server on interface ${1}:" # If you set a timeout, you get one, even if the kernel doesn't think that # your device is connected, in case /sys isn't right (which it usually isn't diff --git a/source/n/nfs-utils/nfs-utils-1.1.4.tar.bz2.sign b/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign index 3457f1ef7..a4b95a792 100644 --- a/source/n/nfs-utils/nfs-utils-1.1.4.tar.bz2.sign +++ b/source/n/nfs-utils/nfs-utils-1.2.2.tar.bz2.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.9 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBI+KqOyGugalF9Dw4RAuC3AJ97L3+wXMajwG6cIy+8GJJUQYWi3ACgkyET -zLF2+bn5et1RX1dGiiijnhs= -=VrzL +iD8DBQBLfTsAyGugalF9Dw4RAgLSAJ0TnlJLHcU7dEWZ80LA775ZuQnrigCgjnWB +bxbY8o9jiBY9G422Fh6b8bA= +=dG1E -----END PGP SIGNATURE----- diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild index 1e3f5cbf9..8f3e3ef88 100755 --- a/source/n/nfs-utils/nfs-utils.SlackBuild +++ b/source/n/nfs-utils/nfs-utils.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,10 +21,19 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.1.4 -ARCH=${ARCH:-x86_64} +VERSION=1.2.2 BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i486" ]; then @@ -33,6 +42,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) @@ -75,7 +86,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-nfsv3 \ --enable-nfsv4=no \ --enable-gss=no \ - --enable-secure-statd \ + --enable-tirpc=no \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux diff --git a/source/n/nmap/nmap.SlackBuild b/source/n/nmap/nmap.SlackBuild index ddf13b9e6..747836ccf 100755 --- a/source/n/nmap/nmap.SlackBuild +++ b/source/n/nmap/nmap.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,19 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${PKGVERSION:-5.00} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-5.21} 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" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -37,8 +45,13 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi +NUMJOBS=${NUMJOBS:-" -j7 "} + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-nmap @@ -105,6 +118,14 @@ cp -a COPYING* HACKING INSTALL $PKG/usr/doc/nmap-$VERSION 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/*-$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/n/nn/m-x86_64.h b/source/n/nn/m-x86_64.h new file mode 100644 index 000000000..931a6139f --- /dev/null +++ b/source/n/nn/m-x86_64.h @@ -0,0 +1,37 @@ +/************** Machine (and compiler) dependent definitions. ************** + * + * This file is for 80386 based UNIX/XENIX systems. + */ + + +/* MACHINE TYPE DEFINED TYPE VALUE RANGE */ + +typedef unsigned char int8; /* 0 .. 255 */ +typedef short int16; /* -10,000 .. 10,000 */ +typedef int int32; /* -100,000 .. 100,000 */ +typedef unsigned int uint32; /* 0 .. 2^31-1 */ + + + +#ifdef NETWORK_DATABASE + +#if 1 + +/* If you want network byte order, you most likely have TCP as well. */ +/* else... why want network byte order??? */ + +#define NETWORK_BYTE_ORDER /* THEY ARE NOT */ +#include <netinet/in.h> + +#else + +#undef NETWORK_BYTE_ORDER /* THEY ARE NOT */ +/* +YOU LOSE -- I DON'T KNOW HOW TO DO THIS ON 80386 BASED SYSTEMS! +*/ +#define htonl(l) ... /* host long to network long */ +#define ntohl(l) ... /* network long to host long */ + +#endif + +#endif /* NETWORK DATABASE */ diff --git a/source/n/nn/nn.SlackBuild b/source/n/nn/nn.SlackBuild index 45b694375..41757fcca 100755 --- a/source/n/nn/nn.SlackBuild +++ b/source/n/nn/nn.SlackBuild @@ -21,18 +21,30 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=6.7.3 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" + MFILE="m-i80386.h" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" + MFILE="m-x86_64.h" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + MFILE="m-i80386.h" fi CWD=$(pwd) @@ -53,14 +65,19 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/nn.diff.gz | sed -e "s#/usr/lib/nn#/usr/lib${LIBDIRSUFFIX}/nn#" \ - | patch -p1 --verbose || exit 1 +zcat $CWD/nn.diff.gz \ + | sed -e "s#m-sparc.h#${MFILE}#" \ + | sed -e "s#/usr/lib/nn#/usr/lib${LIBDIRSUFFIX}/nn#" \ + | patch -p0 --verbose || exit 1 +if [ $ARCH = "x86_64" ]; then + zcat $CWD/m-x86_64.h.gz > conf/m-x86_64.h +fi zcat $CWD/nn.badnntphost.diff.gz | patch -p1 --verbose || exit 1 # Taken from slamd64 (who adapted an old Ubuntu patch); # Besides adding DESTDIR support, it gets rid of the hardlinks that are created: zcat $CWD/nn.destdir.diff.gz | patch -p1 --verbose || exit 1 -cp config.h-dist config.h +cat config.h-dist | sed -e "s#m-sparc.h#${MFILE}#" > config.h make all echo "*** USE install option 's'" diff --git a/source/n/nn/nn.diff b/source/n/nn/nn.diff index 04ec3c4c2..e78cad97e 100644 --- a/source/n/nn/nn.diff +++ b/source/n/nn/nn.diff @@ -1,5 +1,19 @@ ---- ./config.h-dist.orig 2005-04-01 14:44:22.000000000 -0600 -+++ ./config.h-dist 2006-06-27 16:33:00.000000000 -0500 +--- conf/s-linux.h.orig 2009-11-11 15:43:05.780197095 -0500 ++++ conf/s-linux.h 2009-11-11 15:44:38.760195349 -0500 +@@ -131,9 +131,9 @@ + * (in config.h). + */ + +-#define HAVE_GETHOSTNAME /* BSD systems */ ++/* #define HAVE_GETHOSTNAME /* BSD systems */ + /* #define HAVE_UNAME */ /* System V */ +-/* #define HOSTNAME_FILE "/etc/uucpname" /* or another file */ ++#define HOSTNAME_FILE "/etc/HOSTNAME" /* or another file */ + /* #define HOSTNAME_WHOAMI /* in <whoami.h> */ + + /* +--- config.h-dist.orig 2009-11-11 15:44:13.560225381 -0500 ++++ config.h-dist 2009-11-11 15:49:36.937239629 -0500 @@ -45,7 +45,7 @@ #define DO_NOV_DIGEST @@ -73,6 +87,17 @@ #define DAEMON_MAN_SECTION "8" +@@ -301,8 +301,8 @@ + * SIGN_TYPE is the program to be used to create digital signatures. + */ + +-/* #define SIGN_TYPE "gpg" */ +-#define SIGN_TYPE "pgp" ++#define SIGN_TYPE "gpg" ++/* #define SIGN_TYPE "pgp" */ + + /* + * If no "Lines:" header field is present, NN can be made to @@ -425,7 +425,7 @@ * Default: NEWS_LIB_DIR/{rm,del}group */ @@ -83,3 +108,13 @@ +/* #define NEWS_LIB_DIRECTORY "/var/lib/news" */ /************************ CONFIGURATION COMPLETED ************************/ +--- hostname.c.orig 2009-11-11 16:00:16.485194441 -0500 ++++ hostname.c 2009-11-11 16:15:25.741225660 -0500 +@@ -17,6 +17,7 @@ + #include <unistd.h> + #include <string.h> + #include "config.h" ++#include "global.h" + + #undef DONE + diff --git a/source/n/ntp/ntp.SlackBuild b/source/n/ntp/ntp.SlackBuild index 93ff1ee82..b8d4d3638 100755 --- a/source/n/ntp/ntp.SlackBuild +++ b/source/n/ntp/ntp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -VERSION=4.2.4p7 -ARCH=${ARCH:-x86_64} +PKGNAM=ntp +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 @@ -33,6 +42,8 @@ elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" fi CWD=$(pwd) @@ -45,6 +56,9 @@ cd $TMP rm -rf ntp-${VERSION}* tar xvf $CWD/ntp-${VERSION}*.tar.?z* || exit 1 cd ntp-${VERSION}* || exit 1 + +zcat $CWD/ntp.nano.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 2777 -o -perm 2755 \) \ @@ -61,12 +75,13 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --bindir=/usr/sbin \ --sbindir=/usr/sbin \ + --mandir=/usr/man \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 +make -i install DESTDIR=$PKG || exit 1 # Since the Makefile's install pays no heed to the --bindir settings, # we'll move things to where they've always been ourselves: @@ -95,13 +110,37 @@ cp -a util/README $PKG/usr/doc/ntp-$VERSION/util mkdir $PKG/usr/doc/ntp-$VERSION/ntpdate cp -a ntpdate/README $PKG/usr/doc/ntp-$VERSION/ntpdate ( cd $PKG/usr/doc/ntp-$VERSION - find . -type d -name .deps -exec rm -rf {} \; 2> /dev/null + find . -name ".deps*" -exec rm -rf "{}" \; 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 +# 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 -gzip -9 $PKG/usr/man/man?/*.? +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/n/ntp/ntp.nano.diff b/source/n/ntp/ntp.nano.diff new file mode 100644 index 000000000..0ff361ce9 --- /dev/null +++ b/source/n/ntp/ntp.nano.diff @@ -0,0 +1,17 @@ +--- ./include/ntp_syscall.h.orig 2009-12-09 01:36:37.000000000 -0600 ++++ ./include/ntp_syscall.h 2010-04-21 23:38:30.000000000 -0500 +@@ -14,6 +14,14 @@ + # include <sys/timex.h> + #endif + ++#if defined(ADJ_NANO) && !defined(MOD_NANO) ++#define MOD_NANO ADJ_NANO ++#endif ++ ++#if defined(ADJ_TAI) && !defined(MOD_TAI) ++#define MOD_TAI ADJ_TAI ++#endif ++ + #ifndef NTP_SYSCALLS_LIBC + #ifdef NTP_SYSCALLS_STD + # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/source/n/ntp/rc.ntpd b/source/n/ntp/rc.ntpd index 2db421f6c..7cf3d50b0 100644 --- a/source/n/ntp/rc.ntpd +++ b/source/n/ntp/rc.ntpd @@ -12,11 +12,13 @@ ntpd_start() { # Stop ntpd: ntpd_stop() { echo -n "Stopping NTP daemon..." - kill $(cat /var/run/ntpd.pid) + if [ -r /var/run/ntpd.pid ]; then + kill -HUP $(cat /var/run/ntpd.pid) + rm -f /var/run/ntpd.pid + else + killall -HUP -q ntpd + fi echo - sleep 1 - rm -f /var/run/ntpd.pid - killall ntpd 2> /dev/null } # Restart ntpd: @@ -32,6 +34,7 @@ ntpd_status() { echo "ntpd is running." else echo "ntpd is stopped." + exit 1 fi } diff --git a/source/n/obex-data-server/doinst.sh b/source/n/obex-data-server/doinst.sh new file mode 100644 index 000000000..6c2a2f1c3 --- /dev/null +++ b/source/n/obex-data-server/doinst.sh @@ -0,0 +1,16 @@ +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/obex-data-server/imaging_capabilities.xml.new +config etc/obex-data-server/capability.xml.new + diff --git a/source/n/bluez-libs/bluez-libs.SlackBuild b/source/n/obex-data-server/obex-data-server.SlackBuild index e25d346d7..512b0e0d2 100755 --- a/source/n/bluez-libs/bluez-libs.SlackBuild +++ b/source/n/obex-data-server/obex-data-server.SlackBuild @@ -1,6 +1,7 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009 Robby Workman, Northport, Alabama, USA +# Copyright 2010 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -9,7 +10,7 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -20,37 +21,46 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +PKGNAM=obex-data-server +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 -PKGNAM=bluez-libs -VERSION=${VERSION:-3.36} -ARCH=${ARCH:-x86_64} NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} - CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi +rm -rf $PKG +mkdir -p $TMP $PKG cd $TMP -rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 -cd ${PKGNAM}-$VERSION - -# Make sure ownerships and permissions are sane: +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 \) \ @@ -58,57 +68,47 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Configure: CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ + --localstatedir=/var \ --mandir=/usr/man \ - --disable-static \ --build=$ARCH-slackware-linux -# Build and install: make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -# 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 +# Don't clobber config files +mv $PKG/etc/obex-data-server/imaging_capabilities.xml \ + $PKG/etc/obex-data-server/imaging_capabilities.xml.new +mv $PKG/etc/obex-data-server/capability.xml \ + $PKG/etc/obex-data-server/capability.xml.new -# Compress info files, if any: -if [ -d $PKG/usr/info ]; then - ( cd $PKG/usr/info - rm -f dir - gzip -9 * - ) -fi +gzip -9 $PKG/usr/man/man?/*.? -# Add a documentation directory: -mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ - $PKG/usr/doc/${PKGNAM}-$VERSION + AUTHORS COPYING* NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${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 +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/obex-data-server/slack-desc b/source/n/obex-data-server/slack-desc new file mode 100644 index 000000000..68bd08907 --- /dev/null +++ b/source/n/obex-data-server/slack-desc @@ -0,0 +1,20 @@ +# 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------------------------------------------------------| +obex-data-server: obex-data-server (Obex D-Bus Service Support) +obex-data-server: +obex-data-server: Obex-data-server is a D-Bus service providing high-level OBEX client +obex-data-server: and server side functionality, and currently supports OPP, FTP +obex-data-server: profiles and Bluetooth transport. +obex-data-server: +obex-data-server: +obex-data-server: +obex-data-server: +obex-data-server: +obex-data-server: +obex-data-server: diff --git a/source/n/obexfs/obexfs.SlackBuild b/source/n/obexfs/obexfs.SlackBuild new file mode 100755 index 000000000..05c9ceb32 --- /dev/null +++ b/source/n/obexfs/obexfs.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/bash + +# Slackware build script for obexfs + +# Copyright 2009 Robby Workman, Northport, Alabama, USA +# Copyright 2010 Patrick 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=obexfs +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $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" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || make || 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 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${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/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/obexfs/slack-desc b/source/n/obexfs/slack-desc new file mode 100644 index 000000000..73971edc1 --- /dev/null +++ b/source/n/obexfs/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------------------------------------------------------| +obexfs: obexfs (mount filesystem of ObexFTP capable devices) +obexfs: +obexfs: ObexFS uses FUSE to mount filesystems of ObexFTP capable devices +obexfs: either manually or in autofs style mode. It can handle all devices +obexfs: that the obexftp package can handle, connected via serial cable, +obexfs: IrDA, bluetooth, or USB. +obexfs: +obexfs: http://dev.zuckschwerdt.org/openobex/wiki/ObexDownloads +obexfs: +obexfs: +obexfs: diff --git a/source/n/obexftp/obexftp.SlackBuild b/source/n/obexftp/obexftp.SlackBuild index 821db8d21..e2992d559 100755 --- a/source/n/obexftp/obexftp.SlackBuild +++ b/source/n/obexftp/obexftp.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,17 +21,24 @@ PKGNAM=obexftp -VERSION=${VERSION:-0.23} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} + NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -42,11 +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 ${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 # Make sure ownerships and permissions are sane: @@ -57,6 +69,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fixes the RSTRINGLEN for ruby-1.9 +zcat $CWD/ruby_rstringlen.diff.gz | patch -p1 --verbose || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -110,27 +125,27 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO contrib \ + AUTHORS COPYING* INSTALL NEWS README* THANKS TODO contrib \ $PKG/usr/doc/${PKGNAM}-$VERSION rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/contrib/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/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + # Remove perllocal files: find $PKG -name perllocal.pod -exec rm "{}" \; # This removes our DESTDIR from the packlist filenames, to keep perl's # internal inventories consistent and correct. find $PKG -name .packlist | while read plist ; do - sed -e "s%/share/man%/man%g" \ - -e "s%$PKG%%g" \ - -e "s%\.1$%\.1\.gz%g" \ - -e "s%\.2$%\.2\.gz%g" \ - -e "s%\.3$%\.3\.gz%g" \ - -e "s%\.3pm$%\.3pm\.gz%g" \ - -e "s%\.4$%\.4\.gz%g" \ - -e "s%\.5$%\.5\.gz%g" \ - -e "s%\.6$%\.6\.gz%g" \ - -e "s%\.7$%\.7\.gz%g" \ - -e "s%\.8$%\.8\.gz%g" \ + sed -e "s%$PKG%%g" \ + -e "s%/share/man%/man%g" \ + -re "s%\.([1-9]n?|3pm)$%&.gz%g # extend man filenames for .gz" \ ${plist} > ${plist}.new mv -f ${plist}.new ${plist} done diff --git a/source/n/obexftp/ruby_rstringlen.diff b/source/n/obexftp/ruby_rstringlen.diff new file mode 100644 index 000000000..c406b44c2 --- /dev/null +++ b/source/n/obexftp/ruby_rstringlen.diff @@ -0,0 +1,15 @@ +diff -Naur obexftp-0.23.orig/swig/ruby/ruby_wrap.c obexftp-0.23/swig/ruby/ruby_wrap.c +--- obexftp-0.23.orig/swig/ruby/ruby_wrap.c 2009-02-17 12:30:40.000000000 -0600 ++++ obexftp-0.23/swig/ruby/ruby_wrap.c 2010-04-19 12:55:10.445810800 -0500 +@@ -2580,7 +2580,11 @@ + + /* VALUE str = StringValue(argv[0]); // perhaps better? */ + arg2 = STR2CSTR(argv[0]); ++#ifdef RSTRING_LEN ++ arg3 = (int) RSTRING_LEN(argv[0]); ++#else + arg3 = (int) RSTRING(argv[0])->len; ++#endif + + + diff --git a/source/n/openldap-client/openldap-client.SlackBuild b/source/n/openldap-client/openldap-client.SlackBuild index 0131f63c9..c23e17f48 100755 --- a/source/n/openldap-client/openldap-client.SlackBuild +++ b/source/n/openldap-client/openldap-client.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,10 +23,19 @@ # OpenLDAP (clients/libraries only!) -VERSION=2.3.43 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo openldap-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -46,8 +58,8 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf openldap-$VERSION -tar xjvf $CWD/openldap-$VERSION.tar.bz2 || exit 1 -cd openldap-$VERSION +tar xvf $CWD/openldap-$VERSION.tar.?z* || exit 1 +cd openldap-$VERSION || exit 1 chown -R root:root . find . -perm 777 -exec chmod 755 {} \; find . -perm 664 -exec chmod 644 {} \; @@ -57,6 +69,7 @@ CFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --localstatedir=/var/lib \ --sysconfdir=/etc \ + --mandir=/usr/man \ --with-cyrus-sasl \ --with-tls \ --with-readline \ @@ -89,9 +102,17 @@ EOF mkdir -p $PKG/usr/doc/openldap-$VERSION cp -a \ - ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README \ + ANNOUNCEMENT COPYRIGHT LICENSE README \ $PKG/usr/doc/openldap-$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 CHANGES ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat CHANGES | head -n 1000 > $DOCSDIR/CHANGES + touch -r CHANGES $DOCSDIR/CHANGES +fi + # Remove man pages for the servers (not currently supported or shipped... # do they even work properly without the evil PAM?) find $PKG/usr/man -name slap* -exec rm -f {} \; diff --git a/source/n/openobex/openobex.SlackBuild b/source/n/openobex/openobex.SlackBuild index 201735223..5559d9d29 100755 --- a/source/n/openobex/openobex.SlackBuild +++ b/source/n/openobex/openobex.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,18 +22,23 @@ PKGNAM=openobex -VERSION=${VERSION:-1.3} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine architecture for build & packaging: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -44,11 +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 ${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 # Make sure ownerships and permissions are sane: @@ -106,9 +116,17 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS README* \ + AUTHORS COPYING* INSTALL NEWS README* \ $PKG/usr/doc/${PKGNAM}-$VERSION +# 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 diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index 4a6611327..3d0d1a986 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2000 BSDi, Inc. Concord, CA, USA # Copyright 2001, 2002, 2003, 2004 Slackware Linux, Inc. Concord, CA, USA -# 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 @@ -28,9 +28,20 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-openssh -VERSION=${VERSION:-5.2p1} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo openssh-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j6} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -42,6 +53,8 @@ elif [ "$ARCH" = "arm" ]; then SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" elif [ "$ARCH" = "armel" ]; then SLKCFLAGS="-O2 -march=armv4t" +else + SLKCFLAGS="-O2" fi # Clean target location: @@ -51,7 +64,7 @@ mkdir -p $PKG # Prepare the framework and extract the package: cd $TMP rm -rf $PKG openssh-$VERSION -tar xjvf $CWD/openssh-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/openssh-$VERSION.tar.gz || tar xvf $CWD/openssh-$VERSION.tar.?z* || exit 1 cd openssh-$VERSION chown -R root:root . @@ -70,15 +83,13 @@ CFLAGS="$SLKCFLAGS" \ --with-privsep-user=sshd \ --build=$ARCH-slackware-linux -make -j4 || exit 1 +make $NUMJOBS || make || exit 1 # Install the package: 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 -) +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 if needed symlink the man pages: if [ -d $PKG/usr/man ]; then @@ -107,6 +118,14 @@ cp -a \ $PKG/usr/doc/openssh-$VERSION chmod 644 $PKG/usr/doc/openssh-$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 + # Install also 'ssh-copy-id' and its manpage from contrib: ( cd contrib cp -a ssh-copy-id $PKG/usr/bin/ssh-copy-id diff --git a/source/n/openssl/openssl.SlackBuild b/source/n/openssl/openssl.SlackBuild index b6cb80741..82aa87f3c 100755 --- a/source/n/openssl/openssl.SlackBuild +++ b/source/n/openssl/openssl.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2000 BSDi, Inc. Concord, CA, USA # Copyright 2001, 2002 Slackware Linux, Inc. Concord, CA, USA -# Copyright 2005, 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005, 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,9 +27,18 @@ CWD=$(pwd) TMP=${TMP:-/tmp} -VERSION=${VERSION:-0.9.8k} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo openssl-*.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 PKG1=$TMP/package-openssl PKG2=$TMP/package-ossllibs @@ -43,7 +52,7 @@ export LC_ALL=C cd $TMP rm -rf $PKG1 $PKG2 openssl-$VERSION -tar xvf $CWD/openssl-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/openssl-$VERSION.tar.?z* || exit 1 cd openssl-$VERSION # Use .so.0, not .so.0.9.8: @@ -56,9 +65,6 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi -# Advertise TLS extensions only on TLS handshakes, not SSL: -zcat $CWD/openssl.no-extssl.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . mkdir -p $PKG1/usr/doc/openssl-$VERSION cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \ @@ -66,6 +72,14 @@ cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \ find $PKG1/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \; find $PKG1/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \; +# 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 $PKG1/usr/doc/*-$VERSION) + cat CHANGES | head -n 2000 > $DOCSDIR/CHANGES + touch -r CHANGES $DOCSDIR/CHANGES +fi + # These are the known patent issues with OpenSSL: # name # expires # MDC-2: 4,908,861 2007-03-13, included. :-) @@ -86,8 +100,24 @@ make $NUMJOBS || make || exit 1 make install INSTALL_PREFIX=$PKG1 || exit 1 +# Use proper libdir: ( cd $PKG1/usr; mv lib lib${LIBDIRSUFFIX} ) +# Make the .so.? library symlinks: +( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ldconfig -l lib*.so.* ) + +# Move libraries, as they might be needed by programs that bring a network +# mounted /usr online: + +mkdir $PKG1/lib${LIBDIRSUFFIX} +( cd $PKG1/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) + # Add a cron script to warn root if a certificate is going to expire soon: mkdir -p $PKG1/etc/cron.daily zcat $CWD/certwatch.gz > $PKG1/etc/cron.daily/certwatch.new @@ -100,9 +130,6 @@ mv $PKG1/etc/ssl/openssl.cnf $PKG1/etc/ssl/openssl.cnf.new find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) -( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ldconfig -l * 2> /dev/null ) -( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ln -sf libcrypto.so.0 libcrypto.so ) -( cd $PKG1/usr/lib${LIBDIRSUFFIX} ; ln -sf libssl.so.0 libssl.so ) mv $PKG1/etc/ssl/man $PKG1/usr ( cd $PKG1/usr/man/man1 ; mv passwd.1 ssl_passwd.1 ) ( cd $PKG1/usr/man/man3 ; mv rand.3 ssl_rand.3 ) @@ -131,9 +158,9 @@ cat $CWD/slack-desc.openssl > install/slack-desc /sbin/makepkg -l y -c n $TMP/${NAME1}.txz # Make runtime package: -mkdir -p $PKG2/usr/lib${LIBDIRSUFFIX} -( cd usr/lib${LIBDIRSUFFIX} ; cp -a lib*.so.*.*.* $PKG2/usr/lib${LIBDIRSUFFIX} ) -( cd $PKG2/usr/lib${LIBDIRSUFFIX} ; ldconfig -l * ) +mkdir -p $PKG2/lib${LIBDIRSUFFIX} +( cd lib${LIBDIRSUFFIX} ; cp -a lib*.so.* $PKG2/lib${LIBDIRSUFFIX} ) +( cd $PKG2/lib${LIBDIRSUFFIX} ; ldconfig -l * ) mkdir -p $PKG2/etc ( cd $PKG2/etc ; cp -a $PKG1/etc/ssl . ) mkdir -p $PKG2/usr/doc/openssl-$VERSION @@ -141,6 +168,15 @@ mkdir -p $PKG2/usr/doc/openssl-$VERSION cp -a CHANGES CHANGES.SSLeay FAQ INSTALL INSTALL.MacOS INSTALL.VMS INSTALL.W32 \ LICENSE NEWS README README.ENGINE $PKG2/usr/doc/openssl-$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 $PKG2/usr/doc/*-$VERSION) + cat CHANGES | head -n 2000 > $DOCSDIR/CHANGES + touch -r CHANGES $DOCSDIR/CHANGES +fi + find $PKG2/usr/doc/openssl-$VERSION -type d -exec chmod 755 {} \; find $PKG2/usr/doc/openssl-$VERSION -type f -exec chmod 644 {} \; cd $PKG2 diff --git a/source/n/openssl/openssl.no-extssl.diff b/source/n/openssl/openssl.no-extssl.diff deleted file mode 100644 index de00d0c77..000000000 --- a/source/n/openssl/openssl.no-extssl.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff -up openssl-0.9.8g/ssl/t1_lib.c.no-extssl openssl-0.9.8g/ssl/t1_lib.c ---- openssl-0.9.8g/ssl/t1_lib.c.no-extssl 2007-10-19 09:44:10.000000000 +0200 -+++ openssl-0.9.8g/ssl/t1_lib.c 2008-08-10 21:42:11.000000000 +0200 -@@ -132,6 +132,11 @@ unsigned char *ssl_add_clienthello_tlsex - int extdatalen=0; - unsigned char *ret = p; - -+ if (s->client_version != TLS1_VERSION && s->client_version != DTLS1_VERSION) -+ { -+ return ret; -+ } -+ - ret+=2; - - if (ret>=limit) return NULL; /* this really never occurs, but ... */ -@@ -202,6 +207,11 @@ unsigned char *ssl_add_serverhello_tlsex - int extdatalen=0; - unsigned char *ret = p; - -+ if (s->version != TLS1_VERSION && s->version != DTLS1_VERSION) -+ { -+ return ret; -+ } -+ - ret+=2; - if (ret>=limit) return NULL; /* this really never occurs, but ... */ - diff --git a/source/n/openvpn/openvpn.SlackBuild b/source/n/openvpn/openvpn.SlackBuild index 45c1a17d8..56e344c47 100755 --- a/source/n/openvpn/openvpn.SlackBuild +++ b/source/n/openvpn/openvpn.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006, Alan Hicks, Lizella, GA -# 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,11 +22,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=openvpn -VERSION=2.0.9 -ARCH=${ARCH:-x86_64} +PKGNAM=openvpn +VERSION=2.1.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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i486" ]; then @@ -38,18 +47,21 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/pkg-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 +cd $PKGNAM-$VERSION || exit 1 # Fix ownership and permissions inside the source tarball. # It's appalling how many projects have 777 permissions or @@ -68,6 +80,8 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc/openvpn \ --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/openvpn-${VERSION} \ --enable-lzo \ --build=$ARCH-slackware-linux @@ -87,7 +101,7 @@ chmod 644 $PKG/etc/openvpn/openvpn.conf.sample # Let folks know about the other configs, if they haven't found them. # They might even find the documentation there useful. ;-) cat << EOF > $PKG/etc/openvpn/README.TXT -Have a look in /usr/doc/$PRGNAM-$VERSION/sample-config-files +Have a look in /usr/doc/$PKGNAM-$VERSION/sample-config-files for some more examples of how to configure OpenVPN. You'll need to add something to your /etc/rc.d/rc.local to start OpenVPN, as well as to tell it where to find its config file. @@ -97,8 +111,8 @@ See "man openvpn" and the other docs for more information. EOF # Add a link, too: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/sample-config-files -( cd $PKG/usr/doc/$PRGNAM-$VERSION/sample-config-files +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/sample-config-files +( cd $PKG/usr/doc/$PKGNAM-$VERSION/sample-config-files ln -sf /etc/openvpn/openvpn.conf.sample . ) @@ -109,14 +123,22 @@ if [ -d $PKG/usr/man ]; then ) fi -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL INSTALL-win32.txt \ +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a AUTHORS COPYING COPYRIGHT.GPL INSTALL INSTALL-win32.txt \ NEWS PORTS README sample-config-files sample-keys sample-scripts easy-rsa \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/php/channels/pear.php.net.reg b/source/n/php/channels/pear.php.net.reg deleted file mode 100644 index f836b1a22..000000000 --- a/source/n/php/channels/pear.php.net.reg +++ /dev/null @@ -1 +0,0 @@ -a:5:{s:4:"name";s:12:"pear.php.net";s:14:"suggestedalias";s:4:"pear";s:7:"summary";s:40:"PHP Extension and Application Repository";s:7:"servers";a:1:{s:7:"primary";a:2:{s:6:"xmlrpc";a:1:{s:8:"function";a:10:{i:0;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:9:"logintest";}i:1;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:26:"package.listLatestReleases";}i:2;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:15:"package.listAll";}i:3;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:12:"package.info";}i:4;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:22:"package.getDownloadURL";}i:5;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.1";}s:8:"_content";s:22:"package.getDownloadURL";}i:6;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:25:"package.getDepDownloadURL";}i:7;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.1";}s:8:"_content";s:25:"package.getDepDownloadURL";}i:8;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:14:"package.search";}i:9;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:15:"channel.listAll";}}}s:4:"rest";a:1:{s:7:"baseurl";a:2:{i:0;a:2:{s:7:"attribs";a:1:{s:4:"type";s:7:"REST1.0";}s:8:"_content";s:25:"http://pear.php.net/rest/";}i:1;a:2:{s:7:"attribs";a:1:{s:4:"type";s:7:"REST1.1";}s:8:"_content";s:25:"http://pear.php.net/rest/";}}}}}s:13:"_lastmodified";s:31:"Sat, 04 Apr 2009 17:17:11 -0500";}
\ No newline at end of file diff --git a/source/n/php/channels/pecl.php.net.reg b/source/n/php/channels/pecl.php.net.reg deleted file mode 100644 index ea6eaa146..000000000 --- a/source/n/php/channels/pecl.php.net.reg +++ /dev/null @@ -1 +0,0 @@ -a:6:{s:4:"name";s:12:"pecl.php.net";s:14:"suggestedalias";s:4:"pecl";s:7:"summary";s:31:"PHP Extension Community Library";s:7:"servers";a:1:{s:7:"primary";a:2:{s:6:"xmlrpc";a:1:{s:8:"function";a:10:{i:0;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:9:"logintest";}i:1;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:26:"package.listLatestReleases";}i:2;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:15:"package.listAll";}i:3;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:12:"package.info";}i:4;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:22:"package.getDownloadURL";}i:5;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.1";}s:8:"_content";s:22:"package.getDownloadURL";}i:6;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:25:"package.getDepDownloadURL";}i:7;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.1";}s:8:"_content";s:25:"package.getDepDownloadURL";}i:8;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:14:"package.search";}i:9;a:2:{s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}s:8:"_content";s:15:"channel.listAll";}}}s:4:"rest";a:1:{s:7:"baseurl";a:2:{i:0;a:2:{s:7:"attribs";a:1:{s:4:"type";s:7:"REST1.0";}s:8:"_content";s:25:"http://pecl.php.net/rest/";}i:1;a:2:{s:7:"attribs";a:1:{s:4:"type";s:7:"REST1.1";}s:8:"_content";s:25:"http://pecl.php.net/rest/";}}}}}s:15:"validatepackage";a:2:{s:8:"_content";s:19:"PEAR_Validator_PECL";s:7:"attribs";a:1:{s:7:"version";s:3:"1.0";}}s:13:"_lastmodified";s:31:"Sat, 04 Apr 2009 17:17:11 -0500";}
\ No newline at end of file diff --git a/source/n/php/mod_php.conf.example b/source/n/php/mod_php.conf.example index 7a678b90c..670eb7135 100644 --- a/source/n/php/mod_php.conf.example +++ b/source/n/php/mod_php.conf.example @@ -7,8 +7,10 @@ LoadModule php5_module lib/httpd/modules/libphp5.so # Tell Apache to feed all *.php files through PHP. If you'd like to # parse PHP embedded in files with different extensions, comment out -# this line and see the example below. -AddType application/x-httpd-php .php +# these lines and see the example below. +<FilesMatch \.php$> + SetHandler application/x-httpd-php +</FilesMatch> # Tell Apache to feed all *.php, *.html, and *.htm files through # the PHP module. Add or subtract extensions here as desired. Please @@ -16,7 +18,12 @@ AddType application/x-httpd-php .php # and insecure, so be sure to know what you're doing. It's a convenient # shortcut, but probably isn't suitible for high-traffic sites if you # write any of your pages in straight HTML. -#AddType application/x-httpd-php .php .html .htm +#<FilesMatch "\.(php|html|htm)$"> +# SetHandler application/x-httpd-php +#</FilesMatch> # This will display PHP files in colored syntax form. Use with caution. -#AddType application/x-httpd-php-source .phps +#<FilesMatch "\.phps$"> +# SetHandler application/x-httpd-php-source +#</FilesMatch> + diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild index 5f8e2d351..dc0b74bbd 100755 --- a/source/n/php/php.SlackBuild +++ b/source/n/php/php.SlackBuild @@ -3,7 +3,7 @@ # Build and package mod_php on Slackware. # by: David Cantrell <david@slackware.com> # Modified for PHP 4-5 by volkerdi@slackware.com -# Copyright 2007, 2008, 2009 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,11 +24,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=5.2.10 +VERSION=5.2.13 ALPINE=2.00 -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 + NUMJOBS=${NUMJOBS:-" -j7 "} CWD=$(pwd) @@ -37,7 +46,10 @@ PKG=$TMP/package-php/ rm -rf $PKG mkdir -p $TMP $PKG -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then @@ -46,6 +58,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi # we need to compile alpine to get c-client.a for IMAP support: @@ -77,9 +92,12 @@ fi cd $TMP rm -rf php-$VERSION -tar xvf $CWD/php-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/php-$VERSION.tar.?z* || exit 1 cd php-$VERSION +zcat $CWD/php.gmp5.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/php.gd_libpng-1.4.diff.gz | patch -p1 --verbose || exit 1 + # Add missing(?) PEAR modules back: if [ -d php-$VERSION/pear/packages ]; then ( cd php-$VERSION/pear/packages @@ -178,7 +196,7 @@ CFLAGS="$SLKCFLAGS" \ --with-mysqli=shared,/usr/bin/mysql_config \ --enable-pdo=shared \ --with-pdo-mysql=shared,/usr \ - --with-pdo-sqlite=shared \ + --with-pdo-sqlite=shared,/usr \ --with-pspell=shared,/usr \ --with-mm=/usr \ --enable-shmop=shared \ @@ -244,13 +262,13 @@ chmod 755 $PKG/usr/bin/pear rm -rf .channels .depdb .depdblock .filemap .lock .registry ) -# Fix a couple broken .reg files in php-5.2.10: -if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg ; then - cat $CWD/channels/pear.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg -fi -if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg ; then - cat $CWD/channels/pecl.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg -fi +## Fix a couple broken .reg files in php-5.2.10: +#if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg ; then +# cat $CWD/channels/pear.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pear.php.net.reg +#fi +#if ! grep -q Download $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg ; then +# cat $CWD/channels/pecl.php.net.reg > $PKG/usr/lib${LIBDIRSUFFIX}/php/.channels/pecl.php.net.reg +#fi # Fix $PKG/usr/lib/php perms: ( cd $PKG/usr/lib${LIBDIRSUFFIX}/php diff --git a/source/n/php/php.gd_libpng-1.4.diff b/source/n/php/php.gd_libpng-1.4.diff new file mode 100644 index 000000000..a591b7331 --- /dev/null +++ b/source/n/php/php.gd_libpng-1.4.diff @@ -0,0 +1,12 @@ +diff -ru php-5.2.13.orig/ext/gd/libgd/gd_png.c php-5.2.13/ext/gd/libgd/gd_png.c +--- php-5.2.13.orig/ext/gd/libgd/gd_png.c 2009-03-14 12:48:42.000000000 -0500 ++++ php-5.2.13/ext/gd/libgd/gd_png.c 2010-03-21 02:17:03.000000000 -0500 +@@ -139,7 +139,7 @@ + return NULL; + } + +- if (!png_check_sig (sig, 8)) { /* bad signature */ ++ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ + return NULL; + } + diff --git a/source/n/php/php.gmp5.diff b/source/n/php/php.gmp5.diff new file mode 100644 index 000000000..f77dd33a1 --- /dev/null +++ b/source/n/php/php.gmp5.diff @@ -0,0 +1,11 @@ +--- ./ext/gmp/gmp.c.orig 2010-01-03 03:23:27.000000000 -0600 ++++ ./ext/gmp/gmp.c 2010-03-05 21:27:46.000000000 -0600 +@@ -1396,7 +1396,7 @@ + + GMPG(rand_initialized) = 1; + } +- mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * __GMP_BITS_PER_MP_LIMB); ++ mpz_urandomb(*gmpnum_result, GMPG(rand_state), GMP_ABS (limiter) * GMP_LIMB_BITS); + + ZEND_REGISTER_RESOURCE(return_value, gmpnum_result, le_gmp); + } diff --git a/source/n/pinentry/pinentry.SlackBuild b/source/n/pinentry/pinentry.SlackBuild index 3e0dd44de..d01b1295d 100755 --- a/source/n/pinentry/pinentry.SlackBuild +++ b/source/n/pinentry/pinentry.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2006 Robby Workman (http://rlworkman.net) -# Copyright 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pinentry -VERSION=0.7.6 -ARCH=${ARCH:-x86_64} +PKGNAM=pinentry +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 @@ -45,19 +54,23 @@ elif [ "$ARCH" = "arm" ]; then SLKCFLAGS="-O2 -march=armv4t" LIBDIRSUFFIX="" ARCHQUADLET="-gnueabi" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ARCHQUADLET="" fi CWD=$(pwd) TMP=${TMP:-/tmp} -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 || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -102,14 +115,21 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ rm $PKG/usr/info/dir gzip -9 $PKG/usr/info/*.info -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/ppp/ppp.SlackBuild b/source/n/ppp/ppp.SlackBuild index 227a9beb0..f7732bd61 100755 --- a/source/n/ppp/ppp.SlackBuild +++ b/source/n/ppp/ppp.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,14 +20,23 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.4.4 +VERSION=2.4.5 RADVER=0.3.2 PPPVER=1.98 -ARCH=${ARCH:-x86_64} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else @@ -96,7 +105,8 @@ rm -rf radiusclient-$RADVER tar xf $CWD/radiusclient-$RADVER.tar.bz2 || exit 1 cd radiusclient-$RADVER || exit 1 chown -R root:root . -cp /usr/share/libtool/config.{guess,sub} . +#cp /usr/share/libtool/config.{guess,sub} . # libtool-1.x +cp /usr/share/libtool/config/config.{guess,sub} . # libtool-2.x ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild index b004745ab..e7227fda3 100755 --- a/source/n/proftpd/proftpd.SlackBuild +++ b/source/n/proftpd/proftpd.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,13 +21,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.3.2 -DIRVER=1.3.2 -ARCH=${ARCH:-x86_64} +VERSION=1.3.3 +DIRVER=1.3.3 BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -48,7 +60,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf proftpd-$VERSION -tar xvf $CWD/proftpd-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/proftpd-$VERSION.tar.?z* || exit 1 cd proftpd-$DIRVER || exit 1 chown -R root:root . @@ -93,8 +105,13 @@ mkdir -p $PKG/usr/doc/proftpd-$VERSION cp -a COPYING CREDITS INSTALL NEWS README* \ contrib/README.mod_wrap contrib/README.ratio \ $PKG/usr/doc/proftpd-$VERSION -head -c 93 ChangeLog > $PKG/usr/doc/proftpd-$VERSION/ChangeLog -touch -r ChangeLog $PKG/usr/doc/proftpd-$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/proftpd-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi cp -a contrib/README $PKG/usr/doc/proftpd-$VERSION/README.contrib cp -a doc sample-configurations $PKG/usr/doc/proftpd-$VERSION # Bloat removal: diff --git a/source/n/pssh/pssh.SlackBuild b/source/n/pssh/pssh.SlackBuild index 8bb3dcbe9..25c19ae3c 100755 --- a/source/n/pssh/pssh.SlackBuild +++ b/source/n/pssh/pssh.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,10 +22,20 @@ # required: package "python" version 2.2 or higher installed -VERSION=1.3.1 -ARCH=${ARCH:-x86_64} # Note that the package will be created as 'noarch' ! +VERSION=2.1.1 BUILD=1 +# Note that the package will be created as 'noarch' ! +# 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 + PREFIX=/usr if [ "$ARCH" = "x86_64" ]; then diff --git a/source/n/pssh/slack-desc b/source/n/pssh/slack-desc index 42d25006f..8b69ec685 100644 --- a/source/n/pssh/slack-desc +++ b/source/n/pssh/slack-desc @@ -14,6 +14,6 @@ pssh: of large number of machines, using parallel ssh sessions. Included pssh: are parallel versions of ssh, scp, and rsync, as well as a parallel pssh: kill command. pssh: -pssh: Pssh has been written by Brent N. Chun, and requires the python -pssh: package installed. +pssh: Pssh has been written by Brent Chun <bnc at theether.org>, and is +pssh: currently maintained by Andrew McNabb <amcnabb at mcnabbs.org>. pssh: diff --git a/source/n/rdist/rdist-6.1.5-00.linux.diff b/source/n/rdist/rdist-6.1.5-00.linux.diff new file mode 100644 index 000000000..1f9fb8245 --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-00.linux.diff @@ -0,0 +1,23 @@ +diff: rdist-6.1.5/config/mf: No such file or directory +--- rdist-6.1.5/config/os-linux.h.linux Mon Nov 9 22:59:59 1998 ++++ rdist-6.1.5/config/os-linux.h Thu Nov 12 14:50:35 1998 +@@ -58,7 +58,7 @@ + /* + * Select the type of executable file format. + */ +-#define EXE_TYPE EXE_AOUT ++#define EXE_TYPE EXE_ELF + + /* + * Select the type of statfs() system call (if any). +--- rdist-6.1.5/mf/Makefile.var.linux Tue Nov 10 00:02:11 1998 ++++ rdist-6.1.5/mf/Makefile.var Thu Nov 12 14:50:35 1998 +@@ -67,7 +67,7 @@ + # + # Name of YACC. + # +-#YACC = bison -y ++YACC = bison -y + + OPT = -g + RM = rm diff --git a/source/n/rdist/rdist-6.1.5-01.links.diff b/source/n/rdist/rdist-6.1.5-01.links.diff new file mode 100644 index 000000000..187dce4d3 --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-01.links.diff @@ -0,0 +1,74 @@ +--- rdist-6.1.5/src/client.c.links Wed Feb 17 17:46:09 1999 ++++ rdist-6.1.5/src/client.c Wed Feb 17 17:51:15 1999 +@@ -309,6 +309,18 @@ + return(0); + } + ++void freelinkinfo(lp) ++ struct linkbuf *lp; ++{ ++ if (lp->pathname) ++ free(lp->pathname); ++ if (lp->src) ++ free(lp->src); ++ if (lp->target) ++ free(lp->target); ++ free(lp); ++} ++ + /* + * Save and retrieve hard link info + */ +@@ -317,6 +329,7 @@ + { + struct linkbuf *lp; + ++ /* xxx: linear search doesn't scale with many links */ + for (lp = ihead; lp != NULL; lp = lp->nextp) + if (lp->inum == statp->st_ino && lp->devnum == statp->st_dev) { + lp->count--; +@@ -329,12 +342,14 @@ + lp->inum = statp->st_ino; + lp->devnum = statp->st_dev; + lp->count = statp->st_nlink - 1; +- (void) strcpy(lp->pathname, target); +- (void) strcpy(lp->src, source); ++ lp->pathname = strdup(target); ++ lp->src = strdup(source); + if (Tdest) +- (void) strcpy(lp->target, Tdest); ++ lp->target = strdup(Tdest); + else +- *lp->target = CNULL; ++ lp->target = NULL; ++ if (!lp->pathname || !lp->src || !(Tdest && lp->target)) ++ fatalerr("Cannot malloc memory in linkinfo."); + + return((struct linkbuf *) NULL); + } +--- rdist-6.1.5/src/docmd.c.links Wed Feb 17 17:51:23 1999 ++++ rdist-6.1.5/src/docmd.c Wed Feb 17 17:52:44 1999 +@@ -586,7 +586,7 @@ + if (!nflag) { + register struct linkbuf *nextl, *l; + +- for (l = ihead; l != NULL; free((char *)l), l = nextl) { ++ for (l = ihead; l != NULL; freelinkinfo(l), l = nextl) { + nextl = l->nextp; + if (contimedout || IS_ON(opts, DO_IGNLNKS) || + l->count == 0) +--- rdist-6.1.5/include/defs.h.links Wed Feb 17 17:52:58 1999 ++++ rdist-6.1.5/include/defs.h Wed Feb 17 17:53:47 1999 +@@ -276,9 +276,9 @@ + ino_t inum; + dev_t devnum; + int count; +- char pathname[BUFSIZ]; +- char src[BUFSIZ]; +- char target[BUFSIZ]; ++ char *pathname; ++ char *src; ++ char *target; + struct linkbuf *nextp; + }; + diff --git a/source/n/rdist/rdist-6.1.5-03.hardlink.diff b/source/n/rdist/rdist-6.1.5-03.hardlink.diff new file mode 100644 index 000000000..5eeebc1cc --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-03.hardlink.diff @@ -0,0 +1,20 @@ +--- rdist-6.1.5/src/client.c.hardlink Thu Jun 3 13:56:31 1999 ++++ rdist-6.1.5/src/client.c Thu Jun 3 14:00:06 1999 +@@ -348,7 +348,7 @@ + lp->target = strdup(Tdest); + else + lp->target = NULL; +- if (!lp->pathname || !lp->src || !(Tdest && lp->target)) ++ if (!lp->pathname || !lp->src || (Tdest && !lp->target)) + fatalerr("Cannot malloc memory in linkinfo."); + + return((struct linkbuf *) NULL); +@@ -370,7 +370,7 @@ + "sendhardlink: rname='%s' pathname='%s' src='%s' target='%s'\n", + rname, lp->pathname, lp->src, lp->target); + +- if (*lp->target == CNULL) ++ if (lp->target == NULL || *lp->target == CNULL) + (void) sendcmd(C_RECVHARDLINK, "%o %s %s", + opts, lp->pathname, rname); + else { diff --git a/source/n/rdist/rdist-6.1.5-bison.diff b/source/n/rdist/rdist-6.1.5-04.bison.diff index a09130abd..a09130abd 100644 --- a/source/n/rdist/rdist-6.1.5-bison.diff +++ b/source/n/rdist/rdist-6.1.5-04.bison.diff diff --git a/source/n/rdist/rdist-6.1.5-varargs.diff b/source/n/rdist/rdist-6.1.5-05.varargs.diff index cf2786d2c..cf2786d2c 100644 --- a/source/n/rdist/rdist-6.1.5-varargs.diff +++ b/source/n/rdist/rdist-6.1.5-05.varargs.diff diff --git a/source/n/rdist/rdist-6.1.5-06.maxargs.diff b/source/n/rdist/rdist-6.1.5-06.maxargs.diff new file mode 100644 index 000000000..4fbe147bf --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-06.maxargs.diff @@ -0,0 +1,11 @@ +--- rdist-6.1.5/src/setargs.c.maxargs 1998-11-10 05:15:56.000000000 +0100 ++++ rdist-6.1.5/src/setargs.c 2003-09-04 14:39:03.000000000 +0200 +@@ -58,7 +58,7 @@ + * Set process argument functions + */ + +-#define MAXUSERENVIRON 40 ++#define MAXUSERENVIRON 1024 + char **Argv = NULL; + char *LastArgv = NULL; + char *UserEnviron[MAXUSERENVIRON+1]; diff --git a/source/n/rdist/rdist-6.1.5-07.lfs.diff b/source/n/rdist/rdist-6.1.5-07.lfs.diff new file mode 100644 index 000000000..e1fe2a182 --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-07.lfs.diff @@ -0,0 +1,137 @@ +--- rdist-6.1.5/src/client.c.lfs 2003-12-16 23:43:56.000000000 +0100 ++++ rdist-6.1.5/src/client.c 2003-12-16 23:46:56.000000000 +0100 +@@ -414,9 +414,9 @@ + /* + * Send file info + */ +- (void) sendcmd(C_RECVREG, "%o %04o %ld %ld %ld %s %s %s", ++ (void) sendcmd(C_RECVREG, "%o %04o %lld %ld %ld %s %s %s", + opts, stb->st_mode & 07777, +- (long) stb->st_size, ++ (off_t) stb->st_size, + stb->st_mtime, stb->st_atime, + user, group, rname); + if (response() < 0) { +@@ -424,8 +424,8 @@ + return(-1); + } + +- debugmsg(DM_MISC, "Send file '%s' %d bytes\n", +- rname, (long) stb->st_size); ++ debugmsg(DM_MISC, "Send file '%s' %lld bytes\n", ++ rname, (off_t) stb->st_size); + + /* + * Set remote time out alarm handler. +@@ -676,9 +676,9 @@ + /* + * Gather and send basic link info + */ +- (void) sendcmd(C_RECVSYMLINK, "%o %04o %ld %ld %ld %s %s %s", ++ (void) sendcmd(C_RECVSYMLINK, "%o %04o %lld %ld %ld %s %s %s", + opts, stb->st_mode & 07777, +- (long) stb->st_size, ++ (off_t) stb->st_size, + stb->st_mtime, stb->st_atime, + user, group, rname); + if (response() < 0) +@@ -858,7 +858,7 @@ + /* + * Parse size + */ +- size = strtol(cp, &cp, 10); ++ size = strtoll(cp, &cp, 10); + if (*cp++ != ' ') { + error("update: size not delimited"); + return(US_NOTHING); +@@ -910,8 +910,8 @@ + + debugmsg(DM_MISC, "update(%s,) local mode %04o remote mode %04o\n", + rname, lmode, rmode); +- debugmsg(DM_MISC, "update(%s,) size %d mtime %d owner '%s' grp '%s'\n", +- rname, (int) size, mtime, owner, group); ++ debugmsg(DM_MISC, "update(%s,) size %lld mtime %d owner '%s' grp '%s'\n", ++ rname, (off_t) size, mtime, owner, group); + + if (statp->st_mtime != mtime) { + if (statp->st_mtime < mtime && IS_ON(opts, DO_YOUNGER)) { +@@ -937,8 +937,8 @@ + } + + if (statp->st_size != size) { +- debugmsg(DM_MISC, "size does not match (%d != %d).\n", +- (int) statp->st_size, size); ++ debugmsg(DM_MISC, "size does not match (%lld != %lld).\n", ++ statp->st_size, size); + return(US_OUTDATE); + } + +--- rdist-6.1.5/src/server.c.lfs 1998-11-10 05:15:31.000000000 +0100 ++++ rdist-6.1.5/src/server.c 2003-12-16 23:50:19.000000000 +0100 +@@ -645,8 +645,8 @@ + case S_IFLNK: + case S_IFDIR: + case S_IFREG: +- (void) sendcmd(QC_YES, "%ld %ld %o %s %s", +- (long) stb.st_size, ++ (void) sendcmd(QC_YES, "%lld %ld %o %s %s", ++ (off_t) stb.st_size, + stb.st_mtime, + stb.st_mode & 07777, + getusername(stb.st_uid, target, options), +@@ -1388,7 +1388,7 @@ + /* + * Get file size + */ +- size = strtol(cp, &cp, 10); ++ size = strtoll(cp, &cp, 10); + if (*cp++ != ' ') { + error("recvit: size not delimited"); + return; +@@ -1441,7 +1441,7 @@ + } + + debugmsg(DM_MISC, +- "recvit: opts = %04o mode = %04o size = %d mtime = %d", ++ "recvit: opts = %04o mode = %04o size = %lld mtime = %d", + opts, mode, size, mtime); + debugmsg(DM_MISC, + "recvit: owner = '%s' group = '%s' file = '%s' catname = %d isdir = %d", +--- rdist-6.1.5/include/defs.h.lfs 2003-12-16 23:43:56.000000000 +0100 ++++ rdist-6.1.5/include/defs.h 2003-12-16 23:43:56.000000000 +0100 +@@ -22,6 +22,8 @@ + #include <stdlib.h> + #endif /* _POSIX_SOURCE */ + #include <stdio.h> ++#include <string.h> ++#include <mntent.h> + #include <ctype.h> + #include <errno.h> + #include <pwd.h> +@@ -317,15 +319,6 @@ + #endif /* USE_STATDB */ + + /* +- * System function declarations +- */ +-char *hasmntopt(); +-char *strchr(); +-char *strdup(); +-char *strrchr(); +-char *strtok(); +- +-/* + * Our own declarations. + */ + char *exptilde(); +--- rdist-6.1.5/Makefile.local.lfs 1998-11-10 04:36:31.000000000 +0100 ++++ rdist-6.1.5/Makefile.local 2003-12-16 23:43:56.000000000 +0100 +@@ -20,7 +20,7 @@ + # Add any local definitions you want pass to the compiler to DEFS_LOCAL + # below. This includes those items found in "config/config.h". + # +-#DEFS_LOCAL = -DDIRECT_RCMD ++DEFS_LOCAL = -O2 -g -pipe -Wall -D_POSIX_SOURCE -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + + # + # Add any local libraries that your system might need to LIBS_LOCAL below. diff --git a/source/n/rdist/rdist-6.1.5-cleanup.diff b/source/n/rdist/rdist-6.1.5-08.cleanup.diff index 194291348..5b5bfa6c6 100644 --- a/source/n/rdist/rdist-6.1.5-cleanup.diff +++ b/source/n/rdist/rdist-6.1.5-08.cleanup.diff @@ -7,7 +7,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: gram.y,v 6.30 1998/11/10 04:10:42 mcooper Exp $"; @@ -170,7 +170,7 @@ ; @@ -112,7 +112,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: rdist.c,v 6.66 1998/11/10 04:13:49 mcooper Exp $"; @@ -80,7 +80,7 @@ char *name; @@ -232,7 +232,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: client.c,v 6.82 1998/11/10 04:08:47 mcooper Exp $"; @@ -84,7 +84,7 @@ int destdir; @@ -371,7 +371,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: child.c,v 6.29 1998/11/10 04:18:56 mcooper Exp $"; @@ -90,7 +90,7 @@ static void removechild(child) @@ -438,7 +438,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: docmd.c,v 6.87 1998/11/10 04:08:32 mcooper Exp $"; @@ -99,10 +99,10 @@ */ @@ -623,7 +623,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: distopt.c,v 6.12 1998/11/10 04:09:11 mcooper Exp $"; @@ -55,7 +55,7 @@ extern DISTOPTINFO *getdistopt(name) @@ -679,7 +679,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: expand.c,v 6.19 1998/11/10 04:09:31 mcooper Exp $"; @@ -81,9 +81,9 @@ sizeof(*sortbase), argcmp), sortbase = &eargv[eargc] @@ -857,7 +857,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: lookup.c,v 6.9 1998/11/10 04:12:56 mcooper Exp $"; @@ -68,11 +68,12 @@ /* @@ -896,7 +896,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: isexec.c,v 6.22 1998/11/10 04:11:42 mcooper Exp $"; --- rdist-6.1.5/src/signal.c.cleanup 1998-11-10 05:16:13.000000000 +0100 +++ rdist-6.1.5/src/signal.c 2003-12-17 11:38:16.000000000 +0100 @@ -907,7 +907,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: signal.c,v 6.2 1998/11/10 04:16:13 mcooper Exp $"; --- rdist-6.1.5/src/rshrcmd.c.cleanup 1998-11-10 05:15:07.000000000 +0100 +++ rdist-6.1.5/src/rshrcmd.c 2003-12-17 11:38:16.000000000 +0100 @@ -918,7 +918,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: rshrcmd.c,v 1.9 1998/11/10 04:15:07 mcooper Exp $"; @@ -34,6 +34,7 @@ * program in place of a direct rcmd() function call so as to @@ -945,7 +945,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: common.c,v 6.84 1998/11/10 04:09:01 mcooper Exp $"; @@ -87,14 +87,14 @@ /* @@ -1263,7 +1263,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: message.c,v 6.25 1998/11/10 04:13:30 mcooper Exp $"; @@ -97,7 +97,7 @@ */ @@ -1408,7 +1408,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: setargs.c,v 6.5 1998/11/10 04:15:56 mcooper Exp $"; @@ -66,12 +66,12 @@ /* @@ -1474,7 +1474,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: rdistd.c,v 6.23 1998/11/10 04:14:06 mcooper Exp $"; @@ -53,21 +53,12 @@ @@ -1527,7 +1527,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: server.c,v 6.86 1998/11/10 04:15:31 mcooper Exp $"; @@ -197,7 +197,7 @@ static UID_T last_uid = (UID_T)-2; @@ -1748,7 +1748,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: filesys.c,v 6.25 1998/11/10 04:10:17 mcooper Exp $"; @@ -72,7 +72,7 @@ static char last_pathname[MAXPATHLEN]; @@ -1833,7 +1833,7 @@ -#ifndef lint +#if 0 static char RCSid[] = - "$Id: rdist-6.1.5-cleanup.diff,v 1.1 2008/10/27 20:26:28 eha Exp eha $"; + "$Id: filesys-os.c,v 6.18 1998/11/10 04:09:58 mcooper Exp $"; @@ -314,7 +314,7 @@ diff --git a/source/n/rdist/rdist-6.1.5-09.svr4.diff b/source/n/rdist/rdist-6.1.5-09.svr4.diff new file mode 100644 index 000000000..15fc23fbd --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-09.svr4.diff @@ -0,0 +1,10 @@ +--- rdist-6.1.5/build/os-type.svr4 2003-12-17 12:44:18.000000000 +0100 ++++ rdist-6.1.5/build/os-type 2003-12-17 12:44:29.000000000 +0100 +@@ -83,7 +83,6 @@ + if [ -z "${OS}" -a ! -z "${uname}" ]; then + case "`$uname -a | tr '[A-Z]' '[a-z]'`" in + osf1*) OS=break;; +- *"4.0"*) OS=svr4;; # There has to be a better way + *" dcosx "*) OS=dcosx;; + *"cx/ux"*) OS=cxux;; + *"hp-ux"*) # HP-UX 9.x diff --git a/source/n/rdist/rdist-6.1.5-10.ssh.diff b/source/n/rdist/rdist-6.1.5-10.ssh.diff new file mode 100644 index 000000000..f70beb9bf --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-10.ssh.diff @@ -0,0 +1,9 @@ +--- rdist-6.1.5/src/rshrcmd.c.dist Tue Dec 12 08:20:56 1995 ++++ rdist-6.1.5/src/rshrcmd.c Wed Dec 11 07:14:13 1996 +@@ -64,5 +64,5 @@ + sp[0]. */ + (void) close(sp[0]); +- if (dup2(sp[1], 0) < 0 || dup2(0,1) < 0 || dup2(0, 2) < 0) { ++ if (dup2(sp[1], 0) < 0 || dup2(0,1) < 0) { + error("dup2 failed: %s.", SYSERR); + _exit(255); diff --git a/source/n/rdist/rdist-6.1.5-11.mkstemp.diff b/source/n/rdist/rdist-6.1.5-11.mkstemp.diff new file mode 100644 index 000000000..9d9297a8e --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-11.mkstemp.diff @@ -0,0 +1,23 @@ +--- rdist-6.1.5/src/server.c.mkstemp 2004-05-25 14:29:37.279312752 +0200 ++++ rdist-6.1.5/src/server.c 2004-05-25 14:31:27.050744340 +0200 +@@ -1479,11 +1479,18 @@ + *file = '/'; + } + fd = mkstemp(new); +- if (fd < 0) { ++ /* ++ * Don't consider it a fatal error if mkstemp() fails ++ * because parent directory didn't exist. (Missing ++ * parents are created later (in recvfile()) ++ */ ++ if ((fd < 0) && (errno != ENOENT)) { + error("Cannot set file name."); + return; ++ } else if (fd >= 0) { ++ close(fd); ++ unlink(new); /* Or symlink() will fail */ + } +- close(fd); + } + + /* diff --git a/source/n/rdist/rdist-6.1.5-12.stat64.diff b/source/n/rdist/rdist-6.1.5-12.stat64.diff new file mode 100644 index 000000000..3b02d3e8a --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-12.stat64.diff @@ -0,0 +1,80 @@ +--- rdist-6.1.5/src/filesys.c.stat64 2005-05-04 14:11:03.000000000 +0200 ++++ rdist-6.1.5/src/filesys.c 2005-05-04 14:11:10.000000000 +0200 +@@ -430,8 +430,8 @@ + */ + int getfilesysinfo(file, freespace, freefiles) + char *file; +- long *freespace; +- long *freefiles; ++ fsblkcnt_t *freespace; ++ fsfilcnt_t *freefiles; + { + #if defined(STATFS_TYPE) + static statfs_t statfsbuf; +--- rdist-6.1.5/src/server.c.stat64 2005-05-04 14:11:23.000000000 +0200 ++++ rdist-6.1.5/src/server.c 2005-05-04 14:20:34.000000000 +0200 +@@ -62,8 +62,8 @@ + int catname = 0; /* cat name to target name */ + char *sptarget[32]; /* stack of saved ptarget's for directories */ + char *fromhost = NULL; /* Client hostname */ +-static long min_freespace = 0; /* Minimium free space on a filesystem */ +-static long min_freefiles = 0; /* Minimium free # files on a filesystem */ ++static fsblkcnt_t min_freespace = 0; /* Minimium free space on a filesystem */ ++static fsfilcnt_t min_freefiles = 0; /* Minimium free # files on a filesystem */ + int oumask; /* Old umask */ + + /* +@@ -1326,7 +1326,7 @@ + fatalerr("Expected digit, got '%s'.", cp); + return; + } +- min_freespace = (unsigned long) atoi(cp); ++ min_freespace = (fsblkcnt_t) atoll(cp); + break; + + case SC_FREEFILES: /* Minimium free files */ +@@ -1334,7 +1334,7 @@ + fatalerr("Expected digit, got '%s'.", cp); + return; + } +- min_freefiles = (unsigned long) atoi(cp); ++ min_freefiles = (fsfilcnt_t) atoll(cp); + break; + + case SC_LOGGING: /* Logging options */ +@@ -1364,7 +1364,8 @@ + time_t mtime, atime; + char *owner, *group, *file; + char new[MAXPATHLEN]; +- long freespace = -1, freefiles = -1; ++ fsfilcnt_t freefiles = -1; ++ fsblkcnt_t freespace = -1; + char *cp = cmd; + + /* +@@ -1499,7 +1500,7 @@ + */ + if (min_freespace || min_freefiles) { + /* Convert file size to kilobytes */ +- long fsize = (long) (size / 1024); ++ fsblkcnt_t fsize = (fsblkcnt_t) (size / 1024); + + if (getfilesysinfo(target, &freespace, &freefiles) != 0) + return; +@@ -1511,14 +1512,14 @@ + if (min_freespace && (freespace >= 0) && + (freespace - fsize < min_freespace)) { + error( +- "%s: Not enough free space on filesystem: min %d free %d", ++ "%s: Not enough free space on filesystem: min %lld free %lld", + target, min_freespace, freespace); + return; + } + if (min_freefiles && (freefiles >= 0) && + (freefiles - 1 < min_freefiles)) { + error( +- "%s: Not enough free files on filesystem: min %d free %d", ++ "%s: Not enough free files on filesystem: min %lld free %lld", + target, min_freefiles, freefiles); + return; + } diff --git a/source/n/rdist/rdist-6.1.5-14.fix-msgsndnotify-loop.diff b/source/n/rdist/rdist-6.1.5-14.fix-msgsndnotify-loop.diff new file mode 100644 index 000000000..d34aa78d8 --- /dev/null +++ b/source/n/rdist/rdist-6.1.5-14.fix-msgsndnotify-loop.diff @@ -0,0 +1,32 @@ +--- rdist-6.1.5/src/message.c.thestokes 2006-04-19 17:30:39.000000000 -0400 ++++ rdist-6.1.5/src/message.c 2006-04-19 17:36:37.000000000 -0400 +@@ -793,15 +793,20 @@ + char *msg; + { + static char buf[MSGBUFSIZ]; +- +- ++nerrs; +- +- if (isserver) +- (void) sprintf(buf, "REMOTE ERROR: %s", msg); +- else +- (void) sprintf(buf, "LOCAL ERROR: %s", msg); +- +- _message(MT_FERROR, buf); ++ /* Don't reenter this function. There is a nasty infinite recursion ++ case that pops up when msgsndnotify tries to exit. */ ++ static int inside=0; ++ ++ if(inside==0){ ++ ++nerrs; ++ inside=1; ++ ++ if (isserver) ++ (void) sprintf(buf, "REMOTE ERROR: %s", msg); ++ else ++ (void) sprintf(buf, "LOCAL ERROR: %s", msg); ++ _message(MT_FERROR, buf); ++ } + + exit(nerrs); + } diff --git a/source/n/rdist/rdist-6.1.5.diff b/source/n/rdist/rdist-6.1.5.diff deleted file mode 100644 index 0445ca9b0..000000000 --- a/source/n/rdist/rdist-6.1.5.diff +++ /dev/null @@ -1,107 +0,0 @@ -diff -ur rdist-6.1.5.orig/Makefile rdist-6.1.5/Makefile ---- rdist-6.1.5.orig/Makefile Mon Nov 9 19:36:06 1998 -+++ rdist-6.1.5/Makefile Tue Apr 3 10:56:28 2001 -@@ -17,9 +17,10 @@ - SHELL=/bin/sh - - all install install.man: FRC -- @for t in $(TARGETS); do \ -+ @for t in $(TARGETS); do ( \ - echo Making \"$@\" in \"$$t\"; \ - (cd $$t; ${MAKE} $@); \ -+ ) || exit 1; \ - done - - clean: -diff -ur rdist-6.1.5.orig/Makefile.local rdist-6.1.5/Makefile.local ---- rdist-6.1.5.orig/Makefile.local Mon Nov 9 19:36:31 1998 -+++ rdist-6.1.5/Makefile.local Tue Apr 3 10:56:28 2001 -@@ -15,6 +15,20 @@ - # or add your own line. - # - #BIN_DIR = /usr/bin -+BIN_DIR = /usr/bin -+MAN_1_DIR = /usr/man/man1 -+MAN_8_DIR = /usr/man/man8 -+RDIST_MODE = 755 -+RDISTD_MODE = 755 -+MAN_MODE = 644 -+MAN_OWNER = root -+MAN_GROUP = root -+BIN_GROUP = root -+ -+INSTALL = install -+YACC = bison -y -+ -+OPT = -Wall -O2 -pipe - - # - # Add any local definitions you want pass to the compiler to DEFS_LOCAL -Only in rdist-6.1.5: Makefile.local~ -Only in rdist-6.1.5: Makefile~ -diff -ur rdist-6.1.5.orig/config/os-linux.h rdist-6.1.5/config/os-linux.h ---- rdist-6.1.5.orig/config/os-linux.h Mon Nov 9 19:59:59 1998 -+++ rdist-6.1.5/config/os-linux.h Tue Apr 3 10:56:28 2001 -@@ -93,8 +93,8 @@ - /* - * Our types, usually these are uid_t and gid_t. - */ --typedef uid_t UID_T; /* Must be signed */ --typedef gid_t GID_T; /* Must be signed */ -+typedef int UID_T; /* Must be signed */ -+typedef int GID_T; /* Must be signed */ - - /* - * Generic pointer, used by memcpy, malloc, etc. Usually char or void. -Only in rdist-6.1.5/config: os-linux.h~ -diff -ur rdist-6.1.5.orig/doc/Makefile.real rdist-6.1.5/doc/Makefile.real ---- rdist-6.1.5.orig/doc/Makefile.real Mon Nov 9 21:40:06 1998 -+++ rdist-6.1.5/doc/Makefile.real Tue Apr 3 10:56:28 2001 -@@ -16,7 +16,7 @@ - - doc: - --install: -+install: install.man - - install.man: rdist.man rdistd.man - ${INSTALL} ${INSTALL_ARGS} rdist.man ${CLIENT_DEST} -Only in rdist-6.1.5/doc: Makefile.real~ -diff -ur rdist-6.1.5.orig/doc/rdist.man rdist-6.1.5/doc/rdist.man ---- rdist-6.1.5.orig/doc/rdist.man Mon Nov 9 21:38:53 1998 -+++ rdist-6.1.5/doc/rdist.man Tue Apr 3 10:56:28 2001 -@@ -171,7 +171,7 @@ - .I rdist - was compiled with the location of the old rdist - (usually either --.I /usr/ucb/oldrdist -+.I /usr/bin/oldrdist - or - .I /usr/old/rdist) - and that program is available at run time. -@@ -511,7 +511,7 @@ - may be a colon seperated list of possible pathnames. - In this case, the first component of the path to exist is used. - i.e. --.B "/usr/ucb/rsh:/usr/bin/remsh", -+.B "/usr/bin/rsh:/usr/bin/remsh", - .B /usr/bsd/rsh. - .TP - .B "\-t \fItimeout\fR" -Only in rdist-6.1.5/doc: rdist.man~ -diff -ur rdist-6.1.5.orig/src/Makefile.real rdist-6.1.5/src/Makefile.real ---- rdist-6.1.5.orig/src/Makefile.real Mon Nov 9 20:03:46 1998 -+++ rdist-6.1.5/src/Makefile.real Tue Apr 3 10:56:28 2001 -@@ -52,9 +52,9 @@ - $(COMMONOBJS) $(MISSINGOBJS) - - install: -- $(INSTALL) ${IN_ARGS} -o $(BIN_OWNER) -m ${RDIST_MODE} \ -+ $(INSTALL) ${IN_ARGS} -s -o $(BIN_OWNER) -m ${RDIST_MODE} \ - $(CLIENT_BIN) $(BIN_DIR)/$(CLIENT) -- $(INSTALL) ${IN_ARGS} -o ${BIN_OWNER} -m ${RDISTD_MODE} \ -+ $(INSTALL) ${IN_ARGS} -s -o ${BIN_OWNER} -m ${RDISTD_MODE} \ - $(SERVER_BIN) $(BIN_DIR)/$(SERVER) - - install.man: -Only in rdist-6.1.5/src: Makefile.real~ diff --git a/source/n/rdist/rdist-eu-license.txt b/source/n/rdist/rdist-eu-license.txt new file mode 100644 index 000000000..7ae1591b4 --- /dev/null +++ b/source/n/rdist/rdist-eu-license.txt @@ -0,0 +1,118 @@ + MagniComp - End User License Agreement + + www.MagniComp.com + + RDist Version 6.1 + + Version of This Document: 19990724 + +GRANT. + +MagniComp grants you a non-exclusive license to use RDist version 6.1 and +all subsequent versions called 6.1.X software (the "Software") free of +charge. + +This license does not entitle you to hard-copy documentation, support or +telephone assistance. MagniComp reserves the right at any time to alter +prices, features, specifications, capabilities, functions, licensing terms, +general availability of the Software. + +SCOPE OF GRANT. + +You may: + + * use the Software in any way you wish on any computer regardless of + ownership of said computer; + * redistribute the Software in any form, including source and binary, to + any party with or without charging a fee; + * copy the Software for any purpose. + +You may not: + + * remove or alter this notice; + * remove or alter any proprietary notices or labels on the Software. + +REQUIREMENTS. + + * All advertising materials mentioning features or use of this software + must display the following acknowledgement: + + This product includes software developed by MagniComp + (www.MagniComp.com) and its contributors. + + * Redistributions in binary form must reproduce this copyright notice, + this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither name of MagniComp nor the names of its contributors may be used + to endorse or promote products derived from this software without + specific prior written permission. + +TITLE. + +Title, ownership rights, and intellectual property rights in the Software +shall remain in MagniComp and/or its suppliers. The Software is protected by +copyright and other intellectual property laws and by international +treaties. Title and related rights in the content accessed through the +Software is the property of the applicable content owner and may be +protected by applicable law. This license gives you no rights to such +content. + +TERMINATION. + +The license will terminate automatically if you fail to comply with the +limitations described herein. Upon termination of this license, you agree to +destroy all copies of the Software. + +DISCLAIMER OF WARRANTY. + +The Software is provided on an "AS IS" basis, without warranty of any kind, +including without limitation the warranties of merchantability, fitness for +a particular purpose and non-infringement. The entire risk as to the quality +and performance of the Software is borne by you. Should the Software prove +defective, you and not MagniComp or its suppliers assume the entire cost of +any service and repair. In addition, the security mechanisms implemented by +MagniComp software have inherent limitations, and you must determine that +the Software sufficiently meets your requirements. This disclaimer of +warranty constitutes an essential part of the agreement. SOME JURISDICTIONS +DO NOT ALLOW EXCLUSIONS OF AN IMPLIED WARRANTY, SO THIS DISCLAIMER MAY NOT +APPLY TO YOU AND YOU MAY HAVE OTHER LEGAL RIGHTS THAT VARY BY JURISDICTION. + +LIMITATION OF LIABILITY. + +UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, TORT, CONTRACT, OR +OTHERWISE, SHALL MAGNICOMP OR ITS SUPPLIERS OR RESELLERS BE LIABLE TO YOU OR +ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF +GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL +OTHER COMMERCIAL DAMAGES OR LOSSES. IN NO EVENT WILL MAGNICOMP BE LIABLE FOR +ANY DAMAGES, EVEN IF MAGNICOMP SHALL HAVE BEEN INFORMED OF THE POSSIBILITY +OF SUCH DAMAGES, OR FOR ANY CLAIM BY ANY OTHER PARTY. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY TO THE +EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. FURTHERMORE, SOME +JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR +CONSEQUENTIAL DAMAGES, SO THIS LIMITATION AND EXCLUSION MAY NOT APPLY TO +YOU. + +HIGH RISK ACTIVITIES. + +The Software is not fault-tolerant and is not designed, manufactured or +intended for use or resale as on-line control equipment in hazardous +environments requiring fail-safe performance, such as in the operation of +nuclear facilities, aircraft navigation or communication systems, air +traffic control, direct life support machines, or weapons systems, in which +the failure of the Software could lead directly to death, personal injury, +or severe physical or environmental damage ("High Risk Activities"). +MagniComp and its suppliers specifically disclaim any express or implied +warranty of fitness for High Risk Activities. + +MISCELLANEOUS. + +This Agreement represents the complete agreement concerning this license and +may amended only by a writing executed by both parties. If any provision of +this Agreement is held to be unenforceable, such provision shall be reformed +only to the extent necessary to make it enforceable. This Agreement shall be +governed by California law (except for conflict of law provisions). The +application the United Nations Convention of Contracts for the International +Sale of Goods is expressly excluded. + + END diff --git a/source/n/rdist/rdist.SlackBuild b/source/n/rdist/rdist.SlackBuild index e2dd87cdd..66f48c9b0 100755 --- a/source/n/rdist/rdist.SlackBuild +++ b/source/n/rdist/rdist.SlackBuild @@ -1,6 +1,5 @@ #!/bin/sh - -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,59 +19,108 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=6.1.5 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} + +CWD=$(pwd) + +PKGNAM=rdist +VERSION=${VERSION:-6.1.5} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-rdist +# 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 $TMP $PKG +mkdir -p $PKG -# Explode the package framework: -cd $PKG -explodepkg $CWD/_rdist.tar.gz +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2" +fi cd $TMP -rm -rf rdist-$VERSION -tar xvf $CWD/rdist-$VERSION.tar.gz || exit 1 -cd rdist-$VERSION || exit 1 + +rm -rf $PKGNAM-$VERSION +tar xf $CWD/$PKGNAM-$VERSION.tar.gz || exit 1 + +cd ${PKGNAM}-$VERSION + +# Make sure ownerships and permissions are sane: chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -zcat $CWD/rdist-$VERSION.diff.gz | patch -p1 --backup -# Modern tools require patching: -zcat $CWD/rdist-6.1.5-bison.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/rdist-6.1.5-cleanup.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/rdist-6.1.5-varargs.diff.gz | patch -p1 --verbose || exit 1 +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 {} \; +# Patch: +for diff in $CWD/*.diff.gz ; do + zcat $diff | patch -p1 --verbose || exit 1 +done + +# Build: make $NUMJOBS || make || exit 1 -cd src -strip rdist rdistd -cat rdist > $PKG/usr/bin/rdist -cat rdistd > $PKG/usr/bin/rdistd +# Install: +mkdir -p $PKG/usr/bin +cp -a src/{rdist,rdistd} $PKG/usr/bin + +mkdir -p $PKG/usr/man/man1 +cat doc/rdist.man | gzip -9c > $PKG/usr/man/man1/rdist.1.gz +cat doc/rdistd.man | gzip -9c > $PKG/usr/man/man1/rdistd.1.gz + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + $CWD/rdist-eu-license.txt Copyright README \ + $PKG/usr/doc/$PKGNAM-$VERSION -cd ../doc -cat rdist.man | gzip -9c > $PKG/usr/man/man1/rdist.1.gz -cat rdistd.man | gzip -9c > $PKG/usr/man/man1/rdistd.1.gz +# 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 +) -cd .. -mkdir -p $PKG/usr/doc/rdist-$VERSION -cp -a README $PKG/usr/doc/rdist-$VERSION -chmod 644 $PKG/usr/doc/rdist-$VERSION/* +# 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 mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# Build the package: -cd $PKG -/sbin/makepkg -l y -c n $TMP/rdist-$VERSION-$ARCH-$BUILD.txz +cd $TMP/package-${PKGNAM} +makepkg -l y -c n ../${PKGNAM}-$VERSION-$ARCH-$BUILD.txz diff --git a/source/n/rsync/rsync.SlackBuild b/source/n/rsync/rsync.SlackBuild index e4def4e3c..dadf3cd56 100755 --- a/source/n/rsync/rsync.SlackBuild +++ b/source/n/rsync/rsync.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,16 +21,27 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=3.0.6 -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo rsync-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "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 CWD=$(pwd) diff --git a/source/n/rt2860-firmware/rt2860-firmware.SlackBuild b/source/n/rt2860-firmware/rt2860-firmware.SlackBuild new file mode 100755 index 000000000..280b276ff --- /dev/null +++ b/source/n/rt2860-firmware/rt2860-firmware.SlackBuild @@ -0,0 +1,60 @@ +#!/bin/sh + +# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# 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=rt2860-firmware +VERSION=${VERSION:-26} +ARCH=${ARCH:-fw} +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf RT2860_Firmware_V${VERSION} +unzip $CWD/RT2860_Firmware_V${VERSION}.zip || exit 1 +cd RT2860_Firmware_V${VERSION} + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Install: +mkdir -p $PKG/lib/firmware +mv LICEN* $PKG/lib/firmware/LICENSE.ralink-firmware-RT2860_Firmware_V${VERSION}.txt +mv * $PKG/lib/firmware + +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/n/rt2860-firmware/slack-desc b/source/n/rt2860-firmware/slack-desc new file mode 100644 index 000000000..6cdecaecf --- /dev/null +++ b/source/n/rt2860-firmware/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------------------------------------------------------| +rt2860-firmware: rt2860-firmware (RT28XX/RT30XX PCI/mPCI/PCIe/CardBus firmware) +rt2860-firmware: +rt2860-firmware: This is firmware for PCI, mPCI, PCIe, and Cardbus wireless cards +rt2860-firmware: using the Ralink RT2760, RT2790, RT2860, RT2890, RT3060, RT3062, +rt2860-firmware: RT3562, RT2860, RT2760, RT2890, RT2790, and RT3090 wireless chipsets. +rt2860-firmware: +rt2860-firmware: +rt2860-firmware: +rt2860-firmware: +rt2860-firmware: +rt2860-firmware: diff --git a/source/n/rt2870-firmware/rt2870-firmware.SlackBuild b/source/n/rt2870-firmware/rt2870-firmware.SlackBuild new file mode 100755 index 000000000..28542412e --- /dev/null +++ b/source/n/rt2870-firmware/rt2870-firmware.SlackBuild @@ -0,0 +1,60 @@ +#!/bin/sh + +# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# 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=rt2870-firmware +VERSION=${VERSION:-22} +ARCH=${ARCH:-fw} +BUILD=${BUILD:-1} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf RT2870_Firmware_V${VERSION} +unzip $CWD/RT2870_Firmware_V${VERSION}.zip || exit 1 +cd RT2870_Firmware_V${VERSION} + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 700 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Install: +mkdir -p $PKG/lib/firmware +mv LICEN* $PKG/lib/firmware/LICENSE.ralink-firmware-RT2870_Firmware_V${VERSION}.txt +mv * $PKG/lib/firmware + +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/n/rt2870-firmware/slack-desc b/source/n/rt2870-firmware/slack-desc new file mode 100644 index 000000000..1b01f4947 --- /dev/null +++ b/source/n/rt2870-firmware/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------------------------------------------------------| +rt2870-firmware: rt2870-firmware (RT28XX/RT30XX USB firmware) +rt2870-firmware: +rt2870-firmware: This is firmware for USB wireless devices using Ralink RT2870, RT2770, +rt2870-firmware: RT3572, and RT3070 wireless chipsets. +rt2870-firmware: +rt2870-firmware: +rt2870-firmware: +rt2870-firmware: +rt2870-firmware: +rt2870-firmware: +rt2870-firmware: diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild index e62aab09b..cf3918a19 100755 --- a/source/n/samba/samba.SlackBuild +++ b/source/n/samba/samba.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=${VERSION:-3.2.13} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo samba-*.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-samba @@ -36,6 +45,13 @@ rm -rf samba-$VERSION tar xvf $CWD/samba-$VERSION.tar.?z* || exit 1 cd samba-$VERSION || exit 1 +if [ ! -d source3/lib/cmdline ]; then + ( cd source3/lib + mkdir cmdline + cd cmdline + ln -sf ../../../source3/include/popt_common.h . ) +fi + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -43,7 +59,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -cd source +cd source3 if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -58,11 +74,13 @@ fi # Some of these options could be auto-detected, but declaring them # here doesn't hurt and helps document what features we're trying to # build in. +# +# LDFLAGS are needed to avoid problems with missing symbols. +LDFLAGS="-Wl,--no-as-needed" \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --with-libdir=/usr/lib${LIBDIRSUFFIX} \ --bindir=/usr/bin \ --sbindir=/usr/sbin \ --mandir=/usr/man \ @@ -80,6 +98,7 @@ CFLAGS="$SLKCFLAGS" \ --with-acl-support=yes \ --with-automount \ --with-cifsmount \ + --with-cifsumount \ --with-quotas \ --with-syslog \ --with-utmp \ @@ -107,8 +126,8 @@ make install-everything DESTDIR=$PKG || exit 1 # Install libnss_win* libraries: mkdir -p $PKG/lib${LIBDIRSUFFIX} -cp -a nsswitch/libnss_winbind.so $PKG/lib${LIBDIRSUFFIX}/libnss_winbind.so.2 -cp -a nsswitch/libnss_wins.so $PKG/lib${LIBDIRSUFFIX}/libnss_wins.so.2 +cp -a ../nsswitch/libnss_winbind.so $PKG/lib${LIBDIRSUFFIX}/libnss_winbind.so.2 +cp -a ../nsswitch/libnss_wins.so $PKG/lib${LIBDIRSUFFIX}/libnss_wins.so.2 ( cd $PKG/lib${LIBDIRSUFFIX} ln -sf libnss_winbind.so.2 libnss_winbind.so ln -sf libnss_wins.so.2 libnss_wins.so @@ -159,6 +178,10 @@ gzip -9 $PKG/usr/man/man?/*.? find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# PAM related stuff we don't use: +rm -r $PKG/usr/share/locale +rm -f $PKG/usr/man/man8/pam* + cd .. cp -a \ COPYING* MAINTAINERS Manifest PFIF.txt README* \ @@ -170,7 +193,6 @@ rm -rf $PKG/usr/doc/samba-$VERSION/docs/htmldocs \ mkdir -p $PKG/usr/doc/samba-$VERSION/docs ( cd $PKG/usr/doc/samba-$VERSION/docs ln -sf /usr/share/swat/help htmldocs - ln -sf /usr/share/swat/using_samba using_samba ) # I'm sorry, but when all this info is included in HTML, adding 7MB worth of # PDF files just to have extra artwork is more fluff than I'll agree to. diff --git a/source/n/samba/smb.conf.default b/source/n/samba/smb.conf.default index 68e62f930..44ba134f6 100644 --- a/source/n/samba/smb.conf.default +++ b/source/n/samba/smb.conf.default @@ -204,7 +204,7 @@ ; comment = Public Stuff ; path = /home/samba ; public = yes -; writable = yes +; writable = no ; printable = no ; write list = @staff diff --git a/source/n/samba/smb.conf.default.orig b/source/n/samba/smb.conf.default.orig index 971ca19c8..b4e3d63e0 100644 --- a/source/n/samba/smb.conf.default.orig +++ b/source/n/samba/smb.conf.default.orig @@ -204,7 +204,7 @@ ; comment = Public Stuff ; path = /home/samba ; public = yes -; writable = yes +; writable = no ; printable = no ; write list = @staff diff --git a/source/n/samba/smb.conf.diff b/source/n/samba/smb.conf.diff index 553440c54..3573a8f0b 100644 --- a/source/n/samba/smb.conf.diff +++ b/source/n/samba/smb.conf.diff @@ -1,5 +1,5 @@ ---- smb.conf.default.orig 2008-05-28 07:41:11.000000000 -0500 -+++ smb.conf.default 2008-05-28 13:53:01.000000000 -0500 +--- smb.conf.default.orig 2009-09-30 07:17:40.000000000 -0500 ++++ smb.conf.default 2009-10-03 15:59:26.000000000 -0500 @@ -22,7 +22,7 @@ #======================= Global Settings ===================================== [global] diff --git a/source/n/sendmail/SlackBuild-sendmail b/source/n/sendmail/SlackBuild-sendmail index 54dc0c5c2..aec918ca7 100755 --- a/source/n/sendmail/SlackBuild-sendmail +++ b/source/n/sendmail/SlackBuild-sendmail @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,18 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=8.14.3 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +VERSION=8.14.4 +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} @@ -37,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG diff --git a/source/n/sendmail/SlackBuild-sendmail-cf b/source/n/sendmail/SlackBuild-sendmail-cf index 3d7fd4524..d54370b98 100755 --- a/source/n/sendmail/SlackBuild-sendmail-cf +++ b/source/n/sendmail/SlackBuild-sendmail-cf @@ -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. -VERSION=8.14.3 +VERSION=8.14.4 ARCH=noarch -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/n/sendmail/site.config.m4 b/source/n/sendmail/site.config.m4 index 1f6c7f87c..09b1d72ff 100644 --- a/source/n/sendmail/site.config.m4 +++ b/source/n/sendmail/site.config.m4 @@ -1,3 +1,4 @@ +APPENDDEF(`confENVDEF', `-DNETINET6') APPENDDEF(`confMAPDEF', `-DNEWDB -DSTARTTLS -DSASL=2 -DTCPWRAPPERS -DNIS -DMAP_REGEX -DSOCKETMAP') APPENDDEF(`confLIBS', `-lnsl -lssl -lcrypto -lsasl2 -lwrap -lm -ldb -lresolv') APPENDDEF(`conf_libmilter_ENVDEF', `-DMILTER') diff --git a/source/n/slrn/doinst.sh b/source/n/slrn/doinst.sh index ad59028cd..23baae413 100644 --- a/source/n/slrn/doinst.sh +++ b/source/n/slrn/doinst.sh @@ -12,4 +12,5 @@ config() { } config etc/slrn.rc.new +config var/spool/slrnpull/slrnpull.conf.new diff --git a/source/n/slrn/slrn.SlackBuild b/source/n/slrn/slrn.SlackBuild index d2a50362e..d983724d3 100755 --- a/source/n/slrn/slrn.SlackBuild +++ b/source/n/slrn/slrn.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,8 +22,17 @@ VERSION=0.9.9p1 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -36,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -65,7 +77,7 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/slrn-$VERSION \ --with-docdir=/usr/doc/slrn-$VERSION \ --with-ssl \ - --with-slrnpull \ + --with-slrnpull=/var/spool/slrnpull \ --enable-setgid-code \ --with-server-file=/etc/nntpserver \ --with-slanginc=/usr/include/slang \ @@ -92,7 +104,7 @@ rm -f $PKG/usr/doc/slrn-$VERSION/changes.txt chown root.news $PKG/usr/bin/slrnpull chmod 2750 $PKG/usr/bin/slrnpull mkdir -p $PKG/var/spool/slrnpull/{data,news,out.going/rejects} -cp -a $PKG/usr/doc/slrn-$VERSION/slrnpull/slrnpull.conf $PKG/var/spool/slrnpull +cp -a $PKG/usr/doc/slrn-$VERSION/slrnpull/slrnpull.conf $PKG/var/spool/slrnpull/slrnpull.conf.new chown -R news.news $PKG/var/spool/slrnpull chmod -R 3777 $PKG/var/spool/slrnpull/out.going diff --git a/source/n/snownews/snownews.SlackBuild b/source/n/snownews/snownews.SlackBuild index a8ac91857..724cab547 100755 --- a/source/n/snownews/snownews.SlackBuild +++ b/source/n/snownews/snownews.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,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.11 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=snownews +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 "} @@ -35,6 +45,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -86,9 +99,17 @@ fi mkdir -p $PKG/usr/doc/snownews-$VERSION cp -a \ - AUTHOR COPYING* CREDITS Changelog INSTALL README* \ + AUTHOR COPYING* CREDITS INSTALL README* \ $PKG/usr/doc/snownews-$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/n/stunnel/stunnel.SlackBuild b/source/n/stunnel/stunnel.SlackBuild index 187dfa526..f988a3c4e 100755 --- a/source/n/stunnel/stunnel.SlackBuild +++ b/source/n/stunnel/stunnel.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,10 +21,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=4.17 -ARCH=${ARCH:-x86_64} +PKGNAM=stunnel +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 @@ -36,6 +46,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) @@ -47,7 +60,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf stunnel-$VERSION -tar xvf $CWD/stunnel-$VERSION.tar.gz || exit 1 +tar xvf $CWD/stunnel-$VERSION.tar.?z || exit 1 cd stunnel-$VERSION || exit 1 chown -R root:root . find . \ @@ -58,18 +71,27 @@ find . \ CFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix= \ + --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --exec-prefix= \ --sysconfdir=/etc \ --datadir=/usr/share \ --mandir=/usr/man \ --sbindir=/usr/sbin \ + --bindir=/usr/bin \ --localstatedir=/var \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 +# This used to be installed in /usr/sbin, so it would probably be nice to +# link from there: +mkdir -p $PKG/usr/sbin +( cd $PKG/usr/sbin + ln -sf ../bin/stunnel . + ln -sf ../bin/stunnel3 . +) + mkdir -p $PKG/var/run/stunnel # This will produce a useless key. make -i install DESTDIR=$PKG @@ -100,6 +122,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ chmod 0755 $PKG/var/lib chown root:root $PKG/var/lib +# 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 zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/n/tcpdump/libpcap.20-fix-any-intf.diff b/source/n/tcpdump/libpcap.20-fix-any-intf.diff new file mode 100644 index 000000000..84afa6822 --- /dev/null +++ b/source/n/tcpdump/libpcap.20-fix-any-intf.diff @@ -0,0 +1,159 @@ +commit 8fa17a5a554aaeb85d3ec4118b45a31f1efd6808 +Author: guy <guy> +Date: Wed Nov 19 08:20:39 2008 +0000 + + Fix the handling of the "any" device, including making it reject + attempts to open it in monitor mode. +--- + pcap-linux.c | 68 ++++++++++++++++++++++++++++++++++++----------------------- + 1 file changed, 42 insertions(+), 26 deletions(-) + +--- a/pcap-linux.c ++++ b/pcap-linux.c +@@ -297,6 +297,12 @@ + { + pcap_t *handle; + ++ /* ++ * A null device name is equivalent to the "any" device. ++ */ ++ if (device == NULL) ++ device = "any"; ++ + #ifdef HAVE_DAG_API + if (strstr(device, "dag")) { + return dag_create(device, ebuf); +@@ -338,10 +344,9 @@ + struct iwreq ireq; + #endif + +- if (p->opt.source == NULL) { ++ if (strcmp(p->opt.source, "any") == 0) { + /* +- * This is equivalent to the "any" device, and we don't +- * support monitor mode on it. ++ * Monitor mode makes no sense on the "any" device. + */ + return 0; + } +@@ -518,12 +523,11 @@ + handle->stats_op = pcap_stats_linux; + + /* +- * NULL and "any" are special devices which give us the hint to +- * monitor all devices. ++ * The "any" device is a special device which causes us not ++ * to bind to a particular device and thus to look at all ++ * devices. + */ +- if (!device || strcmp(device, "any") == 0) { +- device = NULL; +- handle->md.device = strdup("any"); ++ if (strcmp(device, "any") == 0) { + if (handle->opt.promisc) { + handle->opt.promisc = 0; + /* Just a warning. */ +@@ -531,10 +535,9 @@ + "Promiscuous mode not supported on the \"any\" device"); + status = PCAP_WARNING_PROMISC_NOTSUP; + } ++ } + +- } else +- handle->md.device = strdup(device); +- ++ handle->md.device = strdup(device); + if (handle->md.device == NULL) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s", + pcap_strerror(errno) ); +@@ -1657,19 +1660,21 @@ + activate_new(pcap_t *handle) + { + #ifdef HAVE_PF_PACKET_SOCKETS ++ const char *device = handle->opt.source; ++ int is_any_device = (strcmp(device, "any") == 0); + int sock_fd = -1, arptype, val; + int err = 0; + struct packet_mreq mr; +- const char* device = handle->opt.source; + + /* +- * Open a socket with protocol family packet. If a device is +- * given we try to open it in raw mode otherwise we use +- * the cooked interface. +- */ +- sock_fd = device ? +- socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)) +- : socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)); ++ * Open a socket with protocol family packet. If the ++ * "any" device was specified, we open a SOCK_DGRAM ++ * socket for the cooked interface, otherwise we first ++ * try a SOCK_RAW socket for the raw interface. ++ */ ++ sock_fd = is_any_device ? ++ socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) : ++ socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + + if (sock_fd == -1) { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", +@@ -1704,7 +1709,7 @@ + * to cooked mode if we have an unknown interface type + * or a type we know doesn't work well in raw mode. + */ +- if (device) { ++ if (!is_any_device) { + /* Assume for now we don't need cooked mode. */ + handle->md.cooked = 0; + +@@ -1819,15 +1824,23 @@ + } + } else { + /* +- * This is cooked mode. ++ * The "any" device. ++ */ ++ if (handle->opt.rfmon) { ++ /* ++ * It doesn't support monitor mode. ++ */ ++ return PCAP_ERROR_RFMON_NOTSUP; ++ } ++ ++ /* ++ * It uses cooked mode. + */ + handle->md.cooked = 1; + handle->linktype = DLT_LINUX_SLL; + + /* + * We're not bound to a device. +- * XXX - true? Or true only if we're using +- * the "any" device? + * For now, we're using this as an indication + * that we can't transmit; stop doing that only + * if we figure out how to transmit in cooked +@@ -1852,10 +1865,13 @@ + + /* + * Hmm, how can we set promiscuous mode on all interfaces? +- * I am not sure if that is possible at all. ++ * I am not sure if that is possible at all. For now, we ++ * silently ignore attempts to turn promiscuous mode on ++ * for the "any" device (so you don't have to explicitly ++ * disable it in programs such as tcpdump). + */ + +- if (device && handle->opt.promisc) { ++ if (!is_any_device && handle->opt.promisc) { + memset(&mr, 0, sizeof(mr)); + mr.mr_ifindex = handle->md.ifindex; + mr.mr_type = PACKET_MR_PROMISC; +@@ -3118,7 +3134,7 @@ + + /* Bind to the given device */ + +- if (!device) { ++ if (strcmp(device, "any") == 0) { + strncpy(handle->errbuf, "pcap_activate: The \"any\" device isn't supported on 2.0[.x]-kernel systems", + PCAP_ERRBUF_SIZE); + return PCAP_ERROR; diff --git a/source/n/tcpdump/tcpdump.SlackBuild b/source/n/tcpdump/tcpdump.SlackBuild index ec1d39ee9..15715c567 100755 --- a/source/n/tcpdump/tcpdump.SlackBuild +++ b/source/n/tcpdump/tcpdump.SlackBuild @@ -22,8 +22,17 @@ VERSION=4.0.0 LIBVER=1.0.0 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi NUMJOBS=${NUMJOBS:-" -j7 "} @@ -47,6 +56,9 @@ cd $TMP rm -rf libpcap-$LIBVER tar xvf $CWD/libpcap-$LIBVER.tar.gz || exit 1 cd libpcap-$LIBVER || exit 1 + +zcat $CWD/libpcap.20-fix-any-intf.diff.gz | patch -p1 --verbose || exit 1 + find . -type d -name CVS -depth -exec rm -rf {} \; chown -R root:root . find . \ @@ -63,8 +75,16 @@ CFLAGS="$(getconf LFS_CFLAGS)" \ --enable-ipv6 \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 +make shared $NUMJOBS || make || exit 1 mkdir -p $PKG/usr/bin # otherwise it errors out on install make install DESTDIR=$PKG || exit 1 +strip --strip-debug libpcap.so.1.?.? +cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + ln -sf libpcap.so.1.?.? libpcap.so.1 + ln -sf libpcap.so.1 libpcap.so.0 + ln -sf libpcap.so.1 libpcap.so +) mkdir -p $PKG/usr/doc/libpcap-$LIBVER cp -a \ CHANGES CREDITS FILES INSTALL.txt LICENSE README README.linux TODO VERSION \ diff --git a/source/n/tftp-hpa/tftp-hpa-0.48.tar.bz2.sign b/source/n/tftp-hpa/tftp-hpa-0.48.tar.bz2.sign deleted file mode 100644 index 0bc250608..000000000 --- a/source/n/tftp-hpa/tftp-hpa-0.48.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBFwHdCyGugalF9Dw4RArMGAJsGmXTId7KWtaaPU59qtvxfVqR2hACfV4pp -QP4kzEDqgKlRw3+FYQsQMvY= -=jnKl ------END PGP SIGNATURE----- diff --git a/source/n/tftp-hpa/tftp-hpa-0.49.tar.bz2.sign b/source/n/tftp-hpa/tftp-hpa-0.49.tar.bz2.sign new file mode 100644 index 000000000..de4c7fbb4 --- /dev/null +++ b/source/n/tftp-hpa/tftp-hpa-0.49.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBI/QH7yGugalF9Dw4RAjZZAJ0Ro/KGEOFgQt0Ewk6BRuYQpnv/lQCfUIIJ +lyM+y31FV4/xhLoNKcr8JtA= +=X8qg +-----END PGP SIGNATURE----- diff --git a/source/n/tftp-hpa/tftp-hpa.SlackBuild b/source/n/tftp-hpa/tftp-hpa.SlackBuild index c73c882f1..6fcc104ff 100755 --- a/source/n/tftp-hpa/tftp-hpa.SlackBuild +++ b/source/n/tftp-hpa/tftp-hpa.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,11 +21,22 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=0.48 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +PKGNAM=tftp-hpa +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-tftp-hpa diff --git a/source/n/traceroute/traceroute.SlackBuild b/source/n/traceroute/traceroute.SlackBuild index b687a436e..069ce1f18 100755 --- a/source/n/traceroute/traceroute.SlackBuild +++ b/source/n/traceroute/traceroute.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,20 +21,29 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.4a12 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=traceroute +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" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" +if [ "$ARCH" = "x86_64" ]; then + LIBDIRSUFFIX=64 +else + LIBDIRSUFFIX= fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-traceroute @@ -53,25 +62,26 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/traceroute_$VERSION-5.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 -zcat $CWD/traceroute.no.domain.strip.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +make $NUMJOBS VPATH=/usr/lib${LIBDIRSUFFIX} || make VPATH=/usr/lib${LIBDIRSUFFIX} || exit 1 -CFLAGS="$SLKCFLAGS -Ilinux-include" ./configure --prefix=/usr -make $NUMJOBS || make || exit 1 - -strip traceroute mkdir -p $PKG/usr/bin -cat traceroute > $PKG/usr/bin/traceroute -chmod 4711 $PKG/usr/bin/traceroute +cat traceroute/traceroute > $PKG/usr/bin/traceroute +chmod 755 $PKG/usr/bin/traceroute + +# 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 +) mkdir -p $PKG/usr/man/man8 -gzip -9c traceroute.8 > $PKG/usr/man/man8/traceroute.8.gz +cat traceroute/traceroute.8 | gzip -9c > $PKG/usr/man/man8/traceroute.8.gz mkdir -p $PKG/usr/doc/traceroute-$VERSION cp -a \ - CHANGES FILES INSTALL README VERSION \ + COPYING* CREDITS ChangeLog README* TODO VERSION \ + wrappers \ $PKG/usr/doc/traceroute-$VERSION -chmod 644 $PKG/usr/doc/traceroute-$VERSION/* mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/n/traceroute/traceroute.no.domain.strip.diff b/source/n/traceroute/traceroute.no.domain.strip.diff deleted file mode 100644 index a9af38933..000000000 --- a/source/n/traceroute/traceroute.no.domain.strip.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- traceroute-1.4a12.orig/traceroute.c Tue Feb 4 11:01:05 2003 -+++ traceroute-1.4a12/traceroute.c Tue Feb 4 11:09:17 2003 -@@ -1297,8 +1297,10 @@ - register char *cp; - register struct hostent *hp; - static int first = 1; -- static char domain[MAXHOSTNAMELEN + 1], line[MAXHOSTNAMELEN + 1]; -+/* static char domain[MAXHOSTNAMELEN + 1]; */ -+ static char line[MAXHOSTNAMELEN + 1]; - -+/* - if (first && !nflag) { - first = 0; - if (gethostname(domain, sizeof(domain) - 1) < 0) -@@ -1319,12 +1321,15 @@ - } - } - } -+*/ - if (!nflag && in.s_addr != INADDR_ANY) { - hp = gethostbyaddr((char *)&in, sizeof(in), AF_INET); - if (hp != NULL) { -+/* - if ((cp = strchr(hp->h_name, '.')) != NULL && - strcmp(cp + 1, domain) == 0) - *cp = '\0'; -+*/ - (void)strncpy(line, hp->h_name, sizeof(line) - 1); - line[sizeof(line) - 1] = '\0'; - return (line); diff --git a/source/n/traceroute/traceroute_1.4a12-5.diff b/source/n/traceroute/traceroute_1.4a12-5.diff deleted file mode 100644 index 8cf3d1fe1..000000000 --- a/source/n/traceroute/traceroute_1.4a12-5.diff +++ /dev/null @@ -1,1152 +0,0 @@ ---- traceroute-1.4a12.orig/aclocal.m4 -+++ traceroute-1.4a12/aclocal.m4 -@@ -47,7 +47,7 @@ - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) - AC_BEFORE([$0], [AC_LBL_DEVEL]) - AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) -- $1="-O" -+ $1="-g -O" - $2="" - if test "${srcdir}" != "." ; then - $2="-I\$\(srcdir\)" -@@ -677,12 +677,11 @@ - AC_TRY_LINK(dnl - ifelse([$2], [main], , dnl Avoid conflicting decl of main. - [/* Override any gcc2 internal prototype to avoid an error. */ --]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus -+#ifdef __cplusplus - extern "C" - #endif --])dnl --[/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ - char $2(); - ]), - [$2()], ---- traceroute-1.4a12.orig/configure.in -+++ traceroute-1.4a12/configure.in -@@ -22,7 +22,7 @@ - net/if_dl.h inet/mib2.h) - - AC_REPLACE_FUNCS(strerror usleep) --AC_CHECK_FUNCS(setlinebuf) -+AC_CHECK_FUNCS(setlinebuf snprintf) - if test $ac_cv_func_usleep = "no" ; then - AC_CHECK_FUNCS(nanosleep) - fi -@@ -44,8 +44,9 @@ - ;; - - linux*) -- V_INCLS="$V_INCLS -Ilinux-include" -+ V_INCLS="$V_INCLS -Ilinux-include -DUSE_KERNEL_ROUTING_TABLE" - AC_DEFINE(BYTESWAP_IP_HDR) -+ AC_DEFINE(HAVE_RAW_OPTIONS) - ;; - - osf3*) ---- traceroute-1.4a12.orig/findsaddr-generic.c -+++ traceroute-1.4a12/findsaddr-generic.c -@@ -82,7 +82,11 @@ - static char errbuf[132]; - - /* Get the interface address list */ -+#if HAVE_SNPRINTF -+ if ((n = ifaddrlist(&al, errbuf, sizeof(errbuf))) < 0) -+#else - if ((n = ifaddrlist(&al, errbuf)) < 0) -+#endif - return (errbuf); - - if (n == 0) ---- traceroute-1.4a12.orig/findsaddr-linux.c -+++ traceroute-1.4a12/findsaddr-linux.c -@@ -90,7 +90,11 @@ - static char errbuf[132]; - - if ((f = fopen(route, "r")) == NULL) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "open %s: %.128s", route, strerror(errno)); -+#else - sprintf(errbuf, "open %s: %.128s", route, strerror(errno)); -+#endif - return (errbuf); - } - -@@ -102,7 +106,7 @@ - ++n; - if (n == 1 && strncmp(buf, "Iface", 5) == 0) - continue; -- if ((i = sscanf(buf, "%s %x %*s %*s %*s %*s %*s %x", -+ if ((i = sscanf(buf, "%255s %x %*s %*s %*s %*s %*s %x", - tdevice, &dest, &tmask)) != 3) - return ("junk in buffer"); - if ((to->sin_addr.s_addr & tmask) == dest && -@@ -117,7 +121,11 @@ - return ("Can't find interface"); - - /* Get the interface address list */ -+#if HAVE_SNPRINTF -+ if ((n = ifaddrlist(&al, errbuf, sizeof(errbuf))) < 0) -+#else - if ((n = ifaddrlist(&al, errbuf)) < 0) -+#endif - return (errbuf); - - if (n == 0) -@@ -128,7 +136,11 @@ - if (strcmp(device, al->device) == 0) - break; - if (i <= 0) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "Can't find interface \"%.32s\"", device); -+#else - sprintf(errbuf, "Can't find interface \"%.32s\"", device); -+#endif - return (errbuf); - } - ---- traceroute-1.4a12.orig/findsaddr-socket.c -+++ traceroute-1.4a12/findsaddr-socket.c -@@ -114,7 +114,11 @@ - - s = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC); - if (s < 0) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "socket: %.128s", strerror(errno)); -+#else - sprintf(errbuf, "socket: %.128s", strerror(errno)); -+#endif - return (errbuf); - } - -@@ -134,12 +138,20 @@ - - cc = write(s, (char *)rp, size); - if (cc < 0) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "write: %.128s", strerror(errno)); -+#else - sprintf(errbuf, "write: %.128s", strerror(errno)); -+#endif - close(s); - return (errbuf); - } - if (cc != size) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "short write (%d != %d)", cc, size); -+#else - sprintf(errbuf, "short write (%d != %d)", cc, size); -+#endif - close(s); - return (errbuf); - } -@@ -149,7 +161,11 @@ - memset(rp, 0, size); - cc = read(s, (char *)rp, size); - if (cc < 0) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "read: %.128s", strerror(errno)); -+#else - sprintf(errbuf, "read: %.128s", strerror(errno)); -+#endif - close(s); - return (errbuf); - } -@@ -159,15 +175,27 @@ - - - if (rp->rtm_version != RTM_VERSION) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "bad version %d", rp->rtm_version); -+#else - sprintf(errbuf, "bad version %d", rp->rtm_version); -+#endif - return (errbuf); - } - if (rp->rtm_msglen > cc) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "bad msglen %d > %d", rp->rtm_msglen, cc); -+#else - sprintf(errbuf, "bad msglen %d > %d", rp->rtm_msglen, cc); -+#endif - return (errbuf); - } - if (rp->rtm_errno != 0) { -+#if HAVE_SNPRINTF -+ snprintf(errbuf, sizeof(errbuf), "rtm_errno: %.128s", strerror(rp->rtm_errno)); -+#else - sprintf(errbuf, "rtm_errno: %.128s", strerror(rp->rtm_errno)); -+#endif - return (errbuf); - } - ---- traceroute-1.4a12.orig/ifaddrlist.c -+++ traceroute-1.4a12/ifaddrlist.c -@@ -72,7 +72,12 @@ - * Return the interface list - */ - int -+#if HAVE_SNPRINTF -+ifaddrlist(register struct ifaddrlist **ipaddrp, register char *errbuf, -+ size_t nerrbuf) -+#else - ifaddrlist(register struct ifaddrlist **ipaddrp, register char *errbuf) -+#endif - { - register int fd, nipaddr; - #ifdef HAVE_SOCKADDR_SA_LEN -@@ -89,7 +94,11 @@ - - fd = socket(AF_INET, SOCK_DGRAM, 0); - if (fd < 0) { -+#if HAVE_SNPRINTF -+ (void)snprintf(errbuf, nerrbuf, "socket: %s", strerror(errno)); -+#else - (void)sprintf(errbuf, "socket: %s", strerror(errno)); -+#endif - return (-1); - } - ifc.ifc_len = sizeof(ibuf); -@@ -98,12 +107,23 @@ - if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 || - ifc.ifc_len < sizeof(struct ifreq)) { - if (errno == EINVAL) -+#if HAVE_SNPRINTF -+ (void)snprintf(errbuf, nerrbuf, -+ "SIOCGIFCONF: ifreq struct too small (%d bytes)", -+ sizeof(ibuf)); -+#else - (void)sprintf(errbuf, - "SIOCGIFCONF: ifreq struct too small (%d bytes)", - sizeof(ibuf)); -+#endif - else -+#if HAVE_SNPRINTF -+ (void)snprintf(errbuf, nerrbuf, "SIOCGIFCONF: %s", -+ strerror(errno)); -+#else - (void)sprintf(errbuf, "SIOCGIFCONF: %s", - strerror(errno)); -+#endif - (void)close(fd); - return (-1); - } -@@ -135,9 +155,15 @@ - if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifr) < 0) { - if (errno == ENXIO) - continue; -+#if HAVE_SNPRINTF -+ (void)snprintf(errbuf, nerrbuf, "SIOCGIFFLAGS: %.*s: %s", -+ (int)sizeof(ifr.ifr_name), ifr.ifr_name, -+ strerror(errno)); -+#else - (void)sprintf(errbuf, "SIOCGIFFLAGS: %.*s: %s", - (int)sizeof(ifr.ifr_name), ifr.ifr_name, - strerror(errno)); -+#endif - (void)close(fd); - return (-1); - } -@@ -155,21 +181,35 @@ - continue; - #endif - if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0) { -+#if HAVE_SNPRINTF -+ (void)snprintf(errbuf, nerrbuf, "SIOCGIFADDR: %s: %s", -+ device, strerror(errno)); -+#else - (void)sprintf(errbuf, "SIOCGIFADDR: %s: %s", - device, strerror(errno)); -+#endif - (void)close(fd); - return (-1); - } - - if (nipaddr >= MAX_IPADDR) { -+#if HAVE_SNPRINTF -+ (void)snprintf(errbuf, nerrbuf, "Too many interfaces (%d)", -+ MAX_IPADDR); -+#else - (void)sprintf(errbuf, "Too many interfaces (%d)", - MAX_IPADDR); -+#endif - (void)close(fd); - return (-1); - } - sin = (struct sockaddr_in *)&ifr.ifr_addr; - al->addr = sin->sin_addr.s_addr; - al->device = strdup(device); -+ if (al->device == NULL) { -+ fputs("ifaddrlist: strdup\n", stderr); -+ exit(1); -+ } - ++al; - ++nipaddr; - } ---- traceroute-1.4a12.orig/ifaddrlist.h -+++ traceroute-1.4a12/ifaddrlist.h -@@ -26,4 +26,8 @@ - char *device; - }; - -+#if HAVE_SNPRINTF -+int ifaddrlist(struct ifaddrlist **, char *, size_t); -+#else - int ifaddrlist(struct ifaddrlist **, char *); -+#endif ---- traceroute-1.4a12.orig/traceroute.8 -+++ traceroute-1.4a12/traceroute.8 -@@ -23,7 +23,7 @@ - .na - .B traceroute - [ --.B \-dFInrvx -+.B \-dFIlnrvx - ] [ - .B \-f - .I first_ttl -@@ -110,6 +110,10 @@ - .B \-I - Use ICMP ECHO instead of UDP datagrams. - .TP -+.B \-l -+Display the ttl value of the returned packet. This is useful for -+checking for assymetric routing. -+.TP - .B \-m - Set the max time-to-live (max number of hops) used in outgoing probe - packets. The default is 30 hops (the same default used for TCP -@@ -146,9 +150,8 @@ - multi-homed hosts (those with more than one IP - address), this option can be used to - force the source address to be something other than the IP address --of the interface the probe packet is sent on. If the IP address --is not one of this machine's interface addresses, an error is --returned and nothing is sent. (See the -+of the interface the probe packet is sent on. This option can only -+be used by the super-user. (See the - .B \-i - flag for another way to do this.) - .TP -@@ -329,6 +332,9 @@ - or - .B !P - (host, network or protocol unreachable), -+.BR !A , -+.BR !C -+(access to the network or host, respectively, is prohibited), - .B !S - (source route failed), - .B !F\-<pmtu> ---- traceroute-1.4a12.orig/traceroute.c -+++ traceroute-1.4a12/traceroute.c -@@ -271,7 +271,7 @@ - struct outdata { - u_char seq; /* sequence number of this packet */ - u_char ttl; /* ttl packet left with */ -- struct timeval tv; /* time packet left */ -+ struct timeval tv __attribute__((packed)); /* time packet left */ - }; - - #ifndef HAVE_ICMP_NEXTMTU -@@ -296,8 +296,8 @@ - int s; /* receive (icmp) socket file descriptor */ - int sndsock; /* send (udp/icmp) socket file descriptor */ - --struct sockaddr whereto; /* Who to try to reach */ --struct sockaddr wherefrom; /* Who we are */ -+struct sockaddr_storage whereto; /* Who to try to reach */ -+struct sockaddr_storage wherefrom; /* Who we are */ - int packlen; /* total length of packet */ - int minpacket; /* min ip packet size */ - int maxpacket = 32 * 1024; /* max ip packet size */ -@@ -352,6 +352,11 @@ - int usleep(u_int); - #endif - -+#ifdef USE_KERNEL_ROUTING_TABLE -+struct ifaddrlist *search_routing_table(struct sockaddr_in *to, struct ifaddrlist *al, int n); -+#endif -+ -+ - int - main(int argc, char **argv) - { -@@ -370,8 +375,12 @@ - int tos = 0, settos = 0; - register int lsrr = 0; - register u_short off = 0; -- struct ifaddrlist *al; -+ struct ifaddrlist *al, *allist; - char errbuf[132]; -+ int ttl_flag = 0; -+ int uid; -+ -+ uid = getuid(); - - if (argv[0] == NULL) - prog = "traceroute"; -@@ -381,7 +390,7 @@ - prog = argv[0]; - - opterr = 0; -- while ((op = getopt(argc, argv, "dFInrvxf:g:i:m:p:q:s:t:w:z:")) != EOF) -+ while ((op = getopt(argc, argv, "dFIlnrvxf:g:i:m:p:q:s:t:w:z:")) != EOF) - switch (op) { - - case 'd': -@@ -397,6 +406,10 @@ - break; - - case 'g': -+ if (strlen(optarg) >= MAXHOSTNAMELEN) { -+ Fprintf(stderr, "%s: Nice Try !\n", prog); -+ exit(-1); -+ } - if (lsrr >= NGATEWAYS) { - Fprintf(stderr, - "%s: No more than %d gateways\n", -@@ -409,12 +422,21 @@ - - case 'i': - device = optarg; -+ if (strlen(device) >= 16) { /* that is the IFNAMSIZ -+ * from kernel headers */ -+ Fprintf(stderr, "%s: Nice try !\n", prog); -+ exit(-1); -+ } - break; - - case 'I': - ++useicmp; - break; - -+ case 'l': -+ ++ttl_flag; -+ break; -+ - case 'm': - max_ttl = str2val(optarg, "max ttl", 1, 255); - break; -@@ -441,7 +463,19 @@ - * set the ip source address of the outbound - * probe (e.g., on a multi-homed host). - */ -+ if (uid) { -+ Fprintf( -+ stderr, -+ "%s: -s %s: Permission denied\n", -+ prog, optarg -+ ); -+ exit(-1); -+ } - source = optarg; -+ if (strlen(source) >= MAXHOSTNAMELEN) { -+ Fprintf(stderr, "%s: Nice Try !\n", prog); -+ exit(-1); -+ } - break; - - case 't': -@@ -500,6 +534,10 @@ - - case 1: - hostname = argv[optind]; -+ if (strlen(hostname) >= MAXHOSTNAMELEN) { -+ Fprintf(stderr, "%s: Nice try !\n", prog); -+ exit(-1); -+ } - hi = gethostinfo(hostname); - setsin(to, hi->addrs[0]); - if (hi->n > 1) -@@ -515,75 +553,6 @@ - usage(); - } - --#ifdef HAVE_SETLINEBUF -- setlinebuf (stdout); --#else -- setvbuf(stdout, NULL, _IOLBF, 0); --#endif -- -- outip = (struct ip *)malloc((unsigned)packlen); -- if (outip == NULL) { -- Fprintf(stderr, "%s: malloc: %s\n", prog, strerror(errno)); -- exit(1); -- } -- memset((char *)outip, 0, packlen); -- -- outip->ip_v = IPVERSION; -- if (settos) -- outip->ip_tos = tos; --#ifdef BYTESWAP_IP_HDR -- outip->ip_len = htons(packlen); -- outip->ip_off = htons(off); --#else -- outip->ip_len = packlen; -- outip->ip_off = off; --#endif -- outp = (u_char *)(outip + 1); --#ifdef HAVE_RAW_OPTIONS -- if (lsrr > 0) { -- register u_char *optlist; -- -- optlist = outp; -- outp += optlen; -- -- /* final hop */ -- gwlist[lsrr] = to->sin_addr.s_addr; -- -- outip->ip_dst.s_addr = gwlist[0]; -- -- /* force 4 byte alignment */ -- optlist[0] = IPOPT_NOP; -- /* loose source route option */ -- optlist[1] = IPOPT_LSRR; -- i = lsrr * sizeof(gwlist[0]); -- optlist[2] = i + 3; -- /* Pointer to LSRR addresses */ -- optlist[3] = IPOPT_MINOFF; -- memcpy(optlist + 4, gwlist + 1, i); -- } else --#endif -- outip->ip_dst = to->sin_addr; -- -- outip->ip_hl = (outp - (u_char *)outip) >> 2; -- ident = (getpid() & 0xffff) | 0x8000; -- if (useicmp) { -- outip->ip_p = IPPROTO_ICMP; -- -- outicmp = (struct icmp *)outp; -- outicmp->icmp_type = ICMP_ECHO; -- outicmp->icmp_id = htons(ident); -- -- outdata = (struct outdata *)(outp + 8); /* XXX magic number */ -- } else { -- outip->ip_p = IPPROTO_UDP; -- -- outudp = (struct udphdr *)outp; -- outudp->uh_sport = htons(ident); -- outudp->uh_ulen = -- htons((u_short)(packlen - (sizeof(*outip) + optlen))); -- outdata = (struct outdata *)(outudp + 1); -- } -- - cp = "icmp"; - if ((pe = getprotobyname(cp)) == NULL) { - Fprintf(stderr, "%s: unknown protocol %s\n", prog, cp); -@@ -591,12 +560,15 @@ - } - - /* Insure the socket fds won't be 0, 1 or 2 */ -- if (open(devnull, O_RDONLY) < 0 || -- open(devnull, O_RDONLY) < 0 || -- open(devnull, O_RDONLY) < 0) { -- Fprintf(stderr, "%s: open \"%s\": %s\n", -- prog, devnull, strerror(errno)); -- exit(1); -+ do { -+ if ((n = open(devnull, O_RDONLY)) < 0) { -+ Fprintf(stderr, "%s: open \"%s\": %s\n", -+ prog, devnull, strerror(errno)); -+ exit(1); -+ } -+ } while (n < 2); -+ if (n > 2) { -+ close(n); - } - if ((s = socket(AF_INET, SOCK_RAW, pe->p_proto)) < 0) { - Fprintf(stderr, "%s: icmp socket: %s\n", prog, strerror(errno)); -@@ -662,7 +634,7 @@ - #endif - #ifdef IP_HDRINCL - if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, (char *)&on, -- sizeof(on)) < 0) { -+ sizeof(on)) < 0 && errno != ENOPROTOOPT) { - Fprintf(stderr, "%s: IP_HDRINCL: %s\n", prog, strerror(errno)); - exit(1); - } -@@ -683,8 +655,88 @@ - (void)setsockopt(sndsock, SOL_SOCKET, SO_DONTROUTE, (char *)&on, - sizeof(on)); - -+ /* Revert to non-privileged user after opening sockets */ -+ setgid(getgid()); -+ setuid(uid); -+ -+#ifndef __GLIBC__ -+#ifdef HAVE_SETLINEBUF -+ setlinebuf (stdout); -+#else -+ setvbuf(stdout, NULL, _IOLBF, 0); -+#endif -+#endif -+ -+ outip = (struct ip *)malloc((unsigned)packlen); -+ if (outip == NULL) { -+ Fprintf(stderr, "%s: malloc: %s\n", prog, strerror(errno)); -+ exit(1); -+ } -+ memset((char *)outip, 0, packlen); -+ -+ outip->ip_v = IPVERSION; -+ if (settos) -+ outip->ip_tos = tos; -+#ifdef BYTESWAP_IP_HDR -+ outip->ip_len = htons(packlen); -+ outip->ip_off = htons(off); -+#else -+ outip->ip_len = packlen; -+ outip->ip_off = off; -+#endif -+ outp = (u_char *)(outip + 1); -+#ifdef HAVE_RAW_OPTIONS -+ if (lsrr > 0) { -+ register u_char *optlist; -+ -+ optlist = outp; -+ outp += optlen; -+ -+ /* final hop */ -+ gwlist[lsrr] = to->sin_addr.s_addr; -+ -+ outip->ip_dst.s_addr = gwlist[0]; -+ -+ /* force 4 byte alignment */ -+ optlist[0] = IPOPT_NOP; -+ /* loose source route option */ -+ optlist[1] = IPOPT_LSRR; -+ i = lsrr * sizeof(gwlist[0]); -+ optlist[2] = i + 3; -+ /* Pointer to LSRR addresses */ -+ optlist[3] = IPOPT_MINOFF; -+ memcpy(optlist + 4, gwlist + 1, i); -+ } else -+#endif -+ outip->ip_dst = to->sin_addr; -+ -+ outip->ip_hl = (outp - (u_char *)outip) >> 2; -+ ident = (getpid() & 0xffff) | 0x8000; -+ if (useicmp) { -+ outip->ip_p = IPPROTO_ICMP; -+ -+ outicmp = (struct icmp *)outp; -+ outicmp->icmp_type = ICMP_ECHO; -+ outicmp->icmp_id = htons(ident); -+ -+ outdata = (struct outdata *)(outp + 8); /* XXX magic number */ -+ } else { -+ outip->ip_p = IPPROTO_UDP; -+ -+ outudp = (struct udphdr *)outp; -+ outudp->uh_sport = htons(ident); -+ outudp->uh_ulen = -+ htons((u_short)(packlen - (sizeof(*outip) + optlen))); -+ outdata = (struct outdata *)(outudp + 1); -+ } -+ - /* Get the interface address list */ -- n = ifaddrlist(&al, errbuf); -+#if HAVE_SNPRINTF -+ n = ifaddrlist(&allist, errbuf, sizeof(errbuf)); -+#else -+ n = ifaddrlist(&allist, errbuf); -+#endif -+ al = allist; - if (n < 0) { - Fprintf(stderr, "%s: ifaddrlist: %s\n", prog, errbuf); - exit(1); -@@ -709,6 +761,15 @@ - - /* Determine our source address */ - if (source == NULL) { -+#ifdef USE_KERNEL_ROUTING_TABLE -+ /* Search the kernel routing table for a match with the -+ * destination address. Then use that interface. If -+ * there is no match, default to using the first -+ * interface found. -+ */ -+ al = search_routing_table(to, allist, n); -+ setsin(from, al->addr); -+#else - /* - * If a device was specified, use the interface address. - * Otherwise, try to determine our source address. -@@ -720,6 +781,7 @@ - prog, err); - exit(1); - } -+#endif - } else { - hi = gethostinfo(source); - source = hi->name; -@@ -751,10 +813,6 @@ - freehostinfo(hi); - } - -- /* Revert to non-privileged user after opening sockets */ -- setgid(getgid()); -- setuid(getuid()); -- - outip->ip_src = from->sin_addr; - #ifndef IP_HDRINCL - if (bind(sndsock, (struct sockaddr *)from, sizeof(*from)) < 0) { -@@ -803,9 +861,11 @@ - ++gotlastaddr; - } - Printf(" %.3f ms", deltaT(&t1, &t2)); -+ ip = (struct ip *)packet; -+ if (ttl_flag) -+ Printf(" (%d)", ip->ip_ttl); - if (i == -2) { - #ifndef ARCHAIC -- ip = (struct ip *)packet; - if (ip->ip_ttl <= 1) - Printf(" !"); - #endif -@@ -820,7 +880,6 @@ - - case ICMP_UNREACH_PORT: - #ifndef ARCHAIC -- ip = (struct ip *)packet; - if (ip->ip_ttl <= 1) - Printf(" !"); - #endif -@@ -853,8 +912,14 @@ - break; - - case ICMP_UNREACH_FILTER_PROHIB: -+ case ICMP_UNREACH_NET_PROHIB: /* misuse */ -+ ++unreachable; -+ Printf(" !A"); -+ break; -+ -+ case ICMP_UNREACH_HOST_PROHIB: - ++unreachable; -- Printf(" !X"); -+ Printf(" !C"); - break; - - case ICMP_UNREACH_HOST_PRECEDENCE: -@@ -867,6 +932,23 @@ - Printf(" !C"); - break; - -+ case ICMP_UNREACH_NET_UNKNOWN: -+ case ICMP_UNREACH_HOST_UNKNOWN: -+ ++unreachable; -+ Printf(" !U"); -+ break; -+ -+ case ICMP_UNREACH_ISOLATED: -+ ++unreachable; -+ Printf(" !I"); -+ break; -+ -+ case ICMP_UNREACH_TOSNET: -+ case ICMP_UNREACH_TOSHOST: -+ ++unreachable; -+ Printf(" !T"); -+ break; -+ - default: - ++unreachable; - Printf(" !<%d>", code); -@@ -894,7 +976,7 @@ - struct timeval now, wait; - struct timezone tz; - register int cc = 0; -- int fromlen = sizeof(*fromp); -+ socklen_t fromlen = sizeof(*fromp); - - FD_ZERO(&fds); - FD_SET(sock, &fds); -@@ -938,7 +1020,7 @@ - /* Payload */ - outdata->seq = seq; - outdata->ttl = ttl; -- outdata->tv = *tp; -+ memcpy(&outdata->tv, tp, sizeof(outdata->tv)); - - if (useicmp) - outicmp->icmp_seq = htons(seq); -@@ -1003,12 +1085,13 @@ - - #ifdef __hpux - cc = sendto(sndsock, useicmp ? (char *)outicmp : (char *)outudp, -- packlen - (sizeof(*outip) + optlen), 0, &whereto, sizeof(whereto)); -+ packlen - (sizeof(*outip) + optlen), 0, -+ (struct sockaddr *)&whereto, sizeof(whereto)); - if (cc > 0) - cc += sizeof(*outip) + optlen; - #else - cc = sendto(sndsock, (char *)outip, -- packlen, 0, &whereto, sizeof(whereto)); -+ packlen, 0, (struct sockaddr *)&whereto, sizeof(whereto)); - #endif - if (cc < 0 || cc != packlen) { - if (cc < 0) -@@ -1039,12 +1122,12 @@ - static char *ttab[] = { - "Echo Reply", "ICMP 1", "ICMP 2", "Dest Unreachable", - "Source Quench", "Redirect", "ICMP 6", "ICMP 7", -- "Echo", "ICMP 9", "ICMP 10", "Time Exceeded", -+ "Echo", "Router Advert", "Router Solicit", "Time Exceeded", - "Param Problem", "Timestamp", "Timestamp Reply", "Info Request", -- "Info Reply" -+ "Info Reply", "Mask Request", "Mask Reply" - }; - -- if (t > 16) -+ if (t > 18) - return("OUT-OF-RANGE"); - - return(ttab[t]); -@@ -1272,6 +1355,11 @@ - addr = inet_addr(hostname); - if ((int32_t)addr != -1) { - hi->name = strdup(hostname); -+ if (hi->name == NULL) { -+ Fprintf(stderr, "%s: strdup %s\n", -+ prog, strerror(errno)); -+ exit(1); -+ } - hi->n = 1; - hi->addrs = calloc(1, sizeof(hi->addrs[0])); - if (hi->addrs == NULL) { -@@ -1293,6 +1381,11 @@ - exit(1); - } - hi->name = strdup(hp->h_name); -+ if (hi->name == NULL) { -+ Fprintf(stderr, "%s: strdup %s\n", -+ prog, strerror(errno)); -+ exit(1); -+ } - for (n = 0, p = hp->h_addr_list; *p != NULL; ++n, ++p) - continue; - hi->n = n; -@@ -1381,8 +1474,96 @@ - - Fprintf(stderr, "Version %s\n", version); - Fprintf(stderr, -- "Usage: %s [-dFInrvx] [-g gateway] [-i iface] [-f first_ttl]\n" -+ "Usage: %s [-dFIlnrvx] [-g gateway] [-i iface] [-f first_ttl]\n" - "\t[-m max_ttl] [ -p port] [-q nqueries] [-s src_addr] [-t tos]\n" - "\t[-w waittime] [-z pausemsecs] host [packetlen]\n", prog); - exit(1); - } -+ -+ -+#ifdef USE_KERNEL_ROUTING_TABLE -+ -+/* This function currently only supports IPv4. Someone who knows -+ * more about multi-protocol socket stuff should take a look at this. -+ * -+ * (But does it make any sense for traceroute to support other -+ * protocols? Maybe IPv6... -+ */ -+ -+struct ifaddrlist *search_routing_table(struct sockaddr_in *to, struct ifaddrlist *al, int n) -+{ -+ struct ifaddrlist *first_if; -+ FILE *fp; -+ char buf[1024]; -+ char ifname[128]; -+ unsigned int route_dest; -+ unsigned int mask; -+ char best_name[128]; -+ unsigned int best_mask; -+ unsigned int dest_addr; -+ unsigned int convs; -+ -+ /* How come using ntohl(to->sin_addr.s_addr) doesn't work here? */ -+ dest_addr = to->sin_addr.s_addr; -+ -+ fp = fopen("/proc/net/route", "r"); -+ if (fp == NULL) { -+ return al; -+ } -+ -+ /* Skip the first line (the column headings) */ -+ if (fgets(buf, sizeof(buf), fp) == NULL) { -+ fclose(fp); -+ return al; -+ } -+ -+ best_name[0] = '\0'; -+ best_mask = 0; -+ -+ while (fgets(buf, sizeof(buf), fp) != NULL) { -+ /* Field 1: interface name -+ * Field 2: dest addr -+ * Field 8: genmask -+ */ -+ convs = sscanf(buf, "%127s %x %*s %*s %*s %*s %*s %x", -+ ifname, &route_dest, &mask); -+ if (convs != 3) { -+ /* format error .... */ -+ fclose(fp); -+ return al; -+ } -+ -+ if ((dest_addr & mask) == route_dest) { -+ /* This routing entry applies to -+ * our destination addr -+ */ -+ if ((mask > best_mask) || (best_mask == 0)) { -+ /* And it is more specific than any -+ * previous match (or is the first match) -+ */ -+ best_mask = mask; -+ strncpy(best_name, ifname, -+ sizeof(best_name) - 1); -+ best_name[sizeof(best_name) - 1] = 0; -+ } -+ } -+ } -+ -+ fclose(fp); -+ -+ /* If we don't find a match, we'll return the first entry */ -+ first_if = al; -+ -+ while (al < first_if + n) { -+ if (strcmp(best_name, al->device) == 0) { -+ /* Got a match */ -+ return al; -+ } -+ al++; -+ } -+ -+ return first_if; -+} -+ -+#endif -+ ---- traceroute-1.4a12.orig/debian/changelog -+++ traceroute-1.4a12/debian/changelog -@@ -0,0 +1,63 @@ -+traceroute (1.4a12-5) unstable; urgency=low -+ -+ * Restrict the -s option to the super-user. -+ * Updated documentation for the -s option (closes: #105362). -+ -+ -- Herbert Xu <herbert@debian.org> Mon, 16 Jul 2001 19:28:45 +1000 -+ -+traceroute (1.4a12-4) unstable; urgency=low -+ -+ * Updated aclocal.m4 for autoconf 2.50 (closes: #98367). -+ -+ -- Herbert Xu <herbert@debian.org> Wed, 23 May 2001 18:48:59 +1000 -+ -+traceroute (1.4a12-3) unstable; urgency=low -+ -+ * Drop privileges earlier. -+ * Applied "paranoia" patch from Richard Kettlewell (closes: #85619). -+ - eliminate unbounded sprintf calls -+ - eliminate unbounded sscanf calls -+ - strncpy final-null paranoia -+ * Set HAVE_RAW_OPTIONS (closes: #78475). -+ * Added missing option to usage (Neale Banks, closes: #88892). -+ -+ -- Herbert Xu <herbert@debian.org> Fri, 9 Mar 2001 22:24:11 +1100 -+ -+traceroute (1.4a12-2) unstable; urgency=low -+ -+ * Made changes for dpkg-statoverride (closes: #83817). -+ -+ -- Herbert Xu <herbert@debian.org> Sun, 28 Jan 2001 21:49:35 +1100 -+ -+traceroute (1.4a12-1) unstable; urgency=low -+ -+ * New upstream release (closes: #79920, #81395). -+ * Use struct sockaddr_stroage (closes: #79348). -+ -+ -- Herbert Xu <herbert@debian.org> Fri, 26 Jan 2001 20:57:21 +1100 -+ -+traceroute (1.4a8-1) unstable; urgency=low -+ -+ * New upstream release. -+ -+ -- Herbert Xu <herbert@debian.org> Sat, 9 Dec 2000 14:18:00 +1100 -+ -+traceroute (1.4a5-3) stable unstable; urgency=low -+ -+ * Fixed a bug where free(3) was called on non-malloced memory. -+ -+ -- Herbert Xu <herbert@debian.org> Thu, 24 Aug 2000 20:44:51 +1000 -+ -+traceroute (1.4a5-2) frozen unstable; urgency=low -+ -+ * Use config.* from automake, needed for building traceroute on ARM -+ (closes: #61267). -+ -+ -- Herbert Xu <herbert@debian.org> Fri, 31 Mar 2000 07:50:33 +1000 -+ -+traceroute (1.4a5-1) unstable; urgency=low -+ -+ * Initial release (closes: #34166). -+ -+ -- Herbert Xu <herbert@debian.org> Mon, 1 Nov 1999 15:11:06 +1100 -+ ---- traceroute-1.4a12.orig/debian/control -+++ traceroute-1.4a12/debian/control -@@ -0,0 +1,22 @@ -+Source: traceroute -+Section: net -+Priority: optional -+Maintainer: Herbert Xu <herbert@debian.org> -+Standards-Version: 3.5.5 -+Build-Depends: automake, autoconf, debhelper -+ -+Package: traceroute -+Architecture: any -+Depends: ${shlibs:Depends} -+Conflicts: suidmanager (<< 0.50) -+Replaces: netstd -+Description: Traces the route taken by packets over a TCP/IP network. -+ The traceroute utility displays the route used by IP packets on their way to a -+ specified network (or Internet) host. Traceroute displays the IP number and -+ host name (if possible) of the machines along the route taken by the packets. -+ Traceroute is used as a network debugging tool. If you're having network -+ connectivity problems, traceroute will show you where the trouble is coming -+ from along the route. -+ . -+ Install traceroute if you need a tool for diagnosing network connectivity -+ problems. ---- traceroute-1.4a12.orig/debian/copyright -+++ traceroute-1.4a12/debian/copyright -@@ -0,0 +1,16 @@ -+This package was split from netstd by Herbert Xu herbert@debian.org on -+Mon, 1 Nov 1999 15:14:03 +1100. -+ -+netstd was created by Peter Tobias tobias@et-inf.fho-emden.de on -+Wed, 20 Jul 1994 17:23:21 +0200. -+ -+It was downloaded from ftp://ftp.ee.lbl.gov/. -+ -+Copyright: -+ -+Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997 -+The Regents of the University of California. All rights reserved. -+ -+The license can be found in /usr/share/common-licenses/BSD. -+ -+$Id: copyright,v 1.1 1999/11/01 04:34:49 herbert Exp $ ---- traceroute-1.4a12.orig/debian/rules -+++ traceroute-1.4a12/debian/rules -@@ -0,0 +1,96 @@ -+#!/usr/bin/make -f -+# GNU copyright 1997 to 1999 by Joey Hess. -+# Copyright (c) 1999 Herbert Xu <herbert@debian.org> -+ -+# Uncomment this to turn on verbose mode. -+#export DH_VERBOSE=1 -+ -+# This is the debhelper compatability version to use. -+export DH_COMPAT=2 -+ -+build: build-stamp -+build-stamp: -+ dh_testdir -+ -+ if [ ! -f configure.old ]; then \ -+ mv configure configure.old; \ -+ mv config.guess config.guess.old; \ -+ mv config.sub config.sub.old; \ -+ mv linux-include/netinet/in_systm.h linux-include; \ -+ mv linux-include/netinet/ip.h linux-include; \ -+ mv linux-include/netinet/ip_icmp.h linux-include; \ -+ cp /usr/share/automake/config.guess .; \ -+ cp /usr/share/automake/config.sub .; \ -+ autoconf; \ -+ fi -+ if [ ! -f Makefile ]; then ./configure; fi -+ $(MAKE) CCOPT="-g -O2" -+ -+ touch build-stamp -+ -+clean: -+ dh_testdir -+ dh_testroot -+ rm -f build-stamp install-stamp -+ -+ -$(MAKE) distclean -+ if [ -f configure.old ]; then \ -+ mv configure.old configure; \ -+ mv config.guess.old config.guess; \ -+ mv config.sub.old config.sub; \ -+ mv linux-include/in_systm.h linux-include/netinet; \ -+ mv linux-include/ip.h linux-include/netinet; \ -+ mv linux-include/ip_icmp.h linux-include/netinet; \ -+ fi -+ -+ dh_clean -+ -+install: build install-stamp -+install-stamp: -+ dh_testdir -+ dh_testroot -+ dh_clean -k -+ dh_installdirs -+ -+ install traceroute debian/traceroute/usr/sbin -+ cp traceroute.8 debian/traceroute/usr/share/man/man8 -+ -+ touch install-stamp -+ -+# 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_testversion -+ dh_testdir -+ dh_testroot -+# dh_installdebconf -+ dh_installdocs -+ dh_installexamples -+ dh_installmenu -+# dh_installemacsen -+# dh_installpam -+# dh_installinit -+ dh_installcron -+ dh_installmanpages -+ dh_installinfo -+# dh_undocumented -+ dh_installchangelogs CHANGES -+ dh_link -+ dh_strip -+ dh_compress -+ dh_fixperms -+ # You may want to make some executables suid here. -+ chmod u+s debian/traceroute/usr/sbin/traceroute -+# dh_makeshlibs -+ dh_installdeb -+# dh_perl -+ dh_shlibdeps -+ dh_gencontrol -+ dh_md5sums -+ dh_builddeb -+ -+binary: binary-indep binary-arch -+.PHONY: build clean binary-indep binary-arch binary install ---- traceroute-1.4a12.orig/debian/traceroute.dirs -+++ traceroute-1.4a12/debian/traceroute.dirs -@@ -0,0 +1,2 @@ -+usr/sbin -+usr/share/man/man8 ---- traceroute-1.4a12.orig/debian/traceroute.docs -+++ traceroute-1.4a12/debian/traceroute.docs -@@ -0,0 +1 @@ -+README ---- traceroute-1.4a12.orig/debian/traceroute.examples -+++ traceroute-1.4a12/debian/traceroute.examples -@@ -0,0 +1,2 @@ -+mean.awk -+median.awk diff --git a/source/n/vsftpd/vsftpd.SlackBuild b/source/n/vsftpd/vsftpd.SlackBuild index c202e392d..06b56763d 100755 --- a/source/n/vsftpd/vsftpd.SlackBuild +++ b/source/n/vsftpd/vsftpd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,11 +20,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.1.2 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo vsftpd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else @@ -49,16 +59,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# This allows the libfinder script to find stuff in */lib64 -if [ "$LIBDIRSUFFIX" = "64" ]; then - zcat $CWD/vsftpd.vsf_findlibs.sh.diff.gz | patch -p1 --verbose || exit 1 -fi - zcat $CWD/vsftpd.builddefs.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/vsftpd.conf.diff.gz | patch -p1 --verbose || exit 1 -sed -i -e "s#lib/#lib${LIBDIRSUFFIX}/#g" vsf_findlibs.sh - make $NUMJOBS || make || exit 1 mkdir -p $PKG/usr/sbin @@ -81,10 +84,18 @@ mkdir -p $PKG/home/ftp mkdir -p $PKG/usr/doc/vsftpd-$VERSION cp -a \ - AUDIT BENCHMARKS BUGS COPYING* COPYRIGHT Changelog EXAMPLE FAQ \ + AUDIT BENCHMARKS BUGS COPYING* COPYRIGHT EXAMPLE FAQ \ INSTALL LICENSE README* REFS REWARD SECURITY SIZE SPEED TODO TUNING \ $PKG/usr/doc/vsftpd-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r Changelog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat Changelog | head -n 1000 > $DOCSDIR/Changelog + touch -r Changelog $DOCSDIR/Changelog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/n/vsftpd/vsftpd.conf.diff b/source/n/vsftpd/vsftpd.conf.diff index 230d858c8..1f410a7ac 100644 --- a/source/n/vsftpd/vsftpd.conf.diff +++ b/source/n/vsftpd/vsftpd.conf.diff @@ -1,5 +1,6 @@ ---- ./vsftpd.conf.orig 2008-12-17 14:31:40.000000000 -0600 -+++ ./vsftpd.conf 2009-03-29 22:09:21.000000000 -0500 +diff -Nur vsftpd-2.2.1.orig/vsftpd.conf vsftpd-2.2.1/vsftpd.conf +--- vsftpd-2.2.1.orig/vsftpd.conf 2009-10-18 21:04:23.000000000 -0500 ++++ vsftpd-2.2.1/vsftpd.conf 2009-10-19 10:22:16.609407947 -0500 @@ -19,7 +19,7 @@ # # Default umask for local users is 077. You may wish to change this to 022, @@ -23,7 +24,7 @@ # # You may change the default value for timing out an idle session. #idle_session_timeout=600 -@@ -100,14 +100,17 @@ +@@ -101,12 +101,13 @@ # default to avoid remote users being able to cause excessive I/O on large # sites. However, some broken FTP clients such as "ncftp" and "mirror" assume # the presence of the "-R" option, so there is a strong case for enabling it. @@ -36,13 +37,9 @@ -listen=YES +# When "listen" directive is enabled, vsftpd runs in standalone mode (rather +# than from inetd) and listens on IPv4 sockets. To use vsftpd in standalone -+# mode rather than with inetd, either change the line below to 'listen=YES' -+# or comment it out. This directive cannot be used in conjunction with the -+# listen_ipv6 directive. ++# mode rather than with inetd, change the line below to 'listen=YES' ++# This directive cannot be used in conjunction with the listen_ipv6 directive. +listen=NO # # This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6 - # sockets, you must run two copies of vsftpd whith two configuration files. - # Make sure, that one of the listen options is commented !! - #listen_ipv6=YES -+ + # sockets, you must run two copies of vsftpd with two configuration files. diff --git a/source/n/vsftpd/vsftpd.vsf_findlibs.sh.diff b/source/n/vsftpd/vsftpd.vsf_findlibs.sh.diff deleted file mode 100644 index 147ee7426..000000000 --- a/source/n/vsftpd/vsftpd.vsf_findlibs.sh.diff +++ /dev/null @@ -1,87 +0,0 @@ -diff -Nur vsftpd-2.1.2.orig/vsf_findlibs.sh vsftpd-2.1.2/vsf_findlibs.sh ---- vsftpd-2.1.2.orig/vsf_findlibs.sh 2009-05-21 15:43:11.000000000 -0500 -+++ vsftpd-2.1.2/vsf_findlibs.sh 2009-05-31 00:41:38.308704816 -0500 -@@ -6,61 +6,61 @@ - - if find_func hosts_access tcpwrap.o; then - echo "-lwrap"; -- locate_library /lib/libnsl.so && echo "-lnsl"; -+ locate_library /lib64/libnsl.so && echo "-lnsl"; - fi - - # Look for PAM (done weirdly due to distribution bugs (e.g. Debian) or the - # crypt library. - if find_func pam_start sysdeputil.o; then -- locate_library /lib/libpam.so.0 && echo "/lib/libpam.so.0"; -- locate_library /usr/lib/libpam.so && echo "-lpam"; -+ locate_library /lib64/libpam.so.0 && echo "/lib64/libpam.so.0"; -+ locate_library /usr/lib64/libpam.so && echo "-lpam"; - # HP-UX ends shared libraries with .sl -- locate_library /usr/lib/libpam.sl && echo "-lpam"; -+ locate_library /usr/lib64/libpam.sl && echo "-lpam"; - # AIX ends shared libraries with .a -- locate_library /usr/lib/libpam.a && echo "-lpam"; -+ locate_library /usr/lib64/libpam.a && echo "-lpam"; - else -- locate_library /lib/libcrypt.so && echo "-lcrypt"; -- locate_library /usr/lib/libcrypt.so && echo "-lcrypt"; -+ locate_library /lib64/libcrypt.so && echo "-lcrypt"; -+ locate_library /usr/lib64/libcrypt.so && echo "-lcrypt"; - fi - - # Look for the dynamic linker library. Needed by older RedHat when - # you link in PAM --locate_library /lib/libdl.so && echo "-ldl"; -+locate_library /lib64/libdl.so && echo "-ldl"; - - # Look for libsocket. Solaris needs this. --locate_library /lib/libsocket.so && echo "-lsocket"; -+locate_library /lib64/libsocket.so && echo "-lsocket"; - - # Look for libnsl. Solaris needs this. --locate_library /lib/libnsl.so && echo "-lnsl"; -+locate_library /lib64/libnsl.so && echo "-lnsl"; - - # Look for libresolv. Solaris needs this. --locate_library /lib/libresolv.so && echo "-lresolv"; -+locate_library /lib64/libresolv.so && echo "-lresolv"; - - # Look for libutil. Older FreeBSD need this for setproctitle(). --locate_library /usr/lib/libutil.so && echo "-lutil"; -+locate_library /usr/lib64/libutil.so && echo "-lutil"; - - # For older HP-UX... --locate_library /usr/lib/libsec.sl && echo "-lsec"; -+locate_library /usr/lib64/libsec.sl && echo "-lsec"; - - # Look for libcap (capabilities) --if locate_library /lib/libcap.so.1; then -- echo "/lib/libcap.so.1"; --elif locate_library /lib/libcap.so.2; then -- echo "/lib/libcap.so.2"; -+if locate_library /lib64/libcap.so.1; then -+ echo "/lib64/libcap.so.1"; -+elif locate_library /lib64/libcap.so.2; then -+ echo "/lib64/libcap.so.2"; - else -- locate_library /usr/lib/libcap.so && echo "-lcap"; -- locate_library /lib/libcap.so && echo "-lcap"; -+ locate_library /usr/lib64/libcap.so && echo "-lcap"; -+ locate_library /lib64/libcap.so && echo "-lcap"; - fi - - # Solaris needs this for nanosleep().. --locate_library /lib/libposix4.so && echo "-lposix4"; --locate_library /usr/lib/libposix4.so && echo "-lposix4"; -+locate_library /lib64/libposix4.so && echo "-lposix4"; -+locate_library /usr/lib64/libposix4.so && echo "-lposix4"; - - # Tru64 (nanosleep) - locate_library /usr/shlib/librt.so && echo "-lrt"; - - # Solaris sendfile --locate_library /usr/lib/libsendfile.so && echo "-lsendfile"; -+locate_library /usr/lib64/libsendfile.so && echo "-lsendfile"; - - # OpenSSL - if find_func SSL_library_init ssl.o; then diff --git a/source/n/wget/wget.SlackBuild b/source/n/wget/wget.SlackBuild index 23fbe7342..e79de18cc 100755 --- a/source/n/wget/wget.SlackBuild +++ b/source/n/wget/wget.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,17 +21,31 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=1.11.4 -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} +VERSION=${VERSION:-$(echo wget-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -if [ "$ARCH" = "i486" ]; then +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mtune=i686" +elif [ "$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 CWD=$(pwd) @@ -76,6 +90,14 @@ cp -a \ AUTHORS COPYING* MAILING-LIST NEWS PATCHES README* TODO \ $PKG/usr/doc/wget-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/n/whois/whois.SlackBuild b/source/n/whois/whois.SlackBuild index 26baacf8c..589b57dbd 100755 --- a/source/n/whois/whois.SlackBuild +++ b/source/n/whois/whois.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,19 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=4.7.26 -ARCH=${ARCH:-x86_64} +PKGNAM=whois +VERSION=${VERSION:-$(echo ${PKGNAM}_*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)} BUILD=${BUILD:-1} +# Automatically determine architecture for build & packaging: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-whois @@ -42,27 +51,17 @@ find . \ -exec chmod 644 {} \; make || exit +make install install-pos BASEDIR=$PKG || exit 1 -mkdir -p $PKG/usr/bin -cat whois > $PKG/usr/bin/whois -chmod 755 $PKG/usr/bin/whois - -( cd po - make - for n in *.mo ; do \ - l=`basename $n .mo`; \ - /usr/bin/install -c -m 755 -d $PKG/usr/share/locale/$l; \ - /usr/bin/install -c -m 755 -d $PKG/usr/share/locale/$l/LC_MESSAGES; \ - /usr/bin/install -c -m 644 $n $PKG/usr/share/locale/$l/LC_MESSAGES/whois.mo; \ - done -) +mv $PKG/usr/share/man $PKG/usr +gzip -9 $PKG/usr/man/man1/*.1 -mkdir -p $PKG/usr/man/man1 -cat whois.1 | gzip -9c > $PKG/usr/man/man1/whois.1.gz +# Remove mkpasswd stuff: +find $PKG -iname "mkpasswd*" -exec rm -f {} \; mkdir -p $PKG/usr/doc/whois-$VERSION cp -a \ - COPYING* README \ + COPYING README \ $PKG/usr/doc/whois-$VERSION find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/source/n/wireless-tools/scripts/rc.wireless b/source/n/wireless-tools/scripts/rc.wireless index baa148dc7..5d5c4be5b 100644 --- a/source/n/wireless-tools/scripts/rc.wireless +++ b/source/n/wireless-tools/scripts/rc.wireless @@ -48,6 +48,11 @@ # 23/apr/2008 * Pat Volkerding * Increase sleep time after bringing up an # interface to 3 seconds. Some drivers # need this additional time to initalize. +# 02/jan/2010 * Pat Volkerding * Look for /sys/class/net/$NETDEV/wireless rather +# than the contents of /proc/net/wireless to find +# if a network device is wireless. In newer +# kernels devices will not show up in +# /proc/net/wireless until active. # ------------------------------------------------------------------------------ LOGGER=${LOGGER:-cat} @@ -82,7 +87,7 @@ is_wireless_device () #LC_ALL=C $IWPATH/iwconfig $1 2>&1 | \ # grep -Eiq "no wireless extensions|no such device" || return 0 #return 1 - if ! grep `echo ${1}: | cut -f 1 -d :`: /proc/net/wireless 1> /dev/null ; then + if [ ! -d /sys/class/net/${1}/wireless ]; then # no wireless interface return 1 else diff --git a/source/n/wireless-tools/wireless_tools.SlackBuild b/source/n/wireless-tools/wireless_tools.SlackBuild index 049fb47e0..2e78f0f9c 100755 --- a/source/n/wireless-tools/wireless_tools.SlackBuild +++ b/source/n/wireless-tools/wireless_tools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,17 @@ VERSION=29 -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-5} - +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 if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index a38fed35b..b3acc5834 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2004-2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008-2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008-2010 Patrick J. Volkerding, Sebeka, MN, USA # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that # the above copyright notice and this permission notice appear in all @@ -21,10 +21,19 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- -PRGNAM=wpa_supplicant -VERSION=${VERSION:-0.6.9} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +PKGNAM=wpa_supplicant +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 "} @@ -45,6 +54,9 @@ elif [ "$ARCH" = "arm" ]; then elif [ "$ARCH" = "armel" ]; then SLKCFLAGS="-O2 -march=armv4t" LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi # Support for some of the wireless drivers needs the header files of those @@ -59,19 +71,19 @@ BROADCOM_INCLUDES="" CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM rm -rf $PKG mkdir -p $TMP $PKG -if ! [ -f $CWD/${PRGNAM}.defconfig ]; then - echo "Could not find ${PRGNAM}.defconfig!" +if ! [ -f $CWD/${PKGNAM}.defconfig ]; then + echo "Could not find ${PKGNAM}.defconfig!" exit 1 fi 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.?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 \) \ @@ -87,7 +99,7 @@ find . \ cd wpa_supplicant # Create the configuration file for building wpa_supplicant: -cat $CWD/${PRGNAM}.defconfig > .config +cat $CWD/${PKGNAM}.defconfig > .config if [ ! -z $MADWIFI_INCLUDES -a -d $MADWIFI_INCLUDES ]; then echo "Adding madwifi driver (Atheros) support" cat <<-EOT >> .config @@ -162,7 +174,7 @@ done # Install a default configuration file: mkdir -p $PKG/etc cat <<-_EOT_ > $PKG/etc/wpa_supplicant.conf.new - # See /usr/doc/${PRGNAM}-${VERSION}/wpa_supplicant.conf.sample + # See /usr/doc/${PKGNAM}-${VERSION}/wpa_supplicant.conf.sample # for many more options that you can use in this file. # This line enables the use of wpa_cli which is used by rc.wireless @@ -219,11 +231,11 @@ config etc/dbus-1/system.d/dbus-wpa_supplicant.conf.new EOINS # Add the documentation: -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $CWD/README.slackware $PKG/usr/doc/${PRGNAM}-${VERSION}/ -chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/* -chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION/* +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PKGNAM-$VERSION +cp -a $CWD/README.slackware $PKG/usr/doc/${PKGNAM}-${VERSION}/ +chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* +chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION/* # This should only be read/write by root: chmod 600 $PKG/etc/wpa_supplicant.conf.new @@ -244,5 +256,5 @@ fi # Build the package: cd $PKG -/sbin/makepkg -l y -c n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz diff --git a/source/n/yptools/yp-tools-2.12.tar.bz2.sign b/source/n/yptools/yp-tools-2.12.tar.bz2.sign new file mode 100644 index 000000000..a06fde67a --- /dev/null +++ b/source/n/yptools/yp-tools-2.12.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBLzsykyGugalF9Dw4RAtmgAJ4sG0TJzmNkAz7Z+JJFfOjvGlbTGACgir1a ++uaNv6XQNH7Vu+Saqy/OsL8= +=EcSX +-----END PGP SIGNATURE----- diff --git a/source/n/yptools/yp-tools-2.9.tar.bz2.sign b/source/n/yptools/yp-tools-2.9.tar.bz2.sign deleted file mode 100644 index 2eaf4b97d..000000000 --- a/source/n/yptools/yp-tools-2.9.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.1 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBA1tX5yGugalF9Dw4RApxKAJ4wnAJLtV+fLyqydt6C7/jlHI0S+ACeN8d9 -z4e9NxBySBZBdFi8xwGxHTo= -=JakC ------END PGP SIGNATURE----- diff --git a/source/n/yptools/ypbind-mt-1.19.1.tar.bz2.sign b/source/n/yptools/ypbind-mt-1.19.1.tar.bz2.sign deleted file mode 100644 index 183edfaed..000000000 --- a/source/n/yptools/ypbind-mt-1.19.1.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBCyRFDyGugalF9Dw4RAlOUAJ4kDj2kmYi2cVZqf0dLBlwexfqWhwCfTORG -5qMKKLSrKQ8Mx/1l/ffOmDk= -=zaLU ------END PGP SIGNATURE----- diff --git a/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign b/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign new file mode 100644 index 000000000..1e40e59de --- /dev/null +++ b/source/n/yptools/ypbind-mt-1.31.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD4DBQBLE+GAyGugalF9Dw4RAtllAJdwcdicAyMwnl/BtkHP+DnYseD9AJ4vS2ly +HHNnyMFZ2A0tun7/Lt7Psw== +=ob7L +-----END PGP SIGNATURE----- diff --git a/source/n/yptools/ypserv-2.18.tar.bz2.sign b/source/n/yptools/ypserv-2.18.tar.bz2.sign deleted file mode 100644 index 017a6d21c..000000000 --- a/source/n/yptools/ypserv-2.18.tar.bz2.sign +++ /dev/null @@ -1,8 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) -Comment: See http://www.kernel.org/signature.html for info - -iD8DBQBC3lhmyGugalF9Dw4RArUaAJwP88PBcrq6A8W7600Aa1MOIeySugCfW02y -jYf0vlXo93Vs13VQWcCzzo0= -=ZIYE ------END PGP SIGNATURE----- diff --git a/source/n/yptools/ypserv-2.23.tar.bz2.sign b/source/n/yptools/ypserv-2.23.tar.bz2.sign new file mode 100644 index 000000000..9687e760a --- /dev/null +++ b/source/n/yptools/ypserv-2.23.tar.bz2.sign @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) +Comment: See http://www.kernel.org/signature.html for info + +iD8DBQBLg+CRyGugalF9Dw4RAlGVAJ0Sokt5e5bQg6J8Hq4zUyrTY8g2kQCfaNyD +sBJmO9Igqzku/yLWqtU2WKw= +=dTwr +-----END PGP SIGNATURE----- diff --git a/source/n/yptools/yptools.SlackBuild b/source/n/yptools/yptools.SlackBuild index 96f217245..3c98a8e3a 100755 --- a/source/n/yptools/yptools.SlackBuild +++ b/source/n/yptools/yptools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,23 @@ # Package version number: -VERSION=2.9 -ARCH=${ARCH:-x86_64} +VERSION=2.12 BUILD=${BUILD:-1} YPTOOLS=$VERSION -YPBINDMT=1.19.1 +YPBINDMT=1.31 #YPMAKE=0.11 -YPSERV=2.18 +YPSERV=2.23 + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -40,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi CWD=$(pwd) |