From 3f069b6f400a808c299694d3bd56a29211f2f970493e7aedc4e29b657f7b4537 Mon Sep 17 00:00:00 2001 From: Michael Du Date: Thu, 28 Sep 2023 16:05:09 +0000 Subject: [PATCH] Accepting request 1113393 from home:mnhauke:network - Update to version 1.2.2 * Fix session and accounting data tracking of ocserv. This reverts fix for #444 (#541) * No longer account ICMP and IGMP data for idle session detection - Update URL OBS-URL: https://build.opensuse.org/request/show/1113393 OBS-URL: https://build.opensuse.org/package/show/network:vpn/ocserv?expand=0&rev=49 --- ocserv-1.2.1.tar.xz | 3 --- ocserv-1.2.1.tar.xz.sig | Bin 442 -> 0 bytes ocserv-1.2.2.tar.xz | 3 +++ ocserv-1.2.2.tar.xz.sig | Bin 0 -> 442 bytes ocserv.changes | 9 +++++++++ ocserv.spec | 18 ++++-------------- 6 files changed, 16 insertions(+), 17 deletions(-) delete mode 100644 ocserv-1.2.1.tar.xz delete mode 100644 ocserv-1.2.1.tar.xz.sig create mode 100644 ocserv-1.2.2.tar.xz create mode 100644 ocserv-1.2.2.tar.xz.sig diff --git a/ocserv-1.2.1.tar.xz b/ocserv-1.2.1.tar.xz deleted file mode 100644 index 97f63ce..0000000 --- a/ocserv-1.2.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:de54473ba68d42a8469e434f541ae6b3cf3d98f0936ad0eadfa2c2484810d994 -size 749592 diff --git a/ocserv-1.2.1.tar.xz.sig b/ocserv-1.2.1.tar.xz.sig deleted file mode 100644 index 8cac5a35f7a3de023034296d7fe3666c564821ef381f677baad9190677311b70..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 442 zcmV;r0Y(0a0k;GI0SEvc79j*5LP3cI*dS`BRLtBd?pV2&hEZ_^0%YW~_y7tC5Gn3h zxt4}eaq}$0;H_7LjSpIl0N}6!8V<`&m zr=2U^JUc+u>Gh4b$7jCY%36yi9S$%-7v_LjFF|{T2^`7JzR#(E7dNjF5|70f(lS zjXQoXA~#&U_%-&*qnoJixj|LIEDG*$9>u;kq-*%>O8@`> diff --git a/ocserv-1.2.2.tar.xz b/ocserv-1.2.2.tar.xz new file mode 100644 index 0000000..3d01956 --- /dev/null +++ b/ocserv-1.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e3c7a2ee9e9b4d3621de66e155fd99eb02c0134b9f42cfbc86d3979e485c719 +size 751548 diff --git a/ocserv-1.2.2.tar.xz.sig b/ocserv-1.2.2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ed27ef31e3f9e42e0309c353c30be0446a47efeff8b67c0f294e5411c32fddb2 GIT binary patch literal 442 zcmV;r0Y(0a0k;GI0SEvc79j*5LP3cI*dS`BRLtBd?pV2&hEZ_^0%Z)AB>)Nu5Gn3h zxt4}eait6lA5Y4H-XMyHHBQZ!2Fpsri0bkrMR&o4Rr2IRbVz#}%dA<8lsE}-vvr5l z^)3DD*zD0NlgH^uAqkqYvpvcgf)syDtz)}!cuhu9SgENxxtsbjt!A(3Or*$`wN5|K zzML1kUl!r;-eDm$413se2?5+f(jWTt~9dGy0 zOqiXz;FGGasj0p#)|FmoydeM9m0eFyWps(Dyd>!<)PE{`OGKRC4aDfNxu<7#Qp)%H z1vifA + +- Update to version 1.2.2 + * Fix session and accounting data tracking of ocserv. This + reverts fix for #444 (#541) + * No longer account ICMP and IGMP data for idle session detection +- Update URL + ------------------------------------------------------------------- Tue Aug 29 12:37:56 UTC 2023 - Martin Hauke diff --git a/ocserv.spec b/ocserv.spec index 73da629..ad28bea 100644 --- a/ocserv.spec +++ b/ocserv.spec @@ -17,12 +17,13 @@ Name: ocserv -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: OpenConnect VPN Server License: GPL-2.0-only Group: Productivity/Networking/Security -URL: http://www.infradead.org/ocserv +URL: https://ocserv.gitlab.io/www/ +#Git-Clone: https://gitlab.com/openconnect/ocserv.git Source: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz Source1: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig Source2: ca.tmpl @@ -40,15 +41,14 @@ Patch2: %{name}.config.patch Patch3: %{name}-LZ4_compress_default.patch BuildRequires: autogen BuildRequires: dbus-1-devel -%if 0%{suse_version} >= 1500 BuildRequires: firewall-macros -%endif BuildRequires: freeradius-client-devel BuildRequires: gperf BuildRequires: gpg2 BuildRequires: libev-devel #!BuildIgnore: libevent-devel BuildRequires: libgnutls-devel >= 3.1.10 +BuildRequires: liblz4-devel BuildRequires: libmaxminddb-devel BuildRequires: libnl3-devel BuildRequires: libprotobuf-c-devel @@ -64,11 +64,7 @@ BuildRequires: pkgconfig(libsystemd) BuildRequires: rubygem(ronn) # /usr/bin/certtool for generating certificates Requires: gnutls >= 3.1.10 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} -%if 0%{?suse_version} > 1310 -BuildRequires: liblz4-devel -%endif %description OpenConnect server (ocserv) is an SSL VPN server. Its purpose is to @@ -110,9 +106,7 @@ make V=1 %{?_smp_mflags} make %{?_smp_mflags} DESTDIR=%{buildroot} install install -Dm 0755 %{SOURCE5} %{buildroot}%{_sbindir}/ocserv-forwarding -%if 0%{suse_version} >= 1500 install -D -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/firewalld/services/ocserv.xml -%endif install -d %{buildroot}%{_sysconfdir}/ocserv/certificates install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ocserv/certificates @@ -136,9 +130,7 @@ sed -i '/^\[Service\].*/a ExecStartPre=%{_sbindir}/ocserv-forwarding --enable' % %post %service_add_post ocserv.service ocserv.socket -%if 0%{suse_version} >= 1500 %firewalld_reload -%endif %preun %service_del_preun ocserv.service ocserv.socket @@ -151,11 +143,9 @@ sed -i '/^\[Service\].*/a ExecStartPre=%{_sbindir}/ocserv-forwarding --enable' % %doc AUTHORS NEWS README.md %license COPYING %config %{_sysconfdir}/ocserv -%if 0%{suse_version} >= 1500 %dir %{_prefix}/lib/firewalld %dir %{_prefix}/lib/firewalld/services %{_prefix}/lib/firewalld/services/ocserv.xml -%endif %{_bindir}/occtl %{_bindir}/ocpasswd %{_bindir}/ocserv-script