Remove obsolete revision. Compile linesrv with user CFLAGS. Quote $S and $FILESDIR.

Package-Manager: portage-2.0.54

diff --git a/net-dialup/linesrv/ChangeLog b/net-dialup/linesrv/ChangeLog
index 6477ac8d648deba3895f31313b566798ad063419..a58c88f9f354c6a9afa41a403d731062c0171cf3 100644 (file)
--- a/net-dialup/linesrv/ChangeLog
+++ b/net-dialup/linesrv/ChangeLog
@@ -1,6 +1,12 @@
 # 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.10 2005/12/27 09:31:50 mrness Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/ChangeLog,v 1.11 2006/03/12 16:34:09 mrness Exp $
+
+  12 Mar 2006; Alin Nastac <mrness@gentoo.org> files/lcshutdown.pam,
+  files/linecontrol.pam, files/linesrv.rc6, -linesrv-2.1.21.ebuild,
+  linesrv-2.1.21-r1.ebuild:
+  Remove obsolete revision. Compile linesrv with user CFLAGS. Quote $S and
+  $FILESDIR.
 
   27 Dec 2005; Alin Nastac <mrness@gentoo.org> linesrv-2.1.21-r1.ebuild:
   Stable on x86.

diff --git a/net-dialup/linesrv/Manifest b/net-dialup/linesrv/Manifest
index d4d8181ae7bcdaea02358bf8f7e48bc20a56b701..dacf0109397d9b62d761f1fd4fd8f367c4d99b69 100644 (file)
--- a/net-dialup/linesrv/Manifest
+++ b/net-dialup/linesrv/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3ccd4a610a658a21410a9a7cd87ac245 ChangeLog 3279
-MD5 2151cc793fd154ea019536d367c41d62 files/digest-linesrv-2.1.21 71
+MD5 2bc3603f3482aaa757ddcf7fe713bf03 ChangeLog 3533
 MD5 2151cc793fd154ea019536d367c41d62 files/digest-linesrv-2.1.21-r1 71
-MD5 148291b0901718e67783dd9cd5697ce5 files/lcshutdown.pam 394
-MD5 c12043d06fdf61810bba6fe2903a3cf5 files/linecontrol.pam 420
+MD5 6ab46c52f9780b5929b76d590a5ecfdf files/lcshutdown.pam 288
+MD5 0616e8f26f040ffe8201402367a307e9 files/linecontrol.pam 313
 MD5 206f81642df836e930dc08fd15b1c0f2 files/linesrv.conf 1278
-MD5 18a9115779175629a384615141cc2bc4 files/linesrv.rc6 746
-MD5 7c21da7f0bd4c924d07fd4fb8a2905b1 linesrv-2.1.21-r1.ebuild 3301
-MD5 d7548cc74497bbd825da169fcc81fc46 linesrv-2.1.21.ebuild 2349
+MD5 b515ba3a84a7a9e6a58e1e8e3ba42b53 files/linesrv.rc6 651
+MD5 b3a07d8ecba8bc5982962eafe78d9508 linesrv-2.1.21-r1.ebuild 2935
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFDsQoWNSP4Vda7IdsRAueMAKCL36hDDS1Jjik6gKHb6rNwAUF+JgCfRInO
-mbqwVONeyLE3d4xEowm886o=
-=xSaM
+iD8DBQFEFE2TjG8pv1lIUX4RAianAJsF8XC3qK4QjIQFR7Cv9rF7FXbhOwCg1w3l
+tzp2nhJa/X2FrXx2PUAfsIk=
+=mzwU
 -----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
deleted file mode 100644 (file)
index d334635..0000000
--- a/net-dialup/linesrv/files/digest-linesrv-2.1.21
+++ /dev/null
@@ -1 +0,0 @@
-MD5 71d3395c0877fe066b946deacec1d46f linesrv-2.1.21.src.tar.bz2 204143

diff --git a/net-dialup/linesrv/files/lcshutdown.pam b/net-dialup/linesrv/files/lcshutdown.pam
index 3541d2023d17614b3e441a365abf6f2b7b320a2d..f65f3125b300a4ae377d0b69531fb45cf3eb26be 100644 (file)
--- a/net-dialup/linesrv/files/lcshutdown.pam
+++ b/net-dialup/linesrv/files/lcshutdown.pam
@@ -1,5 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/files/lcshutdown.pam,v 1.1 2004/12/05 15:56:10 mrness Exp $
 # All clients that are able to send a shutdown command should
 # already be authenticated with the pam service linecontrol.
 # so in this service we do only an additional check.
-auth       required   pam_listfile.so item=user sense=allow file=/etc/linesrv.shutdown.users onerr=fail
+auth       required   pam_listfile.so item=user sense=allow file=/etc/linesrv/linesrv.shutdown.users onerr=fail

