Merge branch 'master' into security

* master:
  Ask the database for components
  disable a-f
  new path
  clean the debbugs version track archive
  oh yay, we get away without the s-u-p-u, anything will be taken from s-p-u
  db schema 40
  rename volatile to updates

diff --git a/config/backports/cron.weekly b/config/backports/cron.weekly
index fcdffb029e7ea3ce34ab188dae621d5f704df329..097aa63cf7fcc3672e9efc3091d946857ebb1c5d 100755 (executable)
--- a/config/backports/cron.weekly
+++ b/config/backports/cron.weekly
@@ -36,8 +36,8 @@ dak split-done
 
 # Clean up apt-ftparchive's databases
 cd $configdir
-echo "Cleanup apt-ftparchive's database"
-apt-ftparchive -q clean apt.conf
+#echo "Cleanup apt-ftparchive's database"
+#apt-ftparchive -q clean apt.conf
 
 echo "Fixing symlinks in $ftpdir"
 symlinks -d -r $ftpdir

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 2f278a76bf2026987f5f8f49d87584c6f1d15fc3..0edf6dcef7fb32c29da6f4d21b125065d5aa1dd4 100644 (file)
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -19,7 +19,6 @@
   # New suite aliases
   Alias /buildd-unstable /srv/incoming.debian.org/dists/unstable/current/
   Alias /buildd-experimental /srv/incoming.debian.org/dists/experimental/current/
-  Alias /buildd-squeeze-volatile /srv/incoming.debian.org/dists/squeeze-volatile/current/
 
   <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(dists/|builddweb)|ftp\.debian\.org/mirror)">
     Order allow,deny

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 9822577a277664c4d1f2f4d108cf3e04578efc95..cf07086a2a93949dd66dc67e552d19701cfd5864 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -68,10 +68,10 @@ tree "dists/testing-proposed-updates"
    Contents " ";
 };
 
-tree "dists/squeeze-volatile"
+tree "dists/squeeze-updates"
 {
-   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
    BinOverride "override.squeeze.$(SECTION)";

diff --git a/config/debian/common b/config/debian/common
index 9fd9838359e9786c223d6111ef0a9aac12ec7684..a42c18ff9481be77fa36ec25a6904b416bc06450 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -90,6 +90,13 @@ function sync_debbugs () {
     fi
 }
 
+function clean_debbugs () {
+    # Delete files older than 60 days
+    find $queuedir/bts_version_track_archive/ -mtime +60 -type f -delete
+    # Delete empty directories
+    find $queuedir/bts_version_track_archive/ -empty -type d -delete
+}
+
 function reports() {
     # Send a report on NEW/BYHAND packages
     log "Nagging ftpteam about NEW/BYHAND packages"

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index e4f2571841a8faa5e9667bab6068ccb5fdfe9a9a..1ededd036545b2e7b7e89bfeb2f93a677976ec06 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -28,4 +28,6 @@ mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
 
 reports
 
+clean_debbugs
+
 ################################################################################

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index fbf186f4fb4e661e7c3e8ffa5eeb698ab4c660ab..0f9c35a541dc9fba4b181ef729c8e18c20783100 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -245,7 +245,7 @@ Suite
        };
   };
 
