Editorial updates; add committers info

diff --git a/Makefile b/Makefile
index fdc4c0fed4400e1ab2bdc3c0e950d02a8b7b415a..6c71beca1d717909fc48c8003d27e35aa5972de9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ RELEASEDIR = /var/www/openssl/source
 
 # All simple generated files.
 SIMPLE = newsflash.inc sitemap.txt \
 
 # 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 \
         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
 
 
 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
 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
 
        ./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
 
 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 $@
        @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 $@
 
 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/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' < $< > $@
 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/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' \
 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 >$@
 
        @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 >$@
 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' >$@
 
        @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' >$@
 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 (executable)
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("<tr><td>%s</td><td>%s</td></tr>" % (name, github))
+
+members.sort()
+for m in members:
+    print m

diff --git a/community/committers.html b/community/committers.html
new file mode 100644 (file)
index 0000000..750bb93
--- /dev/null
+++ b/community/committers.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--#include virtual="/inc/head.shtml" -->
+<body>
+  <!--#include virtual="/inc/banner.shtml" -->
+  <div id="main">
+    <div id="content">
+      <div class="blog-index">
+       <article>
+         <header><h2>List of Committers</h2></header>
+         <div class="entry-content">
+           <p>
+            <table summary="Committers">
+           <tr>
+             <td>Name</td>
+             <td>GitHub ID</td>
+           </tr>
+            <!--#include virtual="committers.inc" -->
+            </table>
+           </p>
+         </div>
+         <footer>
+           You are here: <a href="/">Home</a>
+           : <a href=".">Community</a>
+           : <a href="">Committers</a>
+           <br/><a href="/sitemap.txt">Sitemap</a>
+         </footer>
+       </article>
+      </div>
+      <!--#include virtual="sidebar.shtml" -->
+    </div>
+  </div>
+<!--#include virtual="/inc/footer.shtml" -->
+</body>
+</html>
+

diff --git a/community/contacts.html b/community/contacts.html
index 88e01f762af71ce8c550d64b5ae82ff2dcee84af..32c88abc1601be0dea35ef135b313804ac237e58 100644 (file)
--- a/community/contacts.html
+++ b/community/contacts.html
@@ -72,21 +72,6 @@
          </blockquote>
          </p>
 
          </blockquote>
          </p>
 

-         <p>Some OpenSSL team members are available for selected consulting
-         engagements.</p>
-
-         <p>In Sweden:</p>
-
-         <blockquote>
-           OpenSSL SE<br>
-           c/o Richard Levitte<br>
-           Nordingrågatan 20<br>
-           S-162 53 Vällingby<br>
-           Sweden<br>
-           <a href="mailto:openssl-contact.SE@openssl.org">openssl-contact.SE@openssl.org</a>
-         </blockquote>
-         </p>
-

        </div>
        <footer>
          You are here: <a href="/">Home</a>
        </div>
        <footer>
          You are here: <a href="/">Home</a>

diff --git a/community/index.html b/community/index.html
index 33881f2ac45c01b0fe8ac095c34635dd0f872cfc..fe17316aae3cbf4c7e8a4354b186a818bc2c5b26 100644 (file)
--- a/community/index.html
+++ b/community/index.html
@@ -12,12 +12,17 @@
          <header><h2>Community<h2></header>
          <div class="entry-content">
            <p>
          <header><h2>Community<h2></header>
          <div class="entry-content">
            <p>

-           OpenSSL is a a collaborative effort of a worldwide community of
-            volunteers that has a <a href="conduct.html">code of conduct</a>.
+           OpenSSL is a global open source project that has a
+            <a href="conduct.html">code of conduct</a>.
+            It is run by the
+            <a href="omc.html">OpenSSL Management Committee</a> and the
+            source is maintained by a
+            <a href="committers.html">team of committers</a>, as defined
+            in the <a href="/policies/bylaws.html">project bylaws</a>.

             </p>
             </p>

-            <p>Here are some of the ways you can join the
-           community and contribute.
-           We'd also like
+
+            <p>Here are some of the ways you can join the community and
+            contribute. We'd also like

            to <a href="thanks.html">thank</a> several groups for help with
            the project infrastructure over time.
            </p>
            to <a href="thanks.html">thank</a> several groups for help with
            the project infrastructure over time.
            </p>

diff --git a/community/omc.html b/community/omc.html
index 9dbf001c08a8ad31d31326994919daeae5d38957..d154bd2d4e4c690986a45842af6de51aab9cfe8f 100644 (file)
--- a/community/omc.html
+++ b/community/omc.html
@@ -9,7 +9,7 @@
   <div id="content">
     <div class="blog-index">
       <article>
   <div id="content">
     <div class="blog-index">
       <article>

-       <header><h2>Team</h2></header>
+       <header><h2>OpenSSL Management Committee</h2></header>

        <div class="entry-content">
          <p>
           The
        <div class="entry-content">
          <p>
           The


@@ -20,7 +20,7 @@
          <p>
          The current OMC consists of (in alphabetical order):
          </p>
          <p>
          The current OMC consists of (in alphabetical order):
          </p>

-         <table summary="">
+         <table summary="OMC Members">

            <tr>
              <td>Name</td>
              <td>Email</td>
            <tr>
              <td>Name</td>
              <td>Email</td>


@@ -163,7 +163,7 @@
          <footer>
            You are here: <a href="/">Home</a>
            : <a href=".">Community</a>
          <footer>
            You are here: <a href="/">Home</a>
            : <a href=".">Community</a>

-           : <a href="">Team</a>
+           : <a href="">OMC</a>

            <br/><a href="/sitemap.txt">Sitemap</a>
          </footer>
        </article>
            <br/><a href="/sitemap.txt">Sitemap</a>
          </footer>
        </article>

diff --git a/community/sidebar.shtml b/community/sidebar.shtml
index 4b418e442745cd272f5ed30be3f2cd7dc938a14e..ed3cbc59bf7f8cd12849a5a0ebd199fd44a5fce8 100644 (file)
--- a/community/sidebar.shtml
+++ b/community/sidebar.shtml
@@ -9,6 +9,9 @@
       <li>
          <a href="omc.html">OpenSSL Management Committee</a>
       </li>
       <li>
          <a href="omc.html">OpenSSL Management Committee</a>
       </li>

+      <li>
+         <a href="committers.html">List of Committers</a>
+      </li>

       <li>
          <a href="contacts.html">Contact Us</a>
       </li>
       <li>
          <a href="contacts.html">Contact Us</a>
       </li>