diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-01-28 21:11:09 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-01-28 21:11:09 +0000 |
commit | 8330c60c9f3ca80af20c4d6ed9f31444080e6fbb (patch) | |
tree | 368c1e1d95ecac277e71bd4d8965a5ce875613a0 /mail-filter/qmail-scanner | |
parent | Version bump to 0.6.7 Bug #399239 (diff) | |
download | gentoo-2-8330c60c9f3ca80af20c4d6ed9f31444080e6fbb.tar.gz gentoo-2-8330c60c9f3ca80af20c4d6ed9f31444080e6fbb.tar.bz2 gentoo-2-8330c60c9f3ca80af20c4d6ed9f31444080e6fbb.zip |
Disable useless suid mount check #364123 by Heavenly Avenger.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'mail-filter/qmail-scanner')
5 files changed, 33 insertions, 8 deletions
diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog index ba87ffc05081..d06891cbf0b8 100644 --- a/mail-filter/qmail-scanner/ChangeLog +++ b/mail-filter/qmail-scanner/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-filter/qmail-scanner -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.58 2011/03/16 11:40:40 scarabeus Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.59 2012/01/28 21:11:09 vapier Exp $ + + 28 Jan 2012; Mike Frysinger <vapier@gentoo.org> qmail-scanner-2.05.ebuild, + qmail-scanner-2.06.ebuild, qmail-scanner-2.08.ebuild, + +files/qmail-scanner-2.08-disable-suid-check.patch: + Disable useless suid mount check #364123 by Heavenly Avenger. 16 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> qmail-scanner-1.25-r1.ebuild: diff --git a/mail-filter/qmail-scanner/files/qmail-scanner-2.08-disable-suid-check.patch b/mail-filter/qmail-scanner/files/qmail-scanner-2.08-disable-suid-check.patch new file mode 100644 index 000000000000..c323dbae4c86 --- /dev/null +++ b/mail-filter/qmail-scanner/files/qmail-scanner-2.08-disable-suid-check.patch @@ -0,0 +1,17 @@ +this is a useless check for package builders + +https://bugs.gentoo.org/364123 + +--- a/configure ++++ b/configure +@@ -440,9 +440,7 @@ fi + #QMAILQUEUE_BIN="${QMAILQUEUE_BIN:-$BINDIR/qmail-queue}" + + #Sanity check that suid is allowed on the Qmail "/bin" partition +-QMNT=`df $BINDIR|head -2|tail -1|awk '{print $1}'` +-SUIDSTATUS=`mount|egrep "^$QMNT "|grep nosuid` +-if [ "$SUIDSTATUS" != "" ]; then ++if false; then + cat<<EOF + + *** FATAL ERROR *** diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild index bf9924f69d24..be9cf73061d4 100644 --- a/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild +++ b/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild,v 1.7 2011/02/07 11:00:10 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild,v 1.8 2012/01/28 21:11:09 vapier Exp $ inherit fixheadtails toolchain-funcs eutils @@ -49,6 +49,7 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz + epatch "${FILESDIR}"/${PN}-2.08-disable-suid-check.patch #364123 ht_fix_file autoupdaters/* configure sed -i \ -e "s:/var/spool/qscand:/var/spool/qscan:g" \ diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild index b9f284d4539d..b8e1c3b55063 100644 --- a/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild +++ b/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild,v 1.3 2011/02/07 11:00:10 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.06.ebuild,v 1.4 2012/01/28 21:11:09 vapier Exp $ EAPI=2 inherit fixheadtails toolchain-funcs eutils @@ -48,6 +48,7 @@ pkg_preinst() { src_prepare() { epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz + epatch "${FILESDIR}"/${PN}-2.08-disable-suid-check.patch #364123 ht_fix_file autoupdaters/* configure sed -i \ -e "s:/var/spool/qscand:/var/spool/qscan:g" \ diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild index 3221555d2b8a..783c1ef87b04 100644 --- a/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild +++ b/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild,v 1.2 2011/02/07 11:00:10 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.08.ebuild,v 1.3 2012/01/28 21:11:09 vapier Exp $ EAPI=2 inherit fixheadtails toolchain-funcs eutils @@ -49,6 +49,7 @@ pkg_preinst() { src_prepare() { epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz + epatch "${FILESDIR}"/${PN}-2.08-disable-suid-check.patch #364123 ht_fix_file autoupdaters/* configure sed -i \ -e "s:/var/spool/qscand:/var/spool/qscan:g" \ |