From a5c2e73ba30c769148056635676165a4265eac83 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 28 Jul 2012 00:02:21 +0000 Subject: Sat Jul 28 00:02:21 UTC 2012 --- core/dnsutils/PKGBUILD | 8 ++++---- core/systemd/PKGBUILD | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'core') diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index 9fc510129..50549af98 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161356 2012-06-10 08:42:42Z bisson $ +# $Id: PKGBUILD 164066 2012-07-26 15:21:23Z bisson $ # Maintainer: Gaetan Bisson # Contributor: kevin # Contributor: mario @@ -6,8 +6,8 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.1.P1 -_pkgver=9.9.1-P1 +pkgver=9.9.1.P2 +_pkgver=9.9.1-P2 pkgrel=1 pkgdesc='DNS utilities: dig host nslookup' @@ -18,7 +18,7 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' +sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7' 'b465ef6160b004838f04de9978fe1be8422af777') replaces=('bind-tools' 'host') diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 338fd8f94..d677cfcda 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=186 +pkgver=187 pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -17,7 +17,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' 'locale.sh') -md5sums=('17eff1d31e6e49bf82e129fe57efd59b' +md5sums=('26606e3c84448800ef0b3ffd57e6e8b6' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' @@ -52,10 +52,10 @@ package_systemd() { pkgdesc="system and service manager" depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('python-dbus: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' + optdepends=('initscripts: legacy support for hostname and vconsole setup' 'initscripts-systemd: legacy generator for initialization scripts' - 'python-cairo: systemd-analyze' + 'python2-cairo: systemd-analyze' + 'python2-dbus: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -87,6 +87,10 @@ package_systemd() { rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + # fix systemd-analyze for python2. the 'plot' verb does not work + # with py3k due to a bug in python-cairo + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + ### split off libsystemd (libs, includes, pkgconfig, man3) rm -rf "$srcdir/_libsystemd" install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} @@ -137,7 +141,7 @@ package_systemd() { mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8 mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5 + mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd } -- cgit v1.2.3-54-g00ecf