[packages/systemd] Updated to 187
baggins
baggins at pld-linux.org
Fri Jul 20 14:12:06 CEST 2012
commit ab590cee4f07a15c75cca945097d43a85e415fcc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Jul 20 14:11:58 2012 +0200
Updated to 187
static-udev.patch | 4 ++--
systemd.spec | 47 ++++++-----------------------------------------
target-pld.patch | 36 ++++++++++++++++++------------------
3 files changed, 26 insertions(+), 61 deletions(-)
---
diff --git a/static-udev.patch b/static-udev.patch
index 7142f0c..39f7d9e 100644
--- a/static-udev.patch
+++ b/static-udev.patch
@@ -57,7 +57,7 @@ diff -ur systemd-183.orig/src/shared/install.c systemd-183/src/shared/install.c
- if (!path_is_absolute(*i) ||
+ if (!sd_path_is_absolute(*i) ||
- !unit_name_is_valid_no_type(fn, true)) {
+ !unit_name_is_valid(fn, true)) {
if (r == 0)
r = -EINVAL;
@@ -972,7 +972,7 @@
@@ -122,7 +122,7 @@ diff -ur systemd-183.orig/src/shared/path-util.c systemd-183/src/shared/path-uti
+ if (sd_path_is_absolute(p) || !prefix)
return strdup(p);
- return join(prefix, "/", p, NULL);
+ return strjoin(prefix, "/", p, NULL);
}
-char *path_make_absolute_cwd(const char *p) {
diff --git a/systemd.spec b/systemd.spec
index dfaba56..b20ccbf 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -38,13 +38,13 @@ Summary: A System and Service Manager
Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa
Name: systemd
# Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
-Version: 186
-Release: 2
+Version: 187
+Release: 1
Epoch: 1
License: GPL v2+
Group: Base
Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
-# Source0-md5: 17eff1d31e6e49bf82e129fe57efd59b
+# Source0-md5: 26606e3c84448800ef0b3ffd57e6e8b6
Source1: %{name}-sysv-convert
Source2: %{name}_booted.c
Source3: network.service
@@ -86,7 +86,7 @@ BuildRequires: acl-devel
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11
BuildRequires: binutils >= 3:2.22.52.0.1-2
-%{?with_cryptsetup:BuildRequires: cryptsetup-luks-devel}
+%{?with_cryptsetup:BuildRequires: cryptsetup-devel >= 1.4.3}
BuildRequires: dbus-devel >= 1.3.2
BuildRequires: docbook-style-xsl
BuildRequires: glib2-devel >= 1:2.22.0
@@ -1046,9 +1046,6 @@ fi
%{_mandir}/man7/bootup.7*
%{_mandir}/man7/daemon.7*
%{_mandir}/man7/kernel-command-line.7*
-%{_mandir}/man7/sd-daemon.7*
-%{_mandir}/man7/sd-login.7*
-%{_mandir}/man7/sd-readahead.7*
%{_mandir}/man7/systemd.journal-fields.7*
%{_mandir}/man7/systemd.special.7*
%{_mandir}/man8/systemd-binfmt.8*
@@ -1243,40 +1240,8 @@ fi
%{_pkgconfigdir}/libsystemd-id128.pc
%{_pkgconfigdir}/libsystemd-journal.pc
%{_pkgconfigdir}/libsystemd-login.pc
-%{_mandir}/man3/sd_booted.3*
-%{_mandir}/man3/sd_get_seats.3*
-%{_mandir}/man3/sd_get_sessions.3*
-%{_mandir}/man3/sd_get_uids.3*
-%{_mandir}/man3/sd_is_fifo.3*
-%{_mandir}/man3/sd_is_mq.3*
-%{_mandir}/man3/sd_is_socket.3
-%{_mandir}/man3/sd_is_socket_inet.3
-%{_mandir}/man3/sd_is_socket_unix.3
-%{_mandir}/man3/sd_listen_fds.3*
-%{_mandir}/man3/sd_login_monitor_flush.3*
-%{_mandir}/man3/sd_login_monitor_get_fd.3*
-%{_mandir}/man3/sd_login_monitor_new.3*
-%{_mandir}/man3/sd_login_monitor_unref.3*
-%{_mandir}/man3/sd_notify.3*
-%{_mandir}/man3/sd_notifyf.3
-%{_mandir}/man3/sd_pid_get_owner_uid.3*
-%{_mandir}/man3/sd_pid_get_session.3*
-%{_mandir}/man3/sd_pid_get_unit.3*
-%{_mandir}/man3/sd_readahead.3*
-%{_mandir}/man3/sd_seat_can_multi_session.3*
-%{_mandir}/man3/sd_seat_get_active.3*
-%{_mandir}/man3/sd_seat_get_sessions.3*
-%{_mandir}/man3/sd_session_get_class.3*
-%{_mandir}/man3/sd_session_get_display.3*
-%{_mandir}/man3/sd_session_get_seat.3*
-%{_mandir}/man3/sd_session_get_service.3*
-%{_mandir}/man3/sd_session_get_type.3*
-%{_mandir}/man3/sd_session_get_uid.3*
-%{_mandir}/man3/sd_session_is_active.3*
-%{_mandir}/man3/sd_uid_get_seats.3*
-%{_mandir}/man3/sd_uid_get_sessions.3*
-%{_mandir}/man3/sd_uid_get_state.3*
-%{_mandir}/man3/sd_uid_is_on_seat.3*
+%{_mandir}/man3/SD_*.3*
+%{_mandir}/man3/sd*.3*
%files -n bash-completion-systemd
%defattr(644,root,root,755)
diff --git a/target-pld.patch b/target-pld.patch
index 2fc7fbe..b8c5479 100644
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -76,9 +76,9 @@ index 596a32a..f701bfd 100644
+ AC_DEFINE(TARGET_PLD, [], [Target is PLD Linux])
+ M4_DISTRO_FLAG=-DTARGET_PLD=1
+ ;;
- meego)
- SYSTEM_SYSVINIT_PATH=
- SYSTEM_SYSVRCND_PATH=
+ angstrom)
+ SYSTEM_SYSVRCND_PATH=/etc
+ AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström])
@@ -510,6 +517,7 @@ if test -n "$enable_plymouth"; then
fi
@@ -108,8 +108,8 @@ index 2c2f10c..754f0c7 100644
#include "util.h"
#include "log.h"
--#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
+-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
++#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
#define FILENAME "/etc/sysconfig/network"
#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
#define FILENAME "/etc/HOSTNAME"
@@ -117,8 +117,8 @@ index 2c2f10c..754f0c7 100644
static int read_distro_hostname(char **hn) {
--#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) || defined(TARGET_MAGEIA)
+-#if defined(TARGET_FEDORA) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
++#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ARCH) || defined(TARGET_GENTOO) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA)
int r;
FILE *f;
@@ -130,8 +130,8 @@ index 7f692e9..0a45854 100644
if (detect_container(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
--#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MEEGO)
+-#if defined(TARGET_FEDORA)
++#if defined(TARGET_FEDORA) || defined(TARGET_PLD)
"LANG", &variables[VARIABLE_LANG],
#endif
"locale.LANG", &variables[VARIABLE_LANG],
@@ -139,8 +139,8 @@ index 7f692e9..0a45854 100644
log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
}
--#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MEEGO)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ALTLINUX) || defined(TARGET_MEEGO)
+-#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX)
++#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_ALTLINUX)
if (r <= 0 &&
(r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"LANG", &variables[VARIABLE_LANG],
@@ -152,8 +152,8 @@ index 298cb4e..cec3974 100644
static int enable_sysv_units(char **args) {
int r = 0;
--#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_MEEGO) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
-+#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_MEEGO) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
+-#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
++#if defined (HAVE_SYSV_COMPAT) && (defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE) || defined(TARGET_ALTLINUX) || defined(TARGET_MAGEIA))
const char *verb = args[0];
unsigned f = 1, t = 1;
LookupPaths paths;
@@ -178,8 +178,8 @@ index 9196789..1d1a916 100644
}
if (r <= 0) {
--#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
-+#if defined(TARGET_FEDORA) || defined(TARGET_PLD) || defined(TARGET_MEEGO)
+-#if defined(TARGET_FEDORA)
++#if defined(TARGET_FEDORA) || defined(TARGET_PLD)
r = parse_env_file("/etc/sysconfig/i18n", NEWLINE,
"SYSFONT", &vc_font,
"SYSFONTACM", &vc_font_map,
@@ -226,11 +226,11 @@ index 7dd8a22..5a9c363 100644
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
@@ -31,7 +34,7 @@ ExecStart=-/bin/bash -c "exec ${SINGLE}"',
- m4_ifdef(`TARGET_MEEGO',
+ m4_ifdef(`TARGET_MAGEIA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
--`ExecStart=-/sbin/sulogin'))))
-+`ExecStart=-/sbin/sulogin')))))
+-`ExecStart=-/sbin/sulogin')))
++`ExecStart=-/sbin/sulogin'))))
ExecStopPost=- at SYSTEMCTL@ --fail --no-block default
StandardInput=tty-force
StandardOutput=inherit
More information about the pld-cvs-commit
mailing list