diff --git a/.gitignore b/.gitignore index 58c936a..550833f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg -SOURCES/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg -SOURCES/ocserv-1.2.2.tar.xz -SOURCES/ocserv-1.2.2.tar.xz.sig +SOURCES/ocserv-1.2.4.tar.xz +SOURCES/ocserv-1.2.4.tar.xz.sig diff --git a/.ocserv.metadata b/.ocserv.metadata index 74b2ad0..01c8015 100644 --- a/.ocserv.metadata +++ b/.ocserv.metadata @@ -1,4 +1,2 @@ -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 +df2f4727624059c0440b0c22a2935646ddfaacb7 SOURCES/ocserv-1.2.4.tar.xz +73fdabaef5fd01872c38b5bfb4eb27c4dc6fd0a3 SOURCES/ocserv-1.2.4.tar.xz.sig diff --git a/SOURCES/README.packit b/SOURCES/README.packit index ce6b9b9..bba9424 100644 --- a/SOURCES/README.packit +++ b/SOURCES/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.80.0.post35+g9430d702. +The file was generated using packit 0.89.0.post1.dev4+gabf90471. diff --git a/SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg b/SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg new file mode 100644 index 0000000..b1ee43c Binary files /dev/null and b/SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg differ diff --git a/SOURCES/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg b/SOURCES/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg new file mode 100644 index 0000000..42f2ead Binary files /dev/null and b/SOURCES/gpgkey-56EE7FA9E8173B19FE86268D763712747F343FA7.gpg differ diff --git a/SPECS/ocserv.spec b/SPECS/ocserv.spec index a3e3792..1caabbc 100644 --- a/SPECS/ocserv.spec +++ b/SPECS/ocserv.spec @@ -1,5 +1,5 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.3.5) +## (rpmautospec version 0.5.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: release_number = 2; @@ -8,7 +8,7 @@ }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -Version: 1.2.2 +Version: 1.2.4 Release: %autorelease %global _hardened_build 1 @@ -59,30 +59,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 @@ -266,7 +255,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 @@ -279,6 +268,13 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name} %endif %changelog +## START: Generated by rpmautospec +* Thu Jan 25 2024 Nikos Mavrogiannopoulos - 1.2.4-2 +- spec: added ipcalc and updated the location of ocserv-fw + +* Wed Jan 24 2024 Packit - 1.2.4-1 +- [packit] 1.2.4 upstream release + * Fri Sep 22 2023 Nikos Mavrogiannopoulos - 1.2.2-2 - Added packit config @@ -825,3 +821,4 @@ install -D -m 0755 %{SOURCE11} %{buildroot}/%{_initrddir}/%{name} * Fri Dec 06 2013 Nikos Mavrogiannopoulos - 0.2.1-1 - Initial import (#1027770) +## END: Generated by rpmautospec