Fri Feb 10 08:41:25 2017 UTC ()
Enable build of ssl_crtd if ssl option selected. This is required for dynamic
certificate generation when using SSL Bump.
http://wiki.squid-cache.org/ConfigExamples/Intercept/SslBumpExplicit


(sborrill)
diff -r1.72 -r1.73 pkgsrc/www/squid3/Makefile
diff -r1.12 -r1.13 pkgsrc/www/squid3/PLIST
diff -r1.21 -r1.22 pkgsrc/www/squid3/options.mk
cvs diff -r1.72 -r1.73 pkgsrc/www/squid3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/Makefile 2017/01/30 14:17:33 1.72
+++ pkgsrc/www/squid3/Attic/Makefile 2017/02/10 08:41:25 1.73
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.72 2017/01/30 14:17:33 adam Exp $ 1# $NetBSD: Makefile,v 1.73 2017/02/10 08:41:25 sborrill Exp $
2 2
3DISTNAME= squid-3.5.24 3DISTNAME= squid-3.5.24
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ 6MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/
6MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/ 7MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/
7MASTER_SITES+= http://ftp.nluug.nl/internet/squid/ 8MASTER_SITES+= http://ftp.nluug.nl/internet/squid/
8EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 12HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
14 15
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_TOOLS+= perl:run gmake 17USE_TOOLS+= perl:run gmake
cvs diff -r1.12 -r1.13 pkgsrc/www/squid3/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/PLIST 2016/10/10 09:01:39 1.12
+++ pkgsrc/www/squid3/Attic/PLIST 2017/02/10 08:41:25 1.13
@@ -1,22 +1,23 @@ @@ -1,22 +1,23 @@
1@comment $NetBSD: PLIST,v 1.12 2016/10/10 09:01:39 adam Exp $ 1@comment $NetBSD: PLIST,v 1.13 2017/02/10 08:41:25 sborrill Exp $
2bin/purge 2bin/purge
3bin/squidclient 3bin/squidclient
4${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth 4${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
5${PLIST.ba_LDAP}libexec/basic_ldap_auth 5${PLIST.ba_LDAP}libexec/basic_ldap_auth
6${PLIST.ba_NCSA}libexec/basic_ncsa_auth 6${PLIST.ba_NCSA}libexec/basic_ncsa_auth
7${PLIST.ba_PAM}libexec/basic_pam_auth 7${PLIST.ba_PAM}libexec/basic_pam_auth
8libexec/cachemgr.cgi 8libexec/cachemgr.cgi
9${PLIST.ssl}libexec/cert_valid.pl 9${PLIST.ssl}libexec/cert_valid.pl
 10${PLIST.ssl}libexec/ssl_crtd
10${PLIST.da_file}libexec/digest_file_auth 11${PLIST.da_file}libexec/digest_file_auth
11${PLIST.da_LDAP}libexec/digest_ldap_auth 12${PLIST.da_LDAP}libexec/digest_ldap_auth
12${PLIST.diskd}libexec/diskd 13${PLIST.diskd}libexec/diskd
13${PLIST.eacl_file_userip}libexec/ext_file_userip_acl 14${PLIST.eacl_file_userip}libexec/ext_file_userip_acl
14${PLIST.eacl_LDAP_group}libexec/ext_ldap_group_acl 15${PLIST.eacl_LDAP_group}libexec/ext_ldap_group_acl
15${PLIST.eacl_unix_group}libexec/ext_unix_group_acl 16${PLIST.eacl_unix_group}libexec/ext_unix_group_acl
16libexec/helper-mux.pl 17libexec/helper-mux.pl
17libexec/log_db_daemon 18libexec/log_db_daemon
18libexec/log_file_daemon 19libexec/log_file_daemon
19${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth 20${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth
20${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth_test 21${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth_test
21libexec/ntlm_fake_auth 22libexec/ntlm_fake_auth
22libexec/ntlm_smb_lm_auth 23libexec/ntlm_smb_lm_auth
@@ -27,26 +28,27 @@ libexec/url_fake_rewrite @@ -27,26 +28,27 @@ libexec/url_fake_rewrite
27libexec/url_fake_rewrite.sh 28libexec/url_fake_rewrite.sh
28man/man1/squidclient.1 29man/man1/squidclient.1
29${PLIST.ba_getpwnam}man/man8/basic_getpwnam_auth.8 30${PLIST.ba_getpwnam}man/man8/basic_getpwnam_auth.8
30${PLIST.ba_LDAP}man/man8/basic_ldap_auth.8 31${PLIST.ba_LDAP}man/man8/basic_ldap_auth.8
31${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8 32${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8
32${PLIST.ba_PAM}man/man8/basic_pam_auth.8 33${PLIST.ba_PAM}man/man8/basic_pam_auth.8
33man/man8/cachemgr.cgi.8 34man/man8/cachemgr.cgi.8
34${PLIST.da_file}man/man8/digest_file_auth.8 35${PLIST.da_file}man/man8/digest_file_auth.8
35${PLIST.eacl_file_userip}man/man8/ext_file_userip_acl.8 36${PLIST.eacl_file_userip}man/man8/ext_file_userip_acl.8
36${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8 37${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8
37${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8 38${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8
38man/man8/log_db_daemon.8 39man/man8/log_db_daemon.8
39${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8 40${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
 41${PLIST.ssl}man/man8/ssl_crtd.8
40man/man8/squid.8 42man/man8/squid.8
41man/man8/storeid_file_rewrite.8 43man/man8/storeid_file_rewrite.8
42sbin/squid 44sbin/squid
43share/examples/squid/cachemgr.conf 45share/examples/squid/cachemgr.conf
44share/examples/squid/errorpage.css 46share/examples/squid/errorpage.css
45share/examples/squid/mime.conf 47share/examples/squid/mime.conf
46share/examples/squid/squid.conf 48share/examples/squid/squid.conf
47share/squid/errors/COPYRIGHT 49share/squid/errors/COPYRIGHT
48share/squid/errors/TRANSLATORS 50share/squid/errors/TRANSLATORS
49share/squid/errors/af/ERR_ACCESS_DENIED 51share/squid/errors/af/ERR_ACCESS_DENIED
50share/squid/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED 52share/squid/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED
51share/squid/errors/af/ERR_AGENT_CONFIGURE 53share/squid/errors/af/ERR_AGENT_CONFIGURE
52share/squid/errors/af/ERR_AGENT_WPAD 54share/squid/errors/af/ERR_AGENT_WPAD
cvs diff -r1.21 -r1.22 pkgsrc/www/squid3/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/options.mk 2016/10/10 09:01:39 1.21
+++ pkgsrc/www/squid3/Attic/options.mk 2017/02/10 08:41:25 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.21 2016/10/10 09:01:39 adam Exp $ 1# $NetBSD: options.mk,v 1.22 2017/02/10 08:41:25 sborrill Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.squid 3PKG_OPTIONS_VAR= PKG_OPTIONS.squid
4PKG_SUPPORTED_OPTIONS= ecap inet6 snmp ssl squid-backend-aufs \ 4PKG_SUPPORTED_OPTIONS= ecap inet6 snmp ssl squid-backend-aufs \
5 squid-backend-diskd squid-backend-rock squid-backend-ufs \ 5 squid-backend-diskd squid-backend-rock squid-backend-ufs \
6 squid-carp squid-unlinkd squid-kerberos-helper \ 6 squid-carp squid-unlinkd squid-kerberos-helper \
7 squid-ldap-helper squid-pam-helper 7 squid-ldap-helper squid-pam-helper
8PKG_OPTIONS_LEGACY_OPTS+= diskd:squid-backend-diskd \ 8PKG_OPTIONS_LEGACY_OPTS+= diskd:squid-backend-diskd \
9 null:squid-backend-null ufs:squid-backend-ufs \ 9 null:squid-backend-null ufs:squid-backend-ufs \
10 linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \ 10 linux-netfilter:squid-netfilter ipf-transparent:squid-ipf \
11 pf-transparent:squid-pf unlinkd:squid-unlinkd \ 11 pf-transparent:squid-pf unlinkd:squid-unlinkd \
12 arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp 12 arp-acl:squid-arp-acl pam-helper:squid-pam-helper carp:squid-carp
13 13
14PLIST_VARS+= diskd snmp unlinkd 14PLIST_VARS+= diskd snmp unlinkd
@@ -122,26 +122,27 @@ SQUID_EXTERNAL_ACL_HELPERS+= LDAP_group @@ -122,26 +122,27 @@ SQUID_EXTERNAL_ACL_HELPERS+= LDAP_group
122. include "../../mk/pam.buildlink3.mk" 122. include "../../mk/pam.buildlink3.mk"
123SQUID_BASIC_AUTH_HELPERS+= PAM 123SQUID_BASIC_AUTH_HELPERS+= PAM
124.endif 124.endif
125 125
126.if !empty(PKG_OPTIONS:Msnmp) 126.if !empty(PKG_OPTIONS:Msnmp)
127CONFIGURE_ARGS+= --enable-snmp 127CONFIGURE_ARGS+= --enable-snmp
128PLIST.snmp= yes 128PLIST.snmp= yes
129.else 129.else
130CONFIGURE_ARGS+= --disable-snmp 130CONFIGURE_ARGS+= --disable-snmp
131.endif 131.endif
132 132
133.if !empty(PKG_OPTIONS:Mssl) 133.if !empty(PKG_OPTIONS:Mssl)
134CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE:Q} 134CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE:Q}
 135CONFIGURE_ARGS+= --enable-ssl-crtd
135. include "../../security/openssl/buildlink3.mk" 136. include "../../security/openssl/buildlink3.mk"
136PLIST.ssl= yes 137PLIST.ssl= yes
137.endif 138.endif
138 139
139.if !empty(PKG_OPTIONS:Msquid-backend-aufs) 140.if !empty(PKG_OPTIONS:Msquid-backend-aufs)
140SQUID_BACKENDS+= aufs 141SQUID_BACKENDS+= aufs
141. include "../../mk/pthread.buildlink3.mk" 142. include "../../mk/pthread.buildlink3.mk"
142.endif 143.endif
143 144
144.if !empty(PKG_OPTIONS:Msquid-backend-diskd) 145.if !empty(PKG_OPTIONS:Msquid-backend-diskd)
145SQUID_BACKENDS+= diskd 146SQUID_BACKENDS+= diskd
146PLIST.diskd= yes 147PLIST.diskd= yes
147.endif 148.endif