systemd: track changes in upstream

6 files changed, 39 insertions, 130 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 16c7efa..956b80a 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,6 +1,4 @@
-AUX 0001-fixup-xdm.service-for-gentoo.patch 724 RMD160 e0fe38fc93fd678a06c34ce91694e278d4a56503 SHA1 5e402fd5c0c0bb908d95262f96e7af98ce5641e3 SHA256 ae81de07146b571b993a821fdddb2dda7d25b7c306ab0681b7eb70071bb5912b
+AUX 0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch 1045 RMD160 f080497a39fb8d9c4a1afe46066bdba248373a72 SHA1 dfc7df7b5667a8cace130273e4137dd783966080 SHA256 55ac7ebe6f241261bd72e4d6c6eae1c8b7883cca2ef5c2d18ea7da6addbdba18
 AUX 0002-never-umount-lib-rc-init.d.patch 803 RMD160 6e62d9631496984ff8b7c8938e279f1f43439ce8 SHA1 5a377c49813fb390022cde987acbbf528b7a3f55 SHA256 eccc3ba9ea0172bf6a7eae8ad9b823275b3e7a319a1688f22a452f649ba8c310
-AUX 0003-gentoo-set-default-sysvinitd-to-etc-init.d.patch 941 RMD160 f04619d3119be124bb1c3bf0a5a746f4562fe267 SHA1 d3c89264a0da46a14af414705fa0cf2bb7e549c4 SHA256 dd27231e7c239d6825b0d7373716b42ac35e53b5463bc95a63c249184a3dce4d
-AUX 0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch 2303 RMD160 f9586c1d4b63b644f1d5a9b40dcaf91aa805688b SHA1 20734ef62fed74700762a236bbe1132a5779a490 SHA256 0686fec75dddc69ed5f92d68375615fce0e24be55389f613b108c1de53636cde
-EBUILD systemd-9999.ebuild 1688 RMD160 3776c4fe990547cb684a90baece0c36148eddd9f SHA1 a744eb9410f49161a7098b521805d7b4b53433fb SHA256 f43afffb8939e9bffc449d191114edf8860595e26b5d65b33f20ce69b39ced7a
+EBUILD systemd-9999.ebuild 1690 RMD160 69f9232ce0ac95f2a727acc8ebc02600590d22e2 SHA1 ca50fbaa68620a50e86e542c5a772894ec1cda93 SHA256 82cc00356b83be9ff8472aebf8cb8d3407e39a5d6d52d7a71dc45f4f4be5469e
 MISC metadata.xml 285 RMD160 a394b62e33a5c004c74938e8105bd29b135dc6bc SHA1 672d2415dd51ce2c12c36c659c7926a9b2345fed SHA256 0d6905daec8d05c9a874142bfcc3084691ba54df9328d04bd7dd5a9f64ff4c54
