version bump, #66629

5 files changed, 37 insertions, 13 deletions

diff --git a/net-misc/linesrv/ChangeLog b/net-misc/linesrv/ChangeLog
index 244494e09235..66461339086e 100644
--- a/net-misc/linesrv/ChangeLog
+++ b/net-misc/linesrv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/linesrv
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linesrv/ChangeLog,v 1.11 2004/10/07 03:36:05 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linesrv/ChangeLog,v 1.12 2004/10/08 14:17:53 squinky86 Exp $
+
+*linesrv-2.1.20 (08 Oct 2004)
+
+  08 Oct 2004; Jon Hood <squinky86@gentoo.org> -linesrv-2.1.19.ebuild,
+  +linesrv-2.1.20.ebuild:
+  Version bump irt #66629, thanks Stefan Fuchs <gentoo-wrap@srf.ch>
 
 *linesrv-2.1.19 (06 Oct 2004)
 
diff --git a/net-misc/linesrv/Manifest b/net-misc/linesrv/Manifest
index d8222ece3c59..1a96b8c9ca88 100644
--- a/net-misc/linesrv/Manifest
+++ b/net-misc/linesrv/Manifest
@@ -1,12 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3dc5dcc6ce453796b808b3072237f076 linesrv-2.1.19.ebuild 1625
 MD5 f278431712c59f5ac07c17537021d4a9 linesrv-2.1.6-r1.ebuild 1874
-MD5 8413b88c7433dd1c687e6a2630e62258 ChangeLog 1608
+MD5 876fdc9a4aaa05b788bd86225d8c22db linesrv-2.1.20.ebuild 2304
+MD5 541db6df610378b02a4779aadac3f28a ChangeLog 1805
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
 MD5 618cc8195802f0a27d3ad1aa81e40da2 files/lcshutdown.pam 397
-MD5 1eb0c0efc9e1698a66c230af2e202dac files/digest-linesrv-2.1.19 71
+MD5 5f4ba5c11012d9f1d4febf0a889a2cb0 files/digest-linesrv-2.1.20 71
 MD5 ac08554018fe0f5bd255dc00ce0f9e50 files/linesrv.rc6 742
 MD5 fcf1fee9b36c1cd1bfb2933c4b6826e3 files/digest-linesrv-2.1.6-r1 70
 MD5 2f68a269a78a78334c93cd286f5234ba files/linecontrol.pam 423
@@ -14,7 +14,7 @@ MD5 2c1ec3d89dfd37fcdc8bc9fa9d35d325 files/linesrv.conf 1285
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBZLmwcAgAdbxYsnERAiW7AJ9v8q+1FkXjSFwHrmvceT+h7ioppACffSFB
-hXx/shd7uaHrUdWQ+33b01E=
-=gJSh
+iD8DBQFBZqG2cAgAdbxYsnERAgQKAJ9tBJqtONvJuMslXaFV+fH6DL1SxwCeKeGc
+f00oR7N2bdwLINDEGWwMnp0=
+=1dbH
 -----END PGP SIGNATURE-----
diff --git a/net-misc/linesrv/files/digest-linesrv-2.1.19 b/net-misc/linesrv/files/digest-linesrv-2.1.19
deleted file mode 100644
index 7de144fc5506..000000000000
--- a/net-misc/linesrv/files/digest-linesrv-2.1.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e1201e05e6e4a78a43346bffed757319 linesrv-2.1.19.src.tar.bz2 201205
diff --git a/net-misc/linesrv/files/digest-linesrv-2.1.20 b/net-misc/linesrv/files/digest-linesrv-2.1.20
new file mode 100644
index 000000000000..1e14169424b7
--- /dev/null
+++ b/net-misc/linesrv/files/digest-linesrv-2.1.20
@@ -0,0 +1 @@
+MD5 6af17902e24706f8b911f3ca24580020 linesrv-2.1.20.src.tar.bz2 201910
diff --git a/net-misc/linesrv/linesrv-2.1.19.ebuild b/net-misc/linesrv/linesrv-2.1.20.ebuild
index 3d75ea330123..b56f9cf8dc1a 100644
--- a/net-misc/linesrv/linesrv-2.1.19.ebuild
+++ b/net-misc/linesrv/linesrv-2.1.20.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/linesrv/linesrv-2.1.19.ebuild,v 1.1 2004/10/07 03:36:05 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/linesrv/linesrv-2.1.20.ebuild,v 1.1 2004/10/08 14:17:53 squinky86 Exp $
 
 inherit eutils
 
-IUSE="pam mysql"
+# 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/"
@@ -12,7 +14,11 @@ HOMEPAGE="http://linecontrol.srf.ch/"
 S=${WORKDIR}/${PN}-2.1
 SRC_URI="http://linecontrol.srf.ch/down/${P}.src.tar.bz2"
 
-DEPEND="virtual/libc
+# 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"
@@ -22,8 +28,20 @@ KEYWORDS="~x86 ~sparc"
 [ -z "$HTTPD_ROOT" ] && HTTPD_ROOT=/var/www/localhost
 
 src_compile() {
-	econf `use_enable pam pamauth` \
-		`use_enable mysql` || die "bad configure"
+	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
 }