Update to 0.11.11-1

- Update to upstream 0.11.11 release
This commit is contained in:
Nikos Mavrogiannopoulos 2018-03-05 17:08:34 +01:00
parent b795c451c6
commit b13f7a7526
5 changed files with 23 additions and 34 deletions

11
.gitignore vendored
View File

@ -94,3 +94,14 @@
/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
/ocserv-0.11.10.tar.xz.sig
/ocserv-0.11.10.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.11.tar.xz.sig
/ocserv-0.11.11.tar.xz

View File

@ -1,23 +0,0 @@
diff --git a/src/worker-vpn.c b/src/worker-vpn.c
index 730d7d2b..f1585a44 100644
--- a/src/worker-vpn.c
+++ b/src/worker-vpn.c
@@ -2158,11 +2158,17 @@ static int connect_handler(worker_st * ws)
sigprocmask(SIG_BLOCK, &blockset, NULL);
#endif
if (ret == -1) {
- if (errno == EINTR)
+ if (errno == EINTR || EAGAIN)
continue;
terminate_reason = REASON_ERROR;
goto exit;
}
+
+ if ((pfd[0].revents | pfd[1].revents |
+ pfd[2].revents | pfd[3].revents) & POLLERR) {
+ terminate_reason = REASON_ERROR;
+ goto exit;
+ }
}
gettime(&tnow);

View File

@ -1,6 +1,6 @@
# This spec file has been automatically updated
Version: 0.11.10
Release: 2%{?dist}
Version: 0.11.11
Release: 1%{?dist}
%global _hardened_build 1
%if 0%{?fedora} || 0%{?rhel} >= 7
@ -42,11 +42,9 @@ Source8: ocserv-genkey
Source9: ocserv-script
Source10: gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
Source11: ocserv.init
Patch0: ocserv-0.11.10-fix-loop.patch
# Taken from upstream:
# http://git.infradead.org/ocserv.git/commitdiff/7d70006a2dbddf783213f1856374bacc74217e09
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?rhel} && 0%{?rhel} <= 6
BuildRequires: gnutls30-devel
@ -68,7 +66,9 @@ BuildRequires: pcllib-devel
BuildRequires: libtalloc-devel
BuildRequires: libev-devel
BuildRequires: http-parser-devel
%if %{use_libwrap}
BuildRequires: tcp_wrappers-devel
%endif
BuildRequires: automake, autoconf
BuildRequires: radcli-devel
BuildRequires: lz4-devel
@ -83,6 +83,7 @@ BuildRequires: autogen
BuildRequires: liboath-devel
BuildRequires: uid_wrapper
BuildRequires: socket_wrapper
BuildRequires: gnupg2
%if 0%{?rhel} && 0%{?rhel} >= 7
%ifarch x86_64 %{ix86}
@ -126,7 +127,6 @@ to provide the secure VPN service.
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} || gpgv2 --keyring %{SOURCE10} %{SOURCE1} %{SOURCE0}
%endif
%setup -q
%patch0 -p1 -b .infinite-loop
rm -f src/http-parser/http_parser.c src/http-parser/http_parser.h
%if (0%{?use_local_protobuf} == 0)
@ -140,6 +140,7 @@ 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/*
sed -i 's/exit 1/exit 77/g' tests/ocpasswd-test
%if 0%{?rhel} && 0%{?rhel} <= 6
echo "int main() { return 77; }" > tests/valid-hostname.c
@ -233,9 +234,6 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
%make_install
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
@ -264,6 +262,9 @@ rm -rf %{buildroot}
%endif
%changelog
* Mon Mar 05 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.11-1
- Update to upstream 0.11.11 release
* Mon Jan 08 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.11.10-1
- Update to upstream 0.11.10 release

View File

@ -6,6 +6,6 @@ SHA512 (PACKAGE-LICENSING) = eea2a2a4765c90d874c79bb72d754c8b26b58d5e5b3c3cee10c
SHA512 (ocserv-pamd.conf) = 3a75f19d89ddd164f3faa9c3579c7f675fc58413a194f43ec28eee7ebced6fee3f4ca305fe9b0ddf76ae39cd669e8d3d63b58afbbf19b84e4ca646ae7f42d61a
SHA512 (ocserv.service) = 264f3389d88aec1f7d2e4683a4dfc0aa67af2325154de822eecf5fb43f8c221aab0d9f0c6a8eedb893e6d69ed4d94c9397b01e5d0d12e88330017a3bfa5f3644
SHA512 (ocserv.conf) = 0a48d394dba183528c1e92df2a8b844a4d7d419244b1c08883f79c8b48843986e786ea4d48478ed4e8d57fd56626bf962dbcf6c76b5839ba5ab5fac8b089c44c
SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 7eccc70fb763cf8a6525228230c1f537224809cf553efb3ad6bc88ad96f01122c30a5cd9d8328fa3a97b242d59e00bc9966589a24b1e65dd4a27eb71393f097c
SHA512 (ocserv-0.11.10.tar.xz.sig) = d88f3e42595df6c3a13dc64cbcdcca2126f22be7143856b00b0c7620358f9d0e5c524019c11ff10549e74ef5eebb0613c25afd9f7244c6ab14fb70b8059188b8
SHA512 (ocserv-0.11.10.tar.xz) = 40fe152adf4438ed390406ec46049ff3769208e1d48b40bc0f015d507902a6e81012a52dd4ddd867f56a6d50de1dfb8fa497dc3bb6ece3e666ca14df1d76c561
SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 3b1989dc6a64d1140f83a2af0773da2adb03c50d97b6da7357cf09525050651aafa21131f1e3180baa540a8af922119a256f5ff5bcd6602996a806e8e1816bad
SHA512 (ocserv-0.11.11.tar.xz.sig) = 7a1521f94d48d7aafb66e6c544eb2e1c5a08d02441acc5f57876faaa984ad203f0395da37e602ad5539f54aa0ce1ff5da7389254028f6b811a9e01d6f86b1e84
SHA512 (ocserv-0.11.11.tar.xz) = 1750e4ddd221913f82379ed34cf63f2ce858d73cfda0bcf60670a32bf2e8574a39f267c77abab78d2cf9a563a816d975e1a07b85c5e2412bd6d009850c8c262d