Skip to content

Commit

Permalink
Merge pull request #938 from MartinNowak/gpg_keys
Browse files Browse the repository at this point in the history
add gpg signatures to downloads
  • Loading branch information
CyberShadow committed Mar 24, 2015
2 parents 0c1bce0 + 846269e commit 2d6bbfa
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 11 deletions.
14 changes: 14 additions & 0 deletions css/style.css
Expand Up @@ -27,6 +27,20 @@ body::before
height: 1em;
}

/* show signature download on hover */
span.sig_btn > a:last-child
{
display: none;
}

/* but only if there is enough width for the buttons */
@media only screen and (min-width: 50em) {
span.sig_btn:hover > a:last-child
{
display: inherit;
}
}

a.btn
{
color: black !important; /*override a:visited color*/
Expand Down
Binary file added d-keyring.gpg
Binary file not shown.
15 changes: 9 additions & 6 deletions download.dd
Expand Up @@ -9,20 +9,22 @@ $(D_S Downloads,
$(H2 DMD $(DMDV2))
$(LINK2 changelog.html, Changelog)

$(DOWNLOAD $(WINDOWS), Windows, $(BTN $(WINEXE), exe) $(BTN $(ZIP windows), zip))
$(DOWNLOAD $(WINDOWS), Windows, $(SBTN $(WINEXE), exe) $(SBTN $(ZIP windows), zip))

$(DOWNLOAD $(OSX), OS X, $(BTN $(OSXDMG), dmg) $(BTN $(ZIP osx), zip))
$(DOWNLOAD $(OSX), OS X, $(SBTN $(OSXDMG), dmg) $(SBTN $(ZIP osx), zip))

$(DOWNLOAD $(UBUNTU)   $(DEBIAN), Ubuntu/Debian, $(BTN $(DEB32), i386) $(BTN $(DEB64), x86_64) $(BTN $(ZIP linux), zip))
$(DOWNLOAD $(UBUNTU)   $(DEBIAN), Ubuntu/Debian, $(SBTN $(DEB32), i386) $(SBTN $(DEB64), x86_64) $(SBTN $(ZIP linux), zip))

$(DOWNLOAD $(FEDORA)   $(CENTOS), Fedora/CentOS, $(BTN $(RPM32), i386) $(BTN $(RPM64), x86_64) $(BTN $(DLSITE dmd.$(DMDV2).linux.zip), zip))
$(DOWNLOAD $(FEDORA)   $(CENTOS), Fedora/CentOS, $(SBTN $(RPM32), i386) $(SBTN $(RPM64), x86_64) $(SBTN $(DLSITE dmd.$(DMDV2).linux.zip), zip))

$(DOWNLOAD $(OPENSUSE), openSUSE, $(BTN $(SUSE32), i386) $(BTN $(SUSE64), x86_64) $(BTN $(DLSITE dmd.$(DMDV2).linux.zip), zip))
$(DOWNLOAD $(OPENSUSE), openSUSE, $(SBTN $(SUSE32), i386) $(SBTN $(SUSE64), x86_64) $(SBTN $(DLSITE dmd.$(DMDV2).linux.zip), zip))

$(DOWNLOAD $(FREEBSD), FreeBSD, $(BTN $(FBSD32), i386) $(BTN $(FBSD64), x86_64))
$(DOWNLOAD $(FREEBSD), FreeBSD, $(SBTN $(FBSD32), i386) $(SBTN $(FBSD64), x86_64))

$(H3 $(LINK2 http://ftp.digitalmars.com, Release Archive))

$(LINK2 gpg_keys.html, GPG keys)

$(HR)

$(H3 $(LINK2 http://gdcproject.org/downloads, GDC - GCC D Compiler))
Expand Down Expand Up @@ -68,6 +70,7 @@ Macros:
UBUNTU=$(LOGO ubuntu, Ubuntu)
WINDOWS=$(LOGO windows, Windows)

SBTN=$(SPANC sig_btn,$(BTN $1,$+)$(BTN $1.asc,sig))
BTN=<a href="$1" class="btn">$+</a>
H3I=<h3 class="download">$0</h3>
DLSITE=http://downloads.dlang.org/releases/2.x/$(DMDV2)/$0
Expand Down
22 changes: 22 additions & 0 deletions gpg_keys.dd
@@ -0,0 +1,22 @@
Ddoc

$(P Since 2.067.0 dmd binaries and git tags are signed by D's release managers. The following GnuPG keys can be used to verify those signatures.)

$(PRE
pub 4096R/0xAB8FE924C2F7E724 2014-09-01 [expires: 2017-02-26]
Key fingerprint = AFC7 DB45 693D 62BB 472B F27B AB8F E924 C2F7 E724
uid Martin Nowak $(LT)code@dawg.eu$(GT)
sub 4096R/0xB273811612BB1939 2015-02-27 [expires: 2018-03-03]
sub 4096R/0xA78068C444E12E4D 2014-09-01 [expires: 2018-03-03]

pub 4096R/0xC13C70B87267B52D 2012-03-20 [expires: 2016-03-19]
Key fingerprint = 0B96 609E 270F 565C 1329 2B24 C13C 70B8 7267 B52D
uid David Soria Parra $(LT)dsp@php.net$(GT)
sub 4096R/0x4A208C733953AF82 2012-03-20 [expires: 2016-03-19]
)

$(P You can also download them as $(LINK2 d-keyring.gpg,keyring) file.)

Macros:
TITLE=GPG Keys
WIKI=GPG Keys
7 changes: 4 additions & 3 deletions posix.mak
Expand Up @@ -132,8 +132,9 @@ STYLES=$(addsuffix .css, $(addprefix css/, \

PRETTIFY=prettify/prettify.css prettify/prettify.js

PREMADE=appendices.html articles.html fetch-issue-cnt.php \
howtos.html language-reference.html robots.txt .htaccess process.php
PREMADE=appendices.html articles.html fetch-issue-cnt.php howtos.html \
language-reference.html robots.txt .htaccess process.php \
d-keyring.gpg

# Language spec root filenames. They have extension .dd in the source
# and .html in the generated HTML. These are also used for the mobi
Expand All @@ -152,7 +153,7 @@ PAGES_ROOT=$(SPEC_ROOT) 32-64-portability acknowledgements ascii-table \
bugstats.php builtin changelog code_coverage concepts const-faq COM \
comparison cpptod ctod D1toD2 d-array-article d-floating-point \
deprecate dll dll-linux dmd-freebsd dmd-linux dmd-osx dmd-windows \
download dstyle exception-safe faq features2 getstarted glossary gsoc2011 \
download dstyle exception-safe faq features2 gpg_keys getstarted glossary gsoc2011 \
gsoc2012 gsoc2012-template hijack howto-promote htod htomodule index intro \
intro-to-datetime lazy-evaluation memory migrate-to-shared mixin \
overview pretod rationale rdmd regular-expression safed \
Expand Down
6 changes: 4 additions & 2 deletions win32.mak
Expand Up @@ -35,7 +35,7 @@ DDOC_STD=std.ddoc std_navbar-release.ddoc modlist-release.ddoc
ASSETS=images\*.* css\*.*
IMG=dmlogo.gif cpp1.gif d002.ico c1.gif d3.png d4.gif d5.gif favicon.gif

PREMADE=dcompiler.html language-reference.html appendices.html howtos.html articles.html
PREMADE=dcompiler.html language-reference.html appendices.html howtos.html articles.html d-keyring.gpg

TARGETS=cpptod.html ctod.html pretod.html cppcontracts.html index.html overview.html \
intro.html spec.html lex.html grammar.html module.html declaration.html type.html \
Expand All @@ -58,7 +58,7 @@ TARGETS=cpptod.html ctod.html pretod.html cppcontracts.html index.html overview.
D1toD2.html unittest.html hash-map.html intro-to-datetime.html \
simd.html deprecate.html download.html 32-64-portability.html \
d-array-article.html dll-linux.html bugstats.php.html getstarted.html \
css/cssmenu.css \
gpg_keys.html css/cssmenu.css \

# exclude list
MOD_EXCLUDES_RELEASE=--ex=gc. --ex=rt. --ex=core.internal. --ex=core.stdc.config --ex=core.sys. \
Expand Down Expand Up @@ -173,6 +173,8 @@ getstarted.html : $(DDOC) getstarted.dd

glossary.html : $(DDOC) glossary.dd

gpg_keys.html : $(DDOC) gpg_keys.dd

hash-map.html : $(DDOC) hash-map.dd

hijack.html : $(DDOC) hijack.dd
Expand Down

0 comments on commit 2d6bbfa

Please sign in to comment.