Clean up ebuild and patch the vuln per bug #205732.

Package-Manager: portage-2.1.4

5 files changed, 92 insertions, 6 deletions

diff --git a/net-misc/vmpsd/ChangeLog b/net-misc/vmpsd/ChangeLog
index a614a2c8644b..0b7ac62ef00a 100644
--- a/net-misc/vmpsd/ChangeLog
+++ b/net-misc/vmpsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/vmpsd
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/ChangeLog,v 1.5 2007/03/31 22:07:23 robbat2 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/ChangeLog,v 1.6 2008/01/14 02:57:43 robbat2 Exp $
+
+*vmpsd-1.3-r4 (14 Jan 2008)
+
+  14 Jan 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/vmpsd-1.3-format-sec.patch, +vmpsd-1.3-r4.ebuild:
+  Clean up ebuild and patch the vuln per bug #205732.
 
   31 Mar 2007; Robin H. Johnson <robbat2@gentoo.org> vmpsd-1.3-r2.ebuild,
   vmpsd-1.3-r3.ebuild:
diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
index ab3db329eaaf..00b59b03221a 100644
--- a/net-misc/vmpsd/Manifest
+++ b/net-misc/vmpsd/Manifest
@@ -2,6 +2,10 @@ AUX vmpsd-1.3-64bit.patch 910 RMD160 208b4e2aa435541878bd6ad5d3d550372db97f68 SH
 MD5 cda8b88a0b6e5781c492ba72259bda79 files/vmpsd-1.3-64bit.patch 910
 RMD160 208b4e2aa435541878bd6ad5d3d550372db97f68 files/vmpsd-1.3-64bit.patch 910
 SHA256 e6d57def5aff4389c656ef0bb32b10a028a50ede711ea88d5c2edfe125a0533f files/vmpsd-1.3-64bit.patch 910
+AUX vmpsd-1.3-format-sec.patch 554 RMD160 d89da780e0c0de642fe2aac5ab1359598f79f2c9 SHA1 591a36dcb65cf10bac08ffffe8d2680ad3158a12 SHA256 a778332f696f62cd51a2cef57ac3fbe8e9f7fda48acac0fa1e7d18ecb33339e2
+MD5 d5f2539abb92bad014658beb56ce6edb files/vmpsd-1.3-format-sec.patch 554
+RMD160 d89da780e0c0de642fe2aac5ab1359598f79f2c9 files/vmpsd-1.3-format-sec.patch 554
+SHA256 a778332f696f62cd51a2cef57ac3fbe8e9f7fda48acac0fa1e7d18ecb33339e2 files/vmpsd-1.3-format-sec.patch 554
 AUX vmpsd-1.3-snmp-support.patch 2757 RMD160 47c53f465f282f733770e6c6193b676db43cee7b SHA1 93243e5308f0ccecc34e5ed38b834fcf596783be SHA256 fbf1ebcd6c60fd75b3c98e0576f8239efc52b00db2710fb44b7ca1bfa88a6200
 MD5 f521da2ac026b355d27d6f86894ed213 files/vmpsd-1.3-snmp-support.patch 2757
 RMD160 47c53f465f282f733770e6c6193b676db43cee7b files/vmpsd-1.3-snmp-support.patch 2757
@@ -19,14 +23,18 @@ EBUILD vmpsd-1.3-r3.ebuild 1013 RMD160 133702df8b922eeb5b93b7c8fddf8d6c03d8643f
 MD5 d19f7ce764375b176e560ef5111219db vmpsd-1.3-r3.ebuild 1013
 RMD160 133702df8b922eeb5b93b7c8fddf8d6c03d8643f vmpsd-1.3-r3.ebuild 1013
 SHA256 88ef2032b9e48b7d2f7a8d750593c66a3ad0bd79856f47c6462fb641cac51f0e vmpsd-1.3-r3.ebuild 1013
