Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www www: Remove squid3 - legacy squid package, broken ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/550f95eb0340
branches:  trunk
changeset: 429767:550f95eb0340
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Apr 24 12:21:23 2020 +0000

description:
www: Remove squid3 - legacy squid package, broken with OpenSSL 1.1

diffstat:

 www/Makefile                                               |     3 +-
 www/squid3/DESCR                                           |    21 -
 www/squid3/MESSAGE                                         |    10 -
 www/squid3/Makefile                                        |    85 -
 www/squid3/Makefile.common                                 |    19 -
 www/squid3/PLIST                                           |  2153 ------------
 www/squid3/distinfo                                        |    15 -
 www/squid3/files/squid.sh                                  |    75 -
 www/squid3/options.mk                                      |   228 -
 www/squid3/patches/patch-compat_compat.h                   |    15 -
 www/squid3/patches/patch-compat_debug.cc                   |    23 -
 www/squid3/patches/patch-compat_debug.h                    |    27 -
 www/squid3/patches/patch-errors_Makefile.in                |    23 -
 www/squid3/patches/patch-src_Makefile.in                   |    23 -
 www/squid3/patches/patch-src_adaptation_ecap_ServiceRep.cc |    15 -
 www/squid3/patches/patch-src_base_TidyPointer.h            |    17 -
 www/squid3/patches/patch-src_store.cc                      |    15 -
 www/squid3/patches/patch-tools_Makefile.in                 |    15 -
 18 files changed, 1 insertions(+), 2781 deletions(-)

diffs (truncated from 2864 to 300 lines):

diff -r d6edaf47190b -r 550f95eb0340 www/Makefile
--- a/www/Makefile      Fri Apr 24 12:14:01 2020 +0000
+++ b/www/Makefile      Fri Apr 24 12:21:23 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1454 2020/04/18 17:43:17 nikita Exp $
+# $NetBSD: Makefile,v 1.1455 2020/04/24 12:21:23 nia Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -956,7 +956,6 @@
 SUBDIR+=       spawn-fcgi
 SUBDIR+=       spdylay
 SUBDIR+=       sqtop
-SUBDIR+=       squid3
 SUBDIR+=       squid4
 SUBDIR+=       squidGuard
 SUBDIR+=       squidanalyzer
