Attachment #224296 for bug #255266

View | Details | Raw Unified | Return to bug 255266
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/www/tinyproxy/Makefile (-1 / +1 lines)
1	# Created by: Mitsuru Yoshida <mitsuru@riken.go.jp>	1	# Created by: Mitsuru Yoshida <mitsuru@riken.go.jp>
2		2
3	PORTNAME= tinyproxy	3	PORTNAME= tinyproxy
4	PORTVERSION= 1.10.0	4	PORTVERSION= 1.11.0
5	MASTER_SITES= https://github.com/tinyproxy/tinyproxy/releases/download/${PORTVERSION}/	5	MASTER_SITES= https://github.com/tinyproxy/tinyproxy/releases/download/${PORTVERSION}/
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= www	7	CATEGORIES= www

Lines 1-3 Link Here

(-)b/www/tinyproxy/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1598616645	1	TIMESTAMP = 1618926358
2	SHA256 (tinyproxy-1.10.0.tar.xz) = 59be87689c415ba0d9c9bc6babbdd3df3b372d60b21e526b118d722dbc995682	2	SHA256 (tinyproxy-1.11.0.tar.xz) = c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32
3	SIZE (tinyproxy-1.10.0.tar.xz) = 176060	3	SIZE (tinyproxy-1.11.0.tar.xz) = 177664




--- configure.orig	2021-04-16 12:31:44 UTC
+++ configure
@@ -627,9 +627,6 @@ LTLIBOBJS
 HAVE_GPERF_FALSE
 HAVE_GPERF_TRUE
 GPERF
-HAVE_POD2MAN_FALSE
-HAVE_POD2MAN_TRUE
-POD2MAN
-HAVE_A2X_FALSE
-HAVE_A2X_TRUE
 A2X
-HAVE_XSLTPROC_FALSE
-HAVE_XSLTPROC_TRUE
 XSLTPROC
 ADDITIONAL_OBJECTS
 LIBOBJS
 HAVE_MANPAGE_INTEREST_FALSE
@@ -5974,67 +5971,6 @@ rm -f core conftest.err conftest.$ac_objext \
 
 
 
-if test x"$manpage_support_enabled" = x"yes"; then
-# Extract the first word of "pod2man", so it can be a program name with args.
-set dummy pod2man; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_POD2MAN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $POD2MAN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_POD2MAN="$POD2MAN" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_POD2MAN="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
+ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile m4macros/Makefile tests/Makefile tests/scripts/Makefile"
 
-  test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no"
-  ;;
-esac
-fi
-XSLTPROC=$ac_cv_path_XSLTPROC
-if test -n "$XSLTPROC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-$as_echo "$XSLTPROC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
-
- if test "x$XSLTPROC" != "xno"; then
-  HAVE_XSLTPROC_TRUE=
-  HAVE_XSLTPROC_FALSE='#'
-else
-  HAVE_XSLTPROC_TRUE='#'
-  HAVE_XSLTPROC_FALSE=
-fi
-
-
-# Check for asciidoc
-# Extract the first word of "a2x", so it can be a program name with args.
-set dummy a2x; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_A2X+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $A2X in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_A2X="$A2X" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi

