Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=systemd.git;a=commitdiff;h=9fb2a104626cd09b97b9ff3e93d1ed1d6af27556

commit 9fb2a104626cd09b97b9ff3e93d1ed1d6af27556
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Thu Dec 16 15:06:26 2010 +0100

systemd-15-28-i686

- backport commit from git to make sure suse-specific boot.foo handling
is disabled
- all patches are now in upstream and can be removed on the next version
bump

diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index 3d5fe53..e4727ae 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -9,12 +9,12 @@ USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"}

pkgname=systemd
pkgver=15
-pkgrel=27
+pkgrel=28
pkgdesc="A System and Service Manager"
url="http://www.freedesktop.org/wiki/Software/systemd";
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \
-       Frugalware.diff sysv_translate_name.patch getty-after-rc.local.patch \
-       console.conf prefdm.service)
+       build-sys-frugalware-linux-support.patch sysv_translate_name.patch 
getty-after-rc.local.patch \
+       service-ifdef-distro-specific-compat-logic.patch console.conf 
prefdm.service)
up2date="Flasttar http://www.freedesktop.org/software/$pkgname";
depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 
'sysvinit-tools')
makedepends=('vala')
@@ -153,9 +153,10 @@ build()
}

sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \
-          '6bb289f43930f7b9dfca980936c91ac414821733' \
-          'b521d50f26b3e66e47ac405b112d2f17f09cb549' \
-          '80b48103f7e795da86e6d7df5c8dd7ce9753d5df' \
+          '42ec3c9f787c09d0e0b0a44263581bbc3eafd01e' \
+          '714938b9cc079c2fe470c6fac6e104cd4d1ae447' \
+          'd99972f51c65261f2ced039ce5a4db719c19cca2' \
+          'e98981d01cb1229936c28005d1a499475c07d913' \
'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \
'fdb7dc79f5a0d120e722c152f956a841667fe011')

diff --git a/source/base/systemd/Frugalware.diff 
b/source/base/systemd/build-sys-frugalware-linux-support.patch
similarity index 87%
rename from source/base/systemd/Frugalware.diff
rename to source/base/systemd/build-sys-frugalware-linux-support.patch
index 461961f..1878189 100644
--- a/source/base/systemd/Frugalware.diff
+++ b/source/base/systemd/build-sys-frugalware-linux-support.patch
@@ -1,18 +1,11 @@
-From 9b54dd3ac4ba309afc778ffd43386670cea58b7e Mon Sep 17 00:00:00 2001
+From f5c88ec1330b61787441156de7d764a140774bd2 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmik...@frugalware.org>
-Date: Wed, 24 Nov 2010 16:40:15 +0100
-Subject: [PATCH] build-sys: frugalware linux support
+Date: Mon, 29 Nov 2010 13:42:10 +0000
+Subject: build-sys: frugalware linux support

---
- Makefile.am          |    7 +++++++
- configure.ac         |    8 ++++++++
- src/hostname-setup.c |    4 ++--
- src/service.c        |    2 +-
- src/vconsole-setup.c |   13 +++++++++++++
- 5 files changed, 31 insertions(+), 3 deletions(-)
-
diff --git a/Makefile.am b/Makefile.am
-index 694ec57..39a8c9f 100644
+index 6a688b8..fa704ae 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,12 +76,19 @@ AM_CPPFLAGS += \
@@ -36,10 +29,10 @@ index 694ec57..39a8c9f 100644
rootbin_PROGRAMS = \
systemd \
diff --git a/configure.ac b/configure.ac
-index f9f5eee..fb19981 100644
+index 4d29d5f..4f77aa8 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -287,6 +287,7 @@ if test "z$with_distro" = "z"; then
+@@ -290,6 +290,7 @@ if test "z$with_distro" = "z"; then
AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
@@ -47,7 +40,7 @@ index f9f5eee..fb19981 100644
fi
if test "z$with_distro" = "z"; then
with_distro=`uname -s`
-@@ -359,6 +360,12 @@ case $with_distro in
+@@ -362,6 +363,12 @@ case $with_distro in
AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
M4_DISTRO_FLAG=-DTARGET_SLACKWARE=1
;;
@@ -60,7 +53,7 @@ index f9f5eee..fb19981 100644
other)
AS_IF([test "x$with_syslog_service" = "x"],
[AC_MSG_ERROR([With --distro=other, you must pass --with-syslog-service= to 
configure])])
-@@ -408,6 +415,7 @@ AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test 
x"$with_distro" = xdebian -o x"$wit
+@@ -411,6 +418,7 @@ AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test 
x"$with_distro" = xdebian -o x"$wit
AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch)
AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo)
AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
@@ -127,6 +120,5 @@ index 27e4178..d05c277 100644
#elif defined(TARGET_GENTOO)
if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
"unicode", &vc_unicode,
---
-1.7.3.2
-
+--
+cgit v0.8.3-6-g21f6
diff --git a/source/base/systemd/getty-after-rc.local.patch 
b/source/base/systemd/getty-after-rc.local.patch
index b5ac5e0..0683e1a 100644
--- a/source/base/systemd/getty-after-rc.local.patch
+++ b/source/base/systemd/getty-after-rc.local.patch
@@ -1,12 +1,9 @@
-From 25309d888c8b7f4724b952ed51c93f3f5de14d62 Mon Sep 17 00:00:00 2001
+From 6279e1f01442fe01fe036036081d1935e3287d52 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmik...@frugalware.org>
-Date: Sun, 12 Dec 2010 02:24:38 +0100
-Subject: [PATCH] Frugalware: start gettys after local.service
+Date: Thu, 16 Dec 2010 14:00:51 +0000
+Subject: Frugalware: start gettys after local.service

