rpms
/
samba
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rebuild to drop libsystemd-daemon dependency

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-05-23 08:47:19 -04:00
parent af5c6851af
commit 216783b3bd
2 changed files with 55 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
samba-use-libsystemd.patch Normal file
View File

@ -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));

8
samba.spec
View File

@ -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