commit e69e56cac83419efc405fa4aae248d98bf5b7d7a (refs/remotes/origin/v3.5, refs/remotes/github/v3.5, refs/heads/v3.5) Author: squidadm Date: 2017-08-20 06:48:49 +1200 3.5.27 (#49) * Prep for 3.5.27 (#48) * Maintenance: update snapshot script for git (#24) * Update snapshot script after git migration - Remove unused BZRROOT environment variable - Replace tag with branch name * Update source-maintenance script for git (#26) * replace bzr calls with git equivalent * remove obsolete ROOT and PWD variables (git does not support non-recursive file listing) * add exceptions to ignore more files caught by git than bzr * Maintenance: remove unused .bzrignore (#29) * Remove .bzrignore from git * Prep for 3.5.27 * SourceFormat Enforcement * 3.5.27 diff --git a/ChangeLog b/ChangeLog index 3703202..26bdab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Changes to squid-3.5.27 (20 Aug 2017): + + - Regression Bug #4112: ssl_engine does not accept cryptodev + - Bug 4687: Wrong names of components in man page, section SEE ALSO + - Bug 4671: various GCC 7 compile errors + - Bug 4464: Reduce "!Comm::MonitorsRead(serverConnection->fd)" assertions + - Bug 2833: Collapse internal revalidation requests (SMP-unaware caches) + - Bug 2833: Do not respond with HTTP/304 to unconditional requests + - Fix message packing error handling in mgr and snmp SMP Forwarders + - Fix mgr query handoff from the original recipient to Coordinator. + - ... and some documentation updates + Changes to squid-3.5.26 (01 Jun 2017): - Bug 4711: SubjectAlternativeNames is missing in some generated certificates @@ -9,7 +21,7 @@ Changes to squid-3.5.26 (01 Jun 2017): - Bug 3772: message from FTP server gets mangled - Bug 3102: FTP directory listing drops fist character of file names - Add OpenSSL library details to -v output - - ... and some documentatino updates + - ... and some documentation updates Changes to squid-3.5.25 (02 Apr 2017): diff --git a/configure.ac b/configure.ac index 099d483..12e865e 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AC_INIT([Squid Web Proxy],[3.5.26-BZR],[http://bugs.squid-cache.org/],[squid]) +AC_INIT([Squid Web Proxy],[3.5.27-VCS],[http://bugs.squid-cache.org/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml index e69d3ed..fe71fa1 100644 --- a/doc/release-notes/release-3.5.sgml +++ b/doc/release-notes/release-3.5.sgml @@ -1,6 +1,6 @@
-Squid 3.5.26 release notes +Squid 3.5.27 release notes Squid Developers @@ -13,7 +13,7 @@ for Applied Network Research and members of the Web Caching community. Notice

-The Squid Team are pleased to announce the release of Squid-3.5.26. +The Squid Team are pleased to announce the release of Squid-3.5.27. This new release is available for download from or the . diff --git a/helpers/external_acl/LDAP_group/ChangeLog b/helpers/external_acl/LDAP_group/ChangeLog index ab8bc51..eb20255 100644 --- a/helpers/external_acl/LDAP_group/ChangeLog +++ b/helpers/external_acl/LDAP_group/ChangeLog @@ -1,5 +1,5 @@ /* - * Copyright (C) 1996-2015 The Squid Software Foundation and contributors + * Copyright (C) 1996-2017 The Squid Software Foundation and contributors * * Squid software is distributed under GPLv2+ license and includes * contributions from numerous individuals and organizations. diff --git a/mksnapshot.sh b/mksnapshot.sh index e150300..9c82f59 100755 --- a/mksnapshot.sh +++ b/mksnapshot.sh @@ -10,40 +10,34 @@ echo "RUN: $0" if [ $# -lt 1 ]; then echo "Usage: $0 [branch]" - echo "Where [branch] is the path under /bzr/ to the branch to snapshot." + echo "Where [branch] is the name of the branch to snapshot." exit 1 fi -# VCS details -module=squid3 -BZRROOT=${BZRROOT:-/bzr} - -# generate a tarball name from the branch ($1) note that trunk is at -# /bzr/trunk, but we call it 3.HEAD for consistency with CVS (squid 2.x), and -# branches are in /bzr/branches/ but we don't want 'branches/' in the tarball -# name so we strip that. -branchpath=${1:-trunk} -tag=${2:-`basename $branchpath`} + +# generate a tarball name from the branch ($1) +branch=${1:-master} startdir=${PWD} date=`env TZ=GMT date +%Y%m%d` -tmpdir=${TMPDIR:-${PWD}}/${module}-${tag}-mksnapshot +tmpdir=${TMPDIR:-${PWD}}/squid-${branch}-mksnapshot/ rm -rf ${tmpdir} trap "echo FAIL-BUILD_${VERSION} ; rm -rf ${tmpdir}" 0 +mkdir ${tmpdir} -rm -f ${tag}.out -bzr export ${tmpdir} ${BZRROOT}/${module}/${branchpath} || exit 1 +rm -f ${branch}.out +(git archive --format=tar ${branch} | tar -xC ${tmpdir}) || exit 1 if [ ! -f ${tmpdir}/configure ] && [ -f ${tmpdir}/configure.ac ]; then sh -c "cd ${tmpdir} && ./bootstrap.sh" fi if [ ! -f ${tmpdir}/configure ]; then - echo "ERROR! Tag ${tag} not found in ${module}" + echo "ERROR! Branch ${branch} not found." fi cd ${tmpdir} -revision=`bzr revno ${BZRROOT}/${module}/${branchpath}` +revision=`git rev-parse --short ${branch}` suffix="${date}-r${revision}" -eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'` +eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-VCS//' | sed -e 's/PACKAGE_//'` eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'` ed -s configure.ac <>${tag}.out +echo ${PACKAGE}-${VERSION}-${suffix}.tar.gz >>${branch}.out cp -p ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.tar.bz2 . -echo ${PACKAGE}-${VERSION}-${suffix}.tar.bz2 >>${tag}.out +echo ${PACKAGE}-${VERSION}-${suffix}.tar.bz2 >>${branch}.out if [ -f ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.diff ]; then cp -p ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.diff . - echo ${PACKAGE}-${VERSION}-${suffix}.diff >>${tag}.out + echo ${PACKAGE}-${VERSION}-${suffix}.diff >>${branch}.out fi # latest Squid 'make' builds a RELEASENOTES.html at top directory @@ -102,14 +96,14 @@ if [ ! -f ${relnotes} ]; then fi if [ -f ${relnotes} ]; then cp -p ${relnotes} ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html - echo ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html >>${tag}.out + echo ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html >>${branch}.out ed -s ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html <>${tag}.out +echo ${PACKAGE}-${VERSION}-${suffix}-ChangeLog.txt >>${branch}.out # Generate Configuration Manual HTML if [ -x ${tmpdir}/scripts/www/build-cfg-help.pl ]; then @@ -117,10 +111,10 @@ if [ -x ${tmpdir}/scripts/www/build-cfg-help.pl ]; then mkdir -p ${tmpdir}/doc/cfgman ${tmpdir}/scripts/www/build-cfg-help.pl --version ${VERSION} -o ${tmpdir}/doc/cfgman ${tmpdir}/src/cf.data sh -c "cd ${tmpdir}/doc/cfgman && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${suffix}-cfgman.tar.gz *" - echo ${PACKAGE}-${VERSION}-${suffix}-cfgman.tar.gz >>${tag}.out + echo ${PACKAGE}-${VERSION}-${suffix}-cfgman.tar.gz >>${branch}.out ${tmpdir}/scripts/www/build-cfg-help.pl --version ${VERSION} -o ${PACKAGE}-${VERSION}-${suffix}-cfgman.html -f singlehtml ${tmpdir}/src/cf.data gzip -f -9 ${PACKAGE}-${VERSION}-${suffix}-cfgman.html - echo ${PACKAGE}-${VERSION}-${suffix}-cfgman.html.gz >>${tag}.out + echo ${PACKAGE}-${VERSION}-${suffix}-cfgman.html.gz >>${branch}.out fi # Collate Manual Pages and generate HTML versions @@ -136,12 +130,10 @@ if (groff --help >/dev/null); then cat ${f} | groff -E -Thtml -mandoc >${f}.html done sh -c "cd ${tmpdir}/doc/manuals && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${suffix}-manuals.tar.gz *.html *.1 *.8" - echo ${PACKAGE}-${VERSION}-${suffix}-manuals.tar.gz >>${tag}.out + echo ${PACKAGE}-${VERSION}-${suffix}-manuals.tar.gz >>${branch}.out fi # Generate language-pack tarballs -# NP: Only to be done on trunk. -if test "${tag}" = "trunk" ; then - sh -c "cd ${tmpdir}/errors && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${suffix}-langpack.tar.gz ./*/* ./alias* ./TRANSLATORS ./COPYRIGHT " - echo ${PACKAGE}-${VERSION}-${suffix}-langpack.tar.gz >>${tag}.out -fi +# NP: Only useful on development branch +sh -c "cd ${tmpdir}/errors && tar -zcf ${PWD}/${PACKAGE}-${VERSION}-${suffix}-langpack.tar.gz ./*/* ./alias* ./TRANSLATORS ./COPYRIGHT " +echo ${PACKAGE}-${VERSION}-${suffix}-langpack.tar.gz >>${branch}.out diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh index 60c746e..60285bc 100755 --- a/scripts/source-maintenance.sh +++ b/scripts/source-maintenance.sh @@ -29,8 +29,6 @@ else MD5="md5sum" fi -ROOT=`bzr root` - ASVER=`astyle --version 2>&1 | grep -o -E "[0-9.]+"` if test "${ASVER}" != "2.04" ; then echo "Astyle version problem. You have ${ASVER} instead of 2.04" @@ -40,26 +38,27 @@ else fi COPYRIGHT_YEARS=`date +"1996-%Y"` -echo "s/1996-2[0-9]+ The Squid Software Foundation and contributors/${COPYRIGHT_YEARS} The Squid Software Foundation and contributors/g" >>${ROOT}/boilerplate_fix.sed +echo "s/1996-2[0-9]+ The Squid Software Foundation and contributors/${COPYRIGHT_YEARS} The Squid Software Foundation and contributors/g" >>boilerplate_fix.sed srcformat () { -PWD=`pwd` -#echo "FORMAT: ${PWD}..." - # # Scan for incorrect use of #ifdef/#ifndef # -bzr grep --no-recursive "ifn?def .*_SQUID_" | +git grep "ifn?def .*_SQUID_" | grep -v -E "_H$" | - while read f; do echo "PROBLEM?: ${PWD} ${f}"; done + grep -v "scripts/source-maintenance.sh" | + while read f; do echo "PROBLEM?: ${f}"; done # # Scan for file-specific actions # -for FILENAME in `bzr ls --versioned`; do +for FILENAME in `git ls-files`; do skip_copyright_check="" + # skip subdirectories, git ls-files is recursive + test -d $FILENAME && continue + case ${FILENAME} in *.h|*.c|*.cc|*.cci) @@ -68,29 +67,29 @@ for FILENAME in `bzr ls --versioned`; do # Code Style formatting maintenance # if test "${ASVER}"; then - ${ROOT}/scripts/formater.pl ${FILENAME} + ./scripts/formater.pl ${FILENAME} if test -e $FILENAME -a -e "$FILENAME.astylebak"; then md51=`cat $FILENAME| tr -d "\n \t\r" | $MD5`; md52=`cat $FILENAME.astylebak| tr -d "\n \t\r" | $MD5`; if test "$md51" != "$md52"; then - echo "ERROR: File $PWD/$FILENAME not formating well"; + echo "ERROR: File $FILENAME not formating well"; mv $FILENAME $FILENAME.astylebad mv $FILENAME.astylebak $FILENAME - bzr revert ${FILENAME} + git checkout -- ${FILENAME} else rm -f $FILENAME.astylebak fi fi fi - ${ROOT}/scripts/sort-includes.pl ${FILENAME} >${FILENAME}.sorted + ./scripts/sort-includes.pl ${FILENAME} >${FILENAME}.sorted if test -e ${FILENAME} -a -e "${FILENAME}.sorted"; then md51=`cat ${FILENAME}| tr -d "\n \t\r" | $MD5`; md52=`cat ${FILENAME}.sorted| tr -d "\n \t\r" | $MD5`; if test "$md51" != "$md52" ; then - echo "NOTICE: File $PWD/${FILENAME} changed #include order" + echo "NOTICE: File ${FILENAME} changed #include order" fi mv ${FILENAME}.sorted ${FILENAME} fi @@ -99,16 +98,19 @@ for FILENAME in `bzr ls --versioned`; do # REQUIRE squid.h first #include # case ${FILENAME} in + src/cf_gen.cc) + # ignore, this is a build tool. + ;; *.c|*.cc) FI=`grep "#include" ${FILENAME} | head -1`; if test "${FI}" != "#include \"squid.h\"" -a "${FILENAME}" != "cf_gen.cc"; then - echo "ERROR: ${PWD}/${FILENAME} does not include squid.h first!" + echo "ERROR: ${FILENAME} does not include squid.h first!" fi ;; *.h|*.cci) FI=`grep "#include \"squid.h\"" ${FILENAME}`; if test "x${FI}" != "x" ; then - echo "ERROR: ${PWD}/${FILENAME} duplicate include of squid.h" + echo "ERROR: ${FILENAME} duplicate include of squid.h" fi ;; esac @@ -119,7 +121,7 @@ for FILENAME in `bzr ls --versioned`; do # FI=`grep "#include \"forward.h\"" ${FILENAME}`; if test "x${FI}" != "x" ; then - echo "ERROR: ${PWD}/${FILENAME} contains reference to forward.h without path" + echo "ERROR: ${FILENAME} contains reference to forward.h without path" fi # @@ -129,17 +131,17 @@ for FILENAME in `bzr ls --versioned`; do # STRDUP=`grep -e "[^x]strdup(" ${FILENAME}`; if test "x${STRDUP}" != "x" -a "${FILENAME}" != "xstring.h"; then - echo "ERROR: ${PWD}/${FILENAME} contains unprotected use of strdup()" + echo "ERROR: ${FILENAME} contains unprotected use of strdup()" fi SPRINTF=`grep -e "[^v]sprintf(" ${FILENAME}`; if test "x${SPRINTF}" != "x" ; then - echo "ERROR: ${PWD}/${FILENAME} contains unsafe use of sprintf()" + echo "ERROR: ${FILENAME} contains unsafe use of sprintf()" fi # # DEBUG Section list maintenance # - grep " DEBUG: section" <${FILENAME} | sed -e 's/ \* DEBUG: //' -e 's%/\* DEBUG: %%' -e 's% \*/%%' | sort -u >>${ROOT}/doc/debug-sections.tmp + grep " DEBUG: section" <${FILENAME} | sed -e 's/ \* DEBUG: //' -e 's%/\* DEBUG: %%' -e 's% \*/%%' | sort -u >>doc/debug-sections.tmp # # File permissions maintenance. @@ -177,27 +179,19 @@ for FILENAME in `bzr ls --versioned`; do esac # check for Foundation copyright blurb - if test -f ${PWD}/${FILENAME} -a "x$skip_copyright_check" = "x"; then + if test -f ${FILENAME} -a "x$skip_copyright_check" = "x"; then BLURB=`grep -o "${COPYRIGHT_YEARS} The Squid Software Foundation and contributors" ${FILENAME}`; if test "x${BLURB}" = "x"; then BOILER=`grep -o -E "1996-2[0-9]+ The Squid Software Foundation and contributors" ${FILENAME}`; if test "x${BOILER}" != "x"; then - echo "UPDATE COPYRIGHT for ${PWD}/${FILENAME}" - sed --in-place -r -f ${ROOT}/boilerplate_fix.sed ${FILENAME} + echo "UPDATE COPYRIGHT for ${FILENAME}" + sed --in-place -r -f boilerplate_fix.sed ${FILENAME} else - echo "CHECK COPYRIGHT for ${PWD}/${FILENAME}" + echo "CHECK COPYRIGHT for ${FILENAME}" fi fi fi - if test "$FILENAME" = "libltdl/" ; then - : - elif test -d $FILENAME ; then - cd $FILENAME - srcformat ${ROOT} || exit 1 - cd .. - fi - done } @@ -214,73 +208,73 @@ grep -R -h "PROF_start.*" ./* | grep -v probename | sed -e 's/ //g; s/PROF_start echo " XPROF_LAST } xprof_type;" echo "#endif" echo "#endif" -) >${ROOT}/lib/profiler/list -mv ${ROOT}/lib/profiler/list ${ROOT}/lib/profiler/xprof_type.h +) >lib/profiler/list +mv lib/profiler/list lib/profiler/xprof_type.h # Build icons install include from current icons available ( sed -e 's%\ \*%##%' -e 's%/\*%##%' -e 's%##/%##%' ${ROOT}/icons/icon.list +)| sed s%icons/%%g >icons/icon.list # Build templates install include from current templates available ( sed -e 's%\ \*%##%' -e 's%/\*%##%' -e 's%##/%##%' ${ROOT}/errors/template.list +)| sed s%errors/%%g >errors/template.list # Build errors translation install include from current .PO available ( sed -e 's%\ \*%##%' -e 's%/\*%##%' -e 's%##/%##%' ${ROOT}/errors/language.list +)| sed s%errors/%%g | sed s%\.po%\.lang%g >errors/language.list # Build manuals translation install include from current .PO available ( sed -e 's%\ \*%##%' -e 's%/\*%##%' -e 's%##/%##%' ${ROOT}/doc/manuals/language.list +)| sed s%doc/manuals/%%g | sed s%\.po%\.lang%g >doc/manuals/language.list # Build STUB framework include from current stub_* available ( sed -e 's%\ \*%##%' -e 's%/\*%##%' -e 's%##/%##%' ${ROOT}/src/tests/Stub.list +)| sed s%src/%%g >src/tests/Stub.list # Run formating -echo "" >${ROOT}/doc/debug-sections.tmp +echo "" >doc/debug-sections.tmp srcformat || exit 1 -sort -u <${ROOT}/doc/debug-sections.tmp | sort -n >${ROOT}/doc/debug-sections.tmp2 -cat scripts/boilerplate.h ${ROOT}/doc/debug-sections.tmp2 >${ROOT}/doc/debug-sections.txt -rm ${ROOT}/doc/debug-sections.tmp ${ROOT}/doc/debug-sections.tmp2 -rm ${ROOT}/boilerplate_fix.sed +sort -u doc/debug-sections.tmp2 +cat scripts/boilerplate.h doc/debug-sections.tmp2 >doc/debug-sections.txt +rm doc/debug-sections.tmp doc/debug-sections.tmp2 +rm boilerplate_fix.sed