[Debian-ha-commits] [pcs] 01/05: Dropped all patches to redo with a focus on contributing upstream
Richard Winters
devrik-guest at moszumanska.debian.org
Wed May 6 07:55:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository pcs.
commit ce105dd7c107d29cfb2bf3ad49dd0e852eb2fc1b
Author: Richard B Winters <rik at mmogp.com>
Date: Tue May 5 23:48:28 2015 -0400
Dropped all patches to redo with a focus on contributing upstream
- Series updated
Change-Id: I8d89c746440243fec0c8bb627e5f28b7d9f7a8c2
Signed-off-by: Richard B Winters <rik at mmogp.com>
---
.../0001-Fix-pcsd-makefile-for-gnu-linux.patch | 31 ----------
.../0002-Remove-Gemfile.lock-for-debian.patch | 70 ----------------------
.../0003-Remove-build_gems-from-install_pcsd.patch | 25 --------
...ix-pcsd.conf-destination-in-pcsd-makefile.patch | 26 --------
...-Fix-pcsd.service-destination-in-Makefile.patch | 37 ------------
...0006-Change-pcsd-destination-to-usr-share.patch | 38 ------------
.../0007-Fix-check-for-systemctl-on-Debian.patch | 56 -----------------
...-Do-not-install-upstream-pcsd-init-script.patch | 26 --------
.../0009-Fix-pcsd-service-file-for-Debian.patch | 32 ----------
.../0010-Remove-rubygems-require-pcsd-ssl.rb.patch | 22 -------
debian/patches/series | 11 +---
11 files changed, 1 insertion(+), 373 deletions(-)
diff --git a/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch b/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
deleted file mode 100644
index 32214a1..0000000
--- a/debian/patches/0001-Fix-pcsd-makefile-for-gnu-linux.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Fri, 1 May 2015 09:21:51 -0400
-Subject: Fix pcsd makefile for gnu linux
-
- - Patching pcsd makefile with upstream's latest changes, so that
- the build works properly on debian. Without the patch, the
- incorrect alias is used for build_gems
-
-Change-Id: Ib30558166f1cc6ee1f075d0b58d08140b21bad60
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- pcsd/Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pcsd/Makefile b/pcsd/Makefile
-index 325f54a..8779671 100644
---- a/pcsd/Makefile
-+++ b/pcsd/Makefile
-@@ -1,9 +1,9 @@
- REL_INFO := $(shell grep -q -i "release 6" /etc/redhat-release ; echo $$?)
-
--ifeq (${REL_INFO},1)
-- build_gems: build_gems_normal
--else
-+ifeq (${REL_INFO},0)
- build_gems: build_gems_rhel6
-+else
-+ build_gems: build_gems_normal
- endif
-
- build_gems_normal:
diff --git a/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch b/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
deleted file mode 100644
index 07fe77d..0000000
--- a/debian/patches/0002-Remove-Gemfile.lock-for-debian.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Fri, 1 May 2015 10:22:10 -0400
-Subject: Remove Gemfile.lock for debian
-
- - See
-https://wiki.debian.org/Teams/Ruby/Packaging/Tests#Dealing_with_Bundler_usage
-
-Change-Id: I47b6f1159b04b8241f04959e870d128abbff9071
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- pcsd/Gemfile.lock | 50 --------------------------------------------------
- 1 file changed, 50 deletions(-)
- delete mode 100644 pcsd/Gemfile.lock
-
-diff --git a/pcsd/Gemfile.lock b/pcsd/Gemfile.lock
-deleted file mode 100644
-index 06db6d6..0000000
---- a/pcsd/Gemfile.lock
-+++ /dev/null
-@@ -1,50 +0,0 @@
--GEM
-- remote: https://rubygems.org/
-- specs:
-- backports (3.6.4)
-- eventmachine (1.0.3)
-- highline (1.6.20)
-- monkey-lib (0.5.4)
-- backports
-- multi_json (1.10.1)
-- open4 (1.3.4)
-- rack (1.5.2)
-- rack-protection (1.5.3)
-- rack
-- rack-test (0.6.2)
-- rack (>= 1.0)
-- rpam-ruby19 (1.2.1)
-- sinatra (1.4.5)
-- rack (~> 1.4)
-- rack-protection (~> 1.4)
-- tilt (~> 1.3, >= 1.3.4)
-- sinatra-contrib (1.4.2)
-- backports (>= 2.0)
-- multi_json
-- rack-protection
-- rack-test
-- sinatra (~> 1.4.0)
-- tilt (~> 1.3)
-- sinatra-sugar (0.5.1)
-- monkey-lib (~> 0.5.0)
-- sinatra (~> 1.0)
-- tilt (1.4.1)
--
--PLATFORMS
-- ruby
--
--DEPENDENCIES
-- backports
-- eventmachine
-- highline
-- monkey-lib
-- multi_json
-- open4
-- rack
-- rack-protection
-- rack-test
-- rpam-ruby19
-- sinatra
-- sinatra-contrib
-- sinatra-sugar
-- tilt
diff --git a/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch b/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
deleted file mode 100644
index c4479ad..0000000
--- a/debian/patches/0003-Remove-build_gems-from-install_pcsd.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Sat, 2 May 2015 01:19:24 -0400
-Subject: Remove build_gems from install_pcsd
-
- - Decouple the rubygem bundler from pcs/pcsd as Build-Depends
- and Depends handle dependencies on Debian
-
-Change-Id: I323b94d277975737fe083a1fcea17fb503589b58
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c37373b..0bc1767 100644
---- a/Makefile
-+++ b/Makefile
-@@ -36,7 +36,6 @@ install: bash_completion
- install -m644 -D pcs/pcs.8 ${DESTDIR}/${MANDIR}/man8/pcs.8
-
- install_pcsd:
-- make -C pcsd build_gems
- mkdir -p ${DESTDIR}/var/log/pcsd
- mkdir -p ${DESTDIR}${PREFIX}/lib/
- cp -r pcsd ${DESTDIR}${PREFIX}/lib/
diff --git a/debian/patches/0004-Fix-pcsd.conf-destination-in-pcsd-makefile.patch b/debian/patches/0004-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
deleted file mode 100644
index 17fcd01..0000000
--- a/debian/patches/0004-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Sun, 3 May 2015 16:24:18 -0400
-Subject: Fix pcsd.conf destination in pcsd makefile
-
- - The default install destination for pcsd.conf is /etc/
- sysconfig/pcsd, this needs changing on debian
-
-Change-Id: I49610e431a37da21e1b350165c98626eae1fe5c6
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 0bc1767..1e0c00b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,7 @@ install_pcsd:
- mkdir -p ${DESTDIR}/var/log/pcsd
- mkdir -p ${DESTDIR}${PREFIX}/lib/
- cp -r pcsd ${DESTDIR}${PREFIX}/lib/
-- install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/sysconfig/pcsd
-+ install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/default/pcsd.conf
- install -d ${DESTDIR}/etc/pam.d
- install pcsd/pcsd.pam ${DESTDIR}/etc/pam.d/pcsd
- install -m 700 -d ${DESTDIR}/var/lib/pcsd
diff --git a/debian/patches/0005-Fix-pcsd.service-destination-in-Makefile.patch b/debian/patches/0005-Fix-pcsd.service-destination-in-Makefile.patch
deleted file mode 100644
index 689f8b5..0000000
--- a/debian/patches/0005-Fix-pcsd.service-destination-in-Makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Sun, 3 May 2015 20:54:20 -0400
-Subject: Fix pcsd.service destination in Makefile
-
- - The pcsd.service file is installed to /usr/lib/systemd/
- system by default, this requires changing on debian systems
-
-Change-Id: If33c6f26eb50e218ea1b97ee8f2bc0f616e23784
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1e0c00b..da27d98 100644
---- a/Makefile
-+++ b/Makefile
-@@ -45,8 +45,8 @@ install_pcsd:
- install -m 700 -d ${DESTDIR}/var/lib/pcsd
- install -m 644 -D pcsd/pcsd.logrotate ${DESTDIR}/etc/logrotate.d/pcsd
- ifeq ($(IS_SYSTEMCTL),true)
-- install -d ${DESTDIR}/usr/lib/systemd/system/
-- install -m 644 pcsd/pcsd.service ${DESTDIR}/usr/lib/systemd/system/
-+ install -d ${DESTDIR}/lib/systemd/system
-+ install -m 644 pcsd/pcsd.service ${DESTDIR}/lib/systemd/system/
- else
- install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
- endif
-@@ -56,7 +56,7 @@ uninstall:
- rm -rf ${DESTDIR}${PYTHON_SITELIB}/pcs
- rm -rf ${DESTDIR}${PREFIX}/lib/pcsd
- ifeq ($(IS_SYSTEMCTL),true)
-- rm -f ${DESTDIR}/usr/lib/systemd/system/pcsd.service
-+ rm -f ${DESTDIR}/lib/systemd/system/pcsd.service
- else
- rm -f ${DESTDIR}/${initdir}/pcsd
- endif
diff --git a/debian/patches/0006-Change-pcsd-destination-to-usr-share.patch b/debian/patches/0006-Change-pcsd-destination-to-usr-share.patch
deleted file mode 100644
index 265583b..0000000
--- a/debian/patches/0006-Change-pcsd-destination-to-usr-share.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Mon, 4 May 2015 00:00:44 -0400
-Subject: Change pcsd destination to usr share
-
- - By default pcsd/Makefile installs pcsd to usr/lib/pcsd, but
- lintian wants those arch indep files to live in usr/share,
- thus the patch was born.
-
-Change-Id: I592ebe46b721389fbda4634c2a6f5354fa5f2e39
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index da27d98..f318313 100644
---- a/Makefile
-+++ b/Makefile
-@@ -37,8 +37,8 @@ install: bash_completion
-
- install_pcsd:
- mkdir -p ${DESTDIR}/var/log/pcsd
-- mkdir -p ${DESTDIR}${PREFIX}/lib/
-- cp -r pcsd ${DESTDIR}${PREFIX}/lib/
-+ mkdir -p ${DESTDIR}${PREFIX}/share/
-+ cp -r pcsd ${DESTDIR}${PREFIX}/share/
- install -m 644 -D pcsd/pcsd.conf ${DESTDIR}/etc/default/pcsd.conf
- install -d ${DESTDIR}/etc/pam.d
- install pcsd/pcsd.pam ${DESTDIR}/etc/pam.d/pcsd
-@@ -54,7 +54,7 @@ endif
- uninstall:
- rm -f ${DESTDIR}${PREFIX}/sbin/pcs
- rm -rf ${DESTDIR}${PYTHON_SITELIB}/pcs
-- rm -rf ${DESTDIR}${PREFIX}/lib/pcsd
-+ rm -rf ${DESTDIR}${PREFIX}/share/pcsd
- ifeq ($(IS_SYSTEMCTL),true)
- rm -f ${DESTDIR}/lib/systemd/system/pcsd.service
- else
diff --git a/debian/patches/0007-Fix-check-for-systemctl-on-Debian.patch b/debian/patches/0007-Fix-check-for-systemctl-on-Debian.patch
deleted file mode 100644
index 48f6a46..0000000
--- a/debian/patches/0007-Fix-check-for-systemctl-on-Debian.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Mon, 4 May 2015 00:02:33 -0400
-Subject: Fix check for systemctl on Debian
-
- - By default the Makefile checks for /usr/bin/systemctl in
- order to determine if systemd is utilized by the
- environment. On debian we can do this by checking pid 1
-
-Change-Id: Ie4a490d5c2801c14c8b383bead370e93d7a4950c
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f318313..e0073e3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,14 +8,7 @@ ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
- EXTRA_SETUP_OPTS="--install-layout=deb"
- endif
-
--IS_SYSTEMCTL=false
--ifeq ("$(wildcard /usr/bin/systemctl)","/usr/bin/systemctl")
-- IS_SYSTEMCTL=true
--else
-- ifeq ("$(wildcard /bin/systemctl)","/usr/bin/systemctl")
-- IS_SYSTEMCTL=true
-- endif
--endif
-+IS_SYSTEMCTL = $(shell if ps -p 1 -o comm= | grep -q -i "systemd" ; then echo true; else echo false; fi)
-
- MANDIR=/usr/share/man
-
-@@ -47,9 +40,8 @@ install_pcsd:
- ifeq ($(IS_SYSTEMCTL),true)
- install -d ${DESTDIR}/lib/systemd/system
- install -m 644 pcsd/pcsd.service ${DESTDIR}/lib/systemd/system/
--else
-- install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
- endif
-+ install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
-
- uninstall:
- rm -f ${DESTDIR}${PREFIX}/sbin/pcs
-@@ -57,9 +49,8 @@ uninstall:
- rm -rf ${DESTDIR}${PREFIX}/share/pcsd
- ifeq ($(IS_SYSTEMCTL),true)
- rm -f ${DESTDIR}/lib/systemd/system/pcsd.service
--else
-- rm -f ${DESTDIR}/${initdir}/pcsd
- endif
-+ rm -f ${DESTDIR}/${initdir}/pcsd
- rm -f ${DESTDIR}/etc/pam.d/pcsd
- rm -rf ${DESTDIR}/var/lib/pcsd
-
diff --git a/debian/patches/0008-Do-not-install-upstream-pcsd-init-script.patch b/debian/patches/0008-Do-not-install-upstream-pcsd-init-script.patch
deleted file mode 100644
index b89dbbf..0000000
--- a/debian/patches/0008-Do-not-install-upstream-pcsd-init-script.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Tue, 5 May 2015 16:04:56 -0400
-Subject: Do not install upstream pcsd init script
-
- - Remove instruction to install the upstream pcsd init from
- the Makefile, as we will install a maintainer provided init
- script instead
-
-Change-Id: I1af25537d60d59be8c92cfb481b104bd36e9df30
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index e0073e3..f3c412b 100644
---- a/Makefile
-+++ b/Makefile
-@@ -41,7 +41,6 @@ ifeq ($(IS_SYSTEMCTL),true)
- install -d ${DESTDIR}/lib/systemd/system
- install -m 644 pcsd/pcsd.service ${DESTDIR}/lib/systemd/system/
- endif
-- install -m 755 -D pcsd/pcsd ${DESTDIR}/${initdir}/pcsd
-
- uninstall:
- rm -f ${DESTDIR}${PREFIX}/sbin/pcs
diff --git a/debian/patches/0009-Fix-pcsd-service-file-for-Debian.patch b/debian/patches/0009-Fix-pcsd-service-file-for-Debian.patch
deleted file mode 100644
index 0a3bc12..0000000
--- a/debian/patches/0009-Fix-pcsd-service-file-for-Debian.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Tue, 5 May 2015 20:42:01 -0400
-Subject: Fix pcsd service file for Debian
-
- - Updates environment configuration file location
- - Updates ExecStart
- - Removes conflicting options
-
-Change-Id: I01b7a147be2c63ff0f876666c47eb8fb01b193c4
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- pcsd/pcsd.service | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/pcsd/pcsd.service b/pcsd/pcsd.service
-index 5254905..36477de 100644
---- a/pcsd/pcsd.service
-+++ b/pcsd/pcsd.service
-@@ -2,11 +2,8 @@
- Description=PCS GUI and remote configuration interface
-
- [Service]
--EnvironmentFile=-/etc/sysconfig/pcsd
--WorkingDirectory=/var/lib/pcsd
--ExecStart=/usr/lib/pcsd/pcsd start
--Type=notify
--NotifyAccess=all
-+EnvironmentFile=/etc/default/pcsd.conf
-+ExecStart=/usr/bin/ruby -C/var/lib/pcsd -I/usr/share/pcsd -- /usr/share/pcsd/ssl.rb & > /dev/null &
-
- [Install]
- WantedBy=multi-user.target
diff --git a/debian/patches/0010-Remove-rubygems-require-pcsd-ssl.rb.patch b/debian/patches/0010-Remove-rubygems-require-pcsd-ssl.rb.patch
deleted file mode 100644
index 478c893..0000000
--- a/debian/patches/0010-Remove-rubygems-require-pcsd-ssl.rb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Richard B Winters <rik at mmogp.com>
-Date: Tue, 5 May 2015 17:24:12 -0400
-Subject: Remove rubygems require pcsd ssl.rb
-
- - Remove the require on rubygems from /usr/share/pcsd/ssl.rb
- as dependencies are handled via debian
-
-Change-Id: I62077a4ced5f74f0019104757767d0431bac8559
-Signed-off-by: Richard B Winters <rik at mmogp.com>
----
- pcsd/ssl.rb | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pcsd/ssl.rb b/pcsd/ssl.rb
-index 1001755..6535b88 100644
---- a/pcsd/ssl.rb
-+++ b/pcsd/ssl.rb
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'webrick'
- require 'webrick/https'
- require 'openssl'
diff --git a/debian/patches/series b/debian/patches/series
index 1d0195a..8b13789 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1 @@
-0001-Fix-pcsd-makefile-for-gnu-linux.patch
-0002-Remove-Gemfile.lock-for-debian.patch
-0003-Remove-build_gems-from-install_pcsd.patch
-0004-Fix-pcsd.conf-destination-in-pcsd-makefile.patch
-0005-Fix-pcsd.service-destination-in-Makefile.patch
-0006-Change-pcsd-destination-to-usr-share.patch
-0007-Fix-check-for-systemctl-on-Debian.patch
-0008-Do-not-install-upstream-pcsd-init-script.patch
-0009-Fix-pcsd-service-file-for-Debian.patch
-0010-Remove-rubygems-require-pcsd-ssl.rb.patch
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list