commit b127de865b48c082a6e365737954d585fc29c428
parent 6a56edca27ba2db9b3a8114ece78b08f64a37cf0
Author: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Date: Mon, 20 Jul 2015 16:12:45 -0700
squid: version bump and dependency fixes
Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
Diffstat:
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/net/squid/Makefile b/net/squid/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=squid
-PKG_VERSION:=3.5.5
+PKG_VERSION:=3.5.6
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
@@ -16,7 +16,7 @@ PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.squid-cache.org/Versions/v3/3.5/
-PKG_MD5SUM:=9a323a97753143ddd935aed58a0193ae
+PKG_MD5SUM:=93e18bd257857e35bb634ddb8a348563
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
@@ -33,7 +33,7 @@ endef
define Package/squid
$(call Package/squid/Default)
MENU:=1
- DEPENDS:=+libopenssl +libpthread +librt +libltdl +libstdcpp +libgnutls
+ DEPENDS:=+libopenssl +libpthread +librt +libltdl +libstdcpp
TITLE:=full-featured Web proxy cache
endef
@@ -62,12 +62,8 @@ CONFIGURE_ARGS += \
--enable-kill-parent-hack \
--disable-snmp \
--enable-ssl \
+ --enable-ssl-crtd \
--enable-cache-digests \
- --enable-auth \
- --enable-auth-basic \
- --enable-auth-ntlm \
- --enable-auth-negotiate \
- --enable-auth-digest \
--enable-linux-netfilter \
--disable-unlinkd \
--enable-x-accelerator-vary \
@@ -77,6 +73,7 @@ CONFIGURE_ARGS += \
--with-pthreads \
--without-expat \
--without-libxml2 \
+ --without-gnutls \
--without-nettle \
--with-openssl=$(STAGING_DIR)/usr \
--enable-epoll \
@@ -93,7 +90,8 @@ CONFIGURE_ARGS += \
CONFIGURE_VARS += \
ac_cv_header_linux_netfilter_ipv4_h=yes \
- ac_cv_epoll_works=yes
+ ac_cv_epoll_works=yes \
+ squid_cv_gnu_atomics=no
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/lib all
@@ -106,6 +104,9 @@ define Package/squid/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/squid $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/lib/squid
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/squid/ssl_crtd $(1)/usr/lib/squid
+
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/squid.config $(1)/etc/config/squid
diff --git a/net/squid/files/squid.conf b/net/squid/files/squid.conf
@@ -38,7 +38,7 @@ refresh_pattern . 0 20% 4320
access_log none
cache_log /dev/null
-cache_store_log /dev/null
+cache_store_log stdio:/dev/null
logfile_rotate 0
logfile_daemon /dev/null
diff --git a/net/squid/files/squid.config b/net/squid/files/squid.config
@@ -3,3 +3,6 @@ config squid 'squid'
option http_port '3128'
option coredump_dir '/tmp/squid'
option visible_hostname 'OpenWrt'
+ #option http_port_options 'intercept'
+ #option ssldb '/tmp/squid/ssldb'
+ #option ssldb_options '-M 4MB'
diff --git a/net/squid/files/squid.init b/net/squid/files/squid.init
@@ -12,13 +12,16 @@ validate_squid_section() {
uci_validate_section squid squid "${1}" \
'config_file:string' \
'http_port:port:3128' \
+ 'http_port_options:string' \
+ 'ssldb:string' \
+ 'ssldb_options:string' \
'coredump_dir:string' \
'visible_hostname:string:OpenWrt' \
'pinger_enable:string:off'
}
start_service() {
- local config_file http_port coredump_dir visible_hostname pinger_enable
+ local config_file http_port http_port_options ssldb ssldb_options coredump_dir visible_hostname pinger_enable
validate_squid_section squid || {
echo "validation failed"
@@ -28,12 +31,15 @@ start_service() {
config_dir=$(dirname $CONFIGFILE)
[ -d $config_dir ] || mkdir -p $config_dir && chown nobody:nogroup $config_dir
[ -d $coredump_dir ] || mkdir -p $coredump_dir && chown nobody:nogroup $coredump_dir
+ [ "$ssldb" ] && ( [ -f "$ssldb"/size ] || /usr/lib/squid/ssl_crtd -c -s $ssldb && chown -R nobody:nogroup $ssldb )
cat $config_file > $CONFIGFILE
- echo http_port $http_port >> $CONFIGFILE
+ echo http_port $http_port $http_port_options >> $CONFIGFILE
echo coredump_dir $coredump_dir >> $CONFIGFILE
echo visible_hostname $visible_hostname >> $CONFIGFILE
echo pinger_enable $pinger_enable >> $CONFIGFILE
+ [ "$ssldb" ] && echo sslcrtd_program /usr/lib/squid/ssl_crtd -s $ssldb $ssldb_options >> $CONFIGFILE
+ $PROG -s -f $CONFIGFILE -N -z 2>/dev/null
procd_open_instance
procd_set_param command $PROG -s -f $CONFIGFILE -N
