diff options
| -rw-r--r-- | net-dialup/l2tpd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-dialup/l2tpd/Manifest | 14 | ||||
| -rw-r--r-- | net-dialup/l2tpd/files/l2tpd-init | 16 | ||||
| -rw-r--r-- | net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild | 13 |
4 files changed, 30 insertions, 20 deletions
diff --git a/net-dialup/l2tpd/ChangeLog b/net-dialup/l2tpd/ChangeLog index f711fac0cb73..499dbc226059 100644 --- a/net-dialup/l2tpd/ChangeLog +++ b/net-dialup/l2tpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-dialup/l2tpd # Copyright 2003-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.15 2006/03/12 16:07:36 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/ChangeLog,v 1.16 2006/05/30 21:13:21 mrness Exp $ + + 30 May 2006; Alin Nastac <mrness@gentoo.org> files/l2tpd-init, + l2tpd-0.70_pre20031121.ebuild: + Interblock l2tpd with xl2tpd. Install only basic configuration files and + change init script to check the existence of the l2tpd.conf file (#134029). 12 Mar 2006; Alin Nastac <mrness@gentoo.org> -files/l2tpd-0.69-can-2004-0649.patch, -l2tpd-0.69-r2.ebuild, diff --git a/net-dialup/l2tpd/Manifest b/net-dialup/l2tpd/Manifest index 5c6172edb2b1..72d00081fe50 100644 --- a/net-dialup/l2tpd/Manifest +++ b/net-dialup/l2tpd/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 ec8b98d0c98fdd450246cf83fb5060d5 ChangeLog 2068 MD5 032a62f61bd560e76f0130861b79be73 files/digest-l2tpd-0.70_pre20031121 155 -MD5 acfec4f77489a740550c83d5d275477d files/l2tpd-init 473 -MD5 52d5f05008e95db13eb5825c471451e8 l2tpd-0.70_pre20031121.ebuild 1110 +MD5 e9f9b7f11f160180074c80fc8e3ba42d files/l2tpd-init 719 +MD5 3e1ccdade1087a2a957658bed504661e l2tpd-0.70_pre20031121.ebuild 1164 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.1 (GNU/Linux) - -iD8DBQFEFEdZjG8pv1lIUX4RAugZAKCB2xfFx3J40AFRL/wHIYCivxwGOACgocXn -NVqA7+TP8Ee+mzyTGZscNng= -=uLQL ------END PGP SIGNATURE----- diff --git a/net-dialup/l2tpd/files/l2tpd-init b/net-dialup/l2tpd/files/l2tpd-init index 72e88f7952fe..334ec7a9dd99 100644 --- a/net-dialup/l2tpd/files/l2tpd-init +++ b/net-dialup/l2tpd/files/l2tpd-init @@ -1,13 +1,25 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/files/l2tpd-init,v 1.3 2004/08/14 13:40:17 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/files/l2tpd-init,v 1.4 2006/05/30 21:13:21 mrness Exp $ depend() { need net } +checkconfig() { + if [[ ! -f /etc/l2tpd/l2tpd.conf ]] ; then + eerror "Missing /etc/l2tpd/l2tpd.conf configuration file!" + eerror "Example configuration file could be found in doc directory." + return 1 + fi + + return 0 +} + start() { + checkconfig || return 1 + ebegin "Starting l2tpd" start-stop-daemon --start --quiet --exec /usr/sbin/l2tpd eend $? diff --git a/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild b/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild index 3a4172b515cd..b06883cc32f5 100644 --- a/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild +++ b/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild,v 1.5 2006/03/12 16:07:36 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/l2tpd/l2tpd-0.70_pre20031121.ebuild,v 1.6 2006/05/30 21:13:21 mrness Exp $ inherit eutils @@ -16,6 +16,9 @@ KEYWORDS="x86 ~ppc" SLOT="0" IUSE="" +RDEPEND="!net-dialup/xl2tpd + net-dialup/ppp" + S="${WORKDIR}/${P/_/-}.orig" src_unpack() { @@ -32,12 +35,12 @@ src_install() { doman doc/*.[85] doman *.[85] - dodoc BUGS CHANGELOG LICENSE CREDITS README TODO \ + dodoc BUGS CHANGELOG CREDITS README TODO \ doc/rfc2661.txt doc/*.sample - insinto /etc/l2tpd - newins doc/l2tp-secrets.sample l2tp-secrets - newins doc/l2tpd.conf.sample l2tpd.conf + dodir /etc/l2tpd + head -n 2 doc/l2tp-secrets.sample > "${D}/etc/l2tpd/l2tp-secrets" + fperms 0600 /etc/l2tpd/l2tp-secrets newinitd "${FILESDIR}/l2tpd-init" l2tpd } |