sync

diff --git a/TODO b/TODO
index 6cfeddada8d1b1062f9cdc47c9adefa6f42c7d62..07d03fb872b2fd45a30b57033c6148c42e2505a7 100644 (file)
--- a/TODO
+++ b/TODO
@@ -24,12 +24,13 @@ Less Urgent
   o ability to rebuild all other tables from dists _or_ pools (in the event of disaster) (?)
   o check errors on apt_pkg calls so we don't bomb out on daily runs (?)
   o check to see if mutli-component binary packages from a single component source are supported
-  o need a way to sync katie.conf and the DB for things like architecture
+  o Need to finish alyson (a way to sync katie.conf and the DB)
   o dinstall should remove != stable on stable install, not just f + u
   o Should probably use $ in ~ compares for files.
   o jenna needs to validate arguments!
   o jenna's untochable flag doesn't stop adding new packages
   o db_access' get_files needs to use exceptions not this None, > 0, < 0 return val BS
+  o Fix 'mixed' component handling
 
 ===================================================================================================
 
@@ -44,6 +45,7 @@ Packaging TODO
 Future Enhancements
 -------------------
 
+  o possibly disallow binary versions >> source except for bin-only NMUs (Branden Robinson)
   o project/orphaned should be a timed dist so that things only stay
     in there temporarily (say 3 months) [aj]
   o make the --help and --version options do stuff for all scripts

diff --git a/add_constraints.sql b/add_constraints.sql
index d3f4fb971fa25c484f1c249fae889b0e50d4e614..dd366c3a3bf515e24fccfe77da1fdb1e83f22d6d 100644 (file)
--- a/add_constraints.sql
+++ b/add_constraints.sql
@@ -74,25 +74,11 @@ GRANT ALL ON
   bin_associations, bin_associations_id_seq, binaries,
   binaries_id_seq, component, component_id_seq, dsc_files,
   dsc_files_id_seq, files, files_id_seq, location, location_id_seq,
