Author: baggins Date: Sun Feb 12 15:34:57 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- C:sudo with global pam session setup (sudo hates pam_systemd)
- hacked shut-sysv-up.patch into working order
- don't comment commented out lines in comapt config
- don't C with gdm as it breaks gdm2.20 installs
---- Files affected:
packages/systemd:
shut-sysv-up.patch (1.3 -> 1.4) , systemd.spec (1.112 -> 1.113)
---- Diffs:
================================================================
Index: packages/systemd/shut-sysv-up.patch
diff -u packages/systemd/shut-sysv-up.patch:1.3
packages/systemd/shut-sysv-up.patch:1.4
--- packages/systemd/shut-sysv-up.patch:1.3 Sun Jan 29 23:36:13 2012
+++ packages/systemd/shut-sysv-up.patch Sun Feb 12 16:34:52 2012
@@ -1,12 +1,17 @@
diff -urNp systemd-37.orig/src/unit.c systemd-37/src/unit.c
--- systemd-37.orig/src/unit.c 2011-09-23 16:28:27.000000000 +0200
+++ systemd-37/src/unit.c 2011-12-05 21:37:15.000000000 +0100
-@@ -2432,7 +2432,7 @@ void unit_status_printf(Unit *u, const c
+@@ -2432,7 +2432,12 @@ void unit_status_printf(Unit *u, const c
assert(u);
assert(format);
- if (!UNIT_VTABLE(u)->show_status)
-+ if (!UNIT_VTABLE(u)->show_status || (u->manager->sysv_console &&
u->service.sysv_path && (u->job==NULL || u->job->result==JOB_DONE) &&
UNIT_VTABLE(u)->active_state(u)!=UNIT_FAILED && LOG_PRI(log_get_max_level()) <=
LOG_INFO))
++ if (!UNIT_VTABLE(u)->show_status
++ || (u->manager->sysv_console
++ && (startswith(u->description, "SYSV: ") ||
startswith(u->description, "LSB: "))
++ && (u->job == NULL || u->job->result == JOB_DONE)
++ && UNIT_VTABLE(u)->active_state(u) != UNIT_FAILED
++ && LOG_PRI(log_get_max_level()) <= LOG_INFO))
return;
if (!manager_get_show_status(u->manager))
================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.112 packages/systemd/systemd.spec:1.113
--- packages/systemd/systemd.spec:1.112 Sun Feb 12 14:13:13 2012
+++ packages/systemd/systemd.spec Sun Feb 12 16:34:52 2012
@@ -90,8 +90,10 @@
Provides: udev-acl
# systemd takes care of that and causes problems
Conflicts: binfmt-detector
-# sytemd wants pam with pam_systemd.so in system-auth
+# sytemd wants pam with pam_systemd.so in system-auth...
Conflicts: pam < 1:1.1.5-5
+# ...and sudo hates it
+Conflicts: sudo < 1:1.7.8p2-4
Conflicts: upstart
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -233,7 +235,8 @@
Conflicts: fail2ban < 0.8.4-4
Conflicts: filesystem < 4.0-3
Conflicts: gammu-smsd < 1:1.31.0-3
-Conflicts: gdm < 2:3.2.1.1-9
+# Break gdm2.20 installs
+#Conflicts: gdm < 2:3.2.1.1-9
Conflicts: greylistd < 0.8.8-2
Conflicts: inn < 2.4.6-7
Conflicts: ipsec-tools < 0.8.0-3
@@ -278,7 +281,6 @@
Conflicts: sphinx < 2.0.3-4
Conflicts: splashutils < 1.5.4.3-3
Conflicts: stunnel < 4.50-2
-Conflicts: sudo < 1:1.7.8p2-2
Conflicts: tenshi < 0.12-2
Conflicts: tor < 0.2.2.35-2
Conflicts: ucarp < 1.5.2-3
@@ -297,7 +299,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
-#%patch2 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
cp -p %{SOURCE2} src/systemd_booted.c
@@ -478,7 +480,7 @@
fi
%post no-compat-tmpfiles
-%{__sed} -i -e 's/^/# /g' %{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
+%{__sed} -i -e '/^#/!s/^/# /g'
%{_sysconfdir}/tmpfiles.d/compat-pld-var-run.conf
%files
%defattr(644,root,root,755)
@@ -693,6 +695,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.113 2012/02/12 15:34:52 baggins
+- C:sudo with global pam session setup (sudo hates pam_systemd)
+- hacked shut-sysv-up.patch into working order
+- don't comment commented out lines in comapt config
+- don't C with gdm as it breaks gdm2.20 installs
+
Revision 1.112 2012/02/12 13:13:13 baggins
- 42
- systemd binary location changed (compat symlink preseved)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/shut-sysv-up.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.112&r2=1.113&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