-  Squeeze-Volatile
+  Squeeze-Updates
   {
        Components
        {

diff --git a/dak/dakdb/update40.py b/dak/dakdb/update40.py
new file mode 100755 (executable)
index 0000000..062b0dd
--- /dev/null
+++ b/dak/dakdb/update40.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Rename squeeze-volatile to squeeze-updates to get more confused users
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2010 Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from socket import gethostname;
+
+################################################################################
+def do_update(self):
+    """
+    Rename squeeze-volatile to squeeze-updates to get more confused users
+    """
+    print __doc__
+    try:
+        c = self.db.cursor()
+        if gethostname() == 'franck':
+            c.execute("UPDATE suite SET suite_name='squeeze-updates', description='Updated packages for Debian x.y', codename='squeeze-updates' WHERE suite_name='squeeze-volatile'")
+            c.execute("UPDATE build_queue SET queue_name='buildd-squeeze-updates', path='/srv/incoming.debian.org/dists/squeeze-updates/buildd', releasedescription='buildd squeeze updates incoming' WHERE queue_name='buildd-squeeze-volatile'")
+            c.execute("UPDATE policy_queue SET queue_name='squeeze-updates-proposed-updates', path='/srv/ftp-master.debian.org/queue/updates/squeeze-updates-p-u-new' WHERE queue_name='squeeze-volatile-proposed-updates'")
+        c.execute("UPDATE config SET value = '40' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError, msg:
+        self.db.rollback()
+        raise DBUpdateError, 'Unable to apply sick update 40, rollback issued. Error message : %s' % (str(msg))

diff --git a/dak/generate_filelist.py b/dak/generate_filelist.py
index a2246f5cd3707dbf656886ffcee2bb356140064f..a58fe7e2c45d50288b9d135d82a716d58e319eb5 100755 (executable)
--- a/dak/generate_filelist.py
+++ b/dak/generate_filelist.py
@@ -196,9 +196,11 @@ def main():
     suites = [suite.suite_name for suite in query_suites.all()]
     if not cnf.has_key('Filelist::Options::Suite'):
         cnf['Filelist::Options::Suite'] = ','.join(suites)
-    # we can ask the database for components if 'mixed' is gone
+    query_components = session.query(Component)
+    components = \
+        [component.component_name for component in query_components.all()]
     if not cnf.has_key('Filelist::Options::Component'):
-        cnf['Filelist::Options::Component'] = 'main,contrib,non-free'
+        cnf['Filelist::Options::Component'] = ','.join(components)
     query_architectures = session.query(Architecture)
     architectures = \
         [architecture.arch_string for architecture in query_architectures.all()]

diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py
index 7398f67078bf37f6e6b31d0ab647f9ff6dfbf5eb..00489083851fade54710495ccd13943839726b39 100755 (executable)
--- a/dak/generate_packages_sources.py
+++ b/dak/generate_packages_sources.py
@@ -117,11 +117,11 @@ tree "dists/testing"
 };
 """
 
-    apt_trees["squeeze-volatile"]="""
-tree "dists/squeeze-volatile"
+    apt_trees["squeeze-updates"]="""
+tree "dists/squeeze-updates"
 {
-   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "%(arch)s";
    BinOverride "override.squeeze.$(SECTION)";

diff --git a/dak/update_db.py b/dak/update_db.py
index 19ce34dfc9e960ada013b3c4c1fa7e0928c5c214..99ddad1b4249e167a920fa388bab9fe1433e6baa 100755 (executable)
--- a/dak/update_db.py
+++ b/dak/update_db.py
@@ -45,7 +45,7 @@ from daklib.dak_exceptions import DBUpdateError
 ################################################################################
 
 Cnf = None
-required_database_schema = 39
+required_database_schema = 40
 
 ################################################################################
 

diff --git a/daklib/queue.py b/daklib/queue.py
index 237fcc73725ebba5b383c4b1483547cd162dd143..7a49242284026ec39f12e5fe3d13928d46094819 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -805,7 +805,7 @@ class Upload(object):
                     entry["new"] = 1
                 else:
                     dsc_file_exists = False
-                    for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates", "Lenny-Volatile-Proposed-Updates"]:
+                    for myq in ["Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates"]:
                         if cnf.has_key("Dir::Queue::%s" % (myq)):
                             if os.path.exists(os.path.join(cnf["Dir::Queue::" + myq], dsc_filename)):
                                 dsc_file_exists = True

diff --git a/scripts/debian/import_dataset.sh b/scripts/debian/import_dataset.sh
index 1c0a3186b40e8376a5666a75bd0b4c3f4efc7745..183baddd92cd5e2834add8f700efe34ac4efff49 100755 (executable)
--- a/scripts/debian/import_dataset.sh
+++ b/scripts/debian/import_dataset.sh
@@ -38,9 +38,9 @@ case "${IMPORTSUITE}" in
         INPUTFILE="/srv/release.debian.org/britney/Heidi/set/current"
         DO_CHANGELOG="true"
         ;;
-    squeeze-volatile)
+    squeeze-updates)
         # What file we look at.
-        INPUTFILE="/srv/release.debian.org/volatile/set/squeeze-volatile"
+        INPUTFILE="/srv/release.debian.org/sets/squeeze-updates/current"
         DO_CHANGELOG="false"
         ;;
     *)