Version bump.

Package-Manager: portage-2.2.0_alpha87/cvs/Linux x86_64

3 files changed, 101 insertions, 12 deletions

diff --git a/net-misc/vmpsd/Manifest b/net-misc/vmpsd/Manifest
index 66cf5951eaed..2128773e1c5d 100644
--- a/net-misc/vmpsd/Manifest
+++ b/net-misc/vmpsd/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX vmpsd-1.3-64bit.patch 910 RMD160 208b4e2aa435541878bd6ad5d3d550372db97f68 SHA1 dc7f0f72fbf448222404c2ccdec91b54270a3c41 SHA256 e6d57def5aff4389c656ef0bb32b10a028a50ede711ea88d5c2edfe125a0533f
 AUX vmpsd-1.3-format-sec.patch 552 RMD160 e5b531a97479e9a470c4a706aab975e6fcc8e166 SHA1 0e09d883576f66e58d383dda94c8b0c223ff839e SHA256 5b5610b937cdf1e736943d61ba226a92b99e08f7cc69c8c1a11beeebf1200ed4
 AUX vmpsd-1.3-snmp-support.patch 2757 RMD160 47c53f465f282f733770e6c6193b676db43cee7b SHA1 93243e5308f0ccecc34e5ed38b834fcf596783be SHA256 fbf1ebcd6c60fd75b3c98e0576f8239efc52b00db2710fb44b7ca1bfa88a6200
+AUX vmpsd-1.4-snmp-support.patch 2237 RMD160 44c231634b639f9bb6d358c4f15d4d1ff27091ac SHA1 cea30b40e298261da6cd9e5ac90b6d1a9e14875b SHA256 793afee5e7d6c43dc15bb33c7d9afe2b8c1aabf2f936f8f0c2878d74577e86c8
 DIST vmpsd-1.3.tar.gz 95202 RMD160 1185fbd654d5d0e939fdfa08149d1ebcb3fc0ef2 SHA1 39a8f925191690f209d9f1609321f20360810cf1 SHA256 6f6bd6c5d1e9fc862c27cf783bcbabef21619aa5fe7984231eb55e32e11ca142
+DIST vmpsd-1.4.tar.gz 92138 RMD160 42d0cb0f34f396d95e347193924e54dd2083abca SHA1 5a53c56ba853ddc864d03594c7cd41da7cf3d036 SHA256 f9f0bc2f7b5d81189794179b4706015ec01ce5a2f2c87d2d086538754559da7e
 EBUILD vmpsd-1.3-r4.ebuild 1053 RMD160 f10de31a0fbd7a05a0510c37ba50f22f1c6126ef SHA1 342570a859f14e024ef1e5c8364ee8764f327ecc SHA256 c45e9e31e6e2c4700cfff136f4c80a87df9af9b94dfac9a12ef10e78f57c995f
+EBUILD vmpsd-1.4.ebuild 1076 RMD160 1bd8c8da4debfa1458a125dbc56a8bf17907a3d8 SHA1 7e006c21b9df7135afaf3c176a38133c6ede6042 SHA256 dec224b08fa9e5043ad54527ce37e27177d39289757920706d8e00c36f3a3416
 MISC ChangeLog 2014 RMD160 e1d4d7577f9c83a660d68100d7d85ea6498d9848 SHA1 47ea379ffa25e979a5b2fbf016d799a2d8dcdd9c SHA256 02d1aa0e4fd81b4409c3b63b919a6c63790be334a7428a0d35de12b65849367d
 MISC metadata.xml 204 RMD160 e9476d17520b493034db799e50e782ecbfe93b5e SHA1 d43da5c5138e5a686221beb16cb78d9c22cf0137 SHA256 b28c87a01f0b869865644e5a7d958e19aedb2e9b9c48d9313de11e1720b15ecf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59rRUACgkQfXuS5UK5QB3KvwP/Syevu7vED4tVA3rx390mVpNP
