Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
喜羊羊3508
Dak
提交
b1161cd1
D
Dak
项目概览
喜羊羊3508
/
Dak
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
Dak
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b1161cd1
编写于
1月 14, 2009
作者:
M
Mike O'Connor
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://ftp-master.debian.org/git/dak
Conflicts: web/dinstall.html
上级
cf09cfaa
b74dcc5d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
23 addition
and
10 deletion
+23
-10
config/debian/extensions.py
config/debian/extensions.py
+1
-1
daklib/utils.py
daklib/utils.py
+14
-2
scripts/debian/dm-monitor
scripts/debian/dm-monitor
+7
-7
web/dinstall.html
web/dinstall.html
+1
-0
未找到文件。
config/debian/extensions.py
浏览文件 @
b1161cd1
...
...
@@ -86,7 +86,7 @@ def check_signed_by_key(oldfn):
if
changes
[
"source"
]
==
"dpkg"
:
fpr
=
changes
[
"fingerprint"
]
(
uid
,
uid_name
)
=
dak_module
.
lookup_uid_from_fingerprint
(
fpr
)
(
uid
,
uid_name
,
is_dm
)
=
dak_module
.
lookup_uid_from_fingerprint
(
fpr
)
if
fpr
==
"5906F687BD03ACAD0D8E602EFCF37657"
or
uid
==
"iwj"
:
reject
(
"Upload blocked due to hijack attempt 2008/03/19"
)
...
...
daklib/utils.py
浏览文件 @
b1161cd1
...
...
@@ -26,6 +26,7 @@ import codecs, commands, email.Header, os, pwd, re, select, socket, shutil, \
sys
,
tempfile
,
traceback
,
stat
import
apt_pkg
import
database
import
time
from
dak_exceptions
import
*
################################################################################
...
...
@@ -1231,11 +1232,22 @@ used."""
if
keywords
.
has_key
(
"NODATA"
):
reject
(
"no signature found in %s."
%
(
sig_filename
))
bad
=
1
if
keywords
.
has_key
(
"EXPKEYSIG"
):
args
=
keywords
[
"EXPKEYSIG"
]
if
len
(
args
)
>=
1
:
key
=
args
[
0
]
reject
(
"Signature made by expired key x%s"
%
(
key
))
bad
=
1
if
keywords
.
has_key
(
"KEYEXPIRED"
)
and
not
keywords
.
has_key
(
"GOODSIG"
):
args
=
keywords
[
"KEYEXPIRED"
]
expiredate
=
""
if
len
(
args
)
>=
1
:
key
=
args
[
0
]
reject
(
"The key (0x%s) used to sign %s has expired."
%
(
key
,
sig_filename
))
timestamp
=
args
[
0
]
if
timestamp
.
count
(
"T"
)
==
0
:
expiredate
=
time
.
strftime
(
"%Y-%m-%d"
,
time
.
gmtime
(
timestamp
))
else
:
expiredate
=
timestamp
reject
(
"The key used to sign %s has expired on %s"
%
(
sig_filename
,
expiredate
))
bad
=
1
if
bad
:
...
...
scripts/debian/dm-monitor
浏览文件 @
b1161cd1
...
...
@@ -5,7 +5,7 @@ echo "Known debian maintainers:"
psql
--html
projectb
<<
EOF
SELECT uid.uid, uid.name, f.fingerprint
FROM uid LEFT OUTER JOIN fingerprint f ON (uid.id = f.uid)
WHERE uid.uid LIKE '
dm:
%'
WHERE uid.uid LIKE '
%@
%'
ORDER BY uid.uid;
EOF
...
...
@@ -23,7 +23,7 @@ psql --html projectb <<EOF
JOIN uid u ON
(m.name LIKE u.name || ' <%>' OR
m.name LIKE '% <' || substring(u.uid FROM 4) || '>')
WHERE u.uid LIKE '
dm:
%' AND sa.suite = 5
WHERE u.uid LIKE '
%@
%' AND sa.suite = 5
)
ORDER BY uid.uid;
EOF
...
...
@@ -31,13 +31,13 @@ EOF
echo
"Packages debian maintainers may update:"
psql
--html
projectb
<<
EOF
SELECT s.source, s
.version
, u.uid
SELECT s.source, s
pace_separated_list(s.version)
, u.uid
FROM src_uploaders su JOIN source s ON (su.source = s.id)
JOIN src_associations sa ON (s.id = sa.source)
JOIN maintainer m ON (su.maintainer = m.id)
JOIN uid u ON (m.name LIKE u.name || ' <%>' OR
m.name LIKE '% <' || substring(u.uid FROM 4) || '>')
WHERE
u.uid LIKE 'dm:%' AND sa.suite = 5
m.name LIKE '% <' || substring(u.uid FROM 4) || '>')
WHERE
s.dm_upload_allowed = 't' GROUP BY s.source, s.version, u.uid
ORDER BY u.uid, s.source, s.version;
EOF
...
...
@@ -47,7 +47,7 @@ psql --html projectb <<EOF
SELECT s.source, s.version, s.install_date, u.uid
FROM source s JOIN fingerprint f ON (s.sig_fpr = f.id)
JOIN uid u ON (f.uid = u.id)
WHERE u.uid LIKE '
dm:
%'
WHERE u.uid LIKE '
%@
%'
ORDER BY u.uid, s.source, s.version;
EOF
...
...
@@ -58,7 +58,7 @@ psql --html projectb <<EOF
FROM binaries b JOIN architecture a ON (b.architecture = a.id)
JOIN fingerprint f ON (b.sig_fpr = f.id)
JOIN uid u ON (f.uid = u.id)
WHERE u.uid LIKE '
dm:
%'
WHERE u.uid LIKE '
%@
%'
ORDER BY u.uid, b.package, b.version;
EOF
...
...
web/dinstall.html
浏览文件 @
b1161cd1
...
...
@@ -51,6 +51,7 @@ dinstall should run 4 times a day at 01:52, 07:52, 13:52, 19:52 (all times in UT
<font
size=
"-2"
>
Made by Eduard Bloch
<
blade@debian.org
>
<br>
Small update to use 12h dinstall by Felipe Augusto van de Wiel (faw)
<br>
Small update to use 6h dinstall by Mike O'Connor (stew)
<br>
Please check this
<a
href=
"http://lists.debian.org/debian-project/2008/12/msg00114.html"
>
announcement
</a>
about dinstall every 6 hours.
</BODY>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录