version bump with -Wl,-z,now; don't install pam files if pam not selected

Package-Manager: portage-2.0.51.19

7 files changed, 107 insertions, 20 deletions

diff --git a/net-dialup/linesrv/ChangeLog b/net-dialup/linesrv/ChangeLog
index 8626b6c0e226..720851af7fe3 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.3 2005/02/07 20:59:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/ChangeLog,v 1.4 2005/04/16 14:28:29 mrness Exp $
+
+*linesrv-2.1.21 (16 Apr 2005)
+
+  16 Apr 2005; Alin Nastac <mrness@gentoo.org> files/linesrv.rc6,
+  linesrv-2.1.6-r1.ebuild, linesrv-2.1.20.ebuild, +linesrv-2.1.21.ebuild:
+  Version bump. Avoid installing pam configuration files when pam not
+  selected. Avoid lazy bindings.
 
   07 Feb 2005; Alin Nastac <mrness@gentoo.org> linesrv-2.1.20.ebuild:
   Mark stable on x86.
diff --git a/net-dialup/linesrv/Manifest b/net-dialup/linesrv/Manifest
index bf03cca53671..9f53a255547f 100644
--- a/net-dialup/linesrv/Manifest
+++ b/net-dialup/linesrv/Manifest
@@ -1,20 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 55bfb38e1d1a5c164ff1867714fb44fb linesrv-2.1.6-r1.ebuild 1872
-MD5 a8448cbe39aeeb95b721cef6fa953efa linesrv-2.1.20.ebuild 2302
-MD5 5b171233582ce3f678477176dbfb065f ChangeLog 2187
+MD5 82ea4c5f72336acb4abd8a684eba219b linesrv-2.1.21.ebuild 2391
+MD5 47c38284a6d7de0a3f613ccbfbb48689 linesrv-2.1.6-r1.ebuild 1882
+MD5 240c8943e05265c1cb5f0cfd43751429 linesrv-2.1.20.ebuild 2312
+MD5 6d05646ad2b0940e422c7b7340aa6e33 ChangeLog 2462
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 MD5 148291b0901718e67783dd9cd5697ce5 files/lcshutdown.pam 394
 MD5 5f4ba5c11012d9f1d4febf0a889a2cb0 files/digest-linesrv-2.1.20 71
-MD5 c981eee6164b7014b165949affa64aba files/linesrv.rc6 741
+MD5 2151cc793fd154ea019536d367c41d62 files/digest-linesrv-2.1.21 71
+MD5 18a9115779175629a384615141cc2bc4 files/linesrv.rc6 746
 MD5 fcf1fee9b36c1cd1bfb2933c4b6826e3 files/digest-linesrv-2.1.6-r1 70
 MD5 c12043d06fdf61810bba6fe2903a3cf5 files/linecontrol.pam 420
 MD5 5a4da082fefbf6ffd17754034b8cf1a7 files/linesrv.conf 1282
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCB9akjiC39V7gKu0RAvQgAJ0TYkl82np/GZPRDsS6h5AKPGioBwCfY/dj
-PTTi+qpG2KzQK89gMW8thCE=
-=fnbv
+iD8DBQFCYSEjjiC39V7gKu0RAqd0AJ9SD8sYdB1y9SppLZOuju8sHFM+EgCdEw1Q
+wRzlmpz5oZLmlU468hq4q/0=
+=3iz3
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/linesrv/files/digest-linesrv-2.1.21 b/net-dialup/linesrv/files/digest-linesrv-2.1.21
new file mode 100644
index 000000000000..d33463579b10
--- /dev/null
+++ b/net-dialup/linesrv/files/digest-linesrv-2.1.21
@@ -0,0 +1 @@
+MD5 71d3395c0877fe066b946deacec1d46f linesrv-2.1.21.src.tar.bz2 204143
diff --git a/net-dialup/linesrv/files/linesrv.rc6 b/net-dialup/linesrv/files/linesrv.rc6
index a1eefab1c19d..77b990abc134 100755
--- a/net-dialup/linesrv/files/linesrv.rc6
+++ b/net-dialup/linesrv/files/linesrv.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/files/linesrv.rc6,v 1.1 2004/12/05 15:56:10 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/files/linesrv.rc6,v 1.2 2005/04/16 14:28:30 mrness Exp $
 
 depend() {
 	need net logger
@@ -10,8 +10,8 @@ depend() {
 
 checkconfig() {
 	if [ ! -e /etc/linesrv.conf ] ; then
-		eerror "You  need  an  /etc/linesrv.conf file first"
-		eerror "There is a sample in /usr/share/doc/linesrv"
+		eerror "You need a /etc/linesrv.conf file first"
+		eerror "There is a sample in `echo /usr/share/doc/linesrv-*`"
 		return 1
 	fi
 }
diff --git a/net-dialup/linesrv/linesrv-2.1.20.ebuild b/net-dialup/linesrv/linesrv-2.1.20.ebuild
index ccf876d913f5..de8b14b683fb 100644
--- a/net-dialup/linesrv/linesrv-2.1.20.ebuild
+++ b/net-dialup/linesrv/linesrv-2.1.20.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/02/07 20:59:06 mrness Exp $
+# $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
 
@@ -60,10 +60,12 @@ src_install() {
 	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
-	insinto /etc ; newins ${FILESDIR}/linesrv.conf linesrv.conf.sample
-	insinto /etc/pam.d ; newins ${FILESDIR}/linecontrol.pam linecontrol
-	insinto /etc/pam.d ; newins ${FILESDIR}/lcshutdown.pam lcshutdown
+	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.ebuild b/net-dialup/linesrv/linesrv-2.1.21.ebuild
new file mode 100644
index 000000000000..d183903ffa06
--- /dev/null
+++ b/net-dialup/linesrv/linesrv-2.1.21.ebuild
@@ -0,0 +1,73 @@
+# 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.ebuild,v 1.1 2005/04/16 14:28:29 mrness Exp $
+
+inherit eutils 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="~x86 ~sparc"
+# 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
+
+[ -z "$HTTPD_ROOT" ] && HTTPD_ROOT=/var/www/localhost
+
+src_compile() {
+	append-ldflags -Wl,-z,now #don't use lazy bindings
+
+	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 "build failed"
+}
+
+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.6-r1.ebuild b/net-dialup/linesrv/linesrv-2.1.6-r1.ebuild
index 650a7ea74948..eb787616e6b2 100644
--- a/net-dialup/linesrv/linesrv-2.1.6-r1.ebuild
+++ b/net-dialup/linesrv/linesrv-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.6-r1.ebuild,v 1.2 2005/02/07 20:59:06 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/linesrv-2.1.6-r1.ebuild,v 1.3 2005/04/16 14:28:29 mrness Exp $
 
 IUSE="pam"
 
@@ -52,10 +52,12 @@ src_install() {
 	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
-	insinto /etc ; newins ${FILESDIR}/linesrv.conf linesrv.conf.sample
-	insinto /etc/pam.d ; newins ${FILESDIR}/linecontrol.pam linecontrol
-	insinto /etc/pam.d ; newins ${FILESDIR}/lcshutdown.pam lcshutdown
+	if use pam ; then
+		insinto /etc/pam.d ; newins ${FILESDIR}/linecontrol.pam linecontrol
+		insinto /etc/pam.d ; newins ${FILESDIR}/lcshutdown.pam lcshutdown
+	fi
 }