summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/bluez/PKGBUILD6
-rw-r--r--extra/gcin/PKGBUILD6
-rw-r--r--extra/gpsd/PKGBUILD10
-rw-r--r--extra/kexec-tools/PKGBUILD8
-rw-r--r--extra/libgpod/PKGBUILD6
-rw-r--r--extra/libmtp/PKGBUILD6
-rw-r--r--extra/libpng/PKGBUILD14
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--extra/lm_sensors/PKGBUILD7
-rw-r--r--extra/system-config-printer/PKGBUILD12
-rw-r--r--extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch28
-rw-r--r--extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch156
-rw-r--r--extra/systemd/PKGBUILD41
-rw-r--r--extra/systemd/systemd.install5
-rw-r--r--extra/udisks/PKGBUILD7
15 files changed, 263 insertions, 55 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index e86a685f8..e63cd2c66 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 152640 2012-03-07 16:41:27Z tomegun $
+# $Id: PKGBUILD 155739 2012-04-06 00:05:49Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
pkgname=bluez
pkgver=4.99
-pkgrel=1
+pkgrel=2
pkgdesc="Libraries and tools for the Bluetooth protocol stack"
url="http://www.bluez.org/"
arch=('i686' 'x86_64')
@@ -77,7 +77,7 @@ package() {
"${pkgdir}"/usr/bin/bluez-test-input
# http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
- rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules
+ rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules
}
md5sums=('2387053eb5a7b02f37df4871df022a02'
'7412982b440f29fa7f76a41a87fef985'
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 48e4c6768..5c0882c7a 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 152120 2012-03-04 22:38:13Z bisson $
+# $Id: PKGBUILD 155697 2012-04-05 08:34:14Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=gcin
-pkgver=2.7.5
+pkgver=2.7.6.1
pkgrel=1
pkgdesc='Input method server supporting various input methods'
url='http://hyperrate.com/dir.php?eid=67'
@@ -18,7 +18,7 @@ optdepends=('qt: support for qt4 input method'
'libchewing: support for chewing input method')
source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz"
'qt4.patch')
-sha1sums=('5b480965985616beb972d8fc32f90cc173c72264'
+sha1sums=('02319cceb5ed56d22193de0bf1f59bab9e4ab3ab'
'1c6cdcaa218615e53869bb9d67d7f9d2141e86fe')
install=install
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index bf665d310..9d0e5dc2e 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150180 2012-02-14 08:19:26Z andrea $
+# $Id: PKGBUILD 155741 2012-04-06 00:05:51Z tomegun $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
pkgname=gpsd
pkgver=3.4
-pkgrel=1
+pkgrel=2
pkgdesc="GPS daemon and library to support USB/serial GPS devices"
arch=('i686' 'x86_64')
url="http://catb.org/gpsd/"
@@ -16,7 +16,7 @@ optdepends=('php: generate a PHP status page for your GPS'
'php-gd: image support for the PHP status page'
'pygtk: GUI frontends')
makedepends=('scons' 'docbook-xsl' 'chrpath')
-backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules')
+backup=('etc/conf.d/gpsd')
options=('!libtool')
install="${pkgname}.install"
source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
@@ -54,10 +54,10 @@ package() {
install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
- install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules"
+ install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
- install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug"
+ install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
# GPSD needs RPATH
chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD
index e8e5ccdb1..df3615600 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 136323 2011-08-26 10:46:24Z tpowa $
+# $Id: PKGBUILD 155721 2012-04-05 13:08:48Z dreisner $
# Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kexec-tools
pkgver=2.0.2
-pkgrel=4
+pkgrel=5
pkgdesc="Load another kernel from the currently executing Linux kernel"
arch=('i686' 'x86_64')
url="http://kernel.org/pub/linux/utils/kernel/kexec/"
@@ -12,8 +12,7 @@ source=("http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.ta
'kexec-tools-2.0.0-purgatory-makefile.patch'
'kexec'
'kexec.conf.d')
-depends=('gawk')
-makedepends=('zlib' 'xz')
+depends=('gawk' 'zlib' 'xz')
backup=('etc/conf.d/kexec')
license=('GPL2')
md5sums=('35d05fed1c97008ac34c5bfb929295eb'
@@ -23,7 +22,6 @@ md5sums=('35d05fed1c97008ac34c5bfb929295eb'
build() {
cd $srcdir/$pkgname-$pkgver
- export LDFLAGS+=" -static"
patch -Np1 -i ../kexec-tools-2.0.0-purgatory-makefile.patch
./configure --prefix=/usr
make
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index d37438633..6096bee43 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 148826 2012-02-05 11:51:56Z ibiru $
+# $Id: PKGBUILD 155743 2012-04-06 00:05:54Z tomegun $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=libgpod
pkgver=0.8.2
-pkgrel=3
+pkgrel=4
pkgdesc="A shared library to access the contents of an iPod"
arch=(i686 x86_64)
license=('LGPL')
@@ -18,7 +18,7 @@ md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
+ ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
--enable-udev --with-python=/usr/bin/python2
make PREFIX=/usr
}
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index 5631f21e2..e7d7fb122 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153576 2012-03-16 05:45:45Z eric $
+# $Id: PKGBUILD 155745 2012-04-06 00:05:58Z tomegun $
# Contributor: damir <damir@archlinux.org>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
pkgname=libmtp
pkgver=1.1.2
-pkgrel=1
+pkgrel=2
pkgdesc="Library implementation of the Media Transfer Protocol"
arch=("i686" "x86_64")
url="http://libmtp.sourceforge.net"
@@ -16,7 +16,7 @@ md5sums=('6dc708757e3fd3ccce7445b4f2171263')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --with-udev=/usr/lib/udev
make
}
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index d9e496b3d..7563f5316 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 150693 2012-02-20 11:05:39Z ibiru $
+# $Id: PKGBUILD 155695 2012-04-05 07:31:28Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.5.9
-_apngver=1.5.9
+pkgver=1.5.10
+_apngver=1.5.10
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64')
@@ -16,11 +16,11 @@ depends=('zlib' 'sh')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
"http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('05d9ab3705c34954c0032b71318b678a'
- '268f7db97b292d5f14a24ea7940f6f1c')
+md5sums=('9c2ac3c3a31de2ab867875718f8de18e'
+ '88517ab0e9c0be2590800116e2b50c8d')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
# Add animated PNG (apng) support
# see http://sourceforge.net/projects/libpng-apng/
@@ -31,7 +31,7 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
cd contrib/pngminus
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index fe279d92c..090556f7b 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154061 2012-03-22 12:43:43Z giovanni $
+# $Id: PKGBUILD 155693 2012-04-05 06:04:51Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2012.03.22
+pkgver=2012.04.04
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
url="http://live555.com/liveMedia"
depends=('gcc-libs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('95d757a15026eb1c91556b80a18193ee')
+md5sums=('25ad098a6e4a2e329ca6295a9ba27074')
build() {
cd ${srcdir}/live
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index 3603e4b81..e2463836e 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 153558 2012-03-16 01:14:35Z eric $
+# $Id: PKGBUILD 155754 2012-04-06 00:24:13Z dreisner $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=lm_sensors
pkgver=3.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
arch=('i686' 'x86_64')
url="http://www.lm-sensors.org/"
@@ -32,6 +32,7 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
-e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
+ sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
patch -p1 < ../daemonarg.patch
patch -p0 < ../linux_3.0.patch
make PREFIX=/usr
@@ -41,7 +42,7 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
- install -D -m644 prog/init/lm_sensors.service "${pkgdir}/lib/systemd/system/lm_sensors.service"
+ install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 438e17816..a34978cfa 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 154448 2012-03-28 18:31:41Z andrea $
+# $Id: PKGBUILD 155747 2012-04-06 00:06:00Z tomegun $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=system-config-printer
pkgname=('system-config-printer-common'
'system-config-printer-gnome')
pkgver=1.3.9
-pkgrel=1
+pkgrel=2
pkgdesc="A CUPS printer configuration tool and status applet"
url="http://cyberelk.net/tim/software/system-config-printer/"
arch=('i686' 'x86_64')
@@ -33,7 +33,7 @@ build() {
package_system-config-printer-common() {
pkgdesc='Pygtk CUPS Configuration'
- depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl')
+ depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat')
optdepends=('system-config-printer-gnome: for the GTK frontend'
'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
replaces=('system-config-printer')
@@ -64,11 +64,11 @@ package_system-config-printer-common() {
install -d "${pkgdir}"/etc/cupshelpers/
install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
- install -d "${pkgdir}"/lib/udev/rules.d
+ install -d "${pkgdir}"/usr/lib/udev/rules.d
install -m755 udev/{udev-add-printer,udev-configure-printer} \
- "${pkgdir}"/lib/udev/
+ "${pkgdir}"/usr/lib/udev/
install -m644 udev/70-printers.rules \
- "${pkgdir}"/lib/udev/rules.d
+ "${pkgdir}"/usr/lib/udev/rules.d
for file in build/lib/cupshelpers/*.py; do
install -Dm644 $file \
diff --git a/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch b/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
new file mode 100644
index 000000000..f8f6d1fa5
--- /dev/null
+++ b/extra/systemd/0001-check-for-proper-return-from-dirent_ensure_type.patch
@@ -0,0 +1,28 @@
+From 7e5d190ccce8dc064d5756225e306e65fa534ae9 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Mon, 2 Apr 2012 08:20:34 -0400
+Subject: [PATCH] check for proper return from dirent_ensure_type
+
+Fixes 'systemctl list-unit-files', which previously returned only:
+
+ Failed to issue method call: No such file or directory
+---
+ src/install.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/install.c b/src/install.c
+index 174d79b..9256116 100644
+--- a/src/install.c
++++ b/src/install.c
+@@ -1853,7 +1853,7 @@ int unit_file_get_list(
+
+ r = dirent_ensure_type(d, de);
+ if (r < 0) {
+- if (errno == ENOENT)
++ if (r == -ENOENT)
+ continue;
+
+ goto finish;
+--
+1.7.9.5
+
diff --git a/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
new file mode 100644
index 000000000..fa133ca3c
--- /dev/null
+++ b/extra/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
@@ -0,0 +1,156 @@
+From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart@poettering.net>
+Date: Thu, 22 Mar 2012 02:06:40 +0100
+Subject: [PATCH] logind: close FIFO before ending sessions cleanly
+
+For clean session endings ask logind explicitly to get rid of the FIFO
+before closing it so that the FIFO logic doesn't result in su/sudo to be
+terminated immediately.
+---
+ src/login/logind-dbus.c | 30 ++++++++++++++++++++
+ src/login/pam-module.c | 71 +++++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 98 insertions(+), 3 deletions(-)
+
+diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
+index d8f4d89..ea6b89f 100644
+--- a/src/login/logind-dbus.c
++++ b/src/login/logind-dbus.c
+@@ -80,6 +80,9 @@
+ " <arg name=\"seat\" type=\"s\" direction=\"out\"/>\n" \
+ " <arg name=\"vtnr\" type=\"u\" direction=\"out\"/>\n" \
+ " </method>\n" \
++ " <method name=\"ReleaseSession\">\n" \
++ " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \
++ " </method>\n" \
+ " <method name=\"ActivateSession\">\n" \
+ " <arg name=\"id\" type=\"s\" direction=\"in\"/>\n" \
+ " </method>\n" \
+@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler(
+ if (r < 0)
+ return bus_send_error_reply(connection, message, &error, r);
+
++ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) {
++ const char *name;
++ Session *session;
++
++ if (!dbus_message_get_args(
++ message,
++ &error,
++ DBUS_TYPE_STRING, &name,
++ DBUS_TYPE_INVALID))
++ return bus_send_error_reply(connection, message, &error, -EINVAL);
++
++ session = hashmap_get(m->sessions, name);
++ if (!session)
++ return bus_send_error_reply(connection, message, &error, -ENOENT);
++
++ /* We use the FIFO to detect stray sessions where the
++ process invoking PAM dies abnormally. We need to make
++ sure that that process is not killed if at the clean
++ end of the session it closes the FIFO. Hence, with
++ this call explicitly turn off the FIFO logic, so that
++ the PAM code can finish clean up on its own */
++ session_remove_fifo(session);
++
++ reply = dbus_message_new_method_return(message);
++ if (!reply)
++ goto oom;
++
+ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) {
+ const char *name;
+ Session *session;
+diff --git a/src/login/pam-module.c b/src/login/pam-module.c
+index 8544413..4106d2b 100644
+--- a/src/login/pam-module.c
++++ b/src/login/pam-module.c
+@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session(
+ "/org/freedesktop/login1",
+ "org.freedesktop.login1.Manager",
+ "CreateSession");
+-
+ if (!m) {
+ pam_syslog(handle, LOG_ERR, "Could not allocate create session message.");
+ r = PAM_BUF_ERR;
+@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session(
+ int argc, const char **argv) {
+
+ const void *p = NULL;
++ const char *id;
++ DBusConnection *bus = NULL;
++ DBusMessage *m = NULL, *reply = NULL;
++ DBusError error;
++ int r;
+
+- pam_get_data(handle, "systemd.session-fd", &p);
++ assert(handle);
++
++ dbus_error_init(&error);
++
++ id = pam_getenv(handle, "XDG_SESSION_ID");
++ if (id) {
++
++ /* Before we go and close the FIFO we need to tell
++ * logind that this is a clean session shutdown, so
++ * that it doesn't just go and slaughter us
++ * immediately after closing the fd */
++
++ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
++ if (!bus) {
++ pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error));
++ r = PAM_SESSION_ERR;
++ goto finish;
++ }
++
++ m = dbus_message_new_method_call(
++ "org.freedesktop.login1",
++ "/org/freedesktop/login1",
++ "org.freedesktop.login1.Manager",
++ "ReleaseSession");
++ if (!m) {
++ pam_syslog(handle, LOG_ERR, "Could not allocate release session message.");
++ r = PAM_BUF_ERR;
++ goto finish;
++ }
++
++ if (!dbus_message_append_args(m,
++ DBUS_TYPE_STRING, &id,
++ DBUS_TYPE_INVALID)) {
++ pam_syslog(handle, LOG_ERR, "Could not attach parameters to message.");
++ r = PAM_BUF_ERR;
++ goto finish;
++ }
+
++ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
++ if (!reply) {
++ pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error));
++ r = PAM_SESSION_ERR;
++ goto finish;
++ }
++ }
++
++ r = PAM_SUCCESS;
++
++finish:
++ pam_get_data(handle, "systemd.session-fd", &p);
+ if (p)
+ close_nointr(PTR_TO_INT(p) - 1);
+
+- return PAM_SUCCESS;
++ dbus_error_free(&error);
++
++ if (bus) {
++ dbus_connection_close(bus);
++ dbus_connection_unref(bus);
++ }
++
++ if (m)
++ dbus_message_unref(m);
++
++ if (reply)
++ dbus_message_unref(reply);
++
++ return r;
+ }
+--
+1.7.9.5
+
diff --git a/extra/systemd/PKGBUILD b/extra/systemd/PKGBUILD
index d1f60b49c..c09599940 100644
--- a/extra/systemd/PKGBUILD
+++ b/extra/systemd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153641 2012-03-17 02:44:42Z dreisner $
+# $Id: PKGBUILD 155750 2012-04-06 00:06:04Z tomegun $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgbase=systemd
pkgname=('systemd' 'libsystemd')
pkgver=44
-pkgrel=1
+pkgrel=5
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2')
@@ -13,10 +13,14 @@ makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
options=('!libtool')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
"os-release"
- 0001-util-never-follow-symlinks-in-rm_rf_children.patch)
+ 0001-util-never-follow-symlinks-in-rm_rf_children.patch
+ 0001-logind-close-FIFO-before-ending-sessions-cleanly.patch
+ 0001-check-for-proper-return-from-dirent_ensure_type.patch)
md5sums=('11f44ff74c87850064e4351518bcff17'
'752636def0db3c03f121f8b4f44a63cd'
- 'b5863d6d4b47e2b5bda8eb57bde0d327')
+ 'b5863d6d4b47e2b5bda8eb57bde0d327'
+ 'd37833358ef6c23fad622ea4a0941d1f'
+ '11f930fd0a3966abc794bf9127a7dde0')
build() {
cd "$pkgname-$pkgver"
@@ -24,20 +28,25 @@ build() {
# https://bugzilla.redhat.com/show_bug.cgi?id=803358
patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
+ # https://bugs.archlinux.org/task/28386
+ patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch"
+
+ # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49)
+ patch -Np1 <"$srcdir/0001-check-for-proper-return-from-dirent_ensure_type.patch"
+
./configure --sysconfdir=/etc \
--libexecdir=/usr/lib \
- --libdir=/usr/lib \
--with-pamlibdir=/lib/security \
--localstatedir=/var \
- --with-rootprefix= \
- --with-distro=arch
+ --with-distro=arch \
+ --enable-split-usr
make
}
package_systemd() {
- pkgdesc="systemd and service manager"
- depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
+ pkgdesc="system and service manager"
+ depends=('acl' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz')
optdepends=('cryptsetup: required for encrypted block devices'
'dbus-python: systemd-analyze'
'initscripts: legacy support for hostname and vconsole setup'
@@ -66,7 +75,9 @@ package_systemd() {
chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
# symlink to /bin/systemd for compat and sanity
- ln -s ../lib/systemd/systemd "$pkgdir/bin/systemd"
+ install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd"
+ ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
+ ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
# use python2 for systemd-analyze
sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
@@ -87,6 +98,16 @@ package_systemd() {
mv "$manpage" "$section/systemd.$page"
done
+ # move bash-completion and symlink for loginctl
+ install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
+ "$pkgdir/usr/share/bash-completion/completions/systemctl"
+ ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
+ rm -rf "$pkgdir/etc/bash_completion.d"
+
+ # fix systemctl where
+ find "$pkgdir" -type f -name '*.service' -exec \
+ sed -i 's@\([=-]\)/bin/systemctl@\1/usr/bin/systemctl@g' {} +
+
### split off libsystemd (libs, includes, pkgconfig, man3)
install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig}
diff --git a/extra/systemd/systemd.install b/extra/systemd/systemd.install
index f31642e13..822108c0f 100644
--- a/extra/systemd/systemd.install
+++ b/extra/systemd/systemd.install
@@ -7,7 +7,7 @@ checkgroups() {
}
sd_booted() {
- [ -e sys/fs/cgroups/systemd ]
+ [ -e sys/fs/cgroup/systemd ]
}
post_install() {
@@ -29,7 +29,8 @@ post_upgrade() {
fi
if sd_booted; then
- systemctl daemon-reexec >/dev/null
+ systemctl daemon-reload
+ systemctl daemon-reexec
fi
newpkgver=${1%-*}
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index abf99a578..74eef1d57 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 151862 2012-03-03 14:29:19Z giovanni $
+# $Id: PKGBUILD 155737 2012-04-06 00:05:45Z tomegun $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=udisks
pkgver=1.0.4
-pkgrel=2
+pkgrel=3
pkgdesc="Disk Management Service"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/udisks"
@@ -27,4 +27,7 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
+ # move udev helpers and rules to /usr/lib
+ mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
+ rm -r "${pkgdir}"/lib
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-28 00:33:41 +0000