diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-16 17:50:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-05-16 18:50:20 +0000 |
| commit | c1f7e2253205e6ee1df151b57acb508dfeedcaba (patch) | |
| tree | dd408e636c3ff57731661e7e59419c3241735db2 | |
| parent | da442094ef7c9b41855df3fe5385607945fdedae (diff) | |
| download | alpine_aports-c1f7e2253205e6ee1df151b57acb508dfeedcaba.tar.bz2 alpine_aports-c1f7e2253205e6ee1df151b57acb508dfeedcaba.tar.xz alpine_aports-c1f7e2253205e6ee1df151b57acb508dfeedcaba.zip | |
main/xl2tpd: upgrade to 1.3.7
| -rw-r--r-- | main/xl2tpd/APKBUILD | 19 | ||||
| -rw-r--r-- | main/xl2tpd/xl2tpd-compile.patch | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/main/xl2tpd/APKBUILD b/main/xl2tpd/APKBUILD index b72381b0d5..bdc8355901 100644 --- a/main/xl2tpd/APKBUILD +++ b/main/xl2tpd/APKBUILD | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | # Contributor: Danilo Godec <danilo.godec@agenda.si> | 1 | # Contributor: Danilo Godec <danilo.godec@agenda.si> |
| 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
| 3 | pkgname=xl2tpd | 3 | pkgname=xl2tpd |
| 4 | pkgver=1.3.6 | 4 | pkgver=1.3.7 |
| 5 | pkgrel=1 | 5 | pkgrel=0 |
| 6 | pkgdesc="Layer 2 Tunnelling Protocol Daemon (RFC 2661)" | 6 | pkgdesc="Layer 2 Tunnelling Protocol Daemon (RFC 2661)" |
| 7 | url="http://www.xelerance.com/services/software/xl2tpd/" | 7 | url="http://www.xelerance.com/services/software/xl2tpd/" |
| 8 | arch="all" | 8 | arch="all" |
| @@ -16,7 +16,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$p | |||
| 16 | xl2tpd.confd | 16 | xl2tpd.confd |
| 17 | xl2tpd.initd | 17 | xl2tpd.initd |
| 18 | options.l2tp | 18 | options.l2tp |
| 19 | xl2tpd-compile.patch" | 19 | xl2tpd-compile.patch |
| 20 | " | ||
| 20 | 21 | ||
| 21 | _builddir="$srcdir"/$pkgname-$pkgver | 22 | _builddir="$srcdir"/$pkgname-$pkgver |
| 22 | prepare() { | 23 | prepare() { |
| @@ -45,18 +46,18 @@ package() { | |||
| 45 | install -dm755 "$pkgdir"/var/run/xl2tpd | 46 | install -dm755 "$pkgdir"/var/run/xl2tpd |
| 46 | } | 47 | } |
| 47 | 48 | ||
| 48 | md5sums="2f526cc0c36cf6d8a74f1fb2e08c18ec xl2tpd-1.3.6.tar.gz | 49 | md5sums="740b3b59209c59a181cebae55468355a xl2tpd-1.3.7.tar.gz |
| 49 | 0032d104bd2d993b8a514c2f898d1dd9 xl2tpd.confd | 50 | 0032d104bd2d993b8a514c2f898d1dd9 xl2tpd.confd |
| 50 | b711d36939e26bc382411a871d5950d7 xl2tpd.initd | 51 | b711d36939e26bc382411a871d5950d7 xl2tpd.initd |
| 51 | 8f1a2896d08b6353424013cf7247dc7d options.l2tp | 52 | 8f1a2896d08b6353424013cf7247dc7d options.l2tp |
| 52 | 603a366ded106e7a38c269fd7f2ac84e xl2tpd-compile.patch" | 53 | 1bdd15a5eb68077abc2b9803358b1e00 xl2tpd-compile.patch" |
| 53 | sha256sums="49b069aa8d873e1d8f615ccc4212351e427bf681ba453fdd211256a8345bb7fb xl2tpd-1.3.6.tar.gz | 54 | sha256sums="4159e28ac66bf1849f1586828aee0b7bc64820ac8ebb8923c264b91ff532ddf0 xl2tpd-1.3.7.tar.gz |
| 54 | 26865d5ddf660cbba6c0e7a640512745497c89ec233658326699ebb44607e53d xl2tpd.confd | 55 | 26865d5ddf660cbba6c0e7a640512745497c89ec233658326699ebb44607e53d xl2tpd.confd |
| 55 | 7a7204cfe9c0ef7108ce12d12ec133dc9288fda68303b0da47c96d541d9e7256 xl2tpd.initd | 56 | 7a7204cfe9c0ef7108ce12d12ec133dc9288fda68303b0da47c96d541d9e7256 xl2tpd.initd |
| 56 | 5efe8fc378b3fd435961c510d2dc416d775672b9531fe9c713be9024fa852063 options.l2tp | 57 | 5efe8fc378b3fd435961c510d2dc416d775672b9531fe9c713be9024fa852063 options.l2tp |
| 57 | 7c73a130132912a0f8ad3feca4b2c75d6e77f0a10e2e5077a6bbedb2fd6e8b3a xl2tpd-compile.patch" | 58 | d9f9917a9ab4b536b95ecc04e6c282035717ad6fec4b0e8ab69d4155aadf494f xl2tpd-compile.patch" |
| 58 | sha512sums="868c65660e6a45fb8dc22b95542e9d6ca0dc8e5033cc9df04171a651ef273bc5d711a85f61d4a971d714089f7a10ee67460d8ab9f3c007fcffe0e11e81ae0bfd xl2tpd-1.3.6.tar.gz | 59 | sha512sums="4a000e47943d524f421693fc78962460680bc3dfb6ce95212e6a0776d4264f0038385d63de97ec19c9768133e08cc2648c8ca223ed52efe0e61c021a5da50094 xl2tpd-1.3.7.tar.gz |
| 59 | 1d0924d71b96b6bbaccbdcb11468047d02126d01650b7379923489a39976559e10f0167848608586de689fbbf5ba7d8c584f5443f9b4731501f7bf54b1142b44 xl2tpd.confd | 60 | 1d0924d71b96b6bbaccbdcb11468047d02126d01650b7379923489a39976559e10f0167848608586de689fbbf5ba7d8c584f5443f9b4731501f7bf54b1142b44 xl2tpd.confd |
| 60 | 35155e758fe0404d7850600c9c0bcdd17e74cd2b95dea3d21761fbb3032757dccde42a9e34d68822c96f3c0fca475223e2f842e9067a99293f3668d99e858084 xl2tpd.initd | 61 | 35155e758fe0404d7850600c9c0bcdd17e74cd2b95dea3d21761fbb3032757dccde42a9e34d68822c96f3c0fca475223e2f842e9067a99293f3668d99e858084 xl2tpd.initd |
| 61 | 50e01a2e6b397a210789a2b782a4fca01d950ebe41bc5cbb1d185c2e216b722e89b9bc7affc0194089d4c54c90a49f1a773519cc96d83f2dbd8f64c49e565109 options.l2tp | 62 | 50e01a2e6b397a210789a2b782a4fca01d950ebe41bc5cbb1d185c2e216b722e89b9bc7affc0194089d4c54c90a49f1a773519cc96d83f2dbd8f64c49e565109 options.l2tp |
| 62 | 1b965771f796e05a561e417555cd09b64629ecab56e93e1459560b00e5367d0e9cd2135182817e6a7f38c944290bdbd0e10fa864a2d83127a8a6cdace11cec57 xl2tpd-compile.patch" | 63 | 513fc2b7ccbf271aecec182ed41dea7ebb6eea1551e77aef672d737c8ecb043a12feee39804ee63d55841d045d087cbb79ca4ddcd5e5509f63b2d26e8f9e55d3 xl2tpd-compile.patch" |
diff --git a/main/xl2tpd/xl2tpd-compile.patch b/main/xl2tpd/xl2tpd-compile.patch index d41bc595f1..b37baa5506 100644 --- a/main/xl2tpd/xl2tpd-compile.patch +++ b/main/xl2tpd/xl2tpd-compile.patch | |||
| @@ -1,12 +1,11 @@ | |||
| 1 | diff -u --recursive src.orig/xl2tpd-1.3.6/xl2tpd.c src/xl2tpd-1.3.6/xl2tpd.c | 1 | --- ./xl2tpd.c.orig |
| 2 | --- xl2tpd-1.3.6.orig/xl2tpd.c 2014-01-15 21:58:37.000000000 -0100 | 2 | +++ ./xl2tpd.c |
| 3 | +++ xl2tpd-1.3.6/xl2tpd.c 2014-06-21 07:22:21.195278618 -0200 | 3 | @@ -30,7 +30,7 @@ |
| 4 | @@ -33,8 +33,6 @@ | 4 | #include <errno.h> |
| 5 | #if (__GLIBC__ < 2) | 5 | #include <unistd.h> |
| 6 | #include <time.h> | ||
| 7 | -#if (__GLIBC__ < 2) | ||
| 8 | +#if defined(__GLIBC__) && (__GLIBC__ < 2) | ||
| 6 | # if defined(FREEBSD) || defined(OPENBSD) | 9 | # if defined(FREEBSD) || defined(OPENBSD) |
| 7 | # include <sys/signal.h> | 10 | # include <sys/signal.h> |
| 8 | -# elif defined(LINUX) | 11 | # elif defined(LINUX) |
| 9 | -# include <bsd/signal.h> | ||
| 10 | # elif defined(SOLARIS) | ||
| 11 | # include <signal.h> | ||
| 12 | # endif | ||