1 |
commit: 557a30c32e14a897bb06188829f10bbba278baca |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Dec 24 08:58:52 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 21:13:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557a30c3 |
7 |
|
8 |
net-analyzer/ngrep: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18806 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../ngrep/files/ngrep-1.45-build-fixes.patch | 186 --------------------- |
16 |
net-analyzer/ngrep/files/ngrep-1.45-prefix.patch | 17 -- |
17 |
.../ngrep/files/ngrep-1.45-setlocale.patch | 23 --- |
18 |
3 files changed, 226 deletions(-) |
19 |
|
20 |
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch b/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch |
21 |
deleted file mode 100644 |
22 |
index 9cde0f81926..00000000000 |
23 |
--- a/net-analyzer/ngrep/files/ngrep-1.45-build-fixes.patch |
24 |
+++ /dev/null |
25 |
@@ -1,186 +0,0 @@ |
26 |
-This patch fixes a number of problems with have with build: |
27 |
- |
28 |
- * more clean cut off pcre library; we'll never use bundled pcre library, so |
29 |
- some autoconf added REGEX_LIBS to pass correct system libs and header change. |
30 |
- |
31 |
- * We use AC_CONFIG_SUBDIRS to pass make autoconf reconfigure gnuregex library |
32 |
- - this way ./configure will be called correctly and correct comipler will be |
33 |
- selected automatically. |
34 |
- |
35 |
- * With the previous change some modifications were required to make gnuregex |
36 |
- buildable: a) we should not overide CFLAGS in Makefile.in (as they together |
37 |
- with -DHAVE_CONFIG_H will be passed to gnuregex and it'll fail to build, |
38 |
- since no config.h exist) b) obvious way to remove warning "_GNU_SOURCE" |
39 |
- redefined |
40 |
- |
41 |
- * also we don't pass $(MAKEFLAGS) since it caused us problems in the past (bug |
42 |
- #178684) |
43 |
- |
44 |
---- a/Makefile.in |
45 |
-+++ b/Makefile.in |
46 |
-@@ -7,7 +7,8 @@ |
47 |
- |
48 |
- CC=@CC@ |
49 |
- |
50 |
--CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ |
51 |
-+# Never redefine CFLAGS, as it pollutes env and gnuregex build failes |
52 |
-+EXTRA_CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ |
53 |
- INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@ |
54 |
- |
55 |
- LDFLAGS=@LDFLAGS@ @PCAP_LINK@ |
56 |
-@@ -34,25 +35,25 @@ |
57 |
- |
58 |
- REGEX_DIR=@REGEX_DIR@ |
59 |
- REGEX_OBJS=@REGEX_OBJS@ |
60 |
-- |
61 |
-+REGEX_LIBS=@REGEX_LIBS@ |
62 |
- |
63 |
- all: $(TARGET) |
64 |
- |
65 |
- $(TARGET): $(REGEX_OBJS) $(OBJS) |
66 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) |
67 |
-+ $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) |
68 |
- |
69 |
- debug: $(REGEX_OBJS) $(OBJS) |
70 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) |
71 |
-+ $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -g -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) |
72 |
- |
73 |
- static: $(REGEX_OBJS) $(OBJS) |
74 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(LIBS) |
75 |
-+ $(CC) $(EXTRA_CFLAGS) $(LDFLAGS) -o $(TARGET).static -static $(OBJS) $(REGEX_OBJS) $(REGEX_LIBS) $(LIBS) |
76 |
- |
77 |
- install: $(TARGET) |
78 |
- $(INSTALL) -c -m 0755 $(TARGET) $(DESTDIR)/$(BINDIR_INSTALL)/$(TARGET) |
79 |
- $(INSTALL) -c -m 0644 $(MANPAGE) $(DESTDIR)/$(MANDIR_INSTALL)/$(MANPAGE) |
80 |
- |
81 |
- .c.o: |
82 |
-- $(CC) $(CFLAGS) $(INCLUDES) -g -c $< |
83 |
-+ $(CC) $(EXTRA_CFLAGS) $(INCLUDES) -g -c $< |
84 |
- |
85 |
- clean: |
86 |
- make -C $(REGEX_DIR) clean |
87 |
-@@ -63,7 +64,7 @@ |
88 |
- rm -f config.status config.cache config.log config.h Makefile |
89 |
- |
90 |
- $(REGEX_OBJS): $(REGEX_OBJS:.o=.c) $(REGEX_DIR)/*.h |
91 |
-- $(MAKE) $(MAKEFLAGS) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) |
92 |
-+ $(MAKE) -C $(REGEX_DIR) $(notdir $(REGEX_OBJS)) |
93 |
- |
94 |
- $(OBJS): Makefile ngrep.c ngrep.h |
95 |
- |
96 |
- |
97 |
---- a/configure.in |
98 |
-+++ b/configure.in |
99 |
-@@ -124,14 +124,16 @@ |
100 |
- use_pcre="no" |
101 |
- ]) |
102 |
- |
103 |
-+REGEX_DIR="" |
104 |
-+REGEX_OBJS="" |
105 |
-+REGEX_LIBS="" |
106 |
- if test $use_pcre = yes; then |
107 |
- |
108 |
- echo |
109 |
-- echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' |
110 |
-+ echo 'Using System Perl-Compatible Regular Expression (PCRE) library ...' |
111 |
- echo |
112 |
- |
113 |
-- REGEX_DIR='pcre-5.0' |
114 |
-- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o" |
115 |
-+ REGEX_LIBS="`pcre-config --libs`" |
116 |
- USE_PCRE="1" |
117 |
- |
118 |
- else |
119 |
-@@ -144,12 +146,19 @@ |
120 |
- REGEX_OBJS="$REGEX_DIR/regex.o" |
121 |
- USE_PCRE="0" |
122 |
- |
123 |
-+ AC_CONFIG_SUBDIRS([regex-0.12]) |
124 |
-+ |
125 |
-+ echo |
126 |
-+ echo 'GNU Regular Expression library is configured...' |
127 |
-+ echo |
128 |
-+ |
129 |
- fi |
130 |
- |
131 |
--( cd $REGEX_DIR && ./configure ) |
132 |
- |
133 |
- AC_SUBST(REGEX_DIR) |
134 |
- AC_SUBST(REGEX_OBJS) |
135 |
-+AC_SUBST(REGEX_LIBS) |
136 |
-+ |
137 |
- |
138 |
- |
139 |
- echo |
140 |
- |
141 |
---- a/ngrep.c |
142 |
-+++ b/ngrep.c |
143 |
-@@ -92,7 +92,7 @@ |
144 |
- #endif |
145 |
- |
146 |
- #if USE_PCRE |
147 |
--#include "pcre-5.0/pcre.h" |
148 |
-+#include <pcre.h> |
149 |
- #else |
150 |
- #include "regex-0.12/regex.h" |
151 |
- #endif |
152 |
- |
153 |
---- a/regex-0.12/Makefile.in |
154 |
-+++ b/regex-0.12/Makefile.in |
155 |
-@@ -18,23 +18,6 @@ |
156 |
- |
157 |
- version = 0.12 |
158 |
- |
159 |
--# You can define CPPFLAGS on the command line. Aside from system-specific |
160 |
--# flags, you can define: |
161 |
--# -DREGEX_MALLOC to use malloc/realloc/free instead of alloca. |
162 |
--# -DDEBUG to enable the compiled pattern disassembler and execution |
163 |
--# tracing; code runs substantially slower. |
164 |
--# -DEXTRACT_MACROS to use the macros EXTRACT_* (as opposed to |
165 |
--# the corresponding C procedures). If not -DDEBUG, the macros |
166 |
--# are used. |
167 |
--CPPFLAGS = |
168 |
-- |
169 |
--# Likewise, you can override CFLAGS to optimize, use -Wall, etc. |
170 |
--CFLAGS = -g |
171 |
-- |
172 |
--# Ditto for LDFLAGS and LOADLIBES. |
173 |
--LDFLAGS = |
174 |
--LOADLIBES = |
175 |
-- |
176 |
- srcdir = @srcdir@ |
177 |
- VPATH = @srcdir@ |
178 |
- |
179 |
-@@ -43,7 +26,7 @@ |
180 |
- |
181 |
- SHELL = /bin/sh |
182 |
- |
183 |
--subdirs = doc test |
184 |
-+subdirs = |
185 |
- |
186 |
- default all:: regex.o |
187 |
- .PHONY: default all |
188 |
- |
189 |
---- a/regex-0.12/configure.in |
190 |
-+++ b/regex-0.12/configure.in |
191 |
-@@ -34,4 +34,4 @@ |
192 |
- |
193 |
- esac |
194 |
- |
195 |
--AC_OUTPUT(Makefile doc/Makefile test/Makefile) |
196 |
-+AC_OUTPUT(Makefile) |
197 |
- |
198 |
-=== modified file 'regex-0.12/regex.c' |
199 |
---- a/regex-0.12/regex.c |
200 |
-+++ b/regex-0.12/regex.c |
201 |
-@@ -34,7 +34,9 @@ |
202 |
- #pragma alloca |
203 |
- #endif |
204 |
- |
205 |
-+#ifndef _GNU_SOURCE |
206 |
- #define _GNU_SOURCE |
207 |
-+#endif |
208 |
- |
209 |
- /* We need this for `regex.h', and perhaps for the Emacs include files. */ |
210 |
- #include <sys/types.h> |
211 |
- |
212 |
|
213 |
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch b/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch |
214 |
deleted file mode 100644 |
215 |
index 8618f5daae3..00000000000 |
216 |
--- a/net-analyzer/ngrep/files/ngrep-1.45-prefix.patch |
217 |
+++ /dev/null |
218 |
@@ -1,17 +0,0 @@ |
219 |
-* refrain from doing an absolutely insane check (to see if pcap is |
220 |
- installed in more than one place) |
221 |
- |
222 |
---- a/configure.in |
223 |
-+++ b/configure.in |
224 |
-@@ -268,10 +268,7 @@ |
225 |
- |
226 |
- AC_MSG_CHECKING(for a complete set of pcap headers) |
227 |
- |
228 |
--possible_dirs="`eval echo -n ${includedir}` \ |
229 |
-- /usr/include /usr/include/pcap \ |
230 |
-- /usr/local/include /usr/local/include/pcap \ |
231 |
-- /usr/share/include /usr/share/include/pcap" |
232 |
-+possible_dirs="`eval echo -n ${includedir}`" |
233 |
- |
234 |
- AC_ARG_WITH(pcap-includes, |
235 |
- [ --with-pcap-includes specify the pcap include directory], |
236 |
|
237 |
diff --git a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch b/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch |
238 |
deleted file mode 100644 |
239 |
index 8789e5b8c76..00000000000 |
240 |
--- a/net-analyzer/ngrep/files/ngrep-1.45-setlocale.patch |
241 |
+++ /dev/null |
242 |
@@ -1,23 +0,0 @@ |
243 |
-Call setlocale to make isprint() decide what's printable depending |
244 |
-on the current locale. See bugs.debian.org/307496 . |
245 |
- |
246 |
---- a/ngrep.c |
247 |
-+++ b/ngrep.c |
248 |
-@@ -97,6 +97,8 @@ |
249 |
- #include "regex-0.12/regex.h" |
250 |
- #endif |
251 |
- |
252 |
-+#include <locale.h> |
253 |
-+ |
254 |
- #include "ngrep.h" |
255 |
- |
256 |
- |
257 |
-@@ -195,6 +197,8 @@ |
258 |
- signal(SIGWINCH, update_windowsize); |
259 |
- #endif |
260 |
- |
261 |
-+ setlocale(LC_ALL, ""); |
262 |
-+ |
263 |
- while ((c = getopt(argc, argv, "LNhXViwqpevxlDtTRMs:n:c:d:A:I:O:S:P:F:W:")) != EOF) { |
264 |
- switch (c) { |
265 |
- case 'W': { |