1 |
commit: 9b5612b068f12a94455e7dc1055e9b976d6880e5 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 30 08:24:04 2017 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 30 08:24:04 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5612b0 |
7 |
|
8 |
net-analyzer/snips: Remove from tree |
9 |
|
10 |
net-analyzer/snips/Manifest | 1 - |
11 |
.../snips/files/snips-1.2-code-ordering.patch | 25 -- |
12 |
.../snips/files/snips-1.2-conflicting-types.patch | 52 --- |
13 |
.../snips/files/snips-1.2-destdir-awareness.patch | 402 --------------------- |
14 |
.../snips-1.2-etherload-makefile-ordering.patch | 12 - |
15 |
.../files/snips-1.2-implicit-declarations.patch | 130 ------- |
16 |
.../snips/files/snips-1.2-install-missing.patch | 33 -- |
17 |
.../snips/files/snips-1.2-ldflags-respect.patch | 184 ---------- |
18 |
.../files/snips-1.2-link-correct-snmp-lib.patch | 12 - |
19 |
net-analyzer/snips/files/snips-1.2-linux3.patch | 26 -- |
20 |
.../snips/files/snips-1.2-non-interactive.patch | 93 ----- |
21 |
.../snips/files/snips-1.2-nsmon-libresolv.patch | 15 - |
22 |
.../snips/files/snips-1.2-parallel-make.patch | 23 -- |
23 |
.../snips/files/snips-1.2-r2-precache-config | 23 -- |
24 |
.../snips/files/snips-1.2-trapmon-link-order.patch | 12 - |
25 |
net-analyzer/snips/metadata.xml | 8 - |
26 |
net-analyzer/snips/snips-1.2-r2.ebuild | 73 ---- |
27 |
net-analyzer/snips/snips-1.2-r3.ebuild | 81 ----- |
28 |
profiles/package.mask | 5 - |
29 |
19 files changed, 1210 deletions(-) |
30 |
|
31 |
diff --git a/net-analyzer/snips/Manifest b/net-analyzer/snips/Manifest |
32 |
deleted file mode 100644 |
33 |
index 21b2c5c..00000000 |
34 |
--- a/net-analyzer/snips/Manifest |
35 |
+++ /dev/null |
36 |
@@ -1 +0,0 @@ |
37 |
-DIST snips-1.2.tar.gz 1382731 SHA256 2ca44a51251b569e9429ae404caccb3721a9697532e95c9ff0e6db9ef8e3cd28 SHA512 24c53e1af390062ff6f4406e1cb47b2d13812f2723420df79921dfbb620aac626de628d755b05b615b188df1ef8203776e6a64f326901408235c62205ee16f8a WHIRLPOOL 64264505ff8b1d93c79ecf92b6d6aa133a92e4904a672e46e3d68a9c7749d2193aaa4341878309e7b1856a05579cd643a3ff2b60049518c26eb7100325317098 |
38 |
|
39 |
diff --git a/net-analyzer/snips/files/snips-1.2-code-ordering.patch b/net-analyzer/snips/files/snips-1.2-code-ordering.patch |
40 |
deleted file mode 100644 |
41 |
index 13b31dc..00000000 |
42 |
--- a/net-analyzer/snips/files/snips-1.2-code-ordering.patch |
43 |
+++ /dev/null |
44 |
@@ -1,25 +0,0 @@ |
45 |
-diff -uNr snips-1.2.ORIG/ntpmon/main.c snips-1.2/ntpmon/main.c |
46 |
---- snips-1.2.ORIG/ntpmon/main.c 2008-06-27 13:08:34.000000000 +0100 |
47 |
-+++ snips-1.2/ntpmon/main.c 2008-06-27 13:08:57.000000000 +0100 |
48 |
-@@ -42,10 +42,6 @@ |
49 |
- #include "event_utils.h" |
50 |
- #undef _MAIN_ |
51 |
- |
52 |
--/* function prototypes */ |
53 |
--void set_functions(); |
54 |
--void free_device_list(struct device_info **pslist); |
55 |
-- |
56 |
- /* We keep a linked list of all the devices that we poll and store the |
57 |
- * various thresholds in this linked list. |
58 |
- */ |
59 |
-@@ -55,6 +51,10 @@ |
60 |
- struct device_info *next; |
61 |
- } *device_info_list = NULL; |
62 |
- |
63 |
-+/* function prototypes */ |
64 |
-+void set_functions(); |
65 |
-+void free_device_list(struct device_info **pslist); |
66 |
-+ |
67 |
- int main(ac, av) |
68 |
- int ac; |
69 |
- char **av; |
70 |
|
71 |
diff --git a/net-analyzer/snips/files/snips-1.2-conflicting-types.patch b/net-analyzer/snips/files/snips-1.2-conflicting-types.patch |
72 |
deleted file mode 100644 |
73 |
index 500faba..00000000 |
74 |
--- a/net-analyzer/snips/files/snips-1.2-conflicting-types.patch |
75 |
+++ /dev/null |
76 |
@@ -1,52 +0,0 @@ |
77 |
-diff -ur snips-1.2.ORIG/pingmon/main.c snips-1.2/pingmon/main.c |
78 |
---- snips-1.2.ORIG/pingmon/main.c 2008-06-26 17:45:49.000000000 +0100 |
79 |
-+++ snips-1.2/pingmon/main.c 2008-06-26 17:50:25.000000000 +0100 |
80 |
-@@ -517,7 +517,8 @@ |
81 |
- */ |
82 |
- void set_functions() |
83 |
- { |
84 |
-- int help(), readconfig(), poll_devices(); |
85 |
-+ int readconfig(), poll_devices(); |
86 |
-+ void help(); |
87 |
- |
88 |
- set_help_function(help); |
89 |
- set_readconfig_function(readconfig); |
90 |
-diff -ur snips-1.2.ORIG/portmon/main.c snips-1.2/portmon/main.c |
91 |
---- snips-1.2.ORIG/portmon/main.c 2008-06-26 17:45:49.000000000 +0100 |
92 |
-+++ snips-1.2/portmon/main.c 2008-06-26 17:50:39.000000000 +0100 |
93 |
-@@ -476,7 +476,8 @@ |
94 |
- */ |
95 |
- void set_functions() |
96 |
- { |
97 |
-- int help(), readconfig(), poll_devices(); |
98 |
-+ int readconfig(), poll_devices(); |
99 |
-+ void help(); |
100 |
- |
101 |
- set_help_function(help); |
102 |
- set_readconfig_function(readconfig); |
103 |
-diff -ur snips-1.2.ORIG/radiusmon/main.c snips-1.2/radiusmon/main.c |
104 |
---- snips-1.2.ORIG/radiusmon/main.c 2008-06-26 17:45:49.000000000 +0100 |
105 |
-+++ snips-1.2/radiusmon/main.c 2008-06-26 17:51:05.000000000 +0100 |
106 |
-@@ -261,7 +261,8 @@ |
107 |
- |
108 |
- void set_functions() |
109 |
- { |
110 |
-- int help(), readconfig(); |
111 |
-+ int readconfig(); |
112 |
-+ void help(); |
113 |
- u_long dotest(); |
114 |
- |
115 |
- set_help_function(help); |
116 |
-diff -uNr snips-1.2.ORIG/ntpmon/main.c snips-1.2/ntpmon/main.c |
117 |
---- snips-1.2.ORIG/ntpmon/main.c 2008-06-27 13:12:11.000000000 +0100 |
118 |
-+++ snips-1.2/ntpmon/main.c 2008-06-27 13:12:29.000000000 +0100 |
119 |
-@@ -291,7 +291,8 @@ |
120 |
- */ |
121 |
- void set_functions() |
122 |
- { |
123 |
-- int help(), readconfig(), poll_devices(); |
124 |
-+ int readconfig(), poll_devices(); |
125 |
-+ void help(); |
126 |
- |
127 |
- set_help_function(help); |
128 |
- set_readconfig_function(readconfig); |
129 |
|
130 |
diff --git a/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch b/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch |
131 |
deleted file mode 100644 |
132 |
index c842f27..00000000 |
133 |
--- a/net-analyzer/snips/files/snips-1.2-destdir-awareness.patch |
134 |
+++ /dev/null |
135 |
@@ -1,402 +0,0 @@ |
136 |
-diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid |
137 |
---- snips-1.2.ORIG/etherload/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
138 |
-+++ snips-1.2/etherload/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
139 |
-@@ -25,10 +25,10 @@ |
140 |
- make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG) |
141 |
- |
142 |
- install: $(TARG) |
143 |
-- $(INSTALL) -c -m 4750 $(TARG) $(BINDIR) |
144 |
-+ $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR) |
145 |
- @if [ `whoami` = "root" ]; then \ |
146 |
-- chown root $(BINDIR)/$(TARG) ;\ |
147 |
-- ls -lg $(BINDIR)/$(TARG) ;\ |
148 |
-+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
149 |
-+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
150 |
- else \ |
151 |
- echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ |
152 |
- echo "Do as root manually" ;\ |
153 |
-diff -uNr snips-1.2.ORIG/Makefile.mid snips-1.2/Makefile.mid |
154 |
---- snips-1.2.ORIG/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
155 |
-+++ snips-1.2/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
156 |
-@@ -66,8 +66,8 @@ |
157 |
- |
158 |
- ## Ultrix make balked at the tests for directories, hence the second test |
159 |
- install: installdir lib |
160 |
-- @[ -d $(ROOTDIR) ] && [ -d $(DATADIR) ] && [ -d $(ETCDIR) ] \ |
161 |
-- && [ -d $(BINDIR) ] |
162 |
-+ @[ -d $(DESTDIR)$(ROOTDIR) ] && [ -d $(DESTDIR)$(DATADIR) ] && \ |
163 |
-+ [ -d $(DESTDIR)$(ETCDIR) ] && [ -d $(DESTDIR)$(BINDIR) ] |
164 |
- @-(touch SniPpet ; $(INSTALL) -c -m 750 SniPpet /tmp/;) >/dev/null 2>&1 ; |
165 |
- @(if [ -f /tmp/SniPpet ]; then rm -f SniPpet /tmp/SniPpet; else \ |
166 |
- echo "YOU HAVE AN INCOMPATIBLE install, use 'myinstall' instead" ;\ |
167 |
-@@ -82,10 +82,10 @@ |
168 |
- @echo "" |
169 |
- @echo "Installing sample config files under $(EXAMPLESDIR)/..." |
170 |
- @-for i in */*-confg */*.conf *.conf ; do \ |
171 |
-- $(INSTALL) -m 444 -c $$i $(EXAMPLESDIR)/ ;\ |
172 |
-+ $(INSTALL) -m 444 -c $$i $(DESTDIR)$(EXAMPLESDIR)/ ;\ |
173 |
- done |
174 |
- @if [ ! -f $(ETCDIR)/snips.conf ]; then \ |
175 |
-- $(INSTALL) -c -m 755 snips.conf $(ETCDIR)/snips.conf ;\ |
176 |
-+ $(INSTALL) -c -m 755 snips.conf $(DESTDIR)$(ETCDIR)/snips.conf ;\ |
177 |
- fi |
178 |
- @echo "" ; echo " NOW su AND DO A make root " |
179 |
- |
180 |
-@@ -95,9 +95,9 @@ |
181 |
- @if [ "`$(WHOAMI)`" = "root" ]; then \ |
182 |
- echo "Installing the following programs SUID under $(BINDIR)";\ |
183 |
- echo " multiping etherload trapmon" ;\ |
184 |
-- $(INSTALL) -m 4711 -c pingmon/multiping/multiping $(BINDIR) ;\ |
185 |
-- $(INSTALL) -m 4710 -c etherload/etherload $(BINDIR) ;\ |
186 |
-- $(INSTALL) -m 4710 -c trapmon/trapmon $(BINDIR) ;\ |
187 |
-+ $(INSTALL) -m 4711 -c pingmon/multiping/multiping $(DESTDIR)$(BINDIR) ;\ |
188 |
-+ $(INSTALL) -m 4710 -c etherload/etherload $(DESTDIR)$(BINDIR) ;\ |
189 |
-+ $(INSTALL) -m 4710 -c trapmon/trapmon $(DESTDIR)$(BINDIR) ;\ |
190 |
- else \ |
191 |
- echo "PLEASE RUN make root AS root (currently `whoami`)" ;\ |
192 |
- fi |
193 |
-diff -uNr snips-1.2.ORIG/Makefile.tail snips-1.2/Makefile.tail |
194 |
---- snips-1.2.ORIG/Makefile.tail 2008-06-30 12:42:43.000000000 +0100 |
195 |
-+++ snips-1.2/Makefile.tail 2008-06-30 12:35:38.000000000 +0100 |
196 |
-@@ -9,32 +9,32 @@ |
197 |
- |
198 |
- ## these dirs are listed in Makefile.head |
199 |
- installdir: |
200 |
-- @[ -d $(ROOTDIR) ] || mkdir $(ROOTDIR) |
201 |
-- @[ -d $(BINDIR) ] || mkdir $(BINDIR) |
202 |
-- @[ -d $(DATADIR) ] || mkdir $(DATADIR) |
203 |
-- @[ -d $(ETCDIR) ] || mkdir $(ETCDIR) |
204 |
-- @[ -d $(PIDDIR) ] || mkdir $(PIDDIR) |
205 |
-- @[ -d $(INITDIR) ] || mkdir $(INITDIR) |
206 |
-- @[ -d $(MSGSDIR) ] || mkdir $(MSGSDIR) |
207 |
-- @[ -d $(RRD_DBDIR) ] || mkdir $(RRD_DBDIR) |
208 |
-- @[ -d $(EXAMPLESDIR) ] || mkdir $(EXAMPLESDIR) |
209 |
-- @[ -d $(DEVICEHELPDIR) ] || mkdir $(DEVICEHELPDIR) |
210 |
-- @[ -d $(CGIDIR) ] || mkdir -p $(CGIDIR) |
211 |
-- @[ -d $(HTMLDIR) ] || mkdir -p $(HTMLDIR) |
212 |
-- @[ -d $(ROOTDIR)/logs ] || mkdir $(ROOTDIR)/logs |
213 |
-+ @[ -d $(DESTDIR)$(ROOTDIR) ] || mkdir -p $(DESTDIR)$(ROOTDIR) |
214 |
-+ @[ -d $(DESTDIR)$(BINDIR) ] || mkdir -p $(DESTDIR)$(BINDIR) |
215 |
-+ @[ -d $(DESTDIR)$(DATADIR) ] || mkdir -p $(DESTDIR)$(DATADIR) |
216 |
-+ @[ -d $(DESTDIR)$(ETCDIR) ] || mkdir -p $(DESTDIR)$(ETCDIR) |
217 |
-+ @[ -d $(DESTDIR)$(PIDDIR) ] || mkdir -p $(DESTDIR)$(PIDDIR) |
218 |
-+ @[ -d $(DESTDIR)$(INITDIR) ] || mkdir -p $(DESTDIR)$(INITDIR) |
219 |
-+ @[ -d $(DESTDIR)$(MSGSDIR) ] || mkdir -p $(DESTDIR)$(MSGSDIR) |
220 |
-+ @[ -d $(DESTDIR)$(RRD_DBDIR) ] || mkdir -p $(DESTDIR)$(RRD_DBDIR) |
221 |
-+ @[ -d $(DESTDIR)$(EXAMPLESDIR) ] || mkdir -p $(DESTDIR)$(EXAMPLESDIR) |
222 |
-+ @[ -d $(DESTDIR)$(DEVICEHELPDIR) ] || mkdir -p $(DESTDIR)$(DEVICEHELPDIR) |
223 |
-+ @[ -d $(DESTDIR)$(CGIDIR) ] || mkdir -p $(DESTDIR)$(CGIDIR) |
224 |
-+ @[ -d $(DESTDIR)$(HTMLDIR) ] || mkdir -p $(DESTDIR)$(HTMLDIR) |
225 |
-+ @[ -d $(DESTDIR)$(ROOTDIR)/logs ] || mkdir -p $(DESTDIR)$(ROOTDIR)/logs |
226 |
- |
227 |
- init: |
228 |
-- @if [ ! -z "$(INITFILES)" ] && [ -d "$(INITDIR)" ]; then \ |
229 |
-+ @if [ ! -z "$(INITFILES)" ] && [ -d "$(DESTDIR)$(INITDIR)" ]; then \ |
230 |
- for i in $(INITFILES) x ; \ |
231 |
- do \ |
232 |
- if [ "$$i" = "x" ]; then \ |
233 |
- : ;\ |
234 |
- else \ |
235 |
-- if [ -f "$(INITDIR)/$$i.init" ]; then \ |
236 |
-+ if [ -f "$(DESTDIR)$(INITDIR)/$$i.init" ]; then \ |
237 |
- echo "Not overwriting existing $(INITDIR)/$$i.init";\ |
238 |
- else \ |
239 |
- echo "Installing $$i.init under $(INITDIR)/" ;\ |
240 |
-- ln -s $(BINDIR)/snipsprog.init $(INITDIR)/$$i.init ;\ |
241 |
-+ ln -s $(DESTDIR)$(BINDIR)/snipsprog.init $(DESTDIR)$(INITDIR)/$$i.init ;\ |
242 |
- fi \ |
243 |
- fi \ |
244 |
- done \ |
245 |
-diff -uNr snips-1.2.ORIG/man/Makefile.mid snips-1.2/man/Makefile.mid |
246 |
---- snips-1.2.ORIG/man/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
247 |
-+++ snips-1.2/man/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
248 |
-@@ -26,18 +26,18 @@ |
249 |
- |
250 |
- install: installdir |
251 |
- @echo "Installing in 'man'" |
252 |
-- @- [ -d $(MANDIR) ] || mkdir $(MANDIR) |
253 |
-+ @- [ -d $(DESTDIR)$(MANDIR) ] || mkdir $(DESTDIR)$(MANDIR) |
254 |
- # @-for d in $(MANDIR)/man1 $(MANDIR)/man3 $(MANDIR)/man8; do \ |
255 |
- # [! -d $$d ] && mkdir $$d ;\ |
256 |
- # done |
257 |
- @- for m in $(MANPAGES1); do \ |
258 |
-- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 1`$(MANEXT) ;\ |
259 |
-+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 1`$(MANEXT) ;\ |
260 |
- done |
261 |
- @- for m in $(MANPAGES3); do \ |
262 |
-- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 3`$(MANEXT) ;\ |
263 |
-+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 3`$(MANEXT) ;\ |
264 |
- done |
265 |
- @- for m in $(MANPAGES8); do \ |
266 |
-- $(INSTALL) -c -m 644 $$m.sed $(MANDIR)/`basename $$m 8`$(MANEXT) ;\ |
267 |
-+ $(INSTALL) -c -m 644 $$m.sed $(DESTDIR)$(MANDIR)/`basename $$m 8`$(MANEXT) ;\ |
268 |
- done |
269 |
- |
270 |
- clean: |
271 |
-diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid |
272 |
---- snips-1.2.ORIG/nsmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
273 |
-+++ snips-1.2/nsmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
274 |
-@@ -17,7 +17,7 @@ |
275 |
- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
276 |
- |
277 |
- install: installdir $(TARG) |
278 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
279 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
280 |
- |
281 |
- ## for standalone, need to link with -lresolv or -lbind |
282 |
- nstest: nsmon.c |
283 |
-diff -uNr snips-1.2.ORIG/ntpmon/Makefile.mid snips-1.2/ntpmon/Makefile.mid |
284 |
---- snips-1.2.ORIG/ntpmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
285 |
-+++ snips-1.2/ntpmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
286 |
-@@ -17,7 +17,7 @@ |
287 |
- |
288 |
- |
289 |
- install: installdir $(TARG) |
290 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
291 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
292 |
- |
293 |
- clean: |
294 |
- rm -f $(DIRT) |
295 |
-diff -uNr snips-1.2.ORIG/perl-monitors/Makefile.mid snips-1.2/perl-monitors/Makefile.mid |
296 |
---- snips-1.2.ORIG/perl-monitors/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
297 |
-+++ snips-1.2/perl-monitors/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
298 |
-@@ -62,32 +62,32 @@ |
299 |
- # ideally hostmon-osclients/ need not go into the BINDIR, but we are |
300 |
- # putting it all there for now. |
301 |
- install: |
302 |
-- -@[ -d $(BINDIR)/hostmon-osclients ] || mkdir $(BINDIR)/hostmon-osclients |
303 |
-+ -@[ -d $(DESTDIR)$(BINDIR)/hostmon-osclients ] || mkdir $(DESTDIR)$(BINDIR)/hostmon-osclients |
304 |
- -@echo "Installing files in $(BINDIR)/hostmon-osclients" ;\ |
305 |
- for f in hostmon-osclients/* ; do \ |
306 |
- if [ -f $$f ]; then \ |
307 |
-- $(INSTALL) -c -m 755 $$f $(BINDIR)/hostmon-osclients/ ;\ |
308 |
-+ $(INSTALL) -c -m 755 $$f $(DESTDIR)$(BINDIR)/hostmon-osclients/ ;\ |
309 |
- fi \ |
310 |
- done |
311 |
-- -@cd $(BINDIR)/hostmon-osclients ; \ |
312 |
-+ -@cd $(DESTDIR)$(BINDIR)/hostmon-osclients ; \ |
313 |
- if [ -f hostmon-client.seds ]; then \ |
314 |
- $(INSTALL) -c -m 755 hostmon-client.seds hostmon-client ;\ |
315 |
- rm -f hostmon-client.seds ;\ |
316 |
- fi |
317 |
- -@echo "Installing perl monitors under $(BINDIR)" ;\ |
318 |
- for f in $(PROGS) ; do \ |
319 |
-- $(INSTALL) -c -m 755 $$f.seds $(BINDIR)/$$f ;\ |
320 |
-+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\ |
321 |
- done |
322 |
- -@for f in $(CONF) ; do \ |
323 |
-- if [ ! -f $(ETCDIR)/$$f ]; then \ |
324 |
-- $(INSTALL) -c -m 644 $$f.seds $(ETCDIR)/$$f ;\ |
325 |
-+ if [ ! -f $(DESTDIR)$(ETCDIR)/$$f ]; then \ |
326 |
-+ $(INSTALL) -c -m 644 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ;\ |
327 |
- fi \ |
328 |
- done |
329 |
-- $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(BINDIR)/ |
330 |
-- $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget $(BINDIR)/ |
331 |
-- $(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(ETCDIR)/ |
332 |
-- @if [ -f $(ETCDIR)/mibII.txt ]; then \ |
333 |
-- mv $(ETCDIR)/mibII.txt $(ETCDIR)/mibII.txt.old ;\ |
334 |
-+ $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpwalk $(DESTDIR)$(BINDIR)/ |
335 |
-+ $(INSTALL) -c -m 755 $(CMUSNMP)/snmpapps/snmpget $(DESTDIR)$(BINDIR)/ |
336 |
-+ $(INSTALL) -c -m 444 $(CMUSNMP)/mib-v2.txt $(DESTDIR)$(ETCDIR)/ |
337 |
-+ @if [ -f $(DESTDIR)$(ETCDIR)/mibII.txt ]; then \ |
338 |
-+ mv $(DESTDIR)$(ETCDIR)/mibII.txt $(DESTDIR)$(ETCDIR)/mibII.txt.old ;\ |
339 |
- fi |
340 |
- @echo "See $(SRCDIR)/perl-monotors/README for further customizations" |
341 |
- |
342 |
-diff -uNr snips-1.2.ORIG/pingmon/Makefile.mid snips-1.2/pingmon/Makefile.mid |
343 |
---- snips-1.2.ORIG/pingmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
344 |
-+++ snips-1.2/pingmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
345 |
-@@ -26,11 +26,11 @@ |
346 |
- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
347 |
- |
348 |
- install: installdir $(TARG) |
349 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ ; |
350 |
-- @[ -f $(BINDIR)/ippingmon ] && rm -f $(BINDIR)/ippingmon ; \ |
351 |
-- ln -s $(BINDIR)/$(TARG) $(BINDIR)/ippingmon ;\ |
352 |
-- [ -f $(BINDIR)/rpcpingmon ] && rm -f $(BINDIR)/rpcpingmon ; \ |
353 |
-- ln -s $(BINDIR)/$(TARG) $(BINDIR)/rpcpingmon |
354 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ ; |
355 |
-+ @[ -f $(DESTDIR)$(BINDIR)/ippingmon ] && rm -f $(DESTDIR)$(BINDIR)/ippingmon ; \ |
356 |
-+ ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/ippingmon ;\ |
357 |
-+ [ -f $(DESTDIR)$(BINDIR)/rpcpingmon ] && rm -f $(DESTDIR)$(BINDIR)/rpcpingmon ; \ |
358 |
-+ ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/rpcpingmon |
359 |
- |
360 |
- clean: |
361 |
- rm -f $(DIRT) |
362 |
-diff -uNr snips-1.2.ORIG/pingmon/multiping/Makefile.mid snips-1.2/pingmon/multiping/Makefile.mid |
363 |
---- snips-1.2.ORIG/pingmon/multiping/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
364 |
-+++ snips-1.2/pingmon/multiping/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
365 |
-@@ -14,10 +14,10 @@ |
366 |
- $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) |
367 |
- |
368 |
- install: installdir $(TARG) |
369 |
-- $(INSTALL) -c -m 4711 $(TARG) $(BINDIR)/ |
370 |
-+ $(INSTALL) -c -m 4711 $(TARG) $(DESTDIR)$(BINDIR)/ |
371 |
- @if [ `whoami` = "root" ]; then \ |
372 |
-- chown root $(BINDIR)/$(TARG) ;\ |
373 |
-- ls -lg $(BINDIR)/$(TARG) ;\ |
374 |
-+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
375 |
-+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
376 |
- else \ |
377 |
- echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ |
378 |
- echo "Do as root manually" ;\ |
379 |
-diff -uNr snips-1.2.ORIG/pingmon/rpcping/Makefile.mid snips-1.2/pingmon/rpcping/Makefile.mid |
380 |
---- snips-1.2.ORIG/pingmon/rpcping/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
381 |
-+++ snips-1.2/pingmon/rpcping/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
382 |
-@@ -16,7 +16,7 @@ |
383 |
- $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) |
384 |
- |
385 |
- install: installdir $(TARG) |
386 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
387 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
388 |
- |
389 |
- clean: |
390 |
- rm -f $(DIRT) $(TARG) |
391 |
-diff -uNr snips-1.2.ORIG/portmon/Makefile.mid snips-1.2/portmon/Makefile.mid |
392 |
---- snips-1.2.ORIG/portmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
393 |
-+++ snips-1.2/portmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
394 |
-@@ -15,7 +15,7 @@ |
395 |
- |
396 |
- # |
397 |
- install: installdir $(TARG) |
398 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
399 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
400 |
- |
401 |
- clean: |
402 |
- rm -f $(DIRT) |
403 |
-diff -uNr snips-1.2.ORIG/radiusmon/Makefile.mid snips-1.2/radiusmon/Makefile.mid |
404 |
---- snips-1.2.ORIG/radiusmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
405 |
-+++ snips-1.2/radiusmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
406 |
-@@ -17,7 +17,7 @@ |
407 |
- |
408 |
- |
409 |
- install: installdir $(TARG) |
410 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
411 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
412 |
- |
413 |
- test: radiusmon.c md5.c |
414 |
- $(CC) -c $(CFLAGS) -DDEBUG -DTEST radiusmon.c |
415 |
-diff -uNr snips-1.2.ORIG/snipslog/Makefile.mid snips-1.2/snipslog/Makefile.mid |
416 |
---- snips-1.2.ORIG/snipslog/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
417 |
-+++ snips-1.2/snipslog/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
418 |
-@@ -21,7 +21,7 @@ |
419 |
- $(CC) $(CFLAGS) -DTEST -o snipslogtest snipslogtest.c $(LIBS) |
420 |
- |
421 |
- install: installdir $(TARG) |
422 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
423 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
424 |
- @echo "___Update config file for logging daemon in $(ETCDIR) ___" |
425 |
- |
426 |
- clean: |
427 |
-diff -uNr snips-1.2.ORIG/snipstv/Makefile.mid snips-1.2/snipstv/Makefile.mid |
428 |
---- snips-1.2.ORIG/snipstv/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
429 |
-+++ snips-1.2/snipstv/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
430 |
-@@ -20,9 +20,9 @@ |
431 |
- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
432 |
- |
433 |
- install: installdir $(TARG) |
434 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR) |
435 |
-- [ -r $(BINDIR)/netconsole ] || ln -s $(BINDIR)/$(TARG) $(BINDIR)/netconsole |
436 |
-- $(INSTALL) -c -m 0444 snipstv-help $(ETCDIR) |
437 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR) |
438 |
-+ [ -r $(DESTDIR)$(BINDIR)/netconsole ] || ln -s $(DESTDIR)$(BINDIR)/$(TARG) $(DESTDIR)$(BINDIR)/netconsole |
439 |
-+ $(INSTALL) -c -m 0444 snipstv-help $(DESTDIR)$(ETCDIR) |
440 |
- |
441 |
- clean: |
442 |
- rm -f $(DIRT) filter |
443 |
-diff -uNr snips-1.2.ORIG/snipsweb/Makefile.mid snips-1.2/snipsweb/Makefile.mid |
444 |
---- snips-1.2.ORIG/snipsweb/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
445 |
-+++ snips-1.2/snipsweb/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
446 |
-@@ -32,24 +32,24 @@ |
447 |
- |
448 |
- install: installdir |
449 |
- @for f in $(CGI) ; do \ |
450 |
-- $(INSTALL) -c -m 755 $$f.seds $(CGIDIR)/$$f ; \ |
451 |
-+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(CGIDIR)/$$f ; \ |
452 |
- done |
453 |
- @for f in $(CONFIG) ; do \ |
454 |
-- if [ -f $(ETCDIR)/$$f ]; then \ |
455 |
-+ if [ -f $(DESTDIR)$(ETCDIR)/$$f ]; then \ |
456 |
- echo "Not overwriting existing $(ETCDIR)/$$f" ;\ |
457 |
- else \ |
458 |
-- $(INSTALL) -c -m 755 $$f.seds $(ETCDIR)/$$f ; \ |
459 |
-+ $(INSTALL) -c -m 755 $$f.seds $(DESTDIR)$(ETCDIR)/$$f ; \ |
460 |
- fi ;\ |
461 |
- done |
462 |
-- @[ -f $(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DEVICEHELPDIR)/ |
463 |
-+ @[ -f $(DESTDIR)$(DEVICEHELPDIR)/default ] || $(INSTALL) -c -m 644 default $(DESTDIR)$(DEVICEHELPDIR)/ |
464 |
- @for f in $(HTMLFILES) ; do \ |
465 |
-- if [ -f $(HTMLDIR)/$$f ]; then \ |
466 |
-+ if [ -f $(DESTDIR)$(HTMLDIR)/$$f ]; then \ |
467 |
- echo "Not overwriting existing $(HTMLDIR)/$$f" ;\ |
468 |
- else \ |
469 |
-- $(INSTALL) -c -m 644 $$f $(HTMLDIR)/$$f ; \ |
470 |
-+ $(INSTALL) -c -m 644 $$f $(DESTDIR)$(HTMLDIR)/$$f ; \ |
471 |
- fi ;\ |
472 |
- done ;\ |
473 |
-- cp -r gifs $(HTMLDIR)/gifs |
474 |
-+ cp -r gifs $(DESTDIR)$(HTMLDIR)/gifs |
475 |
- @echo "Installed basic web files under " ; \ |
476 |
- echo " $(HTMLDIR) and $(CGIDIR)" ; \ |
477 |
- echo "Move into desired web location."; \ |
478 |
-diff -uNr snips-1.2.ORIG/tksnips/Makefile.mid snips-1.2/tksnips/Makefile.mid |
479 |
---- snips-1.2.ORIG/tksnips/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
480 |
-+++ snips-1.2/tksnips/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
481 |
-@@ -23,7 +23,7 @@ |
482 |
- cat tkSnips.tix > tkSnips ; |
483 |
- |
484 |
- install: installdir $(TARG) |
485 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
486 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
487 |
- |
488 |
- clean: |
489 |
- rm -f $(DIRT) test |
490 |
-diff -uNr snips-1.2.ORIG/tpmon/Makefile.mid snips-1.2/tpmon/Makefile.mid |
491 |
---- snips-1.2.ORIG/tpmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
492 |
-+++ snips-1.2/tpmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
493 |
-@@ -20,7 +20,7 @@ |
494 |
- $(CC) $(CFLAGS) -o tptest tpmon.o tptest.o |
495 |
- |
496 |
- install: installdir $(TARG) |
497 |
-- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
498 |
-+ $(INSTALL) -c -m 751 $(TARG) $(DESTDIR)$(BINDIR)/ |
499 |
- |
500 |
- clean: |
501 |
- rm -f $(DIRT) tptest |
502 |
-diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid |
503 |
---- snips-1.2.ORIG/trapmon/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
504 |
-+++ snips-1.2/trapmon/Makefile.mid 2008-06-30 12:35:38.000000000 +0100 |
505 |
-@@ -20,10 +20,10 @@ |
506 |
- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
507 |
- |
508 |
- install: $(TARG) |
509 |
-- $(INSTALL) -c -m 4750 $(TARG) $(BINDIR)/ |
510 |
-+ $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ |
511 |
- @if [ `whoami` = "root" ]; then \ |
512 |
-- chown root $(BINDIR)/$(TARG) ;\ |
513 |
-- ls -lg $(BINDIR)/$(TARG) ;\ |
514 |
-+ chown root $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
515 |
-+ ls -lg $(DESTDIR)$(BINDIR)/$(TARG) ;\ |
516 |
- else \ |
517 |
- echo "";echo "___Installed $(TARG) needs to be root suid___" ;\ |
518 |
- echo "Do as root manually" ;\ |
519 |
-diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid |
520 |
---- snips-1.2.ORIG/utility/Makefile.mid 2008-06-30 12:42:43.000000000 +0100 |
521 |
-+++ snips-1.2/utility/Makefile.mid 2008-06-30 12:42:59.000000000 +0100 |
522 |
-@@ -59,12 +59,12 @@ |
523 |
- echo "" |
524 |
- |
525 |
- install: all |
526 |
-- $(INSTALL) -c -m 751 $(CPROGS) $(BINDIR)/ |
527 |
-+ $(INSTALL) -c -m 751 $(CPROGS) $(DESTDIR)$(BINDIR)/ |
528 |
- -@ for f in $(SCRIPTS) ; do \ |
529 |
-- if [ -f $(BINDIR)/$$f ]; then \ |
530 |
-+ if [ -f $(DESTDIR)$(BINDIR)/$$f ]; then \ |
531 |
- echo "Not overwriting existing $(BINDIR)/$$f" ;\ |
532 |
- else \ |
533 |
-- $(INSTALL) -c -m 751 $$f.seds $(BINDIR)/$$f ;\ |
534 |
-+ $(INSTALL) -c -m 751 $$f.seds $(DESTDIR)$(BINDIR)/$$f ;\ |
535 |
- fi ;\ |
536 |
- done |
537 |
- |
538 |
|
539 |
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 |
540 |
deleted file mode 100644 |
541 |
index 037f4a4..00000000 |
542 |
--- a/net-analyzer/snips/files/snips-1.2-etherload-makefile-ordering.patch |
543 |
+++ /dev/null |
544 |
@@ -1,12 +0,0 @@ |
545 |
-diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid |
546 |
---- snips-1.2.ORIG/etherload/Makefile.mid 2012-06-26 15:35:46.329759711 +0100 |
547 |
-+++ snips-1.2/etherload/Makefile.mid 2012-06-26 15:37:13.194765114 +0100 |
548 |
-@@ -19,7 +19,7 @@ |
549 |
- INITFILES = etherload |
550 |
- |
551 |
- $(TARG): $(OBJS) |
552 |
-- $(CC) -o etherload $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) |
553 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ |
554 |
- |
555 |
- standalone: clean |
556 |
- make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG) |
557 |
|
558 |
diff --git a/net-analyzer/snips/files/snips-1.2-implicit-declarations.patch b/net-analyzer/snips/files/snips-1.2-implicit-declarations.patch |
559 |
deleted file mode 100644 |
560 |
index 6e3880c..00000000 |
561 |
--- a/net-analyzer/snips/files/snips-1.2-implicit-declarations.patch |
562 |
+++ /dev/null |
563 |
@@ -1,130 +0,0 @@ |
564 |
---- snips-1.2/cmu-snmp/snmp/asn1.c.orig 2008-06-26 17:09:24.000000000 +0100 |
565 |
-+++ snips-1.2/cmu-snmp/snmp/asn1.c 2008-06-26 17:09:47.000000000 +0100 |
566 |
-@@ -36,6 +36,7 @@ |
567 |
- #endif /* HAVE_CONFIG_H */ |
568 |
- |
569 |
- #include <stdio.h> |
570 |
-+#include <string.h> |
571 |
- #include <sys/types.h> |
572 |
- #ifdef WIN32 |
573 |
- #include <memory.h> |
574 |
---- snips-1.2/cmu-snmp/snmp/snmp_api.c.orig 2008-06-26 17:11:36.000000000 +0100 |
575 |
-+++ snips-1.2/cmu-snmp/snmp/snmp_api.c 2008-06-26 17:11:44.000000000 +0100 |
576 |
-@@ -27,6 +27,7 @@ |
577 |
- #endif /* HAVE_CONFIG_H */ |
578 |
- |
579 |
- #include <stdio.h> |
580 |
-+#include <string.h> |
581 |
- #include <sys/types.h> |
582 |
- #include <ctype.h> |
583 |
- #include <errno.h> |
584 |
---- snips-1.2/cmu-snmp/snmp/mib.c.orig 2008-06-26 17:12:42.000000000 +0100 |
585 |
-+++ snips-1.2/cmu-snmp/snmp/mib.c 2008-06-26 17:12:54.000000000 +0100 |
586 |
-@@ -24,6 +24,7 @@ |
587 |
- #endif /* HAVE_CONFIG_H */ |
588 |
- |
589 |
- #include <stdio.h> |
590 |
-+#include <string.h> |
591 |
- |
592 |
- #ifdef HAVE_STDLIB_H |
593 |
- #include <stdlib.h> |
594 |
---- snips-1.2/cmu-snmp/snmp/snmp_pdu.c.orig 2008-06-26 17:10:12.000000000 +0100 |
595 |
-+++ snips-1.2/cmu-snmp/snmp/snmp_pdu.c 2008-06-26 17:10:22.000000000 +0100 |
596 |
-@@ -38,6 +38,7 @@ |
597 |
- #endif /* HAVE_CONFIG_H */ |
598 |
- |
599 |
- #include <stdio.h> |
600 |
-+#include <string.h> |
601 |
- #include <errno.h> |
602 |
- #include <sys/types.h> |
603 |
- |
604 |
---- snips-1.2/cmu-snmp/snmp/snmp_vars.c.orig 2008-06-26 17:10:44.000000000 +0100 |
605 |
-+++ snips-1.2/cmu-snmp/snmp/snmp_vars.c 2008-06-26 17:10:52.000000000 +0100 |
606 |
-@@ -36,6 +36,7 @@ |
607 |
- #endif /* HAVE_CONFIG_H */ |
608 |
- |
609 |
- #include <stdio.h> |
610 |
-+#include <string.h> |
611 |
- #include <errno.h> |
612 |
- #include <sys/types.h> |
613 |
- |
614 |
---- snips-1.2/cmu-snmp/snmp/new-parse.c.orig 2008-06-26 17:13:44.000000000 +0100 |
615 |
-+++ snips-1.2/cmu-snmp/snmp/new-parse.c 2008-06-26 17:13:50.000000000 +0100 |
616 |
-@@ -30,6 +30,7 @@ |
617 |
- #endif /* HAVE_CONFIG_H */ |
618 |
- |
619 |
- #include <stdio.h> |
620 |
-+#include <string.h> |
621 |
- #include <sys/types.h> |
622 |
- |
623 |
- #ifdef HAVE_STRINGS_H |
624 |
---- snips-1.2/cmu-snmp/snmp/snmp_api_util.c.orig 2008-06-26 17:14:38.000000000 +0100 |
625 |
-+++ snips-1.2/cmu-snmp/snmp/snmp_api_util.c 2008-06-26 17:14:46.000000000 +0100 |
626 |
-@@ -27,6 +27,7 @@ |
627 |
- #endif /* HAVE_CONFIG_H */ |
628 |
- |
629 |
- #include <stdio.h> |
630 |
-+#include <string.h> |
631 |
- #include <sys/types.h> |
632 |
- |
633 |
- #ifdef WIN32 |
634 |
---- snips-1.2/cmu-snmp/snmp/parse.c.orig 2008-06-26 17:13:18.000000000 +0100 |
635 |
-+++ snips-1.2/cmu-snmp/snmp/parse.c 2008-06-26 17:13:26.000000000 +0100 |
636 |
-@@ -42,6 +42,7 @@ |
637 |
- #endif /* HAVE_STDLIB_H */ |
638 |
- |
639 |
- #include <stdio.h> |
640 |
-+#include <string.h> |
641 |
- #include <ctype.h> |
642 |
- #include <sys/types.h> |
643 |
- #include "asn1.h" |
644 |
---- snips-1.2/cmu-snmp/snmp/mini-client.c.orig 2008-06-26 17:12:21.000000000 +0100 |
645 |
-+++ snips-1.2/cmu-snmp/snmp/mini-client.c 2008-06-26 17:12:27.000000000 +0100 |
646 |
-@@ -37,6 +37,7 @@ |
647 |
- #include <sys/types.h> |
648 |
- #include <fcntl.h> |
649 |
- #include <stdio.h> |
650 |
-+#include <string.h> |
651 |
- #include <assert.h> |
652 |
- #include <ctype.h> |
653 |
- #include <errno.h> |
654 |
---- snips-1.2/lib/rrd_funcs.c.orig 2008-06-26 17:08:40.000000000 +0100 |
655 |
-+++ snips-1.2/lib/rrd_funcs.c 2008-06-26 17:08:49.000000000 +0100 |
656 |
-@@ -38,6 +38,7 @@ |
657 |
- #include "osdefs.h" |
658 |
- #include <sys/types.h> |
659 |
- #include <stdio.h> |
660 |
-+#include <string.h> |
661 |
- #include <errno.h> |
662 |
- #ifndef NeXT |
663 |
- # include <unistd.h> /* for access(), lseek() */ |
664 |
---- snips-1.2/cmu-snmp/snmp/snmp_api_error.c.orig 2008-06-26 17:23:56.000000000 +0100 |
665 |
-+++ snips-1.2/cmu-snmp/snmp/snmp_api_error.c 2008-06-26 17:24:06.000000000 +0100 |
666 |
-@@ -35,6 +35,7 @@ |
667 |
- #endif /* HAVE_CONFIG_H */ |
668 |
- |
669 |
- #include <stdio.h> |
670 |
-+#include <string.h> |
671 |
- #include <sys/types.h> |
672 |
- |
673 |
- #ifdef HAVE_STRINGS_H |
674 |
---- snips-1.2/cmu-snmp/snmp/snmp_extra.c.orig 2008-06-26 17:22:57.000000000 +0100 |
675 |
-+++ snips-1.2/cmu-snmp/snmp/snmp_extra.c 2008-06-26 17:23:05.000000000 +0100 |
676 |
-@@ -36,6 +36,7 @@ |
677 |
- #endif /* HAVE_CONFIG_H */ |
678 |
- |
679 |
- #include <stdio.h> |
680 |
-+#include <string.h> |
681 |
- #include <ctype.h> |
682 |
- #include <sys/types.h> |
683 |
- |
684 |
---- snips-1.2/cmu-snmp/snmp/coexistance.c.orig 2008-06-26 17:23:26.000000000 +0100 |
685 |
-+++ snips-1.2/cmu-snmp/snmp/coexistance.c 2008-06-26 17:23:33.000000000 +0100 |
686 |
-@@ -32,6 +32,7 @@ |
687 |
- #endif /* HAVE_CONFIG_H */ |
688 |
- |
689 |
- #include <stdio.h> |
690 |
-+#include <string.h> |
691 |
- #ifdef WIN32 |
692 |
- #include <winsock2.h> |
693 |
- #else /* WIN32 */ |
694 |
|
695 |
diff --git a/net-analyzer/snips/files/snips-1.2-install-missing.patch b/net-analyzer/snips/files/snips-1.2-install-missing.patch |
696 |
deleted file mode 100644 |
697 |
index f9af708..00000000 |
698 |
--- a/net-analyzer/snips/files/snips-1.2-install-missing.patch |
699 |
+++ /dev/null |
700 |
@@ -1,33 +0,0 @@ |
701 |
-diff -uNr snips-1.2.ORIG/perl-monitors/Makefile.mid snips-1.2/perl-monitors/Makefile.mid |
702 |
---- snips-1.2.ORIG/perl-monitors/Makefile.mid 2008-07-04 11:24:23.000000000 +0100 |
703 |
-+++ snips-1.2/perl-monitors/Makefile.mid 2008-07-04 11:28:02.000000000 +0100 |
704 |
-@@ -17,7 +17,7 @@ |
705 |
- PROGS = apcmon armon bgpmon bpmon ciscomon modemmon novellmon nrmon \ |
706 |
- hostmon hostmon-collector hostmon-osclients/hostmon-client \ |
707 |
- smbmon sqlmon snmpmon snmpmon-collector snmpgeneric \ |
708 |
-- syslogmon upsmon rcisco testlog |
709 |
-+ syslogmon upsmon rcisco testlog snmpgeneric2 |
710 |
- |
711 |
- # to create init files to start/stop programs |
712 |
- INITFILES = apcmon armon bgpmon bpmon ciscomon modemmon novellmon nrmon \ |
713 |
-@@ -89,7 +89,7 @@ |
714 |
- @if [ -f $(DESTDIR)$(ETCDIR)/mibII.txt ]; then \ |
715 |
- mv $(DESTDIR)$(ETCDIR)/mibII.txt $(DESTDIR)$(ETCDIR)/mibII.txt.old ;\ |
716 |
- fi |
717 |
-- @echo "See $(SRCDIR)/perl-monotors/README for further customizations" |
718 |
-+ @echo "See $(SRCDIR)/perl-monitors/README for further customizations" |
719 |
- |
720 |
- clean: |
721 |
- @-cd $(CMUSNMP)/snmpapps; make realclean |
722 |
-diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid |
723 |
---- snips-1.2.ORIG/utility/Makefile.mid 2008-07-04 11:24:23.000000000 +0100 |
724 |
-+++ snips-1.2/utility/Makefile.mid 2008-07-04 11:25:13.000000000 +0100 |
725 |
-@@ -6,7 +6,7 @@ |
726 |
- |
727 |
- SHSCRIPTS = crontab.snips snipsprog.init |
728 |
- PERLSCRIPTS = keepalive_monitors.pl logstats.pl logmaint.pl \ |
729 |
-- docrypt.pl notifier.pl |
730 |
-+ docrypt.pl notifier.pl snmpconf.pl |
731 |
- SCRIPTS = $(SHSCRIPTS) $(PERLSCRIPTS) |
732 |
- |
733 |
- CPROGS = display_snips_datafile eventselect |
734 |
|
735 |
diff --git a/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch b/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch |
736 |
deleted file mode 100644 |
737 |
index d298ed3..00000000 |
738 |
--- a/net-analyzer/snips/files/snips-1.2-ldflags-respect.patch |
739 |
+++ /dev/null |
740 |
@@ -1,184 +0,0 @@ |
741 |
-diff -uNr snips-1.2.ORIG/etherload/Makefile.mid snips-1.2/etherload/Makefile.mid |
742 |
---- snips-1.2.ORIG/etherload/Makefile.mid 2012-06-26 14:43:15.818552541 +0100 |
743 |
-+++ snips-1.2/etherload/Makefile.mid 2012-06-26 14:48:11.983571994 +0100 |
744 |
-@@ -19,7 +19,7 @@ |
745 |
- INITFILES = etherload |
746 |
- |
747 |
- $(TARG): $(OBJS) |
748 |
-- $(CC) -o etherload $(CFLAGS) $(OBJS) $(LIBS) |
749 |
-+ $(CC) -o etherload $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) |
750 |
- |
751 |
- standalone: clean |
752 |
- make CFLAGS="$(CFLAGS) -DSTANDALONE" $(TARG) |
753 |
-diff -uNr snips-1.2.ORIG/lib/Makefile.mid snips-1.2/lib/Makefile.mid |
754 |
---- snips-1.2.ORIG/lib/Makefile.mid 2012-06-26 14:43:15.791552541 +0100 |
755 |
-+++ snips-1.2/lib/Makefile.mid 2012-06-26 14:44:51.073558777 +0100 |
756 |
-@@ -49,7 +49,7 @@ |
757 |
- echo "Generating ../perl-module/Makefile"; \ |
758 |
- (cd ../perl-module; \ |
759 |
- perl Makefile.PL \ |
760 |
-- CC="$(CC)" LD="$(CC)" OPTIMIZE="$(CFLAGS)" LIBS="$(LIBS)" \ |
761 |
-+ CC="$(CC)" LD="$(CC)" OPTIMIZE="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \ |
762 |
- INSTALLSITELIB=$(ROOTDIR)/lib/perl INSTALLSITEARCH=$(ROOTDIR)/lib/perl INSTALLARCHLIB=$(ROOTDIR)/lib/perl INSTALLMAN3DIR=$(MANDIR) ; \ |
763 |
- ) >/dev/null ;\ |
764 |
- fi |
765 |
-diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid |
766 |
---- snips-1.2.ORIG/nsmon/Makefile.mid 2012-06-26 14:43:15.817552541 +0100 |
767 |
-+++ snips-1.2/nsmon/Makefile.mid 2012-06-26 14:47:26.847568340 +0100 |
768 |
-@@ -14,7 +14,7 @@ |
769 |
- |
770 |
- |
771 |
- $(TARG): $(OBJS) Makefile |
772 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
773 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
774 |
- |
775 |
- install: installdir $(TARG) |
776 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
777 |
-diff -uNr snips-1.2.ORIG/ntpmon/Makefile.mid snips-1.2/ntpmon/Makefile.mid |
778 |
---- snips-1.2.ORIG/ntpmon/Makefile.mid 2012-06-26 14:43:15.807552541 +0100 |
779 |
-+++ snips-1.2/ntpmon/Makefile.mid 2012-06-26 14:46:28.392565438 +0100 |
780 |
-@@ -13,7 +13,7 @@ |
781 |
- INITFILES = ntpmon |
782 |
- |
783 |
- $(TARG): $(OBJS) Makefile |
784 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
785 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
786 |
- |
787 |
- |
788 |
- install: installdir $(TARG) |
789 |
-diff -uNr snips-1.2.ORIG/pingmon/Makefile.mid snips-1.2/pingmon/Makefile.mid |
790 |
---- snips-1.2.ORIG/pingmon/Makefile.mid 2012-06-26 14:43:15.819552541 +0100 |
791 |
-+++ snips-1.2/pingmon/Makefile.mid 2012-06-26 14:48:57.503574984 +0100 |
792 |
-@@ -23,7 +23,7 @@ |
793 |
- INITFILES = ippingmon rpcpingmon |
794 |
- |
795 |
- $(TARG): $(OBJS) Makefile |
796 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
797 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
798 |
- |
799 |
- install: installdir $(TARG) |
800 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ ; |
801 |
-diff -uNr snips-1.2.ORIG/pingmon/multiping/Makefile.mid snips-1.2/pingmon/multiping/Makefile.mid |
802 |
---- snips-1.2.ORIG/pingmon/multiping/Makefile.mid 2012-06-26 14:43:15.819552541 +0100 |
803 |
-+++ snips-1.2/pingmon/multiping/Makefile.mid 2012-06-26 14:48:25.751573031 +0100 |
804 |
-@@ -11,7 +11,7 @@ |
805 |
- OBJS = multiping.o |
806 |
- |
807 |
- $(TARG): $(OBJS) Makefile |
808 |
-- $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) |
809 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) -o $(TARG) |
810 |
- |
811 |
- install: installdir $(TARG) |
812 |
- $(INSTALL) -c -m 4711 $(TARG) $(BINDIR)/ |
813 |
-diff -uNr snips-1.2.ORIG/pingmon/rpcping/Makefile.mid snips-1.2/pingmon/rpcping/Makefile.mid |
814 |
---- snips-1.2.ORIG/pingmon/rpcping/Makefile.mid 2012-06-26 14:43:15.819552541 +0100 |
815 |
-+++ snips-1.2/pingmon/rpcping/Makefile.mid 2012-06-26 14:48:46.799574327 +0100 |
816 |
-@@ -13,7 +13,7 @@ |
817 |
- OBJS = rpcping.o |
818 |
- |
819 |
- $(TARG): $(OBJS) Makefile |
820 |
-- $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) -o $(TARG) |
821 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) -o $(TARG) |
822 |
- |
823 |
- install: installdir $(TARG) |
824 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR)/ |
825 |
-diff -uNr snips-1.2.ORIG/portmon/Makefile.mid snips-1.2/portmon/Makefile.mid |
826 |
---- snips-1.2.ORIG/portmon/Makefile.mid 2012-06-26 14:43:15.796552541 +0100 |
827 |
-+++ snips-1.2/portmon/Makefile.mid 2012-06-26 14:45:28.936561270 +0100 |
828 |
-@@ -11,7 +11,7 @@ |
829 |
- PROGLIBS = |
830 |
- |
831 |
- $(TARG): $(OBJS) Makefile |
832 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $(TARG) |
833 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $(TARG) |
834 |
- |
835 |
- # |
836 |
- install: installdir $(TARG) |
837 |
-diff -uNr snips-1.2.ORIG/radiusmon/Makefile.mid snips-1.2/radiusmon/Makefile.mid |
838 |
---- snips-1.2.ORIG/radiusmon/Makefile.mid 2012-06-26 14:43:15.815552541 +0100 |
839 |
-+++ snips-1.2/radiusmon/Makefile.mid 2012-06-26 14:46:41.096566075 +0100 |
840 |
-@@ -13,7 +13,7 @@ |
841 |
- INITFILES = radiusmon |
842 |
- |
843 |
- $(TARG): $(OBJS) Makefile |
844 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
845 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
846 |
- |
847 |
- |
848 |
- install: installdir $(TARG) |
849 |
-diff -uNr snips-1.2.ORIG/snipslog/Makefile.mid snips-1.2/snipslog/Makefile.mid |
850 |
---- snips-1.2.ORIG/snipslog/Makefile.mid 2012-06-26 14:43:15.817552541 +0100 |
851 |
-+++ snips-1.2/snipslog/Makefile.mid 2012-06-26 14:47:47.263570500 +0100 |
852 |
-@@ -15,7 +15,7 @@ |
853 |
- INITFILES = snipslogd |
854 |
- |
855 |
- $(TARG): $(OBJS) Makefile |
856 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $(TARG) |
857 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $(TARG) |
858 |
- |
859 |
- snipslogtest: snipslogtest.o |
860 |
- $(CC) $(CFLAGS) -DTEST -o snipslogtest snipslogtest.c $(LIBS) |
861 |
-diff -uNr snips-1.2.ORIG/snipstv/Makefile.mid snips-1.2/snipstv/Makefile.mid |
862 |
---- snips-1.2.ORIG/snipstv/Makefile.mid 2012-06-26 14:43:15.818552541 +0100 |
863 |
-+++ snips-1.2/snipstv/Makefile.mid 2012-06-26 14:47:56.599570885 +0100 |
864 |
-@@ -17,7 +17,7 @@ |
865 |
- update_msgwin.o update_promptwin.o update_title.o |
866 |
- |
867 |
- $(TARG): $(OBJS) Makefile |
868 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
869 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
870 |
- |
871 |
- install: installdir $(TARG) |
872 |
- $(INSTALL) -c -m 751 $(TARG) $(BINDIR) |
873 |
-diff -uNr snips-1.2.ORIG/tksnips/Makefile.mid snips-1.2/tksnips/Makefile.mid |
874 |
---- snips-1.2.ORIG/tksnips/Makefile.mid 2012-06-26 14:43:15.792552541 +0100 |
875 |
-+++ snips-1.2/tksnips/Makefile.mid 2012-06-26 14:45:03.849559610 +0100 |
876 |
-@@ -15,7 +15,7 @@ |
877 |
- all: $(TARG) |
878 |
- |
879 |
- ndaemon: $(OBJS) Makefile |
880 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
881 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
882 |
- |
883 |
- tkSnips: tkSnips.tix |
884 |
- @echo "Doing substitutions on tkSnips" ;\ |
885 |
-diff -uNr snips-1.2.ORIG/tpmon/Makefile.mid snips-1.2/tpmon/Makefile.mid |
886 |
---- snips-1.2.ORIG/tpmon/Makefile.mid 2012-06-26 14:43:15.788552541 +0100 |
887 |
-+++ snips-1.2/tpmon/Makefile.mid 2012-06-26 14:44:04.585555459 +0100 |
888 |
-@@ -11,7 +11,7 @@ |
889 |
- PROGLIBS = |
890 |
- |
891 |
- $(TARG): $(OBJS) Makefile |
892 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) -o $@ |
893 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ |
894 |
- |
895 |
- ###### |
896 |
- # small testing program to demonstrate the throughput() function |
897 |
-diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid |
898 |
---- snips-1.2.ORIG/trapmon/Makefile.mid 2012-06-26 14:43:15.816552541 +0100 |
899 |
-+++ snips-1.2/trapmon/Makefile.mid 2012-06-26 14:47:17.560568478 +0100 |
900 |
-@@ -17,7 +17,7 @@ |
901 |
- INITFILES = trapmon |
902 |
- |
903 |
- $(TARG): $(OBJS) Makefile |
904 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
905 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
906 |
- |
907 |
- install: $(TARG) |
908 |
- $(INSTALL) -c -m 4750 $(TARG) $(BINDIR)/ |
909 |
-diff -uNr snips-1.2.ORIG/utility/Makefile.mid snips-1.2/utility/Makefile.mid |
910 |
---- snips-1.2.ORIG/utility/Makefile.mid 2012-06-26 14:43:15.801552541 +0100 |
911 |
-+++ snips-1.2/utility/Makefile.mid 2012-06-26 14:45:49.512562573 +0100 |
912 |
-@@ -25,10 +25,10 @@ |
913 |
- all: $(CPROGS) sed |
914 |
- |
915 |
- display_snips_datafile: display_snips_datafile.o |
916 |
-- $(CC) $(CFLAGS) $@.o $(LIBS) $(PROGLIBS) -o $@ |
917 |
-+ $(CC) $(CFLAGS) $@.o $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
918 |
- |
919 |
- eventselect: eventselect.o |
920 |
-- $(CC) $(CFLAGS) $@.o $(LIBS) $(PROGLIBS) -o $@ |
921 |
-+ $(CC) $(CFLAGS) $@.o $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
922 |
- |
923 |
- |
924 |
- sed: |
925 |
|
926 |
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 |
927 |
deleted file mode 100644 |
928 |
index 23098c0..00000000 |
929 |
--- a/net-analyzer/snips/files/snips-1.2-link-correct-snmp-lib.patch |
930 |
+++ /dev/null |
931 |
@@ -1,12 +0,0 @@ |
932 |
-diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid |
933 |
---- snips-1.2.ORIG/trapmon/Makefile.mid 2008-07-04 15:39:00.000000000 +0100 |
934 |
-+++ snips-1.2/trapmon/Makefile.mid 2008-07-04 15:39:22.000000000 +0100 |
935 |
-@@ -17,7 +17,7 @@ |
936 |
- INITFILES = trapmon |
937 |
- |
938 |
- $(TARG): $(OBJS) Makefile |
939 |
-- $(CC) $(CFLAGS) $(OBJS) $(LIBS) $(PROGLIBS) -o $@ |
940 |
-+ $(CC) $(CFLAGS) $(OBJS) $(PROGLIBS) $(LIBS) -o $@ |
941 |
- |
942 |
- install: $(TARG) |
943 |
- $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ |
944 |
|
945 |
diff --git a/net-analyzer/snips/files/snips-1.2-linux3.patch b/net-analyzer/snips/files/snips-1.2-linux3.patch |
946 |
deleted file mode 100644 |
947 |
index fd2d096..00000000 |
948 |
--- a/net-analyzer/snips/files/snips-1.2-linux3.patch |
949 |
+++ /dev/null |
950 |
@@ -1,26 +0,0 @@ |
951 |
-Index: snips-1.2/Configure |
952 |
-=================================================================== |
953 |
---- snips-1.2.orig/Configure |
954 |
-+++ snips-1.2/Configure |
955 |
-@@ -274,7 +274,7 @@ case "$OS" in |
956 |
- CURSESLIB='-lncurses -ltermcap' |
957 |
- PING="/bin/ping" |
958 |
- ;; |
959 |
-- LINUX20|Linux\ 2*) |
960 |
-+ LINUX20|Linux\ [23]*) |
961 |
- OS_CFLAGS="-DLINUX2"; |
962 |
- OS_LIBS="${LIBRESOLV}" |
963 |
- if [ -f /usr/lib/libgdbm.so ]; then |
964 |
-Index: snips-1.2/utility/snipsprog.init |
965 |
-=================================================================== |
966 |
---- snips-1.2.orig/utility/snipsprog.init |
967 |
-+++ snips-1.2/utility/snipsprog.init |
968 |
-@@ -45,7 +45,7 @@ getpid() { |
969 |
- |
970 |
- # Finally try to extract it from ps depending on the OS |
971 |
- case "`uname -s -r`" in |
972 |
-- LINUX20|Linux\ 2*) |
973 |
-+ LINUX20|Linux\ [23]*) |
974 |
- ps auxw | awk 'BEGIN { prog=ARGV[1]; dir=ARGV[2]; ARGC=1 } |
975 |
- { if ((prog == $11) || (("(" prog ")") == $11) || |
976 |
- ((prog ":") == $11) || ((dir "/" prog) == $11)) |
977 |
|
978 |
diff --git a/net-analyzer/snips/files/snips-1.2-non-interactive.patch b/net-analyzer/snips/files/snips-1.2-non-interactive.patch |
979 |
deleted file mode 100644 |
980 |
index c6cb833..00000000 |
981 |
--- a/net-analyzer/snips/files/snips-1.2-non-interactive.patch |
982 |
+++ /dev/null |
983 |
@@ -1,93 +0,0 @@ |
984 |
---- snips-1.2/Configure.orig 2008-06-26 16:46:49.000000000 +0100 |
985 |
-+++ snips-1.2/Configure 2008-06-26 16:48:10.000000000 +0100 |
986 |
-@@ -72,11 +72,7 @@ |
987 |
- if [ -f $PREVDEFS ]; then |
988 |
- echo "You seem to have already run $0 before, would you like" |
989 |
- echo "to take your previous answers as defaults [n]: " | tr -d '\012' |
990 |
-- read input |
991 |
-- if [ "$input" = "Y" ] || [ "$input" = "y" ] |
992 |
-- then |
993 |
- . ./$PREVDEFS |
994 |
-- fi |
995 |
- fi |
996 |
- |
997 |
- cat <<! |
998 |
-@@ -93,14 +89,11 @@ |
999 |
- ! |
1000 |
- |
1001 |
- echo "Enter top level directory [${ROOTDIR}]: " | tr -d '\012' |
1002 |
--read input ; if [ "X$input" != "X" ]; then ROOTDIR=${input}; fi |
1003 |
- |
1004 |
- MANDIR=${ROOTDIR}/man |
1005 |
- echo "Enter location of man pages [${MANDIR}]: " | tr -d '\012' |
1006 |
--read input ; if [ "X$input" != "X" ]; then MANDIR=${input} ; fi |
1007 |
- |
1008 |
- echo "Enter extension for man pages [${MANEXT}]: " | tr -d '\012' |
1009 |
--read input ; if [ "X$input" != "X" ]; then MANEXT=${input} ; fi |
1010 |
- |
1011 |
- cat <<! |
1012 |
- |
1013 |
-@@ -115,34 +108,27 @@ |
1014 |
- if [ ! -f ${MAIL} ]; then MAIL=/bin/mail ; fi |
1015 |
- if [ ! -f ${MAIL} ]; then MAIL=/usr/bin/mail ; fi |
1016 |
- echo "Where is your MAIL program located? [${MAIL}] :" | tr -d '\012' |
1017 |
--read input ; if [ "X$input" != "X" ]; then MAIL="${input}" ; fi |
1018 |
- if [ ! -f ${MAIL} ]; then echo "WARNING, ${MAIL} does not exist" ; fi |
1019 |
- |
1020 |
- echo "Where should the operational email go? [${OPSMAIL}] :" | tr -d '\012' |
1021 |
--read input ; if [ "X$input" != "X" ]; then OPSMAIL="${input}" ; fi |
1022 |
- |
1023 |
- echo "Where should the admin email go? [${ADMINMAIL}] :" | tr -d '\012' |
1024 |
--read input ; if [ "X$input" != "X" ]; then ADMINMAIL="${input}" ; fi |
1025 |
- |
1026 |
- |
1027 |
- ## |
1028 |
- ## |
1029 |
- echo "" |
1030 |
- echo "Which compiler would you like to use? [${CC}]: " | tr -d '\012' |
1031 |
--read input ; if [ "X$input" != "X" ]; then CC="${input}" ; fi |
1032 |
- |
1033 |
- echo "What compiler options do you want (-DDEBUG)? [${CFLAGS}]: " | tr -d '\012' |
1034 |
--read input ; if [ "X$input" != "X" ]; then CFLAGS="${input}" ; fi |
1035 |
- |
1036 |
- echo "What linker options do you want (-L/local/lib -lbind)? [${LIBS}]: " | tr -d '\012' |
1037 |
--read input ; if [ "X$input" != "X" ]; then LIBS="${input}" ; fi |
1038 |
- |
1039 |
- (mkdir TemP; cd TemP; ${YACC}) 2>&1 | egrep -i 'not.*found' >/dev/null 2>&1 |
1040 |
- if [ $? = 0 ]; then |
1041 |
- echo "${YACC} NOT FOUND" |
1042 |
- YACC="bison -y" |
1043 |
- echo "Enter an alternative to yacc [${YACC}]: " | tr -d '\012' |
1044 |
-- read input ; if [ "X$input" != "X" ]; then YACC="${input}" ; fi |
1045 |
- fi |
1046 |
- rm -rf TemP |
1047 |
- |
1048 |
-@@ -150,7 +136,6 @@ |
1049 |
- if [ ! -f ${PERL} ]; then PERL=/usr/local/bin/perl ; fi |
1050 |
- if [ ! -f ${PERL} ]; then |
1051 |
- echo "Where is PERL located on your system? [$PERL]: "| tr -d '\012' |
1052 |
-- read input ; if [ "X$input" != "X" ]; then PERL="${input}" ; fi |
1053 |
- if [ ! -f ${PERL} ]; then echo "WARNING, ${PERL} does not exist" ; fi |
1054 |
- fi |
1055 |
- |
1056 |
-@@ -161,12 +146,10 @@ |
1057 |
- if [ -d $RRDLIBDIR ]; then RRDCFLAGS="-DRRDTOOL" ; fi |
1058 |
- if [ "$RRDCFLAGS" = "" ]; then definput="n" ; else definput="y" ; fi |
1059 |
- echo "Do you have RRDtool installed (www.caida.org)? [$definput]: " | tr -d '\012' |
1060 |
--read input |
1061 |
- if [ "X$input" = "X" ]; then input=$definput ; fi |
1062 |
- if [ "$input" = "y" ] || [ "$input" = "Y" ]; then |
1063 |
- RRDCFLAGS="-DRRDTOOL" |
1064 |
- echo "Enter path to the RRD library [$RRDLIBDIR]: " | tr -d '\012' |
1065 |
-- read input ; if [ "X$input" != "X" ]; then RRDLIBDIR="${input}"; fi |
1066 |
- |
1067 |
- if [ ! -f $RRDLIBDIR/librrd.a ]; then |
1068 |
- echo "WARNING, $RRDLIBDIR/librrd.a not found" |
1069 |
-@@ -181,7 +164,6 @@ |
1070 |
- ## Check if they want the old NOCOL mode |
1071 |
- #echo "" |
1072 |
- #echo "Do you want to compile using the old NOCOL event structure? [no]: " | tr -d '\012' |
1073 |
--#read input ; if [ "X$input" != "X" ]; then CFLAGS="${CFLAGS} -DNOCOL" ; fi |
1074 |
- |
1075 |
- |
1076 |
- ## |
1077 |
|
1078 |
diff --git a/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch b/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch |
1079 |
deleted file mode 100644 |
1080 |
index 22e2e53..00000000 |
1081 |
--- a/net-analyzer/snips/files/snips-1.2-nsmon-libresolv.patch |
1082 |
+++ /dev/null |
1083 |
@@ -1,15 +0,0 @@ |
1084 |
-diff -uNr snips-1.2.ORIG/nsmon/Makefile.mid snips-1.2/nsmon/Makefile.mid |
1085 |
---- snips-1.2.ORIG/nsmon/Makefile.mid 2012-06-26 14:58:39.418613245 +0100 |
1086 |
-+++ snips-1.2/nsmon/Makefile.mid 2012-06-26 14:59:08.018615168 +0100 |
1087 |
-@@ -3,10 +3,8 @@ |
1088 |
- # Makefile for 'nsmon' |
1089 |
- # |
1090 |
- |
1091 |
--# Might need to link with 'libresolv' on some systems |
1092 |
-- |
1093 |
- PROGCDEFS = |
1094 |
--PROGLIBS = # -lresolv |
1095 |
-+PROGLIBS = -lresolv |
1096 |
- |
1097 |
- TARG = nsmon |
1098 |
- OBJS = main.o nsmon.o |
1099 |
|
1100 |
diff --git a/net-analyzer/snips/files/snips-1.2-parallel-make.patch b/net-analyzer/snips/files/snips-1.2-parallel-make.patch |
1101 |
deleted file mode 100644 |
1102 |
index effa673..00000000 |
1103 |
--- a/net-analyzer/snips/files/snips-1.2-parallel-make.patch |
1104 |
+++ /dev/null |
1105 |
@@ -1,23 +0,0 @@ |
1106 |
-diff -uNr snips-1.2.ORIG/Makefile.mid snips-1.2/Makefile.mid |
1107 |
---- snips-1.2.ORIG/Makefile.mid 2012-06-26 15:53:26.724829432 +0100 |
1108 |
-+++ snips-1.2/Makefile.mid 2012-06-26 15:55:18.298836689 +0100 |
1109 |
-@@ -46,7 +46,7 @@ |
1110 |
- CHECK DONE TODO |
1111 |
- |
1112 |
- all: Init |
1113 |
-- @echo "BUILDING SNIPS revision $(REV) for $(OS) $$OS" ;\ |
1114 |
-+ @+echo "BUILDING SNIPS revision $(REV) for $(OS) $$OS" ;\ |
1115 |
- for i in $(SRCS); do \ |
1116 |
- if [ -d $$i ]; then \ |
1117 |
- (echo "" ; echo "MAKING IN $$i" ; echo "----------" ; \ |
1118 |
-@@ -74,8 +74,8 @@ |
1119 |
- echo "Else prefix your shell PATH with BSD style install" ;\ |
1120 |
- rm -f SniPpet /tmp/SniPpet ; exit 1 ; fi) |
1121 |
- |
1122 |
-- @echo make $(MFLAGS) install ; |
1123 |
-- @-for i in $(SRCS); do \ |
1124 |
-+ @+echo make $(MFLAGS) install ; |
1125 |
-+ @+-for i in $(SRCS); do \ |
1126 |
- ( echo "" ; echo "MAKING IN $$i" ; echo "----------" ; cd $$i ; \ |
1127 |
- make $(MFLAGS) install ; make $(MFLAGS) init ) ;\ |
1128 |
- done |
1129 |
|
1130 |
diff --git a/net-analyzer/snips/files/snips-1.2-r2-precache-config b/net-analyzer/snips/files/snips-1.2-r2-precache-config |
1131 |
deleted file mode 100644 |
1132 |
index a5b6954..00000000 |
1133 |
--- a/net-analyzer/snips/files/snips-1.2-r2-precache-config |
1134 |
+++ /dev/null |
1135 |
@@ -1,23 +0,0 @@ |
1136 |
-# These answers are interdependent; do not edit this file! |
1137 |
-package="snips" |
1138 |
-ROOTDIR="/usr/snips" |
1139 |
-MANDIR="/usr/share/man/snips" |
1140 |
-MANEXT="n" |
1141 |
-OPSMAIL="root@localhost" |
1142 |
-ADMINMAIL="root@localhost" |
1143 |
-MAIL="/bin/mail" |
1144 |
-CC="gcc" |
1145 |
-YACC="yacc" |
1146 |
-LIBS="" |
1147 |
-RPCLIB="" |
1148 |
-PSFLAGS="axw" |
1149 |
-PERL="/usr/bin/perl" |
1150 |
-AR="ar r" |
1151 |
-WHOAMI="/usr/bin/whoami" |
1152 |
-RANLIB="ranlib" |
1153 |
-INSTALL="install" |
1154 |
-PING="/bin/ping" |
1155 |
-CURSESLIB="-lncurses" |
1156 |
-RRDCFLAGS="-DRRDTOOL" |
1157 |
-RRDLIBDIR="/usr/lib/" |
1158 |
-RRDLIBS="-L/usr/lib/ -lrrd" |
1159 |
|
1160 |
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 |
1161 |
deleted file mode 100644 |
1162 |
index fc95c51..00000000 |
1163 |
--- a/net-analyzer/snips/files/snips-1.2-trapmon-link-order.patch |
1164 |
+++ /dev/null |
1165 |
@@ -1,12 +0,0 @@ |
1166 |
-diff -uNr snips-1.2.ORIG/trapmon/Makefile.mid snips-1.2/trapmon/Makefile.mid |
1167 |
---- snips-1.2.ORIG/trapmon/Makefile.mid 2012-06-26 14:50:38.787581669 +0100 |
1168 |
-+++ snips-1.2/trapmon/Makefile.mid 2012-06-26 14:52:11.381587122 +0100 |
1169 |
-@@ -17,7 +17,7 @@ |
1170 |
- INITFILES = trapmon |
1171 |
- |
1172 |
- $(TARG): $(OBJS) Makefile |
1173 |
-- $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) $(PROGLIBS) -o $@ |
1174 |
-+ $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(PROGLIBS) $(LIBS) -o $@ |
1175 |
- |
1176 |
- install: $(TARG) |
1177 |
- $(INSTALL) -c -m 4750 $(TARG) $(DESTDIR)$(BINDIR)/ |
1178 |
|
1179 |
diff --git a/net-analyzer/snips/metadata.xml b/net-analyzer/snips/metadata.xml |
1180 |
deleted file mode 100644 |
1181 |
index c0ebd64..00000000 |
1182 |
--- a/net-analyzer/snips/metadata.xml |
1183 |
+++ /dev/null |
1184 |
@@ -1,8 +0,0 @@ |
1185 |
-<?xml version="1.0" encoding="UTF-8"?> |
1186 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
1187 |
-<pkgmetadata> |
1188 |
-<maintainer type="person"> |
1189 |
- <email>chainsaw@g.o</email> |
1190 |
- <name>Tony Vroon</name> |
1191 |
-</maintainer> |
1192 |
-</pkgmetadata> |
1193 |
|
1194 |
diff --git a/net-analyzer/snips/snips-1.2-r2.ebuild b/net-analyzer/snips/snips-1.2-r2.ebuild |
1195 |
deleted file mode 100644 |
1196 |
index 453869f..00000000 |
1197 |
--- a/net-analyzer/snips/snips-1.2-r2.ebuild |
1198 |
+++ /dev/null |
1199 |
@@ -1,73 +0,0 @@ |
1200 |
-# Copyright 1999-2013 Gentoo Foundation |
1201 |
-# Distributed under the terms of the GNU General Public License v2 |
1202 |
-# $Id$ |
1203 |
- |
1204 |
-inherit eutils toolchain-funcs user |
1205 |
- |
1206 |
-DESCRIPTION="System & Network Integrated Polling Software" |
1207 |
-HOMEPAGE="http://www.netplex-tech.com/snips/" |
1208 |
-SRC_URI="http://www.netplex-tech.com/software/downloads/${PN}/${P}.tar.gz" |
1209 |
- |
1210 |
-LICENSE="SNIPS BSD HPND GPL-1+ RSA free-noncomm" |
1211 |
-SLOT="0" |
1212 |
-KEYWORDS="~amd64" |
1213 |
-IUSE="" |
1214 |
- |
1215 |
-RDEPEND="dev-lang/perl |
1216 |
- virtual/mailx |
1217 |
- net-analyzer/rrdtool |
1218 |
- >=net-misc/iputils-20071127-r2 |
1219 |
- sys-libs/gdbm |
1220 |
- sys-libs/ncurses" |
1221 |
- |
1222 |
-src_unpack() { |
1223 |
- unpack ${A} |
1224 |
- cd "${S}" |
1225 |
- # Gentoo-specific non-interactive configure override |
1226 |
- cp "${FILESDIR}/${PF}-precache-config" "${S}/Config.cache" \ |
1227 |
- || die "Unable to precache configure script answers" |
1228 |
- echo "CFLAGS=\"${CFLAGS} -fPIC\"" >> "${S}/Config.cache" |
1229 |
- echo "CC=\"$(tc-getCC)\"" >> "${S}/Config.cache" |
1230 |
- echo "SRCDIR=\"${S}\"" >> "${S}/Config.cache" |
1231 |
- epatch "${FILESDIR}/${P}-non-interactive.patch" |
1232 |
- # Applied to upstream CVS |
1233 |
- epatch "${FILESDIR}/${P}-install-missing.patch" |
1234 |
- epatch "${FILESDIR}/${P}-implicit-declarations.patch" |
1235 |
- epatch "${FILESDIR}/${P}-conflicting-types.patch" |
1236 |
- epatch "${FILESDIR}/${P}-code-ordering.patch" |
1237 |
- epatch "${FILESDIR}/${P}-destdir-awareness.patch" |
1238 |
- epatch "${FILESDIR}/${P}-link-correct-snmp-lib.patch" |
1239 |
-} |
1240 |
- |
1241 |
-src_compile() { |
1242 |
- # Looks horrid due to missing linebreaks, suppress output |
1243 |
- ebegin "Running configure script (with precached settings)" |
1244 |
- ./Configure &> /dev/null || die "Unable to configure" |
1245 |
- eend $? |
1246 |
- emake || die "emake failed" |
1247 |
-} |
1248 |
- |
1249 |
-src_install() { |
1250 |
- emake DESTDIR="${D}" install || die "emake install failed" |
1251 |
-} |
1252 |
- |
1253 |
-pkg_preinst() { |
1254 |
- enewgroup snips |
1255 |
- enewuser snips -1 -1 /usr/snips snips |
1256 |
-} |
1257 |
- |
1258 |
-pkg_postinst() { |
1259 |
- ebegin "Fixing permissions" |
1260 |
- chown -R snips:snips "${ROOT}"usr/snips |
1261 |
- for x in data logs msgs rrddata run web device-help etc; do |
1262 |
- chmod -R g+w "${ROOT}usr/snips/${x}" \ |
1263 |
- || die "Unable to chmod ${x}" |
1264 |
- done |
1265 |
- chown root:snips "${ROOT}usr/snips/bin/multiping" || die "chown root failed" |
1266 |
- chown root:snips "${ROOT}usr/snips/bin/etherload" || die "chown root failed" |
1267 |
- chown root:snips "${ROOT}usr/snips/bin/trapmon" || die "chown root failed" |
1268 |
- chmod u+s "${ROOT}usr/snips/bin/multiping" || die "SetUID root failed" |
1269 |
- chmod u+s "${ROOT}usr/snips/bin/etherload" || die "SetUID root failed" |
1270 |
- chmod u+s "${ROOT}usr/snips/bin/trapmon" || die "SetUID root failed" |
1271 |
- eend $? |
1272 |
-} |
1273 |
|
1274 |
diff --git a/net-analyzer/snips/snips-1.2-r3.ebuild b/net-analyzer/snips/snips-1.2-r3.ebuild |
1275 |
deleted file mode 100644 |
1276 |
index 9d369c9..00000000 |
1277 |
--- a/net-analyzer/snips/snips-1.2-r3.ebuild |
1278 |
+++ /dev/null |
1279 |
@@ -1,81 +0,0 @@ |
1280 |
-# Copyright 1999-2013 Gentoo Foundation |
1281 |
-# Distributed under the terms of the GNU General Public License v2 |
1282 |
-# $Id$ |
1283 |
- |
1284 |
-EAPI=4 |
1285 |
- |
1286 |
-inherit base toolchain-funcs user |
1287 |
- |
1288 |
-DESCRIPTION="System & Network Integrated Polling Software" |
1289 |
-HOMEPAGE="http://www.netplex-tech.com/snips/" |
1290 |
-SRC_URI="http://www.netplex-tech.com/software/downloads/${PN}/${P}.tar.gz" |
1291 |
- |
1292 |
-LICENSE="SNIPS BSD HPND GPL-1+ RSA free-noncomm" |
1293 |
-SLOT="0" |
1294 |
-KEYWORDS="~amd64" |
1295 |
-IUSE="" |
1296 |
- |
1297 |
-RDEPEND="dev-lang/perl |
1298 |
- virtual/mailx |
1299 |
- net-analyzer/rrdtool |
1300 |
- >=net-misc/iputils-20071127-r2 |
1301 |
- sys-libs/gdbm |
1302 |
- sys-libs/ncurses" |
1303 |
- |
1304 |
-PATCHES=( |
1305 |
- "${FILESDIR}/${P}-ldflags-respect.patch" |
1306 |
- "${FILESDIR}/${P}-parallel-make.patch" |
1307 |
- "${FILESDIR}/${P}-non-interactive.patch" |
1308 |
- "${FILESDIR}/${P}-install-missing.patch" |
1309 |
- "${FILESDIR}/${P}-implicit-declarations.patch" |
1310 |
- "${FILESDIR}/${P}-conflicting-types.patch" |
1311 |
- "${FILESDIR}/${P}-code-ordering.patch" |
1312 |
- "${FILESDIR}/${P}-destdir-awareness.patch" |
1313 |
- "${FILESDIR}/${P}-trapmon-link-order.patch" |
1314 |
- "${FILESDIR}/${P}-nsmon-libresolv.patch" |
1315 |
- "${FILESDIR}/${P}-etherload-makefile-ordering.patch" |
1316 |
- "${FILESDIR}/${P}-linux3.patch" |
1317 |
-) |
1318 |
- |
1319 |
-src_prepare() { |
1320 |
- # Gentoo-specific non-interactive configure override |
1321 |
- cp "${FILESDIR}/${P}-r2-precache-config" "${S}/Config.cache" \ |
1322 |
- || die "Unable to precache configure script answers" |
1323 |
- echo "CFLAGS=\"${CFLAGS} -fPIC\"" >> "${S}/Config.cache" |
1324 |
- echo "CC=\"$(tc-getCC)\"" >> "${S}/Config.cache" |
1325 |
- echo "SRCDIR=\"${S}\"" >> "${S}/Config.cache" |
1326 |
- base_src_prepare |
1327 |
-} |
1328 |
- |
1329 |
-src_compile() { |
1330 |
- # Looks horrid due to missing linebreaks, suppress output |
1331 |
- ebegin "Running configure script (with precached settings)" |
1332 |
- ./Configure &> /dev/null || die "Unable to configure" |
1333 |
- eend $? |
1334 |
- emake || die "emake failed" |
1335 |
-} |
1336 |
- |
1337 |
-src_install() { |
1338 |
- emake DESTDIR="${D}" install || die "emake install failed" |
1339 |
-} |
1340 |
- |
1341 |
-pkg_preinst() { |
1342 |
- enewgroup snips |
1343 |
- enewuser snips -1 -1 /usr/snips snips |
1344 |
-} |
1345 |
- |
1346 |
-pkg_postinst() { |
1347 |
- ebegin "Fixing permissions" |
1348 |
- chown -R snips:snips "${ROOT}"usr/snips |
1349 |
- for x in data logs msgs rrddata run web device-help etc; do |
1350 |
- chmod -R g+w "${ROOT}usr/snips/${x}" \ |
1351 |
- || die "Unable to chmod ${x}" |
1352 |
- done |
1353 |
- chown root:snips "${ROOT}usr/snips/bin/multiping" || die "chown root failed" |
1354 |
- chown root:snips "${ROOT}usr/snips/bin/etherload" || die "chown root failed" |
1355 |
- chown root:snips "${ROOT}usr/snips/bin/trapmon" || die "chown root failed" |
1356 |
- chmod u+s "${ROOT}usr/snips/bin/multiping" || die "SetUID root failed" |
1357 |
- chmod u+s "${ROOT}usr/snips/bin/etherload" || die "SetUID root failed" |
1358 |
- chmod u+s "${ROOT}usr/snips/bin/trapmon" || die "SetUID root failed" |
1359 |
- eend $? |
1360 |
-} |
1361 |
|
1362 |
diff --git a/profiles/package.mask b/profiles/package.mask |
1363 |
index 0533cd1..73b1e7f 100644 |
1364 |
--- a/profiles/package.mask |
1365 |
+++ b/profiles/package.mask |
1366 |
@@ -346,11 +346,6 @@ net-misc/termtter |
1367 |
dev-cpp/luabind |
1368 |
games-rpg/valyriatear |
1369 |
|
1370 |
-# David Seifert <soap@g.o> (20 Dec 2016) |
1371 |
-# Masked for being completely broken and unusable (bug 586356). |
1372 |
-# No reverse dependencies. Masked for removal in 30 days. |
1373 |
-net-analyzer/snips |
1374 |
- |
1375 |
# Mike Gilbert <floppym@g.o> (10 Dec 2016) |
1376 |
# Dev channel releases are only for people who are developers or want more |
1377 |
# experimental features and accept a more unstable release. |