diff --git a/.gitignore b/.gitignore index 75a2b6c..ed5bff9 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,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.10.tar.xz.sig +/ocserv-0.11.10.tar.xz diff --git a/ocserv.spec b/ocserv.spec index 94af597..f536113 100644 --- a/ocserv.spec +++ b/ocserv.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated -Version: 0.11.9 -Release: 3%{?dist} +Version: 0.11.10 +Release: 1%{?dist} %global _hardened_build 1 %if 0%{?fedora} || 0%{?rhel} >= 7 @@ -17,6 +17,13 @@ Release: 3%{?dist} %define use_libwrap 1 %endif +%define use_local_protobuf 0 +%if 0%{?rhel} && 0%{?rhel} == 7 +%ifarch ppc64 +%define use_local_protobuf 1 +%endif +%endif + Name: ocserv Summary: OpenConnect SSL VPN server @@ -48,12 +55,7 @@ BuildRequires: gnutls-devel BuildRequires: pam-devel BuildRequires: iproute -%if 0%{?rhel} && 0%{?rhel} == 7 -%ifnarch ppc64 -BuildRequires: protobuf-c-devel -%endif -%else - +%if (0%{?use_local_protobuf} == 0) BuildRequires: protobuf-c-devel %endif @@ -125,7 +127,10 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} || gpgv2 --keyring %{SOURCE10} %setup -q rm -f src/http-parser/http_parser.c src/http-parser/http_parser.h +%if (0%{?use_local_protobuf} == 0) rm -rf src/protobuf/protobuf-c/ +touch src/*.proto +%endif rm -rf src/ccan/talloc rm -f src/pcl/*.c src/pcl/*.h sed -i 's|/etc/ocserv.conf|/etc/ocserv/ocserv.conf|g' src/config.c @@ -133,7 +138,6 @@ sed -i 's/run-as-group = nogroup/run-as-group = nobody/g' tests/data/*.config # GPLv3 in headers is a gnulib bug: # http://lists.gnu.org/archive/html/bug-gnulib/2013-11/msg00062.html sed -i 's/either version 3 of the License/either version 2 of the License/g' build-aux/snippet/* -touch src/*.proto %if 0%{?rhel} && 0%{?rhel} <= 6 echo "int main() { return 77; }" > tests/valid-hostname.c @@ -161,6 +165,9 @@ autoreconf -fvi %if 0%{?rhel} && 0%{?rhel} <= 6 --enable-local-libopts \ %endif +%if %{use_local_protobuf} + --without-protobuf \ +%endif %if %{use_libwrap} --with-libwrap %else @@ -255,6 +262,9 @@ rm -rf %{buildroot} %endif %changelog +* Mon Jan 08 2018 Nikos Mavrogiannopoulos - 0.11.10-1 +- Update to upstream 0.11.10 release + * Tue Nov 21 2017 Nikos Mavrogiannopoulos - 0.11.9-3 - Update to upstream 0.11.9 release diff --git a/sources b/sources index dadd5d3..43899fc 100644 --- a/sources +++ b/sources @@ -7,5 +7,5 @@ SHA512 (ocserv-pamd.conf) = 3a75f19d89ddd164f3faa9c3579c7f675fc58413a194f43ec28e SHA512 (ocserv.service) = 264f3389d88aec1f7d2e4683a4dfc0aa67af2325154de822eecf5fb43f8c221aab0d9f0c6a8eedb893e6d69ed4d94c9397b01e5d0d12e88330017a3bfa5f3644 SHA512 (ocserv.conf) = 0a48d394dba183528c1e92df2a8b844a4d7d419244b1c08883f79c8b48843986e786ea4d48478ed4e8d57fd56626bf962dbcf6c76b5839ba5ab5fac8b089c44c SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 7eccc70fb763cf8a6525228230c1f537224809cf553efb3ad6bc88ad96f01122c30a5cd9d8328fa3a97b242d59e00bc9966589a24b1e65dd4a27eb71393f097c -SHA512 (ocserv-0.11.9.tar.xz.sig) = 10fb1a9b80e92ce0aafc79af647fe16e61eafc20e3d6846d74cd357826f3d0217ab57c4e9e6efe8ba2ea7b665224e863caef2c5567c512c6403bbf99a3dd321d -SHA512 (ocserv-0.11.9.tar.xz) = e497dfbb55e83874d55238162b0c4340db0a9c6ac2223cfd905923b59ebfd2fba0f998c1a60e9492be2d1e4434c66c960c3619968b47efc8464420f2e9319067 +SHA512 (ocserv-0.11.10.tar.xz.sig) = d88f3e42595df6c3a13dc64cbcdcca2126f22be7143856b00b0c7620358f9d0e5c524019c11ff10549e74ef5eebb0613c25afd9f7244c6ab14fb70b8059188b8 +SHA512 (ocserv-0.11.10.tar.xz) = 40fe152adf4438ed390406ec46049ff3769208e1d48b40bc0f015d507902a6e81012a52dd4ddd867f56a6d50de1dfb8fa497dc3bb6ece3e666ca14df1d76c561