Apply patch from Petter Reinholdtsen to put the security updates onto

the cd.
This commit is contained in:
Tollef Fog Heen 2002-07-11 21:40:17 +00:00
parent c406b16046
commit 37c00f7c39
5 changed files with 19 additions and 3 deletions

View File

@ -10,6 +10,7 @@ unset EXTRANONFREE
unset LOCAL
unset LOCALDEBS
unset SECURED
unset SECURITY
unset BOOTDIR
unset SYMLINK
unset COPYLINK
@ -99,6 +100,10 @@ export APTTMP=/ftp/tmp/apt
# uncomment this line
# export SECURED=1
# Where to find the security patches. This directory should be the
# top directory of a security.debian.org mirror.
#export SECURITY="$TOPDIR"/debian/debian-security
# Sparc only : bootdir (location of cd.b and second.b)
# export BOOTDIR=/boot

5
debian/CONF.sh vendored
View File

@ -6,6 +6,7 @@ unset EXTRANONFREE
unset LOCAL
unset LOCALDEBS
unset SECURED
unset SECURITY
unset BOOTDIR
unset SYMLINK
unset COPYLINK
@ -94,6 +95,10 @@ export APTTMP=/home/ftp/tmp/apt
# uncomment this line
# export SECURED=1
# Where to find the security patches. This directory should be the
# top directory of a security.debian.org mirror.
#export SECURITY="$TOPDIR"/debian/debian-security
# Sparc only : bootdir (location of cd.b and second.b)
# export BOOTDIR=/boot

3
debian/changelog vendored
View File

@ -13,7 +13,8 @@ debian-cd (2.2.15) unstable; urgency=low
* Protect the call to add_secured by a stamp file. Closes: #147105
* Provide a customised isolinux image. We don't need to
recommend syslinux now.
* Apply patch from Petter Reinholdtsen to put security updates on the cd.
-- Raphael Hertzog <hertzog@debian.org> Sun, 5 May 2002 12:12:36 +0200
debian-cd (2.2.14) unstable; urgency=high

View File

@ -4,6 +4,7 @@ use Digest::MD5;
my $mirror = shift || $ENV{'MIRROR'};
my $nonus = shift || $ENV{'NONUS'};
my $security = shift || $ENV{'SECURITY'};
my ($p, $filename, $size, $md5sum, $file) = ('', '', 0, '', '');
my $ok = 1;
@ -20,8 +21,9 @@ while (defined($_ = <>)) {
next if not $p;
$file = ( -e "$mirror/$filename" ) ? "$mirror/$filename" :
"$nonus/$filename";
$file = ( ( -e "$mirror/$filename" ) ? "$mirror/$filename" :
( -e "$nonus/$filename" ) ? "$nonus/$filename" :
"$security/$filename" );
# Check if the file exists
if (! -e $file) {

View File

@ -122,6 +122,9 @@ for SECT in $SECTIONS; do
if [ -d "pool/$SECT" ]; then
find pool/$SECT >>$PREFIX.filelist_$SECT
fi
if [ -n "$SECURITY" -a -d "pool/updates/$SECT" ]; then
find pool/updates/$SECT >>$PREFIX.filelist_$SECT
fi
for DIST in $DISTS; do
if [ -d "dists/$DIST/$SECT/binary-$ARCH" ]; then
find dists/$DIST/$SECT/binary-$ARCH >>$PREFIX.filelist_$SECT