Date: Sun, 30 Aug 2020 07:14:42 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546997 - in head/www/tinyproxy: . files Message-ID: <202008300714.07U7Eg5a007921@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Aug 30 07:14:42 2020 New Revision: 546997 URL: https://svnweb.freebsd.org/changeset/ports/546997 Log: Use upstream release tarball Added: head/www/tinyproxy/files/patch-Makefile.in - copied, changed from r546996, head/www/tinyproxy/files/patch-Makefile.am head/www/tinyproxy/files/patch-configure - copied, changed from r546996, head/www/tinyproxy/files/patch-configure.ac head/www/tinyproxy/files/patch-etc-Makefile.in (contents, props changed) Deleted: head/www/tinyproxy/files/patch-Makefile.am head/www/tinyproxy/files/patch-configure.ac Modified: head/www/tinyproxy/Makefile head/www/tinyproxy/distinfo head/www/tinyproxy/files/patch-src-main.c Modified: head/www/tinyproxy/Makefile ============================================================================== --- head/www/tinyproxy/Makefile Sun Aug 30 07:14:40 2020 (r546996) +++ head/www/tinyproxy/Makefile Sun Aug 30 07:14:42 2020 (r546997) @@ -3,6 +3,7 @@ PORTNAME= tinyproxy PORTVERSION= 1.10.0 +MASTER_SITES= https://github.com/tinyproxy/tinyproxy/releases/download/${PORTVERSION}/ PORTEPOCH= 1 CATEGORIES= www @@ -12,19 +13,17 @@ COMMENT= Small, efficient HTTP proxy server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= REVERSE TRANSPARENT XHEADER -REVERSE_DESC= Reverse proxy support -TRANSPARENT_DESC= Transparent proxy support -XHEADER_DESC= X-Tinyproxy header +USES= gmake tar:xz -USES= autoreconf gmake - CONFIGURE_ARGS= --bindir=${PREFIX}/sbin \ --program-transform-name="" GNU_CONFIGURE= yes -USE_RC_SUBR= ${PORTNAME} +USE_RC_SUBR= tinyproxy -USE_GITHUB= yes +OPTIONS_DEFINE= REVERSE TRANSPARENT XHEADER +REVERSE_DESC= Reverse proxy support +TRANSPARENT_DESC= Transparent proxy support +XHEADER_DESC= X-Tinyproxy header REVERSE_CONFIGURE_ENABLE= reverse TRANSPARENT_CONFIGURE_ENABLE= transparent @@ -35,11 +34,10 @@ post-patch: ${WRKSRC}/docs/man5/tinyproxy.conf.txt.in \ ${WRKSRC}/docs/man8/tinyproxy.txt.in \ ${WRKSRC}/etc/tinyproxy.conf.in - @${REINPLACE_CMD} -e 's|pkgsysconf_DATA|sysconf_DATA|' ${WRKSRC}/etc/Makefile.am @${REINPLACE_CMD} -e '/\/usr\/share\/tinyproxy/d; s|^#\(LogFile \)|\1|; s|^#\(PidFile \)|\1|' ${WRKSRC}/etc/tinyproxy.conf.in post-install: - ${INSTALL_DATA} ${WRKSRC}/etc/tinyproxy.conf ${STAGEDIR}${PREFIX}/etc/tinyproxy.conf.sample + ${MV} ${STAGEDIR}${PREFIX}/etc/tinyproxy.conf ${STAGEDIR}${PREFIX}/etc/tinyproxy.conf.sample ${INSTALL_MAN} ${FILESDIR}/tinyproxy.conf.5 ${STAGEDIR}${PREFIX}/share/man/man5/ ${INSTALL_MAN} ${FILESDIR}/tinyproxy.8 ${STAGEDIR}${PREFIX}/share/man/man8/ Modified: head/www/tinyproxy/distinfo ============================================================================== --- head/www/tinyproxy/distinfo Sun Aug 30 07:14:40 2020 (r546996) +++ head/www/tinyproxy/distinfo Sun Aug 30 07:14:42 2020 (r546997) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546784454 -SHA256 (tinyproxy-tinyproxy-1.10.0_GH0.tar.gz) = ff4f3d1331d6d855d8b6ed794c22ab0a4285dd81fe9c98a7aa7ed591248d4ab9 -SIZE (tinyproxy-tinyproxy-1.10.0_GH0.tar.gz) = 102337 +TIMESTAMP = 1598616645 +SHA256 (tinyproxy-1.10.0.tar.xz) = 59be87689c415ba0d9c9bc6babbdd3df3b372d60b21e526b118d722dbc995682 +SIZE (tinyproxy-1.10.0.tar.xz) = 176060 Copied and modified: head/www/tinyproxy/files/patch-Makefile.in (from r546996, head/www/tinyproxy/files/patch-Makefile.am) ============================================================================== --- head/www/tinyproxy/files/patch-Makefile.am Sun Aug 30 07:14:40 2020 (r546996, copy source) +++ head/www/tinyproxy/files/patch-Makefile.in Sun Aug 30 07:14:42 2020 (r546997) @@ -1,6 +1,6 @@ ---- Makefile.am.orig 2014-12-13 00:57:23 UTC -+++ Makefile.am -@@ -2,7 +2,6 @@ SUBDIRS = \ +--- Makefile.in.orig 2018-09-01 02:12:08 UTC ++++ Makefile.in +@@ -343,7 +343,6 @@ SUBDIRS = \ src \ data \ etc \ Copied and modified: head/www/tinyproxy/files/patch-configure (from r546996, head/www/tinyproxy/files/patch-configure.ac) ============================================================================== --- head/www/tinyproxy/files/patch-configure.ac Sun Aug 30 07:14:40 2020 (r546996, copy source) +++ head/www/tinyproxy/files/patch-configure Sun Aug 30 07:14:42 2020 (r546997) @@ -1,50 +1,221 @@ ---- configure.ac.orig 2018-09-01 02:06:59 UTC -+++ configure.ac -@@ -190,60 +190,15 @@ AC_SUBST(CPPFLAGS) - AC_SUBST(LIBS) - AC_SUBST(ADDITIONAL_OBJECTS) +--- configure.orig 2018-09-01 02:11:56 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 + ADDITIONAL_OBJECTS + LIBOBJS +@@ -6069,173 +6063,9 @@ rm -f core conftest.err conftest.$ac_objext \ + + -# Check for xml tools --AC_PATH_PROG(XSLTPROC, xsltproc, no) --AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") +-# Extract the first word of "xsltproc", so it can be a program name with args. +-set dummy xsltproc; 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 : +- $as_echo_n "(cached) " >&6 +-else +- case $XSLTPROC in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_XSLTPROC="$XSLTPROC" # 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_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 --AC_PATH_PROG(A2X, a2x, no) --AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") +-# 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 +- done +-IFS=$as_save_IFS - +- test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="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; } +-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 +- +- -# checking xmllint --AC_PATH_PROG(XMLLINT, xmllint, no) +-# 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... ") +- $as_echo_n "testing xmllint... " - echo "TEST" > conftest.txt - if $A2X -f docbook conftest.txt 2>/dev/null; then -- AS_ECHO("ok") +- $as_echo "ok" - else -- AS_ECHO("failed") +- $as_echo "failed" - XMLLINT="no" - fi - rm -f conftest.txt conftest.xml -fi --AM_CONDITIONAL(HAVE_XMLLINT, test "x$XMLLINT" != "xno") +- if test "x$XMLLINT" != "xno"; then +- HAVE_XMLLINT_TRUE= +- HAVE_XMLLINT_FALSE='#' +-else +- HAVE_XMLLINT_TRUE='#' +- HAVE_XMLLINT_FALSE= +-fi - - 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 - ]) +- +-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 + 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. +-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 - AC_OUTPUT + : "${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;} +-fi - +- -# 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 -# AC_CONFIG_FILES are created with config.status, which is created at configure @@ -60,4 +231,4 @@ - if test -e docs/man8/tinyproxy.8 ; then - touch docs/man8/tinyproxy.8 - fi --fi + fi Added: head/www/tinyproxy/files/patch-etc-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/tinyproxy/files/patch-etc-Makefile.in Sun Aug 30 07:14:42 2020 (r546997) @@ -0,0 +1,11 @@ +--- etc/Makefile.in.orig 2018-09-01 02:12:08 UTC ++++ etc/Makefile.in +@@ -256,7 +256,7 @@ target_vendor = @target_vendor@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-pkgsysconfdir = $(sysconfdir)/$(PACKAGE) ++pkgsysconfdir = $(sysconfdir) + pkgsysconf_DATA = \ + tinyproxy.conf + Modified: head/www/tinyproxy/files/patch-src-main.c ============================================================================== --- head/www/tinyproxy/files/patch-src-main.c Sun Aug 30 07:14:40 2020 (r546996) +++ head/www/tinyproxy/files/patch-src-main.c Sun Aug 30 07:14:42 2020 (r546997) @@ -1,6 +1,6 @@ ---- src/main.c.orig 2018-09-01 02:06:59 UTC +--- src/main.c.orig 2018-09-01 00:55:39 UTC +++ src/main.c -@@ -395,6 +395,11 @@ main (int argc, char **argv) +@@ -395,17 +395,17 @@ main (int argc, char **argv) } } @@ -12,15 +12,14 @@ /* Switch to a different user if we're running as root */ if (geteuid () == 0) change_user (argv[0]); -@@ -402,11 +407,6 @@ main (int argc, char **argv) + else log_message (LOG_WARNING, "Not running as root, so not changing UID/GID."); - +- - /* Create log file after we drop privileges */ - if (setup_logging ()) { - exit (EX_SOFTWARE); - } -- + if (child_pool_create () < 0) { fprintf (stderr, - "%s: Could not create the pool of children.\n",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008300714.07U7Eg5a007921>