diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-10-09 08:22:05 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-10-09 08:23:13 +0000 |
| commit | c09a38d104fcb3ea72901f85b77e9add30437853 (patch) | |
| tree | 32b7ef3b41aa611d554d442bdb14d233cf899f41 | |
| parent | 3c461dc8d43772a48e601a39e037565920cf588f (diff) | |
| download | aports-c09a38d104fcb3ea72901f85b77e9add30437853.tar.bz2 aports-c09a38d104fcb3ea72901f85b77e9add30437853.tar.xz | |
main/openvpn: fix musl build
| -rw-r--r-- | main/openvpn/APKBUILD | 19 | ||||
| -rw-r--r-- | main/openvpn/fix-headers.patch | 13 |
2 files changed, 25 insertions, 7 deletions
diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD index 3506104aa..714a4fe9d 100644 --- a/main/openvpn/APKBUILD +++ b/main/openvpn/APKBUILD @@ -11,6 +11,7 @@ depends="iproute2" makedepends="openssl-dev lzo-dev linux-pam-dev" install="$pkgname.pre-install" source="http://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz + fix-headers.patch openvpn.initd openvpn.confd openvpn.up @@ -20,13 +21,14 @@ source="http://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz _builddir="$srcdir"/$pkgname-$pkgver prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done + local i + cd "$_builddir" + update_config_sub || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done } build() { @@ -79,16 +81,19 @@ pam() { } md5sums="06e5f93dbf13f2c19647ca15ffc23ac1 openvpn-2.3.2.tar.gz +528e49140f238bb59686d346bab8cd09 fix-headers.patch ec99092827faa7226e9f548c2cd1d20c openvpn.initd 9eca88cac6294027ec1bb7be74185c3a openvpn.confd dc72fecd1a1bcef937603057cd6574b1 openvpn.up dc3ff0bae442b9aedd947b8ffda1687a openvpn.down" sha256sums="20bda3f9debb9a52db262aecddfa4e814050a9404a9106136b7e3b6f7ef36ffc openvpn-2.3.2.tar.gz +eae756177d02769e0bee503f4512d32e6a971ae1236223f3c8e6bbef2ac5a7aa fix-headers.patch 4cc6e77384ddc41d0356ae0703c527c61f78d6ef89523f78944e75158b885e05 openvpn.initd 330149a83684ddabe413d134d4c8efad4c88b18c2ab67165014deff5f7fffad2 openvpn.confd 848da0929c37b2112769232fbbdf61961b6107c6726d4b74d1ceb034b39ad5dd openvpn.up 39debebcd8c899f20e6d355cbc8eaab46e28b83a9f6c33a94c065688a4f3d2c7 openvpn.down" sha512sums="9936a8b3a71073239ca25e0d3cf24862e95c29218b2bba9663369eca80b4c9f83ef12dd41eb9998165d4819f041335606eeb0257b6805e1cdd1ae4761bb9dddf openvpn-2.3.2.tar.gz +236608eacb00c28e903890806b5726a77bc9614c043596a7fb4bf22b10f0a61f104127ade831bc91870fdedbd5661348f88b1ddad4f7809cf6199d9728d964a1 fix-headers.patch da7a29ad3d367d8bad5f20a63208418dc46f20916bb6a6dbd9e26765e7bb5193eab0465ab71b11d3957fec30610e612681ee1a1e3cbd9d7fc41cae6b8824f724 openvpn.initd 982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37 openvpn.confd f904d6125ed1ddb48ea632c3b290a7a4a7a7436be0d46b323fc8c92f919f9d076fdc78ff7bed0dd65675f0bc3559e531e372b805fc11ef287efeeb4d54fe52f4 openvpn.up diff --git a/main/openvpn/fix-headers.patch b/main/openvpn/fix-headers.patch new file mode 100644 index 000000000..0e458d68a --- /dev/null +++ b/main/openvpn/fix-headers.patch @@ -0,0 +1,13 @@ +--- openvpn-2.3.2.orig/src/openvpn/syshead.h ++++ openvpn-2.3.2/src/openvpn/syshead.h +@@ -214,10 +214,6 @@ + + #ifdef TARGET_LINUX + +-#if defined(HAVE_NETINET_IF_ETHER_H) +-#include <netinet/if_ether.h> +-#endif +- + #ifdef HAVE_LINUX_IF_TUN_H + #include <linux/if_tun.h> + #endif |