diff --git a/.gitignore b/.gitignore index 5ca14e7..75a2b6c 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,14 @@ /gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg /ocserv-0.11.9.tar.xz.sig /ocserv-0.11.9.tar.xz +/ocserv.init +/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg +/ocserv-script +/ocserv-genkey +/PACKAGE-LICENSING +/ocserv-pamd.conf +/ocserv.service +/ocserv.conf +/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg +/ocserv-0.11.9.tar.xz.sig +/ocserv-0.11.9.tar.xz diff --git a/ocserv.spec b/ocserv.spec index 790a9a3..94af597 100644 --- a/ocserv.spec +++ b/ocserv.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 0.11.9 -Release: 2%{?dist} +Release: 3%{?dist} %global _hardened_build 1 %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -11,6 +11,12 @@ Release: 2%{?dist} %define have_gpgv2 0 %endif +%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 +%define use_libwrap 0 +%else +%define use_libwrap 1 +%endif + Name: ocserv Summary: OpenConnect SSL VPN server @@ -42,7 +48,15 @@ BuildRequires: gnutls-devel BuildRequires: pam-devel BuildRequires: iproute +%if 0%{?rhel} && 0%{?rhel} == 7 +%ifnarch ppc64 BuildRequires: protobuf-c-devel +%endif +%else + +BuildRequires: protobuf-c-devel +%endif + BuildRequires: libnl3-devel BuildRequires: krb5-devel BuildRequires: libtasn1-devel @@ -136,12 +150,20 @@ export LIBGNUTLS_LIBS="-L%{_libdir}/gnutls30/ -lgnutls" export CFLAGS="$CFLAGS -I/usr/include/libev -I/usr/include/gnutls30" sed -i 's/AM_PROG_AR//g' configure.ac autoreconf -fvi +%endif + %configure \ +%if %{use_systemd} + --enable-systemd \ +%else --disable-systemd \ - --enable-local-libopts +%endif +%if 0%{?rhel} && 0%{?rhel} <= 6 + --enable-local-libopts \ +%endif +%if %{use_libwrap} + --with-libwrap %else -%configure \ - --enable-systemd \ --without-libwrap %endif @@ -233,6 +255,9 @@ rm -rf %{buildroot} %endif %changelog +* Tue Nov 21 2017 Nikos Mavrogiannopoulos - 0.11.9-3 +- Update to upstream 0.11.9 release + * Thu Nov 16 2017 Nikos Mavrogiannopoulos - 0.11.9-2 - Do not enable libwrap