packages: systemd/kmsg-to-syslog.patch, systemd/pld-sysv-network.patch, sys...
baggins
baggins at pld-linux.org
Mon May 28 11:25:19 CEST 2012
Author: baggins Date: Mon May 28 09:25:19 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated patches
- CVE-2012-1174 fixed upstream
- removed patches from git
- disabled shut-sysv-up patch
---- Files affected:
packages/systemd:
kmsg-to-syslog.patch (1.1 -> 1.2) , pld-sysv-network.patch (1.4 -> 1.5) , systemd.spec (1.157 -> 1.158) , target-pld.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: packages/systemd/kmsg-to-syslog.patch
diff -u packages/systemd/kmsg-to-syslog.patch:1.1 packages/systemd/kmsg-to-syslog.patch:1.2
--- packages/systemd/kmsg-to-syslog.patch:1.1 Mon Apr 23 08:20:19 2012
+++ packages/systemd/kmsg-to-syslog.patch Mon May 28 11:25:13 2012
@@ -1,5 +1,5 @@
---- systemd-44/src/journal/systemd-journald.conf~ 2012-03-15 23:13:15.000000000 +0100
-+++ systemd-44/src/journal/systemd-journald.conf 2012-04-23 08:17:08.660433320 +0200
+--- systemd-44/src/journal/journald.conf~ 2012-03-15 23:13:15.000000000 +0100
++++ systemd-44/src/journal/journald.conf 2012-04-23 08:17:08.660433320 +0200
@@ -22,4 +22,4 @@
#ForwardToSyslog=yes
#ForwardToKMsg=no
================================================================
Index: packages/systemd/pld-sysv-network.patch
diff -u packages/systemd/pld-sysv-network.patch:1.4 packages/systemd/pld-sysv-network.patch:1.5
--- packages/systemd/pld-sysv-network.patch:1.4 Sun Mar 18 10:16:24 2012
+++ packages/systemd/pld-sysv-network.patch Mon May 28 11:25:13 2012
@@ -1,5 +1,5 @@
---- systemd-38/src/service.c~ 2012-01-26 00:12:06.239561034 +0100
-+++ systemd-38/src/service.c 2012-01-26 18:26:15.476825041 +0100
+--- systemd-38/src/core/service.c~ 2012-01-26 00:12:06.239561034 +0100
++++ systemd-38/src/core/service.c 2012-01-26 18:26:15.476825041 +0100
@@ -516,6 +516,13 @@
line++;
================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.157 packages/systemd/systemd.spec:1.158
--- packages/systemd/systemd.spec:1.157 Sun May 27 15:39:40 2012
+++ packages/systemd/systemd.spec Mon May 28 11:25:13 2012
@@ -40,9 +40,6 @@
Patch2: shut-sysv-up.patch
Patch3: pld-sysv-network.patch
Patch4: tmpfiles-not-fatal.patch
-Patch5: CVE-2012-1174.patch
-Patch6: ReleaseSession.patch
-Patch7: control-subcgroup.patch
Patch8: kmsg-to-syslog.patch
URL: http://www.freedesktop.org/wiki/Software/systemd
BuildRequires: acl-devel
@@ -321,12 +318,9 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%patch8 -p1
cp -p %{SOURCE2} src/systemd_booted.c
@@ -795,6 +789,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.158 2012/05/28 09:25:13 baggins
+- updated patches
+- CVE-2012-1174 fixed upstream
+- removed patches from git
+- disabled shut-sysv-up patch
+
Revision 1.157 2012/05/27 13:39:40 baggins
- started update to 183
- restored /var/{lock,run} mounts
================================================================
Index: packages/systemd/target-pld.patch
diff -u packages/systemd/target-pld.patch:1.8 packages/systemd/target-pld.patch:1.9
--- packages/systemd/target-pld.patch:1.8 Thu Apr 19 19:11:40 2012
+++ packages/systemd/target-pld.patch Mon May 28 11:25:13 2012
@@ -87,10 +87,10 @@
AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu)
-diff --git a/src/fsck.c b/src/fsck.c
+diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 3477ba1..d32718d 100644
---- a/src/fsck.c
-+++ b/src/fsck.c
+--- a/src/fsck/fsck.c
++++ b/src/fsck/fsck.c
@@ -127,7 +127,7 @@ static int parse_proc_cmdline(void) {
arg_skip = true;
else if (startswith(w, "fsck.mode"))
@@ -100,10 +100,10 @@
else if (strneq(w, "fastboot", l))
arg_skip = true;
else if (strneq(w, "forcefsck", l))
-diff --git a/src/hostname-setup.c b/src/hostname-setup.c
+diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 2c2f10c..754f0c7 100644
---- a/src/hostname-setup.c
-+++ b/src/hostname-setup.c
+--- a/src/core/hostname-setup.c
++++ b/src/core/hostname-setup.c
@@ -30,7 +30,7 @@
#include "util.h"
#include "log.h"
@@ -122,10 +122,10 @@
int r;
FILE *f;
-diff --git a/src/locale-setup.c b/src/locale-setup.c
+diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 7f692e9..0a45854 100644
---- a/src/locale-setup.c
-+++ b/src/locale-setup.c
+--- a/src/core/locale-setup.c
++++ b/src/core/locale-setup.c
@@ -74,7 +74,7 @@ int locale_setup(void) {
if (detect_container(NULL) <= 0)
@@ -144,10 +144,10 @@
if (r <= 0 &&
(r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"LANG", &variables[VARIABLE_LANG],
-diff --git a/src/systemctl.c b/src/systemctl.c
+diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 298cb4e..cec3974 100644
---- a/src/systemctl.c
-+++ b/src/systemctl.c
+--- a/src/systemctl/systemctl.c
++++ b/src/systemctl/systemctl.c
@@ -3460,7 +3460,7 @@ finish:
static int enable_sysv_units(char **args) {
int r = 0;
@@ -180,13 +180,13 @@
if (r <= 0) {
-#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MEEGO)
- if ((r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
+ r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font,
"SYSFONTACM", &vc_font_map,
-diff --git a/units/console-shell.service.m4 b/units/console-shell.service.m4
+diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
index 02adc84..a9f31fd 100644
---- a/units/console-shell.service.m4
-+++ b/units/console-shell.service.m4
+--- a/units/console-shell.service.m4.in
++++ b/units/console-shell.service.m4.in
@@ -11,6 +11,9 @@ After=systemd-user-sessions.service plymouth-quit-wait.service
m4_ifdef(`TARGET_FEDORA',
After=rc-local.service
@@ -211,10 +211,10 @@
m4_ifdef(`TARGET_ARCH',
After=rc-local.service
)m4_dnl
-diff --git a/units/rescue.service.m4 b/units/rescue.service.m4
+diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
index 7dd8a22..5a9c363 100644
---- a/units/rescue.service.m4
-+++ b/units/rescue.service.m4
+--- a/units/rescue.service.m4.in
++++ b/units/rescue.service.m4.in
@@ -22,6 +22,9 @@ ExecStartPre=-/bin/echo 'Welcome to rescue mode. Use "systemctl default" or ^D t
m4_ifdef(`TARGET_FEDORA',
`EnvironmentFile=/etc/sysconfig/init
@@ -231,7 +231,7 @@
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
-`ExecStart=-/sbin/sulogin'))))
+`ExecStart=-/sbin/sulogin')))))
- ExecStopPost=-/bin/systemctl --fail --no-block default
+ ExecStopPost=- at SYSTEMCTL@ --fail --no-block default
StandardInput=tty-force
StandardOutput=inherit
diff --git a/units/serial-getty at .service.m4 b/units/serial-getty at .service.m4
@@ -248,19 +248,19 @@
m4_ifdef(`TARGET_ARCH',
After=rc-local.service
)m4_dnl
-diff --git a/src/rc-local-generator.c b/src/rc-local-generator.c
+diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c
index ac6424a..a247c25 100644
---- a/src/rc-local-generator.c
-+++ b/src/rc-local-generator.c
+--- a/src/rc-local-generator/rc-local-generator.c
++++ b/src/rc-local-generator/rc-local-generator.c
@@ -27,7 +27,7 @@
- #include "log.h"
#include "util.h"
+ #include "mkdir.h"
-#if defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
- #define SCRIPT_PATH "/etc/rc.d/rc.local"
+ #define SCRIPT_PATH_START "/etc/rc.d/rc.local"
#elif defined(TARGET_SUSE)
- #define SCRIPT_PATH "/etc/init.d/boot.local"
+ #define SCRIPT_PATH_START "/etc/init.d/boot.local"
--- /dev/null
+++ b/units/pld/halt-local.service
@@ -0,0 +1,20 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/systemd/kmsg-to-syslog.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/systemd/pld-sysv-network.patch?r1=1.4&r2=1.5
http://cvs.pld-linux.org/packages/systemd/systemd.spec?r1=1.157&r2=1.158
http://cvs.pld-linux.org/packages/systemd/target-pld.patch?r1=1.8&r2=1.9
More information about the pld-cvs-commit
mailing list