commit 59a0e7e537d955279ed876166cbe5450edefb712
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Mon Jun 24 21:17:36 2024 +0200
- updated to 1.3.0
ocserv-link.patch | 10 +++++-----
ocserv.spec | 16 ++++++++++------
2 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/ocserv.spec b/ocserv.spec
index ce20408..a558a33 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -8,12 +8,12 @@
Summary: OpenConnect VPN server
Summary(pl.UTF-8): Serwer VPN-a OpenConnect
Name: ocserv
-Version: 1.2.0
-Release: 2
+Version: 1.3.0
+Release: 1
License: GPL v2+
Group: Applications/Networking
Source0: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-# Source0-md5: a73b32eac50aa3e46ae3b4a9f6140c59
+# Source0-md5: 2b6cfd509e3a18491e8c79ce613faa90
Patch0: %{name}-link.patch
URL: http://ocserv.gitlab.io/www/
BuildRequires: autoconf >= 2.61
@@ -21,7 +21,6 @@ BuildRequires: automake >= 1:1.11.3
%{?with_oidc:BuildRequires: cjose-devel}
%{?with_oidc:BuildRequires: curl-devel}
BuildRequires: gnutls-devel >= 3.6.0
-BuildRequires: http-parser-devel
%{?with_oidc:BuildRequires: jansson-devel}
# pkgconfig(krb5-gssapi)
%{?with_kerberos5:BuildRequires: krb5-devel}
@@ -32,6 +31,7 @@ BuildRequires: libpcl-devel
BuildRequires: libseccomp-devel
%{?with_kerberos5:BuildRequires: libtasn1-devel >= 3.9}
BuildRequires: libwrap-devel
+BuildRequires: llhttp-devel
BuildRequires: lz4-devel >= 1:1.7
BuildRequires: nettle-devel >= 2.7
BuildRequires: oath-toolkit-devel
@@ -40,6 +40,7 @@ BuildRequires: pkgconfig
BuildRequires: protobuf-c-devel
%{?with_radius:BuildRequires: radcli-devel >= 1.2.5}
BuildRequires: readline-devel
+BuildRequires: ronn
BuildRequires: systemd-devel
BuildRequires: talloc-devel
BuildRequires: tar >= 1:1.22
@@ -76,12 +77,15 @@ zaprojektowany jako zgodny także z innymi wariantami
uniksów.
%setup -q
%patch0 -p1
+%{__sed} -i -e 's,/usr/libexec/,%{_libexecdir}/,' src/main-user.c
+
%build
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
+ IPCALC=/bin/ipcalc \
--disable-silent-rules \
%{?with_oidc:--enable-oidc-auth} \
%{!?with_kerberos5:--without-gssapi} \
@@ -99,12 +103,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README.md TODO
+%doc AUTHORS ChangeLog NEWS README.md
%attr(755,root,root) %{_bindir}/occtl
%attr(755,root,root) %{_bindir}/ocpasswd
-%attr(755,root,root) %{_bindir}/ocserv-fw
%attr(755,root,root) %{_sbindir}/ocserv
%attr(755,root,root) %{_sbindir}/ocserv-worker
+%attr(755,root,root) %{_libexecdir}/ocserv-fw
%{_mandir}/man8/occtl.8*
%{_mandir}/man8/ocpasswd.8*
%{_mandir}/man8/ocserv.8*
diff --git a/ocserv-link.patch b/ocserv-link.patch
index 67ae04a..645d64e 100644
--- a/ocserv-link.patch
+++ b/ocserv-link.patch
@@ -1,5 +1,5 @@
---- ocserv-1.2.0/src/Makefile.am.orig 2023-07-19 22:39:18.959302981 +0200
-+++ ocserv-1.2.0/src/Makefile.am 2023-07-19 22:40:34.935558049 +0200
+--- ocserv-1.3.0/src/Makefile.am.orig 2024-04-29 22:24:29.000000000 +0200
++++ ocserv-1.3.0/src/Makefile.am 2024-06-24 20:46:54.483087360 +0200
@@ -18,13 +18,13 @@ BUILT_SOURCES = ipc.pb-c.c ipc.pb-c.h \
EXTRA_DIST = version.inc.in version.inc \
ipc.proto ctl.proto http-heads.gperf common.mk ocserv-fw
@@ -7,7 +7,7 @@
-CORE_LDADD = libccan.a libcommon.a
+CORE_LDADD = libccan.a libcommon.a libipc.a
CORE_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
- $(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_HTTP_PARSER_LIBS) \
+ $(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_LLHTTP_LIBS) \
$(NEEDED_LIBPROTOBUF_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
$(RADCLI_LIBS) $(LIBLZ4_LIBS) $(LIBKRB5_LIBS) \
$(LIBTASN1_LIBS) $(LIBOATH_LIBS) $(LIBNETTLE_LIBS) \
@@ -15,8 +15,8 @@
+ $(LIBEV_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
- if LOCAL_HTTP_PARSER
-@@ -134,9 +134,9 @@ else
+ if LOCAL_LLHTTP
+@@ -136,9 +136,9 @@ else
occtl_occtl_SOURCES += occtl/geoip.c
endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocserv.git/commitdiff/59a0e7e537d955279ed876166cbe5450edefb712
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
