[packages/ocserv] - updated to 0.11.0 - added link patch (fixes build with as-needed)
qboosh
qboosh at pld-linux.org
Sun Feb 28 15:11:56 CET 2016
commit 6bbc5099bcf255793b85665a7d0de7255d58afb7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Feb 28 15:15:21 2016 +0100
- updated to 0.11.0
- added link patch (fixes build with as-needed)
ocserv-link.patch | 32 ++++++++++++++++++++++++++++++++
ocserv.spec | 21 +++++++++++++++------
2 files changed, 47 insertions(+), 6 deletions(-)
---
diff --git a/ocserv.spec b/ocserv.spec
index 046e001..5fc5e03 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -7,39 +7,43 @@
Summary: OpenConnect VPN server
Summary(pl.UTF-8): Serwer VPN-a OpenConnect
Name: ocserv
-Version: 0.10.10
+Version: 0.11.0
Release: 1
License: GPL v2+
Group: Applications/Networking
Source0: ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz
-# Source0-md5: 1f73ccb66d36cd51279323e95ae99e68
+# Source0-md5: 9161b506142232957ccf786c251b5b42
+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: dbus-devel >= 1.1.1
BuildRequires: gnutls-devel >= 3.1.10
BuildRequires: http-parser-devel
# pkgconfig(krb5-gssapi)
%{?with_kerberos5:BuildRequires: krb5-devel}
+BuildRequires: libev-devel >= 4
BuildRequires: libnl-devel >= 3.2
BuildRequires: libpcl-devel
BuildRequires: libseccomp-devel
%{?with_kerberos5:BuildRequires: libtasn1-devel >= 3.9}
BuildRequires: libwrap-devel
BuildRequires: lz4-devel
+BuildRequires: nettle-devel >= 2.7
+BuildRequires: oath-toolkit-devel
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: protobuf-c-devel
-%{?with_radius:BuildRequires: radcli-devel >= 1.2.1}
+%{?with_radius:BuildRequires: radcli-devel >= 1.2.5}
BuildRequires: readline-devel
BuildRequires: systemd-devel
BuildRequires: talloc-devel
BuildRequires: tar >= 1:1.22
BuildRequires: xz
-Requires: dbus-libs >= 1.1.1
Requires: gnutls >= 3.1.10
Requires: libnl >= 3.2
-%{?with_radius:Requires: radcli >= 1.2.1}
+%{?with_radius:Requires: radcli >= 1.2.5}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -65,8 +69,13 @@ zaprojektowany jako zgodny także z innymi wariantami uniksów.
%prep
%setup -q
+%patch0 -p1
%build
+%{__aclocal} -I gl/m4 -I libopts/m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
%configure \
--disable-silent-rules \
%{!?with_kerberos5:--without-gssapi} \
diff --git a/ocserv-link.patch b/ocserv-link.patch
new file mode 100644
index 0000000..e40304b
--- /dev/null
+++ b/ocserv-link.patch
@@ -0,0 +1,32 @@
+--- 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
+ 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) \
+ $(RADCLI_LIBS) $(LIBLZ4_LIBS) $(LIBKRB5_LIBS) \
+ $(LIBTASN1_LIBS) $(LIBOATH_LIBS) $(LIBNETTLE_LIBS) \
+- $(LIBEV_LIBS) libipc.a
++ $(LIBEV_LIBS)
+
+
+ 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 @@
+
+ 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
+-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)
+
+ if LOCAL_PROTOBUF_C
+ occtl_LDADD += ../protobuf/libprotobuf.a
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ocserv.git/commitdiff/6bbc5099bcf255793b85665a7d0de7255d58afb7
More information about the pld-cvs-commit
mailing list