-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_POD2MAN" && ac_cv_path_POD2MAN="no"
-  ;;
-esac
-fi
-POD2MAN=$ac_cv_path_POD2MAN
-if test -n "$POD2MAN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POD2MAN" >&5
-$as_echo "$POD2MAN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test "x$A2X" != "xno"; then
-  HAVE_A2X_TRUE=
-  HAVE_A2X_FALSE='#'
-else
-  HAVE_A2X_TRUE='#'
-  HAVE_A2X_FALSE=
-fi
-
-if test "x$POD2MAN" = "xno" && \
- ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then
-as_fn_error $? "
-  manpage generation requested, but neither pod2man
-  nor pre-generated manpages found.
-  Use --disable-manpage-support if you want to compile anyway." "$LINENO" 5
-if ${ac_cv_path_XMLLINT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XMLLINT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="no"
-  ;;
-esac
-fi
-XMLLINT=$ac_cv_path_XMLLINT
-if test -n "$XMLLINT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
-$as_echo "$XMLLINT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-fi #manpage_support_enabled
-
- if test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno"; then
-  HAVE_POD2MAN_TRUE=
-  HAVE_POD2MAN_FALSE='#'
-  echo "TEST" > conftest.txt
-  if $A2X -f docbook conftest.txt 2>/dev/null; then
-    $as_echo "ok"
-  else
-    $as_echo "failed"
-    XMLLINT="no"
-  fi
-  rm -f conftest.txt conftest.xml
-fi
- if test "x$XMLLINT" != "xno"; then
-  HAVE_XMLLINT_TRUE=
-  HAVE_XMLLINT_FALSE='#'
-else
-  HAVE_POD2MAN_TRUE='#'
-  HAVE_POD2MAN_FALSE=
-fi
-
-
 # Extract the first word of "gperf", so it can be a program name with args.
 set dummy gperf; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -6249,10 +6185,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__f
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -6377,18 +6207,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__f
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_POD2MAN_TRUE}" && test -z "${HAVE_POD2MAN_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_POD2MAN\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_A2X_TRUE}" && test -z "${HAVE_A2X_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_A2X\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_GPERF_TRUE}" && test -z "${HAVE_GPERF_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_GPERF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -7594,22 +7526,4 @@ fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -7720,22 +7538,4 @@ fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}

-
-
-# the manpages are shipped in the release tarball and we don't want them to
-# get regenerated if pod2man is not available. the intermediate files from
-# AC_CONFIG_FILES are created with config.status, which is created at configure
-# runtime, so we need to touch them after config.status terminated to prevent
-# make from rebuild them.
-
-if test "x$POD2MAN" = "xno" ; then
-  touch docs/man5/tinyproxy.conf.txt
-  touch docs/man8/tinyproxy.txt
-  if test -e docs/man5/tinyproxy.conf.5 ; then




--- src/main.c.orig	2021-04-16 12:31:11 UTC
+++ src/main.c
@@ -377,17 +377,17 @@ main (int argc, char **argv)
                 }
         }
 
+        /* Create log file after we drop privileges */
+        if (setup_logging ()) {
+                exit (EX_SOFTWARE);
+        }

         if (geteuid () == 0)
                 change_user (argv[0]);
         else
                 log_message (LOG_INFO,
                              "Not running as root, so not changing UID/GID.");
-
-        /* Create log file after we drop privileges */

-                exit (EX_SOFTWARE);
-        }
 
         /* These signals are only for the parent process. */
         log_message (LOG_INFO, "Setting the various signals.");

Added Link Here

(-)b/www/tinyproxy/files/patch-src_conf.c (+10 lines)
1	--- src/conf.c.orig 2021-04-16 12:31:11 UTC
2	+++ src/conf.c
3	@@ -24,6 +24,7 @@
4	*/
5
6	#include "common.h"
7	+#include <limits.h>
8	#include <regex.h>
9	#include "conf.h"
10

Return to bug 255266

Lines 1-35 Link Here

(-)b/www/tinyproxy/files/patch-configure (-166 / +46 lines)
1	--- configure.orig 2018-09-01 02:11:56 UTC	1	--- configure.orig 2021-04-16 12:31:44 UTC
2	+++ configure	2	+++ configure
3	@@ -624,14 +624,8 @@ ac_includes_default="\	3	@@ -627,9 +627,6 @@ LTLIBOBJS
4	ac_subst_vars='am__EXEEXT_FALSE	4	HAVE_GPERF_FALSE
5	am__EXEEXT_TRUE	5	HAVE_GPERF_TRUE
6	LTLIBOBJS	6	GPERF
7	-HAVE_XMLLINT_FALSE	7	-HAVE_POD2MAN_FALSE
8	-HAVE_XMLLINT_TRUE	8	-HAVE_POD2MAN_TRUE
9	XMLLINT	9	-POD2MAN
10	-HAVE_A2X_FALSE
11	-HAVE_A2X_TRUE
12	A2X
13	-HAVE_XSLTPROC_FALSE
14	-HAVE_XSLTPROC_TRUE
15	XSLTPROC
16	ADDITIONAL_OBJECTS	10	ADDITIONAL_OBJECTS
17	LIBOBJS	11	LIBOBJS
18	@@ -6069,173 +6063,9 @@ rm -f core conftest.err conftest.$ac_objext \	12	HAVE_MANPAGE_INTEREST_FALSE
		13	@@ -5974,67 +5971,6 @@ rm -f core conftest.err conftest.$ac_objext \
