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

[qboosh]

commit a1b78214618c82c3ebd3f84f16351fead4630f00
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 12 22:35:46 2020 +0200

    - updated to 1.0.1
    - updated link patch

 ocserv-link.patch | 36 +++++++++++++++++-------------------
 ocserv.spec       | 22 ++++++++++++++--------
 2 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/ocserv.spec b/ocserv.spec
index 4a008cb..714fbb0 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -2,28 +2,31 @@
 #
 # Conditional build:
 %bcond_with	kerberos5	# GSSAPI authentication (currently only MIT krb5 supported)
+%bcond_without	oidc		# OpenID Connect authentication
 %bcond_without	radius		# RADIUS support
 #
 Summary:	OpenConnect VPN server
 Summary(pl.UTF-8):	Serwer VPN-a OpenConnect
 Name:		ocserv
-Version:	0.11.6
-Release:	4
+Version:	1.0.1
+Release:	1
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-# Source0-md5:	0e4f82d267d27f2f9d3fcba58ac6cf5a
+# Source0-md5:	aadd7723cc1c75ddf2b999433aa98d96
 Patch0:		%{name}-link.patch
 URL:		http://www.infradead.org/ocserv/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.11.3
-BuildRequires:	autogen
-BuildRequires:	autogen-devel
-BuildRequires:	gnutls-devel >= 3.1.10
+%{?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}
 BuildRequires:	libev-devel >= 4
+BuildRequires:	libmaxminddb-devel >= 1.0.0
 BuildRequires:	libnl-devel >= 3.2
 BuildRequires:	libpcl-devel
 BuildRequires:	libseccomp-devel
@@ -41,8 +44,10 @@ BuildRequires:	systemd-devel
 BuildRequires:	talloc-devel
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
-Requires:	gnutls >= 3.1.10
+Requires:	gnutls >= 3.6.0
+Requires:	libmaxminddb >= 1.0.0
 Requires:	libnl >= 3.2
+Requires:	nettle >= 2.7
 %{?with_radius:Requires:	radcli >= 1.2.5}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,12 +77,13 @@ zaprojektowany jako zgodny także z innymi wariantami uniksów.
 %patch0 -p1
 
 %build
-%{__aclocal} -I gl/m4 -I libopts/m4
+%{__aclocal} -I m4 -I gl/m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
 	--disable-silent-rules \
+	%{?with_oidc:--enable-oidc-auth} \
 	%{!?with_kerberos5:--without-gssapi} \
 	%{!?with_radius:--without-radius}
 %{__make}
diff --git a/ocserv-link.patch b/ocserv-link.patch
index e3d1123..ae44d89 100644
--- a/ocserv-link.patch
+++ b/ocserv-link.patch
@@ -1,11 +1,11 @@
---- ocserv-0.11.3/src/Makefile.am.orig	2016-06-26 21:10:17.271299536 +0200
-+++ ocserv-0.11.3/src/Makefile.am	2016-06-26 21:16:45.445863280 +0200
-@@ -65,13 +65,13 @@
+--- 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 @@
  HTTP_PARSER_SOURCES = http-parser/http_parser.c http-parser/http_parser.h
  endif
  
--ocserv_LDADD = ../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocserv.a ccan/libccan.a common/libcommon.a
-+ocserv_LDADD = ../gl/libgnu.a $(NEEDED_LIBOPTS) libcmd-ocserv.a ccan/libccan.a common/libcommon.a libipc.a
+-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) \
  	$(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_HTTP_PARSER_LIBS) \
  	$(NEEDED_LIBPROTOBUF_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
@@ -13,21 +13,19 @@
  	$(LIBTASN1_LIBS) $(LIBOATH_LIBS) $(LIBNETTLE_LIBS) \
 -	$(LIBEV_LIBS) libipc.a $(NEEDED_LIBPROTOBUF_LIBS) \
 +	$(LIBEV_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) \
- 	$(CODE_COVERAGE_LDFLAGS)
- 
- 
---- ocserv-0.11.3/src/occtl/Makefile.am.orig	2016-06-26 21:10:17.271299536 +0200
-+++ ocserv-0.11.3/src/occtl/Makefile.am	2016-06-26 21:17:45.435538287 +0200
-@@ -11,9 +11,9 @@
+ 	$(CODE_COVERAGE_LDFLAGS) 
+ 	
+ if ENABLE_OIDC_AUTH
+@@ -122,9 +122,9 @@
+ occtl_occtl_SOURCES += occtl/geoip.c
+ endif
  
- occtl_SOURCES = occtl.c pager.c occtl.h time.c cache.c ip-cache.c \
- 	nl.c ctl.h print.c json.c json.h hex.c hex.h
--occtl_LDADD = ../../gl/libgnu.a ../common/libcommon.a $(LIBREADLINE_LIBS) \
--	$(LIBNL3_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) $(LIBTALLOC_LIBS) ../ccan/libccan.a \
--	../libipc.a $(NEEDED_LIBPROTOBUF_LIBS) $(CODE_COVERAGE_LDFLAGS) \
-+occtl_LDADD = ../../gl/libgnu.a ../common/libcommon.a ../ccan/libccan.a ../libipc.a $(LIBREADLINE_LIBS) \
+-occtl_occtl_LDADD = ../gl/libgnu.a libcommon.a $(LIBREADLINE_LIBS) \
+-	$(LIBNL3_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) $(LIBTALLOC_LIBS) libccan.a \
+-	libipc.a $(NEEDED_LIBPROTOBUF_LIBS) $(CODE_COVERAGE_LDFLAGS) \
++occtl_occtl_LDADD = ../gl/libgnu.a libcommon.a libccan.a libipc.a $(LIBREADLINE_LIBS) \
 +	$(LIBNL3_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) $(LIBTALLOC_LIBS) \
 +	$(NEEDED_LIBPROTOBUF_LIBS) $(CODE_COVERAGE_LDFLAGS) \
- 	$(LIBNETTLE_LIBS)
+ 	$(LIBNETTLE_LIBS) $(MAXMIND_LIBS) $(GEOIP_LIBS)
  
- occtl_SOURCES += unix.c
+ # Ocpasswd
================================================================

---- gitweb:

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