From 75495533f728bb5331ea15289276352c47b1865a Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 17 Sep 2005 13:45:12 +0000 Subject: [PATCH] Forgot ! when checking for missing config file in initscript. Bug #106267 Package-Manager: portage-2.0.52-r1 --- net-ftp/frox/ChangeLog | 7 ++++++- net-ftp/frox/Manifest | 16 ++++++++-------- ...{digest-frox-0.7.18 => digest-frox-0.7.18-r2} | 0 net-ftp/frox/files/frox.rc | 4 ++-- ...{frox-0.7.18.ebuild => frox-0.7.18-r2.ebuild} | 7 ++++--- 5 files changed, 20 insertions(+), 14 deletions(-) rename net-ftp/frox/files/{digest-frox-0.7.18 => digest-frox-0.7.18-r2} (100%) rename net-ftp/frox/{frox-0.7.18.ebuild => frox-0.7.18-r2.ebuild} (87%) diff --git a/net-ftp/frox/ChangeLog b/net-ftp/frox/ChangeLog index 97c686e3f391..fd6673014f40 100644 --- a/net-ftp/frox/ChangeLog +++ b/net-ftp/frox/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-ftp/frox # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.9 2005/09/07 09:40:08 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/ChangeLog,v 1.10 2005/09/17 13:45:12 dragonheart Exp $ + +*frox-0.7.18-r2 (17 Sep 2005) + + 17 Sep 2005; Daniel Black frox-0.7.18-r2.ebuild files/digest-frox-0.7.18-r2 + Forgot ! when checking for missing config file in initscript. Bug #106267 thanks to M9841 *frox-0.7.18-r1 (07 Sep 2005) diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest index 2ad0ca22f99a..a8430073c16b 100644 --- a/net-ftp/frox/Manifest +++ b/net-ftp/frox/Manifest @@ -2,17 +2,17 @@ Hash: SHA1 MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403 -MD5 2faee46ed2b4a6478586be419c845172 ChangeLog 1571 -MD5 d1ede9dc096fa5b565620e2c01f02653 frox-0.7.18.ebuild 1788 +MD5 8f14cdbe16532380c2411b386ba5bdcf ChangeLog 1800 MD5 4ed8b45b788394d07de8ee0d6d4ec015 frox-0.7.18-r1.ebuild 1821 -MD5 b4bef74e030a66fdc8146dded33be009 files/frox.rc 1076 -MD5 4fc077cd1a556548e43d1bbc6176c1fb files/digest-frox-0.7.18 64 +MD5 3dd0a6b913a28b30847dd560654f0e6d frox-0.7.18-r2.ebuild 1821 +MD5 8b112b625077001f33ae23eb28602115 files/frox.rc 1078 MD5 e80a76dccec13cd8104fe980f63395fd files/config-0.7.18.patch 1953 MD5 4fc077cd1a556548e43d1bbc6176c1fb files/digest-frox-0.7.18-r1 64 +MD5 4fc077cd1a556548e43d1bbc6176c1fb files/digest-frox-0.7.18-r2 64 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux) -iD8DBQFDHrWOmdTrptrqvGERAqGoAJ9r9DWNl22ePENCrbk0BSbzcrklfwCcCSPB -6wZTqKa7WuEzBflklvSoiTM= -=/eX2 +iD8DBQFDLB4AmdTrptrqvGERAgmlAKCdjc6di/ZhnzSEBPemLLhb+7f75wCgiQDu +FM758KCFYOUkhqPf1cCkWtg= +=//36 -----END PGP SIGNATURE----- diff --git a/net-ftp/frox/files/digest-frox-0.7.18 b/net-ftp/frox/files/digest-frox-0.7.18-r2 similarity index 100% rename from net-ftp/frox/files/digest-frox-0.7.18 rename to net-ftp/frox/files/digest-frox-0.7.18-r2 diff --git a/net-ftp/frox/files/frox.rc b/net-ftp/frox/files/frox.rc index 800621c50921..0a0e9f894b21 100644 --- a/net-ftp/frox/files/frox.rc +++ b/net-ftp/frox/files/frox.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/files/frox.rc,v 1.3 2005/09/07 09:40:08 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/files/frox.rc,v 1.4 2005/09/17 13:45:12 dragonheart Exp $ PROGNAME=`basename $1` @@ -12,7 +12,7 @@ depend() { } checkconfig() { - if [ -f /etc/frox.conf ] ; then + if [ ! -f /etc/frox.conf ] ; then eerror "missing /etc/frox.conf" return 1 fi diff --git a/net-ftp/frox/frox-0.7.18.ebuild b/net-ftp/frox/frox-0.7.18-r2.ebuild similarity index 87% rename from net-ftp/frox/frox-0.7.18.ebuild rename to net-ftp/frox/frox-0.7.18-r2.ebuild index f206886a09b4..06ab54780bcd 100644 --- a/net-ftp/frox/frox-0.7.18.ebuild +++ b/net-ftp/frox/frox-0.7.18-r2.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/frox/frox-0.7.18.ebuild,v 1.6 2005/08/23 22:03:28 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/frox/frox-0.7.18-r2.ebuild,v 1.1 2005/09/17 13:45:12 dragonheart Exp $ inherit eutils @@ -31,7 +31,7 @@ src_compile() { --localstatedir=/var/run \ --sysconfdir=/etc \ --enable-http-cache --enable-local-cache \ - `use_enable clamav virus-scan` || die "bad ./configure" + $(use_enable clamav virus-scan) || die "bad ./configure" emake || die "compile problem" } @@ -46,7 +46,8 @@ src_install() { fperms 700 /var/spool/frox fowners ftpproxy:ftpproxy /var/run/frox /var/spool/frox /var/log/frox - dodoc BUGS COPYING README \ + # INSTALL has useful filewall rules + dodoc BUGS README \ doc/CREDITS doc/ChangeLog doc/FAQ doc/INSTALL \ doc/INTERNALS doc/README.transdata doc/RELEASE \ doc/SECURITY doc/TODO -- 2.26.2