don't leak an FD in lz4 (de)compression

[apt.git] / prepare-release

diff --git a/prepare-release b/prepare-release
index e61266eef82f190a35cfaaf52286f0ef4ede74b9..18fd3af94d787024b3f6f3ac047f49a1fa7fbea4 100755 (executable)
--- a/prepare-release
+++ b/prepare-release
@@ -11,17 +11,18 @@ VERSION=$(dpkg-parsechangelog | sed -n -e '/^Version:/s/^Version: //p')
 DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
 
 LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')"
 DISTRIBUTION=$(dpkg-parsechangelog | sed -n -e '/^Distribution:/s/^Distribution: //p')
 
 LIBAPTPKGVERSION="$(awk -v ORS='.' '/^\#define APT_PKG_M/ {print $3}' apt-pkg/contrib/macros.h | sed 's/\.$//')"

-LIBAPTINSTVERSION="$(egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"
+LIBAPTINSTVERSION="$(grep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)"

 
 librarysymbolsfromfile() {
        local MISSING="$(grep '^+#MISSING' "$1")"
 
 librarysymbolsfromfile() {
        local MISSING="$(grep '^+#MISSING' "$1")"

+       local SYMVER="$2"

        echo '=== Missing optional symbols:'
        echo -n "$MISSING" | grep '|optional=' || true
        echo '=== Missing required symbols:'
        echo -n "$MISSING" | grep -v '|optional=' || true
        echo '=== New symbols:'
        echo '=== Missing optional symbols:'
        echo -n "$MISSING" | grep '|optional=' || true
        echo '=== Missing required symbols:'
        echo -n "$MISSING" | grep -v '|optional=' || true
        echo '=== New symbols:'

-       grep '^+ ' "$1" | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
-               echo " (c++)\"${line}@Base\" $VERSION"
+       grep '^+ ' "$1" | grep -v '^+ (c++' | cut -d' ' -f 2 | cut -d'@' -f 1 | c++filt | while read line; do
+               echo " (c++)\"${line}@${SYMVER}\" $VERSION"

        done | sort -u
 }
 
        done | sort -u
 }
 


@@ -52,17 +53,37 @@ if [ "$1" = 'pre-export' ]; then
                VERSION="$VERSION~$(date +%Y%m%d)"
        fi
 
                VERSION="$VERSION~$(date +%Y%m%d)"
        fi
 

