[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#153556: tag 153556 patch

tag 153556 patch
thanks

The following patch should include the security archive in
packages.debian.org.  It has not been tested.

Index: update-files
===================================================================
RCS file: /cvs/webwml/packages/update-files,v
retrieving revision 1.1
diff -u -r1.1 update-files
--- update-files	6 Dec 2002 20:30:09 -0000	1.1
+++ update-files	23 Mar 2003 19:18:13 -0000
@@ -24,6 +24,12 @@
           gunzip -c Packages.gz > ${dist}/${sect}.Packages.non-US; } || true
       { wget -q -N $nonus_ftpsite/dists/${dist}/non-US/${sect}/source/Sources.gz && \
           gunzip -c Sources.gz > ${dist}/${sect}.Sources.non-US; } || true
+    if [ ${dist} != unstable ]; then
+      { wget -q -N $nonus_ftpsite/dists/${dist}/updates/${sect}/binary-i386/Packages.gz && \
+          gunzip -c Packages.gz > ${dist}/${sect}.Packages.security; } || true
+      { wget -q -N $nonus_ftpsite/dists/${dist}/updates/${sect}/source/Sources.gz && \
+          gunzip -c Sources.gz > ${dist}/${sect}.Sources.security; } || true
+    fi
   done
   rm -f Packages.gz Sources.gz
 done
Index: update-htmls
===================================================================
RCS file: /cvs/webwml/packages/update-htmls,v
retrieving revision 1.1
diff -u -r1.1 update-htmls
--- update-htmls	6 Dec 2002 20:30:09 -0000	1.1
+++ update-htmls	23 Mar 2003 19:18:13 -0000
@@ -21,10 +21,19 @@
   fi
 
   # the below two URLs are *different* from $ftpsite and $nonus_ftpsite
-  if [ $dist != "experimental" ]; then
+  if [ $dist = stable -o $dist = testing ]; then
     $script_base/create_package_pages.pl \
     -s http://ftp.debian.org/debian \
     -n http://non-us.debian.org/debian-non-US \
+    -S http://security.debian.org/debian-security \
+    -h $htmldir/${dist} \
+    -m $filesdir/md5sum.${dist} \
+    $filesdir/${dist}/{main,contrib,non-free}.{Packages,Sources}{,.non-US,.security}
+  elif [ $dist = unstable ]; then
+    $script_base/create_package_pages.pl \
+    -s http://ftp.debian.org/debian \
+    -n http://non-us.debian.org/debian-non-US \
+    -S http://security.debian.org/debian-security \
     -h $htmldir/${dist} \
     -m $filesdir/md5sum.${dist} \
     $filesdir/${dist}/{main,contrib,non-free}.{Packages,Sources}{,.non-US}
@@ -32,6 +41,7 @@
     $script_base/create_package_pages.pl \
     -s http://ftp.debian.org/debian \
     -n http://non-us.debian.org/debian-non-US \
+    -S http://security.debian.org/debian-security \
     -h $htmldir/${dist} \
     -m $filesdir/md5sum.${dist} \
     -e \
Index: vars
===================================================================
RCS file: /cvs/webwml/packages/vars,v
retrieving revision 1.1
diff -u -r1.1 vars
--- vars	6 Dec 2002 20:30:09 -0000	1.1
+++ vars	23 Mar 2003 19:18:13 -0000
@@ -12,3 +12,4 @@
 
 ftpsite=http://ftp.debian.org/debian
 nonus_ftpsite=http://ftp.uk.debian.org/debian-non-US
+security_ftpsite=http://security.debian.org/debian-security
Index: cgi-bin/download.pl
===================================================================
RCS file: /cvs/webwml/packages/cgi-bin/download.pl,v
retrieving revision 1.2
diff -u -r1.2 download.pl
--- cgi-bin/download.pl	27 Feb 2003 18:25:47 -0000	1.2
+++ cgi-bin/download.pl	23 Mar 2003 19:18:14 -0000
@@ -263,6 +263,11 @@
 	}
 	print "</ul>";
 }
+elsif ($type eq 'security') {
+	print "<ul>";
+	print "<li><a href=\"http://security.debian.org/debian-security/$file\";>security.debian.org/debian-security</a>\n";
+	print "</ul>";
+}
 else {
 	print "<table border=0><tr><td valign=top>";
 	print "<p><em>North America</em>";
Index: htmlscripts/create_package_pages.pl
===================================================================
RCS file: /cvs/webwml/packages/htmlscripts/create_package_pages.pl,v
retrieving revision 1.3
diff -u -r1.3 create_package_pages.pl
--- htmlscripts/create_package_pages.pl	21 Dec 2002 18:00:28 -0000	1.3
+++ htmlscripts/create_package_pages.pl	23 Mar 2003 19:18:15 -0000
@@ -40,6 +40,7 @@
 %opthash = (
 	"site|s=s" => \$site,
 	"nonus_site|n=s" => \$nonus_site,
+	"security_site|S=s" => \$security_site,
 	"html_root|h=s" => \$html_root,
 	"md5file|m=s" => \$md5file,
 	"experimental|e!" => \$experimental,
@@ -58,6 +59,10 @@
 }
 if (! defined $nonus_site) {
 	print "Error: No --nonus_site option given\n";
+	exit;
+}
+if (! defined $security_site) {
+	print "Error: No --security_site option given\n";
 	exit;
 }
 if (! defined $html_root) {
Index: htmlscripts/pages.pl
===================================================================
RCS file: /cvs/webwml/packages/htmlscripts/pages.pl,v
retrieving revision 1.9
diff -u -r1.9 pages.pl
--- htmlscripts/pages.pl	30 Jan 2003 14:43:59 -0000	1.9
+++ htmlscripts/pages.pl	23 Mar 2003 19:18:16 -0000
@@ -227,6 +227,8 @@
 		$package_page .=  "<input type=\"hidden\" name=\"md5sum\" value=\"$package{$pack}{'md5sum'}\">\n";
 		if ($distrib =~ /non-us/o) {
 			$package_page .=  "<input type=\"hidden\" name=\"type\" value=\"nonus\">\n";
+		} elsif ($distrib =~ /security/o) {
+			$package_page .=  "<input type=\"hidden\" name=\"type\" value=\"security\">\n";
 		} else {
 			$package_page .=  "<input type=\"hidden\" name=\"type\" value=\"main\">\n";
 		}
@@ -256,6 +258,8 @@
 					($src_file_md5, $src_file_size, $src_file_name) = split(/\s+/, $_);
 					if ($distrib =~ /non-us/o) {
 						$package_page .= "<a href=\"$nonus_site/$source_dir/$src_file_name\">[";
+					} elsif ($distrib =~ /security/o) {
+						$package_page .= "<a href=\"$security_site/$source_dir/$src_file_name\">[";
 					} else {
 						$package_page .= "<a href=\"$site/$source_dir/$src_file_name\">[";
 					}

Matt
-- 
It's most certainly GNU/Linux, not Linux.  Read more at
http://www.gnu.org/gnu/why-gnu-linux.html.
Reply to: