Merge and update to 1.2.2-2

.gitignore

@@ -1 +1,4 @@
-SOURCES/ocserv-1.2.0.tar.xz
+SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+SOURCES/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
+SOURCES/ocserv-1.2.2.tar.xz
+SOURCES/ocserv-1.2.2.tar.xz.sig

.ocserv.metadata

@@ -1 +1,4 @@
-3af968b5da51da63e554bb96842b7e66e09d0d43  SOURCES/ocserv-1.2.0.tar.xz
+e6f8a1400839ce7b4021cdd0f8d08d71b0693486  SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
+844b67e84a17dbc5b51b84354a6e19dcf523b853  SOURCES/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg
+3b8a96dccc142b2a9ed5aaf813c54d22ef58f8b0  SOURCES/ocserv-1.2.2.tar.xz
+b49096e67d852b348256956c9e494776eb40a48b  SOURCES/ocserv-1.2.2.tar.xz.sig

SOURCES/.packit.yaml

@@ -0,0 +1,26 @@
+upstream_project_url: https://gitlab.com/openconnect/ocserv
+issue_repository: https://gitlab.com/openconnect/ocserv
+copy_upstream_release_description: true
+downstream_package_name: ocserv
+
+jobs:
+- job: pull_from_upstream
+  trigger: release
+  dist_git_branches:
+    - fedora-all
+    - epel-8
+    - epel-9
+
+- job: koji_build
+  trigger: commit
+  dist_git_branches:
+    - fedora-all
+    - epel-8
+    - epel-9
+
+- job: bodhi_update
+  trigger: commit
+  dist_git_branches:
+    - fedora-branched # rawhide updates are created automatically
+    - epel-8
+    - epel-9

SOURCES/README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.80.0.post35+g9430d702.

SOURCES/ocserv.conf

@@ -438,7 +438,7 @@ pid-file = /var/run/ocserv.pid
 #   4 http
 #   8 sensitive
 #   9 TLS
-log-level = 1
+log-level = 3
 
 # Set the protocol-defined priority (SO_PRIORITY) for packets to
 # be sent. That is a number from 0 to 6 with 0 being the lowest

SPECS/ocserv.spec

@@ -2,13 +2,13 @@
 ## (rpmautospec version 0.3.5)
 ## RPMAUTOSPEC: autorelease, autochangelog
 %define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
-    release_number = 1;
+    release_number = 2;
     base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
     print(release_number + base_release_number - 1);
 }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
 ## END: Set by rpmautospec
 
-Version:	1.2.0
+Version:	1.2.2
 Release: %autorelease
 %global _hardened_build 1
 
@@ -37,8 +37,8 @@ Summary:	OpenConnect SSL VPN server
 # To simplify licenses LGPLv2+ files have been promoted to GPLv2+.
 License:	GPLv2+ and BSD and MIT and CC0
 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
@@ -202,8 +202,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
@@ -213,7 +212,7 @@ make check %{?_smp_mflags} VERBOSE=1 XFAIL_TESTS="test-group-cert"
 %systemd_preun ocserv.service
 
 %postun
-%systemd_postun ocserv.service
+%systemd_postun_with_restart ocserv.service
 %endif
 
 %install
@@ -280,6 +279,30 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name}
 %endif
 
 %changelog
+* Fri Sep 22 2023 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.2.2-2
+- Added packit config
+
+* Thu Sep 21 2023 Packit <hello@packit.dev> - 1.2.2-1
+- [packit] 1.2.2 upstream release
+
+* Tue Aug 29 2023 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.2.1-3
+- config: increased log level to 3
+
+* Wed Aug 23 2023 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.2.1-2
+- make check: no longer use xfail for missing file
+
+* Wed Aug 23 2023 Packit <hello@packit.dev> - 1.2.1-1
+- [packit] 1.2.1 upstream release
+
+* Wed Aug 23 2023 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.2.0-4
+- corrected download link
+
+* Tue Aug 22 2023 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.2.0-3
+- updated URIs of source
+
+* Tue Aug 15 2023 Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com> - 1.2.0-2
+- use %%systemd_postun_with_restart
+
 * Thu Aug 03 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 1.2.0-1
 - Rebuilt for MSVSphere 9.2