From 395c31dddd803290338133bc76ccf7de60cf5c10 Mon Sep 17 00:00:00 2001 From: acoul Date: Mon, 9 Aug 2010 13:25:04 +0000 Subject: [PATCH] net/tinyproxy: update tinyproxy to 1.8.2 git-svn-id: svn://svn.openwrt.org/openwrt/packages@22558 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- net/tinyproxy/Makefile | 8 +++--- net/tinyproxy/patches/010-no-docs-and-tests.patch | 30 +++++++++-------------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/net/tinyproxy/Makefile b/net/tinyproxy/Makefile index 96f3bf781..28147e416 100644 --- a/net/tinyproxy/Makefile +++ b/net/tinyproxy/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tinyproxy -PKG_VERSION:=1.8.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.8.2 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/ -PKG_MD5SUM:=e1f0977592f020ef509262c24c3284fb +PKG_MD5SUM:=edc8502193cfed4974d6a770da173755 PKG_INSTALL:=1 diff --git a/net/tinyproxy/patches/010-no-docs-and-tests.patch b/net/tinyproxy/patches/010-no-docs-and-tests.patch index b008971a4..12298e657 100644 --- a/net/tinyproxy/patches/010-no-docs-and-tests.patch +++ b/net/tinyproxy/patches/010-no-docs-and-tests.patch @@ -24,21 +24,16 @@ # tools want this on a single line --- a/configure +++ b/configure -@@ -9012,67 +9012,8 @@ $as_echo "$as_me: error: Your system's r - fi +@@ -6816,59 +6816,8 @@ 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:$LINENO: checking for $ac_word" >&5 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_A2X+set}" = set; then +-if test "${ac_cv_path_A2X+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case $A2X in @@ -51,14 +46,14 @@ -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do +- for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_A2X="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done --done +- done -IFS=$as_save_IFS - - test -z "$ac_cv_path_A2X" && ac_cv_path_A2X="no" @@ -67,10 +62,10 @@ -fi -A2X=$ac_cv_path_A2X -if test -n "$A2X"; then -- { $as_echo "$as_me:$LINENO: result: $A2X" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $A2X" >&5 -$as_echo "$A2X" >&6; } -else -- { $as_echo "$as_me:$LINENO: result: no" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - @@ -84,11 +79,8 @@ -fi - -if test x"$A2X" = x"no"; then -- { { $as_echo "$as_me:$LINENO: error: Test for asciidoc failed. See the file 'INSTALL' for help." >&5 --$as_echo "$as_me: error: Test for asciidoc failed. See the file 'INSTALL' for help." >&2;} -- { (exit 1); exit 1; }; } +- as_fn_error "Test for asciidoc failed. See the file 'INSTALL' for help." "$LINENO" 5 -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" + 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" -- 2.11.0