Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=14760c04d408d031366682ab17592fdf285a887e
commit 14760c04d408d031366682ab17592fdf285a887e
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Sat Jan 8 04:04:01 2011 +0100
systemd-16-1-i686
- version bump
- touch vala files so that valac will regenerate the c source from them,
respecing the vala flags set by configure
diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild
index 3810c74..5f775b9 100644
--- a/source/base/systemd/FrugalBuild
+++ b/source/base/systemd/FrugalBuild
@@ -8,17 +8,19 @@ USE_GUI=${USE_GUI:-"y"}
USE_SYSV_REPLACE=${USE_SYSV_REPLACE:-"n"}
pkgname=systemd
-pkgver=15
-pkgrel=35
+pkgver=16
+pkgrel=1
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 \
- 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 libnotify.diff libnotify2.diff)
-up2date="Flasttar http://www.freedesktop.org/software/$pkgname";
depends=('dbus' 'udev' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts'
'sysvinit-tools')
-makedepends=('vala')
-
+makedepends=('vala' 'docbook-xsl>=1.73.0-2' 'docbook-xml')
+options=('scriptlet')
+up2date="Flasttar http://www.freedesktop.org/software/$pkgname";
+source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2 \
+ console.conf prefdm.service)
+sha1sums=('70ddb53e8e3346c52548900470d9e26e58e661e1' \
+ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \
+ 'fdb7dc79f5a0d120e722c152f956a841667fe011')
if Fuse $USE_CRYPTSETUP; then
depends=("${depends[@]}" 'cryptsetup-luks')
@@ -92,6 +94,8 @@ build()
Fsed '\(After=@SPECIAL_SYSLOG_SERVICE@\)' '#\1' units/syslog.target.in
Fpatchall
Fautoreconf
+ # force rebuild of vala files with our libnotify
+ find . -name '*.vala' -exec touch {} \;
Fmake
Fmakeinstall
#auto mount
@@ -159,14 +163,3 @@ build()
fi
}
-sha1sums=('b383d35b409a99d6929e7d1f2e508e3b97fef601' \
- '42ec3c9f787c09d0e0b0a44263581bbc3eafd01e' \
- '714938b9cc079c2fe470c6fac6e104cd4d1ae447' \
- 'd99972f51c65261f2ced039ce5a4db719c19cca2' \
- 'e98981d01cb1229936c28005d1a499475c07d913' \
- 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \
- 'fdb7dc79f5a0d120e722c152f956a841667fe011' \
- 'c7b3adce7788e68ab53744a02ff955f6c797b806' \
- '8cde1941ef2900871115753fb7f20f1fcf07ba7b')
-
-
diff --git a/source/base/systemd/build-sys-frugalware-linux-support.patch
b/source/base/systemd/build-sys-frugalware-linux-support.patch
deleted file mode 100644
index 1878189..0000000
--- a/source/base/systemd/build-sys-frugalware-linux-support.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From f5c88ec1330b61787441156de7d764a140774bd2 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmik...@frugalware.org>
-Date: Mon, 29 Nov 2010 13:42:10 +0000
-Subject: build-sys: frugalware linux support
-
----
-diff --git a/Makefile.am b/Makefile.am
-index 6a688b8..fa704ae 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -76,12 +76,19 @@ AM_CPPFLAGS += \
- -DKBD_SETFONT=\"/usr/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
- else
-+if TARGET_FRUGALWARE
-+AM_CPPFLAGS += \
-+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
-+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-+else
- AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"latarcyrheb-sun16\"
- endif
- endif
-+endif
-
- rootbin_PROGRAMS = \
- systemd \
-diff --git a/configure.ac b/configure.ac
-index 4d29d5f..4f77aa8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -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")
-+
AC_CHECK_FILE(/etc/frugalware-release,with_distro="frugalware")
- fi
- if test "z$with_distro" = "z"; then
- with_distro=`uname -s`
-@@ -362,6 +363,12 @@ case $with_distro in
- AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
- M4_DISTRO_FLAG=-DTARGET_SLACKWARE=1
- ;;
-+ frugalware)
-+ SYSTEM_SYSVINIT_PATH=/etc/rc.d
-+ SYSTEM_SYSVRCND_PATH=/etc/rc.d
-+ AC_DEFINE(TARGET_FRUGALWARE, [], [Target is Frugalware])
-+ M4_DISTRO_FLAG=-DTARGET_FRUGALWARE=1
-+ ;;
- other)
- AS_IF([test "x$with_syslog_service" = "x"],
- [AC_MSG_ERROR([With --distro=other, you must pass
--with-syslog-service= to configure])])
-@@ -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)
-+AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
-
- AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"],
[Syslog service name])
-
-diff --git a/src/hostname-setup.c b/src/hostname-setup.c
-index ce7d2a1..0428a64 100644
---- a/src/hostname-setup.c
-+++ b/src/hostname-setup.c
-@@ -32,7 +32,7 @@
-
- #if defined(TARGET_FEDORA)
- #define FILENAME "/etc/sysconfig/network"
--#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
-+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) ||
defined(TARGET_FRUGALWARE)
- #define FILENAME "/etc/HOSTNAME"
- #elif defined(TARGET_ARCH)
- #define FILENAME "/etc/rc.conf"
-@@ -137,7 +137,7 @@ finish:
- fclose(f);
- return r;
-
--#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
-+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) ||
defined(TARGET_FRUGALWARE)
- return read_and_strip_hostname(FILENAME, hn);
- #else
- return -ENOENT;
-diff --git a/src/service.c b/src/service.c
-index 429b53d..6b6ce30 100644
---- a/src/service.c
-+++ b/src/service.c
-@@ -65,7 +65,7 @@ static const struct {
- { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },
- #endif
-
--#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
-+#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) ||
defined(TARGET_FRUGALWARE)
- /* Debian style rcS.d */
- { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },
- #endif
-diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
-index 27e4178..d05c277 100644
---- a/src/vconsole-setup.c
-+++ b/src/vconsole-setup.c
-@@ -267,6 +267,19 @@ int main(int argc, char **argv) {
- log_warning("Failed to read /etc/rc.conf:
%s", strerror(-r));
- }
-
-+#elif defined(TARGET_FRUGALWARE)
-+ if ((r = parse_env_file("/etc/sysconfig/keymap", NEWLINE,
-+ "keymap", &vc_keymap,
-+ NULL)) < 0) {
-+ if (r != -ENOENT)
-+ log_warning("Failed to read
/etc/sysconfig/keymap: %s", strerror(-r));
-+ }
-+ if ((r = parse_env_file("/etc/sysconfig/font", NEWLINE,
-+ "font", &vc_font,
-+ NULL)) < 0) {
-+ if (r != -ENOENT)
-+ log_warning("Failed to read
/etc/sysconfig/font: %s", strerror(-r));
-+ }
- #elif defined(TARGET_GENTOO)
- if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
- "unicode", &vc_unicode,
---
-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
deleted file mode 100644
index 0683e1a..0000000
--- a/source/base/systemd/getty-after-rc.local.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6279e1f01442fe01fe036036081d1935e3287d52 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmik...@frugalware.org>
-Date: Thu, 16 Dec 2010 14:00:51 +0000
-Subject: Frugalware: start gettys after local.service
-
----
-diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
-index 902ab6e..0b3160e 100644
---- a/units/getty@.service.m4
-+++ b/units/getty@.service.m4
-@@ -15,6 +15,9 @@ After=rc-local.service
- m4_ifdef(`TARGET_ARCH',
- After=rc-local.service
- )m4_dnl
-+m4_ifdef(`TARGET_FRUGALWARE',
-+After=local.service
-+)m4_dnl
-
- # If additional gettys are spawned during boot then we should make
- # sure that this is synchronized before getty.target, even though
---
-cgit v0.8.3-6-g21f6
diff --git a/source/base/systemd/libnotify.diff
b/source/base/systemd/libnotify.diff
deleted file mode 100644
index 2221732..0000000
--- a/source/base/systemd/libnotify.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-From d0ef2204b4256189afc2188f0765338d616ca757 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.siev...@vrfy.org>
-Date: Fri, 26 Nov 2010 16:59:53 +0000
-Subject: gnome-ask-password-agent: also support libnotify < 0.7 for now
-
----
-diff --git a/Makefile.am b/Makefile.am
-index 471954b..baf8271 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -962,7 +962,12 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \
- --pkg=gtk+-2.0 \
- --pkg=linux \
- --pkg=gio-unix-2.0 \
-- --pkg=libnotify \
-+ --pkg=libnotify
-+if LIBNOTIFY07
-+systemd_gnome_ask_password_agent_VALAFLAGS += \
-+ -D LIBNOTIFY07
-+endif
-+systemd_gnome_ask_password_agent_VALAFLAGS += \
- -g
-
- systemd_gnome_ask_password_agent_LDADD = \
-diff --git a/configure.ac b/configure.ac
-index 5a6f3c7..dfbce11 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -259,12 +259,16 @@ 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 >= 0.7.0 ],
-+ [ libnotify07=yes ],
-+ [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ]
-+ )
-+ AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
- AC_SUBST(LIBNOTIFY_CFLAGS)
- AC_SUBST(LIBNOTIFY_LIBS)
- fi
-
--AM_PROG_VALAC([0.11])
-+AM_PROG_VALAC([0.10])
- 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..61bbba0 100644
---- a/src/gnome-ask-password-agent.vala
-+++ b/src/gnome-ask-password-agent.vala
-@@ -38,8 +38,13 @@ public class PasswordDialog : Dialog {
- set_default_response(ResponseType.OK);
- set_icon_name(icon);
-
-+#if LIBNOTIFY07
- add_button(Stock.CANCEL, ResponseType.CANCEL);
- add_button(Stock.OK, ResponseType.OK);
-+#else
-+ add_button(STOCK_CANCEL, ResponseType.CANCEL);
-+ add_button(STOCK_OK, ResponseType.OK);
-+#endif
-
- Container content = (Container) get_content_area();
-
-@@ -181,7 +186,12 @@ public class MyStatusIcon : StatusIcon {
-
- set_visible(true);
-
-+#if LIBNOTIFY07
- Notification n = new Notification(title, message, icon);
-+#else
-+ Notification n = new Notification(title, message, icon, null);
-+ n.attach_to_status_icon(this);
-+#endif
- n.set_timeout(5000);
- n.show();
-
-@@ -225,7 +235,11 @@ public class MyStatusIcon : StatusIcon {
-
- OutputStream stream = new UnixOutputStream(to_process, true);
-
-+#if LIBNOTIFY07
- stream.write(password.data, null);
-+#else
-+ stream.write(password, password.length, null);
-+#endif
- }
- }
-
---
-cgit v0.8.3-6-g21f6
diff --git a/source/base/systemd/libnotify2.diff
b/source/base/systemd/libnotify2.diff
deleted file mode 100644
index 42a0369..0000000
--- a/source/base/systemd/libnotify2.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From ab85c225e0bf0ea432027715976cea00182f03c5 Mon Sep 17 00:00:00 2001
-From: Michael Biebl <bi...@debian.org>
-Date: Sat, 27 Nov 2010 12:29:14 +0000
-Subject: Ensure LIBNOTIFY07 conditional is always set
-
-Also use PKG_CHECK_EXISTS to test if libnotify is recent enough
----
-diff --git a/configure.ac b/configure.ac
-index dfbce11..4d29d5f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -259,14 +259,13 @@ if test "$have_gtk" = "yes"; then
- AC_SUBST(DBUSGLIB_CFLAGS)
- AC_SUBST(DBUSGLIB_LIBS)
-
-- PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify >= 0.7.0 ],
-- [ libnotify07=yes ],
-- [ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ]) ]
-- )
-- AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
-+ PKG_CHECK_MODULES(LIBNOTIFY, [ libnotify ])
-+ PKG_CHECK_EXISTS([ libnotify >= 0.7.0 ], [ libnotify07=yes ])
-+
- AC_SUBST(LIBNOTIFY_CFLAGS)
- AC_SUBST(LIBNOTIFY_LIBS)
- fi
-+AM_CONDITIONAL(LIBNOTIFY07, [ test "$libnotify07" = "yes" ])
-
- AM_PROG_VALAC([0.10])
- AC_SUBST(VAPIDIR)
---
-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
deleted file mode 100644
index 636e875..0000000
--- a/source/base/systemd/service-ifdef-distro-specific-compat-logic.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index e56b3bb..0000000
--- a/source/base/systemd/sysv_translate_name.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 65530632c7e40bc369edcba8f014ec9136c8eb02 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmik...@frugalware.org>
-Date: Tue, 07 Dec 2010 21:51:21 +0000
-Subject: service: drop rc. prefix on frugalware linux
-
----
-diff --git a/src/service.c b/src/service.c
-index 1f478f4..620f2b3 100644
---- a/src/service.c
-+++ b/src/service.c
-@@ -248,6 +248,11 @@ static char *sysv_translate_name(const char *name) {
- /* Drop Arch-style background prefix */
- strcpy(stpcpy(r, name + 1), ".service");
- #endif
-+#ifdef TARGET_FRUGALWARE
-+ else if (startswith(name, "rc."))
-+ /* Drop Frugalware-style rc. prefix */
-+ strcpy(stpcpy(r, name + 3), ".service");
-+#endif
- else
- /* Normal init scripts */
- strcpy(stpcpy(r, name), ".service");
-@@ -887,6 +892,18 @@ static int service_load_sysv_name(Service *s, const char
*name) {
- free(path);
- }
-
-+ if (r >= 0 && s->meta.load_state == UNIT_STUB) {
-+ /* Try Frugalware style rc.xxx init scripts */
-+
-+ if (asprintf(&path, "%s/rc.%s", *p, name) < 0)
-+ return -ENOMEM;
-+
-+ /* Drop .service suffix */
-+ path[strlen(path)-8] = 0;
-+ r = service_load_sysv_path(s, path);
-+ free(path);
-+ }
-+
- if (r < 0)
- return r;
-
---
-cgit v0.8.3-6-g21f6
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
