From 5a3de607c74a97325ced5f5766a6a9c7e2709557 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sun, 2 Dec 2012 10:58:38 +0000 Subject: Version bump. Enable Python support. Drop old patches. (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 42B9401D) --- sys-apps/systemd/ChangeLog | 17 +- .../0001-Disable-udev-targets-for-udev-189.patch | 330 -------------------- .../files/0002-journald-add-missing-includes.patch | 88 ------ ...-add-HAVE_XZ-check-to-avoid-build-failure.patch | 35 --- ...-journal-don-t-try-to-compress-without-XZ.patch | 29 -- ...ournal-bring-mmap-cache-prototype-in-sync.patch | 24 -- ...eated-invocation-of-vsnprintf-vaprintf-in.patch | 162 ---------- .../files/196-0001-Disable-udev-targets.patch | 344 +++++++++++++++++++++ .../systemd/files/update-etc-systemd-symlinks.path | 5 - .../files/update-etc-systemd-symlinks.service | 6 - .../systemd/files/update-etc-systemd-symlinks.sh | 19 -- sys-apps/systemd/systemd-196.ebuild | 211 +++++++++++++ 12 files changed, 571 insertions(+), 699 deletions(-) delete mode 100644 sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch delete mode 100644 sys-apps/systemd/files/0002-journald-add-missing-includes.patch delete mode 100644 sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch delete mode 100644 sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch delete mode 100644 sys-apps/systemd/files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch delete mode 100644 sys-apps/systemd/files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch create mode 100644 sys-apps/systemd/files/196-0001-Disable-udev-targets.patch delete mode 100644 sys-apps/systemd/files/update-etc-systemd-symlinks.path delete mode 100644 sys-apps/systemd/files/update-etc-systemd-symlinks.service delete mode 100755 sys-apps/systemd/files/update-etc-systemd-symlinks.sh create mode 100644 sys-apps/systemd/systemd-196.ebuild (limited to 'sys-apps') diff --git a/sys-apps/systemd/ChangeLog b/sys-apps/systemd/ChangeLog index c2a5984b80eb..a1f1918e136e 100644 --- a/sys-apps/systemd/ChangeLog +++ b/sys-apps/systemd/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for sys-apps/systemd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.60 2012/12/01 15:26:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/ChangeLog,v 1.61 2012/12/02 10:58:37 mgorny Exp $ + +*systemd-196 (02 Dec 2012) + + 02 Dec 2012; Michał Górny + +files/196-0001-Disable-udev-targets.patch, +systemd-196.ebuild, + -files/0001-Disable-udev-targets-for-udev-189.patch, + -files/0002-journald-add-missing-includes.patch, + -files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch, + -files/0004-journal-don-t-try-to-compress-without-XZ.patch, + -files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch, + -files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch, + -files/update-etc-systemd-symlinks.path, + -files/update-etc-systemd-symlinks.service, + -files/update-etc-systemd-symlinks.sh: + Version bump. Enable Python support. Drop old patches. 01 Dec 2012; Michał Górny -systemd-189-r3.ebuild, -systemd-191-r1.ebuild, -systemd-192.ebuild, -systemd-193.ebuild, diff --git a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch b/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch deleted file mode 100644 index 05b4a9df677a..000000000000 --- a/sys-apps/systemd/files/0001-Disable-udev-targets-for-udev-189.patch +++ /dev/null @@ -1,330 +0,0 @@ -From 700023b0263f1f014443144a10e4544f18113458 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Wed, 15 Aug 2012 14:02:07 +0200 -Subject: [PATCH] Disable udev targets, for udev-189. - ---- - Makefile.am | 189 +----------------------------------------------------------- - 1 file changed, 1 insertion(+), 188 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8de4aa4..5fa3085 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -307,8 +307,6 @@ dist_systemunit_DATA = \ - units/systemd-ask-password-wall.path \ - units/systemd-ask-password-console.path \ - units/syslog.target \ -- units/systemd-udevd-control.socket \ -- units/systemd-udevd-kernel.socket \ - units/system-update.target - - nodist_systemunit_DATA = \ -@@ -338,9 +336,6 @@ nodist_systemunit_DATA = \ - units/systemd-kexec.service \ - units/systemd-fsck@.service \ - units/systemd-fsck-root.service \ -- units/systemd-udevd.service \ -- units/systemd-udev-trigger.service \ -- units/systemd-udev-settle.service \ - units/debug-shell.service - - dist_userunit_DATA = \ -@@ -1588,12 +1583,6 @@ SUBDIRS += \ - docs/libudev - endif - --include_HEADERS += \ -- src/libudev/libudev.h -- --lib_LTLIBRARIES += \ -- -ludev -- - libudev_la_SOURCES =\ - src/libudev/libudev-private.h \ - src/libudev/libudev.c \ -@@ -1616,9 +1605,6 @@ libudev_la_LDFLAGS = \ - libudev_la_LIBADD = \ - libsystemd-shared.la - --pkgconfiglib_DATA += \ -- src/libudev/libudev.pc -- - EXTRA_DIST += \ - src/libudev/libudev.pc.in \ - src/libudev/libudev.sym -@@ -1639,12 +1625,7 @@ libudev-install-move-hook: - libudev-uninstall-move-hook: - rm -f $(DESTDIR)$(rootlibdir)/libudev.so* - --INSTALL_EXEC_HOOKS += libudev-install-move-hook --UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook -- - # ------------------------------------------------------------------------------ --noinst_LTLIBRARIES += \ -- libudev-private.la - - libudev_private_la_SOURCES =\ - $(libudev_la_SOURCES) \ -@@ -1659,15 +1640,6 @@ libudev_private_la_LIBADD = \ - libsystemd-shared.la - - # ------------------------------------------------------------------------------ --MANPAGES += \ -- man/udev.7 \ -- man/udevadm.8 \ -- man/systemd-udevd.service.8 -- --MANPAGES_ALIAS += \ -- man/systemd-udevd.8 \ -- man/systemd-udevd-control.socket.8 \ -- man/systemd-udevd-kernel.socket.8 - - man/systemd-udevd.8: man/systemd-udevd.service.8 - man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 -@@ -1679,27 +1651,7 @@ udev-confdirs: - INSTALL_DATA_HOOKS += udev-confdirs - - dist_udevrules_DATA += \ -- rules/99-systemd.rules \ -- rules/42-usb-hid-pm.rules \ -- rules/50-udev-default.rules \ -- rules/60-persistent-storage-tape.rules \ -- rules/60-persistent-serial.rules \ -- rules/60-persistent-input.rules \ -- rules/60-persistent-alsa.rules \ -- rules/60-persistent-storage.rules \ -- rules/75-net-description.rules \ -- rules/75-tty-description.rules \ -- rules/78-sound-card.rules \ -- rules/80-drivers.rules \ -- rules/95-udev-late.rules -- --udevconfdir = $(sysconfdir)/udev --dist_udevconf_DATA = \ -- src/udev/udev.conf -- --sharepkgconfigdir = $(datadir)/pkgconfig --sharepkgconfig_DATA = \ -- src/udev/udev.pc -+ rules/99-systemd.rules - - EXTRA_DIST += \ - rules/99-systemd.rules.in \ -@@ -1727,17 +1679,6 @@ systemd-install-hook: - ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service - ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service - --INSTALL_DATA_HOOKS += systemd-install-hook -- --bin_PROGRAMS += \ -- udevadm -- --rootlibexec_PROGRAMS += \ -- systemd-udevd -- --noinst_LTLIBRARIES += \ -- libudev-core.la -- - libudev_core_la_SOURCES = \ - src/udev/udev.h \ - src/udev/udev-event.c \ -@@ -1803,14 +1744,6 @@ udevadm_LDADD = \ - libsystemd-shared.la - - # ------------------------------------------------------------------------------ --TESTS += \ -- test/udev-test.pl \ -- test/rules-test.sh -- --noinst_PROGRAMS += \ -- test-libudev \ -- test-udev -- - test_libudev_SOURCES = \ - src/test/test-libudev.c - -@@ -1860,8 +1793,6 @@ ata_id_LDADD = \ - libudev-private.la \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- ata_id - - # ------------------------------------------------------------------------------ - cdrom_id_SOURCES = \ -@@ -1871,12 +1802,6 @@ cdrom_id_LDADD = \ - -ludev \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- cdrom_id -- --dist_udevrules_DATA += \ -- rules/60-cdrom_id.rules -- - # ------------------------------------------------------------------------------ - collect_SOURCES = \ - src/udev/collect/collect.c -@@ -1884,9 +1809,6 @@ collect_SOURCES = \ - collect_LDADD = \ - libudev-private.la - --udevlibexec_PROGRAMS += \ -- collect -- - # ------------------------------------------------------------------------------ - scsi_id_SOURCES =\ - src/udev/scsi_id/scsi_id.c \ -@@ -1898,9 +1820,6 @@ scsi_id_LDADD = \ - libudev-private.la \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- scsi_id -- - EXTRA_DIST += \ - src/udev/scsi_id/README - -@@ -1911,12 +1830,6 @@ v4l_id_SOURCES = \ - v4l_id_LDADD = \ - -ludev - --udevlibexec_PROGRAMS += \ -- v4l_id -- --dist_udevrules_DATA += \ -- rules/60-persistent-v4l.rules -- - # ------------------------------------------------------------------------------ - accelerometer_SOURCES = \ - src/udev/accelerometer/accelerometer.c -@@ -1925,12 +1838,6 @@ accelerometer_LDADD = \ - -ludev -lm \ - libsystemd-shared.la - --udevlibexec_PROGRAMS += \ -- accelerometer -- --dist_udevrules_DATA += \ -- rules/61-accelerometer.rules -- - # ------------------------------------------------------------------------------ - if ENABLE_GUDEV - if ENABLE_GTK_DOC -@@ -2111,99 +2018,11 @@ nodist_keymap_SOURCES = \ - BUILT_SOURCES += \ - $(nodist_keymap_SOURCES) - --udevlibexec_PROGRAMS += \ -- keymap -- --dist_doc_DATA += \ -- src/udev/keymap/README.keymap.txt -- --dist_udevrules_DATA += \ -- src/udev/keymap/95-keymap.rules \ -- src/udev/keymap/95-keyboard-force-release.rules -- --dist_udevhome_SCRIPTS = \ -- src/udev/keymap/findkeyboards \ -- src/udev/keymap/keyboard-force-release.sh -- --TESTS += \ -- src/udev/keymap/check-keymaps.sh -- - CLEANFILES += \ - src/udev/keymap/keys.txt \ - src/udev/keymap/keys-from-name.gperf \ - src/udev/keymap/keyboard-force-release.sh - --udevkeymapdir = $(udevlibexecdir)/keymaps --dist_udevkeymap_DATA = \ -- keymaps/acer \ -- keymaps/acer-aspire_5720 \ -- keymaps/acer-aspire_8930 \ -- keymaps/acer-aspire_5920g \ -- keymaps/acer-aspire_6920 \ -- keymaps/acer-travelmate_c300 \ -- keymaps/asus \ -- keymaps/compaq-e_evo \ -- keymaps/dell \ -- keymaps/dell-latitude-xt2 \ -- keymaps/everex-xt5000 \ -- keymaps/fujitsu-amilo_li_2732 \ -- keymaps/fujitsu-amilo_pa_2548 \ -- keymaps/fujitsu-amilo_pro_edition_v3505 \ -- keymaps/fujitsu-amilo_pro_v3205 \ -- keymaps/fujitsu-amilo_si_1520 \ -- keymaps/fujitsu-esprimo_mobile_v5 \ -- keymaps/fujitsu-esprimo_mobile_v6 \ -- keymaps/genius-slimstar-320 \ -- keymaps/hewlett-packard \ -- keymaps/hewlett-packard-2510p_2530p \ -- keymaps/hewlett-packard-compaq_elitebook \ -- keymaps/hewlett-packard-pavilion \ -- keymaps/hewlett-packard-presario-2100 \ -- keymaps/hewlett-packard-tablet \ -- keymaps/hewlett-packard-tx2 \ -- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ -- keymaps/inventec-symphony_6.0_7.0 \ -- keymaps/lenovo-3000 \ -- keymaps/lenovo-ideapad \ -- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ -- keymaps/lenovo-thinkpad_x6_tablet \ -- keymaps/lenovo-thinkpad_x200_tablet \ -- keymaps/lg-x110 \ -- keymaps/logitech-wave \ -- keymaps/logitech-wave-cordless \ -- keymaps/logitech-wave-pro-cordless \ -- keymaps/maxdata-pro_7000 \ -- keymaps/medion-fid2060 \ -- keymaps/medionnb-a555 \ -- keymaps/micro-star \ -- keymaps/module-asus-w3j \ -- keymaps/module-ibm \ -- keymaps/module-lenovo \ -- keymaps/module-sony \ -- keymaps/module-sony-old \ -- keymaps/module-sony-vgn \ -- keymaps/module-sony-vpc \ -- keymaps/olpc-xo \ -- keymaps/onkyo \ -- keymaps/oqo-model2 \ -- keymaps/samsung-other \ -- keymaps/samsung-90x3a \ -- keymaps/samsung-sq1us \ -- keymaps/samsung-sx20s \ -- keymaps/toshiba-satellite_a100 \ -- keymaps/toshiba-satellite_a110 \ -- keymaps/toshiba-satellite_m30x \ -- keymaps/zepto-znote -- --udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release --dist_udevkeymapforcerel_DATA = \ -- keymaps-force-release/dell-touchpad \ -- keymaps-force-release/dell-xps \ -- keymaps-force-release/hp-other \ -- keymaps-force-release/samsung-other \ -- keymaps-force-release/samsung-90x3a \ -- keymaps-force-release/common-volume-keys -- - src/udev/keymap/keys.txt: Makefile - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ -@@ -2231,12 +2050,6 @@ mtd_probe_SOURCES = \ - mtd_probe_CPPFLAGS = \ - $(AM_CPPFLAGS) - --dist_udevrules_DATA += \ -- rules/75-probe_mtd.rules -- --udevlibexec_PROGRAMS += \ -- mtd_probe -- - # ------------------------------------------------------------------------------ - libsystemd_id128_la_SOURCES = \ - src/libsystemd-id128/sd-id128.c --- -1.7.12 - diff --git a/sys-apps/systemd/files/0002-journald-add-missing-includes.patch b/sys-apps/systemd/files/0002-journald-add-missing-includes.patch deleted file mode 100644 index 50604d17a603..000000000000 --- a/sys-apps/systemd/files/0002-journald-add-missing-includes.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 4871690d9e32608bbd9b18505b5326c2079c9690 Mon Sep 17 00:00:00 2001 -From: Allin Cottrell -Date: Fri, 24 Aug 2012 01:46:38 +0200 -Subject: [PATCH 1/4] journald: add missing includes - ---- - src/journal/journald-console.c | 1 + - src/journal/journald-gperf.gperf | 1 + - src/journal/journald-kmsg.c | 1 + - src/journal/journald-native.c | 1 + - src/journal/journald-stream.c | 1 + - src/journal/journald-syslog.c | 1 + - 6 files changed, 6 insertions(+) - -diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c -index 6cd2397..2596d44 100644 ---- a/src/journal/journald-console.c -+++ b/src/journal/journald-console.c -@@ -21,6 +21,7 @@ - - #include - #include -+#include - - #include "journald.h" - #include "journald-console.h" -diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf -index 2f83cbd..32474df 100644 ---- a/src/journal/journald-gperf.gperf -+++ b/src/journal/journald-gperf.gperf -@@ -1,5 +1,6 @@ - %{ - #include -+#include - #include "conf-parser.h" - #include "journald.h" - %} -diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c -index aebca5d..b259480 100644 ---- a/src/journal/journald-kmsg.c -+++ b/src/journal/journald-kmsg.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c -index 7aa99a3..4e44c3a 100644 ---- a/src/journal/journald-native.c -+++ b/src/journal/journald-native.c -@@ -20,6 +20,7 @@ - ***/ - - #include -+#include - #include - - #include "socket-util.h" -diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c -index 3e4022a..113c421 100644 ---- a/src/journal/journald-stream.c -+++ b/src/journal/journald-stream.c -@@ -21,6 +21,7 @@ - - #include - #include -+#include - #include - - #ifdef HAVE_SELINUX -diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index daed095..9db9198 100644 ---- a/src/journal/journald-syslog.c -+++ b/src/journal/journald-syslog.c -@@ -20,6 +20,7 @@ - ***/ - - #include -+#include - #include - - #include "socket-util.h" --- -1.7.12 - diff --git a/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch b/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch deleted file mode 100644 index ea1b185236db..000000000000 --- a/sys-apps/systemd/files/0003-journal-add-HAVE_XZ-check-to-avoid-build-failure.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 70f09301d5d47577cfa4fe70c7b3cba336529cdf Mon Sep 17 00:00:00 2001 -From: Yin Kangkai -Date: Fri, 24 Aug 2012 16:52:58 +0800 -Subject: [PATCH] journal: add HAVE_XZ check to avoid build failure - -Without this, build fail with --disable-xz or xz not installed. ---- - src/journal/journal-verify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c -index 2401293..5d134bd 100644 ---- a/src/journal/journal-verify.c -+++ b/src/journal/journal-verify.c -@@ -63,6 +63,7 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { - h1 = le64toh(o->data.hash); - - if (o->object.flags & OBJECT_COMPRESSED) { -+#ifdef HAVE_XZ - void *b = NULL; - uint64_t alloc = 0, b_size; - -@@ -73,6 +74,9 @@ static int journal_file_object_verify(JournalFile *f, Object *o) { - - h2 = hash64(b, b_size); - free(b); -+#else -+ return -EPROTONOSUPPORT; -+#endif - } else - h2 = hash64(o->data.payload, le64toh(o->object.size) - offsetof(Object, data.payload)); - --- -1.7.12 - diff --git a/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch b/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch deleted file mode 100644 index 475766544bfb..000000000000 --- a/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 48b617399d7d8446c5310b2568b2af6f13331b4c Mon Sep 17 00:00:00 2001 -From: Michael Olbrich -Date: Mon, 3 Sep 2012 15:46:44 +0200 -Subject: [PATCH] journal: don't try to compress without XZ - -otherwise the header contains the HEADER_INCOMPATIBLE_COMPRESSED -flag even though the data is not compressed and reading the journal -fails. ---- - src/journal/journal-file.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index c8193ba..8bd5273 100644 ---- a/src/journal/journal-file.c -+++ b/src/journal/journal-file.c -@@ -2021,7 +2021,9 @@ int journal_file_open( - f->flags = flags; - f->prot = prot_from_flags(flags); - f->writable = (flags & O_ACCMODE) != O_RDONLY; -+#ifdef HAVE_XZ - f->compress = compress; -+#endif - f->seal = seal; - - if (mmap_cache) --- -1.7.12 - diff --git a/sys-apps/systemd/files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch b/sys-apps/systemd/files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch deleted file mode 100644 index 353b7e8d209a..000000000000 --- a/sys-apps/systemd/files/191-0002-journal-bring-mmap-cache-prototype-in-sync.patch +++ /dev/null @@ -1,24 +0,0 @@ -From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Sat, 22 Sep 2012 00:16:13 +0200 -Subject: [PATCH] journal: bring mmap cache prototype in sync - ---- - src/journal/mmap-cache.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h -index de34634..0c42fb8 100644 ---- a/src/journal/mmap-cache.h -+++ b/src/journal/mmap-cache.h -@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void); - MMapCache* mmap_cache_ref(MMapCache *m); - MMapCache* mmap_cache_unref(MMapCache *m); - --int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret); -+int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret); - void mmap_cache_close_fd(MMapCache *m, int fd); - void mmap_cache_close_context(MMapCache *m, unsigned context); --- -1.7.12 - diff --git a/sys-apps/systemd/files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch b/sys-apps/systemd/files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch deleted file mode 100644 index 2e543a9ec5c4..000000000000 --- a/sys-apps/systemd/files/191-0003-log-fix-repeated-invocation-of-vsnprintf-vaprintf-in.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 963ddb917de3140308ee62fb642b2307a577a39e Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Mon, 24 Sep 2012 23:22:19 +0200 -Subject: [PATCH] log: fix repeated invocation of vsnprintf()/vaprintf() in - log_struct() - -https://bugs.freedesktop.org/show_bug.cgi?id=55213 ---- - src/nspawn/nspawn.c | 6 ++++++ - src/shared/log.c | 22 ++++++++++++++++++++-- - src/shared/macro.h | 43 +++++++++++++++++++++++++++++++++++++++++++ - src/test/test-log.c | 7 +++++++ - 4 files changed, 76 insertions(+), 2 deletions(-) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 959df4e..5cac32c 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -1307,6 +1307,12 @@ int main(int argc, char *argv[]) { - - if (arg_user) { - -+ /* Note that this resolves user names -+ * inside the container, and hence -+ * accesses the NSS modules from the -+ * container and not the host. This is -+ * a bit weird... */ -+ - if (get_user_creds((const char**)&arg_user, &uid, &gid, &home, NULL) < 0) { - log_error("get_user_creds() failed: %m"); - goto child_fail; -diff --git a/src/shared/log.c b/src/shared/log.c -index b618458..6357868 100644 ---- a/src/shared/log.c -+++ b/src/shared/log.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "log.h" - #include "util.h" -@@ -705,11 +706,23 @@ int log_struct_internal( - va_start(ap, format); - while (format && n + 1 < ELEMENTSOF(iovec)) { - char *buf; -+ va_list aq; - -- if (vasprintf(&buf, format, ap) < 0) { -+ /* We need to copy the va_list structure, -+ * since vasprintf() leaves it afterwards at -+ * an undefined location */ -+ -+ va_copy(aq, ap); -+ if (vasprintf(&buf, format, aq) < 0) { -+ va_end(aq); - r = -ENOMEM; - goto finish; - } -+ va_end(aq); -+ -+ /* Now, jump enough ahead, so that we point to -+ * the next format string */ -+ VA_FORMAT_ADVANCE(format, ap); - - IOVEC_SET_STRING(iovec[n++], buf); - -@@ -742,8 +755,11 @@ int log_struct_internal( - - va_start(ap, format); - while (format) { -+ va_list aq; - -- vsnprintf(buf, sizeof(buf), format, ap); -+ va_copy(aq, ap); -+ vsnprintf(buf, sizeof(buf), format, aq); -+ va_end(aq); - char_array_0(buf); - - if (startswith(buf, "MESSAGE=")) { -@@ -751,6 +767,8 @@ int log_struct_internal( - break; - } - -+ VA_FORMAT_ADVANCE(format, ap); -+ - format = va_arg(ap, char *); - } - va_end(ap); -diff --git a/src/shared/macro.h b/src/shared/macro.h -index c7ce7c8..0dd210a 100644 ---- a/src/shared/macro.h -+++ b/src/shared/macro.h -@@ -193,4 +193,47 @@ static inline size_t IOVEC_INCREMENT(struct iovec *i, unsigned n, size_t k) { - #define _cleanup_closedir_ __attribute__((cleanup(closedirp))) - #define _cleanup_umask_ __attribute__((cleanup(umaskp))) - -+#define VA_FORMAT_ADVANCE(format, ap) do { \ -+ int _argtypes[64]; \ -+ size_t _i, _k; \ -+ _k = parse_printf_format((format), ELEMENTSOF(_argtypes), _argtypes); \ -+ for (_i = 0; _i < _k; _i++) { \ -+ if (_argtypes[_i] & PA_FLAG_PTR) { \ -+ (void) va_arg(ap, void*); \ -+ continue; \ -+ } \ -+ \ -+ switch (_argtypes[_i]) { \ -+ case PA_INT: \ -+ case PA_INT|PA_FLAG_SHORT: \ -+ case PA_CHAR: \ -+ (void) va_arg(ap, int); \ -+ break; \ -+ case PA_INT|PA_FLAG_LONG: \ -+ (void) va_arg(ap, long int); \ -+ break; \ -+ case PA_INT|PA_FLAG_LONG_LONG: \ -+ (void) va_arg(ap, long long int); \ -+ break; \ -+ case PA_WCHAR: \ -+ (void) va_arg(ap, wchar_t); \ -+ break; \ -+ case PA_WSTRING: \ -+ case PA_STRING: \ -+ case PA_POINTER: \ -+ (void) va_arg(ap, void*); \ -+ break; \ -+ case PA_FLOAT: \ -+ case PA_DOUBLE: \ -+ (void) va_arg(ap, double); \ -+ break; \ -+ case PA_DOUBLE|PA_FLAG_LONG_DOUBLE: \ -+ (void) va_arg(ap, long double); \ -+ break; \ -+ default: \ -+ assert_not_reached("Unknown format string argument."); \ -+ } \ -+ } \ -+} while(false) -+ - #include "log.h" -diff --git a/src/test/test-log.c b/src/test/test-log.c -index cc924fa..8dc3d53 100644 ---- a/src/test/test-log.c -+++ b/src/test/test-log.c -@@ -42,5 +42,12 @@ int main(int argc, char* argv[]) { - "SERVICE=foobar", - NULL); - -+ log_struct(LOG_INFO, -+ "MESSAGE=Foobar PID=%lu", (unsigned long) getpid(), -+ "FORMAT_STR_TEST=1=%i A=%c 2=%hi 3=%li 4=%lli 1=%p foo=%s 2.5=%g 3.5=%g 4.5=%Lg", -+ (int) 1, 'A', (short) 2, (long int) 3, (long long int) 4, (void*) 1, "foo", (float) 2.5f, (double) 3.5, (long double) 4.5, -+ "SUFFIX=GOT IT", -+ NULL); -+ - return 0; - } --- -1.7.12 - diff --git a/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch b/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch new file mode 100644 index 000000000000..814c8f41610d --- /dev/null +++ b/sys-apps/systemd/files/196-0001-Disable-udev-targets.patch @@ -0,0 +1,344 @@ +From 3108c60ba5f4f46fa4b4ca0927d8b5df1b701a75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Wed, 15 Aug 2012 14:02:07 +0200 +Subject: [PATCH] Disable udev targets. + +--- + Makefile.am | 203 +----------------------------------------------------------- + 1 file changed, 1 insertion(+), 202 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 29d6323..2df0ec2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -316,8 +316,6 @@ dist_systemunit_DATA = \ + units/systemd-ask-password-wall.path \ + units/systemd-ask-password-console.path \ + units/syslog.target \ +- units/systemd-udevd-control.socket \ +- units/systemd-udevd-kernel.socket \ + units/system-update.target + + nodist_systemunit_DATA = \ +@@ -347,9 +345,6 @@ nodist_systemunit_DATA = \ + units/systemd-kexec.service \ + units/systemd-fsck@.service \ + units/systemd-fsck-root.service \ +- units/systemd-udevd.service \ +- units/systemd-udev-trigger.service \ +- units/systemd-udev-settle.service \ + units/debug-shell.service + + if HAVE_KMOD +@@ -1756,12 +1751,6 @@ SUBDIRS += \ + docs/libudev + endif + +-include_HEADERS += \ +- src/libudev/libudev.h +- +-lib_LTLIBRARIES += \ +- -ludev +- + libudev_la_SOURCES =\ + src/libudev/libudev-private.h \ + src/libudev/libudev.c \ +@@ -1786,9 +1775,6 @@ libudev_la_LDFLAGS = \ + libudev_la_LIBADD = \ + libsystemd-shared.la + +-pkgconfiglib_DATA += \ +- src/libudev/libudev.pc +- + EXTRA_DIST += \ + src/libudev/libudev.pc.in \ + src/libudev/libudev.sym +@@ -1809,12 +1795,7 @@ libudev-install-move-hook: + libudev-uninstall-move-hook: + rm -f $(DESTDIR)$(rootlibdir)/libudev.so* + +-INSTALL_EXEC_HOOKS += libudev-install-move-hook +-UNINSTALL_EXEC_HOOKS += libudev-uninstall-move-hook +- + # ------------------------------------------------------------------------------ +-noinst_LTLIBRARIES += \ +- libudev-private.la + + libudev_private_la_SOURCES =\ + $(libudev_la_SOURCES) \ +@@ -1829,15 +1810,6 @@ libudev_private_la_LIBADD = \ + libsystemd-shared.la + + # ------------------------------------------------------------------------------ +-MANPAGES += \ +- man/udev.7 \ +- man/udevadm.8 \ +- man/systemd-udevd.service.8 +- +-MANPAGES_ALIAS += \ +- man/systemd-udevd.8 \ +- man/systemd-udevd-control.socket.8 \ +- man/systemd-udevd-kernel.socket.8 + + man/systemd-udevd.8: man/systemd-udevd.service.8 + man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 +@@ -1850,40 +1822,7 @@ udev-confdirs: + INSTALL_DATA_HOOKS += udev-confdirs + + dist_udevrules_DATA += \ +- rules/99-systemd.rules \ +- rules/42-usb-hid-pm.rules \ +- rules/50-udev-default.rules \ +- rules/60-persistent-storage-tape.rules \ +- rules/60-persistent-serial.rules \ +- rules/60-persistent-input.rules \ +- rules/60-persistent-alsa.rules \ +- rules/60-persistent-storage.rules \ +- rules/64-btrfs.rules \ +- rules/75-net-description.rules \ +- rules/75-tty-description.rules \ +- rules/78-sound-card.rules \ +- rules/95-udev-late.rules +- +-if HAVE_KMOD +-dist_udevrules_DATA += \ +- rules/80-drivers.rules +-endif +- +-dist_udevhwdb_DATA = \ +- hwdb/20-pci-vendor-product.hwdb \ +- hwdb/20-pci-classes.hwdb \ +- hwdb/20-usb-vendor-product.hwdb \ +- hwdb/20-usb-classes.hwdb \ +- hwdb/20-acpi-vendor.hwdb \ +- hwdb/20-OUI.hwdb +- +-udevconfdir = $(sysconfdir)/udev +-dist_udevconf_DATA = \ +- src/udev/udev.conf +- +-sharepkgconfigdir = $(datadir)/pkgconfig +-sharepkgconfig_DATA = \ +- src/udev/udev.pc ++ rules/99-systemd.rules + + EXTRA_DIST += \ + rules/99-systemd.rules.in \ +@@ -1911,17 +1850,6 @@ systemd-install-hook: + ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service + ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service + +-INSTALL_DATA_HOOKS += systemd-install-hook +- +-bin_PROGRAMS += \ +- udevadm +- +-rootlibexec_PROGRAMS += \ +- systemd-udevd +- +-noinst_LTLIBRARIES += \ +- libudev-core.la +- + libudev_core_la_SOURCES = \ + src/udev/udev.h \ + src/udev/udev-event.c \ +@@ -2008,14 +1936,6 @@ hwdb-remove-hook: + -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN) + + # ------------------------------------------------------------------------------ +-TESTS += \ +- test/udev-test.pl \ +- test/rules-test.sh +- +-noinst_PROGRAMS += \ +- test-libudev \ +- test-udev +- + test_libudev_SOURCES = \ + src/test/test-libudev.c + +@@ -2065,8 +1985,6 @@ ata_id_LDADD = \ + libudev-private.la \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- ata_id + + # ------------------------------------------------------------------------------ + cdrom_id_SOURCES = \ +@@ -2076,12 +1994,6 @@ cdrom_id_LDADD = \ + -ludev \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- cdrom_id +- +-dist_udevrules_DATA += \ +- rules/60-cdrom_id.rules +- + # ------------------------------------------------------------------------------ + collect_SOURCES = \ + src/udev/collect/collect.c +@@ -2089,9 +2001,6 @@ collect_SOURCES = \ + collect_LDADD = \ + libudev-private.la + +-udevlibexec_PROGRAMS += \ +- collect +- + # ------------------------------------------------------------------------------ + scsi_id_SOURCES =\ + src/udev/scsi_id/scsi_id.c \ +@@ -2103,9 +2012,6 @@ scsi_id_LDADD = \ + libudev-private.la \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- scsi_id +- + EXTRA_DIST += \ + src/udev/scsi_id/README + +@@ -2116,12 +2022,6 @@ v4l_id_SOURCES = \ + v4l_id_LDADD = \ + -ludev + +-udevlibexec_PROGRAMS += \ +- v4l_id +- +-dist_udevrules_DATA += \ +- rules/60-persistent-v4l.rules +- + # ------------------------------------------------------------------------------ + accelerometer_SOURCES = \ + src/udev/accelerometer/accelerometer.c +@@ -2130,12 +2030,6 @@ accelerometer_LDADD = \ + -ludev -lm \ + libsystemd-shared.la + +-udevlibexec_PROGRAMS += \ +- accelerometer +- +-dist_udevrules_DATA += \ +- rules/61-accelerometer.rules +- + # ------------------------------------------------------------------------------ + if ENABLE_GUDEV + if ENABLE_GTK_DOC +@@ -2316,100 +2210,11 @@ nodist_keymap_SOURCES = \ + BUILT_SOURCES += \ + $(nodist_keymap_SOURCES) + +-udevlibexec_PROGRAMS += \ +- keymap +- +-dist_doc_DATA += \ +- src/udev/keymap/README.keymap.txt +- +-dist_udevrules_DATA += \ +- src/udev/keymap/95-keymap.rules \ +- src/udev/keymap/95-keyboard-force-release.rules +- +-dist_udevhome_SCRIPTS = \ +- src/udev/keymap/findkeyboards \ +- src/udev/keymap/keyboard-force-release.sh +- +-TESTS += \ +- src/udev/keymap/check-keymaps.sh +- + CLEANFILES += \ + src/udev/keymap/keys.txt \ + src/udev/keymap/keys-from-name.gperf \ + src/udev/keymap/keyboard-force-release.sh + +-udevkeymapdir = $(udevlibexecdir)/keymaps +-dist_udevkeymap_DATA = \ +- keymaps/acer \ +- keymaps/acer-aspire_5720 \ +- keymaps/acer-aspire_8930 \ +- keymaps/acer-aspire_5920g \ +- keymaps/acer-aspire_6920 \ +- keymaps/acer-travelmate_c300 \ +- keymaps/asus \ +- keymaps/compaq-e_evo \ +- keymaps/dell \ +- keymaps/dell-latitude-xt2 \ +- keymaps/everex-xt5000 \ +- keymaps/fujitsu-amilo_li_2732 \ +- keymaps/fujitsu-amilo_pa_2548 \ +- keymaps/fujitsu-amilo_pro_edition_v3505 \ +- keymaps/fujitsu-amilo_pro_v3205 \ +- keymaps/fujitsu-amilo_si_1520 \ +- keymaps/fujitsu-esprimo_mobile_v5 \ +- keymaps/fujitsu-esprimo_mobile_v6 \ +- keymaps/genius-slimstar-320 \ +- keymaps/hewlett-packard \ +- keymaps/hewlett-packard-2510p_2530p \ +- keymaps/hewlett-packard-compaq_elitebook \ +- keymaps/hewlett-packard-pavilion \ +- keymaps/hewlett-packard-presario-2100 \ +- keymaps/hewlett-packard-tablet \ +- keymaps/hewlett-packard-tx2 \ +- keymaps/hewlett-packard_elitebook-8440p \ +- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ +- keymaps/inventec-symphony_6.0_7.0 \ +- keymaps/lenovo-3000 \ +- keymaps/lenovo-ideapad \ +- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \ +- keymaps/lenovo-thinkpad_x6_tablet \ +- keymaps/lenovo-thinkpad_x200_tablet \ +- keymaps/lg-x110 \ +- keymaps/logitech-wave \ +- keymaps/logitech-wave-cordless \ +- keymaps/logitech-wave-pro-cordless \ +- keymaps/maxdata-pro_7000 \ +- keymaps/medion-fid2060 \ +- keymaps/medionnb-a555 \ +- keymaps/micro-star \ +- keymaps/module-asus-w3j \ +- keymaps/module-ibm \ +- keymaps/module-lenovo \ +- keymaps/module-sony \ +- keymaps/module-sony-old \ +- keymaps/module-sony-vgn \ +- keymaps/module-sony-vpc \ +- keymaps/olpc-xo \ +- keymaps/onkyo \ +- keymaps/oqo-model2 \ +- keymaps/samsung-other \ +- keymaps/samsung-90x3a \ +- keymaps/samsung-sq1us \ +- keymaps/samsung-sx20s \ +- keymaps/toshiba-satellite_a100 \ +- keymaps/toshiba-satellite_a110 \ +- keymaps/toshiba-satellite_m30x \ +- keymaps/zepto-znote +- +-udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release +-dist_udevkeymapforcerel_DATA = \ +- keymaps-force-release/dell-touchpad \ +- keymaps-force-release/dell-xps \ +- keymaps-force-release/hp-other \ +- keymaps-force-release/samsung-other \ +- keymaps-force-release/samsung-90x3a \ +- keymaps-force-release/common-volume-keys +- + src/udev/keymap/keys.txt: Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@ +@@ -2437,12 +2242,6 @@ mtd_probe_SOURCES = \ + mtd_probe_CPPFLAGS = \ + $(AM_CPPFLAGS) + +-dist_udevrules_DATA += \ +- rules/75-probe_mtd.rules +- +-udevlibexec_PROGRAMS += \ +- mtd_probe +- + # ------------------------------------------------------------------------------ + libsystemd_id128_la_SOURCES = \ + src/libsystemd-id128/sd-id128.c +-- +1.8.0 + diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.path b/sys-apps/systemd/files/update-etc-systemd-symlinks.path deleted file mode 100644 index 33a95763da2a..000000000000 --- a/sys-apps/systemd/files/update-etc-systemd-symlinks.path +++ /dev/null @@ -1,5 +0,0 @@ -[Unit] -Description=Update /etc/systemd/system symlinks for units moved to /usr - -[Path] -PathChanged=/lib/systemd/system diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.service b/sys-apps/systemd/files/update-etc-systemd-symlinks.service deleted file mode 100644 index c05a19439d9b..000000000000 --- a/sys-apps/systemd/files/update-etc-systemd-symlinks.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=Update /etc/systemd/system symlinks for units moved to /usr - -[Service] -Type=oneshot -ExecStart=/usr/libexec/systemd/update-etc-systemd-symlinks.sh diff --git a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh b/sys-apps/systemd/files/update-etc-systemd-symlinks.sh deleted file mode 100755 index ce81bba58f25..000000000000 --- a/sys-apps/systemd/files/update-etc-systemd-symlinks.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# Update symlinks to systemd units moved into /usr/systemd. -# (c) 2012 Michał Górny -# Released under the terms of the 2-clause BSD license - -IFS_SAVE=${IFS} -IFS=' -' -# follow + symlink type will match broken symlinks only -set -- $(find -L /etc/systemd/system -type l -print) -IFS=${IFS_SAVE} - -for f; do - old_path=$(readlink "${f}") - new_path=/usr/lib${old_path#/lib} - if [ -f "${new_path}" ]; then - ln -v -s -f "${new_path}" "${f}" - fi -done diff --git a/sys-apps/systemd/systemd-196.ebuild b/sys-apps/systemd/systemd-196.ebuild new file mode 100644 index 000000000000..a3e965ba3716 --- /dev/null +++ b/sys-apps/systemd/systemd-196.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-196.ebuild,v 1.1 2012/12/02 10:58:37 mgorny Exp $ + +EAPI=4 + +PYTHON_COMPAT=( python2_7 ) +inherit autotools-utils bash-completion-r1 linux-info pam \ + python-single-r1 systemd user + +DESCRIPTION="System and service manager for Linux" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" +SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" + +LICENSE="GPL-2 LGPL-2.1 MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl audit cryptsetup gcrypt http lzma pam python qrcode selinux + tcpd vanilla xattr" + +MINKV="2.6.39" + +COMMON_DEPEND=">=sys-apps/dbus-1.4.10 + >=sys-apps/kmod-5 + >=sys-apps/util-linux-2.20 + ~sys-fs/udev-${PV} + sys-libs/libcap + acl? ( sys-apps/acl ) + audit? ( >=sys-process/audit-2 ) + cryptsetup? ( >=sys-fs/cryptsetup-1.4.2 ) + gcrypt? ( >=dev-libs/libgcrypt-1.4.5 ) + http? ( net-libs/libmicrohttpd ) + lzma? ( app-arch/xz-utils ) + pam? ( virtual/pam ) + python? ( ${PYTHON_DEPS} ) + qrcode? ( media-gfx/qrencode ) + selinux? ( sys-libs/libselinux ) + tcpd? ( sys-apps/tcp-wrappers ) + xattr? ( sys-apps/attr )" + +RDEPEND="${COMMON_DEPEND} + sys-apps/hwids + || ( + >=sys-apps/util-linux-2.22 +