diff options
| author | J0WI <J0WI@users.noreply.github.com> | 2019-10-27 01:54:39 +0200 |
|---|---|---|
| committer | Rasmus Thomsen <oss@cogitri.dev> | 2020-01-06 20:08:50 +0100 |
| commit | 5c122d8f48e9d4a3f05c451c5fd4c29f3e256190 (patch) | |
| tree | 5ad2d252ab8da9b29cf7819fe46e3125e00f5ec5 /testing/vpnc | |
| parent | 62b01f05e4a79dd1603ba69d2ea6688e5ff3ac56 (diff) | |
| download | aports-5c122d8f48e9d4a3f05c451c5fd4c29f3e256190.tar.bz2 aports-5c122d8f48e9d4a3f05c451c5fd4c29f3e256190.tar.xz | |
testing/vpnc: upgrade to fa0689c
Diffstat (limited to 'testing/vpnc')
| -rw-r--r-- | testing/vpnc/APKBUILD | 8 | ||||
| -rw-r--r-- | testing/vpnc/musl-libc.patch | 42 |
2 files changed, 3 insertions, 47 deletions
diff --git a/testing/vpnc/APKBUILD b/testing/vpnc/APKBUILD index 7285b95950..a471ebc820 100644 --- a/testing/vpnc/APKBUILD +++ b/testing/vpnc/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=vpnc pkgver=0.5.3 -_commit=101208be5b74039ea70b9e007ce0d6c9fbe44d82 -pkgrel=5 +_commit=fa0689cc9a67d02a614c7a2406dfe2e794825a31 +pkgrel=6 pkgdesc="IPSec VPN client compatible with Cisco equipment" url="https://github.com/streambinder/vpnc" arch="all" @@ -11,7 +11,6 @@ license="GPL-3.0-or-later" makedepends="gnutls-dev libgcrypt-dev openssl-dev perl linux-headers" subpackages="$pkgname-doc $pkgname-openrc" source="$pkgname-$pkgver.zip::https://github.com/streambinder/vpnc/archive/$_commit.zip - musl-libc.patch vpnc.initd vpnc.confd" builddir="$srcdir/$pkgname-$_commit" @@ -33,7 +32,6 @@ package() { "$pkgdir"/etc/conf.d/vpnc } -sha512sums="7f49032d9032b4508b4b57ec37347025ed0ef7cc09c527e3bce2b6a6d4f33c7037a648a262f7129f8b075f843ab6d3344f6cd4908ea21ab34ed62e1dcf5bb8ac vpnc-0.5.3.zip -4b34c1b20a865bd36a58bfaa625f77c014a7286796586727610dcc55d50fac39a58bc7e1e03f2deb9b74229301bfc4f429e231081336f6f5eb111d5ae8cd6994 musl-libc.patch +sha512sums="b78a0e9689b743bcda002e1b8b1f924757477c07899b2b6e5d6b4d3a82399f7cc5daaf9f5d10cb337a0a9b082053f9e083f9a9848a6d01481e8846a1d4ad4165 vpnc-0.5.3.zip d20091a67ccd3b8e9f31ca47c49577ff3cd5bf6ba9ef7bcd9f03231d87fa64d978c60ab69c67bbafdc18d6474d932d6ec68de02d13bea41ae6a7d31b845635e9 vpnc.initd 1254f687dcd9822becfcccabbb34d8343d715d70247dbf4b5e018835fff24b33f5272368f77199d697c8d11d913182b1f756d5e08a46b2057849779f09b19633 vpnc.confd" diff --git a/testing/vpnc/musl-libc.patch b/testing/vpnc/musl-libc.patch deleted file mode 100644 index b4ac86612f..0000000000 --- a/testing/vpnc/musl-libc.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/config.c -+++ b/src/config.c -@@ -29,6 +29,7 @@ - #include <unistd.h> - #include <string.h> - #include <errno.h> -+#include <sys/ttydefaults.h> - #include <sys/types.h> - #include <sys/utsname.h> - #include <sys/wait.h> ---- a/src/sysdep.h -+++ b/src/sysdep.h -@@ -37,12 +37,14 @@ - int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); - - /***************************************************************************/ --#if defined(__linux__) || defined(__GLIBC__) -+#if defined(__GLIBC__) || defined(__UCLIBC__) - #include <error.h> -+#define HAVE_ERROR 1 -+#endif - -+#if defined(__linux__) || defined(__GLIBC__) - #define HAVE_VASPRINTF 1 - #define HAVE_ASPRINTF 1 --#define HAVE_ERROR 1 - #define HAVE_UNSETENV 1 - #define HAVE_SETENV 1 - #endif ---- a/src/sysdep.c -+++ b/src/sysdep.c -@@ -59,6 +59,10 @@ - #if defined(__DragonFly__) - #include <net/tun/if_tun.h> - #elif defined(__linux__) -+# if !defined(__GLIBC__) && !defined(__UCLIBC__) -+# define _LINUX_IF_ETHER_H -+# include <net/ethernet.h> -+# endif - #include <linux/if_tun.h> - #elif defined(__APPLE__) - /* no header for tun */ |