From 960ed25687f9c850403dd5450c82c0759a891778 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 15 Feb 2013 08:27:01 +0000
Subject: main/openvpn: upgrade to 2.3.0

fixes #797
---
 main/openvpn/APKBUILD | 57 +++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 31 deletions(-)

(limited to 'main/openvpn/APKBUILD')

diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 929cd73db5..707085385a 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -1,21 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn
-pkgver=2.2.2
+pkgver=2.3.0
 pkgrel=0
 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
 url="http://openvpn.sourceforge.net/"
 arch="all"
 license="custom"
-subpackages="$pkgname-doc $pkgname-easy-rsa:easy_rsa"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-auth-pam:pam"
 depends="iproute2"
-makedepends="openssl-dev lzo-dev"
+makedepends="openssl-dev lzo-dev linux-pam-dev"
 install="$pkgname.pre-install"
 source="http://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz
 	openvpn.initd
 	openvpn.confd
 	openvpn.up
 	openvpn.down
-	openvpn-2.2.2-ipv6.patch
 	"
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -37,7 +36,7 @@ build() {
 		--sysconfdir=/etc/openvpn \
 		--enable-ssl \
 		--enable-crypto \
-		--disable-threads \
+		--enable-password-save \
 		--enable-iproute2
 
 	make || return 1
@@ -50,14 +49,12 @@ package() {
 	cd "$_builddir"
 
 	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/openvpn/plugins/*.la || return 1
 
-	# install plugins
-	install -d "$pkgdir"/usr/lib/$pkgname
-	cp plugin/*/*.so "$pkgdir"/usr/lib/$pkgname
-
-	# install examples
-	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/examples
-	cp -a sample-config-files "$pkgdir"/usr/share/doc/$pkgname/examples
+	# install samples
+	mkdir -p "$pkgdir"/usr/share/doc/$pkgname/samples
+	cp -a sample/sample-* "$pkgdir"/usr/share/doc/$pkgname/samples \
+		|| return 1
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
 	# install init.d and conf.d
@@ -70,27 +67,25 @@ package() {
 
 }
 
-easy_rsa() {
-	pkgdesc="OpenVPN RSA key management"
-	# easy rsa can by usefull on systems
-	# which do not have openvpn installed
-	depends="openssl"
-        # install easy-rsa
-	cd "$_builddir"
-        sed -i -e 's/--directory/-d/g; s/--mode=/-m/g' easy-rsa/2.0/Makefile
-        sed -i -e '1s|#!/bin/bash|#!/bin/sh|' easy-rsa/2.0/*
-        make -C easy-rsa/2.0 DESTDIR="$subpkgdir" \
-                PREFIX=usr/share/doc/openvpn/easy-rsa \
-                install
-}
-
-doc() {
-	default_doc
+pam() {
+	pkgdesc="OpenVPN plugin for PAM authentication"
+	mkdir -p "$subpkgdir"/usr/lib/openvpn/plugins
+	mv "$pkgdir"/usr/lib/openvpn/plugins/*-auth-pam* \
+		"$subpkgdir"/usr/lib/openvpn/plugins/
 }
 
-md5sums="c5181e27b7945fa6276d21873329c5c7  openvpn-2.2.2.tar.gz
+md5sums="56cffde5d5320e0b1ec364d3e486aca9  openvpn-2.3.0.tar.gz
 ec99092827faa7226e9f548c2cd1d20c  openvpn.initd
 9eca88cac6294027ec1bb7be74185c3a  openvpn.confd
 dc72fecd1a1bcef937603057cd6574b1  openvpn.up
-dc3ff0bae442b9aedd947b8ffda1687a  openvpn.down
-51b1ddade743505b84d27db9ebfd6c0a  openvpn-2.2.2-ipv6.patch"
+dc3ff0bae442b9aedd947b8ffda1687a  openvpn.down"
+sha256sums="4602a8d0f66dfa6ac10b7abfeba35260d7d4c570948f6eba5f8216ffa3a2c490  openvpn-2.3.0.tar.gz
+4cc6e77384ddc41d0356ae0703c527c61f78d6ef89523f78944e75158b885e05  openvpn.initd
+330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2  openvpn.confd
+848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd  openvpn.up
+39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7  openvpn.down"
+sha512sums="ebac619dd746406d6751d84391480f7eae2b6c442bbacf1ce6e3d21952ee85bccc7ca2d526fe04cb7ecde749d2a5abb4e787c0e63c349818c7129f5747a2769a  openvpn-2.3.0.tar.gz
+da7a29ad3d367d8bad5f20a63208418dc46f20916bb6a6dbd9e26765e7bb5193eab0465ab71b11d3957fec30610e612681ee1a1e3cbd9d7fc41cae6b8824f724  openvpn.initd
+982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37  openvpn.confd
+f904d6125ed1ddb48ea632c3b290a7a4a7a7436be0d46b323fc8c92f919f9d076fdc78ff7bed0dd65675f0bc3559e531e372b805fc11ef287efeeb4d54fe52f4  openvpn.up
+5defd61edf11cc63f3f8f60bef7fa730c4bcdd2545d664bd94666dd3aea80bd9d190263d8835a555e4287a594f6fce0f52426aed49c60233ff637a2a6164a997  openvpn.down"
-- 
cgit v1.2.3