- updated to 1.2.0

diff --git a/ocserv-link.patch b/ocserv-link.patch
index 92f4d511b3c1db864a34737f97e01e7fec9a7048..67ae04a6ab60be6bc893935f73db0774105e0431 100644 (file)
--- a/ocserv-link.patch
+++ b/ocserv-link.patch
@@ -1,11 +1,11 @@
---- ocserv-1.1.3/src/Makefile.am.orig  2020-12-19 13:45:44.000000000 +0100
-+++ ocserv-1.1.3/src/Makefile.am       2021-06-10 21:36:30.022604888 +0200
+--- 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
 @@ -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
  
--CORE_LDADD = ../gl/libgnu.a libccan.a libcommon.a
-+CORE_LDADD = ../gl/libgnu.a libccan.a libcommon.a libipc.a
+-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) \
        $(NEEDED_LIBPROTOBUF_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
@@ -16,14 +16,14 @@
        $(CODE_COVERAGE_LDFLAGS)
  
  if LOCAL_HTTP_PARSER
-@@ -135,9 +135,9 @@ else
+@@ -134,9 +134,9 @@ else
  occtl_occtl_SOURCES += occtl/geoip.c
  endif
  
--occtl_occtl_LDADD = ../gl/libgnu.a libcommon.a $(LIBREADLINE_LIBS) \
+-occtl_occtl_LDADD = 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) \
++occtl_occtl_LDADD = libcommon.a libccan.a libipc.a $(LIBREADLINE_LIBS) \
 +      $(LIBNL3_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) $(LIBTALLOC_LIBS) \
 +      $(NEEDED_LIBPROTOBUF_LIBS) $(CODE_COVERAGE_LDFLAGS) \
        $(LIBNETTLE_LIBS) $(MAXMIND_LIBS) $(GEOIP_LIBS)

diff --git a/ocserv.spec b/ocserv.spec
index 18f265b75e1be5a4adf1f7809279ceeb943efaae..38dded63759eaae489598a0d41a8115ab119b3fa 100644 (file)
--- 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.1.3
-Release:       2
+Version:       1.2.0
+Release:       1
 License:       GPL v2+
 Group:         Applications/Networking
 Source0:       ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-# Source0-md5: 4bf21afcd30b4f49079d796ae1ba4c24
+# Source0-md5: a73b32eac50aa3e46ae3b4a9f6140c59
 Patch0:                %{name}-link.patch
 URL:           http://ocserv.gitlab.io/www/
 BuildRequires: autoconf >= 2.61
@@ -77,7 +77,7 @@ zaprojektowany jako zgodny także z innymi wariantami uniksów.
 %patch0 -p1
 
 %build
-%{__aclocal} -I m4 -I gl/m4
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -99,7 +99,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog LICENSE NEWS README.md TODO
+%doc AUTHORS ChangeLog NEWS README.md TODO
 %attr(755,root,root) %{_bindir}/occtl
 %attr(755,root,root) %{_bindir}/ocpasswd
 %attr(755,root,root) %{_bindir}/ocserv-fw