From 450817081ed104b8e9030e0f1bcd62f1937189d3 Mon Sep 17 00:00:00 2001 From: Johannes Winkelmann Date: Wed, 1 Oct 2008 10:10:16 +0200 Subject: [PATCH 1/4] util-linux-ng: merge upstream fix to address FS#358 --- util-linux-ng/.md5sum | 1 + util-linux-ng/Pkgfile | 6 ++++-- util-linux-ng/util-linux-ng-2.14.1-mtab.patch | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 util-linux-ng/util-linux-ng-2.14.1-mtab.patch diff --git a/util-linux-ng/.md5sum b/util-linux-ng/.md5sum index 25a6e494..f00fd01b 100644 --- a/util-linux-ng/.md5sum +++ b/util-linux-ng/.md5sum @@ -1 +1,2 @@ +253bf36e58b966128ca225fc691c8091 util-linux-ng-2.14.1-mtab.patch 17bafd53cf242accd716d2306a2c6582 util-linux-ng-2.14.1.tar.gz diff --git a/util-linux-ng/Pkgfile b/util-linux-ng/Pkgfile index 051e3f9b..746a8adb 100644 --- a/util-linux-ng/Pkgfile +++ b/util-linux-ng/Pkgfile @@ -5,11 +5,13 @@ name=util-linux-ng version=2.14.1 -release=1 -source=(http://www.kernel.org/pub/linux/utils/$name/v2.14/$name-$version.tar.gz) +release=2 +source=(http://www.kernel.org/pub/linux/utils/$name/v2.14/$name-$version.tar.gz + $name-$version-mtab.patch) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version-mtab.patch ./configure --prefix=/usr \ --mandir=/usr/man \ --disable-{nls,elvtune,wall} \ diff --git a/util-linux-ng/util-linux-ng-2.14.1-mtab.patch b/util-linux-ng/util-linux-ng-2.14.1-mtab.patch new file mode 100644 index 00000000..3973a1fa --- /dev/null +++ b/util-linux-ng/util-linux-ng-2.14.1-mtab.patch @@ -0,0 +1,17 @@ +--- util-linux-ng-2.14.1.orig/mount/fstab.c 2008-10-01 10:00:15.000000000 +0200 ++++ util-linux-ng-2.14.1/mount/fstab.c 2008-10-01 10:03:09.000000000 +0200 +@@ -30,9 +30,12 @@ + + static void + get_mtab_info(void) { +- struct stat mtab_stat; +- + if (!have_mtab_info) { ++ struct stat mtab_stat; ++ ++ var_mtab_does_not_exist = 0; ++ var_mtab_is_a_symlink = 0; ++ + if (lstat(_PATH_MOUNTED, &mtab_stat)) + var_mtab_does_not_exist = 1; + else if (S_ISLNK(mtab_stat.st_mode)) From d3c5609626cae4822ca91d6ec4706f1b33ea0817 Mon Sep 17 00:00:00 2001 From: Simone Rota Date: Wed, 1 Oct 2008 19:18:22 +0000 Subject: [PATCH 2/4] iproute2: updated to 2.6.26 --- iproute2/.footprint | 7 +++++++ iproute2/.md5sum | 2 +- iproute2/Pkgfile | 10 ++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/iproute2/.footprint b/iproute2/.footprint index 5e8e44f0..ad41db3b 100644 --- a/iproute2/.footprint +++ b/iproute2/.footprint @@ -37,9 +37,16 @@ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/libnetlink.3.gz drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/arpd.8.gz +lrwxrwxrwx root/root usr/man/man8/ctstat.8.gz -> lnstat.8.gz -rw-r--r-- root/root usr/man/man8/ip.8.gz -rw-r--r-- root/root usr/man/man8/lnstat.8.gz +lrwxrwxrwx root/root usr/man/man8/nstat.8.gz -> rtacct.8.gz +lrwxrwxrwx root/root usr/man/man8/routef.8.gz -> routel.8.gz +-rw-r--r-- root/root usr/man/man8/routel.8.gz +-rw-r--r-- root/root usr/man/man8/rtacct.8.gz -rw-r--r-- root/root usr/man/man8/rtmon.8.gz +lrwxrwxrwx root/root usr/man/man8/rtstat.8.gz -> lnstat.8.gz -rw-r--r-- root/root usr/man/man8/ss.8.gz -rw-r--r-- root/root usr/man/man8/tc-bfifo.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq-details.8.gz diff --git a/iproute2/.md5sum b/iproute2/.md5sum index c876764c..3021074e 100644 --- a/iproute2/.md5sum +++ b/iproute2/.md5sum @@ -1,3 +1,3 @@ -20ef2767896a0f156b6fbabd47936f79 iproute2-2.6.22-070710.tar.gz +7d221e735cba05709341cd46401c4ecd iproute2-2.6.26.tar.bz2 ebea778def07e2ca13495117f6e0910e iproute2-netem.patch 0b01b0404718d043adf55cfa314c80bd net.iproute2 diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile index 161b47b0..201b4d63 100644 --- a/iproute2/Pkgfile +++ b/iproute2/Pkgfile @@ -4,15 +4,17 @@ # Packager: Mikhail Kolesnik, mike at openbunker dot org name=iproute2 -version=2.6.22-070710 +version=2.6.26 release=1 -source=(http://developer.osdl.org/dev/iproute2/download/$name-$version.tar.gz \ +source=(http://devresources.linux-foundation.org/dev/iproute2/download/$name-$version.tar.bz2 \ net.iproute2 $name-netem.patch) build() { - patch -p1 < $name-netem.patch + cd $name-$version + patch -p1 < ../$name-netem.patch make KERNEL_INCLUDE="/lib/modules/`uname -r`/source/include" make SBINDIR=/sbin MANDIR=/usr/man DESTDIR=$PKG install - rm -rf $PKG/usr/share + rm -rf $PKG/share install -D -o root -g root -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net + mv $PKG/lib $PKG/usr } From eb2497bed90c5ad8c7ba02bc2410c3226541c36d Mon Sep 17 00:00:00 2001 From: Simone Rota Date: Wed, 1 Oct 2008 19:38:39 +0000 Subject: [PATCH 3/4] iproute2: updated to 2.6.26 --- iproute2/.footprint | 12 +++--------- iproute2/.md5sum | 3 +-- iproute2/Pkgfile | 10 ++++------ iproute2/iproute2-netem.patch | 11 ----------- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 iproute2/iproute2-netem.patch diff --git a/iproute2/.footprint b/iproute2/.footprint index ad41db3b..91a4a6c3 100644 --- a/iproute2/.footprint +++ b/iproute2/.footprint @@ -37,22 +37,16 @@ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/libnetlink.3.gz drwxr-xr-x root/root usr/man/man8/ --rw-r--r-- root/root usr/man/man8/arpd.8.gz -lrwxrwxrwx root/root usr/man/man8/ctstat.8.gz -> lnstat.8.gz -rw-r--r-- root/root usr/man/man8/ip.8.gz -rw-r--r-- root/root usr/man/man8/lnstat.8.gz -lrwxrwxrwx root/root usr/man/man8/nstat.8.gz -> rtacct.8.gz -lrwxrwxrwx root/root usr/man/man8/routef.8.gz -> routel.8.gz --rw-r--r-- root/root usr/man/man8/routel.8.gz --rw-r--r-- root/root usr/man/man8/rtacct.8.gz -rw-r--r-- root/root usr/man/man8/rtmon.8.gz -lrwxrwxrwx root/root usr/man/man8/rtstat.8.gz -> lnstat.8.gz -rw-r--r-- root/root usr/man/man8/ss.8.gz --rw-r--r-- root/root usr/man/man8/tc-bfifo.8.gz +lrwxrwxrwx root/root usr/man/man8/tc-bfifo.8.gz -> tc-pbfifo.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq-details.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq.8.gz -rw-r--r-- root/root usr/man/man8/tc-htb.8.gz -lrwxrwxrwx root/root usr/man/man8/tc-pfifo.8.gz -> tc-bfifo.8.gz +-rw-r--r-- root/root usr/man/man8/tc-pbfifo.8.gz +lrwxrwxrwx root/root usr/man/man8/tc-pfifo.8.gz -> tc-pbfifo.8.gz -rw-r--r-- root/root usr/man/man8/tc-pfifo_fast.8.gz -rw-r--r-- root/root usr/man/man8/tc-prio.8.gz -rw-r--r-- root/root usr/man/man8/tc-red.8.gz diff --git a/iproute2/.md5sum b/iproute2/.md5sum index 3021074e..1be19534 100644 --- a/iproute2/.md5sum +++ b/iproute2/.md5sum @@ -1,3 +1,2 @@ -7d221e735cba05709341cd46401c4ecd iproute2-2.6.26.tar.bz2 -ebea778def07e2ca13495117f6e0910e iproute2-netem.patch +a8fbe5f37e2db79b34f817d43d4cbf8d iproute2-2.6.19-061214.tar.gz 0b01b0404718d043adf55cfa314c80bd net.iproute2 diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile index 201b4d63..1cf818fd 100644 --- a/iproute2/Pkgfile +++ b/iproute2/Pkgfile @@ -4,17 +4,15 @@ # Packager: Mikhail Kolesnik, mike at openbunker dot org name=iproute2 -version=2.6.26 +version=2.6.19-061214 release=1 -source=(http://devresources.linux-foundation.org/dev/iproute2/download/$name-$version.tar.bz2 \ - net.iproute2 $name-netem.patch) +source=(http://developer.osdl.org/dev/iproute2/download/$name-$version.tar.gz \ + net.iproute2) build() { cd $name-$version - patch -p1 < ../$name-netem.patch make KERNEL_INCLUDE="/lib/modules/`uname -r`/source/include" make SBINDIR=/sbin MANDIR=/usr/man DESTDIR=$PKG install - rm -rf $PKG/share + rm -rf $PKG/usr/share install -D -o root -g root -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net - mv $PKG/lib $PKG/usr } diff --git a/iproute2/iproute2-netem.patch b/iproute2/iproute2-netem.patch deleted file mode 100644 index 6b8e593d..00000000 --- a/iproute2/iproute2-netem.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru netem.orig/tc/Makefile netem/tc/Makefile ---- netem.orig/tc/Makefile 2007-10-11 23:56:11.348686771 +0200 -+++ netem/tc/Makefile 2007-10-11 23:58:27.436441970 +0200 -@@ -46,6 +46,7 @@ - CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB - - TCSO := -+TCSO += q_netem.so - ifeq ($(TC_CONFIG_ATM),y) - TCSO += q_atm.so - endif From 30d954b16980b520684c8dc7c88c73c47d5c7e38 Mon Sep 17 00:00:00 2001 From: Simone Rota Date: Wed, 1 Oct 2008 21:24:33 +0000 Subject: [PATCH 4/4] iproute2: restored 2.6.26 --- iproute2/.footprint | 12 +++++++++--- iproute2/.md5sum | 3 ++- iproute2/Pkgfile | 10 ++++++---- iproute2/iproute2-netem.patch | 11 +++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100644 iproute2/iproute2-netem.patch diff --git a/iproute2/.footprint b/iproute2/.footprint index 91a4a6c3..ad41db3b 100644 --- a/iproute2/.footprint +++ b/iproute2/.footprint @@ -37,16 +37,22 @@ drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man3/ -rw-r--r-- root/root usr/man/man3/libnetlink.3.gz drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/arpd.8.gz +lrwxrwxrwx root/root usr/man/man8/ctstat.8.gz -> lnstat.8.gz -rw-r--r-- root/root usr/man/man8/ip.8.gz -rw-r--r-- root/root usr/man/man8/lnstat.8.gz +lrwxrwxrwx root/root usr/man/man8/nstat.8.gz -> rtacct.8.gz +lrwxrwxrwx root/root usr/man/man8/routef.8.gz -> routel.8.gz +-rw-r--r-- root/root usr/man/man8/routel.8.gz +-rw-r--r-- root/root usr/man/man8/rtacct.8.gz -rw-r--r-- root/root usr/man/man8/rtmon.8.gz +lrwxrwxrwx root/root usr/man/man8/rtstat.8.gz -> lnstat.8.gz -rw-r--r-- root/root usr/man/man8/ss.8.gz -lrwxrwxrwx root/root usr/man/man8/tc-bfifo.8.gz -> tc-pbfifo.8.gz +-rw-r--r-- root/root usr/man/man8/tc-bfifo.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq-details.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq.8.gz -rw-r--r-- root/root usr/man/man8/tc-htb.8.gz --rw-r--r-- root/root usr/man/man8/tc-pbfifo.8.gz -lrwxrwxrwx root/root usr/man/man8/tc-pfifo.8.gz -> tc-pbfifo.8.gz +lrwxrwxrwx root/root usr/man/man8/tc-pfifo.8.gz -> tc-bfifo.8.gz -rw-r--r-- root/root usr/man/man8/tc-pfifo_fast.8.gz -rw-r--r-- root/root usr/man/man8/tc-prio.8.gz -rw-r--r-- root/root usr/man/man8/tc-red.8.gz diff --git a/iproute2/.md5sum b/iproute2/.md5sum index 1be19534..3021074e 100644 --- a/iproute2/.md5sum +++ b/iproute2/.md5sum @@ -1,2 +1,3 @@ -a8fbe5f37e2db79b34f817d43d4cbf8d iproute2-2.6.19-061214.tar.gz +7d221e735cba05709341cd46401c4ecd iproute2-2.6.26.tar.bz2 +ebea778def07e2ca13495117f6e0910e iproute2-netem.patch 0b01b0404718d043adf55cfa314c80bd net.iproute2 diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile index 1cf818fd..201b4d63 100644 --- a/iproute2/Pkgfile +++ b/iproute2/Pkgfile @@ -4,15 +4,17 @@ # Packager: Mikhail Kolesnik, mike at openbunker dot org name=iproute2 -version=2.6.19-061214 +version=2.6.26 release=1 -source=(http://developer.osdl.org/dev/iproute2/download/$name-$version.tar.gz \ - net.iproute2) +source=(http://devresources.linux-foundation.org/dev/iproute2/download/$name-$version.tar.bz2 \ + net.iproute2 $name-netem.patch) build() { cd $name-$version + patch -p1 < ../$name-netem.patch make KERNEL_INCLUDE="/lib/modules/`uname -r`/source/include" make SBINDIR=/sbin MANDIR=/usr/man DESTDIR=$PKG install - rm -rf $PKG/usr/share + rm -rf $PKG/share install -D -o root -g root -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net + mv $PKG/lib $PKG/usr } diff --git a/iproute2/iproute2-netem.patch b/iproute2/iproute2-netem.patch new file mode 100644 index 00000000..6b8e593d --- /dev/null +++ b/iproute2/iproute2-netem.patch @@ -0,0 +1,11 @@ +diff -Nru netem.orig/tc/Makefile netem/tc/Makefile +--- netem.orig/tc/Makefile 2007-10-11 23:56:11.348686771 +0200 ++++ netem/tc/Makefile 2007-10-11 23:58:27.436441970 +0200 +@@ -46,6 +46,7 @@ + CFLAGS += -DCONFIG_GACT -DCONFIG_GACT_PROB + + TCSO := ++TCSO += q_netem.so + ifeq ($(TC_CONFIG_ATM),y) + TCSO += q_atm.so + endif