Update to 1.3.0 upstream release

- Resolves: rhbz#2279186 Upstream tag: 1.3.0 Upstream commit: 92dba6e4 Commit authored by Packit automation (https://packit.dev/)
spec: added ipcalc and updated the location of ocserv-fw
2024-05-05 20:19:25 +00:00 · 2024-01-25 09:15:20 +01:00 · 2024-01-24 22:32:59 +00:00 · 2023-10-13 22:01:26 +02:00 · 2023-09-21 19:43:48 +00:00 · 2023-08-23 09:56:04 +02:00
4 changed files with 23 additions and 24 deletions
--- a/.gitignore
+++ b/.gitignore
@ -241,3 +241,11 @@
 /ocserv-1.1.7.tar.xz.sig
 /ocserv-1.2.0.tar.xz
 /ocserv-1.2.0.tar.xz.sig
+/ocserv-1.2.1.tar.xz
+/ocserv-1.2.1.tar.xz.sig
+/ocserv-1.2.2.tar.xz
+/ocserv-1.2.2.tar.xz.sig
+/ocserv-1.2.4.tar.xz
+/ocserv-1.2.4.tar.xz.sig
+/ocserv-1.3.0.tar.xz
+/ocserv-1.3.0.tar.xz.sig
--- a/README.packit
+++ b/README.packit
@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.95.0.post1.dev8+gce6bd577.
--- a/ocserv.spec
+++ b/ocserv.spec
@ -1,4 +1,4 @@
-Version:	1.2.0
+Version:	1.3.0
 Release: %autorelease
 %global _hardened_build 1

@ -25,10 +25,10 @@ Summary:	OpenConnect SSL VPN server

 # For a breakdown of the licensing, see PACKAGE-LICENSING 
 # To simplify licenses LGPLv2+ files have been promoted to GPLv2+.
-License:	GPLv2+ and BSD and MIT and CC0
+License:	GPL-2.0-or-later AND BSD-3-Clause AND MIT AND CC0-1.0
 URL:		http://www.infradead.org/ocserv/
-Source0:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-Source1:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
+Source0:	https://www.infradead.org/ocserv/download/%{name}-%{version}.tar.xz
+Source1:	https://www.infradead.org/ocserv/download/%{name}-%{version}.tar.xz.sig
 Source2:	gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
 Source3:	ocserv.conf
 Source4:	ocserv.service
@ -49,30 +49,19 @@ BuildRequires:	gnutls30-devel
 %else
 BuildRequires:	gnutls-devel
 %endif
-BuildRequires:	pam-devel
-BuildRequires:	iproute
-BuildRequires:	openconnect
-BuildRequires:  gnutls-utils
+BuildRequires:	pam-devel, iproute, ipcalc, openconnect, gnutls-utils

 %if (0%{?use_local_protobuf} == 0)
 BuildRequires:	protobuf-c-devel
 %endif

-BuildRequires:	libnl3-devel
-BuildRequires:	krb5-devel
-BuildRequires:	libtasn1-devel
-BuildRequires:	gperf
-BuildRequires:	libtalloc-devel
-BuildRequires:	libev-devel
-BuildRequires:	http-parser-devel
+BuildRequires:	libnl3-devel, krb5-devel, libtasn1-devel, gperf, libtalloc-devel
+BuildRequires:	libev-devel, http-parser-devel, radcli-devel, lz4-devel, readline-devel
+BuildRequires:	automake, autoconf

 %if %{use_libwrap}
 BuildRequires:	tcp_wrappers-devel
 %endif
-BuildRequires:	automake, autoconf
-BuildRequires:	radcli-devel
-BuildRequires:	lz4-devel
-BuildRequires:	readline-devel
 %if %{use_geoip}
 BuildRequires:	GeoIP-devel
 %else
@ -192,8 +181,7 @@ mkdir -p -m 700 %{_sysconfdir}/pki/ocserv/private
 mkdir -p %{_sysconfdir}/pki/ocserv/cacerts

 %check
-# The 1.2.0 release has a missing file
-make check %{?_smp_mflags} VERBOSE=1 XFAIL_TESTS="test-group-cert"
+make check %{?_smp_mflags} VERBOSE=1

 %if %{use_systemd}
 %post
@ -257,7 +245,7 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}

 %{_bindir}/ocpasswd
 %{_bindir}/occtl
-%{_bindir}/ocserv-fw
+%{_libexecdir}/ocserv-fw
 %{_bindir}/ocserv-script
 %{_sbindir}/ocserv
 %{_sbindir}/ocserv-worker
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (ocserv-1.2.0.tar.xz) = 23edd48313cb4988cea1e2493ab65784c7a39a062798e1ffd380b6de5629e69bd71ded863eb7a0c9fe1bac3cc2db23014cdedbd5d15801e2a66d5ef4e3f28ffb
-SHA512 (ocserv-1.2.0.tar.xz.sig) = 1d8ac24c97c6495adc070f7b24553715ff27e6a9937a020522904559f4c48f3e18ca712b80762d55c285ce8f99eb4cd9a84b2875a351eb1df1ef6c705c5d3199
+SHA512 (ocserv-1.3.0.tar.xz) = 24c3129b389fa767ad14f158580d8abd6830e697162b8fcfe3df6a4d21d543460c1955c3e0c63fecb8b4b01bd2492254d3eea8d5ba60d864cea314325badda7e
+SHA512 (ocserv-1.3.0.tar.xz.sig) = dd6a2e6f28a512bda19e758b32149cfe7951151edab8c34ac371dbcd17eed4a8b10fdfee306629c1d42c2a3e22bcfe523ee2aafb84d59181d5be719c399cfb7d
Author	SHA1	Message	Date
Packit	b27fa8c914	Update to 1.3.0 upstream release - Resolves: rhbz#2279186 Upstream tag: 1.3.0 Upstream commit: 92dba6e4 Commit authored by Packit automation (https://packit.dev/)	2024-05-05 20:19:25 +00:00
Nikos Mavrogiannopoulos	b9356e3b20	spec: added ipcalc and updated the location of ocserv-fw Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>	2024-01-25 09:15:20 +01:00
Packit	cc93add691	[packit] 1.2.4 upstream release Upstream tag: 1.2.4 Upstream commit: 7ced730f	2024-01-24 22:32:59 +00:00
Nikos Mavrogiannopoulos	0e9be03a65	Use the SPDX identifiers for license	2023-10-13 22:01:26 +02:00
Packit	ee09ffd6fa	[packit] 1.2.2 upstream release Upstream tag: 1.2.2 Upstream commit: f6164756	2023-09-21 19:43:48 +00:00
Nikos Mavrogiannopoulos	ae429d97c6	make check: no longer use xfail for missing file	2023-08-23 09:56:04 +02:00
Packit	75ad5b1579	[packit] 1.2.1 upstream release Upstream tag: 1.2.1 Upstream commit: 895a23f3 If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/ocserv.git refs/heads/:refs/remotes/packit/ git checkout packit/1.2.1-f39-update-pull_from_upstream ```	2023-08-23 07:25:30 +00:00
Nikos Mavrogiannopoulos	6c789a4a8d	corrected download link	2023-08-23 09:21:41 +02:00
Nikos Mavrogiannopoulos	209b7437fc	updated URIs of source	2023-08-22 19:32:27 +02:00