From 9664bee729d487bcc0a0bc35859f8e13d5421c75 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 26 Sep 2012 01:10:42 +0000 Subject: Slackware 14.0 Wed Sep 26 01:10:42 UTC 2012 Slackware 14.0 x86_64 stable is released! We're perfectionists here at Slackware, so this release has been a long time a-brewing. But we think you'll agree that it was worth the wait. Slackware 14.0 combines modern components, ease of use, and flexible configuration... our "KISS" philosophy demands it. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Thanks to everyone who helped make this happen. The Slackware team, the upstream developers, and (of course) the awesome Slackware user community. Have fun! :-) --- source/n/iproute2/doinst.sh | 1 + source/n/iproute2/fixup-for-x86_64.diff | 12 ++++++ source/n/iproute2/iproute2.SlackBuild | 45 ++++++++++++---------- .../iproute2.fixup_dbpath_and_iptablespath.diff | 34 ---------------- 4 files changed, 37 insertions(+), 55 deletions(-) create mode 100644 source/n/iproute2/fixup-for-x86_64.diff delete mode 100644 source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff (limited to 'source/n/iproute2') diff --git a/source/n/iproute2/doinst.sh b/source/n/iproute2/doinst.sh index 01b82a28e..a283373d2 100644 --- a/source/n/iproute2/doinst.sh +++ b/source/n/iproute2/doinst.sh @@ -10,6 +10,7 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } config etc/iproute2/ematch_map.new +config etc/iproute2/group.new config etc/iproute2/rt_dsfield.new config etc/iproute2/rt_protos.new config etc/iproute2/rt_realms.new diff --git a/source/n/iproute2/fixup-for-x86_64.diff b/source/n/iproute2/fixup-for-x86_64.diff new file mode 100644 index 000000000..3f5e1a239 --- /dev/null +++ b/source/n/iproute2/fixup-for-x86_64.diff @@ -0,0 +1,12 @@ +diff -Nur iproute2-3.4.0.orig/configure iproute2-3.4.0/configure +--- iproute2-3.4.0.orig/configure 2012-05-21 16:12:19.000000000 -0500 ++++ iproute2-3.4.0/configure 2012-05-23 19:15:58.548350916 -0500 +@@ -149,7 +149,7 @@ + check_ipt_lib_dir() + { + IPT_LIB_DIR="" +- for dir in /lib /usr/lib /usr/local/lib ++ for dir in /lib64 /usr/lib64 /usr/local/lib64 + do + for file in $dir/{xtables,iptables}/lib*t_*so ; do + if [ -f $file ]; then diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild index 929aa7b91..9854a2d83 100755 --- a/source/n/iproute2/iproute2.SlackBuild +++ b/source/n/iproute2/iproute2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,10 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Build this against 2.6.x kernel source and headers... - -VERSION=2.6.37 -BUILD=${BUILD:-1} +VERSION=3.4.0 +BUILD=${BUILD:-2} #NUMJOBS=${NUMJOBS:-" -j7 "} @@ -59,7 +57,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf iproute2-$VERSION -tar xvf $CWD/iproute2-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/iproute2-$VERSION.tar.xz || exit 1 cd iproute2-$VERSION chown -R root:root . @@ -69,24 +67,31 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix up path to bdb and iptables libs -zcat $CWD/iproute2.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 +# Fix up path iptables libs +zcat $CWD/fixup-for-x86_64.diff.gz | patch -p1 || exit 1 ./configure # This is okay, really :-) -make $NUMJOBS || exit 1 + +make \ + CCOPTS="$SLKCFLAGS" \ + LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + CONFDIR=/etc/iproute2 \ + DOCDIR=/usr/doc/iproute2-$VERSION \ + MANDIR=/usr/man \ + DBM_INCLUDE=/usr/include/db44 \ + $NUMJOBS || exit 1 + +make install \ + LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + CONFDIR=/etc/iproute2 \ + DOCDIR=/usr/doc/iproute2-$VERSION \ + MANDIR=/usr/man \ + DBM_INCLUDE=/usr/include/db44 \ + DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr 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 # these utilities may be needed to set up that network, so move @@ -100,7 +105,6 @@ mv $PKG/usr/sbin/* $PKG/sbin done ) -mv $PKG/usr/etc $PKG # Don't clobber existing config files for file in $PKG/etc/iproute2/* ; do mv $file ${file}.new @@ -109,8 +113,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 +[ -d $PKG/usr/etc ] && rm -r $PKG/usr/etc 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/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff b/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff deleted file mode 100644 index fe5b1abc4..000000000 --- a/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff +++ /dev/null @@ -1,34 +0,0 @@ -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 -- cgit v1.2.3