remove old; sanitize config file path; install CGI scripts as a web application (#54620)

(Portage version: 2.0.51.22-r1)

7 files changed, 121 insertions, 86 deletions

diff --git a/net-dialup/linesrv/ChangeLog b/net-dialup/linesrv/ChangeLog
index 412eb3ca8109..6976e833b68b 100644
--- a/net-dialup/linesrv/ChangeLog
+++ b/net-dialup/linesrv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/linesrv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/ChangeLog,v 1.6 2005/07/04 01:24:48 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/ChangeLog,v 1.7 2005/07/17 12:40:59 mrness Exp $
+
+*linesrv-2.1.21-r1 (17 Jul 2005)
+
+  17 Jul 2005; Alin Nastac <mrness@gentoo.org> files/linesrv.conf,
+  -linesrv-2.1.20.ebuild, +linesrv-2.1.21-r1.ebuild:
+  Remove obsolete version. Install CGI scripts as a web application and move
+  configuration file to /etc/linesrv/linesrv.conf (#54620).
 
   04 Jul 2005; Renat Lumpau <rl03@gentoo.org> metadata.xml:
   Fixed herd
diff --git a/net-dialup/linesrv/Manifest b/net-dialup/linesrv/Manifest
index 23af935d0280..e58061a216c3 100644
--- a/net-dialup/linesrv/Manifest
+++ b/net-dialup/linesrv/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 75f88d98fccccdf2b2134d357c104e16 linesrv-2.1.21-r1.ebuild 3288
 MD5 d7548cc74497bbd825da169fcc81fc46 linesrv-2.1.21.ebuild 2349
 MD5 240c8943e05265c1cb5f0cfd43751429 linesrv-2.1.20.ebuild 2312
 MD5 8642471d77035a6098f631ddcce31021 ChangeLog 2670
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
+MD5 2151cc793fd154ea019536d367c41d62 files/digest-linesrv-2.1.21-r1 71
 MD5 148291b0901718e67783dd9cd5697ce5 files/lcshutdown.pam 394
 MD5 5f4ba5c11012d9f1d4febf0a889a2cb0 files/digest-linesrv-2.1.20 71
 MD5 2151cc793fd154ea019536d367c41d62 files/digest-linesrv-2.1.21 71
 MD5 18a9115779175629a384615141cc2bc4 files/linesrv.rc6 746
 MD5 c12043d06fdf61810bba6fe2903a3cf5 files/linecontrol.pam 420
-MD5 5a4da082fefbf6ffd17754034b8cf1a7 files/linesrv.conf 1282
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCyI/lEzitwsaoONoRAhBMAKCbFhzXl8W/SPX4EQEE18NNZaoLGgCfW/zw
-YSLDYsFb9cdYG4W4uUTs9dI=
-=oYO3
------END PGP SIGNATURE-----
+MD5 e01d4d01bb93a5c34a5223f10e945953 files/linesrv.conf 1278
diff --git a/net-dialup/linesrv/files/digest-linesrv-2.1.20 b/net-dialup/linesrv/files/digest-linesrv-2.1.20
deleted file mode 100644
index 1e14169424b7..000000000000
--- a/net-dialup/linesrv/files/digest-linesrv-2.1.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6af17902e24706f8b911f3ca24580020 linesrv-2.1.20.src.tar.bz2 201910
diff --git a/net-dialup/linesrv/files/digest-linesrv-2.1.21-r1 b/net-dialup/linesrv/files/digest-linesrv-2.1.21-r1
new file mode 100644
index 000000000000..d33463579b10
--- /dev/null
+++ b/net-dialup/linesrv/files/digest-linesrv-2.1.21-r1
@@ -0,0 +1 @@
+MD5 71d3395c0877fe066b946deacec1d46f linesrv-2.1.21.src.tar.bz2 204143
diff --git a/net-dialup/linesrv/files/linesrv.conf b/net-dialup/linesrv/files/linesrv.conf
index b6dce508242e..e7b9d0ef7477 100644
--- a/net-dialup/linesrv/files/linesrv.conf
+++ b/net-dialup/linesrv/files/linesrv.conf
@@ -1,8 +1,8 @@
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/files/linesrv.conf,v 1.1 2004/12/05 15:56:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/files/linesrv.conf,v 1.2 2005/07/17 12:40:59 mrness Exp $
 #
 # LineServer Global Settings
 #
-bind_to 192.168.1.1
+bind_to 0.0.0.0
 port 16007
 user_accounting yes
 logfile /var/log/linesrv/linesrv.log
diff --git a/net-dialup/linesrv/linesrv-2.1.20.ebuild b/net-dialup/linesrv/linesrv-2.1.20.ebuild
deleted file mode 100644
index de8b14b683fb..000000000000
--- a/net-dialup/linesrv/linesrv-2.1.20.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/linesrv-2.1.20.ebuild,v 1.3 2005/04/16 14:28:29 mrness Exp $
-
-inherit eutils
-
-# if someone disables pam but wants user authentication
-# to be supported, then crypt is needed.
-IUSE="pam mysql crypt"
-
-DESCRIPTION="Client/Server system to control the Internet link of a masquerading server"
-HOMEPAGE="http://linecontrol.srf.ch/"
-
-S=${WORKDIR}/${PN}-2.1
-SRC_URI="http://linecontrol.srf.ch/down/${P}.src.tar.bz2"
-
-# requesting glibc instead of virtual/libc
-# because we might need crypt. And as far as I
-# (S. Fuchs, author of linesrv) remember, there's
-# glibc specific stuff in linesrv.
-DEPEND=">=sys-libs/glibc-2.2.0
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-4 )"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-
-[ -z "$HTTPD_ROOT" ] && HTTPD_ROOT=/var/www/localhost
-
-src_compile() {
-	local myauth mymysql
-	# sfuchs: configure script of linesrv 2 is quite bad...
-	# prefer pam, if disabled try crypt
-	# the configure script will disable authentication if
-	# neither pam nor crypt is available.
-	if ! ( use pam ); then
-		myauth="--disable-pamauth"
-		if use crypt; then
-			myauth="--enable-cryptauth"
-		fi
-	fi
-	# --enable-mysql is not supported... stupid, I know.
-	use mysql || mymysql="--disable-mysql"
-	econf ${myauth} ${mymysql} || die "bad configure"
-	emake || die
-}
-
-src_install() {
-	dodir /usr/share/linesrv /var/log/linesrv ${HTTPD_ROOT}/htdocs/lclog
-
-	dosbin server/linesrv
-
-	exeinto ${HTTPD_ROOT}/cgi-bin ; doexe lclog/lclog htmlstatus/htmlstatus
-	chmod 4755 ${D}${HTTPD_ROOT}/cgi-bin/htmlstatus
-	insinto ${HTTPD_ROOT}/htdocs/lclog ; doins lclog/html/*
-
-	mknod ${D}/usr/share/linesrv/logpipe p
-	exeinto /usr/share/linesrv ; doexe server/config/complete_syntax/halt-wrapper
-
-	dodoc server/{INSTALL,NEWS,README}
-	newdoc htmlstatus/README README.htmlstatus
-	newdoc lclog/INSTALL INSTALL.lclog
-	newdoc ${FILESDIR}/linesrv.conf linesrv.conf.sample
-	docinto complete_syntax ; dodoc server/config/complete_syntax/*
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/linesrv.rc6 linesrv
-	if use pam ; then
-		insinto /etc/pam.d ; newins ${FILESDIR}/linecontrol.pam linecontrol
-		insinto /etc/pam.d ; newins ${FILESDIR}/lcshutdown.pam lcshutdown
-	fi
-}
diff --git a/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild b/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild
new file mode 100644
index 000000000000..8a41f22e9dfc
--- /dev/null
+++ b/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild,v 1.1 2005/07/17 12:40:59 mrness Exp $
+
+inherit webapp flag-o-matic
+
+DESCRIPTION="Client/Server system to control the Internet link of a masquerading server"
+HOMEPAGE="http://linecontrol.srf.ch/"
+SRC_URI="http://linecontrol.srf.ch/down/${P}.src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+# if someone disables pam but wants user authentication
+# to be supported, then crypt is needed.
+IUSE="pam mysql crypt"
+
+# requesting glibc instead of virtual/libc
+# because we might need crypt. And as far as I
+# (S. Fuchs, author of linesrv) remember, there's
+# glibc specific stuff in linesrv.
+DEPEND=">=sys-libs/glibc-2.2.0
+	pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-4 )"
+
+S=${WORKDIR}/${PN}-2.1
+
+WEBAPP_MANUAL_SLOT=yes
+
+src_unpack() {
+	unpack ${A}
+
+	sed -i -e 's:/etc/linesrv.conf:/etc/linesrv/linesrv.conf:' \
+		${S}/server/cfg.h \
+		${S}/lclog/lclog.c \
+		${S}/htmlstatus/htmlstatus.c
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,now #don't use lazy bindings
+
+	local myconf=""
+	# sfuchs: configure script of linesrv 2 is quite bad...
+	# prefer pam, if disabled try crypt
+	# the configure script will disable authentication if
+	# neither pam nor crypt is available.
+	if ! use pam ; then
+		myconf="${myconf} --disable-pamauth"
+		if use crypt; then
+			myconf="${myconf} --enable-cryptauth"
+		fi
+	fi
+	# --enable-mysql is not supported... stupid, I know.
+	use mysql || myconf="${myconf} --disable-mysql"
+	econf ${myconf} || die "bad configure"
+	emake || die "build failed"
+}
+
+src_install() {
+	webapp_src_preinst
+	dodir /usr/share/linesrv /var/log/linesrv
+
+	dosbin server/linesrv
+
+	mknod ${D}/usr/share/linesrv/logpipe p
+	exeinto /usr/share/linesrv ; doexe server/config/complete_syntax/halt-wrapper
+
+	doman debian/*.{5,8}
+
+	dodoc server/{INSTALL,NEWS,README}
+	newdoc htmlstatus/README README.htmlstatus
+	newdoc lclog/INSTALL INSTALL.lclog
+	newdoc ${FILESDIR}/linesrv.conf linesrv.conf.sample
+	docinto complete_syntax ; dodoc server/config/complete_syntax/*
+
+	insinto /etc/linesrv ; newins ${FILESDIR}/linesrv.conf linesrv.conf
+	newinitd ${FILESDIR}/linesrv.rc6 linesrv
+	if use pam ; then
+		insinto /etc/pam.d
+		newins ${FILESDIR}/linecontrol.pam linecontrol
+		newins ${FILESDIR}/lcshutdown.pam lcshutdown
+	fi
+
+	exeinto ${MY_CGIBINDIR} ; doexe lclog/lclog htmlstatus/htmlstatus
+	insinto ${MY_HTDOCSDIR}/lclog ; doins lclog/html/*
+	webapp_src_install
+
+	#TODO: change FILESDIR files and remove this lines 
+	#when versions older than 2.1.21-r1 are removed
+	use pam && \
+		sed -i -e 's:/etc/linesrv[.]:/etc/linesrv/linesrv.:' ${D}/etc/pam.d/*
+	sed -i -e 's:/etc/linesrv.conf:/etc/linesrv/linesrv.conf:'  ${D}/etc/init.d/${PN}
+}
+
+pkg_preinst() {
+	webapp_pkg_preinst
+	if [ -f "${ROOT}/etc/linesrv.conf" ]; then
+		[ -d "${ROOT}/etc/linesrv" ] || mkdir "${ROOT}/etc/linesrv"
+		mv "${ROOT}/etc/linesrv.conf" "${ROOT}/etc/linesrv/linesrv.conf"
+	fi
+}
+
+pkg_postinst() {
+	einfo "The first stage of the installation is done. Now you need to setup your virtual hosts via webapp-config"
+	einfo "Please read man webapp-config for a detailed description of the process and some examples"
+	webapp_pkg_postinst
+}