Nikos Mavrogiannopoulos
parent
914a518ada
commit
d4859d253f
|
|
@ -137,3 +137,14 @@
|
|||
/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
|
||||
/ocserv-0.12.0.tar.xz.sig
|
||||
/ocserv-0.12.0.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.12.1.tar.xz.sig
|
||||
/ocserv-0.12.1.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
diff --git a/tests/server-cert-rsa-pss b/tests/server-cert-rsa-pss
|
||||
new file mode 100755
|
||||
index 0000000..be3d098
|
||||
--- /dev/null
|
||||
+++ b/tests/server-cert-rsa-pss
|
||||
@@ -0,0 +1,40 @@
|
||||
+#!/bin/sh
|
||||
+#
|
||||
+# Copyright (C) 2017 Red Hat, Inc.
|
||||
+#
|
||||
+# This file is part of ocserv.
|
||||
+#
|
||||
+# ocserv is free software; you can redistribute it and/or modify it
|
||||
+# under the terms of the GNU General Public License as published by the
|
||||
+# Free Software Foundation; either version 2 of the License, or (at
|
||||
+# your option) any later version.
|
||||
+#
|
||||
+# ocserv is distributed in the hope that it will be useful, but
|
||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+# General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with GnuTLS; if not, write to the Free Software Foundation,
|
||||
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
+
|
||||
+SERV="${SERV:-../src/ocserv}"
|
||||
+srcdir=${srcdir:-.}
|
||||
+NO_NEED_ROOT=1
|
||||
+PORT=4444
|
||||
+
|
||||
+. `dirname $0`/common.sh
|
||||
+
|
||||
+echo "Testing server cert with RSA-PSS... "
|
||||
+
|
||||
+update_config test-rsa-pss.config
|
||||
+launch_sr_server -d 1 -f -c ${CONFIG} & PID=$!
|
||||
+wait_server $PID
|
||||
+
|
||||
+echo "Connecting to obtain cookie... "
|
||||
+( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT -q $ADDRESS:$PORT -u test --servercert=sha256:7462b697482f771a9a787bc19db00f704a1685ae09ed201b7a126b052a09522e --cookieonly ) ||
|
||||
+ fail $PID "Could not receive cookie from server"
|
||||
+
|
||||
+cleanup
|
||||
+
|
||||
+exit 0
|
||||
|
|
@ -7,10 +7,10 @@ After=dbus.service
|
|||
|
||||
[Service]
|
||||
PrivateTmp=true
|
||||
Type=forking
|
||||
Type=simple
|
||||
PIDFile=/var/run/ocserv.pid
|
||||
ExecStartPre=/usr/sbin/ocserv-genkey
|
||||
ExecStart=/usr/sbin/ocserv --pid-file /var/run/ocserv.pid --config /etc/ocserv/ocserv.conf
|
||||
ExecStart=/usr/sbin/ocserv --pid-file /var/run/ocserv.pid --config /etc/ocserv/ocserv.conf -f
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
|
||||
[Install]
|
||||
|
|
|
|||
28
ocserv.spec
28
ocserv.spec
|
|
@ -1,7 +1,6 @@
|
|||
# This spec file has been automatically updated
|
||||
Version: 0.12.0
|
||||
Version: 0.12.1
|
||||
Release: 1%{?dist}
|
||||
Patch1: ocserv-0.12.0-add-missing-test.patch
|
||||
%global _hardened_build 1
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 7
|
||||
|
|
@ -19,11 +18,6 @@ Patch1: ocserv-0.12.0-add-missing-test.patch
|
|||
%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
|
||||
|
|
@ -83,7 +77,6 @@ BuildRequires: liboath-devel
|
|||
BuildRequires: uid_wrapper
|
||||
BuildRequires: socket_wrapper
|
||||
BuildRequires: gnupg2
|
||||
BuildRequires: rubygem(ronn)
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} >= 7
|
||||
%ifarch x86_64 %{ix86}
|
||||
|
|
@ -97,6 +90,11 @@ BuildRequires: libseccomp-devel
|
|||
|
||||
%endif #use systemd
|
||||
|
||||
# no rubygem in epel7
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: rubygem(ronn)
|
||||
%endif
|
||||
|
||||
Requires: gnutls-utils
|
||||
Requires: iproute
|
||||
Requires: pam
|
||||
|
|
@ -127,11 +125,7 @@ to provide the secure VPN service.
|
|||
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} || gpgv2 --keyring %{SOURCE10} %{SOURCE1} %{SOURCE0}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
%setup -q
|
||||
%else
|
||||
%autosetup -p1
|
||||
%endif
|
||||
|
||||
rm -f src/http-parser/http_parser.c src/http-parser/http_parser.h
|
||||
%if (0%{?use_local_protobuf} == 0)
|
||||
|
|
@ -150,8 +144,6 @@ sed -i 's/either version 3 of the License/either version 2 of the License/g' bui
|
|||
echo "int main() { return 77; }" > tests/valid-hostname.c
|
||||
%endif
|
||||
|
||||
chmod 755 tests/server-cert-rsa-pss
|
||||
|
||||
%build
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 6
|
||||
|
|
@ -246,9 +238,14 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
|
|||
|
||||
%doc AUTHORS ChangeLog NEWS COPYING LICENSE README.md TODO PACKAGE-LICENSING
|
||||
%doc src/ccan/licenses/CC0 src/ccan/licenses/LGPL-2.1 src/ccan/licenses/BSD-MIT
|
||||
|
||||
## Temporarily disable when rubygem is not present; there is a bug in 0.12.0 dist
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
%{_mandir}/man8/ocserv.8*
|
||||
%{_mandir}/man8/occtl.8*
|
||||
%{_mandir}/man8/ocpasswd.8*
|
||||
%endif
|
||||
|
||||
%{_bindir}/ocpasswd
|
||||
%{_bindir}/occtl
|
||||
%{_bindir}/ocserv-fw
|
||||
|
|
@ -263,6 +260,9 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sat May 12 2018 Nikos Mavrogiannopoulos <nmav@gnutls.org> - 0.12.1-1
|
||||
- Update to upstream 0.12.1 release
|
||||
|
||||
* Mon Apr 23 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.12.0-1
|
||||
- Update to upstream 0.12.0 release
|
||||
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -4,8 +4,8 @@ SHA512 (ocserv-script) = 6d77ebe95d23469d96b45b1ac8de7a062cb1360febd0f9664b42deb
|
|||
SHA512 (ocserv-genkey) = e898144fd977e4c57c4a9a5480b38f6a166c0281c41500c3fa9b7e142197c4525d3fb90846a738e38d217116dc33c2ba5c16ec3e11de0dbf4d834e204c598eac
|
||||
SHA512 (PACKAGE-LICENSING) = eea2a2a4765c90d874c79bb72d754c8b26b58d5e5b3c3cee10c24754fbba6849fd91f7b28e380b5db9789a456f95fc94b3bd8fe8c160a98c8042f404479ecb68
|
||||
SHA512 (ocserv-pamd.conf) = 3a75f19d89ddd164f3faa9c3579c7f675fc58413a194f43ec28eee7ebced6fee3f4ca305fe9b0ddf76ae39cd669e8d3d63b58afbbf19b84e4ca646ae7f42d61a
|
||||
SHA512 (ocserv.service) = 264f3389d88aec1f7d2e4683a4dfc0aa67af2325154de822eecf5fb43f8c221aab0d9f0c6a8eedb893e6d69ed4d94c9397b01e5d0d12e88330017a3bfa5f3644
|
||||
SHA512 (ocserv.service) = 2b258b2e9d211c9626e9e5c67b6c2573b713e0f490917ed1c84c2bb2708f874026ddb55dceb9585e491f86de5d3c8cd400bba864d12966ae96609cc4ce6413d2
|
||||
SHA512 (ocserv.conf) = 5b68a3547c6c69bf7c2b322692d6382162a587c47edad97690223c36f30ed98d3869d1ce063c630740d91888a4d70aadd657ddc6052c10e6e26800fca2e9d0c0
|
||||
SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 3b1989dc6a64d1140f83a2af0773da2adb03c50d97b6da7357cf09525050651aafa21131f1e3180baa540a8af922119a256f5ff5bcd6602996a806e8e1816bad
|
||||
SHA512 (ocserv-0.12.0.tar.xz.sig) = a746e72ba07bf7d28104385a70ba4c685389353368d02383eb385aece19ccc9d51a86226371338dbe1737046e403b17e351a04ffa2674ca594bf9e467438b534
|
||||
SHA512 (ocserv-0.12.0.tar.xz) = 73e39a6073761a42cff7637fdc0748d969dc6ddd80635633487aa2627ae7234af772194cf27fdded9f08637b26d7ca9017555242ccdb6ade03897f9d4ca4de8d
|
||||
SHA512 (ocserv-0.12.1.tar.xz.sig) = 0dd3123ffc525faa724de7a10f0a2202fc31ea667428e41c3ca68a3fffc29979d9bff16abde3adece8e921881704efc952d077e9bc161be4d69a124218ae5616
|
||||
SHA512 (ocserv-0.12.1.tar.xz) = 3fc5e6c6a3b4390cb0ffa78fac4f8e70aa689227c6f5b62180b95f35cf2de0c41075a157412de40866ce1af12ad8feabd87b2b986c8ca09ebee70514da9ec13f
|
||||
|
|
|
|||
Loading…
Reference in New Issue