---
- units/ge...@.service.m4 |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
diff --git a/units/ge...@.service.m4 b/units/ge...@.service.m4
index 902ab6e..0b3160e 100644
--- a/units/ge...@.service.m4
@@ -21,6 +18,5 @@ index 902ab6e..0b3160e 100644

# If additional gettys are spawned during boot then we should make
# sure that this is synchronized before getty.target, even though
---
-1.7.3.2
-
+--
+cgit v0.8.3-6-g21f6
diff --git 
a/source/base/systemd/service-ifdef-distro-specific-compat-logic.patch 
b/source/base/systemd/service-ifdef-distro-specific-compat-logic.patch
new file mode 100644
index 0000000..636e875
--- /dev/null
+++ b/source/base/systemd/service-ifdef-distro-specific-compat-logic.patch
@@ -0,0 +1,72 @@
+From e1992852c8d540f2d9ec3c04a8d9cee791fd8b10 Mon Sep 17 00:00:00 2001
+From: Kay Sievers <kay.siev...@vrfy.org>
+Date: Thu, 16 Dec 2010 13:29:34 +0000
+Subject: service: ifdef distro-specific compat logic
+
+---
+diff --git a/src/service.c b/src/service.c
+index 620f2b3..ca0db8e 100644
+--- a/src/service.c
++++ b/src/service.c
+@@ -855,9 +855,10 @@ static int service_load_sysv_name(Service *s, const char 
*name) {
+         assert(s);
+         assert(name);
+
+-        /* For SysV services we strip the boot. or .sh
++        /* For SysV services we strip the boot.*, rc.* and *.sh
+          * prefixes/suffixes. */
+         if (startswith(name, "boot.") ||
++            startswith(name, "rc.") ||
+             endswith(name, ".sh.service"))
+                 return -ENOENT;
+
+@@ -873,36 +874,42 @@ static int service_load_sysv_name(Service *s, const char 
*name) {
+
+                 r = service_load_sysv_path(s, path);
+
++#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
+                 if (r >= 0 && s->meta.load_state == UNIT_STUB) {
+-                        /* Try Debian style xxx.sh source'able init scripts */
++                        /* Try Debian style *.sh source'able init scripts */
+                         strcat(path, ".sh");
+                         r = service_load_sysv_path(s, path);
+                 }
+-
++#endif
+                 free(path);
+
++#ifdef TARGET_SUSE
+                 if (r >= 0 && s->meta.load_state == UNIT_STUB) {
+-                        /* Try SUSE style boot.xxx init scripts */
++                        /* Try SUSE style boot.* init scripts */
+
+                         if (asprintf(&path, "%s/boot.%s", *p, name) < 0)
+                                 return -ENOMEM;
+
++                        /* Drop .service suffix */
+                         path[strlen(path)-8] = 0;
+                         r = service_load_sysv_path(s, path);
+                         free(path);
+                 }
++#endif
+
++#ifdef TARGET_FRUGALWARE
+                 if (r >= 0 && s->meta.load_state == UNIT_STUB) {
+-                        /* Try Frugalware style rc.xxx init scripts */
++                        /* Try Frugalware style rc.* init scripts */
+
+                         if (asprintf(&path, "%s/rc.%s", *p, name) < 0)
+                                 return -ENOMEM;
+
+-                      /* Drop .service suffix */
++                        /* Drop .service suffix */
+                         path[strlen(path)-8] = 0;
+                         r = service_load_sysv_path(s, path);
+                         free(path);
+                 }
++#endif
+
+                 if (r < 0)
+                         return r;
+--
+cgit v0.8.3-6-g21f6
diff --git a/source/base/systemd/sysv_translate_name.patch 
b/source/base/systemd/sysv_translate_name.patch
index 9fc8521..e56b3bb 100644
--- a/source/base/systemd/sysv_translate_name.patch
+++ b/source/base/systemd/sysv_translate_name.patch
@@ -1,14 +1,11 @@
-From 9fa741b9ff4e663cfe3b7defa346b8982ed2d59c Mon Sep 17 00:00:00 2001
+From 65530632c7e40bc369edcba8f014ec9136c8eb02 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmik...@frugalware.org>
-Date: Sun, 5 Dec 2010 23:13:33 +0100
-Subject: [PATCH] Drop rc. prefix on Frugalware
+Date: Tue, 07 Dec 2010 21:51:21 +0000
+Subject: service: drop rc. prefix on frugalware linux

---
- src/service.c |   17 +++++++++++++++++
- 1 files changed, 17 insertions(+), 0 deletions(-)
-
diff --git a/src/service.c b/src/service.c
-index 6b6ce30..dec47fd 100644
+index 1f478f4..620f2b3 100644
--- a/src/service.c
+++ b/src/service.c
@@ -248,6 +248,11 @@ static char *sysv_translate_name(const char *name) {
@@ -23,7 +20,7 @@ index 6b6ce30..dec47fd 100644
else
/* Normal init scripts */
strcpy(stpcpy(r, name), ".service");
-@@ -886,6 +891,18 @@ static int service_load_sysv_name(Service *s, const char 
*name) {
+@@ -887,6 +892,18 @@ static int service_load_sysv_name(Service *s, const char 
*name) {
free(path);
}

@@ -42,6 +39,5 @@ index 6b6ce30..dec47fd 100644
if (r < 0)
return r;

---
-1.7.3.2
-
+--
+cgit v0.8.3-6-g21f6
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to