mirror of
https://github.com/openwrt/packages.git
synced 2025-12-21 17:04:32 +04:00
squid: update to 7.1
- Use GitHub for sources URL - Remove autoreconf fixup (it works out-of-the-box) - Remove squid-mod-cachemgr package since cachemgr.cgi was removed upstream - Rename ac_cv_epoll_works to squid_cv_epoll_works to follow upstream - Don't customize target CFLAGS and LDFLAGS (they work as is) - Remove nettle configure patch - upstream handles it correctly now - Remove dummy comment in config menu Signed-off-by: Aleksey Vasilenko <aleksey.vasilenko@gmail.com>
This commit is contained in:
committed by
Tianling Shen
parent
d52e588182
commit
55404adb91
@@ -85,6 +85,4 @@ if PACKAGE_squid
|
|||||||
bool "Use libxml2 - Gnome XML library"
|
bool "Use libxml2 - Gnome XML library"
|
||||||
default n
|
default n
|
||||||
|
|
||||||
comment "Additional tools"
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -8,19 +8,17 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=squid
|
PKG_NAME:=squid
|
||||||
PKG_VERSION:=6.11
|
PKG_VERSION:=7.1
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=http://www2.pl.squid-cache.org/Versions/v6/ \
|
PKG_SOURCE_URL:=https://github.com/squid-cache/squid/releases/download/SQUID_$(subst .,_,$(PKG_VERSION))
|
||||||
http://www.squid-cache.org/Versions/v6/
|
PKG_HASH:=763b5a78561cedc4e47634fa42b8e6b8d46c87c949a151b4e7ac2396d2f97dea
|
||||||
PKG_HASH:=b6e60c08429314287925331b3da6c03b7d3c35b7e03319f78edb8bad6fc68899
|
|
||||||
|
|
||||||
PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
|
PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
|
||||||
PKG_LICENSE:=GPL-2.0-or-later
|
PKG_LICENSE:=GPL-2.0-or-later
|
||||||
PKG_CPE_ID:=cpe:/a:squid-cache:squid
|
PKG_CPE_ID:=cpe:/a:squid-cache:squid
|
||||||
|
|
||||||
PKG_FIXUP:=autoreconf
|
|
||||||
PKG_INSTALL:=1
|
PKG_INSTALL:=1
|
||||||
PKG_BUILD_PARALLEL:=1
|
PKG_BUILD_PARALLEL:=1
|
||||||
|
|
||||||
@@ -61,12 +59,6 @@ define Package/squid/conffiles
|
|||||||
/etc/squid/squid.conf
|
/etc/squid/squid.conf
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/squid-mod-cachemgr
|
|
||||||
$(call Package/squid/Default)
|
|
||||||
DEPENDS:=squid
|
|
||||||
TITLE:=Web based proxy manager and reporting tool
|
|
||||||
endef
|
|
||||||
|
|
||||||
CONFIGURE_ARGS += \
|
CONFIGURE_ARGS += \
|
||||||
BUILDCXX=$(HOSTCXX_NOCACHE) \
|
BUILDCXX=$(HOSTCXX_NOCACHE) \
|
||||||
BUILDCXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS) -std=c++17" \
|
BUILDCXXFLAGS="$(HOST_CXXFLAGS) $(HOST_CPPFLAGS) -std=c++17" \
|
||||||
@@ -107,10 +99,7 @@ CONFIGURE_ARGS += \
|
|||||||
|
|
||||||
CONFIGURE_VARS += \
|
CONFIGURE_VARS += \
|
||||||
ac_cv_header_linux_netfilter_ipv4_h=yes \
|
ac_cv_header_linux_netfilter_ipv4_h=yes \
|
||||||
ac_cv_epoll_works=yes
|
squid_cv_epoll_works=yes
|
||||||
|
|
||||||
TARGET_CFLAGS += -Wno-error
|
|
||||||
TARGET_LDFLAGS += -latomic
|
|
||||||
|
|
||||||
define Package/squid/install
|
define Package/squid/install
|
||||||
$(INSTALL_DIR) $(1)/usr/sbin
|
$(INSTALL_DIR) $(1)/usr/sbin
|
||||||
@@ -137,10 +126,4 @@ define Package/squid/install
|
|||||||
$(CP) $(PKG_INSTALL_DIR)/usr/share/squid/errors/templates/* $(1)/usr/share/squid/errors/templates/
|
$(CP) $(PKG_INSTALL_DIR)/usr/share/squid/errors/templates/* $(1)/usr/share/squid/errors/templates/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/squid-mod-cachemgr/install
|
|
||||||
$(INSTALL_DIR) $(1)/www/cgi-bin/
|
|
||||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/squid/cachemgr.cgi $(1)/www/cgi-bin/
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,squid))
|
$(eval $(call BuildPackage,squid))
|
||||||
$(eval $(call BuildPackage,squid-mod-cachemgr))
|
|
||||||
|
|||||||
@@ -36,10 +36,6 @@ http_access deny !Safe_ports
|
|||||||
# Deny CONNECT to other than secure SSL ports
|
# Deny CONNECT to other than secure SSL ports
|
||||||
http_access deny CONNECT !SSL_ports
|
http_access deny CONNECT !SSL_ports
|
||||||
|
|
||||||
# Only allow cachemgr access from localhost
|
|
||||||
http_access allow localhost manager
|
|
||||||
http_access deny manager
|
|
||||||
|
|
||||||
# We strongly recommend the following be uncommented to protect innocent
|
# We strongly recommend the following be uncommented to protect innocent
|
||||||
# web applications running on the proxy server who think the only
|
# web applications running on the proxy server who think the only
|
||||||
# one who can access services on "localhost" is a local user
|
# one who can access services on "localhost" is a local user
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -1033,7 +1033,7 @@ AC_MSG_NOTICE([HTCP support enabled: $en
|
|
||||||
|
|
||||||
# Cryptograhic libraries
|
|
||||||
SQUID_AUTO_LIB(nettle,[Nettle crypto],[LIBNETTLE])
|
|
||||||
-AS_IF(test "x$with_nettle" != "xno"],[
|
|
||||||
+AS_IF([test "x$with_nettle" != "xno"],[
|
|
||||||
SQUID_STATE_SAVE(squid_nettle_state)
|
|
||||||
PKG_CHECK_MODULES([LIBNETTLE],[nettle >= 3.4],[],[
|
|
||||||
CPPFLAGS="$LIBNETTLE_CFLAGS $CPPFLAGS"
|
|
||||||
Reference in New Issue
Block a user