From 434d4fd444e83727cfc6ef7d23dcce3aab8fbe27 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 30 Oct 2011 01:48:38 -0300 Subject: libre/initscripts-2011.10.3-1 --- libre/initscripts/PKGBUILD | 15 ++++----- libre/initscripts/initscripts.install | 8 +++++ libre/initscripts/parabola-branding.patch | 52 ------------------------------- 3 files changed, 16 insertions(+), 59 deletions(-) delete mode 100644 libre/initscripts/parabola-branding.patch (limited to 'libre/initscripts') diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index a6a3abecb..497078dbf 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -1,32 +1,33 @@ -# $Id: PKGBUILD 120250 2011-04-21 17:00:05Z ibiru $ +# $Id: PKGBUILD 140751 2011-10-18 16:38:38Z tomegun $ # Maintainer: Tom Gundersen # Maintainer: Thomas Bächler # Maintainer: Aaron Griffin # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2011.06.4 -pkgrel=2 +pkgver=2011.10.3 +pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') url="http://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2' +depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=173' 'iproute2' 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'net-tools: legacy network support' 'wireless_tools: Wireless networking') +makedepends=(asciidoc) install=initscripts.install -source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" +source=("https://projects.parabolagnulinux.org/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.gz" 'wireless.conf.d') -md5sums=('df73e4c4043d4eaf6502ca6738c549aa' - '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } +md5sums=('4783d7297925bc0722367b0eed8cb53a' + '027576534885b8d5dded9be546057b12') diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install index 56f69248a..963713bee 100644 --- a/libre/initscripts/initscripts.install +++ b/libre/initscripts/initscripts.install @@ -8,4 +8,12 @@ post_upgrade() { echo "Blacklisting of modules is no longer supported in rc.conf," echo "please add blacklist entries to /etc/modprobe.d/ instead." fi + if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then + echo "VERBOSE= in rc.conf no longer has any effect." + echo "Please append 'quiet' to your kernel command line." + fi + if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then + echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf," + echo "as LOCALE in /etc/rc.conf no longer works." + fi } diff --git a/libre/initscripts/parabola-branding.patch b/libre/initscripts/parabola-branding.patch deleted file mode 100644 index a309f9a4c..000000000 --- a/libre/initscripts/parabola-branding.patch +++ /dev/null @@ -1,52 +0,0 @@ -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[0;35;40m" # prefix & brackets - C_SEPARATOR="\033[1;30;40m" # separator - - C_BUSY="\033[0;36;40m" # busy -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 -+# /etc/rc.conf - Main Configuration for Parabola GNU/Linux-Libre - # - - # ----------------------------------------------------------------------- -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\n" -+printhl "${C_H2}http://parabolagnulinux.org\n" -+printhl "You're booting into a libre version of Archlinux." - printsep - - run_hook sysinit_start -- cgit v1.2.3