Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-dialup/xl2tpd: metadata.xml xl2tpd-1.3.1-r2.ebuild ChangeLog
Date: Wed, 26 Dec 2012 04:14:44
Message-Id: 20121226041430.C311F2171D@flycatcher.gentoo.org
1 floppym 12/12/26 04:14:30
2
3 Modified: metadata.xml ChangeLog
4 Added: xl2tpd-1.3.1-r2.ebuild
5 Log:
6 Add fix for kernel mode by Sergey Fionov, resolves bug 441828 by nE0sIghT. Cherry-pick a patch from upstream to avoid type-punning.
7
8 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
9
10 Revision Changes Path
11 1.3 net-dialup/xl2tpd/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/metadata.xml?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/metadata.xml?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/metadata.xml?r1=1.2&r2=1.3
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/metadata.xml,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- metadata.xml 15 Aug 2010 20:33:23 -0000 1.2
24 +++ metadata.xml 26 Dec 2012 04:14:30 -0000 1.3
25 @@ -5,5 +5,6 @@
26 <longdescription>The Layer 2 Tunneling Protocol (L2TP) daemon mantained by Xelerance Corporation.</longdescription>
27 <use>
28 <flag name="dnsretry">Patch for host lookup retries, activated by redial feature</flag>
29 + <flag name="kernel">Enable kernel interface for PPPoL2TP</flag>
30 </use>
31 </pkgmetadata>
32
33
34
35 1.34 net-dialup/xl2tpd/ChangeLog
36
37 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/ChangeLog?rev=1.34&view=markup
38 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/ChangeLog?rev=1.34&content-type=text/plain
39 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/ChangeLog?r1=1.33&r2=1.34
40
41 Index: ChangeLog
42 ===================================================================
43 RCS file: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v
44 retrieving revision 1.33
45 retrieving revision 1.34
46 diff -u -r1.33 -r1.34
47 --- ChangeLog 26 Dec 2012 00:53:01 -0000 1.33
48 +++ ChangeLog 26 Dec 2012 04:14:30 -0000 1.34
49 @@ -1,6 +1,15 @@
50 # ChangeLog for net-dialup/xl2tpd
51 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
52 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.33 2012/12/26 00:53:01 floppym Exp $
53 +# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.34 2012/12/26 04:14:30 floppym Exp $
54 +
55 +*xl2tpd-1.3.1-r2 (26 Dec 2012)
56 +
57 + 26 Dec 2012; Mike Gilbert <floppym@g.o>
58 + +files/xl2tpd-1.3.1-kernelmode.patch,
59 + +files/xl2tpd-1.3.1-no-type-punning-b119c0da.patch, +xl2tpd-1.3.1-r2.ebuild,
60 + metadata.xml:
61 + Add fix for kernel mode by Sergey Fionov, resolves bug 441828 by nE0sIghT.
62 + Cherry-pick a patch from upstream to avoid type-punning.
63
64 26 Dec 2012; Mike Gilbert <floppym@g.o> -xl2tpd-1.3.1.ebuild,
65 xl2tpd-1.3.1-r1.ebuild:
66
67
68
69 1.1 net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild
70
71 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild?rev=1.1&view=markup
72 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild?rev=1.1&content-type=text/plain
73
74 Index: xl2tpd-1.3.1-r2.ebuild
75 ===================================================================
76 # Copyright 1999-2012 Gentoo Foundation
77 # Distributed under the terms of the GNU General Public License v2
78 # $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.3.1-r2.ebuild,v 1.1 2012/12/26 04:14:30 floppym Exp $
79
80 EAPI="4"
81
82 inherit eutils toolchain-funcs vcs-snapshot
83
84 DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
85 HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
86 SRC_URI="https://github.com/xelerance/${PN}/tarball/v${PV} -> ${P}.tar.gz"
87
88 LICENSE="GPL-2"
89 SLOT="0"
90 KEYWORDS="~amd64 ~ppc ~x86"
91 IUSE="dnsretry +kernel"
92
93 DEPEND="net-libs/libpcap"
94 RDEPEND="${DEPEND}
95 net-dialup/ppp"
96 DEPEND+=" kernel? ( >=sys-kernel/linux-headers-2.6.23 )"
97
98 src_prepare() {
99 epatch "${FILESDIR}/${PN}-1.3.0-LDFLAGS.patch"
100 epatch "${FILESDIR}/${PN}-1.3.1-CFLAGS.patch"
101 epatch "${FILESDIR}/${PN}-1.3.1-no-type-punning-b119c0da.patch"
102 epatch "${FILESDIR}/${PN}-1.3.1-kernelmode.patch"
103 sed -i Makefile -e 's| -O2||g' || die "sed Makefile"
104 # The below patch is questionable. Why wasn't it submitted upstream? If it
105 # ever breaks, it will just be removed. -darkside 20120914
106 use dnsretry && epatch "${FILESDIR}/${PN}-dnsretry.patch"
107 # Remove bundled headers
108 rm -r linux || die
109 }
110
111 src_compile() {
112 tc-export CC
113 export OSFLAGS="-DLINUX"
114 use kernel && OSFLAGS+=" -DUSE_KERNEL"
115 emake
116 }
117
118 src_install() {
119 emake PREFIX=/usr DESTDIR="${D}" install
120
121 dodoc CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents doc/rfc2661.txt
122
123 dodir /etc/xl2tpd
124 cp doc/l2tp-secrets.sample "${ED}/etc/xl2tpd/l2tp-secrets" || die
125 cp doc/l2tpd.conf.sample "${ED}/etc/xl2tpd/xl2tpd.conf" || die
126 fperms 0600 /etc/xl2tpd/l2tp-secrets
127 newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
128 }