From 332d1ff4f3ccd0fe5654f703b9b613be9f6381fc Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 12 Jun 2012 15:32:01 +0000 Subject: Remove apparmor for backports git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@531 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede --- build-tor-sources | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/build-tor-sources b/build-tor-sources index 2a836f6..1e6c616 100755 --- a/build-tor-sources +++ b/build-tor-sources @@ -105,6 +105,14 @@ hardening_backport() { fi } +remove_apparmor() { + if grep -q dh-apparmor debian/control; then + sed -i -e '/^Build-Depends/ s/, *dh-apparmor//' debian/control + sed -i -e 's/dh_apparmor/# &/' debian/rules + dch "Remove apparmor support for backport." + fi +} + bp1() { local dir="$1"; shift local sid_debian_version="$1"; shift @@ -190,6 +198,7 @@ rm -r $DIR cd local-build dpkg-source -x ../${PKG}_$debian_version.dsc cd ${PKG}-$debian_upstream_version +remove_apparmor debuild -j8 -rfakeroot -uc -us cd ../.. @@ -201,11 +210,13 @@ cd ../.. ################################################# bp1 $DIR $sid_debian_version lenny (cd $DIR; hardening_backport 0) +(cd $DIR; remove_apparmor) bp2 $DIR $ORIGTAR # SQUEEZE ################################################# bp1 $DIR $sid_debian_version squeeze +(cd $DIR; remove_apparmor) bp2 $DIR $ORIGTAR # WHEEZY @@ -225,27 +236,32 @@ if [ -z "${SKIP_HARDY:-}" ] || [ "${SKIP_HARDY:-}" -eq 0 ]; then # hardy's dpkg-parsechangelog cannot deal with dots in the distribution field, remove them. (cd $DIR; dch --force-distribution --distribution "$(dpkg-parsechangelog | grep-dctrl -n -s Distribution '' | tr -d .)" '') (cd $DIR; hardening_backport 0) + (cd $DIR; remove_apparmor) bp2 $DIR $ORIGTAR fi # LUCID (EOL: April 2015) ################################################# bp1 $DIR $sid_debian_version lucid +(cd $DIR; remove_apparmor) bp2 $DIR $ORIGTAR # MAVERICK (EOL: April 2012) ################################################# bp1 $DIR $sid_debian_version maverick +(cd $DIR; remove_apparmor) bp2 $DIR $ORIGTAR # NATTY (EOL: October 2012) ################################################# bp1 $DIR $sid_debian_version natty +(cd $DIR; remove_apparmor) bp2 $DIR $ORIGTAR # ONEIRIC (EOL: April 2013) ################################################# bp1 $DIR $sid_debian_version oneiric +(cd $DIR; remove_apparmor) bp2 $DIR $ORIGTAR # PRECISE (EOL: April 2017) -- cgit v1.2.3