catch-up commit

diff --git a/bin/ssh-wrapper b/bin/ssh-wrapper
index a340934beabb025635d86b060865e8f82856475e..2ac904fe32da74157de0eccee6dcc5a4af9e43fb 100755 (executable)
--- a/bin/ssh-wrapper
+++ b/bin/ssh-wrapper
@@ -11,8 +11,11 @@ if [ "$bn" != "wanna-build" ]; then
        exit 1
 fi
 
+logger -i -p user.debug -t ssh-wrapper -- $@
+
 shift
 
 [ -f "$bin" -a -x "$bin" ] || exit 1
 
 exec $bin $@
+

diff --git a/etc/cron/crontab b/etc/cron/crontab
index 6a1e3722820d091f4a7333d32b529346d9ad3210..22472776640c02249c1ad5330d4a3ba091f4e0dd 100644 (file)
--- a/etc/cron/crontab
+++ b/etc/cron/crontab
@@ -1,5 +1,5 @@
 # Never change wbadm's crontab with `crontab -e`. Instead, edit
-# ~wbadm/etc/cron/crontab, and run `make` in that directory (or
+# /org/wanna-build/etc/cron/crontab, and run `make` in that directory (or
 # install that file by hand). Also, please `git commit` any
 # non-temporary changes you make.
 
@@ -9,4 +9,13 @@
 MAILTO=cron-errors@buildd.debian.org
 43 * * * *       /org/buildd.debian.org/bin/wb-export
 
+MAILTO=adeodato@buildd.debian.org
+# TODO: locking
+30 3,9,15,21 * * *     /home/adeodato/bin/wannab-import -q ftp
+7/30 * * * *           /home/adeodato/bin/wannab-import -q status; /home/adeodato/code/tools/scripts/tt -q genweb
+MAILTO=cron-errors@buildd.debian.org
+
 3  0 * * *       make -sC /org/wanna-build/etc/cron check
+
+4  0 * * *       /org/buildd.debian.org/mbox/fix-up-permissions
+