+       sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
+       sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
+
+       # update the last-modification field of manpages based on git changes
+       grep --files-with-matches '<date>' doc/*.xml | while read file; do \
+               LASTMOD="$(date -d "@$(git log --format='%at' --max-count=1 --invert-grep --fixed-strings --grep 'review
+typo
+release
+Git-Dch: Ignore' "$file")" '+%Y-%m-%dT00:00:00Z')"
+               sed -i -e "s#^\([ ]\+\)<date>.*</date>\$#\1<date>$LASTMOD</date>#" "$file"
+       done
+

        if [ "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' po/apt-all.pot | cut -d' ' -f 2)" -o \
             "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' doc/po/apt-doc.pot | cut -d' ' -f 2)" ]; then
                echo >&2 'POT files are not up-to-date. Execute »make update-po« for you…'
                make update-po
        fi
        if [ "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' po/apt-all.pot | cut -d' ' -f 2)" -o \
             "$(date +%Y-%m-%d)" != "$(grep --max-count=1 '^"POT-Creation-Date: .*\n"$' doc/po/apt-doc.pot | cut -d' ' -f 2)" ]; then
                echo >&2 'POT files are not up-to-date. Execute »make update-po« for you…'
                make update-po
        fi

-
-       sed -i -e "s/^PACKAGE_VERSION=\".*\"$/PACKAGE_VERSION=\"${VERSION}\"/" configure.ac
-       sed -i -e "s/^<!ENTITY apt-product-version \".*\">$/<!ENTITY apt-product-version \"${VERSION}\">/" doc/apt-verbatim.ent
+elif [ "$1" = 'pre-build' ]; then
+       if [ "$DISTRIBUTION" = "UNRELEASED" ]; then
+               echo 'BUILDING AN UNRELEASED VERSION'
+       else
+               CONFVERSION="$(sed -ne "s/^PACKAGE_VERSION=\"\(.*\)\"$/\1/p" configure.ac)"
+               if [ "$VERSION" != "$CONFVERSION" ]; then
+                       echo "changelog (${VERSION}) and configure (${CONFVERSION}) talk about different versions!"
+                       echo "You probably want to run »./prepare-release pre-export« to fix this."
+                       exit 1
+               fi
+       fi

 elif [ "$1" = 'post-build' ]; then
        if [ "$DISTRIBUTION" != "UNRELEASED" ]; then
 elif [ "$1" = 'post-build' ]; then
        if [ "$DISTRIBUTION" != "UNRELEASED" ]; then

-               echo >&2 "REMEMBER: Tag this release with »git tag ${VERSION}« if you are satisfied"
+               echo >&2 "REMEMBER: Tag this release with »git tag -s ${VERSION}« if you are satisfied"

        else
                echo >&2 'REMEMBER: Change to a valid distribution before release'
        fi
        else
                echo >&2 'REMEMBER: Change to a valid distribution before release'
        fi


@@ -106,10 +127,15 @@ elif [ "$1" = 'post-build' ]; then
 
 elif [ "$1" = 'library' ]; then
        librarysymbols() {
 
 elif [ "$1" = 'library' ]; then
        librarysymbols() {

-               echo "Checking $1 in version $2"
+               local buildlib="build/bin/${1}.so.${2}"
+               if [ ! -r "$buildlib" ]; then
+                       echo "ERROR: The library ${1} has to be built before symbols can be checked!"
+                       return
+               fi
+               echo "Checking $1 in version $2 build at $(stat -L -c '%y' "$buildlib")"

                local tmpfile=$(mktemp)
                local tmpfile=$(mktemp)

-               dpkg-gensymbols -p${1}${2} -ebuild/bin/${1}.so.${2} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true
-               librarysymbolsfromfile "$tmpfile"
+               dpkg-gensymbols -p${1}${2} -e${buildlib} -Idebian/${1}${2}.symbols -O/dev/null 2> /dev/null > $tmpfile || true
+               librarysymbolsfromfile "$tmpfile" "$(echo "${1}" | cut -c 4- | tr -d '-' | tr 'a-z' 'A-Z')_${2}"

                rm -f $tmpfile
        }
        librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}"
                rm -f $tmpfile
        }
        librarysymbols 'libapt-pkg' "${LIBAPTPKGVERSION}"


@@ -117,12 +143,12 @@ elif [ "$1" = 'library' ]; then
        librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}"
 elif [ "$1" = 'buildlog' ]; then
        while [ -n "$2" ]; do
        librarysymbols 'libapt-inst' "${LIBAPTINSTVERSION}"
 elif [ "$1" = 'buildlog' ]; then
        while [ -n "$2" ]; do

-               librarysymbolsfromfile "$2"
+               librarysymbolsfromfile "$2" 'UNKNOWN'

                shift
        done
 elif [ "$1" = 'travis-ci' ]; then
                shift
        done
 elif [ "$1" = 'travis-ci' ]; then

-       apt-get install -q --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' | tr -d ',')
-       apt-get install -q --no-install-recommends $(sed -n 's#^Depends: .*@, \(.*\)$#\1#p' debian/tests/control | tr -d ',')
+       apt-get install -qy --no-install-recommends $(sed -n -e '/^Build-Depends: /,/^Build-Depends-Indep: / {p}' debian/control | sed -e 's#([^)]*)##g' -e 's#^Build-Depends\(-Indep\)\?: ##' -e 's#<.*>##g' | tr -d ',')
+       apt-get install -qy --no-install-recommends $(sed -n 's#^Depends: .*@, \(.*\)$#\1#p' debian/tests/control | tr -d ',')

 elif [ "$1" = 'coverage' ]; then
        DIR="${2:-./coverage}"
        git clean -dfX # remove ignored build artefacts for a clean start
 elif [ "$1" = 'coverage' ]; then
        DIR="${2:-./coverage}"
        git clean -dfX # remove ignored build artefacts for a clean start


@@ -130,8 +156,8 @@ elif [ "$1" = 'coverage' ]; then
        LCOVRC='--rc geninfo_checksum=1 --rc lcov_branch_coverage=1'
        mkdir "$DIR"
        lcov --no-external --directory . --capture --initial --output-file "${DIR}/apt.coverage.init" ${LCOVRC}
        LCOVRC='--rc geninfo_checksum=1 --rc lcov_branch_coverage=1'
        mkdir "$DIR"
        lcov --no-external --directory . --capture --initial --output-file "${DIR}/apt.coverage.init" ${LCOVRC}

-       make test
-       ./test/integration/run-tests -q
+       make test || true
+       ./test/integration/run-tests -q || true

        lcov --no-external --directory . --capture --output-file "${DIR}/apt.coverage.run" ${LCOVRC}
        lcov -a "${DIR}/apt.coverage.init" -a "${DIR}/apt.coverage.run"  -o "${DIR}/apt.coverage.total" ${LCOVRC}
        cp "${DIR}/apt.coverage.total" "${DIR}/apt.coverage.fixed"
        lcov --no-external --directory . --capture --output-file "${DIR}/apt.coverage.run" ${LCOVRC}
        lcov -a "${DIR}/apt.coverage.init" -a "${DIR}/apt.coverage.run"  -o "${DIR}/apt.coverage.total" ${LCOVRC}
        cp "${DIR}/apt.coverage.total" "${DIR}/apt.coverage.fixed"


@@ -157,12 +183,14 @@ elif [ "$1" = 'coverage' ]; then
        genhtml --output-directory "${DIR}" "${DIR}/apt.coverage.fixed" ${LCOVRC}
 else
        echo >&1 "Usage:\t$0 pre-export
        genhtml --output-directory "${DIR}" "${DIR}/apt.coverage.fixed" ${LCOVRC}
 else
        echo >&1 "Usage:\t$0 pre-export

+\t$0 pre-build

 \t$0 post-build
 
 \t$0 post-build
 

-If you use »git buildpackage« you can leave these alone as they will
-be run at the right places auto-magically. Otherwise you should use
-»pre-export« to update po and pot files as well as version numbering.
-»post-build« can be used to run some more or less useful checks later on.
+Updating po-files and versions as well as some basic checks are done
+by »pre-export« which needs to be run before package building.
+If you use »gbp buildpackage« you will be notified if you forget.
+»pre-build« and »post-build« can be used to run some more or less
+useful checks automatically run by »gbp« otherwise.

 
 \t$0 library
 \t$0 buildlog filename…
 
 \t$0 library
 \t$0 buildlog filename…