[Debian-ha-commits] [crmsh] 08/09: Updated patches

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository crmsh.

commit 12de4317fe98225f77e19f3aa2cf3b92e1c63237
Author: Richard B Winters <rik at mmogp.com>
Date:   Thu Apr 30 20:20:59 2015 -0400

    Updated patches
    
     - Added additional patch for modifying the atom-xml template so
       as not to breach privacy by using remote resources
     - Fixed local resource path modified in patch 002
    
    Change-Id: I22a4186266eaa175193b77c90065f6437e00a3be
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...-breach-generic-caused-by-footer-template.patch |  4 ++--
 ...-breach-generic-caused-by-atom-xml-templa.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch b/debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
index 94528b9..c7f6abc 100644
--- a/debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
+++ b/debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
@@ -13,7 +13,7 @@ Signed-off-by: Richard B Winters <rik at mmogp.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/website-v1/crm.conf b/doc/website-v1/crm.conf
-index 44dcc41..d857ec1 100644
+index 44dcc41..df24263 100644
 --- a/doc/website-v1/crm.conf
 +++ b/doc/website-v1/crm.conf
 @@ -575,7 +575,7 @@ bodydata=<td class="tableblock halign-{colalign=left}">|</td>
@@ -21,7 +21,7 @@ index 44dcc41..d857ec1 100644
  </div>
  
 -<a href="https://github.com/ClusterLabs/crmsh"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/652c5b9acfaddf3a9c326fa6bde407b87f7be0f4/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6f72616e67655f6666373630302e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
-+<a href="https://github.com/ClusterLabs/crmsh"><img style="position: absolute; top: 0; right: 0; border: 0;" src="{imagesdir=}{imagesdir?/}fork-me-on-github.png" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
++<a href="https://github.com/ClusterLabs/crmsh"><img style="position: absolute; top: 0; right: 0; border: 0;" src="/img/fork-me-on-github.png" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_orange_ff7600.png"></a>
  
  </body>
  </html>
diff --git a/debian/patches/0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch b/debian/patches/0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
new file mode 100644
index 0000000..29f9854
--- /dev/null
+++ b/debian/patches/0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
@@ -0,0 +1,25 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Thu, 30 Apr 2015 20:19:29 -0400
+Subject: Fix privacy-breach-generic caused by atom xml template
+
+ - Modifies the atom xml template so as not to breach privacy by 
+   using remote resources.
+---
+ doc/website-v1/make-news.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/website-v1/make-news.py b/doc/website-v1/make-news.py
+index 22fb77a..d17c3ad 100644
+--- a/doc/website-v1/make-news.py
++++ b/doc/website-v1/make-news.py
+@@ -21,8 +21,8 @@ ATOM_TEMPLATE = """<?xml version="1.0" encoding="utf-8"?>
+ <feed xmlns="http://www.w3.org/2005/Atom">
+ <title>crmsh</title>
+ <subtitle>Cluster manager shell news</subtitle>
+-<link href="http://crmsh.github.io/atom.xml" rel="self" />
+-<link href="http://crmsh.github.io/" />
++<link href="/atom.xml" rel="self" />
++<link href="/" />
+ <id>%(id)s</id>
+ <updated>%(updated)s</updated>
+ %(entries)s
diff --git a/debian/patches/series b/debian/patches/series
index 5049ab9..d276360 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Add-remote-resource-to-local-cache.patch
 0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
+0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/crmsh.git