Fix SEGFAULT parsing malformed adaptation service configuration

[thirdparty/squid.git] / mkrelease.sh

diff --git a/mkrelease.sh b/mkrelease.sh
index d1e8c3df70574b46914e2a895ea54deef7d1319b..1608e3a672d9159fc4425dc0d96c0f3d82435a7d 100755 (executable)
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -1,4 +1,12 @@
 #!/bin/sh -ex
+#
+## Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 if [ $# -ne 1 -a $# -ne 2 ]; then
        echo "Usage: $0 revision [destination]"
        exit 1
@@ -52,8 +60,13 @@ if [ ${name} != ${PACKAGE}-${VERSION} ]; then
        echo "${name} != ${PACKAGE}-${VERSION}"
        exit 1
 fi
-RELEASE=`echo $VERSION | cut -d. -f1,2 | cut -d- -f1`
-ed -s configure.in <<EOS
+RELEASE=`echo $VERSION | cut -d. -f1,1 | cut -d- -f1`
+NOTES_VERSION=`grep "$VERSION" doc/release-notes/release-${RELEASE}.sgml`
+if test "x$NOTES_VERSION" = "x"; then
+       echo "ERROR! Release Notes HTML version numbers do not match!"
+       exit 1
+fi
+ed -s configure.ac <<EOS
 g/${VERSION}-BZR/ s//${VERSION}/
 w
 EOS
@@ -66,7 +79,7 @@ g/squid_curtime/ s//${RELEASE_TIME}/
 w
 EOS
 
-./configure --silent
+./configure --silent --enable-translation
 make dist-all
 
 cd $startdir
@@ -79,8 +92,9 @@ inst $tmpdir/${name}.tar.gz   $dst/${name}.tar.gz
 inst $tmpdir/${name}.tar.bz2   $dst/${name}.tar.bz2
 inst $tmpdir/CONTRIBUTORS      $dst/CONTRIBUTORS.txt
 inst $tmpdir/COPYING           $dst/COPYING.txt
-inst $tmpdir/COPYRIGHT         $dst/COPYRIGHT.txt
+inst $tmpdir/README            $dst/README.txt
 inst $tmpdir/CREDITS           $dst/CREDITS.txt
+inst $tmpdir/SPONSORS          $dst/SPONSORS.txt
 inst $tmpdir/ChangeLog         $dst/ChangeLog.txt
 if [ -f $tmpdir/doc/release-notes/release-$RELEASE.html ]; then
     cat $tmpdir/doc/release-notes/release-$RELEASE.html | sed -e '