From 37c00f7c3930944909cc93d206c72a1058daca15 Mon Sep 17 00:00:00 2001
From: Tollef Fog Heen <tfheen@debian.org>
Date: Thu, 11 Jul 2002 21:40:17 +0000
Subject: [PATCH] Apply patch from Petter Reinholdtsen to put the security
 updates onto the cd.

---
 CONF.sh            | 5 +++++
 debian/CONF.sh     | 5 +++++
 debian/changelog   | 3 ++-
 tools/mirror_check | 6 ++++--
 tools/scanpackages | 3 +++
 5 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/CONF.sh b/CONF.sh
index eaa4d9f4..cdf6d410 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -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
 
diff --git a/debian/CONF.sh b/debian/CONF.sh
index f6b75a00..449731d8 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -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
 
diff --git a/debian/changelog b/debian/changelog
index b2f0ca9a..1090de0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/tools/mirror_check b/tools/mirror_check
index 8b7ac1cb..ccc929e6 100755
--- a/tools/mirror_check
+++ b/tools/mirror_check
@@ -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) {
diff --git a/tools/scanpackages b/tools/scanpackages
index 96332498..fa5f5818 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -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