fixing format string vulnerability in email report code, #52945 (onliner patch, obviously correct, so marking stable)

5 files changed, 142 insertions, 12 deletions

diff --git a/app-admin/tripwire/ChangeLog b/app-admin/tripwire/ChangeLog
index 7e4a8ad307db..dddcfc0d4ff5 100644
--- a/app-admin/tripwire/ChangeLog
+++ b/app-admin/tripwire/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/tripwire
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.8 2004/03/27 20:12:16 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/ChangeLog,v 1.9 2004/06/04 19:39:59 taviso Exp $
+
+*tripwire-2.3.1.2-r1 (04 Jun 2004)
+
+  04 Jun 2004; Tavis Ormandy <taviso@gentoo.org> tripwire-2.3.1.2-r1.ebuild,
+  files/tripwire-format-string-email-report.diff:
+  format string error in the email report code,
+  http://www.securityfocus.com/archive/1/365036/2004-05-31/2004-06-06/0 fixing
+  #52945
 
   27 Mar 2004; Tavis Ormandy <taviso@gentoo.org> tripwire-2.3.1.2.ebuild:
   use strip-flags
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index bbc55912ca96..ef876b1ce05f 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -1,16 +1,19 @@
-MD5 9493ba83857bc6cfcd276f74becaa98e files/digest-tripwire-2.3.1.2 142
-MD5 0700fa22e2353e11c842f48453703d96 files/tripwire-2.3.0-50-rfc822.patch.bz2 347
+MD5 df60146b83a1b206279ebea4748dbf29 tripwire-2.3.1.2-r1.ebuild 2837
+MD5 37077c38cd07642f1f8c298452244046 tripwire-2.3.1.2.ebuild 2712
+MD5 0b0d986828a8f49ba13c469f735f1982 ChangeLog 1494
+MD5 96f9cca8215d6e0286f08431592d3677 metadata.xml 597
 MD5 fa08ee8d578671e3f18b1ce684e0fa31 files/tripwire-2.3.1-2-fhs.patch.bz2 327
-MD5 504ee0af20b026a651c89030f87c6e10 files/tripwire-2.3.1-2-gcc-3.3.patch.bz2 197
-MD5 30e2f2f5df395d3dd1dc02fb40d9810c files/tripwire-2.3.1-gcc3.patch.bz2 2878
-MD5 6e77715bf58f0e8122d2a2ec2344edab files/tripwire-jbj.patch.bz2 791
 MD5 7b5cac2555db706d0bdc2c49d7f6b9e9 files/tripwire-mkstemp.patch.bz2 564
+MD5 4a83584d44a4974cd6d48d695dfd1d67 files/twcfg.txt 604
+MD5 1c477e41e000e6579665e97f75a9cefb files/twpol.txt 51817
+MD5 9493ba83857bc6cfcd276f74becaa98e files/digest-tripwire-2.3.1.2-r1 142
+MD5 0700fa22e2353e11c842f48453703d96 files/tripwire-2.3.0-50-rfc822.patch.bz2 347
+MD5 87628f7bb2693d2ee923ad3bc1877533 files/tripwire-format-string-email-report.diff 472
+MD5 c0cf6e656870aa10c4ba2e4730080131 files/twinstall.sh 10100
+MD5 30e2f2f5df395d3dd1dc02fb40d9810c files/tripwire-2.3.1-gcc3.patch.bz2 2878
+MD5 504ee0af20b026a651c89030f87c6e10 files/tripwire-2.3.1-2-gcc-3.3.patch.bz2 197
 MD5 033e88454d3adcf1cfc83270b4dc452e files/tripwire.cron 315
+MD5 6e77715bf58f0e8122d2a2ec2344edab files/tripwire-jbj.patch.bz2 791
+MD5 9493ba83857bc6cfcd276f74becaa98e files/digest-tripwire-2.3.1.2 142
 MD5 e68a00cf5ccdd906adec70a54fdfb66b files/tripwire.gif 4679
 MD5 9bbdaa3abc2c11b40d15b5d19d2c56f0 files/tripwire.txt 8401
