Merge http://projects.parabolagnulinux.org/abslibre

4 files changed, 20 insertions, 23 deletions

diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 886f106ff..0d7c0b367 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,36 +1,31 @@
-# $Id: PKGBUILD 100111 2010-11-20 11:25:37Z pierre $
+# $Id: PKGBUILD 120250 2011-04-21 17:00:05Z ibiru $
+# Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2011.02.1
-pkgrel=1
+pkgver=2011.04.1
+pkgrel=1.1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('i686' 'x86_64')
 url="http://parabolagnulinux.org"
-license=('GPL')
+license=('GPL2')
 groups=('base')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
-depends=('bash' 'awk' 'grep' 'coreutils' 'sed' 'udev'
+depends=('bash' 'grep' 'coreutils' 'udev'
          'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit')
 optdepends=('bridge-utils: Network bridging support'
             'dhcpcd: DHCP network configuration'
             'wireless_tools: Wireless networking')
 install=initscripts.install
-source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
-        'wireless.conf.d'
-        'parabola-branding.patch')
-md5sums=('22dcf8fc052deef0894d5caa0981419a'
-         '027576534885b8d5dded9be546057b12'
-         '030deb770293ea5a1e632934095af412')
+source=("http://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
+        'wireless.conf.d')
+md5sums=('9c9cca84f5601700f3f1d0303aa1e058'
+         '027576534885b8d5dded9be546057b12')
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-
-  msg2 "Rebranding for Parabola"
-  patch -Np1 -i ${srcdir}/parabola-branding.patch
-
   DESTDIR=${pkgdir} ./install.sh
   install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index 22b381db4..89af2e32b 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil
 
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.38
-pkgver=${_basekernel}.3
+pkgver=${_basekernel}.4
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
 _patchname="patch-${pkgver}-${pkgrel}-LIBRE"
@@ -241,9 +241,9 @@ find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('ecc5aa47bbb433e48abade02824ba6ac'
-         '32053f02a898803ea9cf8cc7106473db'
-         'b7b18adb9de35b4ecb4d8724f27a2924'
-         '25c5f33e6b086fcc2020f8b85a63e1c3'
+md5sums=('0f1a5d184d4029c9d9b38a4b9407c392'
+         '8395aac2f31718b45afe57794c21ab81'
+         'a6b673aead69b12f50b8ca53d1f14b14'
+         'fa7d6abea1e2163b1ab2b1acfe117f51'
          '25584700a0a679542929c4bed31433b6'
          '2d68b4cf4caedd1f0188f4877eca1d43')
diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686
index a8c4d4703..2269fd1d3 100644
--- a/libre/kernel26-libre/config.i686
+++ b/libre/kernel26-libre/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.38 Kernel Configuration
-# Sun Apr 17 12:35:51 2011
+# Fri Apr 22 17:32:05 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -5320,6 +5320,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_KMEMCHECK is not set
+CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y
diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index d98f24533..d89904aa7 100644
--- a/libre/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/x86_64 2.6.38 Kernel Configuration
-# Sun Apr 17 14:31:49 2011
+# Fri Apr 22 19:25:29 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -5061,6 +5061,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_HAVE_ARCH_KMEMCHECK=y
 # CONFIG_KMEMCHECK is not set
+CONFIG_TEST_KSTRTOX=m
 CONFIG_STRICT_DEVMEM=y
 CONFIG_X86_VERBOSE_BOOTUP=y
 CONFIG_EARLY_PRINTK=y