initscripts-2011.02.1-1

2 files changed, 41 insertions, 28 deletions

diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index 565d22f5d..886f106ff 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -4,8 +4,8 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2010.07
-pkgrel=3
+pkgver=2011.02.1
+pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('i686' 'x86_64')
 url="http://parabolagnulinux.org"
@@ -18,15 +18,15 @@ 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}-1.tar.xz"
+source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz"
         'wireless.conf.d'
         'parabola-branding.patch')
-md5sums=('0cea15a64d999d0e1aa0c4bb4dbd1af8'
+md5sums=('22dcf8fc052deef0894d5caa0981419a'
          '027576534885b8d5dded9be546057b12'
-         'b883c986aa8bdb8ca7b16a05e115db1d')
+         '030deb770293ea5a1e632934095af412')
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}-1
+  cd ${srcdir}/${pkgname}-${pkgver}
 
   msg2 "Rebranding for Parabola"
   patch -Np1 -i ${srcdir}/parabola-branding.patch
diff --git a/libre/initscripts/parabola-branding.patch b/libre/initscripts/parabola-branding.patch
index 028e687ab..a309f9a4c 100644
--- a/libre/initscripts/parabola-branding.patch
+++ b/libre/initscripts/parabola-branding.patch
@@ -1,18 +1,33 @@
-diff -auN initscripts-2010.07-1/functions initscripts-2010.07-1-parabola//functions
---- initscripts-2010.07-1/functions	2010-07-05 20:41:12.000000000 -0300
-+++ initscripts-2010.07-1-parabola//functions	2011-02-21 13:10:40.097545657 -0300
-@@ -54,7 +54,7 @@
- # colors:
- if [ "$USECOLOR" = "YES" -o "$USECOLOR" = "yes" ]; then
+diff -auN initscripts-2011.02.1/PKGBUILD initscripts-2011.02.1-parabola//PKGBUILD
+--- initscripts-2011.02.1/PKGBUILD	2011-02-01 15:34:45.000000000 -0300
++++ initscripts-2011.02.1-parabola//PKGBUILD	2011-02-28 11:06:11.000000000 -0300
+@@ -1,9 +1,9 @@
+ pkgname=initscripts-git
+ pkgver=$(date +%s)
+ pkgrel=$(git log --pretty=format:%h |head -n 1)
+-pkgdesc="System initialization/bootup scripts"
++pkgdesc="System initialization/bootup scripts, rebranded for Parabola"
+ arch=('i686' 'x86_64')
+-url="http://www.archlinux.org"
++url="http://parabolagnulinux.org"
+ license=('GPL')
+ groups=('base')
+ conflicts=('initscripts')
+diff -auN initscripts-2011.02.1/functions initscripts-2011.02.1-parabola//functions
+--- initscripts-2011.02.1/functions	2011-02-01 15:34:45.000000000 -0300
++++ initscripts-2011.02.1-parabola//functions	2011-02-28 11:13:46.000000000 -0300
+@@ -53,7 +53,7 @@
+ if [[ $USECOLOR = YES || $USECOLOR = yes ]]; then
  	C_MAIN="\033[1;37;40m"      # main text
+ 
 -	C_OTHER="\033[1;34;40m"     # prefix & brackets
-+	C_OTHER="\033[1;35;40m"     # prefix & brackets
++	C_OTHER="\033[0;35;40m"     # prefix & brackets
  	C_SEPARATOR="\033[1;30;40m" # separator
  
  	C_BUSY="\033[0;36;40m"      # busy
-diff -auN initscripts-2010.07-1/rc.conf initscripts-2010.07-1-parabola//rc.conf
---- initscripts-2010.07-1/rc.conf	2010-07-05 20:41:12.000000000 -0300
-+++ initscripts-2010.07-1-parabola//rc.conf	2011-02-21 13:11:43.844641708 -0300
+diff -auN initscripts-2011.02.1/rc.conf initscripts-2011.02.1-parabola//rc.conf
+--- initscripts-2011.02.1/rc.conf	2011-02-01 15:34:45.000000000 -0300
++++ initscripts-2011.02.1-parabola//rc.conf	2011-02-28 11:06:37.000000000 -0300
 @@ -1,5 +1,5 @@
  #
 -# /etc/rc.conf - Main Configuration for Arch Linux
@@ -20,20 +35,18 @@ diff -auN initscripts-2010.07-1/rc.conf initscripts-2010.07-1-parabola//rc.conf
  #
  
  # -----------------------------------------------------------------------
-diff -auN initscripts-2010.07-1/rc.sysinit initscripts-2010.07-1-parabola//rc.sysinit
---- initscripts-2010.07-1/rc.sysinit	2010-07-05 20:41:12.000000000 -0300
-+++ initscripts-2010.07-1-parabola//rc.sysinit	2011-02-21 13:11:43.847975064 -0300
-@@ -7,8 +7,11 @@
+diff -auN initscripts-2011.02.1/rc.sysinit initscripts-2011.02.1-parabola//rc.sysinit
+--- initscripts-2011.02.1/rc.sysinit	2011-02-01 15:34:45.000000000 -0300
++++ initscripts-2011.02.1-parabola//rc.sysinit	2011-02-28 11:08:29.000000000 -0300
+@@ -7,8 +7,9 @@
  . /etc/rc.d/functions
  
  echo " "
 -printhl "Arch Linux\n"
 -printhl "${C_H2}http://www.archlinux.org"
-+printhl "Parabola GNU/Linux-Libre"
-+printhl "${C_H2}http://parabolagnulinux.org"
-+printhl "Copyright 2009-2011 The Parabola Project"
-+printsep
-+printhl "You're booting into a libre version of Arch Linux\n"
- printhl "Copyright 2002-2007 Judd Vinet"
- printhl "Copyright 2007-2010 Aaron Griffin"
- printhl "Distributed under the GNU General Public License (GPL)"
++printhl "Parabola GNU/Linux-Libre\n"
++printhl "${C_H2}http://parabolagnulinux.org\n"
++printhl "You're booting into a libre version of Archlinux."
+ printsep
+ 
+ run_hook sysinit_start