Changeset 14756


Ignorieren:
Zeitstempel:
05.07.2018 19:20:14 (vor 3 Monaten)
Autor:
er13
Nachricht:

tinyproxy: bump version to 1.8.4

https://raw.githubusercontent.com/tinyproxy/tinyproxy/1.8.4/NEWS

compile-tested only

Ort:
trunk
Dateien:
1 hinzugefügt
1 gelöscht
6 bearbeitet
2 verschoben

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14755 r14756  
    192192    * subversion 1.8.19/1.9.7 
    193193    * tinc 1.0.33/1.1pre15 
    194     * tinyproxy 1.8.3 
     194    * tinyproxy 1.8.4 
    195195    * tmux 2.5 
    196196    * tor 0.3.2.10 
  • trunk/make/tinyproxy/Config.in

    r9554 r14756  
    11config FREETZ_PACKAGE_TINYPROXY 
    2     bool "Tinyproxy 1.8.2" 
     2    bool "Tinyproxy 1.8.4" 
    33    default n 
    44    help 
  • trunk/make/tinyproxy/external.in

    r10621 r14756  
    55    help 
    66        externals the following file(s) 
    7             /usr/sbin/tinyproxy 
     7         /usr/sbin/tinyproxy 
  • trunk/make/tinyproxy/patches/010-no-docs-and-tests.patch

    r10769 r14756  
    1 --- Makefile.am.orig    2010-06-02 07:09:18.000000000 +0200 
    2 +++ Makefile.am 2010-09-19 02:17:17.624729636 +0200 
    3 @@ -2,9 +2,7 @@ 
    4     src \ 
    5     data \ 
    6     etc \ 
    7 -   docs \ 
    8     m4macros \ 
    9 -   tests 
    10   
    11  # tools want this on a single line 
    12  ACLOCAL_AMFLAGS = -I m4macros 
    13 --- Makefile.in.orig    2010-06-05 11:49:33.000000000 +0200 
    14 +++ Makefile.in 2010-09-19 02:17:17.624729636 +0200 
    15 @@ -222,9 +222,7 @@ 
     1--- Makefile.in 
     2+++ Makefile.in 
     3@@ -317,9 +317,7 @@ 
    164    src \ 
    175    data \ 
     
    2311  
    2412 # tools want this on a single line 
    25 --- configure.orig  2010-06-05 11:49:34.000000000 +0200 
    26 +++ configure   2010-09-19 02:17:17.624729636 +0200 
    27 @@ -6815,61 +6815,9 @@ 
     13--- configure 
     14+++ configure 
     15@@ -7107,6 +7107,7 @@ 
    2816  
    2917  
    3018  
    31 -# Check for asciidoc 
    32 -# Extract the first word of "a2x", so it can be a program name with args. 
    33 -set dummy a2x; ac_word=$2 
    34 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 
    35 -$as_echo_n "checking for $ac_word... " >&6; } 
    36 -if test "${ac_cv_path_A2X+set}" = set; then : 
    37 -  $as_echo_n "(cached) " >&6 
    38 -else 
    39 -  case $A2X in 
    40 -  [\\/]* | ?:[\\/]*) 
    41 -  ac_cv_path_A2X="$A2X" # Let the user override the test with a path. 
    42 -  ;; 
    43 -  *) 
    44 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 
    45 -for as_dir in $PATH 
    46 -do 
    47 -  IFS=$as_save_IFS 
    48 -  test -z "$as_dir" && as_dir=. 
    49 -    for ac_exec_ext in '' $ac_executable_extensions; do 
    50 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 
    51 -    ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext" 
    52 -    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 
    53 -    break 2 
    54 -  fi 
    55 -done 
    56 -  done 
    57 -IFS=$as_save_IFS 
    58 - 
    59 -  test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no" 
    60 -  ;; 
    61 -esac 
    62 -fi 
    63 -A2X=$ac_cv_path_A2X 
    64 -if test -n "$A2X"; then 
    65 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5 
    66 -$as_echo "$A2X" >&6; } 
    67 -else 
    68 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 
    69 -$as_echo "no" >&6; } 
    70 -fi 
    71 - 
    72 - 
    73 - if test "x$A2X" != "xno"; then 
    74 -  HAVE_A2X_TRUE= 
    75 -  HAVE_A2X_FALSE='#' 
    76 -else 
    77    HAVE_A2X_TRUE='#' 
     19+ac_cv_path_A2X=no 
     20 # Check for asciidoc 
     21 # Extract the first word of "a2x", so it can be a program name with args. 
     22 set dummy a2x; ac_word=$2 
     23@@ -7157,9 +7158,6 @@ 
    7824   HAVE_A2X_FALSE= 
    79 -fi 
    80 - 
     25 fi 
     26  
    8127-if test x"$A2X" = x"no"; then 
    8228-  as_fn_error $? "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5 
    8329-fi 
    84 - 
    85 -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" 
    86 +ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile data/templates/Makefile etc/Makefile m4macros/Makefile" 
    8730  
     31 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" 
    8832  
    89  cat >confcache <<\_ACEOF 
    90  
  • trunk/make/tinyproxy/patches/020-no_libnsl_no_libresolv.patch

    r14755 r14756  
    11--- configure 
    22+++ configure 
    3 @@ -5215,6 +5215,7 @@ 
     3@@ -5497,6 +5497,7 @@ 
    44  
    55  
     
    88 unset ac_cv_func_yp_get_default_domain 
    99 ac_fn_c_check_func "$LINENO" "yp_get_default_domain" "ac_cv_func_yp_get_default_domain" 
    10  if test "x$ac_cv_func_yp_get_default_domain" = x""yes; then : 
    11 @@ -5363,6 +5364,7 @@ 
     10 if test "x$ac_cv_func_yp_get_default_domain" = xyes; then : 
     11@@ -5645,6 +5646,7 @@ 
    1212   LIBS="-lresolv $LIBS" 
    1313  
  • trunk/make/tinyproxy/patches/030-file_paths.patch

    r14755 r14756  
    1 diff -Nur a/src/main.c b/src/main.c 
    2 --- src/main.c        2010-07-17 11:57:25.000000000 +0200 
    3 +++ src/main.c        2010-07-17 11:58:52.000000000 +0200 
    4 @@ -326,8 +326,8 @@ 
     1--- src/main.c 
     2+++ src/main.c 
     3@@ -336,8 +336,8 @@ 
    54         conf->errorpages = NULL; 
    65         conf->stathost = safestrdup (TINYPROXY_STATHOST); 
     
    87-        conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy/tinyproxy.log"); 
    98-        conf->pidpath = safestrdup (LOCALSTATEDIR "/run/tinyproxy/tinyproxy.pid"); 
    10 +        conf->logf_name = safestrdup (LOCALSTATEDIR "/log/tinyproxy.log"); 
    11 +        conf->pidpath = safestrdup (LOCALSTATEDIR "/tinyproxy.pid"); 
     9+        conf->logf_name = safestrdup ("/var/log/tinyproxy.log"); 
     10+        conf->pidpath = safestrdup ("/var/run/tinyproxy//tinyproxy.pid"); 
    1211 } 
    1312  
    1413 /** 
    15  
     14--- src/child.c 
     15+++ src/child.c 
     16@@ -75,7 +75,7 @@ 
     17  
     18 static void _child_lock_init (void) 
     19 { 
     20-        char lock_file[] = "/tmp/tinyproxy.servers.lock.XXXXXX"; 
     21+        char lock_file[] = "/var/tmp/tinyproxy.servers.lock.XXXXXX"; 
     22  
     23         /* Only allow u+rw bits. This may be required for some versions 
     24          * of glibc so that mkstemp() doesn't make us vulnerable. 
     25--- src/heap.c 
     26+++ src/heap.c 
     27@@ -109,9 +109,9 @@ 
     28 { 
     29         int fd; 
     30         void *ptr; 
     31-        char buffer[32]; 
     32+        char buffer[36]; 
     33  
     34-        static const char *shared_file = "/tmp/tinyproxy.shared.XXXXXX"; 
     35+        static const char *shared_file = "/var/tmp/tinyproxy.shared.XXXXXX"; 
     36  
     37         assert (size > 0); 
     38  
  • trunk/make/tinyproxy/patches/120-fix_INET6.patch

    r5818 r14756  
    11--- src/sock.c 
    22+++ src/sock.c 
    3 @@ -39,8 +39,7 @@ 
    4   * returned if the bind succeeded.  Otherwise, -1 is returned 
     3@@ -40,7 +40,7 @@ 
    54  * to indicate an error. 
    65  */ 
    7 -static int 
     6 static int 
    87-bind_socket (int sockfd, const char *addr, int family) 
    9 +static int bind_socket (int sockfd, const char *addr) 
     8+bind_socket (int sockfd, const char *addr) 
    109 { 
    1110         struct addrinfo hints, *res, *ressave; 
    1211  
    13 @@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *add 
     12@@ -48,7 +48,7 @@ 
    1413         assert (addr != NULL && strlen (addr) != 0); 
    1514  
     
    2019  
    2120         /* The local port it not important */ 
    22 @@ -106,14 +105,12 @@ int opensock (const char *host, int port 
     21@@ -106,14 +106,12 @@ 
    2322  
    2423                 /* Bind to the specified address */ 
  • trunk/make/tinyproxy/tinyproxy.mk

    r10769 r14756  
    1 $(call PKG_INIT_BIN, 1.8.3) 
    2 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.bz2 
    3 $(PKG)_SOURCE_MD5:=292ac51da8ad6ae883d4ebf56908400d 
    4 $(PKG)_SITE:=https://www.banu.com/pub/tinyproxy/1.8 
     1$(call PKG_INIT_BIN, 1.8.4) 
     2$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz 
     3$(PKG)_SOURCE_MD5:=b181e8c78cb31c2bc16b61fcf2425190 
     4$(PKG)_SITE:=https://github.com/tinyproxy/tinyproxy/releases/download/$($(PKG)_VERSION) 
     5 
    56$(PKG)_BINARY:=$($(PKG)_DIR)/src/tinyproxy 
    67$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/sbin/tinyproxy 
     
    1516$(PKG)_CONFIGURE_ENV += tinyproxy_cv_regex_broken=no 
    1617 
    17 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_TRANSPARENT_PROXY),--enable-transparent) 
    18 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_FILTER),,--disable-filter) 
    19 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_UPSTREAM),,--disable-upstream) 
    20 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_SOCKS),--enable-socks) 
    21 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_REVERSE),--enable-reverse) 
     18$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_TRANSPARENT_PROXY),--enable-transparent,--disable-transparent) 
     19$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_FILTER),--enable-filter,--disable-filter) 
     20$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_UPSTREAM),--enable-upstream,--disable-upstream) 
     21$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_SOCKS),--enable-socks,--disable-socks) 
     22$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_TINYPROXY_WITH_REVERSE),--enable-reverse,--disable-reverse) 
    2223 
    2324$(PKG_SOURCE_DOWNLOAD) 
     
    2627 
    2728$($(PKG)_BINARY): $($(PKG)_DIR)/.configured 
    28     $(SUBMAKE) -C $(TINYPROXY_DIR) $(if $(FREETZ_PACKAGE_TINYPROXY_STATIC),LDFLAGS=-static) 
     29    $(SUBMAKE) -C $(TINYPROXY_DIR) $(if $(FREETZ_PACKAGE_TINYPROXY_STATIC),LDFLAGS=-static) V=1 
    2930 
    3031$($(PKG)_TARGET_BINARY): $($(PKG)_BINARY) 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.