diff --git a/stunnel-listenqueue-option.patch b/stunnel-listenqueue-option.patch index 3955005..ecddd2c 100644 --- a/stunnel-listenqueue-option.patch +++ b/stunnel-listenqueue-option.patch @@ -1,6 +1,12 @@ +--- + src/options.c | 18 ++++++++++++++++++ + src/prototypes.h | 1 + + src/stunnel.c | 2 +- + 3 files changed, 20 insertions(+), 1 deletion(-) + --- src/options.c -+++ src/options.c -@@ -1872,6 +1872,24 @@ ++++ src/options.c 2017-04-06 08:40:50.927511225 +0000 +@@ -1881,6 +1881,24 @@ NOEXPORT char *parse_service_option(CMD break; } @@ -26,8 +32,8 @@ /* OCSP */ --- src/prototypes.h -+++ src/prototypes.h -@@ -248,6 +248,7 @@ ++++ src/prototypes.h 2017-04-06 08:40:50.927511225 +0000 +@@ -252,6 +252,7 @@ typedef struct service_options_struct { int timeout_close; /* maximum close_notify time */ int timeout_connect; /* maximum connect() time */ int timeout_idle; /* maximum idle connection time */ @@ -36,8 +42,8 @@ char *username; --- src/stunnel.c -+++ src/stunnel.c -@@ -451,7 +451,7 @@ ++++ src/stunnel.c 2017-04-06 08:40:50.927511225 +0000 +@@ -476,7 +476,7 @@ int bind_ports(void) { str_free(local_address); return 1; } diff --git a/stunnel.changes b/stunnel.changes index 97e4e47..eab3970 100644 --- a/stunnel.changes +++ b/stunnel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 6 09:05:55 UTC 2017 - werner@suse.de + +- Require package config for libsystemd to help the configure script + to detect and enable systemd socket activation (boo#1032557) +- Refresh patch stunnel-listenqueue-option.patch + ------------------------------------------------------------------- Sat Apr 1 19:07:51 UTC 2017 - michael@stroeder.com diff --git a/stunnel.spec b/stunnel.spec index 234b6b0..f738555 100644 --- a/stunnel.spec +++ b/stunnel.spec @@ -34,8 +34,10 @@ Patch0: stunnel-listenqueue-option.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define VENDOR openSUSE BuildRequires: libopenssl-devel +BuildRequires: pkgconfig BuildRequires: tcpd-devel BuildRequires: zlib-devel +BuildRequires: pkgconfig(libsystemd) %if 0%{?suse_version} >= 1210 BuildRequires: systemd @@ -67,7 +69,7 @@ This package contains additional documentation for the stunnel program. %prep %setup -q -n stunnel-%{version} -%patch0 -p0 +%patch0 -p0 chmod -x $RPM_BUILD_DIR/stunnel-%{version}/tools/ca.* chmod -x $RPM_BUILD_DIR/stunnel-%{version}/tools/importCA.*