gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
This commit is contained in:
Eelco Dolstra
2011-12-12 16:54:35 +00:00
parent 5de58eb387 b0834a993e
commit eda3fd1730
320 changed files with 4058 additions and 2823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
maintainers/scripts/gnu/gnupdate
View File

@@ -441,6 +441,8 @@ the file at URL."
(define validsig-rx
(make-regexp
"^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
(define expkeysig-rx ; good signature, but expired key
(make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$"))
(define errsig-rx
(make-regexp
"^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
@@ -450,20 +452,25 @@ the file at URL."
(lambda (match)
`(signature-id ,(match:substring match 1) ; sig id
,(match:substring match 2) ; date
,(string->number ; timestamp
,(string->number ; timestamp
(match:substring match 3)))))
((regexp-exec goodsig-rx line)
=>
(lambda (match)
`(good-signature ,(match:substring match 1) ; key id
`(good-signature ,(match:substring match 1) ; key id
,(match:substring match 2)))) ; user name
((regexp-exec validsig-rx line)
=>
(lambda (match)
`(valid-signature ,(match:substring match 1) ; fingerprint
,(match:substring match 2) ; sig creation date
,(string->number ; timestamp
,(string->number ; timestamp
(match:substring match 3)))))
((regexp-exec expkeysig-rx line)
=>
(lambda (match)
`(expired-key-signature ,(match:substring match 1) ; fingerprint
,(match:substring match 2)))) ; user name
((regexp-exec errsig-rx line)
=>
(lambda (match)
@@ -471,7 +478,7 @@ the file at URL."
,(match:substring match 2) ; pubkey algo
,(match:substring match 3) ; hash algo
,(match:substring match 4) ; sig class
,(string->number ; timestamp
,(string->number ; timestamp
(match:substring match 5))
,(let ((rc
(string->number ; return code
@@ -504,7 +511,7 @@ the file at URL."
a key-id/user pair; return #f otherwise."
(any (lambda (sexp)
(match sexp
(('good-signature key-id user)
(((or 'good-signature 'expired-key-signature) key-id user)
(cons key-id user))
(_ #f)))
status))
@@ -774,7 +781,6 @@ Return #t if the signature was good, #f otherwise."
("freefont-ttf" "ftp.gnu.org" "/gnu/freefont" #f)
("gnupg" "ftp.gnupg.org" "/gcrypt" #t)
("gnu-ghostscript" "ftp.gnu.org" "/gnu/ghostscript" #f)
("GNUnet" "ftp.gnu.org" "/gnu/gnunet" #f)
("mit-scheme" "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
("icecat" "ftp.gnu.org" "/gnu/gnuzilla" #f)
("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
@@ -798,7 +804,6 @@ Return #t if the signature was good, #f otherwise."
("gnumake" . "make")
("gnused" . "sed")
("gnutar" . "tar")
("gnunet" . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
("mitscheme" . "mit-scheme")
("texmacs" . "TeXmacs")))