Mark version 1.2.4 as stable on amd64 and x86.

Add dnsretry USE flag and patch (#307489).
Version bump.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

8 files changed, 123 insertions, 23 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index b9436482ff24..749120c4eb6d 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dialup/xl2tpd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.19 2009/07/16 06:19:19 mrness Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.20 2010/08/15 20:33:23 mrness Exp $
+
+*xl2tpd-1.2.6 (15 Aug 2010)
+
+  15 Aug 2010; Alin Năstac <mrness@gentoo.org> -xl2tpd-1.1.12-r1.ebuild,
+  xl2tpd-1.2.4.ebuild, +xl2tpd-1.2.6.ebuild,
+  +files/xl2tpd-1.2.6-as-needed.patch, +files/xl2tpd-1.2.6-qa-fixes.patch,
+  +files/xl2tpd-dnsretry.patch, metadata.xml:
+  Mark version 1.2.4 as stable on amd64 and x86. Add dnsretry USE flag and
+  patch (#307489). Version bump.
 
 *xl2tpd-1.2.4 (16 Jul 2009)
 
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 36cfcb2d969e..2fcf9bbe35e2 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -3,19 +3,22 @@ Hash: SHA1
 
 AUX xl2tpd-1.2.3-as-needed.patch 387 RMD160 54101417ac33ac14dc5f2ca09f5900c64644bea8 SHA1 fb268380ff6365235a864e67692b68b9c861aecc SHA256 6dd9be7702e36014ad4de4eb7df7636efd5db8d3a8de82a604f61b8b2f74e8ac
 AUX xl2tpd-1.2.4-as-needed.patch 387 RMD160 b238718a1d691b55500a01711834f9b104638eac SHA1 727715952018ed21ba270f35f67bf2d6e208e5ad SHA256 948ed98a058b9dd34bbd6957a1879a2b763db2f5ff768d7de7113513c9776727
+AUX xl2tpd-1.2.6-as-needed.patch 387 RMD160 46d88418c637aa13694eeedb4612aa4bf93c646c SHA1 851260e53cb70984a833c7f60ad7586a6468d12a SHA256 ef3fdc69e9487e26e03e39cb4733c4d8913237f737808d1a4e76ac10b3dab027
+AUX xl2tpd-1.2.6-qa-fixes.patch 1011 RMD160 9b5c43b0b4f9fe10bbacb2831d483d7b12a646dc SHA1 84d40b2d8751097b5ad6a8d6ef7ab6bc729f897b SHA256 83a473792dd0b4f49081b97cb77a5d54ca47ab83dc09898bae76a998bd7e41f2
+AUX xl2tpd-dnsretry.patch 1463 RMD160 4a7049cf3f9f8a94a7c0f3437c90264041d92674 SHA1 ee0fcdac4811b18518b62078af978733eebf4ce5 SHA256 abcef4537b251754f33c20244499ddab5c2680168c957806f9d3967f07be5f0c
 AUX xl2tpd-init 728 RMD160 d4692c30a510c2a765700136eef2e360d368943b SHA1 7608f6d2ad884bf8031084e9132cb6a2e33a7214 SHA256 895a49a590b04fbeef02e5b53064fec31ee0ea9c19141bb7d3898cd2815ef42d
-DIST xl2tpd-1.1.12.tar.gz 328349 RMD160 4b0e06a50c748bbabb90c4d21b55565040f4e649 SHA1 a2449c6c64d83e10f0fee5286bad00f0dd2c7d8f SHA256 f3ca288040502dc30e0759cea6ddb134738bdf54c2459746257e9a96399fdc68
 DIST xl2tpd-1.2.3.tar.gz 332454 RMD160 73528e1f5e28eb60e2a25509b59dcbc141721908 SHA1 fee344f7771ae295f882a16c46c71234fe1b733a SHA256 db8fa5f7c19cd7928d7e87ea5c99c6a89bc1ad66f27132aaf12d4b3b3febf2e3
 DIST xl2tpd-1.2.4.tar.gz 541039 RMD160 ffc26acfb0fa7ceffefb7fde52f13b537cd159ce SHA1 b89f357fe87bea34faf7495237f75b5481f88fbe SHA256 3e6b4314a5100a576dd075684873b1e8b84b58f7f5ceb10731fabd3ebefaa8c4
-EBUILD xl2tpd-1.1.12-r1.ebuild 992 RMD160 5e6f3a10b48eabb8a26d088bc7ec8e86019be8bb SHA1 ed182c17d5a068d21b6983cdabb9e234481cd327 SHA256 8f73237f8235b6a9a54aca11f578b862c5e471366a0552f7e633a7336c451338
+DIST xl2tpd-1.2.6.tar.gz 545153 RMD160 de34942ed0fcab124066cc40661af1a532a9e6ed SHA1 fef3af1b1d94ab9da2a73bf7ba3091277c190941 SHA256 c807c243ee91e344f4f46718fd45565c1242463b4945c1428a4d1c513a418c15
 EBUILD xl2tpd-1.2.3.ebuild 1081 RMD160 8c6bfeaf9db047e21aecd4b75387d4fa918f90f1 SHA1 0ed260f8756c556ee8b8c5f0fd0b50db454eb696 SHA256 110a20fd018dc261ec20786071f6e9cb1d2e2375599a8343e070cb6825a4aa86
-EBUILD xl2tpd-1.2.4.ebuild 1080 RMD160 aa10d84bd03ec02fa154e71be143ccb6c3df8f4b SHA1 831939bdfbb87e1e9c31d3fef4d2e23efb1b17f3 SHA256 39bbb21a848e5b17a475dd7da25fef72a386b8096d8cd6aeb8b280a738b6186d
-MISC ChangeLog 3083 RMD160 434b83da787411fa46797aef24167913be67999a SHA1 0525594d359467432e3408664ac225f86972fef0 SHA256 151345aed0844ee252c6ba0681c59ca0e21604afb5c7e6848881792ef33920c7
-MISC metadata.xml 281 RMD160 6ba88d0228fd7f974f70d63fb0cc2d762ba82bb5 SHA1 38a78c92947a085d595b7a85d9de2525c69e3fb7 SHA256 3e259d9615cfeebaea3e58571404538766c8d2adc6e7a800c09f3b15756cc0c3
+EBUILD xl2tpd-1.2.4.ebuild 1078 RMD160 f9100554af30338221d5c18489742346ddbe2642 SHA1 1c0bcdf33ce00d0578338a08f133f4cd24f846ac SHA256 847af2f342f53aada493e98b153b10662c9d81be0736ec8533cab06a6d5eb8ff
+EBUILD xl2tpd-1.2.6.ebuild 1189 RMD160 8988384c6cfd7d7069cd24f697be3c07948a9a45 SHA1 040af26301a35dd0b8313f16a5339828a6cf10ab SHA256 fe0d3e9314fc0a30326e0136039762bc9535d0dabf9b864ebbb9349ec99d51cd
+MISC ChangeLog 3461 RMD160 80265e84229f89d7fc686326a94975ef24d1fe83 SHA1 80a4429cbcafd7ddfc411dda750d812a76cc68fe SHA256 36631158af7c05b474ed410d7459c598f14f7360c0beb95bd37067e6de993195
+MISC metadata.xml 386 RMD160 e4818d938f1bcee6157a784588014b43c7a994fc SHA1 ff619ba8f20d0b270d207b3a6c37391b0bceca78 SHA256 54594868bd121cb99bd6544547e5a86fe62394005354e3af679ba1409a960e7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpexm8ACgkQ9A5kJBGSrsus8ACfSae2MRPo1mo7WNNizXNCXaKL
-HgwAn0PBwlJFzKLNjtubHKWFQShzACVq
-=jqWf
+iEYEARECAAYFAkxoTx4ACgkQ1564UogppBKm+QCfYrj17b+2lUMcYz739/3N4RLV
+8psAoJJ1FQY31UwVBaL5+L4tQN+57APj
+=ZxQv
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.6-as-needed.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.6-as-needed.patch
new file mode 100644
index 000000000000..22d8d9beb145
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.2.6-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Nru xl2tpd-1.2.6.orig/Makefile xl2tpd-1.2.6/Makefile
+--- xl2tpd-1.2.6.orig/Makefile	2010-05-10 22:35:43.000000000 +0200
++++ xl2tpd-1.2.6/Makefile	2010-08-15 21:56:20.000000000 +0200
+@@ -113,7 +113,7 @@
+ 
+ pfc:
+ 	$(CC) $(CFLAGS) -c contrib/pfc.c
+-	$(CC) $(LDFLAGS) -lpcap $(LDLIBS) -o pfc pfc.o
++	$(CC) $(LDFLAGS) -o pfc pfc.o -lpcap $(LDLIBS)
+ 
+ romfs:
+ 	$(ROMFSINST) /bin/$(EXEC)
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.6-qa-fixes.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.6-qa-fixes.patch
new file mode 100644
index 000000000000..fd37c03f6a8c
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.2.6-qa-fixes.patch
@@ -0,0 +1,25 @@
+diff -Nru xl2tpd-1.2.6.orig/call.c xl2tpd-1.2.6/call.c
+--- xl2tpd-1.2.6.orig/call.c	2010-05-10 22:35:43.000000000 +0200
++++ xl2tpd-1.2.6/call.c	2010-08-15 22:22:10.000000000 +0200
+@@ -682,15 +682,19 @@
+          */
+         if (gconfig.debug_tunnel)
+         {
++            struct in_addr inaddr;
++            inaddr.s_addr = addr;
+             l2tp_log (LOG_DEBUG,
+                  "%s: allocating new tunnel for host %s, port %d.\n",
+-                 __FUNCTION__, IPADDY (addr), ntohs (port));
++                 __FUNCTION__, IPADDY (inaddr), ntohs (port));
+         }
+         if (!(st = new_tunnel ()))
+         {
++            struct in_addr inaddr;
++            inaddr.s_addr = addr;
+             l2tp_log (LOG_WARNING,
+                  "%s: unable to allocate new tunnel for host %s, port %d.\n",
+-                 __FUNCTION__, IPADDY (addr), ntohs (port));
++                 __FUNCTION__, IPADDY (inaddr), ntohs (port));
+             return NULL;
+         };
+         st->peer.sin_family = AF_INET;
diff --git a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
new file mode 100644
index 000000000000..cf45194b8254
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
@@ -0,0 +1,40 @@
+diff -Nru xl2tpd-1.2.6.orig/xl2tpd.c xl2tpd-1.2.6/xl2tpd.c
+--- xl2tpd-1.2.6.orig/xl2tpd.c	2010-05-10 22:35:43.000000000 +0200
++++ xl2tpd-1.2.6/xl2tpd.c	2010-08-15 22:02:14.000000000 +0200
+@@ -587,9 +587,33 @@
+     hp = gethostbyname (host);
+     if (!hp)
+     {
+-        l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n",
+-             host);
+-        return NULL;
++        if ( lac->redial ) 
++        {
++            int imax=lac->rmax;
++            if ( lac->rmax == 0 )
++                imax = 1;
++            while ( imax > 0 ) 
++            {
++                hp = gethostbyname ( host );
++                if ( hp )
++                    break;
++                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s. Trying to look again in %d seconds.\n", host, lac->rtimeout );
++                if ( lac->rtimeout > 0 )
++                    sleep ( lac->rtimeout );
++                if ( lac->rmax > 0 )
++                    imax--;
++            }
++            if ( ( imax == 0 ) && ( lac->rmax > 0 ) ) 
++            {
++                l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s after %d tries. Lookup stops now.\n", host, lac->rmax );
++                return NULL;
++            }
++        }
++        else 
++        {
++            l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n", host);
++            return NULL;
++        }
+     }
+     bcopy (hp->h_addr, &addr, hp->h_length);
+     /* Force creation of a new tunnel
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index eb06d7f5b8ea..3751bcc34a95 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 	<herd>net-dialup</herd>
 	<longdescription>The Layer 2 Tunneling Protocol (L2TP) daemon mantained by Xelerance Corporation.</longdescription>
+	<use>
+		<flag name="dnsretry">Patch for host lookup retries, activated by redial feature</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild
index 26aa6ff80c9d..504b945108b8 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild,v 1.1 2009/07/16 06:19:19 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.4.ebuild,v 1.2 2010/08/15 20:33:23 mrness Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="net-libs/libpcap"
diff --git a/net-dialup/xl2tpd/xl2tpd-1.1.12-r1.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.6.ebuild
index 4e9d7ad0c9cc..526835dfb64a 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.1.12-r1.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.2.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.1.12-r1.ebuild,v 1.2 2008/08/17 15:25:13 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.2.6.ebuild,v 1.1 2010/08/15 20:33:23 mrness Exp $
+
+EAPI="2"
 
 inherit eutils flag-o-matic
 
@@ -10,20 +12,26 @@ SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dnsretry"
 
-RDEPEND="!net-dialup/l2tpd
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}
 	net-dialup/ppp"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-qa-fixes.patch
+	use dnsretry && epatch "${FILESDIR}"/${PN}-dnsretry.patch
+}
+
 src_compile() {
-    append-flags -DTRUST_PPPD_TO_DIE
-    emake || die "emake failed"
+	append-flags -DTRUST_PPPD_TO_DIE
+	emake || die "emake failed"
 }
 
 src_install() {
-	dosbin xl2tpd || die 'xl2tpd binary not found'
-	doman doc/*.[85]
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc CREDITS README.xl2tpd \
 		doc/README.patents doc/rfc2661.txt doc/*.sample
@@ -31,7 +39,7 @@ src_install() {
 	dodir /etc/xl2tpd
 	head -n 2 doc/l2tp-secrets.sample > "${D}/etc/xl2tpd/l2tp-secrets"
 	fperms 0600 /etc/xl2tpd/l2tp-secrets
-	newinitd "${FILESDIR}/xl2tpd-init" xl2tpd
+	newinitd "${FILESDIR}"/xl2tpd-init xl2tpd
 
 	keepdir /var/run/xl2tpd
 }