Version bump (#169123).

Package-Manager: portage-2.1.2-r9

diff --git a/net-dialup/xl2tpd/ChangeLog b/net-dialup/xl2tpd/ChangeLog
index 1f20db71c4564cb263053b42f0882a25223ef1b3..98e50c6bf258572650d67251b7412daec9e23b76 100644 (file)
--- a/net-dialup/xl2tpd/ChangeLog
+++ b/net-dialup/xl2tpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/xl2tpd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.4 2007/02/10 12:22:59 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/ChangeLog,v 1.5 2007/03/05 10:50:54 mrness Exp $
+
+*xl2tpd-1.1.08 (05 Mar 2007)
+
+  05 Mar 2007; Alin Nastac <mrness@gentoo.org> -files/l2tpd-init,
+  files/xl2tpd-init, +xl2tpd-1.1.08.ebuild:
+  Version bump (#169123).
 
   10 Feb 2007; Alin Năstac <mrness@gentoo.org> -xl2tpd-1.1.05.ebuild:
   Remove old version.

diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index c54f3ad5a3f315258fcd1035715845422639cafa..ef22542a9fee974a297d5c9c39b88a12d13efe9d 100644 (file)
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,23 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX l2tpd-init 719 RMD160 ed104070a9fe39aaa9dc85639b94c1c860c087db SHA1 ed2007e1c33bfc5075a8be626367c4fcde619de7 SHA256 67e8604608b6721b32f9d8ddae2c863b881c04d5ed3a5a762ab9dcc38d24857a
-MD5 e9f9b7f11f160180074c80fc8e3ba42d files/l2tpd-init 719
-RMD160 ed104070a9fe39aaa9dc85639b94c1c860c087db files/l2tpd-init 719
-SHA256 67e8604608b6721b32f9d8ddae2c863b881c04d5ed3a5a762ab9dcc38d24857a files/l2tpd-init 719
-AUX xl2tpd-init 735 RMD160 0312581ff72ef1be472f511c51eeae70df544304 SHA1 805faf9753e930245a75d0c61d3ab88bac9742da SHA256 39e796de29fb2c0f85f0e7eb72c187033bbd1c6ccc7070f7449f8c3deb898c39
-MD5 5c27c8ca49a6bea1a5f20c81254d8ab4 files/xl2tpd-init 735
-RMD160 0312581ff72ef1be472f511c51eeae70df544304 files/xl2tpd-init 735
-SHA256 39e796de29fb2c0f85f0e7eb72c187033bbd1c6ccc7070f7449f8c3deb898c39 files/xl2tpd-init 735
+AUX xl2tpd-init 728 RMD160 d4692c30a510c2a765700136eef2e360d368943b SHA1 7608f6d2ad884bf8031084e9132cb6a2e33a7214 SHA256 895a49a590b04fbeef02e5b53064fec31ee0ea9c19141bb7d3898cd2815ef42d
+MD5 4cebbed7e9faa8908ecbfe61d6a02daa files/xl2tpd-init 728
+RMD160 d4692c30a510c2a765700136eef2e360d368943b files/xl2tpd-init 728
+SHA256 895a49a590b04fbeef02e5b53064fec31ee0ea9c19141bb7d3898cd2815ef42d files/xl2tpd-init 728
 DIST xl2tpd-1.1.06.tar.gz 149891 RMD160 d6f03631cc2dee16110a311c6defd3b844face03 SHA1 0dca8c81cef32a47a9a302a4319a4f173370f3d6 SHA256 98aeec5b5cc9dbf292482dffeefe01072905739062a78215a970ce09bb465e63
+DIST xl2tpd-1.1.08.tar.gz 165439 RMD160 208433daac898e781540dac6ba3658f5a5cfb902 SHA1 efb9e494ccd68cf0f35724caa7ad20dba05f5aab SHA256 05c344e134853234c53b58a85cc204a85498b6b1985780a63690f21b2d7a6e24
 EBUILD xl2tpd-1.1.06.ebuild 1870 RMD160 8c25b757f7e1584bc2a7ccc6fbe9c81eb2eb018d SHA1 c98909a893f003066e06a6cd959b3e1e87a88d21 SHA256 ded75f03e6d8569ab6b8288264db2ad17ec651998e125131eb80a3c40b7ff125
 MD5 c8c0d5aba6f125a9ac7f0eada19d167c xl2tpd-1.1.06.ebuild 1870
 RMD160 8c25b757f7e1584bc2a7ccc6fbe9c81eb2eb018d xl2tpd-1.1.06.ebuild 1870
 SHA256 ded75f03e6d8569ab6b8288264db2ad17ec651998e125131eb80a3c40b7ff125 xl2tpd-1.1.06.ebuild 1870
-MISC ChangeLog 829 RMD160 39a791ecfae01849897df2f530ef37ac787cd574 SHA1 cf09e2ad46f35b274ea11e1ccab2b302c03c87be SHA256 0719174f2dfaa432e9b9046b46f454d254f2ac53c8e8e1a02cf809a817a5b593
-MD5 c2e5870ab32961dc674d4da77957aa59 ChangeLog 829
-RMD160 39a791ecfae01849897df2f530ef37ac787cd574 ChangeLog 829
-SHA256 0719174f2dfaa432e9b9046b46f454d254f2ac53c8e8e1a02cf809a817a5b593 ChangeLog 829
+EBUILD xl2tpd-1.1.08.ebuild 1870 RMD160 674cef182581812d9a50f1fe7bbfb4f4fdb03e00 SHA1 2001ab8cba241e7f5486b76ef17c1699e61b5ea0 SHA256 7c80c4f95cf979fee1ecc9a6e5bf44ec5acbed3737f73f40b394c0be0297e4f2
+MD5 a8d57a8f4c84018652d75a0bb4b897e7 xl2tpd-1.1.08.ebuild 1870
+RMD160 674cef182581812d9a50f1fe7bbfb4f4fdb03e00 xl2tpd-1.1.08.ebuild 1870
+SHA256 7c80c4f95cf979fee1ecc9a6e5bf44ec5acbed3737f73f40b394c0be0297e4f2 xl2tpd-1.1.08.ebuild 1870
+MISC ChangeLog 996 RMD160 81c1025e8a322f416bdd921074e72dfa509f3394 SHA1 2d9e201376ba1070665ac1b2672ee682b122c7dd SHA256 322f86d9f2caa619a9ae287848f376d2b2854bcaddc25d68f235cba17bf3affd
+MD5 8d26f4dc0fc09101d915bb089ff82b77 ChangeLog 996
+RMD160 81c1025e8a322f416bdd921074e72dfa509f3394 ChangeLog 996
+SHA256 322f86d9f2caa619a9ae287848f376d2b2854bcaddc25d68f235cba17bf3affd ChangeLog 996
 MISC metadata.xml 281 RMD160 6ba88d0228fd7f974f70d63fb0cc2d762ba82bb5 SHA1 38a78c92947a085d595b7a85d9de2525c69e3fb7 SHA256 3e259d9615cfeebaea3e58571404538766c8d2adc6e7a800c09f3b15756cc0c3
 MD5 2489971def1ce6f019a703c6b877a124 metadata.xml 281
 RMD160 6ba88d0228fd7f974f70d63fb0cc2d762ba82bb5 metadata.xml 281
@@ -25,10 +26,13 @@ SHA256 3e259d9615cfeebaea3e58571404538766c8d2adc6e7a800c09f3b15756cc0c3 metadata
 MD5 279486ce900a666250e0dae31abd2f75 files/digest-xl2tpd-1.1.06 241
 RMD160 3192c01386982de7a40cda51fe716dcf6a7b97ed files/digest-xl2tpd-1.1.06 241
 SHA256 aae223b448a9a934e999716e2e709685ffa71934133cf2682a945350c7503d39 files/digest-xl2tpd-1.1.06 241
+MD5 ca5f95862c571ed9688b3e546ff20313 files/digest-xl2tpd-1.1.08 241
+RMD160 42af8d45165ad8f350605ca93adcd4bce3102dcc files/digest-xl2tpd-1.1.08 241
+SHA256 0cab1426aebec416fed4e13a9bffdfef46322256055c39468bc356a5f7aadc16 files/digest-xl2tpd-1.1.08 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzbktJnxX6mF440QRAvkAAJ9neWPZmLAE3PoXsmNTmVvnt1eYlQCgyaOd
-fGX4srucf/Sahj1kbo39ZRw=
-=JYde
+iD8DBQFF6/YVJnxX6mF440QRAoCNAKDIokdVzaZNFkuA0LPdaUf92Wec5gCeKjiG
+rHe2QyeIFyjxNh/4EK4kxEE=
+=37Qg
 -----END PGP SIGNATURE-----

diff --git a/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.08 b/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.08
new file mode 100644 (file)
index 0000000..ad862d5
--- /dev/null
+++ b/net-dialup/xl2tpd/files/digest-xl2tpd-1.1.08
@@ -0,0 +1,3 @@
+MD5 d0c310b7a135b385ab5a61325e56566a xl2tpd-1.1.08.tar.gz 165439
+RMD160 208433daac898e781540dac6ba3658f5a5cfb902 xl2tpd-1.1.08.tar.gz 165439
+SHA256 05c344e134853234c53b58a85cc204a85498b6b1985780a63690f21b2d7a6e24 xl2tpd-1.1.08.tar.gz 165439

diff --git a/net-dialup/xl2tpd/files/l2tpd-init b/net-dialup/xl2tpd/files/l2tpd-init
deleted file mode 100644 (file)
index b118736..0000000
--- a/net-dialup/xl2tpd/files/l2tpd-init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/l2tpd-init,v 1.1 2006/05/30 20:54:12 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 $?
-}
-
-stop() {
-       ebegin "Stopping l2tpd"
-       start-stop-daemon --stop --quiet --pidfile /var/run/l2tpd.pid
-       eend $?
-}

diff --git a/net-dialup/xl2tpd/files/xl2tpd-init b/net-dialup/xl2tpd/files/xl2tpd-init
index 1f32d2657b77b03f0c9c2c28e84fafd9c6531336..639007b577ae624d33549dab93a9b87ccff64d19 100644 (file)
--- a/net-dialup/xl2tpd/files/xl2tpd-init
+++ b/net-dialup/xl2tpd/files/xl2tpd-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init,v 1.1 2006/12/08 21:12:34 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/files/xl2tpd-init,v 1.2 2007/03/05 10:50:54 mrness Exp $
 
 depend() {
        need net
@@ -27,6 +27,6 @@ start() {
 
 stop() {
        ebegin "Stopping xl2tpd"
-       start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd/xl2tpd.pid
+       start-stop-daemon --stop --quiet --pidfile /var/run/xl2tpd.pid
        eend $?
 }

diff --git a/net-dialup/xl2tpd/xl2tpd-1.1.08.ebuild b/net-dialup/xl2tpd/xl2tpd-1.1.08.ebuild
new file mode 100644 (file)
index 0000000..9f97cae
--- /dev/null
+++ b/net-dialup/xl2tpd/xl2tpd-1.1.08.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xl2tpd/xl2tpd-1.1.08.ebuild,v 1.1 2007/03/05 10:50:54 mrness Exp $
+
+inherit eutils
+
+DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
+HOMEPAGE="http://www.xelerance.com/software/xl2tpd/"
+SRC_URI="ftp://ftp.xelerance.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!net-dialup/l2tpd
+       net-dialup/ppp"
+
+src_install() {
+       dosbin xl2tpd || die 'xl2tpd binary not found'
+       doman doc/*.[85]
+
+       dodoc CREDITS README \
+               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
+}
+
+#TODO: remove preinst and postinst functions some time around July 2007
+pkg_preinst() {
+       if has_version "<=${CATEGORY}/${PN}-1.1.05" && [[ -d "${ROOT}/etc/l2tpd" ]]; then
+               ebegin "Migrating /etc/l2tpd to /etc/xl2tpd"
+               if [[ -f "${ROOT}/etc/l2tpd/l2tpd.conf" ]] ; then
+                       sed -i -e 's:/etc/l2tpd/:/etc/xl2tpd/:g' "${ROOT}/etc/l2tpd/l2tpd.conf"
+                       mv "${ROOT}/etc/l2tpd/l2tpd.conf" "${ROOT}/etc/l2tpd/xl2tpd.conf"
+               fi
+               mv -f "${ROOT}/etc/l2tpd" "${ROOT}/etc/xl2tpd"
+               eend
+       fi
+}
+
+pkg_postinst() {
+       if has_version "<=${CATEGORY}/${PN}-1.1.05"; then
+               ewarn "The daemon and service have been renamed from l2tpd to xl2tpd."
+               ewarn "Please remove the old init script and configure your system to use"
+               ewarn "the new init script:"
+               ewarn "   ${HILITE}/etc/init.d/l2tpd stop${NORMAL}"
+               ewarn "   ${HILITE}rc-update del l2tpd${NORMAL}"
+               ewarn "   ${HILITE}rm /etc/init.d/l2tpd${NORMAL}"
+               ewarn "   ${HILITE}rc-update add xl2tpd${NORMAL}"
+               ewarn "   ${HILITE}/etc/init.d/xl2tpd start${NORMAL}"
+               ebeep
+       fi
+}