From: Rich Salz Date: Thu, 1 Jun 2017 13:39:13 +0000 (-0400) Subject: Editorial updates; add committers info X-Git-Url: https://git.openssl.org/?p=openssl-web.git;a=commitdiff_plain;h=ec5ce815ce0a8c707ac4381c825f652e72f4335c Editorial updates; add committers info --- diff --git a/Makefile b/Makefile index fdc4c0f..6c71bec 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ RELEASEDIR = /var/www/openssl/source # All simple generated files. SIMPLE = newsflash.inc sitemap.txt \ + community/committers.inc \ docs/faq.inc docs/fips.inc \ news/changelog.inc news/changelog.txt \ news/cl102.txt news/cl110.txt \ @@ -36,6 +37,15 @@ suball: $(SIMPLE) $(SRCLISTS) manmaster relupd: suball manpages sitemap +clean: + rm -f $(SIMPLE) $(SRCLISTS) + +# Legacy targets +hack-source_htaccess: all +simple: all +generated: all +rebuild: all + define makemanpages ./bin/mk-manpages $(1) $(2) docs ./bin/mk-filelist -a docs/man$(2)/apps '' '*.html' >docs/man$(2)/apps/index.inc @@ -53,22 +63,25 @@ manmaster: ./bin/mk-filelist -a docs/manmaster/man5 '' '*.html' >docs/manmaster/man5/index.inc ./bin/mk-filelist -a docs/manmaster/man7 '' '*.html' >docs/manmaster/man7/index.inc +## $(SIMPLE) -- SIMPLE GENERATED FILES +newsflash.inc: news/newsflash.inc + @rm -f $@ + head -7 $? >$@ sitemap: @rm -f sitemap.txt ./bin/mk-sitemap > sitemap.txt -# Legacy targets -hack-source_htaccess: all -simple: all -generated: all -rebuild: all - -clean: - rm -f $(SIMPLE) $(SRCLISTS) +community/committers.inc: + @rm -f $@ + wget -q https://api.openssl.org/0/Group/commit/Members | + ./bin/mk-committers >$@ -newsflash.inc: news/newsflash.inc +docs/faq.inc: docs/faq.txt bin/mk-faq @rm -f $@ - head -7 $? >$@ + ./bin/mk-faq <$? >$@ +docs/fips.inc: $(wildcard docs/fips/*) bin/mk-filelist + @rm -f $@ + ./bin/mk-filelist docs/fips fips/ '*' >$@ news/changelog.inc: news/changelog.txt bin/mk-changelog @rm -f $@ @@ -82,7 +95,6 @@ news/cl102.txt: $(CHECKOUTS)/openssl-1.0.2-stable/CHANGES news/cl110.txt: $(CHECKOUTS)/openssl-1.1.0-stable/CHANGES @rm -f $@ cp $? $@ - news/openssl-1.0.2-notes.html: news/openssl-notes.html.in @rm -f $@ sed -e 's|@VERSION@|1.0.2|g' < $< > $@ @@ -95,7 +107,6 @@ news/openssl-1.0.2-notes.inc: $(CHECKOUTS)/openssl-1.0.2-stable/NEWS news/openss news/openssl-1.1.0-notes.inc: $(CHECKOUTS)/openssl-1.1.0-stable/NEWS news/openssl-1.1.0-notes.html bin/mk-notes @rm -f $@ ./bin/mk-notes 1.1.0 < $(CHECKOUTS)/openssl-1.1.0-stable/NEWS > $@ - news/newsflash.inc: news/newsflash.txt sed <$? >$@ \ -e '/^#/d' \ @@ -106,13 +117,6 @@ news/vulnerabilities.inc: bin/vulnerabilities.xsl news/vulnerabilities.xml @rm -f $@ xsltproc bin/vulnerabilities.xsl news/vulnerabilities.xml >$@ -docs/faq.inc: docs/faq.txt bin/mk-faq - @rm -f $@ - ./bin/mk-faq <$? >$@ -docs/fips.inc: $(wildcard docs/fips/*) bin/mk-filelist - @rm -f $@ - ./bin/mk-filelist docs/fips fips/ '*' >$@ - source/.htaccess: $(wildcard source/openssl-*.tar.gz) bin/mk-latest @rm -f @? ./bin/mk-latest source >$@ @@ -123,6 +127,7 @@ source/index.inc: $(wildcard $(RELEASEDIR)/openssl-*.tar.gz) bin/mk-filelist @rm -f $@ ./bin/mk-filelist $(RELEASEDIR) '' 'openssl-*.tar.gz' >$@ +## $(SRCLISTS) -- LISTS OF SOURCES source/old/0.9.x/index.inc: $(wildcard source/old/0.9.x/*.gz) bin/mk-filelist @rm -f $@ ./bin/mk-filelist source/old/0.9.x '' '*.gz' >$@ diff --git a/bin/mk-committers b/bin/mk-committers new file mode 100755 index 0000000..5e6e748 --- /dev/null +++ b/bin/mk-committers @@ -0,0 +1,24 @@ +#! /usr/bin/python + +import json, sys + +json = json.load(sys.stdin) + +members = [] +for member in json: + name = None + github = '--' + for names in member: + if type(names) == type({}): + if names.has_key(u'github'): + github = names[u'github'] + elif names.find(' ') != -1: + name = names + if name and github: + name = name.encode('ascii', 'xmlcharrefreplace') + github = github.encode('ascii', 'xmlcharrefreplace') + members.append("%s%s" % (name, github)) + +members.sort() +for m in members: + print m diff --git a/community/committers.html b/community/committers.html new file mode 100644 index 0000000..750bb93 --- /dev/null +++ b/community/committers.html @@ -0,0 +1,36 @@ + + + + + +
+
+
+ +
+ +
+
+ + + + diff --git a/community/contacts.html b/community/contacts.html index 88e01f7..32c88ab 100644 --- a/community/contacts.html +++ b/community/contacts.html @@ -72,21 +72,6 @@

-

Some OpenSSL team members are available for selected consulting - engagements.

- -

In Sweden:

- -
- OpenSSL SE
- c/o Richard Levitte
- Nordingrågatan 20
- S-162 53 Vällingby
- Sweden
- openssl-contact.SE@openssl.org -
-

-