diff --git a/libtrigger.sh b/libtrigger.sh
index 8494811a4944786268634d51954a4e42b9856cc5..9428bd1ddaae198033f5263266eda973f5d2b5a4 100644 (file)
--- a/libtrigger.sh
+++ b/libtrigger.sh
@@ -1,8 +1,8 @@
-ARCHS_oldstable="arm sparc alpha powerpc i386 mips mipsel ia64 hppa s390"
-ARCHS_stable="$ARCHS_oldstable armel"
-ARCHS_testing="armel sparc alpha powerpc i386 mips mipsel ia64 hppa s390"
-ARCHS_unstable="$ARCHS_testing"
-CURLOPT="-q -s -S -R -f -Y 10 -y 120 -K /home/pkern/wanna-build/trigger.curlrc"
+ARCHS_oldstable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
+ARCHS_stable="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
+ARCHS_testing="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
+ARCHS_unstable="$ARCHS_testing kfreebsd-amd64 kfreebsd-i386"
+CURLOPT="-q -s -S -R -f -Y 10 -y 120 -K /srv/wanna-build/trigger.curlrc"
 
 curl_index () {
     local url tmpname destname appendname curlopt

diff --git a/postrelease b/postrelease
index 1afda22e1932d244f064d391158b2b170d30c059..da81f809e5f7c8bdae967fea91136f158933e9b0 100644 (file)
--- a/postrelease
+++ b/postrelease
@@ -3,26 +3,27 @@
 
 set -e
 
-# lenny
-ARCHS_stable="arm sparc alpha powerpc i386 amd64 mips mipsel ia64 hppa s390"
-ARCHS_testing="arm sparc alpha powerpc i386 amd64 mips mipsel ia64 hppa s390 armel"
+# lenny -> squeeze move
+ARCHS_old_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
+ARCHS_new_stable="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
+ARCHS_new_testing="alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
 
 #for a in $ALL_ARCHS; do
 #   rm $a/build-db-oldstable
 #   rm $a/build-db-oldstable-security
 #done
 
-for a in $ARCHS_stable; do
+for a in $ARCHS_old_stable; do
     mv $a/build-db-stable $a/build-db-oldstable
     mv $a/build-db-stable-security $a/build-db-oldstable-security
 done
 
-for a in $ARCHS_testing; do
+for a in $ARCHS_new_stable; do
     mv $a/build-db-testing $a/build-db-stable
     mv $a/build-db-testing-security $a/build-db-stable-security
 done
 
-for a in $ARCHS_testing; do
+for a in $ARCHS_new_testing; do
     group=wb-$a
     chmod 400 $a/build-db-stable
     cp -a $a/build-db-stable $a/build-db-testing

diff --git a/ssh-keys/buildd_arm b/ssh-keys/buildd_arm
index f50f904ef058b1814f01641ba87a2d7d8e682f8f..efe46eaff0c4d9f5c29a24a7d3b790110e7f4feb 100644 (file)
--- a/ssh-keys/buildd_arm
+++ b/ssh-keys/buildd_arm
@@ -1,13 +1,15 @@
 # arm
 from="::ffff:82.71.203.197,82.71.203.197",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAyM/keZV6OZbBwe5i+RDZfYgOTt9MWCBo7XglqC5mSOxCbokKzqkrjivF84Ls+RxikPPAVoT89FDTUbq2NiH4+ixGq4rTIfsWFIIDSU3yD6b2Ph+B96LBQKSMekJESFeRwKVP/q7C8ZuYbCLA5bEAPDDPQ29dkUqrSNNLITHEPKc= buildd@smackdown
-from="::ffff:78.32.9.218,78.32.9.218",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArvxNR6a9fkpvhY54W9Bz8UX14R6731CwJ/vIDGyhnpT/Y9kaQ24o6GclMKgA+VWcKAAy5DdgZudbTUbBkqsZ1cy0yWb8XaJBmuJuX4I0ofAREdMW7HQ1gqJzOSubYQJpgdXJza5aC8VDBtyzNwk9q9VpsWuhM7spQvRHGMRdq4iOea0d8ev5tlwTmNvNZmueM1WYzC2JVR0PJ7qLhPS6IVlaNVDHkXhAt7Hr2pewccx5OytGuxN9csIqxqe2/UrFUI3wv+aHFdhCdumXqMcvDXigsxPUnVD2YH+MayDNpKhdGW1yt6oTolfBL9bVb6eKA05zXEg3ouWXhAQ09HuQYQ== buildd@jaffaholic
 from="86.3.74.169",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAraCI2Uy76mUOmZB+5SATAFnV53tqyF2apupjBXyqvNgcA1JFAlLzCEeraXFpUuovkevhQcjGIUiPz+0X3MSB5J5cDag23zTWNfcC/YPiMWZ+xb5X83ccX6wgxF57eTTQPRnjgrrmTX269mzzJojYB0YdNj5ZLq+wFnuuEsYqJ+kJuydAufPf5NSrCIVpA80IASBQrq2y1xFJjR7+aGbtRjquJDoQLJRvw1XGpLmNSTFeVfUAN9AT6yj2Cp+NbeeFMVs23NuXH7AtjNpfNJck2Oa+h4bM9TXXoGhjGzz962xn71GaF5/kxv7WUDvv2kxr439tq0eME897eO91Jv387w== buildd@cats
 from="::ffff:62.116.5.75,62.116.5.75",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuMxRFfo954ZwkTScdp1O+iA1NfKIfjXAaWWTwSpZUB89cP9qVOEfYLvm1JNNwZOxQY5hIiZQJ05749x9pzbDqi5Z/tBJhODkPOpxzZ1eQJpEWt6ErBIwqjzln2TLWH6KL1k3h3bWGZ1Q7wfTPcEIQly52zSNy3YExW2wVa9p632ZL8AouvAutVOI9K+EqGVbvWY4xpW3IRoi4ifCIdXCFHUP8c5kPcdENvbdg2JpCRuMMfE2v7ns9csKmsH8ym+jPSmU+3QIA6JTviTPxRIgwnfxlf8HSaJ/9oc2HAMqZvFlM3wKK8MUqqyVAsxRL0FbKKja7tYkhmqAf7ZoTf05UQ== buildd@grieg
+from="::ffff:78.32.9.218,78.32.9.218",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArvxNR6a9fkpvhY54W9Bz8UX14R6731CwJ/vIDGyhnpT/Y9kaQ24o6GclMKgA+VWcKAAy5DdgZudbTUbBkqsZ1cy0yWb8XaJBmuJuX4I0ofAREdMW7HQ1gqJzOSubYQJpgdXJza5aC8VDBtyzNwk9q9VpsWuhM7spQvRHGMRdq4iOea0d8ev5tlwTmNvNZmueM1WYzC2JVR0PJ7qLhPS6IVlaNVDHkXhAt7Hr2pewccx5OytGuxN9csIqxqe2/UrFUI3wv+aHFdhCdumXqMcvDXigsxPUnVD2YH+MayDNpKhdGW1yt6oTolfBL9bVb6eKA05zXEg3ouWXhAQ09HuQYQ== buildd@toffee
 # armel
 from="::ffff:82.195.75.87,82.195.75.87",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwroffEAOUmkpGGbhhydE1g/HqDMKdAI44eQLyCF1a95n7rs9Heh4ULvwVgACdIjMQ4LVHL6qVLlcLivWJdj892et2blRsCKsJUk2auwWY6HFYwQ28Rq+wpQxvBm+dCJC0HJJQx3tuF4Havv4pRW2tUyYEqutLybWEuPUh/SiEbErSDY7mY6RlvCcA8N/PwOvMo7nv0FrQRB8JZw6xtWjpMdxv3t1vF7QD9n0h582pqbFz/VMy0kjCFW9IR4U3PkapdohBeZBe5nP9U58srcZkIa9CDcSTAk3Wj/sT2mocdEXxCAcWkLpw/Y/0BX3AW6TsiNSTyAFyGJ7ntfxkt/cHw== buildd@arcadelt
-from="::ffff:195.49.152.174,195.49.152.174",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2n0BIpLNAATBbW2hUXM3pMYnbu2UTZQgEDrZDuoIOQliAAFB/h3ObXcDyqWbXf3GIfHxBSTA39sh5/utIjjO6zaX9KQwZAolKuwh9ijk9qGjklyG+OEkEyBJngmeHC8ukrmVZESxbyXYhfxjjmpk/7SOEV/pwbGy+pbKr14wJDJqAeh6nxarH8yC6FMHQYfqHS34oN67aHXR0eGF9my4vpa4NVGSQwV1gKoNWZ8Q0xmcFSXZ5g5GYUmOw/Nn5EM1UwbcNtAKqmamy7Hv8uRyQazogGPQ8RU/6xYgK0/fMjHvw7knUc0bZNA1M0a27fnCE2dGp9QL/GVdfPQD0kAh1Q== buildd@argento
+from="::ffff:93.94.130.160,93.94.130.160",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2n0BIpLNAATBbW2hUXM3pMYnbu2UTZQgEDrZDuoIOQliAAFB/h3ObXcDyqWbXf3GIfHxBSTA39sh5/utIjjO6zaX9KQwZAolKuwh9ijk9qGjklyG+OEkEyBJngmeHC8ukrmVZESxbyXYhfxjjmpk/7SOEV/pwbGy+pbKr14wJDJqAeh6nxarH8yC6FMHQYfqHS34oN67aHXR0eGF9my4vpa4NVGSQwV1gKoNWZ8Q0xmcFSXZ5g5GYUmOw/Nn5EM1UwbcNtAKqmamy7Hv8uRyQazogGPQ8RU/6xYgK0/fMjHvw7knUc0bZNA1M0a27fnCE2dGp9QL/GVdfPQD0kAh1Q== buildd@argento
 from="::ffff:157.193.39.233,157.193.39.233",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA2vWWlEahAxnW2J9licbr1acOlD8oD3hG0PvxR4+fc3Nb0T33Zx1SYX9B4ppoV0TjRGDUZlAhjNyxKT6fU3L41+V0lb3/dkxAq4KoQ/fyYM+2m4AdY8pmVkmIrKFJGcJUNxBtbksUBuKcoIBHoqEiLp6Y/ibfq9L5fzVPSh4FyBn9nzn+E8CaYLukgFUS/xAUb0y3R5RMOU1lv5cMBenXqiaEKgrkPzpte1NQUe6/FKbAxmb6LiKhIiypLn8VyXFUOg2kfzSBqaPKb+tT5/HzzqQimE7FhIO9+YDovi4GNjfkZh3Xzo/flcFwNGKgB2OP+p+RizLY/LlOtfPyNMo0wQ== buildd@allegri
+from="::ffff:157.193.39.13,157.193.39.13",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAygc0/+3cFf7yHQg2iOI8sOrYrAKUSrOKbqTRZzIrz9yoXk1qyH9gOPEPV2g9bnxdUhI/RoCf8Zz/dqJGbUnGbedxUd3QHiLG+lvC6J0f6SGLbO7QxjEZnAc0OGWV21QBYtr8HkU93V8MRsout8lGL1abGF4U/B9CiF2h6vj3PJG9GRCIMgDwhEIDHi+2ioYXIdxleJKwK879et07QTUGkJG3xTTVPHpR8v9D24s3Xb1yqo052toZVgHQevGynJPWClJGq7ykbExdunhWfl2iNTilmfuZzLRw88PS1sqYSg3Fbgy4+y1trxWjLMht74p7pDqHMn1gysti+9sP3bvWTw== buildd@ancina
 # armel (dyn)
 command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA3W+zlc85/J6v9QVelhevO8rZLtdMXjFoM6n8460C7psdsn9CMEd81kWFchCjSqsnpXLeQ3tu5n6HvyDtHF7FP22kmGY9YKPnh13OAomIP53RNyBJxhmwksruxspedrVk4N+vk3sokY0UuFOLzkPjE3QICsH+KxXC0TGeWxLL3P1IL0Gx+GbX70eb4807F4/vS4lGhlcK7R3/m27izIi4Sa6uDQPz7GPVYOsGKQA82n2vwl/7XF2o2b1fFRhUUWzcC4nM8gFbiN7J0a6qfmYRgFktPNJk5vqo13Z7/NC4kShjA4zw/F2ruFGxYBa0iG4UUV342Iwhmy4K3LjwLbtq2Q== buildd@muscat
 command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA347Yls7VDd9ISTO0ZjD4PxVl5IDr17nEJrMdffboTZgWB6VVuBySPl0qvSZlwPLZBViaxn+3VUc/smmOLBcdpcLDd/Zi7tBPMVMCKrDjhlY7qVwVPEYiGQXlP6h7IRkYvJprCus2XtDsgVeiKarYQcrTManaJGvKqE2prl4Ep/814FAmqc2fOEhbXE5cTgQgH4yQFNw/aG9puCQphWnSt51sRiumi5+Ur/iI6kv6M0at3FPTUvz15X8epswuPrbJb5eMoDt4N2kCb1CtGjlW3s8gSapTRMTkBfPUG8JQufxKW/5LRYhBEXbF4iWFRDenOXDFSv6UnnejanHwnyb1PQ== buildd@ALL6500
 command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvAwdXbvqaYHE9XaJDH1x0cq6ARxuJXyp8swKp4xh1sihkt61NqocyGkktyK7tai0OKg4qmg3/B/VaGvQ3llRDKtzVtzz0o/ZRpH/viizjTuxNfLVCMgrksPxfu6QytaEV4e1kdWA7D8acGu4h3XTBDdEHy8vHyxa7z3b/FPZktpjKp2xvBy95nB+MvxsexljKPaJ3nFlbzd1NiNObFuMZmCJGutlYiITq/DwmD8OzRclCOnsklowJjAckniqZKjUMuF5ZsmOwSmr/fX2grtHXPNXLeyWlDQqU0tSePtu6KJKN7z7r4+jHlLz0cxC0S8bVL64EorEr286iCrGOioPFQ== buildd@all6500-2
+

diff --git a/ssh-keys/buildd_hppa b/ssh-keys/buildd_hppa
index d23727f976da8246ba2e9f5fbb5924f16cdfcf8f..40ed703b928e3a8cce4df452b591a1c188a0aa21 100644 (file)
--- a/ssh-keys/buildd_hppa
+++ b/ssh-keys/buildd_hppa
@@ -1,2 +1,4 @@
+from="::ffff:192.25.206.11,192.25.206.11",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAsIHvspYX3tyXjURWo51ZwrLAEt+10z4TI4UazSCvmpY5lpue1FtOWAJSPKyPXQJN3aCl/2OtfUYUIG5+uEPO3wriUB/ajiL2dT/pf2QFzPTq8RyyVfKhidRoVYaPq/SXne0LA9/zkXwWFIcDBXcfRUMreObTadtpjmxaqoVs/vfe/TF7FVDrOgfo8oTyOO5ykmz3JVhIRgqNHxE1DofdqtN6jjBhMEK9LU43jMlAGjCK+t+gWrN86MuSVWePt8QiHCKCDE0XiA+FJw0DFXYvY9bsYlVktZS1LM55cKilDKEuBELxY+el5GgShlqR64V9oKNfhNsWWk/VeSPU2xddnw== buildd@paer
 from="::ffff:192.25.206.15,192.25.206.15",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA0k/bqIUDKIpwMcnk4lkFmLoaChBjUNx0L18PFpvp77scdB18tf7lpNjq0p9WT5tH/hC6GzSlaS8NciuxEvm2jr9nlhLaVShAxWy3RO/WpSxFEJu2M6PWEAURz/OUA5ylLVAZM6cDS3ddDdu0zMMTTAU5A2V6yB2/Pih7nxxWyJJkpMjpSN+c2DKUP3d0cuVSPbcVVfa27wFy8TD1wvHTlJ9WXjFRC3Q1Qoer68tDSooaz0eaYjHHkK5Dh/r1IrlZ7GESwjE30sQSdXqN9Qoet5lrjI3QrbOIZnD3ypgALKNLpK3lrYDL9MH8yaMlTKDQn3jeFjD1iigL7bFuU3bRvQ== buildd@peri
 from="::ffff:192.25.206.68,192.25.206.68",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAylzBBBSGsSIfnid5nlKUK99/O8AC1wbkm3b9Vt+keupUszv19uNqRHnN1Cl09KD5DyB+XRVuBQGysBOsvnHwafLVDK2RV5Fxnogr5fnNvjgXveMkNqFo0CEyQ6zlMrKXfqfV9DqegrqgbDeNAMPHjZ7kMJP6OptSC80OP83wrf2a3szY4XEBvsT2b3kLY9zJiWyhuX6Vuw5EKUtVrqryJTKDtkINGILQkQ8OmW7JFg0lCpTWH86ja7iGk6E51nGhE4W3qgZkKXWXv/6MLF2ZgQ8a/8mIIJ3TRTCtNHGGvefF9rNrXuQzqy5YinGU0ON1eMJ9jw+IbdMf3rsIzf2usQ== buildd@penalosa
+from="::ffff:147.215.7.160,147.215.7.160",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAvIfMy1qqwNwtkt7w85xvGwKiZgD1EyKhHVuXywzLMyKqoxOn7bZaebmFT8f1zH1hksvcUBNDUm3tYyPgoR94Op8d9xkQb/r1ylU922jUeuOVycx0Nx6NQ5CLZ2c8qqoj+3tf8lA5yLRxhrdi/cjP/p2Waau0iYox8ndd9zNL7UgYnNdwIhWZHnClGAOZq8vofROQ3XZ8fjFw3FJY5z+zOmXeTGnlFlxfxAATn78tdBkdIoEjGEDNPI1BQBxa4TLmZV3cFH9mnKmlGB9rvf1af9xpVIg6oAMxBzBw455R6pnMajf0x/6DcCWKUFMfk5/mfkdMB0u55pWZ5PvMnNiY+w== buildd@lafayette 

diff --git a/ssh-keys/buildd_i386 b/ssh-keys/buildd_i386
index c1968b525ccc1c9ff8aacc715d5270b05ccfeb20..618a3e854ea72821dfe24027777aefc8931bb910 100644 (file)
--- a/ssh-keys/buildd_i386
+++ b/ssh-keys/buildd_i386
@@ -1,7 +1,8 @@
 # i386
-from="::ffff:24.84.192.180,24.84.192.180",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA3Fm82LFu5897FH8/A4DP+aWeVdQfKaTMUon5CeK734yVFIpUgflX9X9PC+QPdR6qac7EC7BVr9vmjD63JiMFrm7z55YJsUCauE73QrDsuoOixRFKiCOSLSn4EN5+oqu20WiMZiKkU7nl6djbJ7gzVKtO4cXkJ5XvIR6bKt79bes= buildd@cyberhq
 from="87.106.4.56",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA1RJRWEnU2cqZd25ejj+KT5ARXJdlRTaGgY4+KZ3A6j+UDJPnFipSujW4AcDqKlDnYD2M1pOjmFrUjuhkcndqJbZOjmZjXCe4gbRw7kp9mFDZ6N8WkFget+Auk/+g/bTfpqfQBYvkB7egjV4ZXrL5ndy8E5hqL3+9hfyBvmjatr4xFTSDuo07fvXcaYn/wuANu18u04lU1YrSSwJU6cJYG2gMcQ9QVSK2p4PInNTlmby88wZIOsf8Ztm7epai+skj31l9ghdBQIdewKAnGavwmp45QBdmoW9QWaV/0tV2AGQvHQG8uPWOJsxkqDmAhtpxNHnaN4SrYHGzg2/SsHQWNQ== buildd@puccini
+from="70.103.162.31",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwaSoB/NndkkPM1kHOusJU/NKu4gH8XhNwSqktuAKaSifVVuR5tucANtZOfREDvMZPmL8DJ7Wp5sSpkU4qpYHOif9I3Uqr9gAuneu1iv8Iqu8ai/6fWK/pIFFB4jzFnWWizeJZPkXWGg5YPfWjL9wSFK2Z+qRE/LlS1Y61kKOtFbGefjlpCXuT2eQUw6TCnWguOk2MZWTvPHfQ/qXCPMnO92EX2hHEQKLvz56LodSRupfXVfEITKgNBluZGglAO7KdKQSZryuS/TeV0WrDT7MyZEcMnQa6jxTJWgKHxVqMn+f4SlZxbrdNkUnvTm8gfuy5HWBe75jISWDYigQw2KVAQ== buildd@murphy
 
 # amd64
+from="137.82.84.74",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtuG8xarxaw+1WdvBG/mYFog8+Njffe3jKWPEiQMJn30GQhvZoUTAD0FcnWrgo+KooQrD3bMsINKJlxNnWZNJjwQLAmIivGHDA3qBHRgnwKXtT5OjZTLInig9hewoJv0yCignRai3A1WU4Ds9kMowxAET7jzpfO690kfZmQ9MbquQiOV9NNou0+ijgfLhS+H6AMRR54sgHqlqCMCrsBIglvDHB9Y+3Xbp8TfEpqRd5XiKrFxX1y1049nIK610FsTLynCtg2j1WdZvEXcIvueU++h+dglJdH2j0psaPLX8jTznt26YERK67DB8dj+dHTq3UP4YRtn8P3wW/8arr9gp7w== buildd@brahms
 from="::ffff:77.243.184.66,77.243.184.66",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA4Ti4R6mILSIiR6SBoyxY3r+f4cstoKgcVkjEE20Y/S77Y97lItFSjkqVDoFtjTGCLcza7aKCVahGWzf8gZKYZ+SnzFA86fN9XLJJnVMBKd46mJiUtHyOoEgqQUx77rKg0Y5fwEClQUFV+BiaIjMSUPx+V+qDcQZ1iapZoe9V39ClLvuZ1rUAIuM1OYWstcRzK/0ubNEhtwYfSGTeZGpk4Jj7G/yDaxRst7oZKVt1TR5bWUXUPZJz54tg6QOiQwvL+jyaKR1CiL3SIB+pp7zd5TokFR78Ei4krMLtp2M1vKmWL/zvsnsk6cfM48zIADtvtpryZvuWXc3qA/lqiWT5dw== buildd@excelsior
 from="::ffff:194.0.163.247,194.0.163.247",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA9vips7l/IdrCpfiGIX9LrFIQjYn/oWfiaWoJ4z7hxHV6kVQ1tiuQSqnJcj/pE3jGLicgtfafZEBRP9qPGemcVKKP0grIV0l09Ua8qXbVpj847GaYBYOpmhbodz1Dhcxa/G4msjrfsZJe9zt5LmmTpCmAOTh6SeINHUmpmfvdO8IsKyfbUYdtLWpCOCvVS/MFP8nkcj4hdzebryKIVgTAQvEVdRQy3WDi1eA6PS1gqGOIpere1GSs2pKECfp9jVjn0lvFJCfVIDG6ytNtbUZSf472V7tLT/D5uXHsV8vw5FiAAPxuK70QpAJtl+mCa4FrH+mXUfbE7OocEdikzQocHJ2jv2ySWyuVd27/7p70cRyKj7yd/YrFhmLGQJ/O3g9sMfdVuEzqhgvDTUnBTnyQj2TL/oSrHr+oKAyQP4e+W3jSMhcMppBF8LArCL4sm66hSERLG5lwFaQNgXqb7qF2AqD+RHVAUpOapfcNjwhaWF+dYrVYoGkjmYfQ83eLMrDwGgA6rYFiyslS/zfB61I5NVo5AXL5CFuW0TJdjoighc2AZtQGsjFKZAv6/UkD3Fp9MdVXSHS2zy25k41TeHQYZs8aUoPiliBEfiPPPl1blkEEfLHTyx+/YinnoKKJMCY7rZOh9L1YaiPNX7BoLkUJKsNkwyG9PvhaQjW9z6/pYcM= buildd@nautilus

diff --git a/ssh-keys/buildd_powerpc b/ssh-keys/buildd_powerpc
index 7f08a4403685117e88959d478cbd723125aa5671..8af93924ad07e15304a0bcfe47e15e5c100984a1 100644 (file)
--- a/ssh-keys/buildd_powerpc
+++ b/ssh-keys/buildd_powerpc
@@ -1,2 +1,3 @@
 from="::ffff:72.66.115.54,72.66.115.54",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAuOY514PT+X3VT/zd+tO9YkpYdOLDgFC/vO1jAEFfMQWeOu55L5ynkkKe81lk9ARU2AmuiaHfyX9jhQ+Z3ivUAUxa7pILAB3D3cQxGMygAnQIQoEvUEOvm5FYtWrkOEwyECZ0X1hA6h1qBfLgA3ajYqmO0ErgTgyYYJTFBi5pX/OvZ+mEH0pCKjWmrTqeHQ3BoV8Dr4ivtNRzK6u+z4gas9BrlHVlhe34vqXSJimIzg9nrsI5BLhw4+Ca+NlxtCvGl3UeZ5ob7Z3dLA6vO116xT4ETIHKkCxg4dAPluR6VnJ7P9gVX81s5DSX6punTxDLuaPrZQmV7d1cmfxiKORZKQ== buildd@voltaire
 from="::ffff:140.211.166.27,140.211.166.27",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA9meQiK60jqQ3jEkqqo6rHHQiYwWiLKiE6Ax/Z0rDtTf4+oMDDHkioRK10Huttuyi2Vuyl26sOY+UWX6Sg/osRAyL7uUE4UX9IctoyA3FIPygXWbA5zPCWvPaZ64LBKteydOTTLTMsKl+eILFN7KTEHM41Deqy7Ql9b9A1mS6yvk= buildd@malo
+from="::ffff:130.239.18.121,130.239.18.121",command="/org/wanna-build/bin/ssh-wrapper",no-pty,no-port-forwarding,no-X11-forwarding,no-agent-forwarding ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAtEbqXIqVlKzUKPMmuIPlWkjlWvnHLWA7wMdigwMcP/kNzBJ9J1SIOCa0QJHo8VRgFrF1G7AN4XAbLuf7UDYsrjx9WDupHan+oOveQRX4TLK1Wn9vq42aaSFL5mfC8ZT0jdUnhb2fAfp8LMmwbqTjjxiTlKBHe5XB7v6IEXRcDv/sajMhde0zGITC7u5yqgUWODQY4r9BbqC1H/JMimWCgvXgMO8cuVl4x9iK3qVCbpUpV0l/I8DbQ/skg2PB+KAbRryjfb8UwG5TiCon5IpRu62b+hpncfkNo3Ou7KjNCNGvx7+0tKr9ECsbkpYwdxoGEXcFFnQlVdzDQ3aFFjw33w== buildd@praetorius

diff --git a/trigger.daily b/trigger.daily
index db967a86261b7998b30a6b4105a44297425256ef..20b88ef2c7d0d83ebb60d37be754e82c6ada13fe 100755 (executable)
--- a/trigger.daily
+++ b/trigger.daily
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Updates wanna-build databases after the archive maintenance
 # finishes
@@ -10,8 +10,9 @@
 LANG=C
 PATH="/bin:/usr/bin"
 #testing must be before unstable so late upld don't build for testing needlessly
-#DISTS="oldstable-security stable-security testing-security oldstable stable testing unstable"
-DISTS="stable-security testing-security stable testing unstable"
+DISTS="oldstable-security stable-security testing-security oldstable stable testing unstable"
+# While oldstable is purged
+#DISTS="stable-security testing-security stable testing unstable"
 STATS_DISTS="unstable testing stable"
 SECTIONS="main contrib non-free"
 TMPDIR="/org/wanna-build/tmp"
@@ -41,7 +42,7 @@ echo Updating wanna-build databases...
 umask 027
 
 if [ "$DAY" = "0" ]; then
-       savelog -c 26 -p /srv/wanna-build/db/merge.log
+       savelog -c 64 -p /srv/wanna-build/db/merge.log
 fi
 
 exec 3<&1 >> /srv/wanna-build/db/merge.log 2>&1
@@ -203,7 +204,7 @@ for a in $ALL_ARCHES ; do
                mv quinn-$d.$a quinn-$d.$a-old
        done
        if [ "$DAY" = "0" ]; then
-               savelog -p -c 26 /srv/wanna-build/db/$a/transactions.log
+               savelog -p -c 128 /srv/wanna-build/db/$a/transactions.log
        fi
        wanna-build --remove-maintenance-lock --database=$a/build-db
 done

diff --git a/trigger.often b/trigger.often
index eff43724fcab70f0982096ae30728a1426dd5929..31a1bd335e18c2e60441e50cd44bfe20521ecfc1 100755 (executable)
--- a/trigger.often
+++ b/trigger.often
@@ -7,7 +7,6 @@
 #     Sources-* == upstream fetched file
 #     Sources.* == uncompressed, concat'd version
 #
-# RM: disabled for etch release
 
 LANG=C
 PATH="/bin:/usr/bin"
@@ -59,9 +58,9 @@ done
 umask 007
 for a in $ARCHS_unstable ; do
        if [ "$a" = "$NEWARCH" ]; then
-               quinn-diff -i -A $a -a /org/buildd.debian.org/web/quinn-diff/sid/Packages-arch-specific -s Sources.unstable.$NEWARCH -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
+               quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/sid/Packages-arch-specific -s Sources.unstable.$NEWARCH -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
        else
-               quinn-diff -i -A $a -a /org/buildd.debian.org/web/quinn-diff/sid/Packages-arch-specific -s Sources.unstable -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
+               quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/sid/Packages-arch-specific -s Sources.unstable -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
        fi
        perl -pi -e 's#^(non-free)/.*$##msg' quinn-unstable.$a
        if [ "$a" = "$NEWARCH" ]; then

diff --git a/trigger.security b/trigger.security
index b985f9b7393fd9e90d60ed0289001c2b3a5afb6b..50cdacaa6db7a21a7fff9b7bad85fc9ccad0b7aa 100755 (executable)
--- a/trigger.security
+++ b/trigger.security
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 #
 # This is the equivalent of trigger.often for security.
 #
@@ -27,6 +27,7 @@ MERGELOG="$BASEDIR/db/merge.log"
 
 if [ -z "$BASE_DIST" ]; then
     echo "E: no base suite specified."
+    exit 1
 fi
 
 if lockfile -! -l 3600 "$LOCKFILE"; then
@@ -64,11 +65,15 @@ curl_index "$SECMASTERBUILDD/${BASE_DIST}/Packages.gz" "Packages-$d.accepted.gz"
 
 for a in $ARCHS; do
     echo "processing $d/$a..."
-    quinn-diff -i -A $a -a "/srv/buildd.debian.org/web/quinn-diff/${BASE_DIST}/Packages-arch-specific" -s "Sources.$d.accepted" -p "Packages.$d.accepted" >> "quinn-$d.$a.accepted" 2>/dev/null
+    quinn-diff -i -A $a -a "/srv/buildd.debian.org/web/quinn-diff/${BASE_DIST}/Packages-arch-specific" -s "Sources.$d.accepted" -p "Packages.$d.accepted" > "quinn-$d.$a.accepted" 2>/dev/null
     wanna-build -d $d -b $a/build-db --merge-partial-quinn < "quinn-$d.$a.accepted"
     wanna-build -d $d -b $a/build-db -A $a --merge-packages < "Packages.$d.accepted"
+    mv "quinn-$d.$a.accepted" "quinn-$d.$a.accepted-old"
 done
 
+mv "Sources.$d.accepted" "Sources.$d.accepted-old"
+mv "Packages.$d.accepted" "Packages.$d.accepted-old"
+
 echo "security merge for ${BASE_DIST} ended: `date`"
 exit 0