diff -r d6edaf47190b -r 550f95eb0340 www/squid3/DESCR
--- a/www/squid3/DESCR  Fri Apr 24 12:14:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-Squid is a fully-featured HTTP/1.0 proxy with partial HTTP/1.1 support
-The 3.1 series brings many new features and upgrades to the basic
-networking  protocols. A short list of the major new features is:
-
- * Connection Pinning (for NTLM Auth Passthrough)
- * Native IPv6
- * Quality of Service (QoS) Flow support
- * Native Memory Cache
- * SSL Bump (for HTTPS Filtering and Adaptation)
- * TProxy v4.1+ support
- * eCAP Adaptation Module support
- * Error Page Localization
- * Follow X-Forwarded-For support
- * X-Forwarded-For options extended (truncate, delete, transparent)
- * Peer-Name ACL
- * Reply headers to external ACL.
- * ICAP and eCAP Logging
- * ICAP Service Sets and Chains
- * ICY (SHOUTcast) streaming protocol support
- * HTTP/1.1 support on connections to web servers and peers.
-   (with plans to make this full support within the 3.1 series)
diff -r d6edaf47190b -r 550f95eb0340 www/squid3/MESSAGE
--- a/www/squid3/MESSAGE        Fri Apr 24 12:14:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2013/12/10 14:48:26 adam Exp $
-
-You DO need running nameservice to start and run ${PKGNAME}.
-
-Please note that to use the diskd storage method, you'll likely have to
-change SYSV-IPC parameters in the kernel config file (see
-http://wiki.squid-cache.org/Features/DiskDaemon for details)
-
-===========================================================================
diff -r d6edaf47190b -r 550f95eb0340 www/squid3/Makefile
--- a/www/squid3/Makefile       Fri Apr 24 12:14:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-# $NetBSD: Makefile,v 1.87 2020/04/24 12:14:01 nia Exp $
-
-DISTNAME=      squid-3.5.28
-PKGREVISION=   3
-CATEGORIES=    www
-MASTER_SITES=  http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/
-MASTER_SITES+= ftp://ftp.squid-cache.org/pub/squid/
-MASTER_SITES+= http://ftp.nluug.nl/internet/squid/
-EXTRACT_SUFX=  .tar.xz
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://www.squid-cache.org/
-COMMENT=       Post-Harvest_cached WWW proxy cache and accelerator
-LICENSE=       gnu-gpl-v2
-
-BROKEN=                "Fails to build with OpenSSL 1.1"
-
-USE_LANGUAGES=         c c++
-USE_TOOLS+=            perl:run gmake
-GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=       --localstatedir=${SQUID_DATADIR}
-CONFIGURE_ARGS+=       --datarootdir=${PREFIX}/share/squid
-CONFIGURE_ARGS+=       --disable-arch-native
-CONFIGURE_ARGS+=       --disable-strict-error-checking
-CONFIGURE_ARGS+=       --enable-auth
-CONFIGURE_ARGS+=       --enable-cachemgr-hostname=localhost
-CONFIGURE_ARGS+=       --enable-delay-pools
-CONFIGURE_ARGS+=       --enable-icap-client
-CONFIGURE_ARGS+=       --enable-icmp
-CONFIGURE_ARGS+=       --enable-poll
-CONFIGURE_ARGS+=       --enable-removal-policies=lru,heap
-CONFIGURE_ARGS+=       --enable-storeio=${SQUID_BACKENDS:Q}
-CONFIGURE_ARGS+=       --with-aio
-CONFIGURE_ARGS+=       --with-default-user=${SQUID_USER}
-CONFIGURE_ARGS+=       --with-pidfile=${VARBASE}/run/squid.pid
-
-# Let 'purge' find correct config file by default.
-CPPFLAGS+=             -DDEFAULT_SQUID_CONF=\"${PKG_SYSCONFDIR}/squid.conf\"
-
-BUILD_DEFS+=           VARBASE
-MAKE_ENV+=             INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
-MAKE_ENV+=             PKG_PREFIX=${PREFIX} VARBASE=${VARBASE}
-REPLACE_PERL+=         helpers/ssl/cert_valid.pl tools/helper-mux.pl
-
-EGFILES=               src/mime.conf.default src/squid.conf.default \
-                       errors/errorpage.css tools/cachemgr.conf
-EGDIR=                 share/examples/squid
-.for f in cachemgr.conf errorpage.css mime.conf squid.conf
-CONF_FILES+=           ${PREFIX}/${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
-.endfor
-OWN_DIRS=              ${SQUID_DATADIR}
-OWN_DIRS_PERMS+=       ${SQUID_DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
-                       ${SQUID_DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
-
-.include "Makefile.common"
-.include "options.mk"
-
-# Incorrect check for <netinet/ip_icmp.h> on FreeBSD:
-CONFIGURE_ENV.FreeBSD+=        ac_cv_header_netinet_ip_icmp_h=yes
-
-INSTALLATION_DIRS=     ${EGDIR}
-
-SPECIAL_PERMS+=                libexec/pinger ${SETUID_ROOT_PERMS}
-
-RCD_SCRIPTS=           squid
-RCD_SCRIPT_SRC.squid=  files/squid.sh
-
-SUBST_CLASSES+=                confs
-SUBST_STAGE.confs=     pre-configure
-SUBST_FILES.confs=     src/cf.data.pre
-SUBST_SED.confs=       -e "s/@USER@/${SQUID_USER}/"
-SUBST_MESSAGE.confs=   Fixing configuration files.
-
-post-build:
-       cd ${WRKSRC}/src && ${CP} -pf squid.conf.documented squid.conf.default
-
-post-install:
-.for f in ${EGFILES}
-       ${INSTALL_DATA} ${WRKSRC}/${f} \
-               ${DESTDIR}${PREFIX}/${EGDIR}/`basename ${f} .default`
-.endfor
-
-.include "../../devel/libltdl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r d6edaf47190b -r 550f95eb0340 www/squid3/Makefile.common
--- a/www/squid3/Makefile.common        Fri Apr 24 12:14:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile.common,v 1.1 2013/12/10 14:48:26 adam Exp $
-#
-# used by www/squid3/Makefile
-# used by www/squidGuard/Makefile
-# used by www/squidview/Makefile
-
-SQUID_DATADIR= ${VARBASE}/squid
-
-PKG_SYSCONFSUBDIR?=            squid
-
-SQUID_USER?=                   squid
-SQUID_GROUP?=                  squid
-
-PKG_GROUPS_VARS+=              SQUID_GROUP
-PKG_USERS_VARS+=               SQUID_USER
-
-PKG_GROUPS=                    ${SQUID_GROUP}
-PKG_USERS=                     ${SQUID_USER}:${SQUID_GROUP}
-PKG_GECOS.${SQUID_USER}=       Squid Web-Cache pseudo-user
diff -r d6edaf47190b -r 550f95eb0340 www/squid3/PLIST
--- a/www/squid3/PLIST  Fri Apr 24 12:14:01 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2153 +0,0 @@
-@comment $NetBSD: PLIST,v 1.14 2017/03/18 21:26:31 adam Exp $
-bin/purge
-bin/squidclient
-${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
-${PLIST.ba_LDAP}libexec/basic_ldap_auth
-${PLIST.ba_NCSA}libexec/basic_ncsa_auth
-${PLIST.ba_PAM}libexec/basic_pam_auth
-libexec/cachemgr.cgi
-${PLIST.ssl}libexec/cert_valid.pl
-${PLIST.da_file}libexec/digest_file_auth
-${PLIST.da_LDAP}libexec/digest_ldap_auth
-${PLIST.diskd}libexec/diskd
-${PLIST.eacl_file_userip}libexec/ext_file_userip_acl
-${PLIST.eacl_LDAP_group}libexec/ext_ldap_group_acl
-${PLIST.eacl_unix_group}libexec/ext_unix_group_acl
-libexec/helper-mux.pl
-libexec/log_db_daemon
-libexec/log_file_daemon
-${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth
-${PLIST.ta_kerberos}libexec/negotiate_kerberos_auth_test
-libexec/ntlm_fake_auth
-libexec/ntlm_smb_lm_auth
-libexec/pinger
-${PLIST.ssl}libexec/ssl_crtd
-libexec/storeid_file_rewrite
-${PLIST.unlinkd}libexec/unlinkd
-libexec/url_fake_rewrite
-libexec/url_fake_rewrite.sh
-man/man1/squidclient.1
-${PLIST.ba_getpwnam}man/man8/basic_getpwnam_auth.8
-${PLIST.ba_LDAP}man/man8/basic_ldap_auth.8
-${PLIST.ba_NCSA}man/man8/basic_ncsa_auth.8
-${PLIST.ba_PAM}man/man8/basic_pam_auth.8
-man/man8/cachemgr.cgi.8
-${PLIST.da_file}man/man8/digest_file_auth.8
-${PLIST.eacl_file_userip}man/man8/ext_file_userip_acl.8
-${PLIST.eacl_LDAP_group}man/man8/ext_ldap_group_acl.8
-${PLIST.eacl_unix_group}man/man8/ext_unix_group_acl.8
-man/man8/log_db_daemon.8
-${PLIST.ta_kerberos}man/man8/negotiate_kerberos_auth.8
-man/man8/squid.8
-${PLIST.ssl}man/man8/ssl_crtd.8
-man/man8/storeid_file_rewrite.8
-sbin/squid
-share/examples/squid/cachemgr.conf
-share/examples/squid/errorpage.css
-share/examples/squid/mime.conf
-share/examples/squid/squid.conf
-share/squid/errors/COPYRIGHT
-share/squid/errors/TRANSLATORS
-share/squid/errors/af/ERR_ACCESS_DENIED
-share/squid/errors/af/ERR_ACL_TIME_QUOTA_EXCEEDED
-share/squid/errors/af/ERR_AGENT_CONFIGURE
-share/squid/errors/af/ERR_AGENT_WPAD
-share/squid/errors/af/ERR_CACHE_ACCESS_DENIED
-share/squid/errors/af/ERR_CACHE_MGR_ACCESS_DENIED
-share/squid/errors/af/ERR_CANNOT_FORWARD
-share/squid/errors/af/ERR_CONFLICT_HOST
-share/squid/errors/af/ERR_CONNECT_FAIL
-share/squid/errors/af/ERR_DIR_LISTING
-share/squid/errors/af/ERR_DNS_FAIL
-share/squid/errors/af/ERR_ESI
-share/squid/errors/af/ERR_FORWARDING_DENIED
-share/squid/errors/af/ERR_FTP_DISABLED
-share/squid/errors/af/ERR_FTP_FAILURE
-share/squid/errors/af/ERR_FTP_FORBIDDEN
-share/squid/errors/af/ERR_FTP_NOT_FOUND
-share/squid/errors/af/ERR_FTP_PUT_CREATED
-share/squid/errors/af/ERR_FTP_PUT_ERROR
-share/squid/errors/af/ERR_FTP_PUT_MODIFIED
-share/squid/errors/af/ERR_FTP_UNAVAILABLE
-share/squid/errors/af/ERR_GATEWAY_FAILURE
-share/squid/errors/af/ERR_ICAP_FAILURE
-share/squid/errors/af/ERR_INVALID_REQ
-share/squid/errors/af/ERR_INVALID_RESP
-share/squid/errors/af/ERR_INVALID_URL
-share/squid/errors/af/ERR_LIFETIME_EXP
-share/squid/errors/af/ERR_NO_RELAY
-share/squid/errors/af/ERR_ONLY_IF_CACHED_MISS
-share/squid/errors/af/ERR_PRECONDITION_FAILED
-share/squid/errors/af/ERR_READ_ERROR
-share/squid/errors/af/ERR_READ_TIMEOUT
-share/squid/errors/af/ERR_SECURE_CONNECT_FAIL
-share/squid/errors/af/ERR_SHUTTING_DOWN
-share/squid/errors/af/ERR_SOCKET_FAILURE
-share/squid/errors/af/ERR_TOO_BIG
-share/squid/errors/af/ERR_UNSUP_HTTPVERSION
-share/squid/errors/af/ERR_UNSUP_REQ
-share/squid/errors/af/ERR_URN_RESOLVE
-share/squid/errors/af/ERR_WRITE_ERROR
-share/squid/errors/af/ERR_ZERO_SIZE_OBJECT
-share/squid/errors/af/error-details.txt
-share/squid/errors/ar-ae
-share/squid/errors/ar-bh
-share/squid/errors/ar-dz
-share/squid/errors/ar-eg
-share/squid/errors/ar-iq
-share/squid/errors/ar-jo
-share/squid/errors/ar-kw
-share/squid/errors/ar-lb
-share/squid/errors/ar-ly
-share/squid/errors/ar-ma
-share/squid/errors/ar-om
-share/squid/errors/ar-qa
-share/squid/errors/ar-sa
-share/squid/errors/ar-sy
-share/squid/errors/ar-tn
-share/squid/errors/ar-ye
-share/squid/errors/ar/ERR_ACCESS_DENIED
-share/squid/errors/ar/ERR_ACL_TIME_QUOTA_EXCEEDED
-share/squid/errors/ar/ERR_AGENT_CONFIGURE
-share/squid/errors/ar/ERR_AGENT_WPAD
-share/squid/errors/ar/ERR_CACHE_ACCESS_DENIED
-share/squid/errors/ar/ERR_CACHE_MGR_ACCESS_DENIED
-share/squid/errors/ar/ERR_CANNOT_FORWARD
-share/squid/errors/ar/ERR_CONFLICT_HOST
-share/squid/errors/ar/ERR_CONNECT_FAIL
-share/squid/errors/ar/ERR_DIR_LISTING
-share/squid/errors/ar/ERR_DNS_FAIL
-share/squid/errors/ar/ERR_ESI
-share/squid/errors/ar/ERR_FORWARDING_DENIED
-share/squid/errors/ar/ERR_FTP_DISABLED
-share/squid/errors/ar/ERR_FTP_FAILURE
-share/squid/errors/ar/ERR_FTP_FORBIDDEN
-share/squid/errors/ar/ERR_FTP_NOT_FOUND
-share/squid/errors/ar/ERR_FTP_PUT_CREATED
-share/squid/errors/ar/ERR_FTP_PUT_ERROR
-share/squid/errors/ar/ERR_FTP_PUT_MODIFIED



Home | Main Index | Thread Index | Old Index