[Debian-ha-commits] [crmsh] 03/07: Added patches back

Richard Winters devrik-guest at moszumanska.debian.org
Fri Jan 29 16:28:55 UTC 2016 

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

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

commit 0b50fcc60a089c9097857718ba227b9946f04bff
Author: Richard B Winters <rik at mmogp.com>
Date:   Fri Jan 29 10:45:41 2016 -0500

    Added patches back
    
     - Patches to remove fix for Debian as forwarded and
       merged upstream were added in place of the simple
       fix used previously.
     - Privacy breach patches added back.
    
    Change-Id: I601a687d7f38832537df8b6fc0c828898683e0ae
    Signed-off-by: Richard B Winters <rik at mmogp.com>
---
 ...Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch |  28 +++++++++++++++++++
 debian/patches/0002-Remove-fix-for-Debian.patch    |  31 +++++++++++++++++++++
 .../0003-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                              |   5 ++++
 6 files changed, 119 insertions(+)

diff --git a/debian/patches/0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch b/debian/patches/0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
new file mode 100644
index 0000000..c83898a
--- /dev/null
+++ b/debian/patches/0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
@@ -0,0 +1,28 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Fri, 29 Jan 2016 10:38:09 -0500
+Subject: Remove AM_CONDITIONAL for UNAME_IS_DEBIAN
+
+ - The conditional was implemented as part of a 
+   resolution for a packaging issue on Debian systems, 
+   but is not necessary
+ - This patch was forwarded and merged upstream
+
+Change-Id: I3f41fb84c5fabe446154bcc6236703b8294dd832
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ configure.ac | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f378f26..1a8de80 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -41,8 +41,6 @@ dnl command line
+ dnl Wrap in m4_ifdef to avoid breaking on older platforms
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
+ 
+-AM_CONDITIONAL([UNAME_IS_DEBIAN], [test x`uname -v | grep -oh Debian` = x"Debian"])
+-
+ AC_SUBST(OCF_ROOT_DIR)
+ AC_SUBST(CRM_DAEMON_USER)
+ 
diff --git a/debian/patches/0002-Remove-fix-for-Debian.patch b/debian/patches/0002-Remove-fix-for-Debian.patch
new file mode 100644
index 0000000..100992f
--- /dev/null
+++ b/debian/patches/0002-Remove-fix-for-Debian.patch
@@ -0,0 +1,31 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Fri, 29 Jan 2016 10:38:47 -0500
+Subject: Remove fix for Debian
+
+ - The fix for Debian is not necessary, and so the 
+   respective logic can be safely removed
+ - This patch was forwarded and merged upstream
+
+Change-Id: Ic8ea96abcf36b81d8104380bc596f593dae248d5
+Signed-off-by: Richard B Winters <rik at mmogp.com>
+---
+ Makefile.am | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d89affb..1195376 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -68,12 +68,7 @@ all-local:
+ 		--build-base $(shell readlink -f $(builddir))/build \
+ 		--verbose)
+ 
+-# Fix for GNU/Linux
+-if UNAME_IS_DEBIAN
+-python_prefix = 
+-else
+ python_prefix = --prefix=$(DESTDIR)$(prefix)
+-endif
+ 
+ install-exec-local:
+ 	-mkdir -p $(DESTDIR)$(pkgpythondir)
diff --git a/debian/patches/0003-Add-remote-resource-to-local-cache.patch b/debian/patches/0003-Add-remote-resource-to-local-cache.patch
new file mode 100644
index 0000000..8f966d5
Binary files /dev/null and b/debian/patches/0003-Add-remote-resource-to-local-cache.patch differ
diff --git a/debian/patches/0004-Fix-privacy-breach-generic-caused-by-footer-template.patch b/debian/patches/0004-Fix-privacy-breach-generic-caused-by-footer-template.patch
new file mode 100644
index 0000000..202a507
--- /dev/null
+++ b/debian/patches/0004-Fix-privacy-breach-generic-caused-by-footer-template.patch
@@ -0,0 +1,27 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Fri, 29 Jan 2016 10:43:26 -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: I3798ca0f774161ed6d99d0da25369ad421e69397
+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/0005-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch b/debian/patches/0005-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
new file mode 100644
index 0000000..beb880b
--- /dev/null
+++ b/debian/patches/0005-Fix-privacy-breach-generic-caused-by-atom-xml-templa.patch
@@ -0,0 +1,28 @@
+From: Richard B Winters <rik at mmogp.com>
+Date: Fri, 29 Jan 2016 10:43:46 -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: I0043f9815620a3b88546c481f416b6ebebe66472
+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..cc4faf0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+0001-Remove-AM_CONDITIONAL-for-UNAME_IS_DEBIAN.patch
+0002-Remove-fix-for-Debian.patch
+0003-Add-remote-resource-to-local-cache.patch
+0004-Fix-privacy-breach-generic-caused-by-footer-template.patch
+0005-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

More information about the Debian-HA-Commits mailing list