Gentoo Archives: gentoo-commits

From: "Dirkjan Ochtman (djc)" <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/openvpn: ChangeLog openvpn-2.1.2.ebuild
Date: Mon, 23 Aug 2010 14:08:37
Message-Id: 20100823140831.0BE7D2004E@flycatcher.gentoo.org
1 djc 10/08/23 14:08:31
2
3 Modified: ChangeLog
4 Added: openvpn-2.1.2.ebuild
5 Log:
6 Version bump openvpn-2.1.2.
7 (Portage version: 2.1.8.3/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.176 net-misc/openvpn/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.176&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?rev=1.176&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/ChangeLog?r1=1.175&r2=1.176
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v
19 retrieving revision 1.175
20 retrieving revision 1.176
21 diff -u -r1.175 -r1.176
22 --- ChangeLog 23 Aug 2010 13:45:41 -0000 1.175
23 +++ ChangeLog 23 Aug 2010 14:08:30 -0000 1.176
24 @@ -1,6 +1,11 @@
25 # ChangeLog for net-misc/openvpn
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.175 2010/08/23 13:45:41 djc Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/ChangeLog,v 1.176 2010/08/23 14:08:30 djc Exp $
29 +
30 +*openvpn-2.1.2 (23 Aug 2010)
31 +
32 + 23 Aug 2010; Dirkjan Ochtman <djc@g.o> +openvpn-2.1.2.ebuild:
33 + Version bump to 2.1.2.
34
35 23 Aug 2010; Dirkjan Ochtman <djc@g.o> openvpn-2.1.0-r1.ebuild:
36 Remove built_with_use, upgrade to EAPI=2.
37
38
39
40 1.1 net-misc/openvpn/openvpn-2.1.2.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-2.1.2.ebuild?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openvpn/openvpn-2.1.2.ebuild?rev=1.1&content-type=text/plain
44
45 Index: openvpn-2.1.2.ebuild
46 ===================================================================
47 # Copyright 1999-2010 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49 # $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-2.1.2.ebuild,v 1.1 2010/08/23 14:08:30 djc Exp $
50
51 EAPI=2
52
53 inherit eutils multilib toolchain-funcs autotools flag-o-matic
54
55 IPV6_VERSION="0.4.11"
56 DESCRIPTION="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes."
57 SRC_URI="http://openvpn.net/release/${P}.tar.gz
58 ipv6? (
59 http://cloud.github.com/downloads/jjo/openvpn-ipv6/${PN}-2.1.1-ipv6-${IPV6_VERSION}.patch.gz
60 )
61 eurephia? (
62 mirror://sourceforge/eurephia/${PN}-2.1.0_eurephia.patch
63 )"
64 HOMEPAGE="http://openvpn.net/"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
69 IUSE="eurephia examples iproute2 ipv6 minimal pam passwordsave selinux ssl static pkcs11 threads userland_BSD"
70
71 DEPEND=">=dev-libs/lzo-1.07
72 kernel_linux? (
73 iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools )
74 )
75 !minimal? ( pam? ( virtual/pam ) )
76 selinux? ( sec-policy/selinux-openvpn )
77 ssl? ( >=dev-libs/openssl-0.9.6 )
78 pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )"
79 RDEPEND="${DEPEND}"
80
81 src_prepare() {
82 epatch "${FILESDIR}/${PN}-2.1_rc13-peercred.patch"
83 epatch "${FILESDIR}/${PN}-2.1_rc20-pkcs11.patch"
84 use ipv6 && epatch "${WORKDIR}/${PN}-2.1.1-ipv6-${IPV6_VERSION}.patch"
85 use eurephia && epatch "${DISTDIR}/${PN}-2.1.0_eurephia.patch"
86 sed -i \
87 -e "s/gcc \${CC_FLAGS}/\${CC} \${CFLAGS} -Wall/" \
88 -e "s/-shared/-shared \${LDFLAGS}/" \
89 plugin/*/Makefile || die "sed failed"
90 eautoreconf
91 }
92
93 src_configure() {
94 # basic.h defines a type 'bool' that conflicts with the altivec
95 # keyword bool which has to be fixed upstream, see bugs #293840
96 # and #297854.
97 # For now, filter out -maltivec on ppc and append -mno-altivec, as
98 # -maltivec is enabled implicitly by -mcpu and similar flags.
99 use ppc && filter-flags -maltivec && append-flags -mno-altivec
100
101 local myconf=""
102
103 if use minimal ; then
104 myconf="${myconf} --disable-plugins"
105 myconf="${myconf} --disable-pkcs11"
106 else
107 myconf="$(use_enable pkcs11)"
108 fi
109
110 econf ${myconf} \
111 $(use_enable passwordsave password-save) \
112 $(use_enable ssl) \
113 $(use_enable ssl crypto) \
114 $(use_enable threads pthread) \
115 $(use_enable iproute2) \
116 || die "configure failed"
117 }
118
119 src_compile() {
120 use static && sed -i -e '/^LIBS/s/LIBS = /LIBS = -static /' Makefile
121
122 emake || die "make failed"
123
124 if ! use minimal ; then
125 cd plugin
126 for i in $( ls 2>/dev/null ); do
127 [[ ${i} == "README" || ${i} == "examples" || ${i} == "defer" ]] && continue
128 [[ ${i} == "auth-pam" ]] && ! use pam && continue
129 einfo "Building ${i} plugin"
130 cd "${i}"
131 emake CC=$(tc-getCC) || die "make failed"
132 cd ..
133 done
134 cd ..
135 fi
136 }
137
138 src_install() {
139 make DESTDIR="${D}" install || die "make install failed"
140
141 # install documentation
142 dodoc AUTHORS ChangeLog PORTS README
143 use eurephia && dodoc README.eurephia
144
145 # remove empty dir
146 rmdir "${D}/usr/share/doc/openvpn"
147
148 # Empty dir
149 dodir /etc/openvpn
150 keepdir /etc/openvpn
151
152 # Install some helper scripts
153 exeinto /etc/openvpn
154 doexe "${FILESDIR}/up.sh"
155 doexe "${FILESDIR}/down.sh"
156
157 # Install the init script and config file
158 newinitd "${FILESDIR}/${PN}-2.1.init" openvpn
159 newconfd "${FILESDIR}/${PN}-2.1.conf" openvpn
160
161 # install examples, controlled by the respective useflag
162 if use examples ; then
163 # dodoc does not supportly support directory traversal, #15193
164 insinto /usr/share/doc/${PF}/examples
165 doins -r sample-{config-files,keys,scripts} contrib
166 prepalldocs
167 fi
168
169 # Install plugins and easy-rsa
170 if ! use minimal ; then
171 cd easy-rsa/2.0
172 make install "DESTDIR=${D}/usr/share/${PN}/easy-rsa"
173 cd ../..
174
175 exeinto "/usr/$(get_libdir)/${PN}"
176 doexe plugin/*/*.so
177 fi
178 }
179
180 pkg_postinst() {
181 # Add openvpn user so openvpn servers can drop privs
182 # Clients should run as root so they can change ip addresses,
183 # dns information and other such things.
184 enewgroup openvpn
185 enewuser openvpn "" "" "" openvpn
186
187 if [[ -n $(ls /etc/openvpn/*/local.conf 2>/dev/null) ]] ; then
188 ewarn "WARNING: The openvpn init script has changed"
189 ewarn ""
190 fi
191
192 einfo "The openvpn init script expects to find the configuration file"
193 einfo "openvpn.conf in /etc/openvpn along with any extra files it may need."
194 einfo ""
195 einfo "To create more VPNs, simply create a new .conf file for it and"
196 einfo "then create a symlink to the openvpn init script from a link called"
197 einfo "openvpn.newconfname - like so"
198 einfo " cd /etc/openvpn"
199 einfo " ${EDITOR##*/} foo.conf"
200 einfo " cd /etc/init.d"
201 einfo " ln -s openvpn openvpn.foo"
202 einfo ""
203 einfo "You can then treat openvpn.foo as any other service, so you can"
204 einfo "stop one vpn and start another if you need to."
205
206 if grep -Eq "^[ \t]*(up|down)[ \t].*" "${ROOT}/etc/openvpn"/*.conf 2>/dev/null ; then
207 ewarn ""
208 ewarn "WARNING: If you use the remote keyword then you are deemed to be"
209 ewarn "a client by our init script and as such we force up,down scripts."
210 ewarn "These scripts call /etc/openvpn/\$SVCNAME-{up,down}.sh where you"
211 ewarn "can move your scripts to."
212 fi
213
214 if ! use minimal ; then
215 einfo ""
216 einfo "plugins have been installed into /usr/$(get_libdir)/${PN}"
217 fi
218
219 if use ipv6 ; then
220 einfo ""
221 einfo "This build contains IPv6-Patch from JuanJo Ciarlante."
222 einfo "For more information please visit:"
223 einfo "http://github.com/jjo/openvpn-ipv6"
224 fi
225
226 if use eurephia ; then
227 einfo ""
228 einfo "This build contains eurephia patch."
229 einfo "For more information please visit:"
230 einfo "http://www.eurephia.net/"
231 fi
232 }