From 5b999b7f38f35f6dcd88090bf2b92c57a1d81e57 Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat, 22 Jun 2019 17:39:46 +0200
Subject: [PATCH 1/1] More cleanup following the apt.buildd.debian.org removal

---
 modules/buildd/files/buildd.debian.org.gpg | Bin 1168 -> 0 bytes
 modules/debian_org/files/apt.preferences   |  16 ----------------
 modules/samhain/templates/samhainrc.erb    |   4 ----
 3 files changed, 20 deletions(-)
 delete mode 100644 modules/buildd/files/buildd.debian.org.gpg

diff --git a/modules/buildd/files/buildd.debian.org.gpg b/modules/buildd/files/buildd.debian.org.gpg
deleted file mode 100644
index 5db6d19eb9b5463e663586b042141bc9ecfda953..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1168
zcmV;B1aJG90u2OOsy|Kv5CFQ+j|<s^7QfGG8^OZ0PD9FfnvzX*nsOC)U?|;Bd2=7e
zh=<-BWpId%>#`#@93Q_36aN&m&&S1&G=S%>St$A!(k=@?Thl1YJV7dGDrqglaGZ2J
zo3LBcFkU1qMFvIIo1*G-WM{ujLW&TF<oYsyh2Ydyr(i<^c26~!ywm5e%;k*alL~Cu
z)Z1k53qc-gMJJNAwcn!8auqD%DTIZ^=w`AkO%5A;4<i?T*}}r#tsV8!A=kw1m4N65
zL27+f9gd-O$F#-cCR^LeR?09mMXiePJEhWGE#7r>8I#r34c$!$<={m--hXCdOXa^3
z9v6=fgRfp!F@^fL{mP&4tpo2G1M`gVw(yqCYtg|FBh*<qw=sfmnP!<<>3L0!nh_Le
zpMWZq`}DR*7u@Inz0h$t2>nU|yEbSZ{MMW*q>OWGFhcUN*|$<wX$NsSG5mVvohb5j
zBup~5xh@T&Qr_1Flam^<1Bw5dF6z53W>X*_?Fik5odZrY?h1xC)8W$;y3uyHsyo)m
zdzABaOT`F~R__aV9(?#5K-Ruj=!Y;7#@W4+GFoX@+Co&^OrcK)>nB<@&(VnVN!pgx
znq3z$DVH1YVvz?wxhNRc0k{5GMus?N->d)PVav|9WNwo$=jU@3P~=7!6QXB92BBb^
z*R(mQ=Jhsly>$Q)0RRECCt`JJY-D6EWMyJ$VQwyOa%Ui6a${&|c4Z)IWqBYnFflkU
zGB7bYi2_sv69EbUJ{BPaO2rd=YfD&Yi_;a<WO&WT2_jk!1p->CKTZN00|f~K!e;;l
z3ke7Z0|gZd2?z@X76JnS00JHX0vCV)3JDNoc+JNNB3cf^dJq3ifIKBrzLX>(rjl~`
z`Ys#l5$A3cWZ4^|^U$>m8K@tV*`}yEt+KqDLiXtO;y7gSs}?|rg;r%t?+%Uv{7UNR
zoK4DQ7bJ8kgbQWw+fRP4qc?`lwb4Z!WXELd2=A;W8V1ylV#B_*6<c>1GfDeC>E}X~
zDA}4K)ghn+K<>Li+9~;?mi|0YvS(!+Qp@?n_!Zr_ld6b^dq*40RP<WKHp|s$)yXMR
z(HZ_uI^kDd%6NZ0ftI_`DHtxM-|0sqFZ2Vk`LE~E1!)!FzKh06Q3j=-zCBRQJ3=B9
zXWa*^;}N8OJC+rga(VP&l+d<*ix;-wVii?bOAm5cifd3|Y>u3;hvOq=l0k@Nv>M)a
z)8Ijcdmvxj9>FN~+=OBwQphw7ttjA^wB)ESPc#ie`0f7BTT=p`Xae`V!$Q?a%PZgm
z`CC}Kv-pTo@4>8~Ra=&koJ`{`i<mBJ)G*(UV|^e&ZuA%w5ldBiuA@C{ncIGAv~R<j
z{&#ngC7?J@D-*1no3$u#B4H$x0lvfJ)yCd<-54RduRoi|^00a71luq0*~AM{Y_gK0
z)s5?EuF*r29&M50vt}+>%mor*;C3X3JM&P`F*2<jR33$o<;hICys@QwbNAq#mnc{i
iqjpbn1*g<;Cyb<G@YS??E-<;`8;3y@C&i;t;dEt;!6fSd

diff --git a/modules/debian_org/files/apt.preferences b/modules/debian_org/files/apt.preferences
index 65d11720d..7fbe20773 100644
--- a/modules/debian_org/files/apt.preferences
+++ b/modules/debian_org/files/apt.preferences
@@ -5,19 +5,3 @@ Explanation:
 Package: *
 Pin: release o=Debian Backports
 Pin-Priority: 200
-
-Package: sbuild
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: buildd
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: libsbuild-perl
-Pin: release o=buildd.debian.org
-Pin-Priority: 500
-
-Package: *
-Pin: release o=buildd.debian.org
-Pin-Priority: -1
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 4957a2d0b..56bc38f7e 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -388,10 +388,6 @@ file=/etc/apache2/sites-available/www.debian.org
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
-file=/etc/apt/sources.list.d/buildd.list
-file=/etc/apt/sources.list.d/buildd.debian.org.list
-file=/etc/apt/sources.list.d/buildd.debian.org-proposed.list
-file=/etc/apt/sources.list.d/buildd.debian.org-experimental.list
 file=/etc/apt/sources.list.d/geoip.list
 file=/etc/apt/sources.list.d/backports.debian.org.list
 file=/etc/apt/sources.list.d/debian.org.list
-- 
2.20.1