-  maintainer, maintainer_id_seq, source, source_id_seq,
-  src_associations, src_associations_id_seq, suite,
-  suite_architectures, suite_id_seq
-     TO troup;
-
--- Give write privileges to the associations tables for AJ for the purposes of `testing'
-GRANT ALL ON 
-  binaries, binaries_id_seq, 
-  bin_associations, bin_associations_id_seq,
-  source, source_id_seq, 
-  src_associations, src_associations_id_seq,
-  suite, suite_id_seq 
-     TO ajt;
-
--- RO access to AJ for all other tables
-GRANT SELECT ON 
-  architecture, archive, binaries, component,
-  dsc_files, files, location, maintainer, source, suite, suite_architectures
-     TO ajt;
+  maintainer, maintainer_id_seq, override, override_type,
+  override_type_id_seq, priority, priority_id_seq, section,
+  section_id_seq, source, source_id_seq, src_associations,
+  src_associations_id_seq, suite, suite_architectures, suite_id_seq
+     TO GROUP ftpmaster;
 
 -- Read only access to user 'nobody'
 GRANT SELECT ON 
@@ -100,7 +86,8 @@ GRANT SELECT ON
   bin_associations, bin_associations_id_seq, binaries,
   binaries_id_seq, component, component_id_seq, dsc_files,
   dsc_files_id_seq, files, files_id_seq, location, location_id_seq,
-  maintainer, maintainer_id_seq, source, source_id_seq,
-  src_associations, src_associations_id_seq, suite,
-  suite_architectures, suite_id_seq
+  maintainer, maintainer_id_seq, override, override_type,
+  override_type_id_seq, priority, priority_id_seq, section,
+  section_id_seq, source, source_id_seq, src_associations,
+  src_associations_id_seq, suite, suite_architectures, suite_id_seq
      TO PUBLIC;

diff --git a/apt.conf b/apt.conf
index 524c1aea6223defdb8c98dd6c0ff49f97d5601e0..d1b6336e3a9cda9d1aa5f3edd88368b88ed0fdef 100644 (file)
--- a/apt.conf
+++ b/apt.conf
@@ -36,8 +36,8 @@ tree "dists/testing"
    SourceFileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm i386 m68k powerpc sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.testing.$(SECTION)";
+   SrcOverride "override.testing.$(SECTION).src";
 };
 
 tree "dists/unstable"
@@ -46,8 +46,8 @@ tree "dists/unstable"
    SourceFileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
+   BinOverride "override.sid.$(SECTION)";
+   SrcOverride "override.sid.$(SECTION).src";
 };
 
 tree "dists/unstable/main"
@@ -55,7 +55,7 @@ tree "dists/unstable/main"
    FileList "/org/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc";
-   BinOverride "override.woody.$(SECTION)";
+   BinOverride "override.sid.main.$(SECTION)";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
    Contents " ";

diff --git a/copyoverrides b/copyoverrides
index 23714dd119ab1c81246c9007920b11e7128408c7..73ecea163b060d16a13d926af671d4dbe25d1aeb 100755 (executable)
--- a/copyoverrides
+++ b/copyoverrides
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: copyoverrides,v 1.1 2000-11-24 00:20:11 troup Exp $
+# $Id: copyoverrides,v 1.2 2001-01-10 06:01:07 troup Exp $
 
 set -e
 . $SCRIPTVARS
@@ -7,9 +7,6 @@ echo 'Copying override files into public view ...'
 
 for f in $copyoverrides ; do
        cd $overridedir
-       sortover.pl <override.$f >override.$f.new
-       ln -f override.$f old/override.$f.old
-       mv override.$f.new override.$f
        chmod g+w override.$f
 
        cd $indices
@@ -25,6 +22,7 @@ for f in $copyoverrides ; do
        elif [ $rc = 1 -o ! -f $nf ]; then
                echo "   installing new $nf $pc"
                mv -f .newover-$f.gz $nf
+               chmod g+w $nf
        else
                echo $? $pc
                exit 1

diff --git a/cron.daily b/cron.daily
index 445ce11a8b7638a6f01fc42d9b442cd85b56375e..4ce8f617804867cb9fb17d0710213d7c359e756e 100755 (executable)
--- a/cron.daily
+++ b/cron.daily
@@ -59,6 +59,15 @@ jenna
 # FIXME
 cd /org/ftp.debian.org/database/dists/
 for i in proposed-updates_-_binary-*; do cat $i >> proposed-updates_-_binary.list; done
+
+# Generate override files
+cd $overridedir
+denise
+# FIXME
+rm override.potato.all3
+for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done
+
+# Generate Packages and Sources files
 cd $masterdir
 apt-ftparchive generate apt.conf
 

diff --git a/debian/control b/debian/control
index 5ba969cb12a098e09f5164037e429e116c1cfa76..ab30399ef7248275f22babdbb3ddc91f567e77db 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Standards-Version: 3.2.1
 
 Package: katie
 Architecture: all
-Depends: python-pygresql, python, python-apt, apt-utils, gnupg, postgresql (>= 7.0.3-1)
+Depends: python, python-pygresql, python-zlib, python-apt, apt-utils, gnupg, postgresql (>= 7.0.3-1)
 Suggests: gnupg (>= 1.0.4-1)
 Description: Debian's archive maintenance scripts
  This is a collection of archive maintenance scripts used by the

diff --git a/katie.conf b/katie.conf
index bcb175e53fa6cc070e802a51b4dfe8fdd2df455f..06511d79ef384782bcb92a74647144c62ad7a3f9 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -75,6 +75,48 @@ Shania
  MorgueSubDir "shania";
 };
 
+Natalie
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Version "";
+    Component "main";
+    List "";
+    Suite "unstable";
+    Set "";
+    Type "deb";
+   };
+
+ ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
+};
+
+Melanie
+{
+
+  Options
+  {
+    Debug "";
+    Help "";
+    Version "";
+    Architecture "";
+    Binary-Only "";
+    Component "";
+    Done "";
+    No-Action "";
+    Orphan "";
+    Partial "";
+    Reason "";
+    Source-Only "";
+    Suite "unstable";
+   };
+
+   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
+   LogFile "/home/troup/public_html/removals.txt";
+};
+
 Neve
 {
 
@@ -202,6 +244,7 @@ Suite
        Version "2.3-testing";
        Origin "Debian";
        Description "Debian 2.3 Testing distribution - Not Released";
+       OverrideCodeName "testing";
        Priority "3";
   };
 
@@ -233,8 +276,8 @@ Suite
        Version "2.3";
        Origin "Debian";
        Description "Debian 2.3 Unstable - Not Released";
-       CodeName "woody";
-       OverrideCodeName "woody";
+       CodeName "sid";
+       OverrideCodeName "sid";
        Priority "4";
   };
 
@@ -309,6 +352,67 @@ Component
        MeetsDFSG "false";
   };
 
+  mixed  // **NB:** only used for overrides; not yet used in other code
+  {
+       Description "Legacy Mixed";
+       MeetsDFSG "false";
+  };
+
+};
+
+Section
+{
+
+  "admin" "";
+  "base" "";
+  "comm" "";
+  "debian-installer" "";
+  "devel" "";
+  "doc" "";
+  "editors" "";
+  "electronics" "";
+  "games" "";
+  "graphics" "";
+  "hamradio" "";
+  "interpreters" "";
+  "libs" "";
+  "mail" "";
+  "math" "";
+  "misc" "";
+  "net" "";
+  "news" "";
+  "oldlibs" "";
+  "otherosfs" "";
+  "science" "";
+  "shells" "";
+  "sound" "";
+  "tex" "";
+  "text" "";
+  "utils" "";
+  "web" "";
+  "x11" "";
+
+};
+
+Priority
+{
+
+  "required" 1;
+  "important" 2;
+  "standard" 3;
+  "optional" 4;
+  "extra" 5;
+  "source" 0; // i.e. unused
+
+};
+
+OverrideType
+{
+
+  "deb" "";
+  "udeb" "";
+  "dsc" "";
+
 };
 
 Location

diff --git a/tea b/tea
index 54137c5826630d2babd9b9530bad7787c7e640f5..c8ca3ae647a1399bd2438cc2014a57e62df88cce 100755 (executable)
--- a/tea
+++ b/tea
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
-# 'Fix' stable to make debian-cd and dpkg -BORGiE users happy
+# Sanity check the database
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: tea,v 1.1 2000-12-05 04:27:48 troup Exp $
+# $Id: tea,v 1.2 2001-01-10 06:00:12 troup Exp $
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/vars b/vars
index 84699f2d3b90df92c0bf7aba26955a696830a7cb..c166ff7fbe50f5f6c942bd205c9ee0152ed059ab 100644 (file)
--- a/vars
+++ b/vars
@@ -11,7 +11,7 @@ overridedir=$scriptdir/override
 
 incoming=/org/ftp.debian.org/incoming
 
-copyoverrides="potato potato.contrib potato.non-free woody woody.contrib woody.non-free"
+copyoverrides="potato.contrib potato.contrib.src potato.main potato.main.src potato.non-free potato.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src testing.contrib testing.contrib.src testing.main testing.main.src testing.non-free testing.non-free.src"
 
 PATH=$masterdir:$PATH
 umask 022