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

Fix libsystemd patch

This commit is contained in:
Alexander Bokovoy 2016-05-25 14:16:10 +03:00
parent a747ed75d6
commit 0acf45b178
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samba-use-libsystemd.patch
View File

@ -25,7 +25,7 @@ index 4622971907..04d77da529 100644
_PUBLIC_ void exit_daemon(const char *msg, int error) _PUBLIC_ void exit_daemon(const char *msg, int error)
{ {
-#ifdef HAVE_LIBSYSTEMD_DAEMON -#ifdef HAVE_LIBSYSTEMD_DAEMON
+#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD +#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD
if (msg == NULL) { if (msg == NULL) {
msg = strerror(error); msg = strerror(error);
} }
@ -34,7 +34,7 @@ index 4622971907..04d77da529 100644
name = "Samba"; name = "Samba";
} }
-#ifdef HAVE_LIBSYSTEMD_DAEMON -#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); sd_notifyf(0, "READY=1\nSTATUS=%s: ready to serve connections...", name);
#endif #endif
DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve " DEBUG(0, ("STATUS=daemon '%s' finished starting up and ready to serve "
@ -43,7 +43,7 @@ index 4622971907..04d77da529 100644
name = "Samba"; name = "Samba";
} }
-#ifdef HAVE_LIBSYSTEMD_DAEMON -#ifdef HAVE_LIBSYSTEMD_DAEMON
+#ifdef HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD +#if HAVE_LIBSYSTEMD_DAEMON || HAVE_LIBSYSTEMD
sd_notifyf(0, "\nSTATUS=%s: %s", name, msg); sd_notifyf(0, "\nSTATUS=%s: %s", name, msg);
#endif #endif
DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg)); DEBUG(0, ("STATUS=daemon '%s' : %s", name, msg));

9
samba.spec
View File

@ -6,7 +6,7 @@
# ctdb is enabled by default, you can disable it with: --without clustering # ctdb is enabled by default, you can disable it with: --without clustering
%bcond_without clustering %bcond_without clustering
%define main_release 1 %define main_release 2
%define samba_version 4.4.3 %define samba_version 4.4.3
%define talloc_version 2.1.6 %define talloc_version 2.1.6
@ -75,7 +75,7 @@
Name: samba Name: samba
Version: %{samba_version} Version: %{samba_version}
Release: %{samba_release}.2 Release: %{samba_release}
%if 0%{?rhel} %if 0%{?rhel}
Epoch: 0 Epoch: 0
@ -686,7 +686,7 @@ and use CTDB instead.
%setup -q -n samba-%{version}%{pre_release} %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 %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 %build
%global _talloc_lib ,talloc,pytalloc,pytalloc-util %global _talloc_lib ,talloc,pytalloc,pytalloc-util
@ -1983,6 +1983,9 @@ rm -rf %{buildroot}
%endif # with_clustering_support %endif # with_clustering_support
%changelog %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 * 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) - Rebuild to drop libsystemd-daemon dependency (#1125086)