mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-28 10:08:24 +00:00
Code Issues Releases Activity

www/tinyproxy: Update to 1.11.0

Browse Source 
Changes:	https://github.com/tinyproxy/tinyproxy/releases
PR:		255266
This commit is contained in:
Guido Falsi 2021-05-05 05:29:45 +08:00 committed by Po-Chuan Hsieh
parent ff80f43ba0
commit c2a7a0c03e
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
5 changed files with 68 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/tinyproxy/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Mitsuru Yoshida <mitsuru@riken.go.jp>
PORTNAME= tinyproxy
PORTVERSION= 1.10.0
PORTVERSION= 1.11.0
MASTER_SITES= https://github.com/tinyproxy/tinyproxy/releases/download/${PORTVERSION}/
PORTEPOCH= 1
CATEGORIES= www

6
www/tinyproxy/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1598616645
SHA256 (tinyproxy-1.10.0.tar.xz) = 59be87689c415ba0d9c9bc6babbdd3df3b372d60b21e526b118d722dbc995682
SIZE (tinyproxy-1.10.0.tar.xz) = 176060
TIMESTAMP = 1620163643
SHA256 (tinyproxy-1.11.0.tar.xz) = c1ec81cfc4c551d2c24e0227a5aeeaad8723bd9a39b61cd729e516b82eaa3f32
SIZE (tinyproxy-1.11.0.tar.xz) = 177664

218
www/tinyproxy/files/patch-configure
View File

@ -1,35 +1,30 @@
--- configure.orig 2018-09-01 02:11:56 UTC
--- configure.orig 2021-04-16 12:31:44 UTC
+++ configure
@@ -624,14 +624,8 @@ ac_includes_default="\
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
-HAVE_XMLLINT_FALSE
-HAVE_XMLLINT_TRUE
XMLLINT
-HAVE_A2X_FALSE
-HAVE_A2X_TRUE
A2X
-HAVE_XSLTPROC_FALSE
-HAVE_XSLTPROC_TRUE
XSLTPROC
@@ -627,9 +627,6 @@ LTLIBOBJS
HAVE_GPERF_FALSE
HAVE_GPERF_TRUE
GPERF
-HAVE_POD2MAN_FALSE
-HAVE_POD2MAN_TRUE
-POD2MAN
ADDITIONAL_OBJECTS
LIBOBJS
@@ -6069,173 +6063,9 @@ rm -f core conftest.err conftest.$ac_objext \
HAVE_MANPAGE_INTEREST_FALSE
@@ -5974,67 +5971,6 @@ rm -f core conftest.err conftest.$ac_objext \
-# Check for xml tools
-# Extract the first word of "xsltproc", so it can be a program name with args.
-set dummy xsltproc; ac_word=$2
-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_XSLTPROC+:} false; then :
-if ${ac_cv_path_POD2MAN+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $XSLTPROC in
- case $POD2MAN in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
- ac_cv_path_POD2MAN="$POD2MAN" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@ -39,59 +34,7 @@
- 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_XSLTPROC="$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"
- 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
@ -99,117 +42,54 @@
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no"
- test -z "$ac_cv_path_POD2MAN" && ac_cv_path_POD2MAN="no"
- ;;
-esac
-fi
-A2X=$ac_cv_path_A2X
-if test -n "$A2X"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5
-$as_echo "$A2X" >&6; }
-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='#'
-
-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
-fi
-fi #manpage_support_enabled
-
- if test "x$POD2MAN" != "x" -a "x$POD2MAN" != "xno"; then
- HAVE_POD2MAN_TRUE=
- HAVE_POD2MAN_FALSE='#'
-else
- HAVE_A2X_TRUE='#'
- HAVE_A2X_FALSE=
- HAVE_POD2MAN_TRUE='#'
- HAVE_POD2MAN_FALSE=
-fi
-
-
-# checking xmllint
-# Extract the first word of "xmllint", so it can be a program name with args.
-set dummy xmllint; 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_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
-
-
-if test "x$XMLLINT" != "xno"; then
- $as_echo_n "testing xmllint... "
- 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_XMLLINT_TRUE='#'
- HAVE_XMLLINT_FALSE=
-fi
-
-
-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"
-
-
cat >confcache <<\_ACEOF
# 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
# 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
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_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined.
-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_XMLLINT_TRUE}" && test -z "${HAVE_XMLLINT_FALSE}"; then
- as_fn_error $? "conditional \"HAVE_XMLLINT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
@@ -7720,22 +7538,4 @@ 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
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;}
@ -217,12 +97,12 @@
-
-
-# the manpages are shipped in the release tarball and we don't want them to
-# get regenerated if a2x is not available. the intermediate files from
-# 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$A2X" = "xno"; then
-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

10
www/tinyproxy/files/patch-src-conf.c Normal file
View File

@ -0,0 +1,10 @@
--- src/conf.c.orig 2021-04-16 12:31:11 UTC
+++ src/conf.c
@@ -24,6 +24,7 @@
*/
#include "common.h"
+#include <limits.h>
#include <regex.h>
#include "conf.h"

10
www/tinyproxy/files/patch-src-main.c
View File

@ -1,6 +1,6 @@
--- src/main.c.orig 2018-09-01 00:55:39 UTC
--- src/main.c.orig 2021-04-16 12:31:11 UTC
+++ src/main.c
@@ -395,17 +395,17 @@ main (int argc, char **argv)
@@ -377,17 +377,17 @@ main (int argc, char **argv)
}
}
@ -13,7 +13,7 @@
if (geteuid () == 0)
change_user (argv[0]);
else
log_message (LOG_WARNING,
log_message (LOG_INFO,
"Not running as root, so not changing UID/GID.");
-
- /* Create log file after we drop privileges */
@ -21,5 +21,5 @@
- exit (EX_SOFTWARE);
- }
if (child_pool_create () < 0) {
fprintf (stderr,
/* These signals are only for the parent process. */
log_message (LOG_INFO, "Setting the various signals.");