[packages] tinyproxy: update to v1.8.0 (#6563)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@19319 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright (C) 2006-2009 OpenWrt.org
|
# Copyright (C) 2006-2010 OpenWrt.org
|
||||||
#
|
#
|
||||||
# This is free software, licensed under the GNU General Public License v2.
|
# This is free software, licensed under the GNU General Public License v2.
|
||||||
# See /LICENSE for more information.
|
# See /LICENSE for more information.
|
||||||
@ -8,12 +8,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=tinyproxy
|
PKG_NAME:=tinyproxy
|
||||||
PKG_VERSION:=1.6.5
|
PKG_VERSION:=1.8.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.6/
|
PKG_SOURCE_URL:=http://www.banu.com/pub/tinyproxy/1.8/
|
||||||
PKG_MD5SUM:=2b2862ba33d2939e4572688d442ba415
|
PKG_MD5SUM:=09843d47828261394d0a30af0b058997
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
@ -31,7 +31,8 @@ endef
|
|||||||
|
|
||||||
CONFIGURE_ARGS+= \
|
CONFIGURE_ARGS+= \
|
||||||
--enable-filter \
|
--enable-filter \
|
||||||
--enable-transparent-proxy \
|
--enable-transparent \
|
||||||
|
--enable-regexcheck=no \
|
||||||
|
|
||||||
define Build/Compile
|
define Build/Compile
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(MAKE) -C $(PKG_BUILD_DIR) \
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
--- a/src/reqs.c
|
|
||||||
+++ b/src/reqs.c
|
|
||||||
@@ -726,7 +726,7 @@ process_request(struct conn_s *connptr,
|
|
||||||
request->host);
|
|
||||||
|
|
||||||
indicate_http_error(connptr, 403, "Filtered",
|
|
||||||
- "detail", "The request you made has been filted",
|
|
||||||
+ "detail", "The request you made has been filtered",
|
|
||||||
"url", url,
|
|
||||||
NULL);
|
|
||||||
|
|
38
net/tinyproxy/patches/120-fix_INET6.patch
Normal file
38
net/tinyproxy/patches/120-fix_INET6.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
--- a/src/sock.c
|
||||||
|
+++ b/src/sock.c
|
||||||
|
@@ -39,8 +39,7 @@
|
||||||
|
* returned if the bind succeeded. Otherwise, -1 is returned
|
||||||
|
* to indicate an error.
|
||||||
|
*/
|
||||||
|
-static int
|
||||||
|
-bind_socket (int sockfd, const char *addr, int family)
|
||||||
|
+static int bind_socket (int sockfd, const char *addr)
|
||||||
|
{
|
||||||
|
struct addrinfo hints, *res, *ressave;
|
||||||
|
|
||||||
|
@@ -48,7 +47,7 @@ bind_socket (int sockfd, const char *addr, int family)
|
||||||
|
assert (addr != NULL && strlen (addr) != 0);
|
||||||
|
|
||||||
|
memset (&hints, 0, sizeof (struct addrinfo));
|
||||||
|
- hints.ai_family = family;
|
||||||
|
+ hints.ai_family = AF_UNSPEC;
|
||||||
|
hints.ai_socktype = SOCK_STREAM;
|
||||||
|
|
||||||
|
/* The local port it not important */
|
||||||
|
@@ -106,14 +105,12 @@ int opensock (const char *host, int port, const char *bind_to)
|
||||||
|
|
||||||
|
/* Bind to the specified address */
|
||||||
|
if (bind_to) {
|
||||||
|
- if (bind_socket (sockfd, bind_to,
|
||||||
|
- res->ai_family) < 0) {
|
||||||
|
+ if (bind_socket (sockfd, bind_to) < 0) {
|
||||||
|
close (sockfd);
|
||||||
|
continue; /* can't bind, so try again */
|
||||||
|
}
|
||||||
|
} else if (config.bind_address) {
|
||||||
|
- if (bind_socket (sockfd, config.bind_address,
|
||||||
|
- res->ai_family) < 0) {
|
||||||
|
+ if (bind_socket (sockfd, config.bind_address) < 0) {
|
||||||
|
close (sockfd);
|
||||||
|
continue; /* can't bind, so try again */
|
||||||
|
}
|
Reference in New Issue
Block a user