[arch-commits] Commit in systemd/trunk (3 files)
Dave Reisner
dreisner at archlinux.org
Wed Jul 4 00:56:02 UTC 2012
Date: Tuesday, July 3, 2012 @ 20:56:01
Author: dreisner
Revision: 162937
upgpkg: systemd 186-1
- drop backported patches
- adjust optdeps to run systemd-analyze against py3k
Modified:
systemd/trunk/PKGBUILD
Deleted:
systemd/trunk/0001-udev-systemd-udev-settle.service-fix-After.patch
systemd/trunk/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
--------------------------------------------------------+
0001-udev-systemd-udev-settle.service-fix-After.patch | 26 ----
0001-vconsole-setup-enable-utf-8-mode-explicitly.patch | 79 ---------------
PKGBUILD | 23 ----
3 files changed, 5 insertions(+), 123 deletions(-)
Deleted: 0001-udev-systemd-udev-settle.service-fix-After.patch
===================================================================
--- 0001-udev-systemd-udev-settle.service-fix-After.patch 2012-07-04 00:50:10 UTC (rev 162936)
+++ 0001-udev-systemd-udev-settle.service-fix-After.patch 2012-07-04 00:56:01 UTC (rev 162937)
@@ -1,26 +0,0 @@
-From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay at vrfy.org>
-Date: Wed, 6 Jun 2012 14:30:16 +0200
-Subject: [PATCH] udev: systemd-udev-settle.service fix After=
-
-https://bugs.freedesktop.org/show_bug.cgi?id=50779
----
- units/systemd-udev-settle.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
-index d637700..2c4c129 100644
---- a/units/systemd-udev-settle.service.in
-+++ b/units/systemd-udev-settle.service.in
-@@ -21,7 +21,7 @@ Documentation=man:udev(7)
- Documentation=man:systemd-udevd(8)
- DefaultDependencies=no
- Wants=systemd-udev.service
--After=udev-trigger.service
-+After=systemd-udev-trigger.service
- Before=basic.target
- ConditionCapability=CAP_MKNOD
-
---
-1.7.11
-
Deleted: 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
===================================================================
--- 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch 2012-07-04 00:50:10 UTC (rev 162936)
+++ 0001-vconsole-setup-enable-utf-8-mode-explicitly.patch 2012-07-04 00:56:01 UTC (rev 162937)
@@ -1,79 +0,0 @@
-From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg at jklm.no>
-Date: Sun, 10 Jun 2012 20:37:14 +0200
-Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Rather than assuming the console is in utf-8 mode if nothing else is
-specified, be a bit more robust and enable it explicitly.
-
-This fixes a regression compared with Arch's initscripts when not
-using a framebuffer as the old VGA console would not be in utf-8
-mode by default.
-
-Furthermore, this would allow vconsole-setup to be used after boot
-to change the vconsole into utf-8 mode in case it has been set to
-non-utf-8 mode for whatever reason. I.e, the following would leave
-the console in utf-8 mode as expected:
-
- # export LANG=en_US.ISO-8859-1
- # /usr/lib/systemd/systemd-vconsole-setup
- # export LANG=en_US.UTF-8
- # /usr/lib/systemd/systemd-vconsole-setup
-
-Reported-by: Xyne <xyne at archlinx.ca>
-Reported-by: Thomas Bächler <thomas at archlinux.org>
-Cc: Dave Reisner <dreisner at archlinux.org>
----
- src/vconsole/vconsole-setup.c | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index d04fab4..aa5fa18 100644
---- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -80,6 +80,25 @@ static int disable_utf8(int fd) {
- return r;
- }
-
-+static int enable_utf8(int fd) {
-+ int r = 0, k;
-+
-+ if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0)
-+ r = -errno;
-+
-+ if (loop_write(fd, "\033%G", 3, false) < 0)
-+ r = -errno;
-+
-+ k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1");
-+ if (k < 0)
-+ r = k;
-+
-+ if (r < 0)
-+ log_warning("Failed to enable UTF-8: %s", strerror(-r));
-+
-+ return r;
-+}
-+
- static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) {
- const char *args[8];
- int i = 0;
-@@ -418,9 +437,12 @@ int main(int argc, char **argv) {
-
- r = EXIT_FAILURE;
-
-- if (!utf8)
-+ if (utf8)
-+ enable_utf8(fd);
-+ else
- disable_utf8(fd);
-
-+
- if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
- load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
- r = EXIT_SUCCESS;
---
-1.7.11
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-07-04 00:50:10 UTC (rev 162936)
+++ PKGBUILD 2012-07-04 00:56:01 UTC (rev 162937)
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=185
-pkgrel=4
+pkgver=186
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,16 +16,12 @@
'initcpio-install-udev'
'initcpio-install-timestamp'
'0001-Reinstate-TIMEOUT-handling.patch'
- '0001-vconsole-setup-enable-utf-8-mode-explicitly.patch'
- '0001-udev-systemd-udev-settle.service-fix-After.patch'
'locale.sh')
-md5sums=('a7dbbf05986eb0d2c164ec8e570eb78f'
+md5sums=('17eff1d31e6e49bf82e129fe57efd59b'
'e99e9189aa2f6084ac28b8ddf605aeb8'
'59e91c4d7a69b7bf12c86a9982e37ced'
'df69615503ad293c9ddf9d8b7755282d'
'5543be25f205f853a21fa5ee68e03f0d'
- '83f51149ff9c4d75ea946e2b3cc61e53'
- 'b3e41e90beaff35c66ba1b4bc223430a'
'f15956945052bb911e5df81cf5e7e5dc')
build() {
@@ -34,12 +30,6 @@
# still waiting on ipw2x00 to get fixed...
patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
- # upstream commit d305a67b46644d6360ef557109384c831ee8e018
- patch -Np1 <"$srcdir/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch"
-
- # upstream commit 8e8eb8fbafcaa841fa5393e396acde27b26edf2f
- patch -Np1 <"$srcdir/0001-udev-systemd-udev-settle.service-fix-After.patch"
-
./configure \
--libexecdir=/usr/lib \
--localstatedir=/var \
@@ -62,10 +52,10 @@
pkgdesc="system and service manager"
depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
"systemd-tools=$pkgver" 'util-linux' 'xz')
- optdepends=('python2-dbus: systemd-analyze'
+ optdepends=('python-dbus: systemd-analyze'
'initscripts: legacy support for hostname and vconsole setup'
'initscripts-systemd: legacy generator for initialization scripts'
- 'python2-cairo: systemd-analyze'
+ 'python-cairo: 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
@@ -86,9 +76,6 @@
install -dm755 "$pkgdir/bin"
ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
- # fix systemd-analyze for python2
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
# 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"
More information about the arch-commits
mailing list