From 1fa8819f9371a64f075ac29a7a0235dc6689e990 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 9 Mar 2010 19:40:24 +0000 Subject: [PATCH] some minor cleanups, conditionally depend on sqlinjection tools --- sys-apps/pentoo/Manifest | 2 +- sys-apps/pentoo/pentoo-2010.0-r3.ebuild | 57 +++++++++++++------------ 2 files changed, 31 insertions(+), 28 deletions(-) diff --git a/sys-apps/pentoo/Manifest b/sys-apps/pentoo/Manifest index 169149fdb..00c4b5c51 100644 --- a/sys-apps/pentoo/Manifest +++ b/sys-apps/pentoo/Manifest @@ -10,5 +10,5 @@ EBUILD pentoo-2009.1-r2.ebuild 1189 RMD160 0c808303b31d2242195c5e1ae347317db2012 EBUILD pentoo-2009.1.ebuild 742 RMD160 800e8bc740199dc5c1f9daf77e0cb66876e12abf SHA1 1e86c8f888e0308795b0b2c31c9af512688a09ee SHA256 05072a1b4832596fb12454a72d7514329000e69d85a9a4347576b33531b651c7 EBUILD pentoo-2010.0-r1.ebuild 10330 RMD160 c2f9c5e0834ab42f125a0d8b0ac215e6182f8a57 SHA1 65ca5c7b63fee188eb91a3b6a7a57e8b96419bf8 SHA256 bf0a3783e5185e230c7a5a759d30d79c204fa3dd93c45d8fcbc6f564d530b49a EBUILD pentoo-2010.0-r2.ebuild 10589 RMD160 e2bfbcfd4aae692be261ed995684410a637e626d SHA1 bbd3405f07900346f33b07679369224ad3bbe575 SHA256 db71c45c41cf0ae374b84ec5f933638f42d2d4bb1c789027aa6331e3a779ae47 -EBUILD pentoo-2010.0-r3.ebuild 11163 RMD160 6b5f884490232c6f2992b94b1efb0e65ee315591 SHA1 77b406478ca0ed2f656cfc72538d66673ece2dbc SHA256 c28d68974af1c7d90793670ea424b07278629a353034ce57d2bae24682c3e306 +EBUILD pentoo-2010.0-r3.ebuild 11124 RMD160 37f7a7576a369df426c5fba701f354979fd7e736 SHA1 831c48213ba9e4586168fae478a669fa5e539be0 SHA256 d8a30e66ebd47d6c9e03aa66369fb723c8fe985feb633b8963de60c69f74b64f EBUILD pentoo-2010.0.ebuild 3936 RMD160 c9a608c706aeba29b7f48515c89d95ef89976e63 SHA1 d5744654ea2b4e67f1dca027bb9c349e7b5ebfee SHA256 0329956191fe71135cf9cdbe2c5c623fc73351be285ff4796505a9b653694375 diff --git a/sys-apps/pentoo/pentoo-2010.0-r3.ebuild b/sys-apps/pentoo/pentoo-2010.0-r3.ebuild index f119c74ab..d04e0b340 100644 --- a/sys-apps/pentoo/pentoo-2010.0-r3.ebuild +++ b/sys-apps/pentoo/pentoo-2010.0-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -8,7 +8,7 @@ DESCRIPTION="One ebuild to rule them all and in the darkness bind them" HOMEPAGE="http://www.pentoo.ch" SLOT="0" LICENSE="GPL" -IUSE="dwm +enlightenment +forensics kde +managedetcportage +sqlsec +webappsec +wirelesssec xfce" +IUSE="dwm +enlightenment +forensics kde +managedetcportage +sqlsec +wirelesssec xfce" DEPEND="" @@ -52,7 +52,6 @@ RDEPEND="${RDEPEND} net-wireless/wifitap ) " #net-wireless/wifiscanner - #window makers RDEPEND="${RDEPEND} dwm? ( x11-wm/dwm ) @@ -272,6 +271,18 @@ RDEPEND="${RDEPEND} app-forensics/pdf-parser app-forensics/sleuthkit )" +RDEPEND="${RDEPEND} + sqlsec? ( + dev-db/minimysqlator + dev-db/mssqlscan + dev-db/oat + dev-db/sqlbf + dev-db/sqlibf + dev-db/sqlix + dev-db/sqlmap + dev-db/sqlninja + x86? ( dev-db/sqid ) )" + RDEPEND="${RDEPEND} app-crypt/SIPcrack app-crypt/chntpw @@ -289,15 +300,6 @@ RDEPEND="${RDEPEND} x86? ( app-fuzz/smtp-fuzz ) x86? ( app-fuzz/smudge ) x86? ( app-fuzz/taof ) - dev-db/minimysqlator - dev-db/mssqlscan - dev-db/oat - x86? ( dev-db/sqid ) - dev-db/sqlbf - dev-db/sqlibf - dev-db/sqlix - dev-db/sqlmap - dev-db/sqlninja net-analyzer/aimsniff net-analyzer/amap x86? ( net-analyzer/angst ) @@ -386,6 +388,7 @@ RDEPEND="${RDEPEND} net-wireless/cowpatty net-wireless/crda net-wireless/hostapd" + #TODO: explain why these aren't included? #net-wireless/waveselect #dev-db/absinthe #net-analyzer/sara @@ -396,21 +399,21 @@ RDEPEND="${RDEPEND} #dev-db/sqlat pkg_setup() { - #pam_pwdb and pam_console are no longer supported - grep -v pam_console "${ROOT}"/etc/pam.d/entrance > "${T}"/entrance - local grepret=$? - [ ${grepret} -ge 2 ] && [ -f "${ROOT}"/etc/pam.d/entrance ] && die "Tried to grep the pam files and got an error." - [ ${grepret} == 0 ] && einfo "pam_console has been purged from /etc/pam.d/entrance. It's a good thing." - [ ${grepret} == 1 ] && einfo "pam_console was not found in /etc/pam.d/entrance. It's a good thing" - mv "${T}"/entrance "${ROOT}"/etc/pam.d/entrance - grep pam_console "${ROOT}/etc/pam.d/*" - local grepret=$? - [ ${grepret} == 0 ] && die "pam_console still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_console." - [ ${grepret} == 1 ] && einfo "pam_console no longer exists in /etc/pam.d. It's a good thing." - grep pam_pwdb "${ROOT}/etc/pam.d/*" - local grepret=$? - [ ${grepret} == 0 ] && die "pam_pwdb still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_pwdb." - [ ${grepret} == 1 ] && einfo "pam_pwdb no longer exists in /etc/pam.d. It's a good thing." + #pam_pwdb and pam_console are no longer supported + grep -v pam_console "${ROOT}"/etc/pam.d/entrance > "${T}"/entrance + local grepret=$? + [ ${grepret} -ge 2 ] && [ -f "${ROOT}"/etc/pam.d/entrance ] && die "Tried to grep the pam files and got an error." + [ ${grepret} == 0 ] && einfo "pam_console has been purged from /etc/pam.d/entrance. It's a good thing." + [ ${grepret} == 1 ] && einfo "pam_console was not found in /etc/pam.d/entrance. It's a good thing" + mv "${T}"/entrance "${ROOT}"/etc/pam.d/entrance + grep pam_console "${ROOT}/etc/pam.d/*" + local grepret=$? + [ ${grepret} == 0 ] && die "pam_console still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_console." + [ ${grepret} == 1 ] && einfo "pam_console no longer exists in /etc/pam.d. It's a good thing." + grep pam_pwdb "${ROOT}/etc/pam.d/*" + local grepret=$? + [ ${grepret} == 0 ] && die "pam_pwdb still exists in /etc/pam.d/ and is no longer supported. Please remove all instances of pam_pwdb." + [ ${grepret} == 1 ] && einfo "pam_pwdb no longer exists in /etc/pam.d. It's a good thing." }