summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-03-24 01:41:16 +0000
committerMike Frysinger <vapier@gentoo.org>2005-03-24 01:41:16 +0000
commit4fe553f37f04634c9ad9bef48ed17da83368ec51 (patch)
tree3440433077ab8f9972313c13c8f527a56b6f2b56 /net-ftp
parentMarked ppc stable for bug #86405. (diff)
downloadhistorical-4fe553f37f04634c9ad9bef48ed17da83368ec51.tar.gz
historical-4fe553f37f04634c9ad9bef48ed17da83368ec51.tar.bz2
historical-4fe553f37f04634c9ad9bef48ed17da83368ec51.zip
re-add the glftpd stuff in pkg_config for /etc/services #86417
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/glftpd/Manifest2
-rw-r--r--net-ftp/glftpd/glftpd-2.00.ebuild16
2 files changed, 12 insertions, 6 deletions
diff --git a/net-ftp/glftpd/Manifest b/net-ftp/glftpd/Manifest
index 6305e560273e..9ded2fe25631 100644
--- a/net-ftp/glftpd/Manifest
+++ b/net-ftp/glftpd/Manifest
@@ -1,5 +1,5 @@
MD5 7752d3a2578390f4c936ee9a78ef4c84 ChangeLog 1335
-MD5 81df3cc220a8772787fbd35b38f6c6b8 glftpd-2.00.ebuild 2668
+MD5 9765afee47eb196dd38c07bf2c28fef0 glftpd-2.00.ebuild 2852
MD5 fb8d5f6b8fac69dbe80b089824d8d257 glftpd-1.32-r2.ebuild 2815
MD5 2158fefa6b8983f5dd6bfe2c2b401558 files/digest-glftpd-2.00 65
MD5 24b620c9e2a0384f8aa0570e9c6e8a87 files/glftpd.env.d 44
diff --git a/net-ftp/glftpd/glftpd-2.00.ebuild b/net-ftp/glftpd/glftpd-2.00.ebuild
index 4d6c5e4c5114..491917c5f4b7 100644
--- a/net-ftp/glftpd/glftpd-2.00.ebuild
+++ b/net-ftp/glftpd/glftpd-2.00.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-ftp/glftpd/glftpd-2.00.ebuild,v 1.2 2005/02/20 22:09:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-2.00.ebuild,v 1.3 2005/03/24 01:41:16 vapier Exp $
inherit eutils
@@ -45,7 +45,7 @@ src_install() {
# custom options
export USETCPD=$(yesno useq tcpd)
export JAIL=y
- export MAKETLS=$(yesno [ ! -e /etc/glftpd-dsa.pem ])
+ export MAKETLS=$(yesno [[ ! -e ${ROOT}/etc/glftpd-dsa.pem ]])
export WHICHNETD=x
"${S}"/installgl.sh || die "installgl.sh failed"
@@ -56,10 +56,10 @@ src_install() {
mv ${GLROOT}/glftpd.conf ${D}/etc/
ln -s /etc/glftpd.conf ${GLROOT}/glftpd.conf
- if [ -e /etc/glftpd-dsa.pem ] ; then
- cp /etc/glftpd-dsa.pem ${D}/etc/
+ if [[ -e ${ROOT}/etc/glftpd-dsa.pem ]] ; then
+ cp "${ROOT}"/etc/glftpd-dsa.pem "${D}"/etc/
else
- cp ftpd-dsa.pem ${D}/etc/glftpd-dsa.pem
+ cp ftpd-dsa.pem "${D}"/etc/glftpd-dsa.pem
fi
ln -s /etc/glftpd-dsa.pem ${GLROOT}/etc/glftpd-dsa.pem
fperms o-r /etc/glftpd-dsa.pem
@@ -92,6 +92,12 @@ pkg_postinst() {
}
pkg_config() {
+ einfo "Updating /etc/services"
+ { grep -v ^glftpd /etc/services;
+ echo "glftpd 21/tcp"
+ } > /etc/services.new
+ mv -f /etc/services.new /etc/services
+
einfo "Updating crontab"
{ crontab -l | grep -v "bin/reset"
echo "0 0 * * * ${CUSTOMGLROOT}/bin/reset -r ${CUSTOMGLROOT}/glftpd.conf"