diff --git a/sys-apps/systemd/files/0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch b/sys-apps/systemd/files/0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch
new file mode 100644
index 0000000..da961c0
--- /dev/null
+++ b/sys-apps/systemd/files/0001-Revert-Revert-Revert-fsck-add-new-l-switch-to-fsck-m.patch
@@ -0,0 +1,36 @@
+From 48b2521b1894e09248a6e099c0cb1783015f66a8 Mon Sep 17 00:00:00 2001
+From: Henry Gebhardt <hsggebhardt@googlemail.com>
+Date: Thu, 25 Nov 2010 22:58:43 +0100
+Subject: [PATCH] Revert "Revert "Revert "fsck: add new -l switch to fsck mount options"""
+
+This reverts commit e9ecea880571e520c60fae2dd2f10fcfd7dd1ab8.
+
+Needs development version of util-linux.
+---
+ src/fsck.c |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/fsck.c b/src/fsck.c
+index fdcf6b4..dfaf221 100644
+--- a/src/fsck.c
++++ b/src/fsck.c
+@@ -142,7 +142,7 @@ static void test_files(void) {
+ }
+ 
+ int main(int argc, char *argv[]) {
+-        const char *cmdline[8];
++        const char *cmdline[7];
+         int i = 0, r = EXIT_FAILURE, q;
+         pid_t pid;
+         siginfo_t status;
+@@ -213,7 +213,6 @@ int main(int argc, char *argv[]) {
+         cmdline[i++] = "/sbin/fsck";
+         cmdline[i++] = "-a";
+         cmdline[i++] = "-T";
+-        cmdline[i++] = "-l";
+ 
+         if (!root_directory)
+                 cmdline[i++] = "-M";
+-- 
+1.7.3.2
+
diff --git a/sys-apps/systemd/files/0001-fixup-xdm.service-for-gentoo.patch b/sys-apps/systemd/files/0001-fixup-xdm.service-for-gentoo.patch
deleted file mode 100644
index cc89f8c..0000000
--- a/sys-apps/systemd/files/0001-fixup-xdm.service-for-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 240b47bb4edb5496a51c82904a32f95022ebedb0 Mon Sep 17 00:00:00 2001
-From: Luo Jinghua <sunmoon1997@gmail.com>
-Date: Sat, 16 Oct 2010 13:18:29 +0800
-Subject: [PATCH 1/4] fixup xdm.service for gentoo
-
----
- units/gentoo/xdm.service |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/units/gentoo/xdm.service b/units/gentoo/xdm.service
-index b94c6a8..fd387b1 100644
---- a/units/gentoo/xdm.service
-+++ b/units/gentoo/xdm.service
-@@ -7,10 +7,12 @@
- 
- [Unit]
- Description=Display Manager
--After=syslog.target dbus.target hald.service
-+After=syslog.target
- 
- [Service]
-+Type=forking
- ExecStart=/etc/init.d/xdm start
-+ExecStop=/etc/init.d/xdm stop
- 
- [Install]
- Alias=display-manager.service
--- 
-1.7.3.2
-
diff --git a/sys-apps/systemd/files/0003-gentoo-set-default-sysvinitd-to-etc-init.d.patch b/sys-apps/systemd/files/0003-gentoo-set-default-sysvinitd-to-etc-init.d.patch
deleted file mode 100644
index 62cc1e5..0000000
--- a/sys-apps/systemd/files/0003-gentoo-set-default-sysvinitd-to-etc-init.d.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 114b2a1ab3c68b0177f490cda4babfbe638b184d Mon Sep 17 00:00:00 2001
-From: Luo Jinghua <sunmoon1997@gmail.com>
-Date: Sun, 24 Oct 2010 15:05:28 +0800
-Subject: [PATCH 3/4] gentoo: set default sysvinitd to /etc/init.d
-
-And set sysvrcd to /etc/runlevels too.
----
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4f22b1b..7dce60b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -316,8 +316,8 @@ case $with_distro in
-                 M4_DISTRO_FLAG=-DTARGET_ARCH=1
-                 ;;
-         gentoo)
--                SYSTEM_SYSVINIT_PATH=
--                SYSTEM_SYSVRCND_PATH=
-+                SYSTEM_SYSVINIT_PATH=/etc/init.d
-+                SYSTEM_SYSVRCND_PATH=/etc/runlevels
-                 SPECIAL_SYSLOG_SERVICE=syslog-ng.service
-                 AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo])
-                 M4_DISTRO_FLAG=-DTARGET_GENTOO=1
--- 
-1.7.3.2
-
diff --git a/sys-apps/systemd/files/0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch b/sys-apps/systemd/files/0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch
deleted file mode 100644
index 3ce3ed8..0000000
--- a/sys-apps/systemd/files/0005-Revert-build-sys-fix-building-against-libnotify-0.7.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 25295d8445f9dfddd45c108545d8b6974e1785cb Mon Sep 17 00:00:00 2001
-From: Luo Jinghua <sunmoon1997@gmail.com>
-Date: Fri, 19 Nov 2010 10:46:36 +0800
-Subject: [PATCH 5/5] Revert "build-sys: fix building against libnotify 0.7"
-
-This reverts commit 5c273f855630bf54f6ebe95ea8b45c8abe2ffff6.
----
- configure.ac                      |    4 ++--
- src/gnome-ask-password-agent.vala |    9 +++++----
- 2 files changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d99f02b..45ab664 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -256,12 +256,12 @@ if test "$have_gtk" = "yes"; then
-         AC_SUBST(DBUSGLIB_CFLAGS)
-         AC_SUBST(DBUSGLIB_LIBS)
- 
--        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ])
-+        PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
-         AC_SUBST(LIBNOTIFY_CFLAGS)
-         AC_SUBST(LIBNOTIFY_LIBS)
- fi
- 
--AM_PROG_VALAC([0.11])
-+AM_PROG_VALAC([0.9])
- AC_SUBST(VAPIDIR)
- AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x)
- 
-diff --git a/src/gnome-ask-password-agent.vala b/src/gnome-ask-password-agent.vala
-index 6cab6f9..1523e2e 100644
---- a/src/gnome-ask-password-agent.vala
-+++ b/src/gnome-ask-password-agent.vala
-@@ -38,8 +38,8 @@ public class PasswordDialog : Dialog {
-                 set_default_response(ResponseType.OK);
-                 set_icon_name(icon);
- 
--                add_button(Stock.CANCEL, ResponseType.CANCEL);
--                add_button(Stock.OK, ResponseType.OK);
-+                add_button(STOCK_CANCEL, ResponseType.CANCEL);
-+                add_button(STOCK_OK, ResponseType.OK);
- 
-                 Container content = (Container) get_content_area();
- 
-@@ -181,7 +181,8 @@ public class MyStatusIcon : StatusIcon {
- 
-                 set_visible(true);
- 
--                Notification n = new Notification(title, message, icon);
-+                Notification n = new Notification(title, message, icon, null);
-+                n.attach_to_status_icon(this);
-                 n.set_timeout(5000);
-                 n.show();
- 
-@@ -225,7 +226,7 @@ public class MyStatusIcon : StatusIcon {
- 
-                 OutputStream stream = new UnixOutputStream(to_process, true);
- 
--                stream.write(password.data, null);
-+                stream.write(password, password.length, null);
-         }
- }
- 
--- 
-1.7.3.2
-
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 2248d82..358555f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -67,7 +67,7 @@ src_install() {
 	mkdir -p "${D}"/cgroup/{cpu,cpuacct,cpuset,debug,devices,freezer,memory,ns,systemd}
 	emake DESTDIR="${D}" install
 	if ! use selinux; then
-		rm "${D}"/lib/systemd/system/basic.target.wants/sys-kernel-security.automount
+		rm "${D}"/lib/systemd/system/sysinit.target.wants/sys-kernel-security.automount
 	fi
 	dodoc "${D}/usr/share/doc/systemd"/* && \
 	rm -r "${D}/usr/share/doc/systemd/"