19		14
20		15
21		16
22	-# Check for xml tools	17	-if test x"$manpage_support_enabled" = x"yes"; then
23	-# Extract the first word of "xsltproc", so it can be a program name with args.	18	-# Extract the first word of "pod2man", so it can be a program name with args.
24	-set dummy xsltproc; ac_word=$2	19	-set dummy pod2man; ac_word=$2
25	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	20	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
26	-$as_echo_n "checking for $ac_word... " >&6; }	21	-$as_echo_n "checking for $ac_word... " >&6; }
27	-if ${ac_cv_path_XSLTPROC+:} false; then :	22	-if ${ac_cv_path_POD2MAN+:} false; then :
28	- $as_echo_n "(cached) " >&6	23	- $as_echo_n "(cached) " >&6
29	-else	24	-else
30	- case $XSLTPROC in	25	- case $POD2MAN in
31	- [\\/]* \| ?:[\\/]*)	26	- [\\/]* \| ?:[\\/]*)
32	- ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.	27	- ac_cv_path_POD2MAN="$POD2MAN" # Let the user override the test with a path.
33	- ;;	28	- ;;
34	- *)	29	- *)
35	- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR	30	- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
Lines 39-97 Link Here
39	- test -z "$as_dir" && as_dir=.	34	- test -z "$as_dir" && as_dir=.
40	- for ac_exec_ext in '' $ac_executable_extensions; do	35	- for ac_exec_ext in '' $ac_executable_extensions; do
41	- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then	36	- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
42	- ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"	37	- ac_cv_path_POD2MAN="$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	+ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile m4macros/Makefile tests/Makefile tests/scripts/Makefile"
50
51	- test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no"
52	- ;;
53	-esac
54	-fi
55	-XSLTPROC=$ac_cv_path_XSLTPROC
56	-if test -n "$XSLTPROC"; then
57	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
58	-$as_echo "$XSLTPROC" >&6; }
59	-else
60	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
61	-$as_echo "no" >&6; }
62	-fi
63
64	-
65	- if test "x$XSLTPROC" != "xno"; then
66	- HAVE_XSLTPROC_TRUE=
67	- HAVE_XSLTPROC_FALSE='#'
68	-else
69	- HAVE_XSLTPROC_TRUE='#'
70	- HAVE_XSLTPROC_FALSE=
71	-fi
72	-
73	-
74	-# Check for asciidoc
75	-# Extract the first word of "a2x", so it can be a program name with args.
76	-set dummy a2x; ac_word=$2
77	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
78	-$as_echo_n "checking for $ac_word... " >&6; }
79	-if ${ac_cv_path_A2X+:} false; then :
80	- $as_echo_n "(cached) " >&6
81	-else
82	- case $A2X in
83	- [\\/]* \| ?:[\\/]*)
84	- ac_cv_path_A2X="$A2X" # Let the user override the test with a path.
85	- ;;
86	- *)
87	- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
88	-for as_dir in $PATH
89	-do
90	- IFS=$as_save_IFS
91	- test -z "$as_dir" && as_dir=.
92	- for ac_exec_ext in '' $ac_executable_extensions; do
93	- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
94	- ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext"
95	- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5	38	- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
96	- break 2	39	- break 2
97	- fi	40	- fi
Lines 99-215 Link Here
99	- done	42	- done
100	-IFS=$as_save_IFS	43	-IFS=$as_save_IFS
101	-	44	-
102	- test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no"	45	- test -z "$ac_cv_path_POD2MAN" && ac_cv_path_POD2MAN="no"
103	- ;;	46	- ;;
104	-esac	47	-esac
105	-fi	48	-fi
106	-A2X=$ac_cv_path_A2X	49	-POD2MAN=$ac_cv_path_POD2MAN
107	-if test -n "$A2X"; then	50	-if test -n "$POD2MAN"; then
108	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5	51	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POD2MAN" >&5
109	-$as_echo "$A2X" >&6; }	52	-$as_echo "$POD2MAN" >&6; }
110	-else	53	-else
111	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5	54	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
112	-$as_echo "no" >&6; }	55	-$as_echo "no" >&6; }
113	-fi	56	-fi
114	-	57	-
115	-	58	-
116	- if test "x$A2X" != "xno"; then
117	- HAVE_A2X_TRUE=
118	- HAVE_A2X_FALSE='#'
119	-else
120	- HAVE_A2X_TRUE='#'
121	- HAVE_A2X_FALSE=
122	-fi
123	-	59	-
124	-	60	-if test "x$POD2MAN" = "xno" && \
125	-# checking xmllint	61	- ! test -e docs/man5/tinyproxy.conf.5 -a -e docs/man8/tinyproxy.8 ; then
126	-# Extract the first word of "xmllint", so it can be a program name with args.	62	-as_fn_error $? "
127	-set dummy xmllint; ac_word=$2	63	- manpage generation requested, but neither pod2man
128	-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5	64	- nor pre-generated manpages found.
129	-$as_echo_n "checking for $ac_word... " >&6; }	65	- Use --disable-manpage-support if you want to compile anyway." "$LINENO" 5
130	-if ${ac_cv_path_XMLLINT+:} false; then :
131	- $as_echo_n "(cached) " >&6
132	-else
133	- case $XMLLINT in
134	- [\\/]* \| ?:[\\/]*)
135	- ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
136	- ;;
137	- *)
138	- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
139	-for as_dir in $PATH
140	-do
141	- IFS=$as_save_IFS
142	- test -z "$as_dir" && as_dir=.
143	- for ac_exec_ext in '' $ac_executable_extensions; do
144	- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
145	- ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
146	- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
147	- break 2
148	- fi
149	-done
150	- done
151	-IFS=$as_save_IFS
152	-
153	- test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="no"
154	- ;;
155	-esac
156	-fi
157	-XMLLINT=$ac_cv_path_XMLLINT
158	-if test -n "$XMLLINT"; then
159	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
160	-$as_echo "$XMLLINT" >&6; }
161	-else
162	- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
163	-$as_echo "no" >&6; }
164	-fi	66	-fi
		67	-fi #manpage_support_enabled
