Hi,

Please apply. This makes xl2tpd build.

regards,


Igmar

>From 64c3c81b5639e0c901280f92482a567a938e23c6 Mon Sep 17 00:00:00 2001
From: Igmar Palsenberg <igmar@palsenberg.com>
Date: Sat, 21 Jun 2014 07:50:12 +0200
Subject: [PATCH] Make xl2tpd build Fixes #2979

---
 main/xl2tpd/APKBUILD             | 14 +++++++++-----
 main/xl2tpd/xl2tpd-compile.patch | 12 ++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 main/xl2tpd/xl2tpd-compile.patch

diff --git a/main/xl2tpd/APKBUILD b/main/xl2tpd/APKBUILD
index 635bd09..70675dc 100644
--- a/main/xl2tpd/APKBUILD
+++ b/main/xl2tpd/APKBUILD
@@ -5,7 +5,7 @@ pkgver=1.3.6
 pkgrel=0
 pkgdesc="Layer 2 Tunnelling Protocol Daemon (RFC 2661)"
 url="http://www.xelerance.com/services/software/xl2tpd/"
-arch=""
+arch="i686 x86_64"
 license="GPL"
 depends=""
 depends_dev="libpcap-dev"
@@ -15,7 +15,8 @@ subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/xelerance/xl2tpd/archive/v$pkgver.tar.gz
 	xl2tpd.confd
 	xl2tpd.initd
-	options.l2tp"
+	options.l2tp
+        xl2tpd-compile.patch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
@@ -47,12 +48,15 @@ package() {
 md5sums="2f526cc0c36cf6d8a74f1fb2e08c18ec  xl2tpd-1.3.6.tar.gz
 0032d104bd2d993b8a514c2f898d1dd9  xl2tpd.confd
 fc8c1dca4b14974ace99d08219daf76d  xl2tpd.initd
-8f1a2896d08b6353424013cf7247dc7d  options.l2tp"
+8f1a2896d08b6353424013cf7247dc7d  options.l2tp
+603a366ded106e7a38c269fd7f2ac84e  xl2tpd-compile.patch"
 sha256sums="49b069aa8d873e1d8f615ccc4212351e427bf681ba453fdd211256a8345bb7fb  xl2tpd-1.3.6.tar.gz
 26865d5ddf660cbba6c0e7a640512745497c89ec233658326699ebb44607e53d  xl2tpd.confd
 4b393ab50edc5e6314639ff4feab6ed8ffd13036663d515eea052522ad1c35cd  xl2tpd.initd
-5efe8fc378b3fd435961c510d2dc416d775672b9531fe9c713be9024fa852063  options.l2tp"
+5efe8fc378b3fd435961c510d2dc416d775672b9531fe9c713be9024fa852063  options.l2tp
+7c73a130132912a0f8ad3feca4b2c75d6e77f0a10e2e5077a6bbedb2fd6e8b3a  xl2tpd-compile.patch"
 sha512sums="868c65660e6a45fb8dc22b95542e9d6ca0dc8e5033cc9df04171a651ef273bc5d711a85f61d4a971d714089f7a10ee67460d8ab9f3c007fcffe0e11e81ae0bfd  xl2tpd-1.3.6.tar.gz
 1d0924d71b96b6bbaccbdcb11468047d02126d01650b7379923489a39976559e10f0167848608586de689fbbf5ba7d8c584f5443f9b4731501f7bf54b1142b44  xl2tpd.confd
 fbd381823421581c012f4171a55a9bea67b9ee7c7141f31793296011d565c639e79fc9ef61ef783e134407f949da142ae1a7cf58054d4a820c762bcee662db2b  xl2tpd.initd
-50e01a2e6b397a210789a2b782a4fca01d950ebe41bc5cbb1d185c2e216b722e89b9bc7affc0194089d4c54c90a49f1a773519cc96d83f2dbd8f64c49e565109  options.l2tp"
+50e01a2e6b397a210789a2b782a4fca01d950ebe41bc5cbb1d185c2e216b722e89b9bc7affc0194089d4c54c90a49f1a773519cc96d83f2dbd8f64c49e565109  options.l2tp
+1b965771f796e05a561e417555cd09b64629ecab56e93e1459560b00e5367d0e9cd2135182817e6a7f38c944290bdbd0e10fa864a2d83127a8a6cdace11cec57  xl2tpd-compile.patch"
diff --git a/main/xl2tpd/xl2tpd-compile.patch b/main/xl2tpd/xl2tpd-compile.patch
new file mode 100644
index 0000000..d41bc59
--- /dev/null
+++ b/main/xl2tpd/xl2tpd-compile.patch
@@ -0,0 +1,12 @@
+diff -u --recursive src.orig/xl2tpd-1.3.6/xl2tpd.c src/xl2tpd-1.3.6/xl2tpd.c
+--- xl2tpd-1.3.6.orig/xl2tpd.c	2014-01-15 21:58:37.000000000 -0100
++++ xl2tpd-1.3.6/xl2tpd.c	2014-06-21 07:22:21.195278618 -0200
+@@ -33,8 +33,6 @@
+ #if (__GLIBC__ < 2)
+ # if defined(FREEBSD) || defined(OPENBSD)
+ #  include <sys/signal.h>
+-# elif defined(LINUX)
+-#  include <bsd/signal.h>
+ # elif defined(SOLARIS)
+ #  include <signal.h>
+ # endif
-- 
2.0.0



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---

On Tue, 24 Jun 2014 20:46:45 +0200 (CEST)
Igmar Palsenberg <maillist@palsenberg.com> wrote:

> 
> Hi,
> 
> Please apply. This makes xl2tpd build.
> 
> regards,
> 
> 
> Igmar
> 
> From 64c3c81b5639e0c901280f92482a567a938e23c6 Mon Sep 17 00:00:00 2001
> From: Igmar Palsenberg <igmar@palsenberg.com>
> Date: Sat, 21 Jun 2014 07:50:12 +0200
> Subject: [PATCH] Make xl2tpd build Fixes #2979
> 
> ---
>  main/xl2tpd/APKBUILD             | 14 +++++++++-----
>  main/xl2tpd/xl2tpd-compile.patch | 12 ++++++++++++
>  2 files changed, 21 insertions(+), 5 deletions(-)
>  create mode 100644 main/xl2tpd/xl2tpd-compile.patch
> 
> diff --git a/main/xl2tpd/APKBUILD b/main/xl2tpd/APKBUILD
> index 635bd09..70675dc 100644
> --- a/main/xl2tpd/APKBUILD
> +++ b/main/xl2tpd/APKBUILD
> @@ -5,7 +5,7 @@ pkgver=1.3.6
>  pkgrel=0
>  pkgdesc="Layer 2 Tunnelling Protocol Daemon (RFC 2661)"
>  url="http://www.xelerance.com/services/software/xl2tpd/"
> -arch=""
> +arch="i686 x86_64"

I change it to:

arch="all"

and pushed with fixed commit message.

cherry-picked it for v3.0 too.

thanks!

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---