Bug #148575, add working SNMP support. Also fix a bug that broke this package on ppc.

(Portage version: 2.1.2_pre2)

3 files changed, 77 insertions, 0 deletions

diff --git a/net-misc/vmpsd/files/digest-vmpsd-1.3 b/net-misc/vmpsd/files/digest-vmpsd-1.3
index 4b7e9060c3bd..577a1ce45315 100644
--- a/net-misc/vmpsd/files/digest-vmpsd-1.3
+++ b/net-misc/vmpsd/files/digest-vmpsd-1.3
@@ -1 +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/digest-vmpsd-1.3-r1 b/net-misc/vmpsd/files/digest-vmpsd-1.3-r1
new file mode 100644
index 000000000000..577a1ce45315
--- /dev/null
+++ b/net-misc/vmpsd/files/digest-vmpsd-1.3-r1
@@ -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-snmp-support.patch b/net-misc/vmpsd/files/vmpsd-1.3-snmp-support.patch
new file mode 100644
index 000000000000..612bee519174
--- /dev/null
+++ b/net-misc/vmpsd/files/vmpsd-1.3-snmp-support.patch
@@ -0,0 +1,72 @@
+Fix SNMP support and also make application work on platforms where char is
+unsigned by design, which would otherwise break getopt.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Date: 30 Sept 2006
+Bugzilla-URL: http://bugs.gentoo.org/show_bug.cgi?id=148575
+
+diff -Nuar --exclude '*~' vmpsd.orig/Makefile.in vmpsd/Makefile.in
+--- vmpsd.orig/Makefile.in	2004-10-30 17:54:44.000000000 -0700
++++ vmpsd/Makefile.in	2006-09-30 10:08:24.000000000 -0700
+@@ -58,7 +58,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.
+@@ -70,7 +70,8 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/vmpsd-log.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/vmpsd-parser.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/vmpsd-vmpsd.Po \
+-@AMDEP_TRUE@	./$(DEPDIR)/vmpsd-vqp.Po
++@AMDEP_TRUE@	./$(DEPDIR)/vmpsd-vqp.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/snmp.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+@@ -251,7 +252,7 @@
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ vmpsd$(EXEEXT): $(vmpsd_OBJECTS) $(vmpsd_DEPENDENCIES) 
+ 	@rm -f vmpsd$(EXEEXT)
+-	$(LINK) $(vmpsd_LDFLAGS) $(vmpsd_OBJECTS) $(vmpsd_LDADD) $(LIBS)
++	$(LINK) $(vmpsd_LDFLAGS) $(vmpsd_OBJECTS) $(vmpsd_LDADD) $(LIBS) $(SNMP_LIB)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+diff -Nuar --exclude '*~' vmpsd.orig/snmp.c vmpsd/snmp.c
+--- vmpsd.orig/snmp.c	2004-07-08 02:34:29.000000000 -0700
++++ vmpsd/snmp.c	2006-09-30 10:02:06.000000000 -0700
+@@ -7,7 +7,8 @@
+ #include <sys/types.h>
+ #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 --exclude '*~' vmpsd.orig/vmpsd.c vmpsd/vmpsd.c
+--- vmpsd.orig/vmpsd.c	2004-10-30 18:00:15.000000000 -0700
++++ vmpsd/vmpsd.c	2006-09-30 10:19:48.000000000 -0700
+@@ -17,7 +17,7 @@
+ 
+ int parse_options(int argc, char **argv)
+ {
+-	char	opt;
++	signed char	opt;
+ 	char	*options = "a:de:f:l:p:";
+ 
+ 	opterr = 0;
+@@ -74,7 +74,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");