summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-05 14:39:56 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-05 14:39:56 -0300
commitd3d017afff0ed1a1f364fd610c17e35bebc08535 (patch)
tree55cd995717c6cf32d5f8fcb0ea2a174f1d441ba3
parent8d460a3e2670da093d1619a84ca908c5ed2b163e (diff)
parent7b83bedb351161a20b3aa124280a9ecea7ff419f (diff)
downloadabslibre-d3d017afff0ed1a1f364fd610c17e35bebc08535.tar.gz
abslibre-d3d017afff0ed1a1f364fd610c17e35bebc08535.tar.bz2
abslibre-d3d017afff0ed1a1f364fd610c17e35bebc08535.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rwxr-xr-xlibre/initscripts/PKGBUILD15
-rw-r--r--libre/initscripts/split-hwclock-calls.diff21
-rw-r--r--social/netatalk/PKGBUILD6
3 files changed, 33 insertions, 9 deletions
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index cde66e1db..1f68a6356 100755
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 164178 2012-07-26 23:40:45Z tomegun $
+# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Thomas Bächler <thomas@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
pkgname=initscripts
-pkgver=2012.09.1
+pkgver=2012.10.5
pkgrel=1
pkgdesc="System initialization/bootup scripts (Parabola branding)"
arch=('any')
@@ -16,21 +16,22 @@ provides=('initscripts-systemd')
conflicts=('initscripts-systemd')
replaces=('initscripts-systemd')
backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
-depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit')
+depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
optdepends=('dhcpcd: DHCP network configuration'
'bridge-utils: Legacy network bridging support'
'net-tools: Legacy network support'
- 'wireless_tools: Legacy wireless networking')
+ 'wireless_tools: Legacy wireless networking'
+ 'sysvinit: Legacy init support')
makedepends=(asciidoc)
install=initscripts.install
source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
package() {
cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- # moved to filesystem
- rm -rf ${pkgdir}/etc/profile.d
+ make DESTDIR=${pkgdir} install
}
md5sums=('16039aeb4c996194d9466a8c66a06f5a'
'522804c7981c32c3c779964844d64377')
+md5sums=('3be94446496bda58051141e0d3863a7b'
+ '3f03d3a5c7d8b7e1ddebb13334441440')
diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff
new file mode 100644
index 000000000..c0a6a4fd6
--- /dev/null
+++ b/libre/initscripts/split-hwclock-calls.diff
@@ -0,0 +1,21 @@
+diff --git a/rc.sysinit b/rc.sysinit
+index eb49e2b..8f9727b 100755
+--- a/rc.sysinit
++++ b/rc.sysinit
+@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
+
+ run_hook sysinit_start
+
+-HWCLOCK_PARAMS="--systz"
+ case $HARDWARECLOCK in
+ "") ;;
+ UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
+@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
+
+ [[ $TIMEZONE ]] && export TZ=$TIMEZONE
+
+- hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
++ { hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail
+
+ unset TZ
+ fi
diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD
index 98e64982d..7e2fe14aa 100644
--- a/social/netatalk/PKGBUILD
+++ b/social/netatalk/PKGBUILD
@@ -6,8 +6,8 @@
# Contributor: Farhan Yousaf <farhany at xaviya dot com>
pkgname=netatalk
-pkgver=3.0
-pkgrel=4
+pkgver=3.0.1
+pkgrel=1
pkgdesc='Open Source AFP fileserver'
arch=('i686' 'x86_64')
url='http://netatalk.sourceforge.net'
@@ -54,3 +54,5 @@ package() {
msg2 'Copying initscripts...'
install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk
}
+md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
+ 'b4f5c932b2ca99f5292bd6b6d69b3ebc')