[Debian-ha-commits] [crmsh] 07/16: Re-added patches based on new upstream version sources

[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 dc1841f3d856de16f8b4b871aed4c6ee3c7ef012
Author: Richard B Winters <rik at mmogp.com>
Date:   Tue Jan 26 16:09:10 2016 -0500

    Re-added patches based on new upstream version sources
    
     - All but CFlags patch still required
    
    Change-Id: Ibb35f18507886b9cdc4490ef6e6de0d3a0363d1f
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 .../0001-Add-remote-resource-to-local-cache.patch  | Bin 0 -> 10133 bytes
 ...-breach-generic-caused-by-footer-template.patch |  27 ++++++++++++++++++++
 ...-breach-generic-caused-by-atom-xml-templa.patch |  28 +++++++++++++++++++++
 debian/patches/series                              |   3 +++
 4 files changed, 58 insertions(+)

diff --git a/debian/patches/0001-Add-remote-resource-to-local-cache.patch b/debian/patches/0001-Add-remote-resource-to-local-cache.patch
new file mode 100644
index 0000000..7741dc3
Binary files /dev/null and b/debian/patches/0001-Add-remote-resource-to-local-cache.patch differ
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
new file mode 100644
index 0000000..c1b7de8
--- /dev/null
+++ b/debian/patches/0002-Fix-privacy-breach-generic-caused-by-footer-template.patch
@@ -0,0 +1,27 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Tue, 26 Jan 2016 16:06:12 -0500
+Subject: Fix privacy-breach-generic caused by footer template
+
+ - An image fetched from githubuserconent needs to be 
+   replaced with a local cache to avoid the aforementioned 
+   lintian informational warning.
+
+Change-Id: I5c756ec23adac6a65b67cd1030c106e8d8f97f95
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ doc/website-v1/crm.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/website-v1/crm.conf b/doc/website-v1/crm.conf
+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>
+ </div>
+ </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="/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..9b5a6c5
--- /dev/null
+++ b/debian/patches/0003-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
@@ -0,0 +1,28 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Tue, 26 Jan 2016 16:08:26 -0500
+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.
+
+Change-Id: Ib5b21b8c302cadfa4763a14a9202d8c8a36d2546
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ 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 f3c9073..89271d2 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
new file mode 100644
index 0000000..d276360
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +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