mcpierce pushed to qpid-dispatch (f22). "Rebased on Dispatch 0.4. (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 21 18:26:33 UTC 2015
>From 09bbadec4da011031afaff8a8e19ce4310cd20ae Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce at gmail.com>
Date: Mon, 20 Apr 2015 17:11:38 -0400
Subject: Rebased on Dispatch 0.4.
- Changed username for qdrouterd to be qdrouterd.
diff --git a/.gitignore b/.gitignore
index a5aa6de..e4bed35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/qpid-dispatch-0.1.tar.gz
/qpid-dispatch-0.2.tar.gz
/qpid-dispatch-0.3.tar.gz
+/qpid-dispatch-0.4.tar.gz
diff --git a/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch b/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
index 9f8e914..916fa2f 100644
--- a/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
+++ b/0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
@@ -1,7 +1,7 @@
-From a6af2b463092626d819107b76999e6aace1ba066 Mon Sep 17 00:00:00 2001
+From 7a9589250731fe7bf6ac32d62b80eab90be28568 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce at gmail.com>
Date: Fri, 8 Nov 2013 10:29:28 -0500
-Subject: [PATCH 01/10] NO-JIRA: Systemd control file for qdrouterd.
+Subject: [PATCH 1/2] NO-JIRA: Systemd control file for qdrouterd.
---
etc/qdrouterd.service | 12 ++++++++++++
diff --git a/0002-NO-JIRA-SysVInit-script-for-qdrouterd.patch b/0002-NO-JIRA-SysVInit-script-for-qdrouterd.patch
deleted file mode 100644
index 0890220..0000000
--- a/0002-NO-JIRA-SysVInit-script-for-qdrouterd.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 746092585eaeff60502901fe9f125304c61c3523 Mon Sep 17 00:00:00 2001
-From: "Darryl L. Pierce" <mcpierce at gmail.com>
-Date: Thu, 30 Jan 2014 09:23:56 -0500
-Subject: [PATCH 02/10] NO-JIRA: SysVInit script for qdrouterd.
-
----
- etc/qdrouterd | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 86 insertions(+)
- create mode 100644 etc/qdrouterd
-
-diff --git a/etc/qdrouterd b/etc/qdrouterd
-new file mode 100644
-index 0000000..2b3f1ed
---- /dev/null
-+++ b/etc/qdrouterd
-@@ -0,0 +1,86 @@
-+#!/bin/bash
-+#
-+# /etc/rc.d/init.d/qdrouterd
-+#
-+# Startup script for the Qpid Router.
-+#
-+# <tags -- see below for tag definitions. *Every line* from the top
-+# of the file to the end of the tags section must begin with a #
-+# character. After the tags section, there should be a blank line.
-+# This keeps normal comments in the rest of the file from being
-+# mistaken for tags, should they happen to fit the pattern.>
-+
-+# Source function library.
-+. /etc/rc.d/init.d/functions
-+
-+### BEGIN INIT INFO
-+# Provides: qdrouterd
-+# Required-Start: $local_fs
-+# Required-Stop: $local_fs
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
-+# Short-Description: start or stop qdrouterd
-+# Description: Qpid Router is an intermediary for AMQP messaging.
-+### END INIT INFO
-+
-+prog=qdrouterd
-+exe=/usr/sbin/$prog
-+lockfile=/var/lock/subsys/$prog
-+pidfile=/var/run/$prog.pid
-+config=/etc/qpid-dispatch/qdrouterd.conf
-+
-+if [ -f /etc/sysconfig/$prog ]; then
-+ . /etc/sysconfig/$prog
-+fi
-+
-+# ensure binary is present before continuing
-+if [[ !(-x $exe) ]]; then
-+ echo "$exe not found or is not executable"
-+ exit 5
-+fi
-+
-+start() {
-+ echo -n "Starting qdrouterd services: "
-+ $exe --daemon --pidfile $pidfile --user qpidd
-+ RETVAL=$?
-+ [ $RETVAL = 0 ] && touch $lockfile
-+ if [ $RETVAL = 0 ]; then
-+ touch $pidfile
-+ chown qpidd.qpidd $pidfile
-+ [ -x /sbin/restorecon ] && /sbin/restorecon $pidfile
-+ fi
-+}
-+
-+stop() {
-+ echo -n "Shutting down qdrouterd services: "
-+ killproc -p $pidfile $prog
-+ RETVAL=$?
-+ [ $RETVAL = 0 ] && rm -f $lockfile $pidfile
-+}
-+
-+restart() {
-+ stop
-+ start
-+}
-+
-+case "$1" in
-+ start|stop|restart|reload)
-+ $1
-+ ;;
-+
-+ status)
-+ status $prog
-+ RETVAL=$?
-+ ;;
-+
-+ force-reload)
-+ restart
-+ ;;
-+
-+ *)
-+ echo "Usage: $0 {start|stop|status|restart|reload|status|force-reload}"
-+ exit 2
-+ ;;
-+esac
-+
-+exit $RETVAL
---
-2.1.0
-
diff --git a/0002-NO-JIRA-new-SysVInit-script-for-qdrouterd-from-Alan-.patch b/0002-NO-JIRA-new-SysVInit-script-for-qdrouterd-from-Alan-.patch
new file mode 100644
index 0000000..5b41033
--- /dev/null
+++ b/0002-NO-JIRA-new-SysVInit-script-for-qdrouterd-from-Alan-.patch
@@ -0,0 +1,104 @@
+From 8142ee84fb0c96d4340ee43cf617b9a102408924 Mon Sep 17 00:00:00 2001
+From: Irina Boverman <iboverma at redhat.com>
+Date: Tue, 7 Apr 2015 15:12:22 -0400
+Subject: [PATCH 2/2] NO-JIRA new SysVInit script for qdrouterd from Alan
+ Conway
+
+---
+ etc/qdrouterd | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 84 insertions(+)
+ create mode 100644 etc/qdrouterd
+
+diff --git a/etc/qdrouterd b/etc/qdrouterd
+new file mode 100644
+index 0000000..2be7bc9
+--- /dev/null
++++ b/etc/qdrouterd
+@@ -0,0 +1,84 @@
++#!/bin/bash
++#
++# /etc/rc.d/init.d/qdrouterd
++#
++# Startup script for the Qpid Router.
++#
++# <tags -- see below for tag definitions. *Every line* from the top
++# of the file to the end of the tags section must begin with a #
++# character. After the tags section, there should be a blank line.
++# This keeps normal comments in the rest of the file from being
++# mistaken for tags, should they happen to fit the pattern.>
++
++# Source function library.
++. /etc/rc.d/init.d/functions
++
++### BEGIN INIT INFO
++# Provides: qdrouterd
++# Required-Start: $local_fs
++# Required-Stop: $local_fs
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
++# Short-Description: start or stop qdrouterd
++# Description: Qpid Router is an intermediary for AMQP messaging.
++### END INIT INFO
++
++prog=qdrouterd
++exe=/usr/sbin/$prog
++
++# Configurable variables, can be set in /etc/sysconfig/$prog
++USER=qdrouterd
++CONFIG=/etc/qpid-dispatch/qdrouterd.conf
++RUNDIR=/var/run/qpid-dispatch
++
++if [ -f /etc/sysconfig/$prog ]; then
++ . /etc/sysconfig/$prog
++fi
++
++pidfile=$RUNDIR/$prog.pid
++
++# ensure binary is present before continuing
++if [[ !(-x $exe) ]]; then
++ echo "$exe not found or is not executable"
++ exit 5 # Not installed
++fi
++
++start() {
++ echo -n "Starting qdrouterd services: "
++ daemon --check $prog --user $USER --pidfile $pidfile $exe --daemon --config $CONFIG --pidfile $pidfile
++ echo
++ RETVAL=$?
++}
++
++stop() {
++ echo -n "Shutting down qdrouterd services: "
++ killproc -p $pidfile $prog
++ echo
++}
++
++restart() {
++ stop
++ start
++}
++
++case "$1" in
++ start|stop|restart)
++ $1
++ ;;
++
++ status)
++ status $prog
++ RETVAL=$?
++ ;;
++
++ reload|force-reload)
++ exit 3 # Not implemented
++ ;;
++
++ *)
++ echo "Usage: $0 {start|stop|status|restart|reload|force-reload}"
++ exit 2 # Invalid arguments
++ ;;
++esac
++
++exit $RETVAL
+--
+2.1.0
+
diff --git a/0003-DISPATCH-96-Fix-installing-the-qpid_dispatch_site.py.patch b/0003-DISPATCH-96-Fix-installing-the-qpid_dispatch_site.py.patch
deleted file mode 100644
index 83e71bd..0000000
--- a/0003-DISPATCH-96-Fix-installing-the-qpid_dispatch_site.py.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 94d5dc9b6da18259bb0bf0ee34c4e5ed30346a90 Mon Sep 17 00:00:00 2001
-From: "Darryl L. Pierce" <dpierce at redhat.com>
-Date: Mon, 12 Jan 2015 10:56:54 -0500
-Subject: [PATCH 03/10] DISPATCH-96: Fix installing the qpid_dispatch_site.py
- module.
-
----
- CMakeLists.txt | 2 ++
- python/CMakeLists.txt | 19 ++++++++++++++++++-
- 2 files changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f33cc2..92e5258 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -87,6 +87,8 @@ find_library(dl_lib dl)
- find_library(rt_lib rt)
- find_path(proton_include proton/driver.h)
-
-+set (USE_SETUP_PY 1 CACHE FLAG "Flag for toggling the use of setup.py for installation")
-+
- ##
- ## Include directories used by all sub-directories.
- ##
-diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
-index 117de87..4064173 100644
---- a/python/CMakeLists.txt
-+++ b/python/CMakeLists.txt
-@@ -27,7 +27,24 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qpid_dispatch_site.py.in
- ${CMAKE_CURRENT_BINARY_DIR}/qpid_dispatch_site.py)
-
- # Install script for public python modules
--install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py -v install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-+
-+if (NOT USE_SETUP_PY)
-+ execute_process(COMMAND ${PYTHON_EXECUTABLE}
-+ -c "from distutils.sysconfig import get_python_lib; print get_python_lib(False)"
-+ OUTPUT_VARIABLE PYTHON_SITEARCH_PACKAGES
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+
-+
-+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid_dispatch_site.py
-+ DESTINATION ${PYTHON_SITEARCH_PACKAGES})
-+ install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/qpid_dispatch
-+ DESTINATION ${PYTHON_SITEARCH_PACKAGES})
-+
-+else(NOT USE_SETUP_PY)
-+
-+ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} setup.py -v install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
-+
-+endif (NOT USE_SETUP_PY)
-
- install(FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/qpid_dispatch/management/qdrouter.json
---
-2.1.0
-
diff --git a/0004-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch b/0004-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch
deleted file mode 100644
index 1b1ce91..0000000
--- a/0004-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0cc2cfcec7449c99347012e26b8ded4026737039 Mon Sep 17 00:00:00 2001
-From: Alan Conway <aconway at apache.org>
-Date: Tue, 10 Feb 2015 16:15:45 +0000
-Subject: [PATCH 04/10] NO-JIRA: Fix error handling bug in check_output for old
- python
-
-git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658749 13f79535-47bb-0310-9956-ffa450edef68
----
- python/qpid_dispatch_internal/compat/subproc.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/qpid_dispatch_internal/compat/subproc.py b/python/qpid_dispatch_internal/compat/subproc.py
-index afcbf9f..26ea8ec 100644
---- a/python/qpid_dispatch_internal/compat/subproc.py
-+++ b/python/qpid_dispatch_internal/compat/subproc.py
-@@ -33,10 +33,10 @@ except ImportError:
- @return: stdout of command (mixed with stderr if stderr=STDOUT)
- @raise L{CalledProcessError}: If command returns non-0 exit status.
- """
-- if "stdoutxo" in kwargs:
-+ if "stdout" in kwargs:
- raise ValueError("Must not specify stdout in check_output")
- p = Popen(args, stdout=PIPE, stdin=stdin, stderr=stderr, shell=shell, universal_newlines=universal_newlines, **kwargs)
- out, err = p.communicate()
- if p.returncode:
-- raise CalledProcessError(args, p.returncode, err or out)
-+ raise CalledProcessError(args, p.returncode)
- return out
---
-2.1.0
-
diff --git a/0005-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch b/0005-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch
deleted file mode 100644
index fc8dd31..0000000
--- a/0005-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f0fed7788526969da583f1a61fd6e4ac325da64 Mon Sep 17 00:00:00 2001
-From: Alan Conway <aconway at apache.org>
-Date: Tue, 10 Feb 2015 16:24:14 +0000
-Subject: [PATCH 05/10] NO-JIRA: Fix error handling bug in check_output for old
- python (2)
-
-git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658753 13f79535-47bb-0310-9956-ffa450edef68
----
- python/qpid_dispatch_internal/compat/subproc.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/qpid_dispatch_internal/compat/subproc.py b/python/qpid_dispatch_internal/compat/subproc.py
-index 26ea8ec..69a511d 100644
---- a/python/qpid_dispatch_internal/compat/subproc.py
-+++ b/python/qpid_dispatch_internal/compat/subproc.py
-@@ -38,5 +38,5 @@ except ImportError:
- p = Popen(args, stdout=PIPE, stdin=stdin, stderr=stderr, shell=shell, universal_newlines=universal_newlines, **kwargs)
- out, err = p.communicate()
- if p.returncode:
-- raise CalledProcessError(args, p.returncode)
-+ raise CalledProcessError(p.returncode, args)
- return out
---
-2.1.0
-
diff --git a/0006-NO-JIRA-Add-program-output-to-exception-in-check_out.patch b/0006-NO-JIRA-Add-program-output-to-exception-in-check_out.patch
deleted file mode 100644
index 0c31870..0000000
--- a/0006-NO-JIRA-Add-program-output-to-exception-in-check_out.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c8173f14a3f9a09b11955150772e0352cd9bc6b0 Mon Sep 17 00:00:00 2001
-From: Alan Conway <aconway at apache.org>
-Date: Tue, 10 Feb 2015 16:44:33 +0000
-Subject: [PATCH 06/10] NO-JIRA: Add program output to exception in
- check_output for old python
-
-git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658758 13f79535-47bb-0310-9956-ffa450edef68
----
- doc/man/help2md.py | 10 ++++++++--
- python/qpid_dispatch_internal/compat/subproc.py | 4 +++-
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/doc/man/help2md.py b/doc/man/help2md.py
-index 1032388..b43d76e 100644
---- a/doc/man/help2md.py
-+++ b/doc/man/help2md.py
-@@ -27,7 +27,7 @@ or append it at the end if there is no # Options section.
- """
-
- import re, sys
--from qpid_dispatch_internal.compat.subproc import check_output, STDOUT
-+from qpid_dispatch_internal.compat.subproc import check_output, STDOUT, CalledProcessError
- from os import path
-
- def help2md(help_out):
-@@ -63,4 +63,10 @@ def main(argv):
- open(target, "w").write(upcase_md)
-
- if __name__ == "__main__":
-- main(sys.argv)
-+ try:
-+ main(sys.argv)
-+ except CalledProcessError, e:
-+ if hasattr(e, "output") and e.output:
-+ print "\n%s\n\n%s\n" % (e, e.output)
-+ raise
-+
-diff --git a/python/qpid_dispatch_internal/compat/subproc.py b/python/qpid_dispatch_internal/compat/subproc.py
-index 69a511d..7927961 100644
---- a/python/qpid_dispatch_internal/compat/subproc.py
-+++ b/python/qpid_dispatch_internal/compat/subproc.py
-@@ -38,5 +38,7 @@ except ImportError:
- p = Popen(args, stdout=PIPE, stdin=stdin, stderr=stderr, shell=shell, universal_newlines=universal_newlines, **kwargs)
- out, err = p.communicate()
- if p.returncode:
-- raise CalledProcessError(p.returncode, args)
-+ e = CalledProcessError(p.returncode, args)
-+ e.output = err or out
-+ raise e
- return out
---
-2.1.0
-
diff --git a/0007-NO-JIRA-Make-python-setup.py.in-respect-DESTDIR-on-p.patch b/0007-NO-JIRA-Make-python-setup.py.in-respect-DESTDIR-on-p.patch
deleted file mode 100644
index 4d52b23..0000000
--- a/0007-NO-JIRA-Make-python-setup.py.in-respect-DESTDIR-on-p.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a080390cd25e09685906a9dd42f53a65497a0f6f Mon Sep 17 00:00:00 2001
-From: Alan Conway <aconway at apache.org>
-Date: Tue, 10 Feb 2015 19:44:41 +0000
-Subject: [PATCH 07/10] NO-JIRA: Make python/setup.py.in respect DESTDIR on
- python 2.6
-
-git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658787 13f79535-47bb-0310-9956-ffa450edef68
----
- bin/test.sh | 2 ++
- python/setup.py.in | 9 ++++++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/bin/test.sh b/bin/test.sh
-index 7b56dda..44f8465 100755
---- a/bin/test.sh
-+++ b/bin/test.sh
-@@ -18,6 +18,8 @@
- # under the License.
- #
-
-+test -z "$SOURCE_DIR" -a -f config.sh && source ./config.sh
-+
- if [[ -z "$SOURCE_DIR" ]]; then
- echo "The devel environment isn't ready. Run 'source config.sh' from"
- echo "the base of the dispatch source tree"
-diff --git a/python/setup.py.in b/python/setup.py.in
-index 22e8fb0..af63f5f 100755
---- a/python/setup.py.in
-+++ b/python/setup.py.in
-@@ -22,6 +22,7 @@ from distutils.core import setup
- from distutils.command.build_py import build_py
- from distutils.file_util import copy_file
- from os.path import join
-+from os import environ
-
- """Install public packages and scripts for Qpid Dispatch."""
-
-@@ -38,8 +39,14 @@ class BuildPy(build_py):
- def get_outputs(self, **kwargs):
- return build_py.get_outputs(self, **kwargs) + [join(self.build_lib, m) for m in self.MODULES]
-
--# Install public python modules in standard python locations.
-+options={}
-+destdir = environ.get("DESTDIR")
-+if destdir:
-+ options["install"] = {"root": destdir}
-+
- setup(
-+ options=options,
-+
- name='qpid_dispatch',
- description='Apache Qpid Dispatch tools and libraries.',
- package_dir={'' : '${CMAKE_SOURCE_DIR}/python'},
---
-2.1.0
-
diff --git a/0008-NO-JIRA-Disable-the-daemon-setgid-it-fails-in-deploy.patch b/0008-NO-JIRA-Disable-the-daemon-setgid-it-fails-in-deploy.patch
deleted file mode 100644
index 4035943..0000000
--- a/0008-NO-JIRA-Disable-the-daemon-setgid-it-fails-in-deploy.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e0781c743b915e1ec305e5583aac5d0fd2364aff Mon Sep 17 00:00:00 2001
-From: Ted Ross <tross at apache.org>
-Date: Tue, 10 Feb 2015 22:43:21 +0000
-Subject: [PATCH 08/10] NO-JIRA - Disable the daemon-setgid, it fails in
- deployment.
-
-git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658828 13f79535-47bb-0310-9956-ffa450edef68
----
- router/src/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/router/src/main.c b/router/src/main.c
-index a5ba493..92f4bed 100644
---- a/router/src/main.c
-+++ b/router/src/main.c
-@@ -219,8 +219,8 @@ static void daemon_process(const char *config_path, const char *python_pkgdir,
- if (user) {
- struct passwd *pwd = getpwnam(user);
- if (pwd == 0) fail(pipefd[1], "Can't look up user %s", user);
-- if (setuid(pwd->pw_uid) < 0) fail(pipefd[1], "Can't set user ID for user %s", user);
-- if (setgid(pwd->pw_gid) < 0) fail(pipefd[1], "Cant set group ID for user %s", user);
-+ if (setuid(pwd->pw_uid) < 0) fail(pipefd[1], "Can't set user ID for user %s, errno=%d", user, errno);
-+ //if (setgid(pwd->pw_gid) < 0) fail(pipefd[1], "Can't set group ID for user %s, errno=%d", user, errno);
- }
-
- main_process(config_path, python_pkgdir, pipefd[1]);
---
-2.1.0
-
diff --git a/0009-NO-JIRA-Do-no-build-man-pages.patch b/0009-NO-JIRA-Do-no-build-man-pages.patch
deleted file mode 100644
index 68623c8..0000000
--- a/0009-NO-JIRA-Do-no-build-man-pages.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e21b36d0484b53ccdf5bca88a71a73fa34f7e2ff Mon Sep 17 00:00:00 2001
-From: "Darryl L. Pierce" <dpierce at redhat.com>
-Date: Wed, 11 Feb 2015 08:25:33 -0500
-Subject: [PATCH 09/10] NO-JIRA: Do no build man pages
-
----
- doc/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index e8e1284..d397cef 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -18,5 +18,5 @@
- ##
-
- add_subdirectory(api)
--add_subdirectory(man)
--add_subdirectory(book)
-+# add_subdirectory(man)
-+# add_subdirectory(book)
---
-2.1.0
-
diff --git a/0010-NO-JIRA-Remove-dependency-of-qdrouterd-on-proton-pyt.patch b/0010-NO-JIRA-Remove-dependency-of-qdrouterd-on-proton-pyt.patch
deleted file mode 100644
index 607f5ab..0000000
--- a/0010-NO-JIRA-Remove-dependency-of-qdrouterd-on-proton-pyt.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From e2b7be6a1f4f313829ec1a0366151f0971383c2b Mon Sep 17 00:00:00 2001
-From: Alan Conway <aconway at apache.org>
-Date: Wed, 11 Feb 2015 14:57:41 +0000
-Subject: [PATCH 10/10] NO-JIRA: Remove dependency of qdrouterd on proton
- python binding.
-
-The dependency was introduced in error by a careless use of
- from .client import *
-in qpid_dispatch.management.__init__.py
-This was dragging in the client module if *any* module under qpid_dispatch.management
-was imported.
-
-git-svn-id: https://svn.apache.org/repos/asf/qpid/dispatch/trunk@1658975 13f79535-47bb-0310-9956-ffa450edef68
----
- python/qpid_dispatch/management/__init__.py | 2 --
- tests/system_test.py | 2 +-
- tests/system_tests_management.py | 2 +-
- tools/qdmanage | 2 +-
- tools/qdstat | 2 +-
- 5 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/python/qpid_dispatch/management/__init__.py b/python/qpid_dispatch/management/__init__.py
-index 11adc7d..ce0dd0c 100644
---- a/python/qpid_dispatch/management/__init__.py
-+++ b/python/qpid_dispatch/management/__init__.py
-@@ -17,5 +17,3 @@
- # under the License
- #
- """AMQP management client package."""
--
--from .client import *
-diff --git a/tests/system_test.py b/tests/system_test.py
-index 128b2d3..48e740a 100644
---- a/tests/system_test.py
-+++ b/tests/system_test.py
-@@ -56,7 +56,7 @@ import os, time, socket, random, subprocess, shutil, unittest, __main__, re
- from copy import copy
- import proton
- from proton import Message
--from qpid_dispatch.management import Node
-+from qpid_dispatch.management.client import Node
- from run import with_valgrind
-
- # Optional modules
-diff --git a/tests/system_tests_management.py b/tests/system_tests_management.py
-index 4d5339d..537f8b8 100644
---- a/tests/system_tests_management.py
-+++ b/tests/system_tests_management.py
-@@ -20,7 +20,7 @@
- """System tests for management of qdrouter"""
-
- import unittest, system_test, re, os
--from qpid_dispatch.management import Node, ManagementError, Url, BadRequestStatus, NotImplementedStatus, NotFoundStatus, ForbiddenStatus
-+from qpid_dispatch.management.client import Node, ManagementError, Url, BadRequestStatus, NotImplementedStatus, NotFoundStatus, ForbiddenStatus
- from system_test import Qdrouterd, message, retry, wait_ports, Process
- from proton import ConnectionException
- from itertools import chain
-diff --git a/tools/qdmanage b/tools/qdmanage
-index 4bf067f..6dd5908 100755
---- a/tools/qdmanage
-+++ b/tools/qdmanage
-@@ -21,7 +21,7 @@
-
- import sys, json
- import qpid_dispatch_site
--from qpid_dispatch.management import Node, Url
-+from qpid_dispatch.management.client import Node, Url
- from collections import Mapping, Sequence
- from optparse import OptionGroup
- from qpid_dispatch_internal.tools.command import OptionParser, Option, UsageError, connection_options, check_args, main
-diff --git a/tools/qdstat b/tools/qdstat
-index f89f728..4a57ba4 100755
---- a/tools/qdstat
-+++ b/tools/qdstat
-@@ -27,7 +27,7 @@ import socket
- import re
- from proton import Messenger, Message, Timeout
- import qpid_dispatch_site
--from qpid_dispatch.management import Url, Node, Entity
-+from qpid_dispatch.management.client import Url, Node, Entity
- from qpid_dispatch_internal.management.qdrouter import QdSchema
- from qpid_dispatch_internal.tools import Display, Header, Sorter, YN, Commas, TimeLong
- from qpid_dispatch_internal.tools.command import connection_options, main, OptionParser
---
-2.1.0
-
diff --git a/qpid-dispatch.spec b/qpid-dispatch.spec
index 721f049..2bcbefd 100644
--- a/qpid-dispatch.spec
+++ b/qpid-dispatch.spec
@@ -17,23 +17,15 @@
%global proton_minimum_version 0.8
Name: qpid-dispatch
-Version: 0.3
-Release: 4%{?dist}
+Version: 0.4
+Release: 1%{?dist}
Summary: Dispatch router for Qpid
License: ASL 2.0
URL: http://qpid.apache.org/
Source0: http://www.apache.org/dist/qpid/dispatch/%{version}/qpid-dispatch-%{version}.tar.gz
Patch0001: 0001-NO-JIRA-Systemd-control-file-for-qdrouterd.patch
-Patch0002: 0002-NO-JIRA-SysVInit-script-for-qdrouterd.patch
-Patch0003: 0003-DISPATCH-96-Fix-installing-the-qpid_dispatch_site.py.patch
-Patch0004: 0004-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch
-Patch0005: 0005-NO-JIRA-Fix-error-handling-bug-in-check_output-for-o.patch
-Patch0006: 0006-NO-JIRA-Add-program-output-to-exception-in-check_out.patch
-Patch0007: 0007-NO-JIRA-Make-python-setup.py.in-respect-DESTDIR-on-p.patch
-Patch0008: 0008-NO-JIRA-Disable-the-daemon-setgid-it-fails-in-deploy.patch
-Patch0009: 0009-NO-JIRA-Do-no-build-man-pages.patch
-Patch0010: 0010-NO-JIRA-Remove-dependency-of-qdrouterd-on-proton-pyt.patch
+Patch0002: 0002-NO-JIRA-new-SysVInit-script-for-qdrouterd-from-Alan-.patch
BuildRequires: qpid-proton-c-devel >= %{proton_minimum_version}
BuildRequires: python-devel
@@ -80,6 +72,7 @@ Requires: qpid-proton-c%{?_isa} >= %{proton_minimum_version}
%exclude %{_exec_prefix}/lib/qpid-dispatch/tests
%{python_sitelib}/qpid_dispatch_site.py*
%{python_sitelib}/qpid_dispatch
+%exclude %{python_sitelib}/*egg-info
%post -n libqpid-dispatch -p /sbin/ldconfig
@@ -140,10 +133,10 @@ Requires(postun): systemd
%pre router
-getent group qpidd >/dev/null || groupadd -r qpidd
-getent passwd qpidd >/dev/null || \
- useradd -r -M -g qpidd -d %{_localstatedir}/lib/qpidd -s /sbin/nologin \
- -c "Owner of Qpidd Daemons" qpidd
+getent group qdrouterd >/dev/null || groupadd -r qdrouterd
+getent passwd qdrouterd >/dev/null || \
+ useradd -r -M -g qdrouterd -d %{_localstatedir}/lib/qdrouterd -s /sbin/nologin \
+ -c "Owner of Qpidd Daemons" qdrouterd
exit 0
@@ -226,14 +219,6 @@ Requires: libqpid-dispatch%{?_isa} = %{version}-%{release}
%endif
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
%build
@@ -269,6 +254,10 @@ install -pm 755 %{_builddir}/qpid-dispatch-%{version}/etc/qdrouterd \
%changelog
+* Tue Apr 21 2015 Darryl L. Pierce <dpierce at rehdat.com> - 0.4-1
+- Rebased on Dispatch 0.4.
+- Changed username for qdrouterd to be qdrouterd.
+
* Tue Feb 24 2015 Darryl L. Pierce <dpierce at redhat.com> - 0.3-4
- Changed SysVInit script to properly name qdrouterd as the service to start.
diff --git a/sources b/sources
index 8ced4a1..ffc754b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d2c312b1db37e3cb3529ed1da4546dc qpid-dispatch-0.3.tar.gz
+c7056fb980295ae687188a7a76eb86a7 qpid-dispatch-0.4.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/qpid-dispatch.git/commit/?h=f22&id=09bbadec4da011031afaff8a8e19ce4310cd20ae
More information about the scm-commits
mailing list