165	-	68	-
166	-	69	- if test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno"; then
167	-if test "x$XMLLINT" != "xno"; then	70	- HAVE_POD2MAN_TRUE=
168	- $as_echo_n "testing xmllint... "	71	- HAVE_POD2MAN_FALSE='#'
169	- echo "TEST" > conftest.txt
170	- if $A2X -f docbook conftest.txt 2>/dev/null; then
171	- $as_echo "ok"
172	- else
173	- $as_echo "failed"
174	- XMLLINT="no"
175	- fi
176	- rm -f conftest.txt conftest.xml
177	-fi
178	- if test "x$XMLLINT" != "xno"; then
179	- HAVE_XMLLINT_TRUE=
180	- HAVE_XMLLINT_FALSE='#'
181	-else	72	-else
182	- HAVE_XMLLINT_TRUE='#'	73	- HAVE_POD2MAN_TRUE='#'
183	- HAVE_XMLLINT_FALSE=	74	- HAVE_POD2MAN_FALSE=
184	-fi	75	-fi
185	-	76	-
186	-	77	-
187	-ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile docs/Makefile docs/man5/Makefile docs/man5/tinyproxy.conf.txt docs/man8/Makefile docs/man8/tinyproxy.txt m4macros/Makefile tests/Makefile tests/scripts/Makefile"	78	# Extract the first word of "gperf", so it can be a program name with args.
188	-	79	set dummy gperf; ac_word=$2
189	-	80	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
190	cat >confcache <<\_ACEOF	81	@@ -6249,10 +6185,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__f
191	# This file is a shell script that caches the results of configure
192	# tests run on this system so they can be shared between configure
193	@@ -6377,18 +6207,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__f
194	as_fn_error $? "conditional \"am__fastdepCC\" was never defined.	82	as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
195	Usually this means the macro was only invoked conditionally." "$LINENO" 5	83	Usually this means the macro was only invoked conditionally." "$LINENO" 5
196	fi	84	fi
197	-if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then	85	-if test -z "${HAVE_POD2MAN_TRUE}" && test -z "${HAVE_POD2MAN_FALSE}"; then
198	- as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined.	86	- as_fn_error $? "conditional \"HAVE_POD2MAN\" was never defined.
199	-Usually this means the macro was only invoked conditionally." "$LINENO" 5
200	-fi
201	-if test -z "${HAVE_A2X_TRUE}" && test -z "${HAVE_A2X_FALSE}"; then
202	- as_fn_error $? "conditional \"HAVE_A2X\" was never defined.
203	-Usually this means the macro was only invoked conditionally." "$LINENO" 5	87	-Usually this means the macro was only invoked conditionally." "$LINENO" 5
204	-fi	88	-fi
205	-if test -z "${HAVE_XMLLINT_TRUE}" && test -z "${HAVE_XMLLINT_FALSE}"; then	89	if test -z "${HAVE_GPERF_TRUE}" && test -z "${HAVE_GPERF_FALSE}"; then
206	- as_fn_error $? "conditional \"HAVE_XMLLINT\" was never defined.	90	as_fn_error $? "conditional \"HAVE_GPERF\" was never defined.
207	-Usually this means the macro was only invoked conditionally." "$LINENO" 5	91	Usually this means the macro was only invoked conditionally." "$LINENO" 5
208	-fi	92	@@ -7594,22 +7526,4 @@ fi
209
210	: "${CONFIG_STATUS=./config.status}"
211	ac_write_fail=0
212	@@ -7720,22 +7538,4 @@ fi
213	if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then	93	if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
214	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5	94	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
215	$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}	95	$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
Lines 217-228 Link Here
217	-	97	-
218	-	98	-
219	-# the manpages are shipped in the release tarball and we don't want them to	99	-# the manpages are shipped in the release tarball and we don't want them to
220	-# get regenerated if a2x is not available. the intermediate files from	100	-# get regenerated if pod2man is not available. the intermediate files from
221	-# AC_CONFIG_FILES are created with config.status, which is created at configure	101	-# AC_CONFIG_FILES are created with config.status, which is created at configure
222	-# runtime, so we need to touch them after config.status terminated to prevent	102	-# runtime, so we need to touch them after config.status terminated to prevent
223	-# make from rebuild them.	103	-# make from rebuild them.
224	-	104	-
225	-if test "x$A2X" = "xno"; then	105	-if test "x$POD2MAN" = "xno" ; then
226	- touch docs/man5/tinyproxy.conf.txt	106	- touch docs/man5/tinyproxy.conf.txt
227	- touch docs/man8/tinyproxy.txt	107	- touch docs/man8/tinyproxy.txt
228	- if test -e docs/man5/tinyproxy.conf.5 ; then	108	- if test -e docs/man5/tinyproxy.conf.5 ; then

