diff options
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | libs.patch | 34 |
3 files changed, 9 insertions, 49 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Wed Apr 6 07:30:09 UTC 2016 pkgbase = ocserv pkgdesc = OpenConnect VPN Server - pkgver = 0.11.1 + pkgver = 0.11.2 pkgrel = 1 url = https://gitlab.com/ocserv/ocserv arch = i686 @@ -22,12 +20,11 @@ pkgbase = ocserv depends = libseccomp depends = freeradius-client depends = libev + depends = oath-toolkit backup = etc/ocserv.config backup = etc/ocserv-passwd - source = ocserv-0.11.1.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_0_11_1 - source = libs.patch - sha256sums = c01a992c5bd945756fa1b11b8899bf2f42a70076ac76067243c4bd03d3552feb - sha256sums = ac600ec5bf93a677a5d28fc2492ecdf07b391bb4f30f88a1075024a755ffb308 + source = ocserv-0.11.2.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_0_11_2 + sha256sums = f78e2b866f0b883af8b55aa2f42d119d9adf914b0725c5c9a54ec85912713d72 pkgname = ocserv @@ -1,23 +1,20 @@ # Maintainer: Brian Bidulock <bidulock@openss7.org> pkgname=ocserv -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="OpenConnect VPN Server" arch=('i686' 'x86_64') url="https://gitlab.com/ocserv/ocserv" license=('GPL2') -depends=('autogen' 'libpcl' 'gnutls' 'http-parser' 'libnl' 'libsystemd' 'pam' 'protobuf-c' 'talloc' 'libseccomp' 'freeradius-client' 'libev') +depends=('autogen' 'libpcl' 'gnutls' 'http-parser' 'libnl' 'libsystemd' 'pam' 'protobuf-c' 'talloc' 'libseccomp' 'freeradius-client' 'libev' 'oath-toolkit') makedepends=('freeradius' 'gperf') backup=('etc/ocserv.config' 'etc/ocserv-passwd') -source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_0_11_1" - libs.patch) -sha256sums=('c01a992c5bd945756fa1b11b8899bf2f42a70076ac76067243c4bd03d3552feb' - 'ac600ec5bf93a677a5d28fc2492ecdf07b391bb4f30f88a1075024a755ffb308') +source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_0_11_2") +sha256sums=('f78e2b866f0b883af8b55aa2f42d119d9adf914b0725c5c9a54ec85912713d72') prepare() { cd ${pkgname}-${pkgname}_* - patch -Np0 -b -z .orig < ../libs.patch - autoreconf -fiv + autoreconf -fi } build() { diff --git a/libs.patch b/libs.patch deleted file mode 100644 index 707486370c30..000000000000 --- a/libs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up ./src/Makefile.am.orig ./src/Makefile.am ---- ./src/Makefile.am.orig 2016-03-19 06:05:34.000000000 -0600 -+++ ./src/Makefile.am 2016-04-06 01:17:26.000000000 -0600 -@@ -75,13 +75,13 @@ if HAVE_GSSAPI - 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 -diff -up ./src/occtl/Makefile.am.orig ./src/occtl/Makefile.am ---- ./src/occtl/Makefile.am.orig 2016-04-06 01:24:11.000000000 -0600 -+++ ./src/occtl/Makefile.am 2016-04-06 01:24:39.000000000 -0600 -@@ -17,9 +17,8 @@ bin_PROGRAMS = occtl - - 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) $(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 - AM_CPPFLAGS += -I$(srcdir)/../protobuf/ |