Revert r14491

It turns out that debsecan still needs the binary package data. 8-(


git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@14492 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 66 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 38606ff740..54e1effb83 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,19 @@ BUG_LISTS = $(wildcard data/*/list)
 # arbitrary at the moment.  More architectures can be added later.
 
 MIRROR = http://ftp.de.debian.org/debian/
+ETCH_ARCHS = alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
+LENNY_ARCHS = alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+SQUEEZE_ARCHS = amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc
+SID_ARCHS = alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc
 
 OLDSTABLE = etch
 STABLE    = lenny
 TESTING   = squeeze
 
+OLDSTABLE_uc = $(shell echo "$(OLDSTABLE)" | tr "[:lower:]" "[:upper:]")
+STABLE_uc = $(shell echo "$(STABLE)" | tr "[:lower:]" "[:upper:]")
+TESTING_uc = $(shell echo "$(TESTING)" | tr "[:lower:]" "[:upper:]")
+
 all:
 	rm -f data/security-new.db data/security-new.db.journal
 	if test -e data/security.db; then cp data/security.db data/security-new.db; fi
@@ -52,6 +60,13 @@ update-packages: update-testing
 			$(MIRROR)/dists/$$rel/$$archive/source/Sources \
 			data/packages/$${rel}__$${archive}_Sources ; \
 		done ; \
+	        for arch in $(SID_ARCHS) ; do \
+		  for archive in main contrib non-free ; do \
+		  $(PYTHON) bin/apt-update-file \
+		    $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \
+		    data/packages/$${rel}__$${archive}_$${arch}_Packages ; \
+		  done ; \
+		done ; \
 	done
 
 update-testing:
@@ -61,6 +76,13 @@ update-testing:
 			$(MIRROR)/dists/$$rel/$$archive/source/Sources \
 			data/packages/$${rel}__$${archive}_Sources ; \
 		done ; \
+	        for arch in $($(TESTING_uc)_ARCHS) ; do \
+		  for archive in main contrib non-free ; do \
+		  $(PYTHON) bin/apt-update-file \
+		    $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \
+		    data/packages/$${rel}__$${archive}_$${arch}_Packages ; \
+		  done ; \
+		done ; \
 	done
 
 update-stable: update-oldstable
@@ -70,6 +92,13 @@ update-stable: update-oldstable
 			$(MIRROR)/dists/$$rel/$$archive/source/Sources \
 			data/packages/$${rel}__$${archive}_Sources ; \
 		done ; \
+	        for arch in $($(STABLE_uc)_ARCHS) ; do \
+		  for archive in main contrib non-free ; do \
+		  $(PYTHON) bin/apt-update-file \
+		    $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \
+		    data/packages/$${rel}__$${archive}_$${arch}_Packages ; \
+		  done ; \
+		done ; \
 	done
 
 update-oldstable:
@@ -79,6 +108,13 @@ update-oldstable:
 			$(MIRROR)/dists/$$rel/$$archive/source/Sources \
 			data/packages/$${rel}__$${archive}_Sources ; \
 		done ; \
+	        for arch in $($(OLDSTABLE_uc)_ARCHS) ; do \
+		  for archive in main contrib non-free ; do \
+		  $(PYTHON) bin/apt-update-file \
+		    $(MIRROR)/dists/$$rel/$$archive/binary-$$arch/Packages \
+		    data/packages/$${rel}__$${archive}_$${arch}_Packages ; \
+		  done ; \
+		done ; \
 	done
 
 .PHONY: update-security update-old-security update-testing-security
@@ -87,6 +123,10 @@ ST_FILE = data/packages/$(TESTING)_security_
 update-testing-security:
 	$(PYTHON) bin/apt-update-file \
 	  $(ST_MIRROR)/main/source/Sources $(ST_FILE)main_Sources
+	set -e ; for arch in $($(TESTING_uc)_ARCHS) ; do \
+	  $(PYTHON) bin/apt-update-file \
+	    $(ST_MIRROR)/main/binary-$${arch}/Packages $(ST_FILE)main_$${arch}_Packages ; \
+	  done
 
 SEC_MIRROR = http://security.debian.org/dists
 update-security: update-old-security
@@ -95,6 +135,11 @@ update-security: update-old-security
 	    $(PYTHON) bin/apt-update-file \
 	      $(SEC_MIRROR)/$$archive/updates/$$section/source/Sources \
 	      data/packages/$${archive}_security_$${section}_Sources ; \
+	    for arch in $($(STABLE_uc)_ARCHS) ; do \
+	      $(PYTHON) bin/apt-update-file \
+	        $(SEC_MIRROR)/$$archive/updates/$$section/binary-$$arch/Packages \
+	        data/packages/$${archive}_security_$${section}_$${arch}_Packages ; \
+	    done ; \
 	  done ; \
 	done
 
@@ -104,24 +149,45 @@ update-old-security:
 	    $(PYTHON) bin/apt-update-file \
 	      $(SEC_MIRROR)/$$archive/updates/$$section/source/Sources \
 	      data/packages/$${archive}_security_$${section}_Sources ; \
+	    for arch in $($(OLDSTABLE_uc)_ARCHS) ; do \
+	      $(PYTHON) bin/apt-update-file \
+	        $(SEC_MIRROR)/$$archive/updates/$$section/binary-$$arch/Packages \
+	        data/packages/$${archive}_security_$${section}_$${arch}_Packages ; \
+	    done ; \
 	  done ; \
 	done
 
 VOLATILE_MIRROR = http://volatile.debian.net/debian-volatile/dists
 update-volatile:
 	set -e && for archive in $(OLDSTABLE) $(STABLE) ; do \
+	  for arch in $(ETCH_ARCHS) ; do \
+	    $(PYTHON) bin/apt-update-file \
+	      $(VOLATILE_MIRROR)/$${archive}/volatile/main/binary-$$arch/Packages \
+	      data/packages/$${archive}-volatile__main_$${arch}_Packages ; \
+	  done ; \
 	  $(PYTHON) bin/apt-update-file \
 	      $(VOLATILE_MIRROR)/$${archive}/volatile/main/source/Sources \
 	      data/packages/$${archive}-volatile__main_Sources ; \
 	done
+	$(PYTHON) bin/apt-update-file \
+	  $(VOLATILE_MIRROR)/lenny/volatile/main/binary-armel/Packages \
+          data/packages/lenny-volatile__main_armel_Packages
 
 BACKPORTS_MIRROR = http://www.backports.org/backports.org/dists
 update-backports:
 	set -e && for archive in $(OLDSTABLE) $(STABLE) ; do \
+	  for arch in $(ETCH_ARCHS) ; do \
+	    $(PYTHON) bin/apt-update-file \
+	      $(BACKPORTS_MIRROR)/$${archive}-backports/main/binary-$$arch/Packages \
+	      data/packages/$${archive}-backports__main_$${arch}_Packages ; \
+	  done ; \
 	  $(PYTHON) bin/apt-update-file \
 	      $(BACKPORTS_MIRROR)/$${archive}-backports/main/source/Sources \
 	      data/packages/$${archive}-backports__main_Sources ; \
 	done
+	$(PYTHON) bin/apt-update-file \
+	  $(BACKPORTS_MIRROR)/lenny-backports/main/binary-armel/Packages \
+	      data/packages/lenny-backports__main_armel_Packages
 
 update-lists:
 	svn update -q data