Version bump.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 92 insertions, 5 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 1e9d6976ea86..d697289850dd 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.21 2010/09/19 11:31:22 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.22 2010/11/27 11:01:36 mrness Exp $
+
+*xl2tpd-1.2.7 (27 Nov 2010)
+
+  27 Nov 2010; Alin Năstac <mrness@gentoo.org> +xl2tpd-1.2.7.ebuild,
+  +files/xl2tpd-1.2.7-as-needed.patch, +files/xl2tpd-1.2.7-qa-fixes.patch:
+  Version bump.
 
 *xl2tpd-1.2.6-r1 (19 Sep 2010)
 
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index cb5f26b35cc1..4cb3e9407133 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -4,18 +4,22 @@ Hash: SHA1
 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-1.2.7-as-needed.patch 387 RMD160 9a11ead575a1f3a121724b21df07df4c60729aff SHA1 af19bf9491a7e882821154f9b5edde4ccf030168 SHA256 658e0bb47f9a652442ba1c9e438fbafa682ed79e21e18589e0eb2c6b1e9d3c1a
+AUX xl2tpd-1.2.7-qa-fixes.patch 1011 RMD160 22e38f90e8923efd75925acc7822689828464bd1 SHA1 f547e9b571973546e5548d69eecc152f25f016cb SHA256 499180716da0a35b958293c1c396d9cfba1193b6e4e758c0fc71dc6c596614e0
 AUX xl2tpd-dnsretry.patch 1463 RMD160 4a7049cf3f9f8a94a7c0f3437c90264041d92674 SHA1 ee0fcdac4811b18518b62078af978733eebf4ce5 SHA256 abcef4537b251754f33c20244499ddab5c2680168c957806f9d3967f07be5f0c
 AUX xl2tpd-init 728 RMD160 d4692c30a510c2a765700136eef2e360d368943b SHA1 7608f6d2ad884bf8031084e9132cb6a2e33a7214 SHA256 895a49a590b04fbeef02e5b53064fec31ee0ea9c19141bb7d3898cd2815ef42d
 DIST xl2tpd-1.2.4.tar.gz 541039 RMD160 ffc26acfb0fa7ceffefb7fde52f13b537cd159ce SHA1 b89f357fe87bea34faf7495237f75b5481f88fbe SHA256 3e6b4314a5100a576dd075684873b1e8b84b58f7f5ceb10731fabd3ebefaa8c4
 DIST xl2tpd-1.2.6.tar.gz 545153 RMD160 de34942ed0fcab124066cc40661af1a532a9e6ed SHA1 fef3af1b1d94ab9da2a73bf7ba3091277c190941 SHA256 c807c243ee91e344f4f46718fd45565c1242463b4945c1428a4d1c513a418c15
+DIST xl2tpd-1.2.7.tar.gz 545711 RMD160 5154734536ff48ffcf924edb60507301e41ebaaf SHA1 acad40f504492bd3de8435a4c57f51028a690d50 SHA256 ed8b86939844f97c6cb9ae8db2ef0eb4432f1726ea50923c4eb2101f925aec6c
 EBUILD xl2tpd-1.2.4.ebuild 1078 RMD160 f9100554af30338221d5c18489742346ddbe2642 SHA1 1c0bcdf33ce00d0578338a08f133f4cd24f846ac SHA256 847af2f342f53aada493e98b153b10662c9d81be0736ec8533cab06a6d5eb8ff
 EBUILD xl2tpd-1.2.6-r1.ebuild 1097 RMD160 3a56d05dba0f5b0cafd64c64056587d0c3e242b1 SHA1 02656fe84bd7db90b87f0602b62cab08cadbfe40 SHA256 b2e8f848ade73384ff6d2bc99443b05a181fb8af45c735bf6bc8befa650eabd8
-MISC ChangeLog 3745 RMD160 1601580b24ea61b531855f8e72d66dc16f536251 SHA1 fc0aee3a7a70f908046afdd0abad4104367759be SHA256 1dd5c19fa1c60a48a6265c5e538cc9e07ba753563ee2ba06945cd12862005c26
+EBUILD xl2tpd-1.2.7.ebuild 1087 RMD160 7505a02e740ae2d38e64a5b0816ed83dc50efd8b SHA1 222d13599381fd54fc147dea445e242cbcc02bea SHA256 2b035c4cc26881756742566183a8542f521639467d4fc2f47a982d9ba4d46fc6
+MISC ChangeLog 3936 RMD160 b0d77e4f7626349924935587502dfd3e56d28642 SHA1 bafe98615f653a420957fc0f90ca27cefa0cedb7 SHA256 b45843db595cbc0397ef6b2035f310d217c8a297c077859b79ed8bd9ccf9cb3d
 MISC metadata.xml 386 RMD160 e4818d938f1bcee6157a784588014b43c7a994fc SHA1 ff619ba8f20d0b270d207b3a6c37391b0bceca78 SHA256 54594868bd121cb99bd6544547e5a86fe62394005354e3af679ba1409a960e7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkyV9JUACgkQ1564UogppBIWugCfapPvRW1picGXjhGxkHKHSuty
-nO0An1XXSYrmVXk40nRH6T/9uAL+KNjb
-=s03Q
+iEYEARECAAYFAkzw5RkACgkQ1564UogppBLXYACghQQ0ZxHd7j69///vbX4ExrUA
+HbsAn18wEHufQYhGEagpsmwuPxoYFZql
+=OcFd
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.2.7-as-needed.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.7-as-needed.patch
new file mode 100644
index 000000000000..d92c7e653f11
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.2.7-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Nru xl2tpd-1.2.7.orig/Makefile xl2tpd-1.2.7/Makefile
+--- xl2tpd-1.2.7.orig/Makefile	2010-08-06 00:33:46.000000000 +0200
++++ xl2tpd-1.2.7/Makefile	2010-11-27 11:57:10.000000000 +0100
+@@ -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.7-qa-fixes.patch b/net-dialup/xl2tpd/files/xl2tpd-1.2.7-qa-fixes.patch
new file mode 100644
index 000000000000..10c5e6dde53d
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.2.7-qa-fixes.patch
@@ -0,0 +1,25 @@
+diff -Nru xl2tpd-1.2.7.orig/call.c xl2tpd-1.2.7/call.c
+--- xl2tpd-1.2.7.orig/call.c	2010-08-06 00:33:46.000000000 +0200
++++ xl2tpd-1.2.7/call.c	2010-11-27 11:58:13.000000000 +0100
+@@ -665,15 +665,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/xl2tpd-1.2.7.ebuild b/net-dialup/xl2tpd/xl2tpd-1.2.7.ebuild
new file mode 100644
index 000000000000..ecd45ab30466
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.2.7.ebuild
@@ -0,0 +1,40 @@
+# 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.7.ebuild,v 1.1 2010/11/27 11:01:36 mrness Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="http://www.xelerance.com/software/"
+SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dnsretry"
+
+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_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc CREDITS README.xl2tpd \
+		doc/README.patents doc/rfc2661.txt doc/*.sample
+
+	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
+
+	keepdir /var/run/xl2tpd
+}