Lines 1-10 Link Here

(-)b/www/tinyproxy/files/patch-src-main.c (-6 / +6 lines)
1	--- src/main.c.orig 2018-09-01 00:55:39 UTC	1	--- src/main.c.orig 2021-04-16 12:31:11 UTC
2	+++ src/main.c	2	+++ src/main.c
3	@@ -395,17 +395,17 @@ main (int argc, char **argv)	3	@@ -377,17 +377,17 @@ main (int argc, char **argv)
4	}	4	}
5	}	5	}
6		6
7	+ /* Create log file before we drop privileges */	7	+ /* Create log file after we drop privileges */
8	+ if (setup_logging ()) {	8	+ if (setup_logging ()) {
9	+ exit (EX_SOFTWARE);	9	+ exit (EX_SOFTWARE);
10	+ }	10	+ }
Lines 13-19 Link Here
13	if (geteuid () == 0)	13	if (geteuid () == 0)
14	change_user (argv[0]);	14	change_user (argv[0]);
15	else	15	else
16	log_message (LOG_WARNING,	16	log_message (LOG_INFO,
17	"Not running as root, so not changing UID/GID.");	17	"Not running as root, so not changing UID/GID.");
18	-	18	-
19	- /* Create log file after we drop privileges */	19	- /* Create log file after we drop privileges */
Lines 21-25 Link Here
21	- exit (EX_SOFTWARE);	21	- exit (EX_SOFTWARE);
22	- }	22	- }
23		23
24	if (child_pool_create () < 0) {	24	/* These signals are only for the parent process. */
25	fprintf (stderr,	25	log_message (LOG_INFO, "Setting the various signals.");