diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-05-23 08:47:19 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-05-23 09:26:33 -0400 |
| commit | 216783b3bd2d9a469d996cd714f2ced34cf9019c (patch) | |
| tree | f22d5aad4b088a4f78333be58e8ff826cc529184 | |
| parent | af5c6851afd0cd755b2acffad87dc0864e42a511 (diff) | |
Rebuild to drop libsystemd-daemon dependency
| -rw-r--r-- | samba-use-libsystemd.patch | 49 | ||||
| -rw-r--r-- | samba.spec | 8 |
2 files changed, 55 insertions, 2 deletions
diff --git a/samba-use-libsystemd.patch b/samba-use-libsystemd.patch new file mode 100644 index 0000000..2ad20b4 --- /dev/null +++ b/samba-use-libsystemd.patch @@ -0,0 +1,49 @@ +diff --git samba-4.4.3/lib/util/become_daemon.c~ samba-4.4.3/lib/util/become_daemon.c +index 4622971907..04d77da529 100644 +--- samba-4.4.3/lib/util/become_daemon.c~ ++++ samba-4.4.3/lib/util/become_daemon.c +@@ -24,7 +24,7 @@ + #include "includes.h" + #include "system/filesys.h" + #include "system/locale.h" +-#if HAVE_LIBSYSTEMD_DAEMON ++#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD + #include <systemd/sd-daemon.h> + #endif + #include "lib/util/close_low_fd.h" +@@ -69,7 +69,7 @@ _PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool log_stdout + if (do_fork) { + newpid = fork(); + if (newpid) { +-#if HAVE_LIBSYSTEMD_DAEMON ++#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD + sd_notifyf(0, "READY=0\nSTATUS=Starting process...\nMAINPID=%lu", (unsigned long) newpid); + #endif /* HAVE_LIBSYSTEMD_DAEMON */ + _exit(0); +@@ -98,7 +98,7 @@ _PUBLIC_ void become_daemon(bool do_fork, bool no_process_group, bool log_stdout + + _PUBLIC_ void exit_daemon(const char *msg, int error) + { +-#ifdef HAVE_LIBSYSTEMD_DAEMON ++#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD + if (msg == NULL) { + msg = strerror(error); + } +@@ -117,7 +117,7 @@ _PUBLIC_ void daemon_ready(const char *name) + if (name == NULL) { + name = "Samba"; + } +-#ifdef HAVE_LIBSYSTEMD_DAEMON ++#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD + sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", name); + #endif + DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve " +@@ -129,7 +129,7 @@ _PUBLIC_ void daemon_status(const char *name, const char *msg) + if (name == NULL) { + name = "Samba"; + } +-#ifdef HAVE_LIBSYSTEMD_DAEMON ++#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD + sd_notifyf(0, "\nSTATUS=%s: %s", name, msg); + #endif + DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg)); @@ -75,7 +75,7 @@ Name: samba Version: %{samba_version} -Release: %{samba_release}.1 +Release: %{samba_release}.2 %if 0%{?rhel} Epoch: 0 @@ -107,6 +107,7 @@ Source200: README.dc Source201: README.downgrade Patch0: samba-4.4.2-s3-winbind-make-sure-domain-member-can-talk-to-trust.patch +Patch1: samba-use-libsystemd.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -171,7 +172,6 @@ BuildRequires: sed BuildRequires: xfsprogs-devel BuildRequires: zlib-devel >= 1.2.3 -BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd) %if %{with_vfs_glusterfs} @@ -683,6 +683,7 @@ and use CTDB instead. %setup -q -n samba-%{version}%{pre_release} %patch0 -p 1 -b .samba-4.4.2-s3-winbind-make-sure-domain-member-can-talk-to-trust.patch +%patch1 -p1 %build %global _talloc_lib ,talloc,pytalloc,pytalloc-util @@ -1976,6 +1977,9 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Mon May 23 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2:4.4.3-1.2 +- Rebuild to drop libsystemd-daemon dependency (#1125086) + * Sun May 15 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2:4.4.3-1.1 - Perl 5.24 rebuild |