+EBUILD vmpsd-1.3-r4.ebuild 1085 RMD160 cf5e38c17ced58188d1e85fec9392656e836f37b SHA1 e84e9e7d0c225a2e853e5037c158406366d5bb97 SHA256 dedadcbe0b49df02fa4004ade0d17b1672c5be4b2232acd8fd00bcc54e55b4f0
+MD5 b9feca7c02e10889e2d2fed382bfbc5e vmpsd-1.3-r4.ebuild 1085
+RMD160 cf5e38c17ced58188d1e85fec9392656e836f37b vmpsd-1.3-r4.ebuild 1085
+SHA256 dedadcbe0b49df02fa4004ade0d17b1672c5be4b2232acd8fd00bcc54e55b4f0 vmpsd-1.3-r4.ebuild 1085
 EBUILD vmpsd-1.3.ebuild 926 RMD160 6f406244064a4d5c14becf279438fd82c89d633b SHA1 5b5a993532463956d9701436a833263ad15fd42b SHA256 c9fdc2389e8b58edf1e5b4bb12d2764756e89ee74e8a971a8a4ce2d890622fea
 MD5 43acb0e78c9e240e5e2bffdc3dc4ad3b vmpsd-1.3.ebuild 926
 RMD160 6f406244064a4d5c14becf279438fd82c89d633b vmpsd-1.3.ebuild 926
 SHA256 c9fdc2389e8b58edf1e5b4bb12d2764756e89ee74e8a971a8a4ce2d890622fea vmpsd-1.3.ebuild 926
-MISC ChangeLog 1199 RMD160 98250ad6877884bd78508fc7c31edc3076038754 SHA1 f4ba3b9fbb280e6d4491702c5a3a6c8a79fa165d SHA256 36ca76576e5fd16d58f20260a5e9f334d6e50d5b321396acb109fa178ff2d0c0
-MD5 f2305776b2f8356fbc4aaa58c5eceeaa ChangeLog 1199
-RMD160 98250ad6877884bd78508fc7c31edc3076038754 ChangeLog 1199
-SHA256 36ca76576e5fd16d58f20260a5e9f334d6e50d5b321396acb109fa178ff2d0c0 ChangeLog 1199
+MISC ChangeLog 1395 RMD160 c72cf735f782760ef4e8266d0fc291e80cd49b00 SHA1 a88d8cfb598591fb7b1a9efb7a9a7a52924464a4 SHA256 b8eb194efd8f8965cea7576f344b2e0281c091fcc4cb68f576b83f5facb165f3
+MD5 9c1f9b7833ce87a25b2e13cef14b9e47 ChangeLog 1395
+RMD160 c72cf735f782760ef4e8266d0fc291e80cd49b00 ChangeLog 1395
+SHA256 b8eb194efd8f8965cea7576f344b2e0281c091fcc4cb68f576b83f5facb165f3 ChangeLog 1395
 MISC metadata.xml 225 RMD160 c09f9d0847a74b63fa447b4f33720f22f73595f6 SHA1 78f3994ac404ca6cee7bccc029cea214c72f7e39 SHA256 426743569a0f3c42eee0aecbe64a683e26802253fef77b403e9b1b04c01ffca2
 MD5 5c9d9683447326ea1f1a6fe9aa699120 metadata.xml 225
 RMD160 c09f9d0847a74b63fa447b4f33720f22f73595f6 metadata.xml 225
@@ -43,3 +51,6 @@ SHA256 302b7fa717c51641bb95afe9e7971ae53ef17ef48b1c3d8568d06ee12cf284b7 files/di
 MD5 9a49f8a708039fbbfb4862bdd5ae83ab files/digest-vmpsd-1.3-r3 226
 RMD160 6f2bc4719a58e9210fdfabeaa6c83a196fdae57e files/digest-vmpsd-1.3-r3 226
 SHA256 302b7fa717c51641bb95afe9e7971ae53ef17ef48b1c3d8568d06ee12cf284b7 files/digest-vmpsd-1.3-r3 226
