From: James Troup Date: Wed, 21 Mar 2001 01:00:55 +0000 (+0000) Subject: sync X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=a9a4efc997ab32398a78367b1cc6bc5fd2e34678;p=dak.git sync --- diff --git a/TODO b/TODO index c0642569..e5a2d6e0 100644 --- a/TODO +++ b/TODO @@ -93,6 +93,7 @@ Less Urgent o Need the ability to rebuild all other tables from dists _or_ pools (in the event of disaster) (?) o Make the --help and --version options do stuff for all scripts o Need to check for .dsc when source is mentioned + o Do a checkpc(1)-a-like which sanitizes a config files. o fix parse_changes()/build_file_list() to sanity check filenames o saftey check and/or rename debs so they match what they should be diff --git a/katie.conf b/katie.conf index e01571cc..1b81e329 100644 --- a/katie.conf +++ b/katie.conf @@ -19,9 +19,13 @@ Dinstall SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; SendmailCommand "/usr/sbin/sendmail -oi -t"; MyEmailAddress "Debian Installer "; + MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() + MyDistribution "Debian"; // Used in emails + BugServer "bugs.debian.org"; NewAckList "/org/ftp.debian.org/katie/log"; LockFile "/org/ftp.debian.org/katie/lock"; + Bcc "troup@auric.debian.org"; }; @@ -328,6 +332,7 @@ Dir { RootDir "/org/ftp.debian.org/ftp/"; PoolDir "/org/ftp.debian.org/ftp/pool/"; + TemplatesDir "/org/ftp.debian.org/katie/templates/"; PoolRoot "pool/"; IncomingDir "/org/ftp.debian.org/incoming/"; OverrideDir "/org/ftp.debian.org/scripts/override/"; @@ -338,7 +343,7 @@ Dir DB { Name "projectb"; - Host "ftp-master.debian.org"; + Host ""; Port -1; ROUser "nobody"; }; @@ -370,6 +375,7 @@ Archive ftp-master { OriginServer "ftp-master.debian.org"; + PrimaryMirror "ftp.debian.org"; Description "Master Archive for the Debian project"; }; diff --git a/katie.conf-non-US b/katie.conf-non-US index 7c884c77..f50bb6ee 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -18,9 +18,13 @@ Dinstall GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; SendmailCommand "/usr/sbin/sendmail -oi -t"; MyEmailAddress "Debian Installer "; + MyAdminAddress "ftpmaster@debian.org"; MyHost "debian.org"; // used for generating user@my_host addresses in e.g. manual_reject() + MyDistribution "Debian"; // Used in emails + BugServer "bugs.debian.org"; NewAckList "/org/non-us.debian.org/katie/log"; LockFile "/org/non-us.debian.org/katie/lock"; + Bcc "troup@auric.debian.org"; }; @@ -324,7 +328,7 @@ Dir DB { Name "projectb"; - Host "non-us.debian.org"; + Host ""; Port -1; ROUser "nobody"; }; @@ -356,6 +360,7 @@ Archive non-US { OriginServer "non-us.debian.org"; + PrimaryMirror "non-us.debian.org"; Description "Non-US Archive for the Debian project"; }; diff --git a/templates/README b/templates/README new file mode 100644 index 00000000..6d256230 --- /dev/null +++ b/templates/README @@ -0,0 +1,35 @@ +Currently used substitutions in katie: +====================================== + +Global +------ + + o __ADMIN_ADDRESS__ + o __BCC__ [*] + o __BUG_SERVER__ + o __DISTRO__ + o __KATIE_ADDRESS__ + +Per package +----------- + + o __ARCHITECTURE__ + o __CHANGES_FILENAME__ + o __FILE_CONTENTS__ + o __MAINTAINER_ADDRESS__ + o __MAINTAINER__ + o __REJECT_MESSAGE__ + o __SOURCE__ + o __VERSION__ + +Misc +---- + o __ANNOUNCE_LIST_ADDRESS__ + o __BUG_NUMBER__ + o __CONTROL_MESSAGE__ + o __MANUAL_REJECT_MESSAGE__ + o __SHORT_SUMMARY__ + o __SUMMARY__ + o __STABLE_WARNING__ + o __SUITE__ + diff --git a/templates/katie.announce b/templates/katie.announce new file mode 100644 index 00000000..ccb58efc --- /dev/null +++ b/templates/katie.announce @@ -0,0 +1,9 @@ +From: __MAINTAINER_ADDRESS__ +To: __ANNOUNCE_LIST_ADDRESS__ +__BCC__ +Subject: Installed __SOURCE__ __VERSION__ (__ARCHITECTURE__) + +__FILE_CONTENTS__ + +Installed: +__SHORT_SUMMARY__ diff --git a/templates/katie.bug-close b/templates/katie.bug-close new file mode 100644 index 00000000..db1b51ef --- /dev/null +++ b/templates/katie.bug-close @@ -0,0 +1,28 @@ +From: __MAINTAINER_ADDRESS__ +To: __BUG_NUMBER__-close@__BUG_SERVER__ +__BCC__ +Subject: Bug#__BUG_NUMBER__: fixed in __SOURCE__ __VERSION__ + +We believe that the bug you reported is fixed in the latest version of +__SOURCE__, which has been installed in the __DISTRO__ FTP archive: + +__SHORT_SUMMARY__ +__STABLE_WARNING__ + +A summary of the changes between this version and the previous one is +attached. + +Thank you for reporting the bug, which will now be closed. If you +have further comments please address them to __BUG_NUMBER__@__BUG_SERVER__, +and the maintainer will reopen the bug report if appropriate. + +__DISTRO__ distribution maintenance software +pp. +__MAINTAINER__ (supplier of updated __SOURCE__ package) + +(This message was generated automatically at their request; if you +believe that there is a problem with it please contact the archive +administrators by mailing __ADMIN_ADDRESS__) + + +__FILE_CONTENTS__ diff --git a/templates/katie.bug-nmu-fixed b/templates/katie.bug-nmu-fixed new file mode 100644 index 00000000..8a77bc3a --- /dev/null +++ b/templates/katie.bug-nmu-fixed @@ -0,0 +1,13 @@ +From: __MAINTAINER_ADDRESS__ +To: control@__BUG_SERVER__ +Cc: __MAINTAINER_ADDRESS__ +__BCC__ +Subject: Fixed in NMU of __SOURCE__ __VERSION__ + +__CONTROL_MESSAGE__ +quit + +This message was generated automatically in response to a +non-maintainer upload. The .changes file follows. + +__FILE_CONTENTS__ diff --git a/templates/katie.installed b/templates/katie.installed new file mode 100644 index 00000000..23b84375 --- /dev/null +++ b/templates/katie.installed @@ -0,0 +1,12 @@ +From: __KATIE_ADDRESS__ +To: __MAINTAINER_ADDRESS__ +__BCC__ +Subject: __CHANGES_FILENAME__ INSTALLED __SUITE__ + +__REJECT_MESSAGE__ +Installing: +__SUMMARY__ + +If the override file requires editing, reply to this mail. + +Thank you for your contribution to __DISTRO__. diff --git a/templates/katie.new b/templates/katie.new new file mode 100644 index 00000000..cc36f710 --- /dev/null +++ b/templates/katie.new @@ -0,0 +1,13 @@ +From: __KATIE_ADDRESS__ +To: __MAINTAINER_ADDRESS__ +__BCC__ +Subject: __CHANGES_FILENAME__ is NEW + +__SUMMARY__ + +Your package contains new components which requires manual editing of +the override file. It is ok otherwise, so please be patient. New +packages are usually added to the override file about once a week. + +You may have gotten the distribution wrong. You'll get warnings above +if files already exist in other distributions. diff --git a/templates/katie.override-disparity b/templates/katie.override-disparity new file mode 100644 index 00000000..49cdad94 --- /dev/null +++ b/templates/katie.override-disparity @@ -0,0 +1,20 @@ +From: __KATIE_ADDRESS__ +To: __MAINTAINER_ADDRESS__ +__BCC__ +Subject: __SOURCE__ override disparity + +There are disparities between your recently installed upload and the +override file for the following file(s): + +__SUMMARY__ +Either the package or the override file is incorrect. If you think +the override is correct and the package wrong please fix the package +so that this disparity is fixed in the next upload. If you feel the +override is incorrect then please reply to this mail and explain why. + +-- +__DISTRO__ distribution maintenance software + +(This message was generated automatically; if you believe that there +is a problem with it please contact the archive administrators by +mailing __ADMIN_ADDRESS__) diff --git a/templates/katie.rejected b/templates/katie.rejected new file mode 100644 index 00000000..a65c98b4 --- /dev/null +++ b/templates/katie.rejected @@ -0,0 +1,17 @@ +From: __KATIE_ADDRESS__ +To: __MAINTAINER_ADDRESS__ +__BCC__ +Subject: __CHANGES_FILENAME__ REJECTED + +__MANUAL_REJECT_MESSAGE__ +__REJECT_MESSAGE__ + +=== + +If you don't understand why your files were rejected, or if the +override file requires editing, reply to this email. + +Your rejected files are in incoming/REJECT/. (Some may also be in +incoming/ if your .changes file was unparsable.) If only some of the +files need to repaired, you may move any good files back to incoming/. +Please remove any bad files from incoming/REJECT/. diff --git a/templates/melanie.bug-close b/templates/melanie.bug-close new file mode 100644 index 00000000..45862b58 --- /dev/null +++ b/templates/melanie.bug-close @@ -0,0 +1,39 @@ +From: __MELANIE_ADDRESS__ +To: __BUG_NUMBER__-close@__BUG_SERVER__ +__CC__ +__BCC__ +Subject: Bug#__BUG_NUMBER__: fixed + +We believe that the bug you reported is now fixed; the following +package(s) have been removed from __SUITE_LIST__: + +__SUMMARY__ +Note that the package(s) have simply been removed from the tag +database and may (or may not) still be in the pool; this is not a bug. +The package(s) will be physically removed automatically when no suite +references them (and in the case of source, when no binary references +it). Please also remember that the changes have been done on the +master archive (__MASTER_ARCHIVE__) and will not propagate to any +mirrors (__PRIMARY_MIRROR__ included) until the next cron.daily run at the +earliest. + +Packages are never removed from testing by hand. Testing tracks +unstable and will automatically remove packages which were removed +from unstable when removing them from testing causes no dependency +problems. + +Bugs which have been reported against this package are not automatically +removed from the Bug Tracking System. Please check all open bugs and +close them or re-assign them to another package if the removed package +was superseded by another one. + +Thank you for reporting the bug, which will now be closed. If you +have further comments please address them to __BUG_NUMBER__@__BUG_SERVER__. + +This message was generated automatically; if you believe that there is +a problem with it please contact the archive administrators by mailing +__ADMIN_ADDRESS__. + +__DISTRO__ distribution maintenance software +pp. +__WHOAMI__ (the ftpmaster behind the curtain)