summaryrefslogtreecommitdiffstats
path: root/recipes-scanners/clamav/files/fix_pcre_check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-scanners/clamav/files/fix_pcre_check.patch')
-rw-r--r--recipes-scanners/clamav/files/fix_pcre_check.patch443
1 files changed, 443 insertions, 0 deletions
diff --git a/recipes-scanners/clamav/files/fix_pcre_check.patch b/recipes-scanners/clamav/files/fix_pcre_check.patch
new file mode 100644
index 0000000..81500c5
--- /dev/null
+++ b/recipes-scanners/clamav/files/fix_pcre_check.patch
@@ -0,0 +1,443 @@
1Index: git/configure
2===================================================================
3--- git.orig/configure
4+++ git/configure
5@@ -22779,369 +22779,35 @@ fi
6 LIBS="$save_LIBS"
7
8
9-
10-# Check whether --with-pcre was given.
11-if test "${with_pcre+set}" = set; then :
12- withval=$with_pcre; pcreser=$withval
13-else
14- pcreser="yes"
15-fi
16-
17-
18-case "$pcreser" in
19-no)
20- pcreconfig=""
21- ;;
22-yes)
23- # Extract the first word of "pcre2-config", so it can be a program name with args.
24-set dummy pcre2-config; ac_word=$2
25-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
26-$as_echo_n "checking for $ac_word... " >&6; }
27-if ${ac_cv_path_pcreconfig+:} false; then :
28- $as_echo_n "(cached) " >&6
29-else
30- case $pcreconfig in
31- [\\/]* | ?:[\\/]*)
32- ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path.
33- ;;
34- *)
35- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
36-for as_dir in $PATH
37-do
38- IFS=$as_save_IFS
39- test -z "$as_dir" && as_dir=.
40- for ac_exec_ext in '' $ac_executable_extensions; do
41- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
42- ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext"
43- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
44- break 2
45- fi
46-done
47- done
48-IFS=$as_save_IFS
49-
50- ;;
51-esac
52-fi
53-pcreconfig=$ac_cv_path_pcreconfig
54-if test -n "$pcreconfig"; then
55- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
56-$as_echo "$pcreconfig" >&6; }
57-else
58- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
59-$as_echo "no" >&6; }
60-fi
61-
62-
63- if test "x$pcreconfig" = "x"; then
64- # Extract the first word of "pcre-config", so it can be a program name with args.
65-set dummy pcre-config; ac_word=$2
66-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
67-$as_echo_n "checking for $ac_word... " >&6; }
68-if ${ac_cv_path_pcreconfig+:} false; then :
69- $as_echo_n "(cached) " >&6
70-else
71- case $pcreconfig in
72- [\\/]* | ?:[\\/]*)
73- ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path.
74- ;;
75- *)
76- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
77-for as_dir in $PATH
78-do
79- IFS=$as_save_IFS
80- test -z "$as_dir" && as_dir=.
81- for ac_exec_ext in '' $ac_executable_extensions; do
82- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
83- ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext"
84- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
85- break 2
86- fi
87-done
88- done
89-IFS=$as_save_IFS
90-
91- ;;
92-esac
93-fi
94-pcreconfig=$ac_cv_path_pcreconfig
95-if test -n "$pcreconfig"; then
96- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
97-$as_echo "$pcreconfig" >&6; }
98-else
99- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
100-$as_echo "no" >&6; }
101-fi
102-
103-
104- if test "x$pcreconfig" = "x"; then
105- { $as_echo "$as_me:${as_lineno-$LINENO}: cannot locate libpcre2 or libpcre within PATH" >&5
106-$as_echo "$as_me: cannot locate libpcre2 or libpcre within PATH" >&6;}
107- else
108- pcrelib="pcre"
109- fi
110- else
111- pcrelib="pcre2"
112- fi
113- ;;
114-"")
115- as_fn_error $? "cannot assign blank value to --with-pcre" "$LINENO" 5
116- ;;
117-*)
118- # Extract the first word of "pcre2-config", so it can be a program name with args.
119-set dummy pcre2-config; ac_word=$2
120-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
121-$as_echo_n "checking for $ac_word... " >&6; }
122-if ${ac_cv_path_pcreconfig+:} false; then :
123- $as_echo_n "(cached) " >&6
124-else
125- case $pcreconfig in
126- [\\/]* | ?:[\\/]*)
127- ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path.
128- ;;
129- *)
130- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
131-for as_dir in $pcreser/bin
132-do
133- IFS=$as_save_IFS
134- test -z "$as_dir" && as_dir=.
135- for ac_exec_ext in '' $ac_executable_extensions; do
136- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
137- ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext"
138- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
139- break 2
140- fi
141-done
142- done
143-IFS=$as_save_IFS
144-
145- ;;
146-esac
147-fi
148-pcreconfig=$ac_cv_path_pcreconfig
149-if test -n "$pcreconfig"; then
150- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
151-$as_echo "$pcreconfig" >&6; }
152-else
153- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
154-$as_echo "no" >&6; }
155-fi
156-
157-
158- if test "x$pcreconfig" = "x"; then
159- # Extract the first word of "pcre-config", so it can be a program name with args.
160-set dummy pcre-config; ac_word=$2
161-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
162-$as_echo_n "checking for $ac_word... " >&6; }
163-if ${ac_cv_path_pcreconfig+:} false; then :
164- $as_echo_n "(cached) " >&6
165-else
166- case $pcreconfig in
167- [\\/]* | ?:[\\/]*)
168- ac_cv_path_pcreconfig="$pcreconfig" # Let the user override the test with a path.
169- ;;
170- *)
171- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
172-for as_dir in $pcreser/bin
173-do
174- IFS=$as_save_IFS
175- test -z "$as_dir" && as_dir=.
176- for ac_exec_ext in '' $ac_executable_extensions; do
177- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
178- ac_cv_path_pcreconfig="$as_dir/$ac_word$ac_exec_ext"
179- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
180- break 2
181- fi
182-done
183- done
184-IFS=$as_save_IFS
185-
186- ;;
187-esac
188-fi
189-pcreconfig=$ac_cv_path_pcreconfig
190-if test -n "$pcreconfig"; then
191- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcreconfig" >&5
192-$as_echo "$pcreconfig" >&6; }
193-else
194- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
195-$as_echo "no" >&6; }
196-fi
197-
198-
199- if test "x$pcreconfig" = "x"; then
200- as_fn_error $? "cannot locate libpcre2 or libpcre at $pcreser" "$LINENO" 5
201- else
202- pcrelib="pcre"
203- fi
204- else
205- pcrelib="pcre2"
206- fi
207- ;;
208-esac
209-
210 found_pcre="no"
211-if test "x$pcreconfig" != "x"; then
212- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pcre-config version" >&5
213-$as_echo_n "checking pcre-config version... " >&6; }
214- pcre_version="`$pcreconfig --version`"
215-
216- if test "x$pcre_version" = "x"; then
217- as_fn_error $? "$pcreconfig failed" "$LINENO" 5
218- fi
219-
220- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pcre_version" >&5
221-$as_echo "$pcre_version" >&6; }
222-
223- pcrever_prefix=`expr "$pcre_version" : '\([^0-9]*\)'`
224- pcrever_frag=${pcre_version#$pcrever_prefix}
225-
226- pcrever_major=`expr "$pcrever_frag" : '\([0-9]*\)'`
227- pcrever_frag=${pcrever_frag#*\.}
228- pcrever_minor=`expr "$pcrever_frag" : '\([0-9]*\)'`
229-
230- if test "$pcrelib" = "pcre"; then
231- if test $pcrever_major -lt 6; then
232- as_fn_error $? "This pcre version is missing features used by ClamAV. Please upgrade to a newer version: http://www.pcre.org." "$LINENO" 5
233- fi
234- if test $pcrever_major -eq 6 && test $pcrever_minor -lt 5; then
235- as_fn_error $? "This pcre version is missing features used by ClamAV. Please upgrade to a newer version: http://www.pcre.org." "$LINENO" 5
236- fi
237- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pcre (original) detected. We recommend upgrading from pcre to pcre2 10.30 or later: http://www.pcre.org." >&5
238-$as_echo "$as_me: WARNING: pcre (original) detected. We recommend upgrading from pcre to pcre2 10.30 or later: http://www.pcre.org." >&2;}
239- fi
240-
241- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CVE-2017-7186" >&5
242-$as_echo_n "checking for CVE-2017-7186... " >&6; }
243- if test "$pcrelib" = "pcre2"; then
244- if test $pcrever_major -eq 10 && test $pcrever_minor -lt 24; then
245- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The installed pcre2 version may contain security bugs. Please upgrade to 10.30 or later: http://www.pcre.org." >&5
246-$as_echo "$as_me: WARNING: The installed pcre2 version may contain security bugs. Please upgrade to 10.30 or later: http://www.pcre.org." >&2;}
247- else
248- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
249-$as_echo "ok" >&6; }
250- fi
251- else
252- if test $pcrever_major -eq 8 && test $pcrever_minor -lt 41; then
253- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The installed pcre version may contain security bugs. Please upgrade to 8.41+ or _preferably_ install pcre2 10.30+: http://www.pcre.org." >&5
254-$as_echo "$as_me: WARNING: The installed pcre version may contain security bugs. Please upgrade to 8.41+ or _preferably_ install pcre2 10.30+: http://www.pcre.org." >&2;}
255- else
256- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
257-$as_echo "ok" >&6; }
258- fi
259- fi
260-
261- found_pcre="yes"
262- PCRE_HOME="`$pcreconfig --prefix`"
263- PCRE_CPPFLAGS="`$pcreconfig --cflags`"
264- if test "$pcrelib" = "pcre2"; then
265- PCRE_LIBS="`$pcreconfig --libs8`"
266- else
267- PCRE_LIBS="`$pcreconfig --libs`"
268- fi
269-
270- { $as_echo "$as_me:${as_lineno-$LINENO}: CFLAGS from pcre-config: $PCRE_CPPFLAGS" >&5
271-$as_echo "$as_me: CFLAGS from pcre-config: $PCRE_CPPFLAGS" >&6;}
272- { $as_echo "$as_me:${as_lineno-$LINENO}: LIBS from pcre-config: $PCRE_LIBS" >&5
273-$as_echo "$as_me: LIBS from pcre-config: $PCRE_LIBS" >&6;}
274-fi
275-
276 have_pcre="no"
277-if test "x$found_pcre" != "xno"; then
278- save_CPPFLAGS="$CPPFLAGS"
279- CPPFLAGS=$PCRE_CPPFLAGS
280+# Check whether --with-pcre was given.
281+if test "${with_pcre+set}" = set; then :
282+ withval=$with_pcre;
283 save_LDFLAGS="$LDFLAGS"
284- LDFLAGS=$PCRE_LIBS
285-
286- if test "$pcrelib" = "pcre2"; then
287-
288- have_pcre="yes"
289- else
290- ac_fn_c_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
291-if test "x$ac_cv_header_pcre_h" = xyes; then :
292- have_pcre="yes"
293-else
294- have_pcre="no"
295-fi
296-
297-
298- if test "x$have_pcre" = "xno"; then
299- ac_fn_c_check_header_mongrel "$LINENO" "pcre/pcre.h" "ac_cv_header_pcre_pcre_h" "$ac_includes_default"
300-if test "x$ac_cv_header_pcre_pcre_h" = xyes; then :
301- have_pcre="yes"
302+ if test "X$withval" != "Xno"; then
303+ if test "${PKG_CONFIG}libpcre2-8 --exists"; then
304+ pcrelib="pcre2"
305+ have_pcre="yes"
306+ found_pcre="yes"
307+ PCRE_HOME="$withval"
308+ PCRE_LIBS="${PKG_CONFIG} libpcre2-8 --libs"
309+ LDFLAGS="$PCRE_LIBS $save_LDFLAGS"
310+ fi
311+ LDFLAGS="$save_LDFLAGS"
312+ fi
313 else
314- have_pcre="no"
315+ as_fn_error $? "libpcre not found. libpcre (e.g. libpcre-devel) is required in order to build freshclam and clamsubmit." "$LINENO" 5
316 fi
317
318
319- fi
320-
321- if test "x$have_pcre" = "xyes"; then
322- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
323-$as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
324-if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
325- $as_echo_n "(cached) " >&6
326-else
327- ac_check_lib_save_LIBS=$LIBS
328-LIBS="-lpcre $LIBS"
329-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
330-/* end confdefs.h. */
331-
332-/* Override any GCC internal prototype to avoid an error.
333- Use char because int might match the return type of a GCC
334- builtin and then its argument prototype would still apply. */
335-#ifdef __cplusplus
336-extern "C"
337-#endif
338-char pcre_compile ();
339-int
340-main ()
341-{
342-return pcre_compile ();
343- ;
344- return 0;
345-}
346-_ACEOF
347-if ac_fn_c_try_link "$LINENO"; then :
348- ac_cv_lib_pcre_pcre_compile=yes
349-else
350- ac_cv_lib_pcre_pcre_compile=no
351-fi
352-rm -f core conftest.err conftest.$ac_objext \
353- conftest$ac_exeext conftest.$ac_ext
354-LIBS=$ac_check_lib_save_LIBS
355-fi
356-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
357-$as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
358-if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
359- have_pcre="yes"
360-else
361- have_pcre="no"
362-fi
363-
364- fi
365- fi
366
367- CPPFLAGS="$save_CPPFLAGS"
368- LDFLAGS="$save_LDFLAGS"
369+if test "$pcrelib" = "pcre2"; then
370+ $as_echo "#define USING_PCRE2 1" >>confdefs.h
371+ { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with pcre2 from $PCRE_HOME" >&5
372+ $as_echo "$as_me: Compiling and linking with pcre2 from $PCRE_HOME" >&6;}
373 fi
374
375-if test "x$have_pcre" = "xyes"; then
376-
377-$as_echo "#define HAVE_PCRE 1" >>confdefs.h
378-
379-
380- if test "$pcrelib" = "pcre2"; then
381-
382-$as_echo "#define USING_PCRE2 1" >>confdefs.h
383-
384- { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with pcre2 from $PCRE_HOME" >&5
385-$as_echo "$as_me: Compiling and linking with pcre2 from $PCRE_HOME" >&6;}
386- else
387- { $as_echo "$as_me:${as_lineno-$LINENO}: Compiling and linking with pcre from $PCRE_HOME" >&5
388-$as_echo "$as_me: Compiling and linking with pcre from $PCRE_HOME" >&6;}
389- fi
390-fi
391
392
393
394@@ -37002,33 +36668,27 @@ fi
395
396 fi
397 if test "x$PCRE_HOME" = "x"; then
398-
399-
400 $as_echo_n " pcre : "
401 if test "x$have_pcre" = "xno"; then :
402- $as_echo "no (disabled)"
403-elif test "x$have_pcre" = "xyes"; then :
404- $as_echo "no"
405-elif test "x$have_pcre" = "x"; then :
406- $as_echo "no"
407-else
408- $as_echo "no ($have_pcre)"
409-fi
410-
411+ $as_echo "no (disabled)"
412+ elif test "x$have_pcre" = "xyes"; then :
413+ $as_echo "no"
414+ elif test "x$have_pcre" = "x"; then :
415+ $as_echo "no"
416+ else
417+ $as_echo "no ($have_pcre)"
418+ fi
419 else
420-
421-
422 $as_echo_n " pcre : "
423 if test "x$have_pcre" = "xno"; then :
424- $as_echo "$PCRE_HOME (disabled)"
425-elif test "x$have_pcre" = "xyes"; then :
426- $as_echo "$PCRE_HOME"
427-elif test "x$have_pcre" = "x"; then :
428- $as_echo "$PCRE_HOME"
429-else
430- $as_echo "$PCRE_HOME ($have_pcre)"
431-fi
432-
433+ $as_echo "$PCRE_HOME (disabled)"
434+ elif test "x$have_pcre" = "xyes"; then :
435+ $as_echo "$PCRE_HOME"
436+ elif test "x$have_pcre" = "x"; then :
437+ $as_echo "$PCRE_HOME"
438+ else
439+ $as_echo "$PCRE_HOME ($have_pcre)"
440+ fi
441 fi
442
443
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-18 02:50:34 +0000