+MD5 9a49f8a708039fbbfb4862bdd5ae83ab files/digest-vmpsd-1.3-r4 226
+RMD160 6f2bc4719a58e9210fdfabeaa6c83a196fdae57e files/digest-vmpsd-1.3-r4 226
+SHA256 302b7fa717c51641bb95afe9e7971ae53ef17ef48b1c3d8568d06ee12cf284b7 files/digest-vmpsd-1.3-r4 226
diff --git a/net-misc/vmpsd/files/digest-vmpsd-1.3-r4 b/net-misc/vmpsd/files/digest-vmpsd-1.3-r4
new file mode 100644
index 000000000000..577a1ce45315
--- /dev/null
+++ b/net-misc/vmpsd/files/digest-vmpsd-1.3-r4
@@ -0,0 +1,3 @@
+MD5 07ad86343ad715c94b9de4c54c62d3db vmpsd-1.3.tar.gz 95202
+RMD160 1185fbd654d5d0e939fdfa08149d1ebcb3fc0ef2 vmpsd-1.3.tar.gz 95202
+SHA256 6f6bd6c5d1e9fc862c27cf783bcbabef21619aa5fe7984231eb55e32e11ca142 vmpsd-1.3.tar.gz 95202
diff --git a/net-misc/vmpsd/files/vmpsd-1.3-format-sec.patch b/net-misc/vmpsd/files/vmpsd-1.3-format-sec.patch
new file mode 100644
index 000000000000..21fcd338093c
--- /dev/null
+++ b/net-misc/vmpsd/files/vmpsd-1.3-format-sec.patch
@@ -0,0 +1,23 @@
+Patch taken from http://www.freenac.net/downloads/openvmps.patch
+as mentioned at http://www.freenac.net/phpBB2/viewtopic.php?t=76
+for http://www.securityfocus.com/bid/15072/info
+--- log.c	2006-09-08 16:33:01.000000000 +0200
++++ /root/log.c	2006-10-22 16:32:11.000000000 +0200
+@@ -27,14 +27,14 @@
+ 			log_opened = 1;
+ 		}
+ 		vsnprintf(str, 256, fmt, ap);
+-		syslog(LOG_INFO, str);
++		syslog(LOG_INFO, "%s", str);
+ 
+ 		if ( debug ) { 
+-			fprintf(stderr,str);
+-			fprintf(stderr,"\n");
++			fprintf(stderr,"%s\n", str);
+ 		}
+ 			 
+ 		va_end(ap);
+ 
+ 	}
+ }
++
diff --git a/net-misc/vmpsd/vmpsd-1.3-r4.ebuild b/net-misc/vmpsd/vmpsd-1.3-r4.ebuild
new file mode 100644
index 000000000000..ad8986396f2d
--- /dev/null
+++ b/net-misc/vmpsd/vmpsd-1.3-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/vmpsd-1.3-r4.ebuild,v 1.1 2008/01/14 02:57:43 robbat2 Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An open-source VLAN management system"
+HOMEPAGE="http://vmps.sourceforge.net"
+SRC_URI="mirror://sourceforge/vmps/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+DEPEND="virtual/libc
+		net-analyzer/net-snmp
+		dev-libs/openssl"
+S="${WORKDIR}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-snmp-support.patch
+	epatch "${FILESDIR}"/${P}-64bit.patch
+	EPATCH_OPTS="-d${S}" \
+	epatch "${FILESDIR}"/${P}-format-sec.patch
+}
+
+src_compile() {
+	append-ldflags -lssl
+	econf \
+		--sysconfdir=/etc/vmpsd \
+		--enable-snmp \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd "${S}"
+	emake DESTDIR="${D}" install || die
+	dodoc README INSTALL AUTHORS doc/*txt
+	newdoc external/README README.external
+	newdoc tools/README README.tools
+	dodoc external/simple tools/vqpcli.pl
+}