From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 25 Apr 2011 13:37:00 +0000 Subject: Slackware 13.37 Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. 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. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun! --- ...oute2-2.6.33-fixup_dbpath_and_iptablespath.diff | 34 ---------------------- source/n/iproute2/iproute2.SlackBuild | 14 +++++++-- .../iproute2.fixup_dbpath_and_iptablespath.diff | 34 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 37 deletions(-) delete mode 100644 source/n/iproute2/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff create mode 100644 source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff (limited to 'source/n/iproute2') 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 deleted file mode 100644 index fe5b1abc..00000000 --- a/source/n/iproute2/iproute2-2.6.33-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 diff --git a/source/n/iproute2/iproute2.SlackBuild b/source/n/iproute2/iproute2.SlackBuild index d9e8622c..929aa7b9 100755 --- a/source/n/iproute2/iproute2.SlackBuild +++ b/source/n/iproute2/iproute2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # Build this against 2.6.x kernel source and headers... -VERSION=2.6.33 +VERSION=2.6.37 BUILD=${BUILD:-1} #NUMJOBS=${NUMJOBS:-" -j7 "} @@ -70,7 +70,7 @@ find . \ -exec chmod 644 {} \; # Fix up path to bdb and iptables libs -zcat $CWD/iproute2-2.6.33-fixup_dbpath_and_iptablespath.diff.gz | sed \ +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 @@ -134,6 +134,14 @@ mkdir -p $PKG/usr/doc/iproute2-$VERSION cp -a COPYING RE* \ $PKG/usr/doc/iproute2-$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 diff --git a/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff b/source/n/iproute2/iproute2.fixup_dbpath_and_iptablespath.diff new file mode 100644 index 00000000..fe5b1abc --- /dev/null +++ b/source/n/iproute2/iproute2.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 -- cgit v1.2.3