------------------------------------------------------------ revno: 12348 revision-id: squidadm@squid-cache.org-20121006042158-m42ilkkin86rxijt parent: squid3@treenet.co.nz-20121006025453-nwsmqga7ak4yyubk committer: Automatic source maintenance branch nick: 3.3 timestamp: Fri 2012-10-05 22:21:58 -0600 message: Branch 3.3.0.0 ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squidadm@squid-cache.org-20121006042158-\ # m42ilkkin86rxijt # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: de8d4cb0be32bbc0f7b8b241106129c4cd82fefb # timestamp: 2012-10-06 04:36:17 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20121006025453-\ # nwsmqga7ak4yyubk # # Begin patch === modified file 'configure.ac' --- configure.ac 2012-10-04 11:10:17 +0000 +++ configure.ac 2012-10-06 04:21:58 +0000 @@ -1,4 +1,4 @@ -AC_INIT([Squid Web Proxy],[3.HEAD-BZR],[http://www.squid-cache.org/bugs/],[squid]) +AC_INIT([Squid Web Proxy],[3.3.0.0-BZR],[http://www.squid-cache.org/bugs/],[squid]) AC_PREREQ(2.61) AC_CONFIG_HEADERS([include/autoconf.h]) AC_CONFIG_AUX_DIR(cfgaux) === removed file 'mksnapshot-cron.sh' --- mksnapshot-cron.sh 2012-04-02 04:59:33 +0000 +++ mksnapshot-cron.sh 1970-01-01 00:00:00 +0000 @@ -1,134 +0,0 @@ -#!/bin/sh -e -echo "RUN: $0" -# Nightly cron job to generate snapshot releases -top=${PWD} -versions=/server/httpd/htdocs/squid-cache.org/content/Versions/ -TMPDIR=/home/squidadm/${LOGNAME}.cron -export TMPDIR -if [ -d ${TMPDIR} ]; then - chmod -R +w ${TMPDIR} - rm -rf ${TMPDIR} -fi -mkdir -p ${TMPDIR} -trap "echo FAIL-BUILD_snapshot-cron; cd /; chmod -R +w ${TMPDIR}; rm -rf ${TMPDIR}" 0 - -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin -export PATH - -# Be nice to our friends. This is a batch job -renice 10 $$ >/dev/null - -make_snapshot() -{ { - set -e - cd ../release - mksnap=${1} - branch=${2} - dir=${3} - ver=${4} - save=${5:-3} - dst=${versions}/${dir}/${ver} - out=${6:-`basename $branch`} - $mksnap ${branch} ${6} 2>&1 | grep -v "set owner/group" - for file in `cat ${out}.out` ; do - case ${file} in - *-cfgman.tar.gz) - type=-cfgman.tar.gz - ;; - *-langpack.tar.gz) - type=-langpack.tar.gz - ;; - *-manuals.tar.gz) - type=-manuals.tar.gz - ;; - *) - type=`echo ${file} | sed -e 's/.*\.tar\.gz/.tar.gz/' -e 's/.*\.tar\.bz2/.tar.bz2/' -e 's/.*\.patch/.patch/' -e 's/.*\.diff/.diff/' -e 's/.*-RELEASENOTES.html/-RELEASENOTES.html/' -e 's/^.*ChangeLog.txt$/-ChangeLog.txt/' -e 's/.*-cfgman/-cfgman/'` - esac - - # move tarball - rm -f ${dst}/${file}.md5 - rm -f ${dst}/${file} - md5 ${file} >${dst}/${file}.md5 - cp -p ${file} ${dst}/${file} - rm -f ${file} - - # update snapshot symlink - rm -f ${dst}/squid-${ver}.snapshot$type - ln -s ${file} ${dst}/squid-${ver}.snapshot${type} - rm -f ${dst}/squid-${ver}.snapshot${type}.md5 - ln -s ${file}.md5 ${dst}/squid-${ver}.snapshot${type}.md5 - - set +e - # cleanup old snapshots - ls ${dst}/*-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-r*[0-9]${type} | \ - sed -e 's/.*-\([0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-r[0-9]+'${type}'\)/\1/' | \ - sort -r | tail +${save} | \ - while read f; do - rm -f ${dst}/*-${f} ${dst}/*-${f}.md5 - done - - set -e - - # update dynamic index pages Last-Modified info - touch ${dst}/index.dyn - - # Special cases - case ${file} in - *-cfgman.tar.gz) - mkdir -p ${dst}/cfgman - tar -C ${dst}/cfgman -zxf ${dst}/${file} - ;; - *-cfgman.html) - rm -f ${dst}/cfgman.html - ln -s ${dst}/${file} ${dst}/cfgman.html - ;; - *-cfgman.html.gz) - rm -f ${dst}/cfgman.html.gz - ln -s ${dst}/${file} ${dst}/cfgman.html.gz - ;; - *-manuals.tar.gz) - mkdir -p ${dst}/manuals - tar -C ${dst}/manuals -zxf ${dst}/${file} - ;; - esac - done -} } - -set +e - -# autotool derived files not kept in trunk, but still need to bootstrap for make dist -../commit/bootstrap squid-3 -make_snapshot ../commit/squid-3/mksnapshot.sh trunk v3 3.HEAD 6 - -rm -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new -cp ../commit/squid-3/CONTRIBUTORS /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new -chmod 444 /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new -mv -f /server/httpd/htdocs/squid-cache.org/CONTRIBUTORS.new /server/httpd/htdocs/squid-cache.org/content/CONTRIBUTORS.txt - -rm -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new -cp ../commit/squid-3/SPONSORS /server/httpd/htdocs/squid-cache.org/SPONSORS.new -chmod 444 /server/httpd/htdocs/squid-cache.org/SPONSORS.new -mv -f /server/httpd/htdocs/squid-cache.org/SPONSORS.new /server/httpd/htdocs/squid-cache.org/content/SPONSORS.txt - -../commit/bootstrap squid-3.2 -make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_2 v3 3.2 30 - -../commit/bootstrap squid-3.1 -make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_1 v3 3.1 30 - -#../commit/bootstrap squid-3.0 -#make_snapshot ../commit/squid-3/mksnapshot.sh branches/SQUID_3_0 v3 3.0 3 - -#../commit/bootstrap squid-2 -#make_snapshot ../commit/squid-2/mksnapshot.sh HEAD v2 HEAD 3 - -#../commit/bootstrap squid-2.7 -#make_snapshot ../commit/squid-2.7/mksnapshot.sh SQUID_2_7 v2 2.7 3 - -#../commit/bootstrap squid-2.6 -#make_snapshot ../commit/squid-2.6/mksnapshot.sh SQUID_2_6 v2 2.6 3 - -#../commit/bootstrap squid-2.5 -#make_snapshot ../commit/squid-2.5/mksnapshot.sh SQUID_2_5 v2 2.5 3 - -#../commit/squid3-SQUID2.sync === removed file 'mksnapshot.sh' --- mksnapshot.sh 2011-11-07 10:08:21 +0000 +++ mksnapshot.sh 1970-01-01 00:00:00 +0000 @@ -1,134 +0,0 @@ -#!/bin/sh -e -echo "RUN: $0" -if [ $# -lt 1 ]; then - echo "Usage: $0 [branch]" - echo "Where [branch] is the path under /bzr/ to 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`} -startdir=${PWD} -date=`env TZ=GMT date +%Y%m%d` - -tmpdir=${TMPDIR:-${PWD}}/${module}-${tag}-mksnapshot - -rm -rf ${tmpdir} -trap "echo FAIL-BUILD_${VERSION} ; rm -rf ${tmpdir}" 0 - -rm -f ${tag}.out -bzr export ${tmpdir} ${BZRROOT}/${module}/${branchpath} || 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}" -fi - -cd ${tmpdir} -revision=`bzr revno ${BZRROOT}/${module}/${branchpath}` -suffix="${date}-r${revision}" -eval `grep "^ *PACKAGE_VERSION=" configure | sed -e 's/-BZR//' | sed -e 's/PACKAGE_//'` -eval `grep "^ *PACKAGE_TARNAME=" configure | sed -e 's/_TARNAME//'` -ed -s configure.ac <${PACKAGE}-${VERSION}-${suffix}.diff - diff -ruN ${PACKAGE}-${VERSION} ${PACKAGE}-${VERSION}-${suffix} >>${PACKAGE}-${VERSION}-${suffix}.diff || true -else - echo "Building Tarball diff ... skipped (no tarball exists)." -fi - -cd ${startdir} -echo "Preparing to publish: ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.tar.* ..." -#echo "LOCAL: " ; pwd -#echo "BUILT TARS: " ; ls -1 ${tmpdir}/*.tar.* || true - -cp -p ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.tar.gz . -echo ${PACKAGE}-${VERSION}-${suffix}.tar.gz >>${tag}.out -cp -p ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.tar.bz2 . -echo ${PACKAGE}-${VERSION}-${suffix}.tar.bz2 >>${tag}.out -if [ -f ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.diff ]; then - cp -p ${tmpdir}/${PACKAGE}-${VERSION}-${suffix}.diff . - echo ${PACKAGE}-${VERSION}-${suffix}.diff >>${tag}.out -fi - -relnotes=${tmpdir}/doc/release-notes/release-`echo ${VERSION} | cut -d. -f1,2 | cut -d- -f1`.html -if [ -f ${relnotes} ]; then - cp -p ${relnotes} ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html - echo ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html >>${tag}.out - ed -s ${PACKAGE}-${VERSION}-${suffix}-RELEASENOTES.html <>${tag}.out - -# Generate Configuration Manual HTML -if [ -x ${tmpdir}/scripts/www/build-cfg-help.pl ]; then - make -C ${tmpdir}/src cf.data - 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 - ${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 -fi - -# Collate Manual Pages and generate HTML versions -if (groff --help >/dev/null); then - make -C ${tmpdir}/src squid.8 - if [ ! -d ${tmpdir}/doc/manuals ] ; then - mkdir -p ${tmpdir}/doc/manuals - fi - for f in `ls -1 ${tmpdir}/helpers/*/*/*.8 ${tmpdir}/src/*.8 ${tmpdir}/src/*/*.8 ${tmpdir}/tools/*.1 ${tmpdir}/tools/*.8 ./helpers/*/*/*.8 2>/dev/null` ; do - cp $f ${tmpdir}/doc/manuals/ - done - for f in `ls -1 ${tmpdir}/doc/manuals/*.1 ${tmpdir}/doc/manuals/*.8 2>/dev/null` ; do - 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 -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