From 6270c2a0adab382ec33ab87e6cca55ff4014b996 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 9 Apr 2018 18:50:03 +0000 Subject: [PATCH] - merged 2.4.4 from PLD --- openvpn.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/openvpn.spec b/openvpn.spec index a5420c7..a08b545 100644 --- a/openvpn.spec +++ b/openvpn.spec @@ -1,26 +1,28 @@ +# # Conditional build: %bcond_without pkcs11 # PKCS#11 support Summary: VPN Daemon Summary(pl.UTF-8): Serwer VPN Name: openvpn -Version: 2.4.0 +Version: 2.4.4 Release: 1 License: GPL v2 Group: Networking/Daemons Source0: http://swupdate.openvpn.net/community/releases/%{name}-%{version}.tar.xz -# Source0-md5: e49431542f065dd60a0181233927669e +# Source0-md5: 7a2002aad1671b24457bc9432a0c5c52 Source1: %{name}.init Source2: %{name}.sysconfig -Source3: %{name}-update-resolv-conf +Source7: %{name}-update-resolv-conf Patch0: %{name}-pam.patch URL: http://www.openvpn.net/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.9 BuildRequires: libselinux-devel BuildRequires: libtool +BuildRequires: lz4-devel >= 1:1.7 BuildRequires: lzo-devel -BuildRequires: openssl-devel >= 0.9.7d +BuildRequires: openssl-devel >= 0.9.8 %{?with_pkcs11:BuildRequires: p11-kit-devel} BuildRequires: pam-devel %{?with_pkcs11:BuildRequires: pkcs11-helper-devel >= 1.11} @@ -30,6 +32,7 @@ BuildRequires: tar >= 1:1.22 BuildRequires: xz Requires(post,preun): /sbin/chkconfig Requires: /sbin/ip +Requires: openssl >= 0.9.8 %{?with_pkcs11:Requires: pkcs11-helper >= 1.11} Requires: rc-scripts >= 0.4.3.0 Requires: uname(release) >= 2.4 @@ -126,7 +129,7 @@ Ten pakiet zawiera pliki nagłówkowe do tworzenia wtyczek OpenVPN. %setup -q %patch0 -p1 -sed -e 's,/''usr/lib/openvpn,%{_libdir}/%{name},' %{SOURCE3} > contrib/update-resolv-conf +sed -e 's,/''usr/lib/openvpn,%{_libdir}/%{name},' %{SOURCE7} > contrib/update-resolv-conf %build %{__libtoolize} @@ -134,12 +137,12 @@ sed -e 's,/''usr/lib/openvpn,%{_libdir}/%{name},' %{SOURCE3} > contrib/update-re %{__autoheader} %{__autoconf} %{__automake} - +CPPFLAGS="%{rpmcppflags} $(pkg-config --cflags liblz4)" %configure \ IFCONFIG=/sbin/ifconfig \ IPROUTE=/sbin/ip \ - ROUTE=/sbin/route \ NETSTAT=/bin/netstat \ + ROUTE=/sbin/route \ ac_cv_nsl_inet_ntoa=no \ ac_cv_socket_socket=no \ ac_cv_resolv_gethostbyname=no \ -- 2.44.0