[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 2288a005cce79eaa795e6b5782145e60999f010f

[Michal Čihař]

The branch, master has been updated
       via  2288a005cce79eaa795e6b5782145e60999f010f (commit)
       via  d9e6e1f5e5199f36e6a09d4955bf7a6bd1cfb4df (commit)
       via  dba8d9610b4af1cf7647feae71aa9f7d7b0f313f (commit)
      from  e44eb2866f5210b701416b82c29af918841ec666 (commit)


- Log -----------------------------------------------------------------
commit 2288a005cce79eaa795e6b5782145e60999f010f
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue May 24 16:21:13 2011 +0200

    Add CVE ids

commit d9e6e1f5e5199f36e6a09d4955bf7a6bd1cfb4df
Merge: dba8d9610b4af1cf7647feae71aa9f7d7b0f313f e44eb2866f5210b701416b82c29af918841ec666
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue May 24 16:20:29 2011 +0200

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website

commit dba8d9610b4af1cf7647feae71aa9f7d7b0f313f
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon May 16 16:07:54 2011 +0200

    Do not point to (disabled) cia.vc

-----------------------------------------------------------------------

Summary of changes:
 render.py                       |    2 +-
 templates/security/PMASA-2011-3 |    2 +-
 templates/security/PMASA-2011-4 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/render.py b/render.py
index 9cb655b..a28b47a 100755
--- a/render.py
+++ b/render.py
@@ -85,7 +85,7 @@ PROJECT_FILES_RSS = 'https://sourceforge.net/api/file/index/project-id/%d/rss' %
 PROJECT_NEWS_RSS = 'https://sourceforge.net/export/rss2_projnews.php?group_id=%d&rss_fulltext=1&limit=10' % PROJECT_ID
 PROJECT_SUMMARY_RSS = 'https://sourceforge.net/export/rss2_projsummary.php?group_id=%d' % PROJECT_ID
 DONATIONS_RSS = 'https://sourceforge.net/export/rss2_projdonors.php?group_id=%d&limit=20' % PROJECT_ID
-PROJECT_VCS_RSS = 'http://cia.vc/stats/project/phpmyadmin/.rss'
+PROJECT_VCS_RSS = 'http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=rss'
 PROJECT_DL = 'http://prdownloads.sourceforge.net/%s/%%s' % PROJECT_NAME
 PROJECT_GIT = 'git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin'
 PLANET_RSS = 'http://planet.phpmyadmin.net/rss20.xml'
diff --git a/templates/security/PMASA-2011-3 b/templates/security/PMASA-2011-3
index cb973dd..215554e 100644
--- a/templates/security/PMASA-2011-3
+++ b/templates/security/PMASA-2011-3
@@ -42,7 +42,7 @@ This issue was found by a person who wishes to be known as "dave b".
 </py:def>
 
 <!--! CVE ID of the report, this is automatically added to references -->
-<py:def function="announcement_cve">CVE-2011-XXXX</py:def>
+<py:def function="announcement_cve">CVE-2011-1940</py:def>
 
 <py:def function="announcement_cwe">661 79</py:def>
 
diff --git a/templates/security/PMASA-2011-4 b/templates/security/PMASA-2011-4
index 1ebbfda..7909027 100644
--- a/templates/security/PMASA-2011-4
+++ b/templates/security/PMASA-2011-4
@@ -37,7 +37,7 @@ This issue was found by Kian Mohageri.
 </py:def>
 
 <!--! CVE ID of the report, this is automatically added to references -->
-<py:def function="announcement_cve">CVE-2011-XXXX</py:def>
+<py:def function="announcement_cve">CVE-2011-1941</py:def>
 
 <py:def function="announcement_cwe">661 601</py:def>
 


hooks/post-receive
-- 
phpMyAdmin website