Re: debian-cd and security mirror (patch)

[Petter Reinholdtsen <pere@hungry.com>]

[Tollef Fog Heen]
> I'll commit it once you've tested it.

I've tested the resulting CD it using bochs, and it seem to work just
fine. :-)

Here is the relevant patch for the SECURITY option.  I'm not sure if
the change to tools/mirror_check is required, as I have never tried
without it.  It works with this patch, but I do not know if it would
still work output it.  That part is the patch I got from Carlos
Barros.  Without this patch, the security updates will not be
included/used on he CD.

Index: CONF.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/CONF.sh,v
retrieving revision 1.27
diff -u -3 -p -u -r1.27 CONF.sh
--- CONF.sh	2002/05/06 17:19:05	1.27
+++ CONF.sh	2002/07/11 16:01:09
@@ -10,6 +10,7 @@ unset EXTRANONFREE
 unset LOCAL
 unset LOCALDEBS
 unset SECURED
+unset SECURITY
 unset BOOTDIR
 unset SYMLINK
 unset COPYLINK
@@ -98,6 +99,10 @@ export APTTMP=/ftp/tmp/apt
 # Release.gpg and files listed by this Release file, then
 # 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
Index: debian/CONF.sh
===================================================================
RCS file: /cvs/debian-boot/debian-cd/debian/CONF.sh,v
retrieving revision 1.21
diff -u -3 -p -u -r1.21 CONF.sh
--- debian/CONF.sh	2002/05/06 17:19:05	1.21
+++ debian/CONF.sh	2002/07/11 16:01:09
@@ -6,6 +6,7 @@ unset EXTRANONFREE
 unset LOCAL
 unset LOCALDEBS
 unset SECURED
+unset SECURITY
 unset BOOTDIR
 unset SYMLINK
 unset COPYLINK
@@ -93,6 +94,10 @@ export APTTMP=/home/ftp/tmp/apt
 # Release.gpg and files listed by this Release file, then
 # 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
Index: tools/mirror_check
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/mirror_check,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 mirror_check
--- tools/mirror_check	2001/07/10 14:42:54	1.4
+++ tools/mirror_check	2002/07/11 16:01:09
@@ -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) {
Index: tools/scanpackages
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/scanpackages,v
retrieving revision 1.21
diff -u -3 -p -u -r1.21 scanpackages
--- tools/scanpackages	2002/04/13 12:17:57	1.21
+++ tools/scanpackages	2002/07/11 16:01:09
@@ -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


-- 
To UNSUBSCRIBE, email to debian-cd-request@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org