Date: Wed, 5 Aug 2015 18:32:18 +0000 (UTC) From: Bartek Rutkowski <robak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393602 - in head/www/squid: . files Message-ID: <201508051832.t75IWIvH064573@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: robak Date: Wed Aug 5 18:32:18 2015 New Revision: 393602 URL: https://svnweb.freebsd.org/changeset/ports/393602 Log: www/squid: update 3.5.6 -> 3.5.7 - Fix build with ecap by clang - Get rid of useless and always empty /var/squid/logs - Rework patches to make portlint a bit happier PR: 202053 Submitted by: Pavel Timofeev <timp87@gmail.com> (maintainer) Added: head/www/squid/files/patch-build-clang-ecap (contents, props changed) head/www/squid/files/patch-configure (contents, props changed) Deleted: head/www/squid/files/patch-bug4190 head/www/squid/files/patch-configure_GSSAPI_NONE head/www/squid/files/patch-configure_NIS head/www/squid/files/patch-configure_crypt.h Modified: head/www/squid/Makefile head/www/squid/distinfo head/www/squid/files/extra-patch-build-8-9 head/www/squid/files/patch-compat_compat.h head/www/squid/files/patch-src-cf.data.pre head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc head/www/squid/files/patch-src_ipc_mem_Segment.cc head/www/squid/files/patch-src_tools.cc head/www/squid/pkg-plist Modified: head/www/squid/Makefile ============================================================================== --- head/www/squid/Makefile Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/Makefile Wed Aug 5 18:32:18 2015 (r393602) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= squid -PORTVERSION= 3.5.6 +PORTVERSION= 3.5.7 CATEGORIES= www ipv6 MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www2.us.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ @@ -255,12 +255,6 @@ CONFIGURE_ARGS+= --enable-auth-basic="${ --enable-auth-negotiate="${negotiate_auth}" \ --enable-auth-ntlm="${ntlm_auth}" -.if ${PORT_OPTIONS:MECAP} -. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -BROKEN= Squid with eCAP enabled can't be compiled by clang -. endif -.endif - # Storage schemes: storage_schemes= ufs diskio_modules= AIO Blocking IpcIo Mmapped @@ -354,7 +348,6 @@ post-install: ${STAGEDIR}${EXAMPLESDIR} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} && ${INSTALL_DATA} ${MYDOCS} ${STAGEDIR}${DOCSDIR}) - ${MKDIR} ${STAGEDIR}/var/squid/logs .include <bsd.port.pre.mk> Modified: head/www/squid/distinfo ============================================================================== --- head/www/squid/distinfo Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/distinfo Wed Aug 5 18:32:18 2015 (r393602) @@ -1,2 +1,2 @@ -SHA256 (squid3.5/squid-3.5.6.tar.xz) = cd080e8d5eaabebf6808792751322bd05f2a9c8fe4377f54c7155682ef6c38d5 -SIZE (squid3.5/squid-3.5.6.tar.xz) = 2291152 +SHA256 (squid3.5/squid-3.5.7.tar.xz) = ec6f861bddee007b1dd320667a26ddc9ff76847bbe4cbb59c0134588e65c8699 +SIZE (squid3.5/squid-3.5.7.tar.xz) = 2294580 Modified: head/www/squid/files/extra-patch-build-8-9 ============================================================================== --- head/www/squid/files/extra-patch-build-8-9 Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/files/extra-patch-build-8-9 Wed Aug 5 18:32:18 2015 (r393602) @@ -1,6 +1,6 @@ ---- helpers/negotiate_auth/kerberos/negotiate_kerberos.h.orig 2015-04-04 11:08:51.000000000 +0400 -+++ helpers/negotiate_auth/kerberos/negotiate_kerberos.h 2015-04-04 11:11:10.000000000 +0400 -@@ -135,7 +135,7 @@ +--- helpers/negotiate_auth/kerberos/negotiate_kerberos.h.orig 2015-08-01 06:08:17 UTC ++++ helpers/negotiate_auth/kerberos/negotiate_kerberos.h +@@ -140,7 +140,7 @@ int check_gss_err(OM_uint32 major_status char *gethost_name(void); Added: head/www/squid/files/patch-build-clang-ecap ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid/files/patch-build-clang-ecap Wed Aug 5 18:32:18 2015 (r393602) @@ -0,0 +1,40 @@ +--- src/adaptation/ecap/ServiceRep.cc.orig 2015-08-01 06:08:17 UTC ++++ src/adaptation/ecap/ServiceRep.cc +@@ -234,7 +234,7 @@ bool Adaptation::Ecap::ServiceRep::probe + + bool Adaptation::Ecap::ServiceRep::up() const + { +- return theService != NULL; ++ return theService; + } + + bool Adaptation::Ecap::ServiceRep::wantsUrl(const String &urlPath) const +--- src/adaptation/ecap/XactionRep.cc.orig 2015-08-01 06:08:17 UTC ++++ src/adaptation/ecap/XactionRep.cc +@@ -72,7 +72,7 @@ void + Adaptation::Ecap::XactionRep::master(const AdapterXaction &x) + { + Must(!theMaster); +- Must(x != NULL); ++ Must(x); + theMaster = x; + } + +@@ -259,7 +259,7 @@ Adaptation::Ecap::XactionRep::swanSong() + // clear body_pipes, if any + // this code does not maintain proxying* and canAccessVb states; should it? + +- if (theAnswerRep != NULL) { ++ if (theAnswerRep) { + BodyPipe::Pointer body_pipe = answer().body_pipe; + if (body_pipe != NULL) { + Must(body_pipe->stillProducing(this)); +@@ -318,7 +318,7 @@ Adaptation::Ecap::XactionRep::cause() + libecap::Message & + Adaptation::Ecap::XactionRep::adapted() + { +- Must(theAnswerRep != NULL); ++ Must(theAnswerRep); + return *theAnswerRep; + } + Modified: head/www/squid/files/patch-compat_compat.h ============================================================================== --- head/www/squid/files/patch-compat_compat.h Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/files/patch-compat_compat.h Wed Aug 5 18:32:18 2015 (r393602) @@ -1,5 +1,5 @@ ---- compat/compat.h.orig 2015-02-26 17:09:19.142090018 +0300 -+++ compat/compat.h 2015-02-26 17:09:42.440097986 +0300 +--- compat/compat.h.orig 2015-08-01 06:08:17 UTC ++++ compat/compat.h @@ -42,17 +42,6 @@ #endif #endif Added: head/www/squid/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/squid/files/patch-configure Wed Aug 5 18:32:18 2015 (r393602) @@ -0,0 +1,53 @@ +--- configure.orig 2015-08-05 08:12:21 UTC ++++ configure +@@ -23559,7 +23559,9 @@ fi + + if test $ac_with_krb5_count -gt 1 ; then + as_fn_error $? "Please choose only one Kerberos library." "$LINENO" 5 +-elif test $ac_with_krb5_count -eq 0 ; then ++# XXX: On FreeBSD we don't need to involve krb5-config. ++# This change makes GSSAPI_NONE work properly. ++elif test $ac_with_krb5_count -eq 100 ; then + # find installed libs via pkg-config or krb5-config + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gssapi-krb5 krb5\""; } >&5 +@@ -31973,7 +31975,7 @@ done + ## + + BUILD_HELPER="NIS" +-for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h crypt.h ++for ac_header in sys/types.h rpc/rpc.h rpcsvc/ypclnt.h rpcsvc/yp_prot.h rpcsvc/crypt.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " +@@ -31988,8 +31990,10 @@ if eval test \"x\$"$as_ac_Header"\" = x" + #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 + _ACEOF + +-else +- BUILD_HELPER="" ++# XXX: On FreeBSD we have to do this to make NIS work ++# until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=188247 ++# is resolved. ++ BUILD_HELPER="NIS" + fi + + done +@@ -32454,7 +32458,7 @@ done + + # unconditionally requires crypt(3), for now + if test "x$ac_cv_func_crypt" != "x"; then +- for ac_header in unistd.h crypt.h shadow.h ++ for ac_header in unistd.h rpcsvc/crypt.h shadow.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +@@ -34509,7 +34513,7 @@ for ac_header in \ + arpa/nameser.h \ + assert.h \ + bstring.h \ +- crypt.h \ ++ rpcsvc/crypt.h \ + ctype.h \ + direct.h \ + errno.h \ Modified: head/www/squid/files/patch-src-cf.data.pre ============================================================================== --- head/www/squid/files/patch-src-cf.data.pre Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/files/patch-src-cf.data.pre Wed Aug 5 18:32:18 2015 (r393602) @@ -1,13 +1,13 @@ ---- src/cf.data.pre.orig 2015-02-26 17:56:12.817890613 +0300 -+++ src/cf.data.pre 2015-02-26 17:56:41.556917775 +0300 -@@ -4461,6 +4461,10 @@ +--- src/cf.data.pre.orig 2015-08-01 06:08:17 UTC ++++ src/cf.data.pre +@@ -4537,6 +4537,10 @@ DEFAULT: @DEFAULT_PID_FILE@ LOC: Config.pidFilename DOC_START A filename to write the process-id to. To disable, enter "none". + + Note: If you change this setting, you need to set squid_pidfile + in /etc/rc.conf to reflect the new value. Please see -+ %%PREFIX%%/etc/rc.d/squid for details. ++ /usr/local/etc/rc.d/squid for details. DOC_END NAME: client_netmask Modified: head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc ============================================================================== --- head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/files/patch-src_DiskIO_Mmapped_MmappedFile.cc Wed Aug 5 18:32:18 2015 (r393602) @@ -1,6 +1,6 @@ ---- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-04-15 10:39:56.146312000 +0300 -+++ src/DiskIO/Mmapped/MmappedFile.cc 2015-04-15 10:40:53.487834000 +0300 -@@ -235,7 +235,7 @@ +--- src/DiskIO/Mmapped/MmappedFile.cc.orig 2015-08-01 06:08:17 UTC ++++ src/DiskIO/Mmapped/MmappedFile.cc +@@ -235,7 +235,7 @@ Mmapping::map() static const int pageSize = getpagesize(); delta = offset % pageSize; Modified: head/www/squid/files/patch-src_ipc_mem_Segment.cc ============================================================================== --- head/www/squid/files/patch-src_ipc_mem_Segment.cc Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/files/patch-src_ipc_mem_Segment.cc Wed Aug 5 18:32:18 2015 (r393602) @@ -1,6 +1,6 @@ ---- src/ipc/mem/Segment.cc.orig 2015-04-15 10:38:29.724278000 +0300 -+++ src/ipc/mem/Segment.cc 2015-04-15 10:39:37.130756000 +0300 -@@ -150,7 +150,7 @@ +--- src/ipc/mem/Segment.cc.orig 2015-08-01 06:08:17 UTC ++++ src/ipc/mem/Segment.cc +@@ -150,7 +150,7 @@ Ipc::Mem::Segment::attach() assert(theSize == static_cast<off_t>(static_cast<size_t>(theSize))); void *const p = Modified: head/www/squid/files/patch-src_tools.cc ============================================================================== --- head/www/squid/files/patch-src_tools.cc Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/files/patch-src_tools.cc Wed Aug 5 18:32:18 2015 (r393602) @@ -1,6 +1,6 @@ ---- src/tools.cc.orig 2014-08-19 13:38:40.000000000 +0400 -+++ src/tools.cc 2014-08-19 13:39:00.000000000 +0400 -@@ -735,7 +735,7 @@ +--- src/tools.cc.orig 2015-08-01 06:08:17 UTC ++++ src/tools.cc +@@ -635,7 +635,7 @@ no_suid(void) uid = geteuid(); debugs(21, 3, "no_suid: PID " << getpid() << " giving up root priveleges forever"); Modified: head/www/squid/pkg-plist ============================================================================== --- head/www/squid/pkg-plist Wed Aug 5 18:31:18 2015 (r393601) +++ head/www/squid/pkg-plist Wed Aug 5 18:32:18 2015 (r393602) @@ -2180,4 +2180,3 @@ sbin/squidclient @dir(squid,squid,750) /var/run/squid @dir(squid,squid,750) /var/squid @dir(squid,squid,750) /var/squid/cache -@dir(squid,squid,750) /var/squid/logs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508051832.t75IWIvH064573>