Version bump, bug #376919 wrt andreyc.

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

5 files changed, 74 insertions, 6 deletions

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index fbb952d6ecd5..33486e6da740 100644
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.23 2011/07/18 07:33:10 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.24 2011/09/20 04:49:45 pva Exp $
+
+*xl2tpd-1.3.0 (20 Sep 2011)
+
+  20 Sep 2011; Peter Volkov <pva@gentoo.org> +xl2tpd-1.3.0.ebuild,
+  files/xl2tpd-dnsretry.patch, +files/xl2tpd-1.3.0-LDFLAGS.patch:
+  Version bump, bug #376919 wrt andreyc.
 
 *xl2tpd-1.2.8 (18 Jul 2011)
 
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index 3ccb6cc04466..24d66bae99e2 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -3,15 +3,18 @@ AUX xl2tpd-1.2.6-as-needed.patch 387 RMD160 46d88418c637aa13694eeedb4612aa4bf93c
 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-1.3.0-LDFLAGS.patch 321 RMD160 dd8f11a264d4acb7282ac51867d14855eb99da91 SHA1 f4c60f2a193d4c81294b3025b461a610826ee923 SHA256 bc289758e9880371c2c52f082d7c553f6683922b0b817da87a69dedcce43adff
+AUX xl2tpd-dnsretry.patch 1509 RMD160 51599b2eddb866cae87c68edc43534e8bc2d9585 SHA1 e54ebdd51246c4c28b8a29672d94d8a6e92cb427 SHA256 ac398be2d5fb67cc7c5e5b7247572d89cde85b2dc988e4e99c470afddfc5860c
 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
 DIST xl2tpd-1.2.8.tar.gz 546214 RMD160 e006fada784950e48655dc8393ddde9ae1d7ce00 SHA1 17417da46df8e4af447bdccfb0cd660684d96d64 SHA256 bd0e7ad9e69e9575b0f1a8d017b78f7f61fd4c5372d45b635d6bf2f2d1b5422b
+DIST xl2tpd-1.3.0.tar.gz 550901 RMD160 ef2cec6d363bdc8b107f2efcb5db2df9b1d2c7ec SHA1 e0382fdce023f577f8914a6f98f1fbff74a54490 SHA256 972b9440d637c7cff3e28ca4cb4131bc33b9394cfcb7d391383202136632c8c0
 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
 EBUILD xl2tpd-1.2.7.ebuild 1087 RMD160 7505a02e740ae2d38e64a5b0816ed83dc50efd8b SHA1 222d13599381fd54fc147dea445e242cbcc02bea SHA256 2b035c4cc26881756742566183a8542f521639467d4fc2f47a982d9ba4d46fc6
 EBUILD xl2tpd-1.2.8.ebuild 1191 RMD160 23edded0e99c4d04f43eefaa6b477cfb55c9ac15 SHA1 2d1dd14e0bd41cd5511ef2a3cdd9f514945c45a6 SHA256 372eb71967ee805c80e16f606011e429b2c55ef8b55edabc57e1622c9a36c297
-MISC ChangeLog 4158 RMD160 9c91e9e62a029a504295e5ee9177f142fb25694e SHA1 dda435a6401b9b1ff00d6a62b03aaf08fc4eea11 SHA256 524f6592b720ea0266b2579a2dc8fc7510e5c7c84314cc1ef0f1fde47b034357
+EBUILD xl2tpd-1.3.0.ebuild 1153 RMD160 bf0ec76b74c53f148a0090c0adab821d54f64358 SHA1 ab8c52df7c25765e2ac134e7d40ca3828edd832c SHA256 4fd2a459a019aa2aa254fe15f6db0bf89caaa18660f396f04b82463e8a851b59
+MISC ChangeLog 4362 RMD160 a6c6da0e21fe998aa80e035660cc908aa3a3e620 SHA1 6dd8c85f9e1e3992316ee3ee461c3eb14e51efe2 SHA256 caad3d13ceebf7a2eb8a254dd9b5dc17401eadab184653f47eb2dd857d84bee8
 MISC metadata.xml 386 RMD160 e4818d938f1bcee6157a784588014b43c7a994fc SHA1 ff619ba8f20d0b270d207b3a6c37391b0bceca78 SHA256 54594868bd121cb99bd6544547e5a86fe62394005354e3af679ba1409a960e7b
diff --git a/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch b/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch
new file mode 100644
index 000000000000..a87ab3fff8b9
--- /dev/null
+++ b/net-dialup/xl2tpd/files/xl2tpd-1.3.0-LDFLAGS.patch
@@ -0,0 +1,13 @@
+=== modified file 'Makefile'
+--- Makefile	2011-09-20 04:44:23 +0000
++++ Makefile	2011-09-20 04:44:35 +0000
+@@ -114,7 +114,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
+ 
+ $(CONTROL_EXEC): $(CONTROL_SRCS)
+-	$(CC) $(CONTROL_SRCS) -o $@
++	$(CC) $(LDFLAGS) $(CONTROL_SRCS) -o $@
+ 
+ pfc:
+ 	$(CC) $(CFLAGS) -c contrib/pfc.c
+
diff --git a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
index cf45194b8254..b27703fe435e 100644
--- a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
+++ b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
@@ -1,6 +1,8 @@
-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
+https://bugs.gentoo.org/show_bug.cgi?id=307489
+http://homenet.beeline.ru/index.php?showtopic=192551&st=0&p=1063626345&#entry1063626345
+
+--- xl2tpd.c	2010-05-10 22:35:43.000000000 +0200
++++ xl2tpd.c	2010-08-15 22:02:14.000000000 +0200
 @@ -587,9 +587,33 @@
      hp = gethostbyname (host);
      if (!hp)
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild
new file mode 100644
index 000000000000..09fcc40db73d
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.0.ebuild,v 1.1 2011/09/20 04:49:45 pva Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
+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}/${PN}-1.3.0-LDFLAGS.patch"
+	sed -i Makefile -e 's| -O2 ||g' || die "sed Makefile"
+	use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	emake PREFIX=/usr DESTDIR="${D}" install
+
+	dodoc CREDITS README.xl2tpd \
+		doc/README.patents doc/rfc2661.txt doc/*.sample
+
+	dodir /etc/xl2tpd
+	head -n 2 doc/l2tp-secrets.sample > "${ED}/etc/xl2tpd/l2tp-secrets" || die
+	fperms 0600 /etc/xl2tpd/l2tp-secrets
+	newinitd "${FILESDIR}"/xl2tpd-init xl2tpd
+
+	keepdir /var/run/xl2tpd
+}