diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | install.patch | 32 |
3 files changed, 42 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = ocserv pkgdesc = OpenConnect VPN Server pkgver = 0.3.2 - pkgrel = 1 + pkgrel = 2 url = http://www.infradead.org/ocserv/ arch = i686 arch = x86_64 @@ -18,7 +18,9 @@ pkgbase = ocserv backup = etc/ocserv.config backup = etc/ocserv-passwd source = ftp://ftp.infradead.org/pub/ocserv/ocserv-0.3.2.tar.xz + source = install.patch sha256sums = a420bff8d26bd7b1e820b875a264bd8fdae871770120f3adf131b040cbf6ed9a + sha256sums = 81ae628d912e6edb928ce0e62d26807b319866ba0bbf0a2d8c14385a959a9203 pkgname = ocserv @@ -1,19 +1,23 @@ # Maintainer: Brian Bidulock <bidulock@openss7.org> pkgname=ocserv pkgver=0.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="OpenConnect VPN Server" arch=('i686' 'x86_64') url="http://www.infradead.org/ocserv/" license=('GPL2') depends=('autogen' 'libpcl' 'gnutls' 'http-parser' 'libdbus' 'libnl' 'libsystemd' 'pam' 'protobuf-c') backup=('etc/ocserv.config' 'etc/ocserv-passwd') -source=("ftp://ftp.infradead.org/pub/ocserv/ocserv-$pkgver.tar.xz") -sha256sums=('a420bff8d26bd7b1e820b875a264bd8fdae871770120f3adf131b040cbf6ed9a') +source=("ftp://ftp.infradead.org/pub/ocserv/ocserv-$pkgver.tar.xz" + "install.patch") +sha256sums=('a420bff8d26bd7b1e820b875a264bd8fdae871770120f3adf131b040cbf6ed9a' + '81ae628d912e6edb928ce0e62d26807b319866ba0bbf0a2d8c14385a959a9203') prepare() { cd "$srcdir/${pkgname}-${pkgver}/" sed -e 's/CPPFunction/rl_completion_func_t/' -i src/occtl.c + patch -Np2 -b -z .orig <"$srcdir/install.patch" + autoreconf -fi } build() { diff --git a/install.patch b/install.patch new file mode 100644 index 000000000000..ba188eea1ab6 --- /dev/null +++ b/install.patch @@ -0,0 +1,32 @@ +diff -up src/ocserv-0.3.2/configure.ac.orig src/ocserv-0.3.2/configure.ac +--- src/ocserv-0.3.2/configure.ac.orig 2014-03-30 06:46:56.000000000 -0600 ++++ src/ocserv-0.3.2/configure.ac 2014-03-30 06:56:15.000000000 -0600 +@@ -65,9 +65,11 @@ AM_CONDITIONAL(HAVE_DBUS, test "x$dbus_e + + if test "x$dbus_enabled" != xno;then + dbus_conf_dir=$($PKG_CONFIG dbus-1 --variable=sysconfdir) +-AC_SUBST(DBUS_CONFIG_DIR, [$dbus_conf_dir/etc/dbus-1/system.d/]) ++AC_SUBST(dbusconfdir, [$dbus_conf_dir/dbus-1/system.d/]) + fi + ++AC_SUBST(systemddir, ['${libdir}/systemd/system']) ++ + AC_ARG_WITH(protobuf, + AS_HELP_STRING([--without-protobuf], [use the included protobuf library]), + test_for_protobuf=$withval, +diff -up src/ocserv-0.3.2/doc/Makefile.am.orig src/ocserv-0.3.2/doc/Makefile.am +--- src/ocserv-0.3.2/doc/Makefile.am.orig 2014-03-30 06:47:13.000000000 -0600 ++++ src/ocserv-0.3.2/doc/Makefile.am 2014-03-30 06:56:08.000000000 -0600 +@@ -20,6 +20,9 @@ ocpasswd.8: ../src/ocpasswd-args.def + @AUTOGEN@ -L../src -DMAN_SECTION=8 -Tagman-cmd.tpl "$<".tmp && \ + rm -f "$<".tmp + +-install-data-local: +- -test -d "$(DBUS_CONFIG_DIR)" && ! test -f $(DBUS_CONFIG_DIR)/org.infradead.ocserv.conf && $(INSTALL_DATA) dbus/org.infradead.ocserv.conf $(DBUS_CONFIG_DIR) +- -test -d "/usr/lib/systemd/system/" && ! test -f /usr/lib/systemd/system/ocserv.service && $(INSTALL_DATA) systemd/standalone/ocserv.service /usr/lib/systemd/system/ ++dist_dbusconf_DATA = \ ++ dbus/org.infradead.ocserv.conf ++ ++dist_systemd_DATA = \ ++ systemd/socket-activated/ocserv.service \ ++ systemd/socket-activated/ocserv.socket |