-MD5 4a83584d44a4974cd6d48d695dfd1d67 files/twcfg.txt 604
-MD5 c0cf6e656870aa10c4ba2e4730080131 files/twinstall.sh 10100
-MD5 1c477e41e000e6579665e97f75a9cefb files/twpol.txt 51817
-MD5 0b0d986828a8f49ba13c469f735f1982 ChangeLog 1494
-MD5 96f9cca8215d6e0286f08431592d3677 metadata.xml 597
-MD5 37077c38cd07642f1f8c298452244046 tripwire-2.3.1.2.ebuild 2712
diff --git a/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r1 b/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r1
new file mode 100644
index 000000000000..7bf1e05bec86
--- /dev/null
+++ b/app-admin/tripwire/files/digest-tripwire-2.3.1.2-r1
@@ -0,0 +1,2 @@
+MD5 6a15fe110565cef9ed33c1c7e070355e tripwire-2.3.1-2.tar.gz 1514955
+MD5 46659bfa3a1201757e070c51207de884 tripwire_2.3.1.2-6.1.diff.gz 608867
diff --git a/app-admin/tripwire/files/tripwire-format-string-email-report.diff b/app-admin/tripwire/files/tripwire-format-string-email-report.diff
new file mode 100644
index 000000000000..7e4f2676d4ef
--- /dev/null
+++ b/app-admin/tripwire/files/tripwire-format-string-email-report.diff
@@ -0,0 +1,13 @@
+diff -u -r1.1 -r1.2
+--- src/tripwire/pipedmailmessage.cpp   21 Jan 2001 00:46:48 -0000      1.1
++++ src/tripwire/pipedmailmessage.cpp   26 May 2004 20:59:15 -0000      1.2
+@@ -180,7 +180,7 @@
+
+ void cPipedMailMessage::SendString( const TSTRING& s )
+ {
+-    if( _ftprintf( mpFile, s.c_str() ) < 0 )
++    if( _ftprintf( mpFile, "%s", s.c_str() ) < 0 )
+     {
+         TOSTRINGSTREAM estr;
+         estr << TSS_GetString( cTripwire, tripwire::STR_ERR2_MAIL_MESSAGE_COMMAND
+)
diff --git a/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
new file mode 100644
index 000000000000..da9e6867210c
--- /dev/null
+++ b/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tripwire/tripwire-2.3.1.2-r1.ebuild,v 1.1 2004/06/04 19:39:59 taviso Exp $
+
+inherit eutils flag-o-matic
+
+TW_VER="2.3.1-2"
+DESCRIPTION="Open Source File Integrity Checker and IDS"
+HOMEPAGE="http://www.tripwire.org/"
+SRC_URI="mirror://sourceforge/tripwire/tripwire-${TW_VER}.tar.gz
+	http://non-us.debian.org/debian-non-US/pool/non-US/main/t/tripwire/tripwire_2.3.1.2-6.1.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 -alpha"
+IUSE=""
+
+DEPEND="virtual/glibc
+	dev-util/patchutils
+	sys-devel/automake
+	dev-libs/openssl"
+RDEPEND="virtual/glibc
+	virtual/cron
+	virtual/mta
+	dev-libs/openssl"
+
+S=${WORKDIR}/tripwire-${TW_VER}
+
+src_unpack() {
+	# unpack tripwire source tarball
+	unpack tripwire-${TW_VER}.tar.gz; cd ${S}
+
+	# some patches ive collected/made for tripwire
+	# mostly from mandrake, some from other sources
+	epatch ${FILESDIR}/tripwire-2.3.0-50-rfc822.patch.bz2
+	epatch ${FILESDIR}/tripwire-2.3.1-2-fhs.patch.bz2
+	epatch ${FILESDIR}/tripwire-2.3.1-2-gcc-3.3.patch.bz2
+	epatch ${FILESDIR}/tripwire-2.3.1-gcc3.patch.bz2
+	epatch ${FILESDIR}/tripwire-jbj.patch.bz2
+	epatch ${FILESDIR}/tripwire-mkstemp.patch.bz2
+
+	# pull out the interesting debian patches
+	filterdiff  -i '*/man/man8/twadmin.8' -z  --strip=1	\
+		${DISTDIR}/tripwire_2.3.1.2-6.1.diff.gz > ${T}/debian-patch.diff
+	epatch ${T}/debian-patch.diff
+
+	# cleanup ready for build
+	rm -rf ${S}/src/STLport*
+	touch ${S}/src/STLport_r ${S}/src/STLport_d
+
+	# security fix, http://www.securityfocus.com/archive/1/365036
+	epatch ${FILESDIR}/tripwire-format-string-email-report.diff
+}
+
+src_compile() {
+	cd ${S}/src
+
+	# tripwire can be sensitive to compiler optimisation.
+	# see #32613, #45823, and others.
+	# 	-taviso@gentoo.org
+	strip-flags
+
+	emake release RPM_OPT_FLAGS="${CXXFLAGS}"
+}
+
+src_install() {
+	dosbin ${S}/bin/*/siggen
+	dosbin ${S}/bin/*/tripwire
+	dosbin ${S}/bin/*/twadmin
+	dosbin ${S}/bin/*/twprint
+
+	for i in {4,5,8}
+	do
+		cd ${S}/man/man${i}
+		doman *.$i
+		cd ${S}
+	done
+
+	dodir /etc/tripwire
+	dodir /var/lib/tripwire/report
+
+	exeinto /etc/cron.daily
+	doexe ${FILESDIR}/tripwire.cron
+
+	dodoc README Release_Notes ChangeLog policy/policyguide.txt TRADEMARK \
+		${FILESDIR}/tripwire.gif ${FILESDIR}/tripwire.txt
+
+	insinto /etc/tripwire
+	doins ${FILESDIR}/twcfg.txt ${FILESDIR}/twpol.txt
+
+	exeinto /etc/tripwire
+	doexe ${FILESDIR}/twinstall.sh
+
+	fperms 755 /etc/tripwire/twinstall.sh /etc/cron.daily/tripwire.cron
+}
+
+pkg_postinst() {
+	einfo "After installing this package, you should run \"/etc/tripwire/twinstall.sh\""
+	einfo "to generate cryptographic keys, and \"tripwire --init\" to initialize the"
+	einfo "database Tripwire uses."
+	einfo
+	einfo "A quickstart guide is included with the documentation."
+	einfo
+}