diff options
| -rw-r--r-- | net-ftp/glftpd/ChangeLog | 71 | ||||
| -rw-r--r-- | net-ftp/glftpd/Manifest | 24 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/1.32-install.patch | 57 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/1.32-stack-overflow.patch | 54 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/glftpd-2.00-gcc.patch | 7 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/glftpd-2.00-install.patch | 101 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/glftpd-2.00-script-path-checks.patch | 47 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/glftpd-2.01-install.patch | 105 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/glftpd.env.d | 1 | ||||
| -rw-r--r-- | net-ftp/glftpd/files/glftpd.xinetd.d | 12 | ||||
| -rw-r--r-- | net-ftp/glftpd/glftpd-2.00.ebuild | 105 | ||||
| -rw-r--r-- | net-ftp/glftpd/glftpd-2.01.ebuild | 105 | ||||
| -rw-r--r-- | net-ftp/glftpd/metadata.xml | 8 |
13 files changed, 0 insertions, 697 deletions
diff --git a/net-ftp/glftpd/ChangeLog b/net-ftp/glftpd/ChangeLog deleted file mode 100644 index 77011a8e21b4..000000000000 --- a/net-ftp/glftpd/ChangeLog +++ /dev/null @@ -1,71 +0,0 @@ -# ChangeLog for net-ftp/glftpd -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/ChangeLog,v 1.19 2008/10/09 21:07:10 flameeyes Exp $ - - 09 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> glftpd-2.01.ebuild: - Restrict stripping -- binary only package. - - 31 May 2008; Mike Frysinger <vapier@gentoo.org> files/glftpd.xinetd.d: - Dont both listing cert path in xinetd as it should be handled in the glftpd - conf file #205389 by Jiri Tyr. - - 11 Nov 2007; Raúl Porcel <armin76@gentoo.org> glftpd-2.01.ebuild: - x86 stable - - 15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml: - add <herd>no-herd</herd> - - 06 May 2007; Marius Mauch <genone@gentoo.org> glftpd-2.00.ebuild, - glftpd-2.01.ebuild: - Replacing einfo with elog - - 08 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -glftpd-1.32-r2.ebuild: - QA: Removed unused versions. - -*glftpd-2.01 (06 Jan 2006) - - 06 Jan 2006; Mike Frysinger <vapier@gentoo.org> - +files/glftpd-2.01-install.patch, +glftpd-2.01.ebuild: - Version bump #117958 for Jakub Moc. - -*glftpd-2.00 (19 Feb 2005) - - 19 Feb 2005; Mike Frysinger <vapier@gentoo.org> : - Version bump #79532 by Peter. Include patch to fix information disclosure - bug #82544. - -*glftpd-1.32-r2 (07 Oct 2004) - - 07 Oct 2004; Mike Frysinger <vapier@gentoo.org> - files/1.32-stack-overflow.patch, -glftpd-1.32-r1.ebuild, - +glftpd-1.32-r2.ebuild: - More stack overflow fixes #66495. - -*glftpd-1.32-r1 (20 Sep 2004) - - 20 Sep 2004; Mike Frysinger <vapier@gentoo.org> - +files/1.32-stack-overflow.patch, +glftpd-1.32-r1.ebuild: - Version bump to fix stack overflow #64809. - - 09 Jun 2004; Aron Griffis <agriffis@gentoo.org> glftpd-1.32.ebuild: - Fix use invocation, trusting SpanKY to clean up yesno ;-) - -*glftpd-1.32 (03 Dec 2003) - - 03 Dec 2003; Mike Frysinger <vapier@gentoo.org> : - Version bump + TLS merge + major cleanup. - -*glftpd-1.30 (29 Apr 2003) - - 29 Apr 2003; Mike Frysinger <vapier@gentoo.org> : - Version bump. - -*glftpd-1.28 (12 Jan 2003) - - 12 Jan 2003; Mike Frysinger <vapier@gentoo.org> : - Version bump. - -*glftpd-1.27 (23 Oct 2002) - - 23 Oct 2002; Mike Frysinger <vapier@gentoo.org> : - Initial import. Ebuild submitted by me. diff --git a/net-ftp/glftpd/Manifest b/net-ftp/glftpd/Manifest deleted file mode 100644 index b777bfe0e946..000000000000 --- a/net-ftp/glftpd/Manifest +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 1.32-install.patch 1432 RMD160 4272a7afab3f392c5d03584c2f6bcba84459119a SHA1 6bbfa41a9b558b77dd9c6713af34c290e89f3448 SHA256 aa599ecc69541e19d84c940e07e483f204a72b39e50efae0942b59b39efe49a0 -AUX 1.32-stack-overflow.patch 1818 RMD160 9b0c4b28d3c60e5972765c83099f23e3897cfa27 SHA1 fe197b78e24e12c4d61fcc1e76ef13d084746cf2 SHA256 d84273d6775a1c63cfd6dda1cc4fb4d9d1b3f5b0c697d6de8dc786a8605c75a3 -AUX glftpd-2.00-gcc.patch 230 RMD160 d5d45de56b9e889fcb0498a3c138d2b4177a7c07 SHA1 0dfec72b4fa1d024f4c8373a63a02b15451c7e0e SHA256 cd5449ef6acb0c646bec261b12b191a4fa3f4a20fd1ca22a8e1376eff752ba4e -AUX glftpd-2.00-install.patch 2944 RMD160 238ce972b9fba1cd02075e323c4444f365443c9a SHA1 0fcc4c9bbe8fccd7933dc0dcd24482a26063cae7 SHA256 c0d4ce34551444e44c644cb37f640aa608a4f03e82a7b9c7bb9b30e99baa78c0 -AUX glftpd-2.00-script-path-checks.patch 830 RMD160 02fc832c341f7c9f19f313ce6641683f180dfa42 SHA1 6961482efe385f5e0e55727627b1434bcb915a60 SHA256 d55426b9c87cd3140420492b1a93c745e2e4136ec0d9b30245b1eadfd09acf89 -AUX glftpd-2.01-install.patch 3146 RMD160 2445a06128943b6f89572864f7cf55d2bf8b2f51 SHA1 b3896b858dbd7a57212a469bf9e9cacac9cb9b1e SHA256 4212cbe7fc2320beb4aa8c4452a55b3ee9b54127991484de44172daefbcd3b87 -AUX glftpd.env.d 44 RMD160 06e27d093b318f63973cd710e5cd0d5a8024b8ec SHA1 7c2bd0f344e3492eb7bef95ab93be6e405e2d1bd SHA256 41ad94c5f4a28697f402f390907e18a534cd9b6124add1197641850215527f28 -AUX glftpd.xinetd.d 356 RMD160 611bda32b5a266605907ad98d0ee4d151defa36d SHA1 4ce243eaab58cdd874c8ef1b0eea200317ca4d07 SHA256 a4586b4a36c862b689f7e2988ea673ed6c252b79150e47343ba2e063324fcb87 -DIST glftpd-LNX_2.00.tgz 2601322 RMD160 5bdb70ead970f26cc59a01b5e8e733c7ceec680d SHA1 1280de49dc225845f9b136abbee3fe1485417c57 SHA256 88db34eec1fb5a752f85c596717e72c75ab98c1254b1844989400fab2ba66be8 -DIST glftpd-LNX_2.01.tgz 2765868 RMD160 85b5ec152557bb33ec31dac0cc10afc2ab30ffe5 SHA1 bc15e3fbf48ff7d24df189841d9fa532948503fd SHA256 e5a199c7e6e8b928e53adc3d00452a4a0decaf15bbac6d6815d7c008d5c2ae31 -EBUILD glftpd-2.00.ebuild 2822 RMD160 ed2c82b2c50b5bfdbe0d3919ec4f02c90e160625 SHA1 ee26441bb8e4f217d31f88dd6562780e9c246295 SHA256 82a9f5c8b2cc634300b903f71fdb7fd302ec3abbd74c1cfbbe8407e52794819e -EBUILD glftpd-2.01.ebuild 2768 RMD160 5f092c74ce2b43abc09d2a58d043de5e7087cec7 SHA1 be6d6436f73f290cc623f7ae973c37f7af6a1a7a SHA256 ee383e39ca33614250eae4171e67a1485694d72c45a996684de378e370994ab6 -MISC ChangeLog 2218 RMD160 7d45e57a1549e00f799831192f5d8d1d9ec896ea SHA1 e215bdcf4d92697dff3e8ce106906f319b18bda8 SHA256 d3a6daaa3bbd0ecb000a0e3c418d2fc76fa2418682990f3b1c900cdc8c14b7d2 -MISC metadata.xml 232 RMD160 854b06094287201d0b98f2b21d36054db25d81cd SHA1 cc4f98e9ee0102aea687d71cf3af924cf156edbb SHA256 21382e863647add08888c924279a4b931b2b90ccd0cf5e526ee74a3d5e1fd0df ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkjucosACgkQAiZjviIA2Xi/twCfaIRK5l48KjhnTHtYcL30YzDI -Yg4Anjxxu0qIdHurLGgzCro3RugV1lra -=vYy9 ------END PGP SIGNATURE----- diff --git a/net-ftp/glftpd/files/1.32-install.patch b/net-ftp/glftpd/files/1.32-install.patch deleted file mode 100644 index 3d3386fa9ef0..000000000000 --- a/net-ftp/glftpd/files/1.32-install.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- installgl.sh.orig 2003-12-02 23:52:43.000000000 -0500 -+++ installgl.sh 2003-12-02 23:56:17.000000000 -0500 -@@ -138 +138 @@ -- read usetcpd -+ usetcpd=${USETCPD} -@@ -173 +173 @@ -- read jail -+ jail=y -@@ -185 +185 @@ -- read jaildir -+ jaildir=${GLROOT} -@@ -197 +197 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 1" ; exit 1 -@@ -229 +229 @@ -- read useprivgroup -+ useprivgroup=n -@@ -259 +259 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 2" ; exit 1 -@@ -335 +335 @@ -- read glroot -+ break -@@ -347 +347 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 3" ; exit 1 -@@ -514 +514 @@ -- read port -+ port=${GLFTPD_PORT} -@@ -527,2 +527 @@ --} > /etc/services.new --mv -f /etc/services.new /etc/services -+} > /dev/null -@@ -539 +538 @@ -- read whichnetd -+ whichnetd=${WHICHNETD} -@@ -571 +570 @@ -- read tlsname -+ tlsname="ftp server" -@@ -636 +634,0 @@ -- mv -f $base.pem $tls/ -@@ -665 +663 @@ -- read tlsq -+ tlsq=${MAKETLS} -@@ -683 +681,2 @@ -- read tls -+ tls=/etc/glftpd-dsa.pem -+ break -@@ -735 +734 @@ -- cat <<EOF > /etc/xinetd.d/glftpd -+ cat <<EOF > ${D}/etc/xinetd.d/glftpd -@@ -750 +749 @@ -- if killall -USR2 xinetd; then -+ if 0; then -@@ -763 +762 @@ --} | crontab - > /dev/null -+} diff --git a/net-ftp/glftpd/files/1.32-stack-overflow.patch b/net-ftp/glftpd/files/1.32-stack-overflow.patch deleted file mode 100644 index b6ffed04d991..000000000000 --- a/net-ftp/glftpd/files/1.32-stack-overflow.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- bin/sources/dupescan.c.orig 2004-09-20 21:19:29.448018912 -0400 -+++ bin/sources/dupescan.c 2004-09-20 21:20:58.484483312 -0400 -@@ -51,7 +51,8 @@ - read_conf_datapath(Temp); - sprintf(dupefile, "%s/logs/dupefile", Temp); - -- strcpy(dupename, argv[1]); -+ strncpy(dupename, argv[1], sizeof(dupename)-1); -+ dupename[sizeof(dupename)-1] = '\0'; - if((fp = fopen(dupefile, "r")) == NULL) - return 0; - ---- bin/sources/dirlogclean.c.orig 2002-11-24 08:52:14.000000000 -0500 -+++ bin/sources/dirlogclean.c 2004-10-06 20:49:02.357541216 -0400 -@@ -99,14 +99,16 @@ - if (argv[x][0] != '-') { } else { - switch ( argv[x][1] ) { - case 'r': -- strcpy(config_file, argv[x+1]); -+ strncpy(config_file, argv[x+1], sizeof(config_file) - 1); -+ config_file[ sizeof(config_file) - 1 ] = '\0'; - break; - } - } - x++; - } - -- strcpy(cleanname, argv[argc-1]); -+ strncpy(cleanname, argv[argc-1], sizeof(cleanname) - 1); -+ cleanname[ sizeof(cleanname) - 1 ] = '\0'; - printf("CLEANING: %s\n", cleanname); - - read_conf_datapath(datapath, config_file); ---- bin/sources/formateduser.c.orig 2002-11-24 08:52:14.000000000 -0500 -+++ bin/sources/formateduser.c 2004-10-06 20:51:35.995184744 -0400 -@@ -238,7 +238,8 @@ - if (argv[x][0] != '-') { } else { - switch ( argv[x][1] ) { - case 'r': -- strcpy(config_file, argv[x+1]); -+ strncpy(config_file, argv[x+1], sizeof(config_file) - 1); -+ config_file[ sizeof(config_file) - 1 ] = '\0'; - break; - } - } -@@ -246,7 +247,7 @@ - } - - read_conf_datapath(datapath, config_file); -- sprintf(userfile, "%s/users/%s", datapath, argv[argc-1]); -+ snprintf(userfile, sizeof(userfile), "%s/users/%s", datapath, argv[argc-1]); - - - if((fp = fopen(userfile, "r")) == NULL) diff --git a/net-ftp/glftpd/files/glftpd-2.00-gcc.patch b/net-ftp/glftpd/files/glftpd-2.00-gcc.patch deleted file mode 100644 index 28c9c187c8c7..000000000000 --- a/net-ftp/glftpd/files/glftpd-2.00-gcc.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- bin/sources/glupdate.c -+++ bin/sources/glupdate.c -@@ -64,3 +64,3 @@ - void update_log (struct dirlog); --void get_dir_size (char *, int *, long *); -+void get_dir_size (char *, int *, unsigned long long *); - char *trim (char *); diff --git a/net-ftp/glftpd/files/glftpd-2.00-install.patch b/net-ftp/glftpd/files/glftpd-2.00-install.patch deleted file mode 100644 index a372a044eb51..000000000000 --- a/net-ftp/glftpd/files/glftpd-2.00-install.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- installgl.sh -+++ installgl.sh -@@ -246 +245,0 @@ --read randomkey -@@ -272 +271 @@ -- read usetcpd -+ usetcpd=${USETCPD} -@@ -336 +335 @@ -- read jail -+ jail=y -@@ -349 +348 @@ -- read jaildir -+ jaildir=${GLROOT} -@@ -361 +360 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 1" ; exit 1 -@@ -393 +392 @@ -- read useprivgroup -+ useprivgroup=n -@@ -414 +413 @@ -- read privgroup -+ echo "SHOULD NOT HAVE BEEN HERE 2" ; exit 1 -@@ -423 +422 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 3" ; exit 1 -@@ -441 +440 @@ -- read jailusers -+ echo "SHOULD NOT HAVE BEEN HERE 4" ; exit 1 -@@ -505 +504 @@ -- read glroot -+ break -@@ -517 +516 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 5" ; exit 1 -@@ -602 +601 @@ -- read servicename -+ servicename=glftpd -@@ -617 +616 @@ -- read keystroke -+ keystroke=y -@@ -639 +638 @@ -- read keystroke -+ echo "SHOULD NOT HAVE BEEN HERE 6.2" ; exit 1 -@@ -696 +695 @@ -- $usegcc $gccflags "$jaildir$glroot/bin/$base" "$cfile" >/dev/null 2>&1 || \ -+ $usegcc $gccflags "$jaildir$glroot/bin/$base" "$cfile" >& "$cfile".cc.log || \ -@@ -699 +698 @@ -- echo "OK." -+ echo "OK." ; rm -f "$cfile".cc.log -@@ -702 +701 @@ -- echo "FAILED!" -+ echo "FAILED!" ; cat "$cfile".cc.log -@@ -826 +825 @@ -- read port -+ port=21 -@@ -842,4 +840,0 @@ --{ grep -v ^${servicename} /etc/services; -- echo "$servicename $port/tcp" --} > /etc/services.new --mv -f /etc/services.new /etc/services -@@ -891 +886 @@ -- read whichnetd -+ whichnetd=${WHICHNETD} -@@ -903,3 +898 @@ -- echo "ERROR: Can't determine if you are using inetd or xinetd!" -- echo "Please fix this problem and re-run the installation script" -- exit 1 -+ whichnetd=${WHICHNETD} -@@ -920 +913 @@ -- read keystroke -+ keystroke=n -@@ -938 +931 @@ -- read keystroke -+ keystroke=no -@@ -960 +952,0 @@ -- cp /etc/localtime /usr/lib/ -@@ -980 +972 @@ -- read tlsname -+ tlsname="ftp server" -@@ -1041 +1033 @@ -- mv -f $base.pem $tls/ -+ mv -f $base.pem $D$tls/ -@@ -1068 +1060 @@ -- read tls -+ echo "SHOULD NOT HAVE BEEN HERE 7" ; exit 1 -@@ -1096 +1088 @@ -- read tls -+ tls=/etc/glftpd-dsa.pem ; break -@@ -1222,3 +1214,2 @@ -- [ ! -d "/etc/xinetd.d" ] && { -- mkdir /etc/xinetd.d -- echo "includedir /etc/xinetd.d" >> /etc/xinetd.conf -+ [ ! -d "$D/etc/xinetd.d" ] && { -+ mkdir $D/etc/xinetd.d -@@ -1226 +1217 @@ -- cat <<EOF > /etc/xinetd.d/$servicename -+ cat <<EOF > $D/etc/xinetd.d/$servicename -@@ -1252,3 +1242,0 @@ --{ crontab -l | grep -v "$jaildir$glroot/bin/reset" -- echo "0 0 * * * $jaildir$glroot/bin/reset ${euroweek}${confpath}" --} | crontab - > /dev/null diff --git a/net-ftp/glftpd/files/glftpd-2.00-script-path-checks.patch b/net-ftp/glftpd/files/glftpd-2.00-script-path-checks.patch deleted file mode 100644 index 892e914e1590..000000000000 --- a/net-ftp/glftpd/files/glftpd-2.00-script-path-checks.patch +++ /dev/null @@ -1,47 +0,0 @@ -Make people don't try scanning for files they shouldn't have -access to normally. - -http://bugs.gentoo.org/show_bug.cgi?id=82544 - ---- bin/sitenfo.sh -+++ bin/sitenfo.sh -@@ -37,6 +37,11 @@ - exit 0 - } - -+[ "${1/..\/}" != "$1" ] && { -+ echo "That zipfile does not exist!" -+ exit 1 -+} -+ - [ ! -e "$1" ] && { - echo "That zipfile does not exist!" - exit 1 ---- bin/sitezipchk.sh -+++ bin/sitezipchk.sh -@@ -37,6 +37,11 @@ - exit 0 - } - -+[ "${1/..\/}" != "$1" ] && { -+ echo "That zipfile does not exist!" -+ exit 1 -+} -+ - [ ! -e "$1" ] && { - echo "That zipfile does not exist!" - exit 1 ---- bin/siteziplist.sh -+++ bin/siteziplist.sh -@@ -37,6 +37,11 @@ - exit 0 - } - -+[ "${1/..\/}" != "$1" ] && { -+ echo "That zipfile does not exist!" -+ exit 1 -+} -+ - [ ! -e "$1" ] && { - echo "That zipfile does not exist!" - exit 1 diff --git a/net-ftp/glftpd/files/glftpd-2.01-install.patch b/net-ftp/glftpd/files/glftpd-2.01-install.patch deleted file mode 100644 index dd0f04aa8de8..000000000000 --- a/net-ftp/glftpd/files/glftpd-2.01-install.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- installgl.sh -+++ installgl.sh -@@ -273 +272,0 @@ --read randomkey -@@ -299 +298 @@ -- read usetcpd -+ usetcpd=${USETCPD} -@@ -363 +362 @@ -- read jail -+ jail=y -@@ -376 +375 @@ -- read jaildir -+ jaildir=${GLROOT} -@@ -388 +387 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 1" ; exit 1 -@@ -420 +419 @@ -- read useprivgroup -+ useprivgroup=n -@@ -441 +440 @@ -- read privgroup -+ echo "SHOULD NOT HAVE BEEN HERE 2" ; exit 1 -@@ -450 +449 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 3" ; exit 1 -@@ -468 +467 @@ -- read jailusers -+ echo "SHOULD NOT HAVE BEEN HERE 4" ; exit 1 -@@ -532 +531 @@ -- read glroot -+ break -@@ -544 +543 @@ -- read reply -+ echo "SHOULD NOT HAVE BEEN HERE 5" ; exit 1 -@@ -620 +619 @@ -- read keystroke -+ echo "SHOULD NOT HAVE BEEN HERE A" ; exit 1 -@@ -657 +656 @@ -- read servicename -+ servicename=glftpd -@@ -672 +671 @@ -- read keystroke -+ keystroke=y -@@ -694 +693 @@ -- read keystroke -+ echo "SHOULD NOT HAVE BEEN HERE 6.2" ; exit 1 -@@ -751 +750 @@ -- $usegcc $gccflags "$jaildir$glroot/bin/$base" "$cfile" >/dev/null 2>&1 || \ -+ $usegcc $gccflags "$jaildir$glroot/bin/$base" "$cfile" >& "$cfile".cc.log || \ -@@ -754 +753 @@ -- echo "OK." -+ echo "OK." ; rm -f "$cfile".cc.log -@@ -757 +756 @@ -- echo "FAILED!" -+ echo "FAILED!" ; cat "$cfile".cc.log -@@ -885 +884 @@ -- read port -+ port=21 -@@ -901,4 +899,0 @@ --{ grep -v ^${servicename} /etc/services; -- echo "$servicename $port/tcp" --} > /etc/services.new --mv -f /etc/services.new /etc/services -@@ -950 +945 @@ -- read whichnetd -+ whichnetd=${WHICHNETD} -@@ -962,4 +957 @@ -- echo "ERROR: Can't determine if you are using inetd or xinetd!" -- echo "This is usually because neither is running at the moment -" -- echo "install/start one of them and re-run this installer." -- exit 1 -+ whichnetd=${WHICHNETD} -@@ -980 +972 @@ -- read keystroke -+ keystroke=n -@@ -998 +990 @@ -- read keystroke -+ echo "SHOULD NOT HAVE BEEN HERE B" ; exit 1 -@@ -1020 +1011,0 @@ -- cp /etc/localtime /usr/lib/ -@@ -1040 +1031 @@ -- read tlsname -+ tlsname="ftp server" -@@ -1101 +1092 @@ -- mv -f $base.pem $tls/ -+ mv -f $base.pem $D$tls/ -@@ -1134 +1125 @@ -- read tls -+ echo "SHOULD NOT HAVE BEEN HERE 7" ; exit 1 -@@ -1162 +1153 @@ -- read tls -+ tls=/etc/glftpd-dsa.pem ; break -@@ -1287,3 +1278,2 @@ -- [ ! -d "/etc/xinetd.d" ] && { -- mkdir /etc/xinetd.d -- echo "includedir /etc/xinetd.d" >> /etc/xinetd.conf -+ [ ! -d "$D/etc/xinetd.d" ] && { -+ mkdir $D/etc/xinetd.d -@@ -1291 +1281 @@ -- cat <<EOF > /etc/xinetd.d/$servicename -+ cat <<EOF > $D/etc/xinetd.d/$servicename -@@ -1324,3 +1313,0 @@ --{ crontab -l | grep -v "$jaildir$glroot/bin/reset" -- echo "0 0 * * * $jaildir$glroot/bin/reset ${euroweek}${confpath}" --} | crontab - > /dev/null diff --git a/net-ftp/glftpd/files/glftpd.env.d b/net-ftp/glftpd/files/glftpd.env.d deleted file mode 100644 index df90b64f721f..000000000000 --- a/net-ftp/glftpd/files/glftpd.env.d +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PROTECT="GLROOT/etc GLROOT/ftp-data" diff --git a/net-ftp/glftpd/files/glftpd.xinetd.d b/net-ftp/glftpd/files/glftpd.xinetd.d deleted file mode 100644 index 4507f58f6a06..000000000000 --- a/net-ftp/glftpd/files/glftpd.xinetd.d +++ /dev/null @@ -1,12 +0,0 @@ -service glftpd -{ - disable = yes - flags = REUSE NAMEINARGS - socket_type = stream - protocol = tcp - wait = no - user = root - server = /usr/sbin/tcpd - server_args = GLROOT/bin/glftpd -l -i -o -r GLROOT/glftpd.conf -sGLROOT/bin/glstrings.bin - only_from = 0.0.0.0 -} diff --git a/net-ftp/glftpd/glftpd-2.00.ebuild b/net-ftp/glftpd/glftpd-2.00.ebuild deleted file mode 100644 index ab8b9aa74a36..000000000000 --- a/net-ftp/glftpd/glftpd-2.00.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2007 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.6 2007/05/06 10:55:09 genone Exp $ - -inherit eutils - -MY_P=${P/-/-LNX_} -DESCRIPTION="a HIGHLY configurable ftp server" -HOMEPAGE="http://www.glftpd.com/" -SRC_URI="http://www.glftpd.com/files/${MY_P}.tgz" - -LICENSE="freedist" -SLOT="0" -KEYWORDS="-* x86" -IUSE="" - -DEPEND="dev-libs/openssl" -RDEPEND="${DEPEND} - sys-apps/xinetd" - -S=${WORKDIR}/${MY_P} - -# custom options -export CUSTOMGLROOT=${CUSTOMGLROOT:-/opt/glftpd} -export GLROOT=${GLROOT:-${D}${CUSTOMGLROOT}} - -pkg_setup() { - [[ -d /proc/sysvipc ]] || die "You need System V IPC support in your kernel" -} - -src_unpack() { - unpack ${A} - cd "${S}" - cp installgl.sh{,.orig} - epatch "${FILESDIR}"/${P}-install.patch - epatch "${FILESDIR}"/${P}-gcc.patch - epatch "${FILESDIR}"/${P}-script-path-checks.patch -} - -yesno() { if $@ ; then echo y ; else echo n ; fi ; } - -src_install() { - dodir /etc/xinetd.d - - # custom options - export USETCPD=$(yesno useq tcpd) - export JAIL=y - export MAKETLS=$(yesno [[ ! -e ${ROOT}/etc/glftpd-dsa.pem ]]) - export WHICHNETD=x - "${S}"/installgl.sh || die "installgl.sh failed" - - # fix the glftpd.conf file - sed -i \ - -e "s:${GLROOT}:${CUSTOMGLROOT}/:" \ - ${GLROOT}/glftpd.conf - - mv ${GLROOT}/glftpd.conf ${D}/etc/ - ln -s /etc/glftpd.conf ${GLROOT}/glftpd.conf - 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 - fi - ln -s /etc/glftpd-dsa.pem ${GLROOT}/etc/glftpd-dsa.pem - fperms o-r /etc/glftpd-dsa.pem - - # xinetd.d entry (use our custom one :]) - insinto /etc/xinetd.d - newins ${FILESDIR}/glftpd.xinetd.d glftpd - dosed "s:GLROOT:${CUSTOMGLROOT}:g" /etc/xinetd.d/glftpd - - # env entry to protect our ftp passwd/group files - newenvd ${FILESDIR}/glftpd.env.d 99glftpd - dosed "s:GLROOT:${CUSTOMGLROOT}:g" /etc/env.d/99glftpd - - # chmod the glftpd dir so that user files will work - chmod 711 ${GLROOT} -} - -pkg_postinst() { - echo - elog "Read the documentation in /opt/glftpd/docs/" - elog "After you setup your conf file, edit the xinetd" - elog "entry in /etc/xinetd.d/glftpd to enable, then" - elog "start xinetd: /etc/init.d/xinetd start" - elog - elog "To add glftpd to your services file and to" - elog "create a cronjob for auto generating statistics," - elog "just run this command after you install:" - elog - elog "emerge --config =${CATEGORY}/${PF}" -} - -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" - } | crontab - > /dev/null -} diff --git a/net-ftp/glftpd/glftpd-2.01.ebuild b/net-ftp/glftpd/glftpd-2.01.ebuild deleted file mode 100644 index d026296cdec6..000000000000 --- a/net-ftp/glftpd/glftpd-2.01.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/glftpd/glftpd-2.01.ebuild,v 1.6 2008/10/09 21:07:10 flameeyes Exp $ - -inherit eutils - -MY_P=${P/-/-LNX_} -DESCRIPTION="a HIGHLY configurable ftp server" -HOMEPAGE="http://www.glftpd.com/" -SRC_URI="http://www.glftpd.com/files/${MY_P}.tgz" - -LICENSE="freedist" -SLOT="0" -KEYWORDS="-* ~amd64 x86" -IUSE="" - -DEPEND="dev-libs/openssl" -RDEPEND="${DEPEND} - sys-apps/xinetd" - -RESTRICT="strip" - -S=${WORKDIR}/${MY_P} - -# custom options -export CUSTOMGLROOT=${CUSTOMGLROOT:-/opt/glftpd} -export GLROOT=${GLROOT:-${D}${CUSTOMGLROOT}} - -pkg_setup() { - [[ -d /proc/sysvipc ]] || die "You need System V IPC support in your kernel" -} - -src_unpack() { - unpack ${A} - cd "${S}" - cp installgl.sh{,.orig} - epatch "${FILESDIR}"/${P}-install.patch -} - -yesno() { if eval "$@" ; then echo y ; else echo n ; fi ; } - -src_install() { - dodir /etc/xinetd.d - - # custom options - export USETCPD=$(yesno useq tcpd) - export JAIL=y - export MAKETLS=$(yesno [[ ! -e ${ROOT}/etc/glftpd-dsa.pem ]]) - export WHICHNETD=x - "${S}"/installgl.sh || die "installgl.sh failed" - - # fix the glftpd.conf file - sed -i \ - -e "s:${GLROOT}:${CUSTOMGLROOT}/:" \ - ${GLROOT}/glftpd.conf - - mv ${GLROOT}/glftpd.conf ${D}/etc/ - ln -s /etc/glftpd.conf ${GLROOT}/glftpd.conf - 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 - fi - ln -s /etc/glftpd-dsa.pem ${GLROOT}/etc/glftpd-dsa.pem - fperms o-r /etc/glftpd-dsa.pem - - # xinetd.d entry (use our custom one :]) - insinto /etc/xinetd.d - newins ${FILESDIR}/glftpd.xinetd.d glftpd - dosed "s:GLROOT:${CUSTOMGLROOT}:g" /etc/xinetd.d/glftpd - - # env entry to protect our ftp passwd/group files - newenvd ${FILESDIR}/glftpd.env.d 99glftpd - dosed "s:GLROOT:${CUSTOMGLROOT}:g" /etc/env.d/99glftpd - - # chmod the glftpd dir so that user files will work - chmod 711 ${GLROOT} -} - -pkg_postinst() { - echo - elog "Read the documentation in /opt/glftpd/docs/" - elog "After you setup your conf file, edit the xinetd" - elog "entry in /etc/xinetd.d/glftpd to enable, then" - elog "start xinetd: /etc/init.d/xinetd start" - elog - elog "To add glftpd to your services file and to" - elog "create a cronjob for auto generating statistics," - elog "just run this command after you install:" - elog - elog "emerge --config =${CATEGORY}/${PF}" -} - -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" - } | crontab - > /dev/null -} diff --git a/net-ftp/glftpd/metadata.xml b/net-ftp/glftpd/metadata.xml deleted file mode 100644 index 616f0488f72e..000000000000 --- a/net-ftp/glftpd/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>no-herd</herd> -<maintainer> - <email>maintainer-needed@gentoo.org</email> -</maintainer> -</pkgmetadata> |