diff options
19 files changed, 0 insertions, 1210 deletions
diff --git a/net-analyzer/snips/Manifest b/net-analyzer/snips/Manifest deleted file mode 100644 index 21b2c5c15174..000000000000 --- a/net-analyzer/snips/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST snips-1.2.tar.gz 1382731 SHA256 2ca44a51251b569e9429ae404caccb3721a9697532e95c9ff0e6db9ef8e3cd28 SHA512 24c53e1af390062ff6f4406e1cb47b2d13812f2723420df79921dfbb620aac626de628d755b05b615b188df1ef8203776e6a64f326901408235c62205ee16f8a WHIRLPOOL 64264505ff8b1d93c79ecf92b6d6aa133a92e4904a672e46e3d68a9c7749d2193aaa4341878309e7b1856a05579cd643a3ff2b60049518c26eb7100325317098 diff --git a/net-analyzer/snips/files/snips-1.2-code-ordering.patch b/net-analyzer/snips/files/snips-1.2-code-ordering.patch deleted file mode 100644 index 13b31dc3c0f7..000000000000 --- a/net-analyzer/snips/files/snips-1.2-code-ordering.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -uNr snips-1.2.ORIG/ntpmon/main.c snips-1.2/ntpmon/main.c ---- snips-1.2.ORIG/ntpmon/main.c 2008-06-27 13:08:34.000000000 +0100 -+++ snips-1.2/ntpmon/main.c 2008-06-27 13:08:57.000000000 +0100 -@@ -42,10 +42,6 @@ - #include "event_utils.h" - #undef _MAIN_ - --/* function prototypes */ --void set_functions(); --void free_device_list(struct device_info **pslist); -- - /* We keep a linked list of all the devices that we poll and store the - * various thresholds in this linked list. - */ -@@ -55,6 +51,10 @@ - struct device_info *next; - } *device_info_list = NULL; - -+/* function prototypes */ -+void set_functions(); -+void free_device_list(struct device_info **pslist); -+ - int main(ac, av) - int ac; - char **av; diff --git a/net-analyzer/snips/files/snips-1.2-conflicting-types.patch b/net-analyzer/snips/files/snips-1.2-conflicting-types.patch deleted file mode 100644 index 500faba89a60..000000000000 --- a/net-analyzer/snips/files/snips-1.2-conflicting-types.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -ur snips-1.2.ORIG/pingmon/main.c snips-1.2/pingmon/main.c ---- snips-1.2.ORIG/pingmon/main.c 2008-06-26 17:45:49.000000000 +0100 -+++ snips-1.2/pingmon/main.c 2008-06-26 17:50:25.000000000 +0100 -@@ -517,7 +517,8 @@ - */ - void set_functions() - { -- int help(), readconfig(), poll_devices(); -+ int readconfig(), poll_devices(); -+ void help(); - - set_help_function(help); - set_readconfig_function(readconfig); -diff -ur snips-1.2.ORIG/portmon/main.c snips-1.2/portmon/main.c ---- snips-1.2.ORIG/portmon/main.c 2008-06-26 17:45:49.000000000 +0100 -+++ snips-1.2/portmon/main.c 2008-06-26 17:50:39.000000000 +0100 -@@ -476,7 +476,8 @@ - */ - void set_functions() - { -- int help(), readconfig(), poll_devices(); -+ int readconfig(), poll_devices(); -+ void help(); - - set_help_function(help); - set_readconfig_function(readconfig); -diff -ur snips-1.2.ORIG/radiusmon/main.c snips-1.2/radiusmon/main.c ---- snips-1.2.ORIG/radiusmon/main.c 2008-06-26 17:45:49.000000000 +0100 -+++ snips-1.2/radiusmon/main.c 2008-06-26 17:51:05.000000000 +0100 -@@ -261,7 +261,8 @@ - - void set_functions() - { -- int help(), readconfig(); -+ int readconfig(); -+ void help(); - u_long dotest(); - - set_help_function(help); -diff -uNr snips-1.2.ORIG/ntpmon/main.c snips-1.2/ntpmon/main.c ---- snips-1.2.ORIG/ntpmon/main.c 2008-06-27 13:12:11.000000000 +0100 -+++ snips-1.2/ntpmon/main.c 2008-06-27 13:12:29.000000000 +0100 -@@ -291,7 +291,8 @@ - */ - void set_functions() - { -- int help(), readconfig(), poll_devices(); -+ int readconfig(), poll_devices(); -+ void help(); - - set_help_function(help); - set_readconfig_function(readconfig); diff --git a/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch b/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch deleted file mode 100644 index c842f27c52b2..000000000000 --- a/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch +++ /dev/null @@ -1,402 +0,0 @@ -diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid ---- snips-1.2.ORIG/etherload/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/etherload/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -25,10 +25,10 @@ - make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG) - - install: $(TARG) -- $(INSTALL) -c -m 4750 $(TARG) $(BINDIR) -+ $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR) - @if [ `whoami` = "root" ]; then \ -- chown root $(BINDIR)/$(TARG) ;\ -- ls -lg $(BINDIR)/$(TARG) ;\ -+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ -+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ - else \ - echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ - echo "Do as root manually" ;\ -diff -uNr snips-1.2.ORIG/Makefile.mid snips-1.2/Makefile.mid ---- snips-1.2.ORIG/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -66,8 +66,8 @@ - - ## Ultrix make balked at the tests for directories, hence the second test - install: installdir lib -- @[ -d $(ROOTDIR) ] && [ -d $(DATADIR) ] && [ -d $(ETCDIR) ] \ -- && [ -d $(BINDIR) ] -+ @[ -d $(DESTDIR)$(ROOTDIR) ] && [ -d $(DESTDIR)$(DATADIR) ] && \ -+ [ -d $(DESTDIR)$(ETCDIR) ] && [ -d $(DESTDIR)$(BINDIR) ] - @-(touch SniPpet ; $(INSTALL) -c -m 750 SniPpet /tmp/;) >/dev/null 2>&1 ; - @(if [ -f /tmp/SniPpet ]; then rm -f SniPpet /tmp/SniPpet; else \ - echo "YOU HAVE AN INCOMPATIBLE install, use 'myinstall' instead" ;\ -@@ -82,10 +82,10 @@ - @echo "" - @echo "Installing sample config files under $(EXAMPLESDIR)/..." - @-for i in */*-confg */*.conf *.conf ; do \ -- $(INSTALL) -m 444 -c $$i $(EXAMPLESDIR)/ ;\ -+ $(INSTALL) -m 444 -c $$i $(DESTDIR)$(EXAMPLESDIR)/ ;\ - done - @if [ ! -f $(ETCDIR)/snips.conf ]; then \ -- $(INSTALL) -c -m 755 snips.conf $(ETCDIR)/snips.conf ;\ -+ $(INSTALL) -c -m 755 snips.conf $(DESTDIR)$(ETCDIR)/snips.conf ;\ - fi - @echo "" ; echo " NOW su AND DO A make root " - -@@ -95,9 +95,9 @@ - @if [ "`$(WHOAMI)`" = "root" ]; then \ - echo "Installing the following programs SUID under $(BINDIR)";\ - echo " multiping etherload trapmon" ;\ -- $(INSTALL) -m 4711 -c pingmon/multiping/multiping $(BINDIR) ;\ -- $(INSTALL) -m 4710 -c etherload/etherload $(BINDIR) ;\ -- $(INSTALL) -m 4710 -c trapmon/trapmon $(BINDIR) ;\ -+ $(INSTALL) -m 4711 -c pingmon/multiping/multiping $(DESTDIR)$(BINDIR) ;\ -+ $(INSTALL) -m 4710 -c etherload/etherload $(DESTDIR)$(BINDIR) ;\ -+ $(INSTALL) -m 4710 -c trapmon/trapmon $(DESTDIR)$(BINDIR) ;\ - else \ - echo "PLEASE RUN make root AS root (currently `whoami`)" ;\ - fi -diff -uNr snips-1.2.ORIG/Makefile.tail snips-1.2/Makefile.tail ---- snips-1.2.ORIG/Makefile.tail 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/Makefile.tail 2008-06-30 12:35:38.000000000 +0100 -@@ -9,32 +9,32 @@ - - ## these dirs are listed in Makefile.head - installdir: -- @[ -d $(ROOTDIR) ] || mkdir $(ROOTDIR) -- @[ -d $(BINDIR) ] || mkdir $(BINDIR) -- @[ -d $(DATADIR) ] || mkdir $(DATADIR) -- @[ -d $(ETCDIR) ] || mkdir $(ETCDIR) -- @[ -d $(PIDDIR) ] || mkdir $(PIDDIR) -- @[ -d $(INITDIR) ] || mkdir $(INITDIR) -- @[ -d $(MSGSDIR) ] || mkdir $(MSGSDIR) -- @[ -d $(RRD_DBDIR) ] || mkdir $(RRD_DBDIR) -- @[ -d $(EXAMPLESDIR) ] || mkdir $(EXAMPLESDIR) -- @[ -d $(DEVICEHELPDIR) ] || mkdir $(DEVICEHELPDIR) -- @[ -d $(CGIDIR) ] || mkdir -p $(CGIDIR) -- @[ -d $(HTMLDIR) ] || mkdir -p $(HTMLDIR) -- @[ -d $(ROOTDIR)/logs ] || mkdir $(ROOTDIR)/logs -+ @[ -d $(DESTDIR)$(ROOTDIR) ] || mkdir -p $(DESTDIR)$(ROOTDIR) -+ @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) -+ @[ -d $(DESTDIR)$(DATADIR) ] || mkdir -p $(DESTDIR)$(DATADIR) -+ @[ -d $(DESTDIR)$(ETCDIR) ] || mkdir -p $(DESTDIR)$(ETCDIR) -+ @[ -d $(DESTDIR)$(PIDDIR) ] || mkdir -p $(DESTDIR)$(PIDDIR) -+ @[ -d $(DESTDIR)$(INITDIR) ] || mkdir -p $(DESTDIR)$(INITDIR) -+ @[ -d $(DESTDIR)$(MSGSDIR) ] || mkdir -p $(DESTDIR)$(MSGSDIR) -+ @[ -d $(DESTDIR)$(RRD_DBDIR) ] || mkdir -p $(DESTDIR)$(RRD_DBDIR) -+ @[ -d $(DESTDIR)$(EXAMPLESDIR) ] || mkdir -p $(DESTDIR)$(EXAMPLESDIR) -+ @[ -d $(DESTDIR)$(DEVICEHELPDIR) ] || mkdir -p $(DESTDIR)$(DEVICEHELPDIR) -+ @[ -d $(DESTDIR)$(CGIDIR) ] || mkdir -p $(DESTDIR)$(CGIDIR) -+ @[ -d $(DESTDIR)$(HTMLDIR) ] || mkdir -p $(DESTDIR)$(HTMLDIR) -+ @[ -d $(DESTDIR)$(ROOTDIR)/logs ] || mkdir -p $(DESTDIR)$(ROOTDIR)/logs - - init: -- @if [ ! -z "$(INITFILES)" ] && [ -d "$(INITDIR)" ]; then \ -+ @if [ ! -z "$(INITFILES)" ] && [ -d "$(DESTDIR)$(INITDIR)" ]; then \ - for i in $(INITFILES) x ; \ - do \ - if [ "$$i" = "x" ]; then \ - : ;\ - else \ -- if [ -f "$(INITDIR)/$$i.init" ]; then \ -+ if [ -f "$(DESTDIR)$(INITDIR)/$$i.init" ]; then \ - echo "Not overwriting existing $(INITDIR)/$$i.init";\ - else \ - echo "Installing $$i.init under $(INITDIR)/" ;\ -- ln -s $(BINDIR)/snipsprog.init $(INITDIR)/$$i.init ;\ -+ ln -s $(DESTDIR)$(BINDIR)/snipsprog.init $(DESTDIR)$(INITDIR)/$$i.init ;\ - fi \ - fi \ - done \ -diff -uNr snips-1.2.ORIG/man/Makefile.mid snips-1.2/man/Makefile.mid ---- snips-1.2.ORIG/man/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/man/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -26,18 +26,18 @@ - - install: installdir - @echo "Installing in 'man'" -- @- [ -d $(MANDIR) ] || mkdir $(MANDIR) -+ @- [ -d $(DESTDIR)$(MANDIR) ] || mkdir $(DESTDIR)$(MANDIR) - # @-for d in $(MANDIR)/man1 $(MANDIR)/man3 $(MANDIR)/man8; do \ - # [! -d $$d ] && mkdir $$d ;\ - # done - @- for m in $(MANPAGES1); do \ -- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 1`$(MANEXT) ;\ -+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 1`$(MANEXT) ;\ - done - @- for m in $(MANPAGES3); do \ -- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 3`$(MANEXT) ;\ -+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 3`$(MANEXT) ;\ - done - @- for m in $(MANPAGES8); do \ -- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 8`$(MANEXT) ;\ -+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 8`$(MANEXT) ;\ - done - - clean: -diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid ---- snips-1.2.ORIG/nsmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/nsmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -17,7 +17,7 @@ - $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - - ## for standalone, need to link with -lresolv or -lbind - nstest: nsmon.c -diff -uNr snips-1.2.ORIG/ntpmon/Makefile.mid snips-1.2/ntpmon/Makefile.mid ---- snips-1.2.ORIG/ntpmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/ntpmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -17,7 +17,7 @@ - - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - - clean: - rm -f $(DIRT) -diff -uNr snips-1.2.ORIG/perl-monitors/Makefile.mid snips-1.2/perl-monitors/Makefile.mid ---- snips-1.2.ORIG/perl-monitors/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/perl-monitors/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -62,32 +62,32 @@ - # ideally hostmon-osclients/ need not go into the BINDIR, but we are - # putting it all there for now. - install: -- -@[ -d $(BINDIR)/hostmon-osclients ] || mkdir $(BINDIR)/hostmon-osclients -+ -@[ -d $(DESTDIR)$(BINDIR)/hostmon-osclients ] || mkdir $(DESTDIR)$(BINDIR)/hostmon-osclients - -@echo "Installing files in $(BINDIR)/hostmon-osclients" ;\ - for f in hostmon-osclients/* ; do \ - if [ -f $$f ]; then \ -- $(INSTALL) -c -m 755 $$f $(BINDIR)/hostmon-osclients/ ;\ -+ $(INSTALL) -c -m 755 $$f $(DESTDIR)$(BINDIR)/hostmon-osclients/ ;\ - fi \ - done -- -@cd $(BINDIR)/hostmon-osclients ; \ -+ -@cd $(DESTDIR)$(BINDIR)/hostmon-osclients ; \ - if [ -f hostmon-client.seds ]; then \ - $(INSTALL) -c -m 755 hostmon-client.seds hostmon-client ;\ - rm -f hostmon-client.seds ;\ - fi - -@echo "Installing perl monitors under $(BINDIR)" ;\ - for f in $(PROGS) ; do \ -- $(INSTALL) -c -m 755 $$f.seds $(BINDIR)/$$f ;\ -+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\ - done - -@for f in $(CONF) ; do \ -- if [ ! -f $(ETCDIR)/$$f ]; then \ -- $(INSTALL) -c -m 644 $$f.seds $(ETCDIR)/$$f ;\ -+ if [ ! -f $(DESTDIR)$(ETCDIR)/$$f ]; then \ -+ $(INSTALL) -c -m 644 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ;\ - fi \ - done -- $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(BINDIR)/ -- $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget $(BINDIR)/ -- $(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(ETCDIR)/ -- @if [ -f $(ETCDIR)/mibII.txt ]; then \ -- mv $(ETCDIR)/mibII.txt $(ETCDIR)/mibII.txt.old ;\ -+ $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget $(DESTDIR)$(BINDIR)/ -+ $(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(DESTDIR)$(ETCDIR)/ -+ @if [ -f $(DESTDIR)$(ETCDIR)/mibII.txt ]; then \ -+ mv $(DESTDIR)$(ETCDIR)/mibII.txt $(DESTDIR)$(ETCDIR)/mibII.txt.old ;\ - fi - @echo "See $(SRCDIR)/perl-monotors/README for further customizations" - -diff -uNr snips-1.2.ORIG/pingmon/Makefile.mid snips-1.2/pingmon/Makefile.mid ---- snips-1.2.ORIG/pingmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/pingmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -26,11 +26,11 @@ - $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ ; -- @[ -f $(BINDIR)/ippingmon ] && rm -f $(BINDIR)/ippingmon ; \ -- ln -s $(BINDIR)/$(TARG) $(BINDIR)/ippingmon ;\ -- [ -f $(BINDIR)/rpcpingmon ] && rm -f $(BINDIR)/rpcpingmon ; \ -- ln -s $(BINDIR)/$(TARG) $(BINDIR)/rpcpingmon -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ ; -+ @[ -f $(DESTDIR)$(BINDIR)/ippingmon ] && rm -f $(DESTDIR)$(BINDIR)/ippingmon ; \ -+ ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/ippingmon ;\ -+ [ -f $(DESTDIR)$(BINDIR)/rpcpingmon ] && rm -f $(DESTDIR)$(BINDIR)/rpcpingmon ; \ -+ ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/rpcpingmon - - clean: - rm -f $(DIRT) -diff -uNr snips-1.2.ORIG/pingmon/multiping/Makefile.mid snips-1.2/pingmon/multiping/Makefile.mid ---- snips-1.2.ORIG/pingmon/multiping/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/pingmon/multiping/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -14,10 +14,10 @@ - $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) - - install: installdir $(TARG) -- $(INSTALL) -c -m 4711 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 4711 $(TARG) $(DESTDIR)$(BINDIR)/ - @if [ `whoami` = "root" ]; then \ -- chown root $(BINDIR)/$(TARG) ;\ -- ls -lg $(BINDIR)/$(TARG) ;\ -+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ -+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ - else \ - echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ - echo "Do as root manually" ;\ -diff -uNr snips-1.2.ORIG/pingmon/rpcping/Makefile.mid snips-1.2/pingmon/rpcping/Makefile.mid ---- snips-1.2.ORIG/pingmon/rpcping/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/pingmon/rpcping/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -16,7 +16,7 @@ - $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - - clean: - rm -f $(DIRT) $(TARG) -diff -uNr snips-1.2.ORIG/portmon/Makefile.mid snips-1.2/portmon/Makefile.mid ---- snips-1.2.ORIG/portmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/portmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -15,7 +15,7 @@ - - # - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - - clean: - rm -f $(DIRT) -diff -uNr snips-1.2.ORIG/radiusmon/Makefile.mid snips-1.2/radiusmon/Makefile.mid ---- snips-1.2.ORIG/radiusmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/radiusmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -17,7 +17,7 @@ - - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - - test: radiusmon.c md5.c - $(CC) -c $(CFLAGS) -DDEBUG -DTEST radiusmon.c -diff -uNr snips-1.2.ORIG/snipslog/Makefile.mid snips-1.2/snipslog/Makefile.mid ---- snips-1.2.ORIG/snipslog/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/snipslog/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -21,7 +21,7 @@ - $(CC) $(CFLAGS) -DTEST -o snipslogtest snipslogtest.c $(LIBS) - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - @echo "___Update config file for logging daemon in $(ETCDIR) ___" - - clean: -diff -uNr snips-1.2.ORIG/snipstv/Makefile.mid snips-1.2/snipstv/Makefile.mid ---- snips-1.2.ORIG/snipstv/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/snipstv/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -20,9 +20,9 @@ - $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR) -- [ -r $(BINDIR)/netconsole ] || ln -s $(BINDIR)/$(TARG) $(BINDIR)/netconsole -- $(INSTALL) -c -m 0444 snipstv-help $(ETCDIR) -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR) -+ [ -r $(DESTDIR)$(BINDIR)/netconsole ] || ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/netconsole -+ $(INSTALL) -c -m 0444 snipstv-help $(DESTDIR)$(ETCDIR) - - clean: - rm -f $(DIRT) filter -diff -uNr snips-1.2.ORIG/snipsweb/Makefile.mid snips-1.2/snipsweb/Makefile.mid ---- snips-1.2.ORIG/snipsweb/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/snipsweb/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -32,24 +32,24 @@ - - install: installdir - @for f in $(CGI) ; do \ -- $(INSTALL) -c -m 755 $$f.seds $(CGIDIR)/$$f ; \ -+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(CGIDIR)/$$f ; \ - done - @for f in $(CONFIG) ; do \ -- if [ -f $(ETCDIR)/$$f ]; then \ -+ if [ -f $(DESTDIR)$(ETCDIR)/$$f ]; then \ - echo "Not overwriting existing $(ETCDIR)/$$f" ;\ - else \ -- $(INSTALL) -c -m 755 $$f.seds $(ETCDIR)/$$f ; \ -+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ; \ - fi ;\ - done -- @[ -f $(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DEVICEHELPDIR)/ -+ @[ -f $(DESTDIR)$(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DESTDIR)$(DEVICEHELPDIR)/ - @for f in $(HTMLFILES) ; do \ -- if [ -f $(HTMLDIR)/$$f ]; then \ -+ if [ -f $(DESTDIR)$(HTMLDIR)/$$f ]; then \ - echo "Not overwriting existing $(HTMLDIR)/$$f" ;\ - else \ -- $(INSTALL) -c -m 644 $$f $(HTMLDIR)/$$f ; \ -+ $(INSTALL) -c -m 644 $$f $(DESTDIR)$(HTMLDIR)/$$f ; \ - fi ;\ - done ;\ -- cp -r gifs $(HTMLDIR)/gifs -+ cp -r gifs $(DESTDIR)$(HTMLDIR)/gifs - @echo "Installed basic web files under " ; \ - echo " $(HTMLDIR) and $(CGIDIR)" ; \ - echo "Move into desired web location."; \ -diff -uNr snips-1.2.ORIG/tksnips/Makefile.mid snips-1.2/tksnips/Makefile.mid ---- snips-1.2.ORIG/tksnips/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/tksnips/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -23,7 +23,7 @@ - cat tkSnips.tix > tkSnips ; - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - - clean: - rm -f $(DIRT) test -diff -uNr snips-1.2.ORIG/tpmon/Makefile.mid snips-1.2/tpmon/Makefile.mid ---- snips-1.2.ORIG/tpmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/tpmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -20,7 +20,7 @@ - $(CC) $(CFLAGS) -o tptest tpmon.o tptest.o - - install: installdir $(TARG) -- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ - - clean: - rm -f $(DIRT) tptest -diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid ---- snips-1.2.ORIG/trapmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/trapmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 -@@ -20,10 +20,10 @@ - $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ - - install: $(TARG) -- $(INSTALL) -c -m 4750 $(TARG) $(BINDIR)/ -+ $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ - @if [ `whoami` = "root" ]; then \ -- chown root $(BINDIR)/$(TARG) ;\ -- ls -lg $(BINDIR)/$(TARG) ;\ -+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ -+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ - else \ - echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ - echo "Do as root manually" ;\ -diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid ---- snips-1.2.ORIG/utility/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 -+++ snips-1.2/utility/Makefile.mid 2008-06-30 12:42:59.000000000 +0100 -@@ -59,12 +59,12 @@ - echo "" - - install: all -- $(INSTALL) -c -m 751 $(CPROGS) $(BINDIR)/ -+ $(INSTALL) -c -m 751 $(CPROGS) $(DESTDIR)$(BINDIR)/ - -@ for f in $(SCRIPTS) ; do \ -- if [ -f $(BINDIR)/$$f ]; then \ -+ if [ -f $(DESTDIR)$(BINDIR)/$$f ]; then \ - echo "Not overwriting existing $(BINDIR)/$$f" ;\ - else \ -- $(INSTALL) -c -m 751 $$f.seds $(BINDIR)/$$f ;\ -+ $(INSTALL) -c -m 751 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\ - fi ;\ - done - diff --git a/net-analyzer/snips/files/snips-1.2-etherload-makefile-ordering.patch b/net-analyzer/snips/files/snips-1.2-etherload-makefile-ordering.patch deleted file mode 100644 index 037f4a4b8a65..000000000000 --- a/net-analyzer/snips/files/snips-1.2-etherload-makefile-ordering.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid ---- snips-1.2.ORIG/etherload/Makefile.mid 2012-06-26 15:35:46.329759711 +0100 -+++ snips-1.2/etherload/Makefile.mid 2012-06-26 15:37:13.194765114 +0100 -@@ -19,7 +19,7 @@ - INITFILES = etherload - - $(TARG): $(OBJS) -- $(CC) -o etherload $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ - - standalone: clean - make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG) diff --git a/net-analyzer/snips/files/snips-1.2-implicit-declarations.patch b/net-analyzer/snips/files/snips-1.2-implicit-declarations.patch deleted file mode 100644 index 6e3880ca58bf..000000000000 --- a/net-analyzer/snips/files/snips-1.2-implicit-declarations.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- snips-1.2/cmu-snmp/snmp/asn1.c.orig 2008-06-26 17:09:24.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/asn1.c 2008-06-26 17:09:47.000000000 +0100 -@@ -36,6 +36,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - #ifdef WIN32 - #include <memory.h> ---- snips-1.2/cmu-snmp/snmp/snmp_api.c.orig 2008-06-26 17:11:36.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/snmp_api.c 2008-06-26 17:11:44.000000000 +0100 -@@ -27,6 +27,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - #include <ctype.h> - #include <errno.h> ---- snips-1.2/cmu-snmp/snmp/mib.c.orig 2008-06-26 17:12:42.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/mib.c 2008-06-26 17:12:54.000000000 +0100 -@@ -24,6 +24,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - - #ifdef HAVE_STDLIB_H - #include <stdlib.h> ---- snips-1.2/cmu-snmp/snmp/snmp_pdu.c.orig 2008-06-26 17:10:12.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/snmp_pdu.c 2008-06-26 17:10:22.000000000 +0100 -@@ -38,6 +38,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <errno.h> - #include <sys/types.h> - ---- snips-1.2/cmu-snmp/snmp/snmp_vars.c.orig 2008-06-26 17:10:44.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/snmp_vars.c 2008-06-26 17:10:52.000000000 +0100 -@@ -36,6 +36,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <errno.h> - #include <sys/types.h> - ---- snips-1.2/cmu-snmp/snmp/new-parse.c.orig 2008-06-26 17:13:44.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/new-parse.c 2008-06-26 17:13:50.000000000 +0100 -@@ -30,6 +30,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - - #ifdef HAVE_STRINGS_H ---- snips-1.2/cmu-snmp/snmp/snmp_api_util.c.orig 2008-06-26 17:14:38.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/snmp_api_util.c 2008-06-26 17:14:46.000000000 +0100 -@@ -27,6 +27,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - - #ifdef WIN32 ---- snips-1.2/cmu-snmp/snmp/parse.c.orig 2008-06-26 17:13:18.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/parse.c 2008-06-26 17:13:26.000000000 +0100 -@@ -42,6 +42,7 @@ - #endif /* HAVE_STDLIB_H */ - - #include <stdio.h> -+#include <string.h> - #include <ctype.h> - #include <sys/types.h> - #include "asn1.h" ---- snips-1.2/cmu-snmp/snmp/mini-client.c.orig 2008-06-26 17:12:21.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/mini-client.c 2008-06-26 17:12:27.000000000 +0100 -@@ -37,6 +37,7 @@ - #include <sys/types.h> - #include <fcntl.h> - #include <stdio.h> -+#include <string.h> - #include <assert.h> - #include <ctype.h> - #include <errno.h> ---- snips-1.2/lib/rrd_funcs.c.orig 2008-06-26 17:08:40.000000000 +0100 -+++ snips-1.2/lib/rrd_funcs.c 2008-06-26 17:08:49.000000000 +0100 -@@ -38,6 +38,7 @@ - #include "osdefs.h" - #include <sys/types.h> - #include <stdio.h> -+#include <string.h> - #include <errno.h> - #ifndef NeXT - # include <unistd.h> /* for access(), lseek() */ ---- snips-1.2/cmu-snmp/snmp/snmp_api_error.c.orig 2008-06-26 17:23:56.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/snmp_api_error.c 2008-06-26 17:24:06.000000000 +0100 -@@ -35,6 +35,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <sys/types.h> - - #ifdef HAVE_STRINGS_H ---- snips-1.2/cmu-snmp/snmp/snmp_extra.c.orig 2008-06-26 17:22:57.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/snmp_extra.c 2008-06-26 17:23:05.000000000 +0100 -@@ -36,6 +36,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #include <ctype.h> - #include <sys/types.h> - ---- snips-1.2/cmu-snmp/snmp/coexistance.c.orig 2008-06-26 17:23:26.000000000 +0100 -+++ snips-1.2/cmu-snmp/snmp/coexistance.c 2008-06-26 17:23:33.000000000 +0100 -@@ -32,6 +32,7 @@ - #endif /* HAVE_CONFIG_H */ - - #include <stdio.h> -+#include <string.h> - #ifdef WIN32 - #include <winsock2.h> - #else /* WIN32 */ diff --git a/net-analyzer/snips/files/snips-1.2-install-missing.patch b/net-analyzer/snips/files/snips-1.2-install-missing.patch deleted file mode 100644 index f9af70847494..000000000000 --- a/net-analyzer/snips/files/snips-1.2-install-missing.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -uNr snips-1.2.ORIG/perl-monitors/Makefile.mid snips-1.2/perl-monitors/Makefile.mid ---- snips-1.2.ORIG/perl-monitors/Makefile.mid 2008-07-04 11:24:23.000000000 +0100 -+++ snips-1.2/perl-monitors/Makefile.mid 2008-07-04 11:28:02.000000000 +0100 -@@ -17,7 +17,7 @@ - PROGS = apcmon armon bgpmon bpmon ciscomon modemmon novellmon nrmon \ - hostmon hostmon-collector hostmon-osclients/hostmon-client \ - smbmon sqlmon snmpmon snmpmon-collector snmpgeneric \ -- syslogmon upsmon rcisco testlog -+ syslogmon upsmon rcisco testlog snmpgeneric2 - - # to create init files to start/stop programs - INITFILES = apcmon armon bgpmon bpmon ciscomon modemmon novellmon nrmon \ -@@ -89,7 +89,7 @@ - @if [ -f $(DESTDIR)$(ETCDIR)/mibII.txt ]; then \ - mv $(DESTDIR)$(ETCDIR)/mibII.txt $(DESTDIR)$(ETCDIR)/mibII.txt.old ;\ - fi -- @echo "See $(SRCDIR)/perl-monotors/README for further customizations" -+ @echo "See $(SRCDIR)/perl-monitors/README for further customizations" - - clean: - @-cd $(CMUSNMP)/snmpapps; make realclean -diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid ---- snips-1.2.ORIG/utility/Makefile.mid 2008-07-04 11:24:23.000000000 +0100 -+++ snips-1.2/utility/Makefile.mid 2008-07-04 11:25:13.000000000 +0100 -@@ -6,7 +6,7 @@ - - SHSCRIPTS = crontab.snips snipsprog.init - PERLSCRIPTS = keepalive_monitors.pl logstats.pl logmaint.pl \ -- docrypt.pl notifier.pl -+ docrypt.pl notifier.pl snmpconf.pl - SCRIPTS = $(SHSCRIPTS) $(PERLSCRIPTS) - - CPROGS = display_snips_datafile eventselect diff --git a/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch b/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch deleted file mode 100644 index d298ed3a7436..000000000000 --- a/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid ---- snips-1.2.ORIG/etherload/Makefile.mid 2012-06-26 14:43:15.818552541 +0100 -+++ snips-1.2/etherload/Makefile.mid 2012-06-26 14:48:11.983571994 +0100 -@@ -19,7 +19,7 @@ - INITFILES = etherload - - $(TARG): $(OBJS) -- $(CC) -o etherload $(CFLAGS) $(OBJS) $(LIBS) -+ $(CC) -o etherload $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) - - standalone: clean - make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG) -diff -uNr snips-1.2.ORIG/lib/Makefile.mid snips-1.2/lib/Makefile.mid ---- snips-1.2.ORIG/lib/Makefile.mid 2012-06-26 14:43:15.791552541 +0100 -+++ snips-1.2/lib/Makefile.mid 2012-06-26 14:44:51.073558777 +0100 -@@ -49,7 +49,7 @@ - echo "Generating ../perl-module/Makefile"; \ - (cd ../perl-module; \ - perl Makefile.PL \ -- CC="$(CC)" LD="$(CC)" OPTIMIZE="$(CFLAGS)" LIBS="$(LIBS)" \ -+ CC="$(CC)" LD="$(CC)" OPTIMIZE="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \ - INSTALLSITELIB=$(ROOTDIR)/lib/perl INSTALLSITEARCH=$(ROOTDIR)/lib/perl INSTALLARCHLIB=$(ROOTDIR)/lib/perl INSTALLMAN3DIR=$(MANDIR) ; \ - ) >/dev/null ;\ - fi -diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid ---- snips-1.2.ORIG/nsmon/Makefile.mid 2012-06-26 14:43:15.817552541 +0100 -+++ snips-1.2/nsmon/Makefile.mid 2012-06-26 14:47:26.847568340 +0100 -@@ -14,7 +14,7 @@ - - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - install: installdir $(TARG) - $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -diff -uNr snips-1.2.ORIG/ntpmon/Makefile.mid snips-1.2/ntpmon/Makefile.mid ---- snips-1.2.ORIG/ntpmon/Makefile.mid 2012-06-26 14:43:15.807552541 +0100 -+++ snips-1.2/ntpmon/Makefile.mid 2012-06-26 14:46:28.392565438 +0100 -@@ -13,7 +13,7 @@ - INITFILES = ntpmon - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - - install: installdir $(TARG) -diff -uNr snips-1.2.ORIG/pingmon/Makefile.mid snips-1.2/pingmon/Makefile.mid ---- snips-1.2.ORIG/pingmon/Makefile.mid 2012-06-26 14:43:15.819552541 +0100 -+++ snips-1.2/pingmon/Makefile.mid 2012-06-26 14:48:57.503574984 +0100 -@@ -23,7 +23,7 @@ - INITFILES = ippingmon rpcpingmon - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - install: installdir $(TARG) - $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ ; -diff -uNr snips-1.2.ORIG/pingmon/multiping/Makefile.mid snips-1.2/pingmon/multiping/Makefile.mid ---- snips-1.2.ORIG/pingmon/multiping/Makefile.mid 2012-06-26 14:43:15.819552541 +0100 -+++ snips-1.2/pingmon/multiping/Makefile.mid 2012-06-26 14:48:25.751573031 +0100 -@@ -11,7 +11,7 @@ - OBJS = multiping.o - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) -o $(TARG) - - install: installdir $(TARG) - $(INSTALL) -c -m 4711 $(TARG) $(BINDIR)/ -diff -uNr snips-1.2.ORIG/pingmon/rpcping/Makefile.mid snips-1.2/pingmon/rpcping/Makefile.mid ---- snips-1.2.ORIG/pingmon/rpcping/Makefile.mid 2012-06-26 14:43:15.819552541 +0100 -+++ snips-1.2/pingmon/rpcping/Makefile.mid 2012-06-26 14:48:46.799574327 +0100 -@@ -13,7 +13,7 @@ - OBJS = rpcping.o - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) -o $(TARG) - - install: installdir $(TARG) - $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ -diff -uNr snips-1.2.ORIG/portmon/Makefile.mid snips-1.2/portmon/Makefile.mid ---- snips-1.2.ORIG/portmon/Makefile.mid 2012-06-26 14:43:15.796552541 +0100 -+++ snips-1.2/portmon/Makefile.mid 2012-06-26 14:45:28.936561270 +0100 -@@ -11,7 +11,7 @@ - PROGLIBS = - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $(TARG) -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARG) - - # - install: installdir $(TARG) -diff -uNr snips-1.2.ORIG/radiusmon/Makefile.mid snips-1.2/radiusmon/Makefile.mid ---- snips-1.2.ORIG/radiusmon/Makefile.mid 2012-06-26 14:43:15.815552541 +0100 -+++ snips-1.2/radiusmon/Makefile.mid 2012-06-26 14:46:41.096566075 +0100 -@@ -13,7 +13,7 @@ - INITFILES = radiusmon - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - - install: installdir $(TARG) -diff -uNr snips-1.2.ORIG/snipslog/Makefile.mid snips-1.2/snipslog/Makefile.mid ---- snips-1.2.ORIG/snipslog/Makefile.mid 2012-06-26 14:43:15.817552541 +0100 -+++ snips-1.2/snipslog/Makefile.mid 2012-06-26 14:47:47.263570500 +0100 -@@ -15,7 +15,7 @@ - INITFILES = snipslogd - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $(TARG) -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $(TARG) - - snipslogtest: snipslogtest.o - $(CC) $(CFLAGS) -DTEST -o snipslogtest snipslogtest.c $(LIBS) -diff -uNr snips-1.2.ORIG/snipstv/Makefile.mid snips-1.2/snipstv/Makefile.mid ---- snips-1.2.ORIG/snipstv/Makefile.mid 2012-06-26 14:43:15.818552541 +0100 -+++ snips-1.2/snipstv/Makefile.mid 2012-06-26 14:47:56.599570885 +0100 -@@ -17,7 +17,7 @@ - update_msgwin.o update_promptwin.o update_title.o - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - install: installdir $(TARG) - $(INSTALL) -c -m 751 $(TARG) $(BINDIR) -diff -uNr snips-1.2.ORIG/tksnips/Makefile.mid snips-1.2/tksnips/Makefile.mid ---- snips-1.2.ORIG/tksnips/Makefile.mid 2012-06-26 14:43:15.792552541 +0100 -+++ snips-1.2/tksnips/Makefile.mid 2012-06-26 14:45:03.849559610 +0100 -@@ -15,7 +15,7 @@ - all: $(TARG) - - ndaemon: $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - tkSnips: tkSnips.tix - @echo "Doing substitutions on tkSnips" ;\ -diff -uNr snips-1.2.ORIG/tpmon/Makefile.mid snips-1.2/tpmon/Makefile.mid ---- snips-1.2.ORIG/tpmon/Makefile.mid 2012-06-26 14:43:15.788552541 +0100 -+++ snips-1.2/tpmon/Makefile.mid 2012-06-26 14:44:04.585555459 +0100 -@@ -11,7 +11,7 @@ - PROGLIBS = - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ - - ###### - # small testing program to demonstrate the throughput() function -diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid ---- snips-1.2.ORIG/trapmon/Makefile.mid 2012-06-26 14:43:15.816552541 +0100 -+++ snips-1.2/trapmon/Makefile.mid 2012-06-26 14:47:17.560568478 +0100 -@@ -17,7 +17,7 @@ - INITFILES = trapmon - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - install: $(TARG) - $(INSTALL) -c -m 4750 $(TARG) $(BINDIR)/ -diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid ---- snips-1.2.ORIG/utility/Makefile.mid 2012-06-26 14:43:15.801552541 +0100 -+++ snips-1.2/utility/Makefile.mid 2012-06-26 14:45:49.512562573 +0100 -@@ -25,10 +25,10 @@ - all: $(CPROGS) sed - - display_snips_datafile: display_snips_datafile.o -- $(CC) $(CFLAGS) $@.o $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $@.o $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - eventselect: eventselect.o -- $(CC) $(CFLAGS) $@.o $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $@.o $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ - - - sed: diff --git a/net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch b/net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch deleted file mode 100644 index 23098c02d3ff..000000000000 --- a/net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid ---- snips-1.2.ORIG/trapmon/Makefile.mid 2008-07-04 15:39:00.000000000 +0100 -+++ snips-1.2/trapmon/Makefile.mid 2008-07-04 15:39:22.000000000 +0100 -@@ -17,7 +17,7 @@ - INITFILES = trapmon - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) $(LIBS) -o $@ - - install: $(TARG) - $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ diff --git a/net-analyzer/snips/files/snips-1.2-linux3.patch b/net-analyzer/snips/files/snips-1.2-linux3.patch deleted file mode 100644 index fd2d096189bb..000000000000 --- a/net-analyzer/snips/files/snips-1.2-linux3.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: snips-1.2/Configure -=================================================================== ---- snips-1.2.orig/Configure -+++ snips-1.2/Configure -@@ -274,7 +274,7 @@ case "$OS" in - CURSESLIB='-lncurses -ltermcap' - PING="/bin/ping" - ;; -- LINUX20|Linux\ 2*) -+ LINUX20|Linux\ [23]*) - OS_CFLAGS="-DLINUX2"; - OS_LIBS="${LIBRESOLV}" - if [ -f /usr/lib/libgdbm.so ]; then -Index: snips-1.2/utility/snipsprog.init -=================================================================== ---- snips-1.2.orig/utility/snipsprog.init -+++ snips-1.2/utility/snipsprog.init -@@ -45,7 +45,7 @@ getpid() { - - # Finally try to extract it from ps depending on the OS - case "`uname -s -r`" in -- LINUX20|Linux\ 2*) -+ LINUX20|Linux\ [23]*) - ps auxw | awk 'BEGIN { prog=ARGV[1]; dir=ARGV[2]; ARGC=1 } - { if ((prog == $11) || (("(" prog ")") == $11) || - ((prog ":") == $11) || ((dir "/" prog) == $11)) diff --git a/net-analyzer/snips/files/snips-1.2-non-interactive.patch b/net-analyzer/snips/files/snips-1.2-non-interactive.patch deleted file mode 100644 index c6cb83386212..000000000000 --- a/net-analyzer/snips/files/snips-1.2-non-interactive.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- snips-1.2/Configure.orig 2008-06-26 16:46:49.000000000 +0100 -+++ snips-1.2/Configure 2008-06-26 16:48:10.000000000 +0100 -@@ -72,11 +72,7 @@ - if [ -f $PREVDEFS ]; then - echo "You seem to have already run $0 before, would you like" - echo "to take your previous answers as defaults [n]: " | tr -d '\012' -- read input -- if [ "$input" = "Y" ] || [ "$input" = "y" ] -- then - . ./$PREVDEFS -- fi - fi - - cat <<! -@@ -93,14 +89,11 @@ - ! - - echo "Enter top level directory [${ROOTDIR}]: " | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then ROOTDIR=${input}; fi - - MANDIR=${ROOTDIR}/man - echo "Enter location of man pages [${MANDIR}]: " | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then MANDIR=${input} ; fi - - echo "Enter extension for man pages [${MANEXT}]: " | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then MANEXT=${input} ; fi - - cat <<! - -@@ -115,34 +108,27 @@ - if [ ! -f ${MAIL} ]; then MAIL=/bin/mail ; fi - if [ ! -f ${MAIL} ]; then MAIL=/usr/bin/mail ; fi - echo "Where is your MAIL program located? [${MAIL}] :" | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then MAIL="${input}" ; fi - if [ ! -f ${MAIL} ]; then echo "WARNING, ${MAIL} does not exist" ; fi - - echo "Where should the operational email go? [${OPSMAIL}] :" | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then OPSMAIL="${input}" ; fi - - echo "Where should the admin email go? [${ADMINMAIL}] :" | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then ADMINMAIL="${input}" ; fi - - - ## - ## - echo "" - echo "Which compiler would you like to use? [${CC}]: " | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then CC="${input}" ; fi - - echo "What compiler options do you want (-DDEBUG)? [${CFLAGS}]: " | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then CFLAGS="${input}" ; fi - - echo "What linker options do you want (-L/local/lib -lbind)? [${LIBS}]: " | tr -d '\012' --read input ; if [ "X$input" != "X" ]; then LIBS="${input}" ; fi - - (mkdir TemP; cd TemP; ${YACC}) 2>&1 | egrep -i 'not.*found' >/dev/null 2>&1 - if [ $? = 0 ]; then - echo "${YACC} NOT FOUND" - YACC="bison -y" - echo "Enter an alternative to yacc [${YACC}]: " | tr -d '\012' -- read input ; if [ "X$input" != "X" ]; then YACC="${input}" ; fi - fi - rm -rf TemP - -@@ -150,7 +136,6 @@ - if [ ! -f ${PERL} ]; then PERL=/usr/local/bin/perl ; fi - if [ ! -f ${PERL} ]; then - echo "Where is PERL located on your system? [$PERL]: "| tr -d '\012' -- read input ; if [ "X$input" != "X" ]; then PERL="${input}" ; fi - if [ ! -f ${PERL} ]; then echo "WARNING, ${PERL} does not exist" ; fi - fi - -@@ -161,12 +146,10 @@ - if [ -d $RRDLIBDIR ]; then RRDCFLAGS="-DRRDTOOL" ; fi - if [ "$RRDCFLAGS" = "" ]; then definput="n" ; else definput="y" ; fi - echo "Do you have RRDtool installed (www.caida.org)? [$definput]: " | tr -d '\012' --read input - if [ "X$input" = "X" ]; then input=$definput ; fi - if [ "$input" = "y" ] || [ "$input" = "Y" ]; then - RRDCFLAGS="-DRRDTOOL" - echo "Enter path to the RRD library [$RRDLIBDIR]: " | tr -d '\012' -- read input ; if [ "X$input" != "X" ]; then RRDLIBDIR="${input}"; fi - - if [ ! -f $RRDLIBDIR/librrd.a ]; then - echo "WARNING, $RRDLIBDIR/librrd.a not found" -@@ -181,7 +164,6 @@ - ## Check if they want the old NOCOL mode - #echo "" - #echo "Do you want to compile using the old NOCOL event structure? [no]: " | tr -d '\012' --#read input ; if [ "X$input" != "X" ]; then CFLAGS="${CFLAGS} -DNOCOL" ; fi - - - ## diff --git a/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch b/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch deleted file mode 100644 index 22e2e53d5eca..000000000000 --- a/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid ---- snips-1.2.ORIG/nsmon/Makefile.mid 2012-06-26 14:58:39.418613245 +0100 -+++ snips-1.2/nsmon/Makefile.mid 2012-06-26 14:59:08.018615168 +0100 -@@ -3,10 +3,8 @@ - # Makefile for 'nsmon' - # - --# Might need to link with 'libresolv' on some systems -- - PROGCDEFS = --PROGLIBS = # -lresolv -+PROGLIBS = -lresolv - - TARG = nsmon - OBJS = main.o nsmon.o diff --git a/net-analyzer/snips/files/snips-1.2-parallel-make.patch b/net-analyzer/snips/files/snips-1.2-parallel-make.patch deleted file mode 100644 index effa673baefc..000000000000 --- a/net-analyzer/snips/files/snips-1.2-parallel-make.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -uNr snips-1.2.ORIG/Makefile.mid snips-1.2/Makefile.mid ---- snips-1.2.ORIG/Makefile.mid 2012-06-26 15:53:26.724829432 +0100 -+++ snips-1.2/Makefile.mid 2012-06-26 15:55:18.298836689 +0100 -@@ -46,7 +46,7 @@ - CHECK DONE TODO - - all: Init -- @echo "BUILDING SNIPS revision $(REV) for $(OS) $$OS" ;\ -+ @+echo "BUILDING SNIPS revision $(REV) for $(OS) $$OS" ;\ - for i in $(SRCS); do \ - if [ -d $$i ]; then \ - (echo "" ; echo "MAKING IN $$i" ; echo "----------" ; \ -@@ -74,8 +74,8 @@ - echo "Else prefix your shell PATH with BSD style install" ;\ - rm -f SniPpet /tmp/SniPpet ; exit 1 ; fi) - -- @echo make $(MFLAGS) install ; -- @-for i in $(SRCS); do \ -+ @+echo make $(MFLAGS) install ; -+ @+-for i in $(SRCS); do \ - ( echo "" ; echo "MAKING IN $$i" ; echo "----------" ; cd $$i ; \ - make $(MFLAGS) install ; make $(MFLAGS) init ) ;\ - done diff --git a/net-analyzer/snips/files/snips-1.2-r2-precache-config b/net-analyzer/snips/files/snips-1.2-r2-precache-config deleted file mode 100644 index a5b695426c51..000000000000 --- a/net-analyzer/snips/files/snips-1.2-r2-precache-config +++ /dev/null @@ -1,23 +0,0 @@ -# These answers are interdependent; do not edit this file! -package="snips" -ROOTDIR="/usr/snips" -MANDIR="/usr/share/man/snips" -MANEXT="n" -OPSMAIL="root@localhost" -ADMINMAIL="root@localhost" -MAIL="/bin/mail" -CC="gcc" -YACC="yacc" -LIBS="" -RPCLIB="" -PSFLAGS="axw" -PERL="/usr/bin/perl" -AR="ar r" -WHOAMI="/usr/bin/whoami" -RANLIB="ranlib" -INSTALL="install" -PING="/bin/ping" -CURSESLIB="-lncurses" -RRDCFLAGS="-DRRDTOOL" -RRDLIBDIR="/usr/lib/" -RRDLIBS="-L/usr/lib/ -lrrd" diff --git a/net-analyzer/snips/files/snips-1.2-trapmon-link-order.patch b/net-analyzer/snips/files/snips-1.2-trapmon-link-order.patch deleted file mode 100644 index fc95c5155ed9..000000000000 --- a/net-analyzer/snips/files/snips-1.2-trapmon-link-order.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid ---- snips-1.2.ORIG/trapmon/Makefile.mid 2012-06-26 14:50:38.787581669 +0100 -+++ snips-1.2/trapmon/Makefile.mid 2012-06-26 14:52:11.381587122 +0100 -@@ -17,7 +17,7 @@ - INITFILES = trapmon - - $(TARG): $(OBJS) Makefile -- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ -+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) $(LIBS) -o $@ - - install: $(TARG) - $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ diff --git a/net-analyzer/snips/metadata.xml b/net-analyzer/snips/metadata.xml deleted file mode 100644 index c0ebd6414a53..000000000000 --- a/net-analyzer/snips/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>chainsaw@gentoo.org</email> - <name>Tony Vroon</name> -</maintainer> -</pkgmetadata> diff --git a/net-analyzer/snips/snips-1.2-r2.ebuild b/net-analyzer/snips/snips-1.2-r2.ebuild deleted file mode 100644 index 453869f22cad..000000000000 --- a/net-analyzer/snips/snips-1.2-r2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils toolchain-funcs user - -DESCRIPTION="System & Network Integrated Polling Software" -HOMEPAGE="http://www.netplex-tech.com/snips/" -SRC_URI="http://www.netplex-tech.com/software/downloads/${PN}/${P}.tar.gz" - -LICENSE="SNIPS BSD HPND GPL-1+ RSA free-noncomm" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-lang/perl - virtual/mailx - net-analyzer/rrdtool - >=net-misc/iputils-20071127-r2 - sys-libs/gdbm - sys-libs/ncurses" - -src_unpack() { - unpack ${A} - cd "${S}" - # Gentoo-specific non-interactive configure override - cp "${FILESDIR}/${PF}-precache-config" "${S}/Config.cache" \ - || die "Unable to precache configure script answers" - echo "CFLAGS=\"${CFLAGS} -fPIC\"" >> "${S}/Config.cache" - echo "CC=\"$(tc-getCC)\"" >> "${S}/Config.cache" - echo "SRCDIR=\"${S}\"" >> "${S}/Config.cache" - epatch "${FILESDIR}/${P}-non-interactive.patch" - # Applied to upstream CVS - epatch "${FILESDIR}/${P}-install-missing.patch" - epatch "${FILESDIR}/${P}-implicit-declarations.patch" - epatch "${FILESDIR}/${P}-conflicting-types.patch" - epatch "${FILESDIR}/${P}-code-ordering.patch" - epatch "${FILESDIR}/${P}-destdir-awareness.patch" - epatch "${FILESDIR}/${P}-link-correct-snmp-lib.patch" -} - -src_compile() { - # Looks horrid due to missing linebreaks, suppress output - ebegin "Running configure script (with precached settings)" - ./Configure &> /dev/null || die "Unable to configure" - eend $? - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} - -pkg_preinst() { - enewgroup snips - enewuser snips -1 -1 /usr/snips snips -} - -pkg_postinst() { - ebegin "Fixing permissions" - chown -R snips:snips "${ROOT}"usr/snips - for x in data logs msgs rrddata run web device-help etc; do - chmod -R g+w "${ROOT}usr/snips/${x}" \ - || die "Unable to chmod ${x}" - done - chown root:snips "${ROOT}usr/snips/bin/multiping" || die "chown root failed" - chown root:snips "${ROOT}usr/snips/bin/etherload" || die "chown root failed" - chown root:snips "${ROOT}usr/snips/bin/trapmon" || die "chown root failed" - chmod u+s "${ROOT}usr/snips/bin/multiping" || die "SetUID root failed" - chmod u+s "${ROOT}usr/snips/bin/etherload" || die "SetUID root failed" - chmod u+s "${ROOT}usr/snips/bin/trapmon" || die "SetUID root failed" - eend $? -} diff --git a/net-analyzer/snips/snips-1.2-r3.ebuild b/net-analyzer/snips/snips-1.2-r3.ebuild deleted file mode 100644 index 9d369c9fc41d..000000000000 --- a/net-analyzer/snips/snips-1.2-r3.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit base toolchain-funcs user - -DESCRIPTION="System & Network Integrated Polling Software" -HOMEPAGE="http://www.netplex-tech.com/snips/" -SRC_URI="http://www.netplex-tech.com/software/downloads/${PN}/${P}.tar.gz" - -LICENSE="SNIPS BSD HPND GPL-1+ RSA free-noncomm" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND="dev-lang/perl - virtual/mailx - net-analyzer/rrdtool - >=net-misc/iputils-20071127-r2 - sys-libs/gdbm - sys-libs/ncurses" - -PATCHES=( - "${FILESDIR}/${P}-ldflags-respect.patch" - "${FILESDIR}/${P}-parallel-make.patch" - "${FILESDIR}/${P}-non-interactive.patch" - "${FILESDIR}/${P}-install-missing.patch" - "${FILESDIR}/${P}-implicit-declarations.patch" - "${FILESDIR}/${P}-conflicting-types.patch" - "${FILESDIR}/${P}-code-ordering.patch" - "${FILESDIR}/${P}-destdir-awareness.patch" - "${FILESDIR}/${P}-trapmon-link-order.patch" - "${FILESDIR}/${P}-nsmon-libresolv.patch" - "${FILESDIR}/${P}-etherload-makefile-ordering.patch" - "${FILESDIR}/${P}-linux3.patch" -) - -src_prepare() { - # Gentoo-specific non-interactive configure override - cp "${FILESDIR}/${P}-r2-precache-config" "${S}/Config.cache" \ - || die "Unable to precache configure script answers" - echo "CFLAGS=\"${CFLAGS} -fPIC\"" >> "${S}/Config.cache" - echo "CC=\"$(tc-getCC)\"" >> "${S}/Config.cache" - echo "SRCDIR=\"${S}\"" >> "${S}/Config.cache" - base_src_prepare -} - -src_compile() { - # Looks horrid due to missing linebreaks, suppress output - ebegin "Running configure script (with precached settings)" - ./Configure &> /dev/null || die "Unable to configure" - eend $? - emake || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} - -pkg_preinst() { - enewgroup snips - enewuser snips -1 -1 /usr/snips snips -} - -pkg_postinst() { - ebegin "Fixing permissions" - chown -R snips:snips "${ROOT}"usr/snips - for x in data logs msgs rrddata run web device-help etc; do - chmod -R g+w "${ROOT}usr/snips/${x}" \ - || die "Unable to chmod ${x}" - done - chown root:snips "${ROOT}usr/snips/bin/multiping" || die "chown root failed" - chown root:snips "${ROOT}usr/snips/bin/etherload" || die "chown root failed" - chown root:snips "${ROOT}usr/snips/bin/trapmon" || die "chown root failed" - chmod u+s "${ROOT}usr/snips/bin/multiping" || die "SetUID root failed" - chmod u+s "${ROOT}usr/snips/bin/etherload" || die "SetUID root failed" - chmod u+s "${ROOT}usr/snips/bin/trapmon" || die "SetUID root failed" - eend $? -} diff --git a/profiles/package.mask b/profiles/package.mask index 0533cd1c3d06..73b1e7ff124a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -346,11 +346,6 @@ net-misc/termtter dev-cpp/luabind games-rpg/valyriatear -# David Seifert <soap@gentoo.org> (20 Dec 2016) -# Masked for being completely broken and unusable (bug 586356). -# No reverse dependencies. Masked for removal in 30 days. -net-analyzer/snips - # Mike Gilbert <floppym@gentoo.org> (10 Dec 2016) # Dev channel releases are only for people who are developers or want more # experimental features and accept a more unstable release. |