[packages/ocserv] - updated to 1.1.2 - updated link patch

qboosh qboosh at pld-linux.org
Sat Dec 12 12:08:46 CET 2020


commit 931406f7ce80bad7191cc147df1982614d327d50
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Dec 12 12:09:15 2020 +0100

    - updated to 1.1.2
    - updated link patch

 ocserv-link.patch | 16 ++++++++--------
 ocserv.spec       |  7 ++++---
 2 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/ocserv.spec b/ocserv.spec
index 714fbb0..f33947d 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -8,14 +8,14 @@
 Summary:	OpenConnect VPN server
 Summary(pl.UTF-8):	Serwer VPN-a OpenConnect
 Name:		ocserv
-Version:	1.0.1
+Version:	1.1.2
 Release:	1
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-# Source0-md5:	aadd7723cc1c75ddf2b999433aa98d96
+# Source0-md5:	51331a912464bb0c731cea61a8a4a7f2
 Patch0:		%{name}-link.patch
-URL:		http://www.infradead.org/ocserv/
+URL:		http://ocserv.gitlab.io/www/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.11.3
 %{?with_oidc:BuildRequires:	cjose-devel}
@@ -104,6 +104,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
 %{_mandir}/man8/occtl.8*
 %{_mandir}/man8/ocpasswd.8*
 %{_mandir}/man8/ocserv.8*
diff --git a/ocserv-link.patch b/ocserv-link.patch
index ae44d89..3346083 100644
--- a/ocserv-link.patch
+++ b/ocserv-link.patch
@@ -1,12 +1,12 @@
---- ocserv-1.0.1/src/Makefile.am.orig	2020-05-12 20:57:37.308459654 +0200
-+++ ocserv-1.0.1/src/Makefile.am	2020-05-12 21:05:33.645879112 +0200
-@@ -70,13 +70,13 @@
+--- ocserv-1.1.2/src/Makefile.am.orig	2020-08-11 23:13:48.000000000 +0200
++++ ocserv-1.1.2/src/Makefile.am	2020-12-12 12:01:01.742091938 +0100
+@@ -80,13 +80,13 @@
  HTTP_PARSER_SOURCES = http-parser/http_parser.c http-parser/http_parser.h
  endif
  
--ocserv_LDADD = ../gl/libgnu.a libccan.a libcommon.a
-+ocserv_LDADD = ../gl/libgnu.a libccan.a libcommon.a libipc.a
- ocserv_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
+-CORE_LDADD = ../gl/libgnu.a libccan.a libcommon.a
++CORE_LDADD = ../gl/libgnu.a libccan.a libcommon.a libipc.a
+ CORE_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
  	$(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_HTTP_PARSER_LIBS) \
  	$(NEEDED_LIBPROTOBUF_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
  	$(RADCLI_LIBS) $(LIBLZ4_LIBS) $(LIBKRB5_LIBS) \
@@ -15,8 +15,8 @@
 +	$(LIBEV_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) \
  	$(CODE_COVERAGE_LDFLAGS) 
  	
- if ENABLE_OIDC_AUTH
-@@ -122,9 +122,9 @@
+ if ENABLE_LATENCY_SUPPORT
+@@ -134,9 +134,9 @@
  occtl_occtl_SOURCES += occtl/geoip.c
  endif
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocserv.git/commitdiff/931406f7ce80bad7191cc147df1982614d327d50



More information about the pld-cvs-commit mailing list