initscripts: revert to working 2011.12.1.1

initscripts-live: revert to working 2011.12.1.1
util-linux: revert to revision 1

Note: Last initscript update created to much regressions in our internal testings

initscripts-live/PKGBUILD

@@ -6,8 +6,8 @@
 
 _origname=initscripts
 pkgname=initscripts-live
-pkgver=2012.01
+pkgver=2011.12.1.1
-pkgrel=2
+pkgrel=1
 pkgdesc="System initialization/bootup scripts"
 arch=('i686' 'x86_64')
 url="http://www.chakra-project.org"
@@ -25,16 +25,16 @@ optdepends=('bridge-utils: Network bridging support'
             'wireless_tools: Wireless networking')
 source=("http://chakra.sourceforge.net/sources/${_origname}/${_origname}-${pkgver}.tar.xz"
         'http://chakra.sourceforge.net/sources/initscripts/wireless.conf.d'
-        "http://chakra.sourceforge.net/sources/initscripts/${pkgname}-2012.01-2.patch")
+        "http://chakra.sourceforge.net/sources/initscripts/${pkgname}-2011.12.1-4.patch")
-sha256sums=('e74e0908e37bc3509f94e6455cfb9ab78a283b66701c82e2d0b3e55cd1579922'
+sha256sums=('c4df150201a5194dd0eb0973b53998ae84eaaf7443b3aaefa1f37f4d902d2f90'
             '0eba4250b07e0a727ef64772f5ee9027b123cbd4bb0894ba2842f545035c827f'
-            '85fa01fc71751c4909b5361dfe849396ce318e7287628a119a48d8802705d4cd')
+            '01c28b517af61061dd475f36045fa0ddce93223a63cbc8ecc8bf86cf66feb2be')
 
 package() {
   cd ${srcdir}/chakra-${_origname}
   make DESTDIR=${pkgdir} install
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
   cd ${pkgdir}
-  patch -Np1 -i ${srcdir}/${pkgname}-2012.01-2.patch || return 1
+  patch -Np1 -i ${srcdir}/${pkgname}-2011.12.1-4.patch || return 1
   #rm -v $(find . -type f -name '*.orig')
 }

initscripts/PKGBUILD

@@ -5,8 +5,8 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=initscripts
-pkgver=2012.01
+pkgver=2011.12.1.1
-pkgrel=2
+pkgrel=1
 pkgdesc="System initialization/bootup scripts"
 arch=('i686' 'x86_64')
 url="http://www.chakra-project.org"
@@ -15,14 +15,14 @@ groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless etc/locale.conf)
 depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=174' 'iproute2'
          'ncurses' 'kbd' 'findutils' 'sysvinit')
-optdepends=('bridge-utils: Network bridging support'
+optdepends=('net-tools: legacy networking support'
+            'bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
-            'net-tools: legacy network support'
             'wireless_tools: Wireless networking')
 makedepends=(asciidoc)
+install=initscripts.install
 source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         "http://chakra.sourceforge.net/sources/initscripts/wireless.conf.d")
-install=("${pkgname}.install")
 
 # create tarball: source PKGBUILD && mksource
 
@@ -45,5 +45,5 @@ package() {
   mv ${pkgdir}/etc/profile.d/locale.sh ${pkgdir}/etc/profile.d/locale.sh.new
 }
 
