diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2016-05-25 14:16:10 +0300 |
|---|---|---|
| committer | Alexander Bokovoy <abokovoy@redhat.com> | 2016-05-25 14:16:10 +0300 |
| commit | 0acf45b17873e468c585d845585f7cba395dffbf (patch) | |
| tree | b99c4e49496e6fddaea9e9befd5173f7d6c7fc91 | |
| parent | a747ed75d6ea2ba25c8f3e192435970fca852b2d (diff) | |
Fix libsystemd patch
| -rw-r--r-- | samba-use-libsystemd.patch | 6 | ||||
| -rw-r--r-- | samba.spec | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/samba-use-libsystemd.patch b/samba-use-libsystemd.patch index 2ad20b4..2fe68d8 100644 --- a/samba-use-libsystemd.patch +++ b/samba-use-libsystemd.patch @@ -25,7 +25,7 @@ index 4622971907..04d77da529 100644 _PUBLIC_ void exit_daemon(const char *msg, int error) { -#ifdef HAVE_LIBSYSTEMD_DAEMON -+#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD if (msg == NULL) { msg = strerror(error); } @@ -34,7 +34,7 @@ index 4622971907..04d77da529 100644 name = "Samba"; } -#ifdef HAVE_LIBSYSTEMD_DAEMON -+#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if 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 " @@ -43,7 +43,7 @@ index 4622971907..04d77da529 100644 name = "Samba"; } -#ifdef HAVE_LIBSYSTEMD_DAEMON -+#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD ++#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD sd_notifyf(0, "\nSTATUS=%s: %s", name, msg); #endif DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg)); @@ -6,7 +6,7 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 1 +%define main_release 2 %define samba_version 4.4.3 %define talloc_version 2.1.6 @@ -75,7 +75,7 @@ Name: samba Version: %{samba_version} -Release: %{samba_release}.2 +Release: %{samba_release} %if 0%{?rhel} Epoch: 0 @@ -686,7 +686,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 +%patch1 -p 1 -b .samba-use-libsystemd.patch %build %global _talloc_lib ,talloc,pytalloc,pytalloc-util @@ -1983,6 +1983,9 @@ rm -rf %{buildroot} %endif # with_clustering_support %changelog +* Wed May 25 2016 Alexander Bokovoy <abokovoy@redhat.com> - 2:4.4.3-2 +- Fix libsystemd patch (#1125086) so that it actually works + * 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) |