Merge branch 'debian-master' of ssh://source.djpig.de/srv/source.djpig.de/git/package...

diff --git a/bin/build-maintainerdb b/bin/build-maintainerdb
index b64be0023413ef0decd1eb919dc20fa1459d6117..91f393243dafed9c01fdfc36e5098aa1f38baf84 100755 (executable)
--- a/bin/build-maintainerdb
+++ b/bin/build-maintainerdb
@@ -41,13 +41,16 @@ while (<C>) {
 }
 close (C);
 
-my $maildomain = "packages.debian.org";
+#my $maildomain = "packages.debian.org";
 my $ptsdomain = "packages.qa.debian.org";
 
 
-my $maintainerfile = "$topdir/../ftp.root/debian/indices/Maintainers";
+my $maintainerfile = "$topdir/../mirrors/ftp.debian.org/indices/Maintainers";
 my $maintainerdb = "$topdir/conf/maintainer";
 my $overridefile = "$topdir/conf/maintainerdb.override";
+my $rblfile = "$topdir/conf/rbllist";
+my $rhsblfile = "$topdir/mail/rhsbllist";
+my $calloutfile = "$topdir/mail/callout_users";
 my @postcall = ( "/usr/sbin/postmap", $maintainerdb );
 my $opt_verbose = 0;
 my $dbdir = "$topdir/files/db";
@@ -179,6 +182,10 @@ sub write_maintainer
 
     printf "Writing to %s.new\n", $file if ($opt_verbose > 0);
     open (CONF, ">$file.new") || die "Can't open $file.new, $!";
+    open (WRITE, "| cdbmake $file.cdb $file.cdb.tmp") || die "Can't talk to cdbmake, $!";
+    open (RBL, ">$rblfile.new") || die "Can't open $file.new, $!";
+    open (RHSBL, ">$rhsblfile.new") || die "Can't open $file.new, $!";
+    open (CALLOUT, ">$calloutfile.new") || die "Can't open $file.new, $!";
     my $forward;
     foreach my $package (sort(keys(%maint))) {
 # It is possible that we do not know a source package -> in that case fall back to old behaviour
@@ -189,15 +196,27 @@ sub write_maintainer
            $forward .= ", $binsrc{$package}_contact\@$ptsdomain";
        }
        printf "%s -> %s\n", $package, $forward if ($opt_verbose);
-       printf CONF "%s@%s\t%s\n", $package, $maildomain, $forward;
+       printf CONF "%s:\t%s\n", $package, $forward;
+       printf WRITE "+%d,%d:%s->%s\n", length($package), length($forward), $package, $forward;
+       printf RBL "%s : zen.spamhaus.org : cbl.abuseat.org\n", $package; 
+       printf RHSBL "%s : bogusmx.rfc-ignorant.org/\$sender_address_domain : dsn.rfc-ignorant.org/\$sender_address_domain\n", $package;
+       printf CALLOUT "%s\n", $package;
 #      printf "%s -> %s and pts: %s\n", $package, $maint{$package}, $binsrc{$package} if ($opt_verbose);
 #      printf CONF "%s@%s\t%s, %s_contact@%s\n", $package, $maildomain, $maint{$package}, $binsrc{$package}, $ptsdomain;
     }
+    print WRITE "\n";
     close (CONF);
-    printf "Renaming to %s\n", $file if ($opt_verbose > 0);
+    close (WRITE);
+    close (RBL);
+    close (RHSBL);
+    close (CALLOUT);
+    printf "Renaming the new files\n" if ($opt_verbose > 0);
     system "mv -f $file.new $file";
-    printf "Executing @postcall\n" if ($opt_verbose > 0);
-    system @postcall;
+    system "mv -f $rblfile.new $rblfile";
+    system "mv -f $rhsblfile.new $rhsblfile";
+    system "mv -f $calloutfile.new $calloutfile";
+#    printf "Executing @postcall\n" if ($opt_verbose > 0);
+#    system @postcall;
 }
 
 sub help

diff --git a/conf/.gitignore b/conf/.gitignore
index 135b043fae7829a51f8c95edaf405ac70b6d27f0..4ecbfe7260d8e461e17c81616dc4bf19b0e5a394 100644 (file)
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -1,4 +1,6 @@
 apache.conf
 ttreerc
 maintainer
+maintainer.cdb
 crontab
+rbllist

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 00b38ad6b4b6772a09357b8198771ab45a07cc1e..bb6c21fbe386515eda54f5559660a4a2200a1c49 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -65,15 +65,14 @@
   AddEncoding x-gzip .gz
 </Directory>
 
-<VirtualHost *>
+<VirtualHost *:80>
    ServerAdmin webmaster@debian.org
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
+   ServerAlias newpackages.debian.org
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
-   CBandUser pdo
-
    Alias /cgi-bin/ %TOPDIR%/cgi-bin/
   
    PerlModule ModPerl::Registry

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 198effd159b33e404824bcffe0a1b79a76a502d4..ffa4e10e4d99a02b0bf7dc9c6a7c5566ad075825 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -19,7 +19,7 @@ cachedir=${topdir}/cache
 # unset this if %SITE% moves somewhere where the packages files
 # cannot be obtained locally
 #
-localdir=/org/ftp.root/debian
+localdir=/srv/mirrors/ftp.debian.org
 
 # path to private ftp directory
 #ftproot=/org/ftp.root

diff --git a/mail/.gitignore b/mail/.gitignore
new file mode 100644 (file)
index 0000000..6600526
--- /dev/null
+++ b/mail/.gitignore
@@ -0,0 +1,3 @@
+callout_users
+grey_users
+rhsbllist