sync

diff --git a/add_constraints.sql b/add_constraints.sql
index 9352eeaa3f9bc22d47b621d5e4925fa27d527fb8..2d1d6ab2d7bff2011e9742264c978abf0bdd4b03 100644 (file)
--- a/add_constraints.sql
+++ b/add_constraints.sql
@@ -93,25 +93,23 @@ VACUUM override_type;
 VACUUM override;
 
 -- FIXME: has to be a better way to do this
 VACUUM override;
 
 -- FIXME: has to be a better way to do this

-GRANT ALL ON
-  architecture, architecture_id_seq, archive, archive_id_seq,
-  bin_associations, bin_associations_id_seq, binaries,
+GRANT ALL ON architecture, architecture_id_seq, archive,
+  archive_id_seq, bin_associations, bin_associations_id_seq, binaries,

   binaries_id_seq, component, component_id_seq, dsc_files,
   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, 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;
+  dsc_files_id_seq, files, files_id_seq, fingerprint,
+  fingerprint_id_seq, location, location_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 GROUP ftpmaster;

 
 -- Read only access to user 'nobody'
 
 -- Read only access to user 'nobody'

-GRANT SELECT ON
-  architecture, architecture_id_seq, archive, archive_id_seq,
-  bin_associations, bin_associations_id_seq, binaries,
+GRANT SELECT ON architecture, architecture_id_seq, archive,
+  archive_id_seq, bin_associations, bin_associations_id_seq, binaries,

   binaries_id_seq, component, component_id_seq, dsc_files,
   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, 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;
+  dsc_files_id_seq, files, files_id_seq, fingerprint,
+  fingerprint_id_seq, location, location_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/docs/README.config b/docs/README.config
index 92772185bbaae5c6ec06796c149648a17595fbdc..d5caaff37820722e47ee18b8ce713d3d8821539a 100644 (file)
--- a/docs/README.config
+++ b/docs/README.config
@@ -94,6 +94,9 @@ Mandatory.  List of dinstall options, e.g.:
 |    LockFile "/org/ftp.debian.org/katie/lock";
 |    Bcc "archive@ftp-master.debian.org";
 |    GroupOverrideFilename "override.group-maint";
 |    LockFile "/org/ftp.debian.org/katie/lock";
 |    Bcc "archive@ftp-master.debian.org";
 |    GroupOverrideFilename "override.group-maint";

+|    FutureTimeTravelGrace "8640"; // 6 hours
+|    PastCutoffYear "1984";
+|    BXANotify 0;

 | };
 
 PGPKeyring and GPGKeyring are mandatory fields which are filenames of
 | };
 
 PGPKeyring and GPGKeyring are mandatory fields which are filenames of


@@ -126,6 +129,13 @@ GroupOverrideFilename, if non-blank, is the override file which
 contains the list of email addresses which, if part of the Maintainer
 field, cause uploads to always be treated as maintainer uploads.
 
 contains the list of email addresses which, if part of the Maintainer
 field, cause uploads to always be treated as maintainer uploads.
 

+FutureTimeTravelGrace specifies how many seconds into the future
+timestamps are allowed to be inside a deb before being rejected.
+PastCutoffYear specifies the cut-off year which is used when deciding
+whether or not to reject packages based on the file timestamp.
+
+If BXANotify is non-zero/blank a (Debian-specfic) BXA notification is sent.
+

 ================================================================================
 
 Archive
 ================================================================================
 
 Archive

diff --git a/katie.conf b/katie.conf
index 8f97af2e516397ebe5ddc1cd819e57d2b9f15fc8..5e91a2cf64555f104c65321180462410d245b60d 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -283,6 +283,17 @@ Dir
   ListsDir "/org/ftp.debian.org/database/dists/";
   LogDir "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";
   ListsDir "/org/ftp.debian.org/database/dists/";
   LogDir "/org/ftp.debian.org/log/";
   Morgue "/org/ftp.debian.org/morgue/";

+  MorgueRejectDir "reject";
+  OverrideDir "/org/ftp.debian.org/scripts/override/";
+  QueueRootDir "/org/ftp.debian.org/queue/";
+  QueueAcceptedDir "/org/ftp.debian.org/queue/accepted/";
+  QueueByhandDir "/org/ftp.debian.org/queue/byhand/";
+  QueueDoneDir "/org/ftp.debian.org/queue/done/";
+  QueueHoldingDir "/org/ftp.debian.org/queue/holding/";
+  QueueNewDir "/org/ftp.debian.org/queue/new/";
+  QueueRejectDir "/org/ftp.debian.org/queue/reject/";
+  QueueUncheckedDir "/org/ftp.debian.org/queue/unchecked/";
+  UrgencyLogDir "/org/ftp.debian.org/testing/";

 };
 
 DB
 };
 
 DB


@@ -455,3 +466,15 @@ Location
 
 };
 
 
 };
 

+Urgency
+{
+  Default "low";
+  Valid
+  {
+    low "";
+    medium "";
+    high "";
+    emergency "";
+    critical "";
+  };
+};

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 170b7bda9a30d957a30887a038174e78ccf574c0..4408acbf4e6df2c59ef1cb30fbbe62fb461e6408 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -18,6 +18,8 @@ Dinstall
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";

+   FutureTimeTravelGrace "8640"; // 6 hours
+   PastCutoffYear "1984";

    BXANotify 0;
 };
 
    BXANotify 0;
 };
 


@@ -37,6 +39,15 @@ Shania
  MorgueSubDir "shania";
 };
 
  MorgueSubDir "shania";
 };
 

+
+Catherine 
+{
+  Options 
+  {
+     Limit     10240;
+  };
+};
+

 Natalie
 {
   Options
 Natalie
 {
   Options


@@ -265,6 +276,16 @@ Dir
   ListsDir "/org/non-us.debian.org/database/dists/";
   LogDir "/org/non-us.debian.org/log/";
   Morgue "/org/non-us.debian.org/morgue/";
   ListsDir "/org/non-us.debian.org/database/dists/";
   LogDir "/org/non-us.debian.org/log/";
   Morgue "/org/non-us.debian.org/morgue/";

+  MorgueRejectDir "reject";
+  QueueRootDir "/org/non-us.debian.org/queue/";
+  QueueAcceptedDir "/org/non-us.debian.org/queue/accepted/";
+  QueueByhandDir "/org/non-us.debian.org/queue/byhand/";
+  QueueDoneDir "/org/non-us.debian.org/queue/done/";
+  QueueHoldingDir "/org/non-us.debian.org/queue/holding/";
+  QueueNewDir "/org/non-us.debian.org/queue/new/";
+  QueueRejectDir "/org/non-us.debian.org/queue/reject/";
+  QueueUncheckedDir "/org/non-us.debian.org/queue/unchecked/";
+  UrgencyLogDir "/org/non-us.debian.org/testing/";

 };
 
 DB
 };
 
 DB


@@ -390,8 +411,16 @@ Location
 
 };
 
 
 };
 

-Catherine {
-       Options {
-               Limit   10240;
-       };
+Urgency
+{
+  Default "low";
+  Valid
+  {
+    low "";
+    medium "";
+    high "";
+    emergency "";
+    critical "";
+  };

 };
 };

+