diff options
Diffstat (limited to 'build-tor-sources')
| -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) ################################################# |