commit 7b6ac6805e2bc24fdc065dcbd92c9981590b3443
Author: Jakub Bogusz <[email protected]>
Date: Mon Jun 27 16:08:30 2016 +0200
- updated to 0.11.3
- updated link patch
ocserv-link.patch | 37 +++++++++++++++++++------------------
ocserv.spec | 6 +++---
2 files changed, 22 insertions(+), 21 deletions(-)
---
diff --git a/ocserv.spec b/ocserv.spec
index a7a6bd4..ef9bc24 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -7,12 +7,12 @@
Summary: OpenConnect VPN server
Summary(pl.UTF-8): Serwer VPN-a OpenConnect
Name: ocserv
-Version: 0.11.0
-Release: 3
+Version: 0.11.3
+Release: 1
License: GPL v2+
Group: Applications/Networking
Source0: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-# Source0-md5: 9161b506142232957ccf786c251b5b42
+# Source0-md5: ffe3d79662e939bb55dfe7c9e490b4f2
Patch0: %{name}-link.patch
URL: http://www.infradead.org/ocserv/
BuildRequires: autoconf >= 2.61
diff --git a/ocserv-link.patch b/ocserv-link.patch
index e40304b..e3d1123 100644
--- a/ocserv-link.patch
+++ b/ocserv-link.patch
@@ -1,32 +1,33 @@
---- ocserv-0.11.0/src/Makefile.am.orig 2016-01-18 09:07:27.000000000 +0100
-+++ ocserv-0.11.0/src/Makefile.am 2016-02-28 11:36:30.909331089 +0100
-@@ -74,13 +74,13 @@
- ocserv_SOURCES += kkdcp_asn1_tab.c kkdcp.asn
+--- 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 @@
+ 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 += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
$(LIBSECCOMP) $(LIBWRAP) $(LIBCRYPT) $(NEEDED_HTTP_PARSER_LIBS) \
- $(LIBPROTOBUF_C_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
+ $(NEEDED_LIBPROTOBUF_LIBS) $(LIBSYSTEMD) $(LIBTALLOC_LIBS) \
$(RADCLI_LIBS) $(LIBLZ4_LIBS) $(LIBKRB5_LIBS) \
$(LIBTASN1_LIBS) $(LIBOATH_LIBS) $(LIBNETTLE_LIBS) \
-- $(LIBEV_LIBS) libipc.a
-+ $(LIBEV_LIBS)
+- $(LIBEV_LIBS) libipc.a $(NEEDED_LIBPROTOBUF_LIBS) \
++ $(LIBEV_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) \
+ $(CODE_COVERAGE_LDFLAGS)
- if PCL
---- ocserv-0.11.0/src/occtl/Makefile.am.orig 2016-02-10 13:08:43.000000000
+0100
-+++ ocserv-0.11.0/src/occtl/Makefile.am 2016-02-28 14:41:50.838864527
+0100
-@@ -17,9 +17,8 @@
+--- 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 @@
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
+ 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) $(LIBPROTOBUF_C_LIBS) $(LIBTALLOC_LIBS)
../ccan/libccan.a \
-- ../libipc.a
-+occtl_LDADD = ../../gl/libgnu.a ../common/libcommon.a ../ccan/libccan.a
../libipc.a \
-+ $(LIBREADLINE_LIBS) $(LIBNL3_LIBS) $(LIBPROTOBUF_C_LIBS)
$(LIBTALLOC_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) \
++ $(LIBNL3_LIBS) $(NEEDED_LIBPROTOBUF_LIBS) $(LIBTALLOC_LIBS) \
++ $(NEEDED_LIBPROTOBUF_LIBS) $(CODE_COVERAGE_LDFLAGS) \
+ $(LIBNETTLE_LIBS)
- if LOCAL_PROTOBUF_C
- occtl_LDADD += ../protobuf/libprotobuf.a
+ occtl_SOURCES += unix.c
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocserv.git/commitdiff/7b6ac6805e2bc24fdc065dcbd92c9981590b3443
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