diff --git a/net-dialup/linesrv/files/linecontrol.pam b/net-dialup/linesrv/files/linecontrol.pam
index 0c1e78cea0ff73bd8ad2732e85b99c74e79ea49a..263d7954347006881a3065a9d08962eb3cb61e71 100644 (file)
--- a/net-dialup/linesrv/files/linecontrol.pam
+++ b/net-dialup/linesrv/files/linecontrol.pam
@@ -1,6 +1,5 @@
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/files/linecontrol.pam,v 1.1 2004/12/05 15:56:10 mrness Exp $
 # linesrv login requires auth and a valid account
 # uncomment the following line only if you have a list of allowed users in a certain file.
-#auth       required   pam_listfile.so item=user sense=allow file=/etc/linesrv.users onerr=fail
+#auth       required   pam_listfile.so item=user sense=allow file=/etc/linesrv/linesrv.users onerr=fail
 auth       required   pam_pwdb.so
 account           required   pam_pwdb.so

diff --git a/net-dialup/linesrv/files/linesrv.rc6 b/net-dialup/linesrv/files/linesrv.rc6
index 77b990abc134a53449ccf3c4036f0fa8e8ea2337..43eb3fe4fa09cf89eba958200c57246311d023e7 100755 (executable)
--- a/net-dialup/linesrv/files/linesrv.rc6
+++ b/net-dialup/linesrv/files/linesrv.rc6
@@ -1,7 +1,6 @@
 #!/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/linesrv/files/linesrv.rc6,v 1.2 2005/04/16 14:28:30 mrness Exp $
 
 depend() {
        need net logger
@@ -9,8 +8,8 @@ depend() {
 }
 
 checkconfig() {
-       if [ ! -e /etc/linesrv.conf ] ; then
-               eerror "You need a /etc/linesrv.conf file first"
+       if [ ! -e /etc/linesrv/linesrv.conf ] ; then
+               eerror "You need a /etc/linesrv/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.21-r1.ebuild b/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild
index cd1216fdd2e63b6e766f5f150db3634432897cfe..1bd91dd1a9ede115b4e6e3450ba7d06233c0092e 100644 (file)
--- a/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild
+++ b/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 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/linesrv/linesrv-2.1.21-r1.ebuild,v 1.4 2005/12/27 09:31:50 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/linesrv/linesrv-2.1.21-r1.ebuild,v 1.5 2006/03/12 16:34:09 mrness Exp $
 
 inherit webapp flag-o-matic
 
@@ -23,7 +23,7 @@ DEPEND=">=sys-libs/glibc-2.2.0
        pam? ( >=sys-libs/pam-0.75 )
        mysql? ( >=dev-db/mysql-4 )"
 
-S=${WORKDIR}/${PN}-2.1
+S="${WORKDIR}/${PN}-${PV%.*}"
 
 WEBAPP_MANUAL_SLOT=yes
 
@@ -31,9 +31,11 @@ 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
+               "${S}/server/cfg.h" \
+               "${S}/lclog/lclog.c" \
+               "${S}/htmlstatus/htmlstatus.c"
+       sed -i -e 's:^CFLAGS *=:CFLAGS = @CFLAGS@:' \
+               "${S}/server/Makefile.in" #set user CFLAGS 
 }
 
 src_compile() {
@@ -62,7 +64,7 @@ src_install() {
 
        dosbin server/linesrv
 
-       mknod ${D}/usr/share/linesrv/logpipe p
+       mknod "${D}/usr/share/linesrv/logpipe" p
        exeinto /usr/share/linesrv ; doexe server/config/complete_syntax/halt-wrapper
 
        doman debian/*.{5,8}
@@ -70,34 +72,20 @@ src_install() {
        dodoc server/{INSTALL,NEWS,README}
        newdoc htmlstatus/README README.htmlstatus
        newdoc lclog/INSTALL INSTALL.lclog
-       newdoc ${FILESDIR}/linesrv.conf linesrv.conf.sample
+       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
+       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
+               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/*
+       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() {

diff --git a/net-dialup/linesrv/linesrv-2.1.21.ebuild b/net-dialup/linesrv/linesrv-2.1.21.ebuild
deleted file mode 100644 (file)
index 3601072..0000000
--- a/net-dialup/linesrv/linesrv-2.1.21.ebuild
+++ /dev/null
@@ -1,74 +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.21.ebuild,v 1.2 2005/06/15 22:05:16 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="~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
-
-[ -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/*
-
-       newinitd ${FILESDIR}/linesrv.rc6 linesrv
-       if use pam ; then
-               insinto /etc/pam.d
-               newins ${FILESDIR}/linecontrol.pam linecontrol
-               newins ${FILESDIR}/lcshutdown.pam lcshutdown
-       fi
-}