Skip to content

D
Dak

喜羊羊3508 / Dak
10 个月 前同步成功

通知 1
Star 0
Fork 0
D
Dak

体验新版 GitCode，发现更多精彩内容 >>

提交 a6496b97 编写于 作者: A Archive Administrator
浏览文件
操作

changes for etch release, katie -> dak user conversion, and some misc cleanups

上级 b1a0d766
隐藏空白更改
内联 并排
Showing with 72 addition and 74 deletion
config/debian-security/apt.conf
浏览文件 @ a6496b97
APT::FTPArchive::Contents off;
Dir
{
ArchiveDir "/org/security.debian.org/ftp/";
......@@ -7,8 +9,8 @@ Dir
Default
{
Packages::Compress ". gzip";
Sources::Compress "gzip";
Packages::Compress ". gzip bzip2";
Sources::Compress "gzip bzip2";
DeLinkLimit 0;
FileMode 0664;
}
......@@ -18,10 +20,10 @@ tree "dists/oldstable/updates"
FileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
SourceFileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
BinOverride "override.woody.$(SECTION)";
ExtraOverride "override.woody.extra.$(SECTION)";
SrcOverride "override.woody.$(SECTION).src";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
BinOverride "override.sarge.$(SECTION)";
ExtraOverride "override.sarge.extra.$(SECTION)";
SrcOverride "override.sarge.$(SECTION).src";
Contents " ";
};
......@@ -30,11 +32,13 @@ tree "dists/stable/updates"
FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
SourceFileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
BinOverride "override.sarge.$(SECTION)";
ExtraOverride "override.sarge.extra.$(SECTION)";
SrcOverride "override.sarge.$(SECTION).src";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.etch.$(SECTION)";
ExtraOverride "override.etch.extra.$(SECTION)";
SrcOverride "override.etch.$(SECTION).src";
Contents " ";
Packages::Compress "gzip bzip2";
Sources::Compress "gzip bzip2";
};
tree "dists/testing/updates"
......@@ -42,9 +46,11 @@ tree "dists/testing/updates"
FileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
SourceFileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
BinOverride "override.etch.$(SECTION)";
ExtraOverride "override.etch.extra.$(SECTION)";
SrcOverride "override.etch.$(SECTION).src";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.lenny.$(SECTION)";
ExtraOverride "override.lenny.extra.$(SECTION)";
SrcOverride "override.lenny.$(SECTION).src";
Contents " ";
Packages::Compress "gzip bzip2";
Sources::Compress "gzip bzip2";
};
config/debian-security/apt.conf.buildd
浏览文件 @ a6496b97
APT::FTPArchive::Contents off;
Dir
{
ArchiveDir "/org/security.debian.org/buildd/";
OverrideDir "/org/security.debian.org/override/";
CacheDir "/org/security.debian.org/dak-database/";
ArchiveDir "/srv/security.debian.org/buildd/";
OverrideDir "/srv/security.debian.org/override/";
CacheDir "/srv/security.debian.org/dak-database/";
};
Default
......@@ -20,19 +22,21 @@ bindirectory "etch"
Contents " ";
BinOverride "override.etch.all3";
SrcOverride "override.etch.all3.src";
BinCacheDB "packages-accepted-etch.db";
PathPrefix "";
Packages::Extensions ".deb .udeb";
};
bindirectory "woody"
bindirectory "lenny"
{
Packages "woody/Packages";
Sources "woody/Sources";
Packages "lenny/Packages";
Sources "lenny/Sources";
Contents " ";
BinOverride "override.woody.all3";
BinCacheDB "packages-accepted-woody.db";
BinOverride "override.lenny.all3";
SrcOverride "override.lenny.all3.src";
BinCacheDB "packages-accepted-lenny.db";
PathPrefix "";
Packages::Extensions ".deb .udeb";
};
......@@ -44,6 +48,7 @@ bindirectory "sarge"
Contents " ";
BinOverride "override.sarge.all3";
SrcOverride "override.sarge.all3.src";
BinCacheDB "packages-accepted-sarge.db";
PathPrefix "";
Packages::Extensions ".deb .udeb";
......
config/debian-security/cron.buildd
浏览文件 @ a6496b97
......@@ -2,8 +2,8 @@
#
# Executed after cron.unchecked
ARCHS_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
ARCHS_stable="$ARCHS_oldstable"
ARCHS_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390 amd64"
ARCHS_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc sparc s390"
ARCHS_testing="$ARCHS_stable"
DISTS="oldstable stable testing"
SSH_SOCKET=~/.ssh/buildd.debian.org.socket
......@@ -18,7 +18,7 @@ if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
eval SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
eval PACKAGES_$d=`stat -c "%Y" $base/buildd/$d/Packages.gz`
done
apt-ftparchive -qq generate apt.conf.buildd-security
apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
dists=
for d in $DISTS; do
eval NEW_SOURCES_$d=`stat -c "%Y" $base/buildd/$d/Sources.gz`
......@@ -60,8 +60,10 @@ if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
quinn-diff -a /org/security.debian.org/buildd/Packages-arch-specific -A $a 2>/dev/null | ssh buildd@buildd -S $SSH_SOCKET wanna-build -d $d-security -b $a/build-db --merge-partial-quinn
ssh buildd@buildd -S $SSH_SOCKET wanna-build -d $d-security -A $a -b $a/build-db --merge-packages < Packages
done
if [ "$d" = "oldstable" ]; then
ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
fi
done
fi
fi
ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
config/debian-security/cron.daily 100644 → 100755
浏览文件 @ a6496b97
......@@ -16,25 +16,11 @@ cd $overridedir
find . -name override\*.gz -type f -maxdepth 1 -mindepth 1 | xargs gunzip -f
find . -type l -maxdepth 1 -mindepth 1 | xargs rm
rm -fr non-US
mkdir non-US
cd non-US
rsync -ql non-us::indices/override\* .
find . -name override\*.gz -type f -maxdepth 1 -mindepth 1 | xargs gunzip
find . -type l -maxdepth 1 -mindepth 1 | xargs rm
for i in *; do
if [ -f ../$i ]; then
cat $i >> ../$i;
fi;
done
cd ..
rm -fr non-US
for suite in $suites; do
case $suite in
oldstable) override_suite=woody;;
stable) override_suite=sarge;;
testing) override_suite=etch;;
oldstable) override_suite=sarge;;
stable) override_suite=etch;;
testing) override_suite=lenny;;
*) echo "Unknown suite type ($suite)"; exit 1;;
esac
for component in $components; do
......@@ -47,7 +33,7 @@ for suite in $suites; do
# XXX RUN AFUCKINGAWAY
if [ "$override_type" = "udeb" ]; then
if [ ! "$component" = "main" ]; then
continue;
continue
fi
if [ "$suite" = "unstable" ]; then
dak control-overrides -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
......@@ -57,9 +43,6 @@ for suite in $suites; do
fi
case $suite in
oldstable)
if [ ! "$override_type" = "udeb" ]; then
dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
fi
dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
;;
stable)
......@@ -75,15 +58,18 @@ for suite in $suites; do
done
# Generate .all3 overides for the buildd support
for dist in woody sarge etch; do
for dist in sarge etch lenny; do
rm -f override.$dist.all3
components="main contrib non-free";
if [ -f override.$dist.main.debian-installer ]; then
components="$components main.debian-installer";
components="$components main.debian-installer"
fi
for component in $components; do
cat override.$dist.$component >> override.$dist.all3;
done;
cat override.$dist.$component >> override.$dist.all3
if [ -e "override.$dist.$component.src" ]; then
cat override.$dist.$component.src >> override.$dist.all3.src
fi
done
done
################################################################################
......
config/debian-security/cron.unchecked
浏览文件 @ a6496b97
......@@ -33,4 +33,4 @@ if ! $doanything; then
exit 0
fi
sh $masterdir/cron.buildd-security
sh $masterdir/cron.buildd
config/debian-security/dak.conf
浏览文件 @ a6496b97
......@@ -4,7 +4,7 @@ Dinstall
GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
SigningKeyIds "2D230C5F";
SigningKeyIds "6070D3A1";
SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
MyAdminAddress "ftpmaster@debian.org";
......@@ -29,14 +29,14 @@ Dinstall
};
SecurityQueueHandling "true";
SecurityQueueBuild "true";
DefaultSuite "Testing";
DefaultSuite "oldstable";
SuiteSuffix "updates";
OverrideMaintainer "dak@security.debian.org";
StableDislocationSupport "false";
LegacyStableHasNoSections "false";
};
Process-Unchecked
Process-New
{
AcceptedLockFile "/org/security.debian.org/lock/unchecked.lock";
};
......@@ -52,9 +52,9 @@ Queue-Report
{
Directories
{
byhand;
new;
accepted;
// byhand;
// new;
unembargoed;
};
};
......@@ -122,7 +122,8 @@ Suite
{
source;
all;
alpha;
alpha;
amd64;
arm;
hppa;
i386;
......@@ -135,12 +136,12 @@ Suite
sparc;
};
Announce "dak@security.debian.org";
Version "3.0";
Version "3.1";
Origin "Debian";
Label "Debian-Security";
Description "Debian 3.0 Security Updates";
CodeName "woody";
OverrideCodeName "woody";
Description "Debian 3.1 Security Updates";
CodeName "sarge";
OverrideCodeName "sarge";
CopyDotDak "/org/security.debian.org/queue/done/";
};
......@@ -156,13 +157,12 @@ Suite
{
source;
all;
alpha;
amd64;
alpha;
arm;
hppa;
i386;
ia64;
m68k;
mips;
mipsel;
powerpc;
......@@ -170,12 +170,12 @@ Suite
sparc;
};
Announce "dak@security.debian.org";
Version "3.1";
Version "";
Origin "Debian";
Label "Debian-Security";
Description "Debian 3.1 Security Updates";
CodeName "sarge";
OverrideCodeName "sarge";
Description "Debian 4.0 Security Updates";
CodeName "etch";
OverrideCodeName "etch";
CopyDotDak "/org/security.debian.org/queue/done/";
};
......@@ -197,7 +197,6 @@ Suite
hppa;
i386;
ia64;
m68k;
mips;
mipsel;
powerpc;
......@@ -209,11 +208,10 @@ Suite
Origin "Debian";
Label "Debian-Security";
Description "Debian testing Security Updates";
CodeName "etch";
OverrideCodeName "etch";
CodeName "lenny";
OverrideCodeName "lenny";
CopyDotDak "/org/security.debian.org/queue/done/";
};
};
SuiteMappings
......@@ -222,7 +220,7 @@ SuiteMappings
"silent-map stable-security stable";
// JT - FIXME, hackorama
// "silent-map testing-security stable";
"silent-map etch-secure testing";
"silent-map etch-secure stable";
"silent-map testing-security testing";
};
......@@ -250,6 +248,7 @@ Dir
New "/org/security.debian.org/queue/new/";
Reject "/org/security.debian.org/queue/reject/";
Unchecked "/org/security.debian.org/queue/unchecked/";
ProposedUpdates "/does/not/exist/"; // XXX fixme
Embargoed "/org/security.debian.org/queue/embargoed/";
Unembargoed "/org/security.debian.org/queue/unembargoed/";
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或