From 69bb3ff1da0daa3f20b5adb3d3567b9b98e13b3f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 20 Jun 2008 00:24:16 -0700 Subject: [PATCH] * Use apt pinning to force use of the version of ssl-cert from the hardy release pocket, not the one from -updates, so we avoid pulling in the very large openssl-blacklist package that we don't need on live CDs --- debian/changelog | 8 ++++++++ livecd.sh | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index 05465ea8..273f71a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (0.61) UNRELEASED; urgency=low + + * Use apt pinning to force use of the version of ssl-cert from the hardy + release pocket, not the one from -updates, so we avoid pulling in the + very large openssl-blacklist package that we don't need on live CDs + + -- Steve Langasek Fri, 20 Jun 2008 00:23:23 -0700 + livecd-rootfs (0.60) intrepid; urgency=low * Employ hideous hack to ensure that when we're building against diff --git a/livecd.sh b/livecd.sh index 72eb56c3..a29664cb 100755 --- a/livecd.sh +++ b/livecd.sh @@ -307,6 +307,18 @@ link_in_boot = $link_in_boot LIST="$(without_package "$x" "$LIST")" done + if [ "$STE" = "hardy" ]; then + # use the version of ssl-cert from the release + # pocket, because the version in -updates pulls in the large + # openssl-blacklist package which we should never need on the + # live CD + cat << @@EOF > ${ROOT}etc/apt/preferences +Package: ssl-cert +Pin: version 1.0.14-0ubuntu2 +Pin-Priority: 900 +@@EOF + fi + # Create a good sources.list, and finish the install echo deb $MIRROR $STE ${COMP} > ${ROOT}etc/apt/sources.list echo deb $MIRROR ${STE}-security ${COMP} >> ${ROOT}etc/apt/sources.list @@ -363,6 +375,9 @@ link_in_boot = $link_in_boot chroot $ROOT dpkg-divert --remove --rename /${file} done + # remove the apt preferences hack if it was added + rm -f ${ROOT}etc/apt/preferences + # And make this look more pristine cat << @@EOF > ${ROOT}etc/apt/sources.list deb ${USERMIRROR} $STE ${COMP}