diff options
| author | Peter Palfrader <peter@palfrader.org> | 2012-03-11 11:03:44 +0000 |
|---|---|---|
| committer | weasel <weasel@bc3d92e2-beff-0310-a7cd-cc87d7ac0ede> | 2012-03-11 11:03:44 +0000 |
| commit | 023f64b73179bcca412557c7fc2c63400e3fd647 (patch) | |
| tree | f658421e636fdbd660cd1e825082a9fa5db63d62 | |
| parent | 6da67f0ab11d56677a9bb20896d02e06511a1d02 (diff) | |
support skipping hardy
git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@503 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
| -rwxr-xr-x | build-tor-sources | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/build-tor-sources b/build-tor-sources index ffd3dff..bcb808a 100755 --- a/build-tor-sources +++ b/build-tor-sources @@ -31,6 +31,7 @@ case "$(basename $0)" in build-obfsproxy-sources) GITDIR="$HOME/projects/debian/debian/obfsproxy/obfsproxy" PKG="obfsproxy" + SKIP_HARDY=1 ;; *) GITDIR="$HOME/projects/tor/tor" @@ -217,13 +218,15 @@ bp2 $DIR $ORIGTAR # HARDY (EOL: April 2013) ################################################# -bp1 $DIR $sid_debian_version hardy -(echo "/Conflicts:"; echo d; echo i; echo "Conflicts: libssl0.9.8 (<< 0.9.8g-4ubuntu3.1)"; echo . ; echo w) | ed "$DIR/debian/control" -(cd $DIR; dch "Conflict with libssl0.9.8 (<< 0.9.8g-4ubuntu3.1) on hardy") -# 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) -bp2 $DIR $ORIGTAR +if [ -z "${SKIP_HARDY:-}" ] || [ "${SKIP_HARDY:-}" -eq 0 ]; then + bp1 $DIR $sid_debian_version hardy + (echo "/Conflicts:"; echo d; echo i; echo "Conflicts: libssl0.9.8 (<< 0.9.8g-4ubuntu3.1)"; echo . ; echo w) | ed "$DIR/debian/control" + (cd $DIR; dch "Conflict with libssl0.9.8 (<< 0.9.8g-4ubuntu3.1) on hardy") + # 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) + bp2 $DIR $ORIGTAR +fi # LUCID (EOL: April 2015) ################################################# |