-sha256sums=('e74e0908e37bc3509f94e6455cfb9ab78a283b66701c82e2d0b3e55cd1579922'
+sha256sums=('c4df150201a5194dd0eb0973b53998ae84eaaf7443b3aaefa1f37f4d902d2f90'
             '0eba4250b07e0a727ef64772f5ee9027b123cbd4bb0894ba2842f545035c827f')

util-linux/0001-findmnt-support-alternative-location-of-fstab.patch

@@ -1,77 +0,0 @@
-From d466c6a1fe66603227b3ff73a21a45abd77ee826 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <d@falconindy.com>
-Date: Sun, 11 Dec 2011 13:58:05 -0500
-Subject: [PATCH] findmnt: support alternative location of fstab
-
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- misc-utils/findmnt.8 |    6 ++++--
- misc-utils/findmnt.c |    9 +++++----
- 2 files changed, 9 insertions(+), 6 deletions(-)
-
-diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
-index 24e3a52..7f3dc6c 100644
---- a/misc-utils/findmnt.8
-+++ b/misc-utils/findmnt.8
-@@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default.
- .SH OPTIONS
- .IP "\fB\-h, \-\-help\fP"
- Print help and exit.
--.IP "\fB\-s, \-\-fstab\fP"
-+.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP"
- Search in
- .IR /etc/fstab
- and
- .IR /etc/fstab.d .
--The output is in the list format (see --list).
-+The output is in the list format (see --list). Optionally, search the file
-+specified by
-+.IR fstab .
- .IP "\fB\-m, \-\-mtab\fP"
- Search in
- .IR /etc/mtab .
-diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
-index 4577dc6..5502a87 100644
---- a/misc-utils/findmnt.c
-+++ b/misc-utils/findmnt.c
-@@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
- 
- 	fprintf(out, _(
- 	"\nOptions:\n"
--	" -s, --fstab            search in static table of filesystems\n"
-+	" -s, --fstab[=<fstab>]  search in static table of filesystems\n"
- 	" -m, --mtab             search in table of mounted filesystems\n"
- 	" -k, --kernel           search in kernel table of mounted\n"
-         "                          filesystems (default)\n\n"));
-@@ -839,7 +839,7 @@ int main(int argc, char *argv[])
- 	    { "direction",    1, 0, 'd' },
- 	    { "evaluate",     0, 0, 'e' },
- 	    { "first-only",   0, 0, 'f' },
--	    { "fstab",        0, 0, 's' },
-+	    { "fstab",        2, 0, 's' },
- 	    { "help",         0, 0, 'h' },
- 	    { "invert",       0, 0, 'i' },
- 	    { "kernel",       0, 0, 'k' },
-@@ -872,7 +872,8 @@ int main(int argc, char *argv[])
- 	tt_flags |= TT_FL_TREE;
- 
- 	while ((c = getopt_long(argc, argv,
--				"acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) {
-+				"acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:",
-+				longopts, NULL)) != -1) {
- 		switch(c) {
- 		case 'a':
- 			tt_flags |= TT_FL_ASCII;
-@@ -938,7 +939,7 @@ int main(int argc, char *argv[])
- 		case 's':		/* fstab */
- 			if (tabfile)
- 				errx_mutually_exclusive("--{fstab,mtab,kernel}");
--			tabfile = _PATH_MNTTAB;
-+			tabfile = optarg ? optarg : _PATH_MNTTAB;
- 			tt_flags &= ~TT_FL_TREE;
- 			break;
- 		case 'k':		/* kernel (mountinfo) */
--- 
-1.7.8.1
-

util-linux/PKGBUILD

@@ -1,10 +1,12 @@
-# $Id$
+#
-# Maintainer: Tom Gundersen <teg@jklm.no>
+# Chakra Packages for Chakra, part of chakra-project.org
-# Contributor: judd <jvinet@zeroflux.org>
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=util-linux
 pkgver=2.20.1
-pkgrel=2
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('i686' 'x86_64')
@@ -16,8 +18,7 @@ provides=('linux32' "util-linux-ng=${pkgver}")
 license=('GPL2')
 options=('!libtool')
 #source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2
+source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2)
-	0001-findmnt-support-alternative-location-of-fstab.patch)
 optdepends=('perl: for chkdupexe support')
 
 build() {
@@ -26,9 +27,6 @@ build() {
   # hardware clock
   sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
 
-  # backport patch needed for usr support in initramfs
-  patch -p1 -i ../0001-findmnt-support-alternative-location-of-fstab.patch
-
   ./configure --enable-arch\
               --enable-write\
               --enable-raw\
@@ -46,5 +44,4 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('079b37517fd4e002a2e6e992e8b4e361'
+md5sums=('079b37517fd4e002a2e6e992e8b4e361')
-         '823e2d87885b81f245b8c368e28f8cab')