-Ow3PC4me+DG6znXA3OcNLjroQlMVcTJz2qqCqhKpUILmLJiTS2o4ZspJhpTrWwjH
-eZuDYwXCz5qorOUN2WDv0TrCZkDMBrZcLPuv+uqI3vNLIdKrRkZidNtk5pSbnizZ
-Jk7ZVPwmtH2wP0O1IHM=
-=Ex0g
------END PGP SIGNATURE-----
diff --git a/net-misc/vmpsd/files/vmpsd-1.4-snmp-support.patch b/net-misc/vmpsd/files/vmpsd-1.4-snmp-support.patch
new file mode 100644
index 000000000000..66890af3a731
--- /dev/null
+++ b/net-misc/vmpsd/files/vmpsd-1.4-snmp-support.patch
@@ -0,0 +1,56 @@
+diff -Nuar vmpsd.orig/Makefile.am vmpsd/Makefile.am
+--- vmpsd.orig/Makefile.am	2004-10-31 00:59:51.000000000 +0000
++++ vmpsd/Makefile.am	2012-02-21 09:11:30.120856909 +0000
+@@ -1,5 +1,6 @@
+ bin_PROGRAMS = vmpsd
+-vmpsd_SOURCES = vmpsd.c daemon.c data.c log.c parser.c vqp.c data.h log.h vqp.h external.c external.h
++vmpsd_SOURCES = vmpsd.c daemon.c data.c log.c parser.c vqp.c snmp.c data.h log.h vqp.h external.c external.h
+ vmpsd_CFLAGS = -DSYSCONFDIR="\"${sysconfdir}\""
++vmpsd_LDADD = $(SNMP_LIB)
+ man_MANS = vmpsd.1
+ sysconf_DATA = vlan.db
+diff -Nuar vmpsd.orig/Makefile.in vmpsd/Makefile.in
+--- vmpsd.orig/Makefile.in	2006-05-15 13:33:57.000000000 +0000
++++ vmpsd/Makefile.in	2012-02-21 09:08:54.807227002 +0000
+@@ -59,7 +59,7 @@
+ am_vmpsd_OBJECTS = vmpsd-vmpsd.$(OBJEXT) vmpsd-daemon.$(OBJEXT) \
+ 	vmpsd-data.$(OBJEXT) vmpsd-log.$(OBJEXT) \
+ 	vmpsd-parser.$(OBJEXT) vmpsd-vqp.$(OBJEXT) \
+-	vmpsd-external.$(OBJEXT)
++	vmpsd-external.$(OBJEXT) $(SNMP_OBJECTS)
+ vmpsd_OBJECTS = $(am_vmpsd_OBJECTS)
+ vmpsd_LDADD = $(LDADD)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+diff -Nuar vmpsd.orig/snmp.c vmpsd/snmp.c
+--- vmpsd.orig/snmp.c	2004-07-08 09:34:29.000000000 +0000
++++ vmpsd/snmp.c	2012-02-21 09:11:51.817566865 +0000
+@@ -8,6 +8,8 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
++#define UCD_COMPATIBLE 1
++#include <net-snmp/net-snmp-config.h>
+ #include <ucd-snmp/ucd-snmp-includes.h>
+  
+ #include "log.h"
+diff -Nuar vmpsd.orig/vmpsd.c vmpsd/vmpsd.c
+--- vmpsd.orig/vmpsd.c	2006-05-15 13:33:57.000000000 +0000
++++ vmpsd/vmpsd.c	2012-02-21 09:12:28.987640940 +0000
+@@ -18,7 +18,7 @@
+ 
+ int parse_options(int argc, char **argv)
+ {
+-	char	opt;
++	signed char	opt;
+ 	char	*options = "a:cde:f:l:p:";
+ 
+ 	opterr = 0;
+@@ -80,7 +80,7 @@
+ 	printf("\t-d         do not detach, log to stderr also\n");
+ 	printf("\t-e path    use external program for mac to vlan assignment\n");
+ 	printf("\t           when/if used with -f, -f is disregarded\n");
+-	printf("\t-f file    read VMPS database from file (/etc/vmps.db)\n");
++	printf("\t-f file    read VMPS database from file ("SYSCONFDIR"/vmps.db)\n");
+ 	printf("\t-l level   set logging level:\n");
+ 	printf("\t                 0x0100 - fatal,\n");
+ 	printf("\t                 0x0200 - info,\n");
diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild
new file mode 100644
index 000000000000..b219b590078a
--- /dev/null
+++ b/net-misc/vmpsd/vmpsd-1.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vmpsd/vmpsd-1.4.ebuild,v 1.1 2012/02/21 09:18:00 robbat2 Exp $
+
+EAPI=4
+inherit eutils flag-o-matic autotools
+
+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="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND="net-analyzer/net-snmp
+	dev-libs/openssl"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4-snmp-support.patch
+	epatch "${FILESDIR}"/${PN}-1.3-64bit.patch
+	# Merged upstream
+	#EPATCH_OPTS="-d${S}" \
+	#epatch "${FILESDIR}"/${PN}-1.3-format-sec.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--sysconfdir=/etc/vmpsd \
+		--enable-snmp \
+		LIBS="-lssl" \
+		|| die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install || die
+	dodoc README INSTALL AUTHORS doc/*txt
+	newdoc external/README README.external
+	newdoc tools/README README.tools
+	dodoc external/simple tools/vqpcli.pl
+}