Hello community,
here is the log from the commit of package booth for openSUSE:Factory checked
in at 2017-06-12 15:33:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/booth (Old)
and /work/SRC/openSUSE:Factory/.booth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "booth"
Mon Jun 12 15:33:55 2017 rev:41 rq:502676 version:1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-06-02
10:34:19.347511043 +0200
+++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2017-06-12
15:33:55.739690404 +0200
@@ -2 +2 @@
-Thu Jun 1 13:23:42 UTC 2017 - ckowalc...@suse.com
+Thu Jun 2 14:11:42 UTC 2017 - ckowalc...@suse.com
@@ -4,2 +4,4 @@
-- configuration: handle hostnames in booth.conf file
-- build: create and set working directory
+- Build: create and set working directory (bsc#1039727)
+ * bug-1039727_booth-build.patch
+- Configuration: handle hostnames in booth.conf file (bsc#1037422)
+- Upstream version cs: bbddf969550969784b76b743baecdcf72796bdf7
Old:
----
booth-1.0+20170601.9647c6d.tar.bz2
New:
----
booth.tar.bz2
bug-1039727_booth-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ booth.spec ++++++
--- /var/tmp/diff_new_pack.Wqkpo0/_old 2017-06-12 15:33:57.091499744 +0200
+++ /var/tmp/diff_new_pack.Wqkpo0/_new 2017-06-12 15:33:57.095499180 +0200
@@ -25,9 +25,6 @@
%global test_path %{_datadir}/booth/tests
-# local commit:
-%global commit 1.0+20170601.9647c6d
-
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
Name: booth
@@ -37,8 +34,9 @@
License: GPL-2.0+
Group: Productivity/Clustering/HA
Url: https://github.com/ClusterLabs/booth
-Source: %{name}-%{commit}.tar.bz2
+Source: booth.tar.bz2
Source1: %{name}-rpmlintrc
+Patch1: bug-1039727_booth-build.patch
BuildRequires: asciidoc
BuildRequires: autoconf
BuildRequires: automake
@@ -76,7 +74,8 @@
the Cluster Ticket Manager for Pacemaker.
%prep
-%setup -q -n %{name}-%{commit}
+%setup -q -n %{name}
+%patch1 -p1
%build
autoreconf -fvi
@@ -161,6 +160,9 @@
%doc AUTHORS README COPYING
%doc README.upgrade-from-v0.1
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores
+
%files test
%defattr(-,root,root)
%doc README-testing
++++++ booth-1.0+20170601.9647c6d.tar.bz2 -> booth.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/.git_info
new/booth/.git_info
--- old/booth-1.0+20170601.9647c6d/.git_info 2017-06-01 15:45:18.779767136
+0200
+++ new/booth/.git_info 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-v1.0-114-g9647c6d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/Makefile.am
new/booth/Makefile.am
--- old/booth-1.0+20170601.9647c6d/Makefile.am 2017-06-01 14:54:29.000000000
+0200
+++ new/booth/Makefile.am 2017-06-01 13:52:09.000000000 +0200
@@ -83,10 +83,6 @@
$(INSTALL) -d $(DESTDIR)/${boothsitedir}
$(INSTALL) -d $(DESTDIR)/${boothocfdir}
$(INSTALL) -d $(DESTDIR)/${SOCKETDIR}
- $(INSTALL) -d $(DESTDIR)/${BOOTH_LIB_DIR} -m 750
- -chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP)
$(DESTDIR)/${BOOTH_LIB_DIR}
- $(INSTALL) -d $(DESTDIR)/${BOOTH_CORE_DIR} -m 750
- -chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP)
$(DESTDIR)/${BOOTH_CORE_DIR}
install-exec-hook:
ln -sf ${sbindir}/boothd $(DESTDIR)/${sbindir}/booth
@@ -97,8 +93,6 @@
rmdir $(DESTDIR)/${bootharbitratordir} || :;
rmdir $(DESTDIR)/${boothsitedir} || :;
rmdir $(DESTDIR)/${SOCKETDIR} || :;
- rmdir $(DESTDIR)/${BOOTH_CORE_DIR} || :;
- rmdir $(DESTDIR)/${BOOTH_LIB_DIR} || :;
test: check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/booth.spec
new/booth/booth.spec
--- old/booth-1.0+20170601.9647c6d/booth.spec 2017-06-01 14:54:29.000000000
+0200
+++ new/booth/booth.spec 2017-06-01 13:52:09.000000000 +0200
@@ -166,8 +166,6 @@
%dir /usr/lib/ocf/lib
%dir /usr/lib/ocf/lib/booth
%dir %{_sysconfdir}/booth
-%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/
-%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores
%{_sbindir}/rcbooth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
/usr/lib/ocf/lib/booth/geo_attr.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/configure.ac
new/booth/configure.ac
--- old/booth-1.0+20170601.9647c6d/configure.ac 2017-06-01 14:54:29.000000000
+0200
+++ new/booth/configure.ac 2017-06-01 13:52:09.000000000 +0200
@@ -169,31 +169,6 @@
return $RC
}
-## extract header or define
-try_extract_header_define() {
- AC_MSG_CHECKING(if $2 in $1 exists)
- Cfile=$srcdir/extract_define.$2.${$}
- printf "#include <stdio.h>\n" > ${Cfile}.c
- printf "#include <%s>\n" $1 >> ${Cfile}.c
- printf "int main(int argc, char **argv) {\n" >> ${Cfile}.c
- printf "#ifdef %s\n" $2 >> ${Cfile}.c
- printf "printf(\"%%s\", %s);\n" $2 >> ${Cfile}.c
- printf "#endif \n return 0; }\n" >> ${Cfile}.c
- $CC $CFLAGS ${Cfile}.c -o ${Cfile} 2>/dev/null
- value=
- if test -x ${Cfile}; then
- value=`${Cfile} 2>/dev/null`
- fi
- if test x"${value}" == x""; then
- value=$3
- AC_MSG_RESULT(default: $value)
- else
- AC_MSG_RESULT($value)
- fi
- printf $value
- rm -rf ${Cfile}.c ${Cfile} ${Cfile}.dSYM ${Cfile}.gcno
- }
-
## cleanup
AC_MSG_NOTICE(Sanitizing prefix: ${prefix})
case $prefix in
@@ -341,15 +316,6 @@
fi
AM_CONDITIONAL([COREDUMP_NURSING], [test "x$coredump_nursing" != "xno"])
-# define CRM daemon user & group
-CRM_DAEMON_USER=`try_extract_header_define glue_config.h HA_CCMUSER hacluster`
-AC_DEFINE_UNQUOTED(CRM_DAEMON_USER,"$CRM_DAEMON_USER", User to run Booth
daemon as)
-AC_SUBST(CRM_DAEMON_USER)
-
-CRM_DAEMON_GROUP=`try_extract_header_define glue_config.h HA_APIGROUP haclient`
-AC_DEFINE_UNQUOTED(CRM_DAEMON_GROUP,"$CRM_DAEMON_GROUP", Group to run Booth
daemon as)
-AC_SUBST(CRM_DAEMON_GROUP)
-
# OS detection
# THIS SECTION MUST DIE!
CP=cp
@@ -549,19 +515,11 @@
AC_DEFINE_UNQUOTED([SOCKETDIR], "$(eval echo ${SOCKETDIR})", [Socket
directory])
-BOOTH_LIB_DIR=${localstatedir}/lib/booth
-BOOTH_CORE_DIR=${localstatedir}/lib/booth/cores
BOOTHSYSCONFDIR=${sysconfdir}/booth
-
AC_SUBST([HAVE_LOG_CIB_DIFF])
AC_SUBST([HAVE_XML_LOG_PATCHSET])
-AC_SUBST([BOOTH_LIB_DIR])
-AC_SUBST([BOOTH_CORE_DIR])
AC_SUBST([BOOTHSYSCONFDIR])
AC_SUBST([BOOTH_BUILD_VERSION])
-
-AC_DEFINE_UNQUOTED([BOOTH_LIB_DIR], "$(eval echo ${BOOTH_LIB_DIR})", [booth
lib directory])
-AC_DEFINE_UNQUOTED([BOOTH_CORE_DIR], "$(eval echo ${BOOTH_CORE_DIR})", [booth
working directory])
AC_DEFINE_UNQUOTED([BOOTHSYSCONFDIR], "$(eval echo ${BOOTHSYSCONFDIR})",
[booth config directory])
AC_DEFINE_UNQUOTED([PACKAGE_FEATURES], "${PACKAGE_FEATURES}", [booth built-in
features])
@@ -590,9 +548,6 @@
AC_MSG_RESULT([ Range2random provider = ${range2random_provider}])
AC_MSG_RESULT([ Nametag provider = ${nametag_provider}])
AC_MSG_RESULT([ Coredump nursing = ${coredump_nursing}])
-AC_MSG_RESULT([ Working directory = ${BOOTH_CORE_DIR}])
-AC_MSG_RESULT([ HA group name = ${CRM_DAEMON_GROUP}])
-AC_MSG_RESULT([ HA user name = ${CRM_DAEMON_USER}])
AC_MSG_RESULT([])
AC_MSG_RESULT([$PACKAGE build info:])
AC_MSG_RESULT([ Library SONAME = ${SONAME}])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/booth-1.0+20170601.9647c6d/src/main.c
new/booth/src/main.c
--- old/booth-1.0+20170601.9647c6d/src/main.c 2017-06-01 14:54:29.000000000
+0200
+++ new/booth/src/main.c 2017-06-01 13:52:09.000000000 +0200
@@ -1477,10 +1477,6 @@
}
cl_cdtocoredir();
prctl(PR_SET_DUMPABLE, (unsigned long)TRUE, 0UL, 0UL, 0UL);
-#else
- if (chdir(BOOTH_CORE_DIR) < 0) {
- log_error("cannot change working directory to %s",
BOOTH_CORE_DIR);
- }
#endif
signal(SIGCHLD, (__sighandler_t)wait_child);
++++++ bug-1039727_booth-build.patch ++++++
Index: booth/Makefile.am
===================================================================
--- booth.orig/Makefile.am
+++ booth/Makefile.am
@@ -83,6 +83,10 @@ install-exec-local:
$(INSTALL) -d $(DESTDIR)/${boothsitedir}
$(INSTALL) -d $(DESTDIR)/${boothocfdir}
$(INSTALL) -d $(DESTDIR)/${SOCKETDIR}
+ $(INSTALL) -d $(DESTDIR)/${BOOTH_LIB_DIR} -m 750
+ -chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP)
$(DESTDIR)/${BOOTH_LIB_DIR}
+ $(INSTALL) -d $(DESTDIR)/${BOOTH_CORE_DIR} -m 750
+ -chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP)
$(DESTDIR)/${BOOTH_CORE_DIR}
install-exec-hook:
ln -sf ${sbindir}/boothd $(DESTDIR)/${sbindir}/booth
@@ -93,6 +97,8 @@ uninstall-local:
rmdir $(DESTDIR)/${bootharbitratordir} || :;
rmdir $(DESTDIR)/${boothsitedir} || :;
rmdir $(DESTDIR)/${SOCKETDIR} || :;
+ rmdir $(DESTDIR)/${BOOTH_CORE_DIR} || :;
+ rmdir $(DESTDIR)/${BOOTH_LIB_DIR} || :;
test: check
Index: booth/booth.spec
===================================================================
--- booth.orig/booth.spec
+++ booth/booth.spec
@@ -166,6 +166,8 @@ echo "%%run_build_tests set to %run_buil
%dir /usr/lib/ocf/lib
%dir /usr/lib/ocf/lib/booth
%dir %{_sysconfdir}/booth
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/
+%dir %attr (750, %{uname}, %{gname}) %{_var}/lib/booth/cores
%{_sbindir}/rcbooth-arbitrator
/usr/lib/ocf/resource.d/pacemaker/booth-site
/usr/lib/ocf/lib/booth/geo_attr.sh
Index: booth/configure.ac
===================================================================
--- booth.orig/configure.ac
+++ booth/configure.ac
@@ -169,6 +169,31 @@ cc_supports_flag() {
return $RC
}
+## extract header or define
+try_extract_header_define() {
+ AC_MSG_CHECKING(if $2 in $1 exists)
+ Cfile=$srcdir/extract_define.$2.${$}
+ printf "#include <stdio.h>\n" > ${Cfile}.c
+ printf "#include <%s>\n" $1 >> ${Cfile}.c
+ printf "int main(int argc, char **argv) {\n" >> ${Cfile}.c
+ printf "#ifdef %s\n" $2 >> ${Cfile}.c
+ printf "printf(\"%%s\", %s);\n" $2 >> ${Cfile}.c
+ printf "#endif \n return 0; }\n" >> ${Cfile}.c
+ $CC $CFLAGS ${Cfile}.c -o ${Cfile} 2>/dev/null
+ value=
+ if test -x ${Cfile}; then
+ value=`${Cfile} 2>/dev/null`
+ fi
+ if test x"${value}" == x""; then
+ value=$3
+ AC_MSG_RESULT(default: $value)
+ else
+ AC_MSG_RESULT($value)
+ fi
+ printf $value
+ rm -rf ${Cfile}.c ${Cfile} ${Cfile}.dSYM ${Cfile}.gcno
+ }
+
## cleanup
AC_MSG_NOTICE(Sanitizing prefix: ${prefix})
case $prefix in
@@ -316,6 +341,15 @@ if test "x$coredump_nursing" != "xno"; t
fi
AM_CONDITIONAL([COREDUMP_NURSING], [test "x$coredump_nursing" != "xno"])
+# define CRM daemon user & group
+CRM_DAEMON_USER=`try_extract_header_define glue_config.h HA_CCMUSER hacluster`
+AC_DEFINE_UNQUOTED(CRM_DAEMON_USER,"$CRM_DAEMON_USER", User to run Booth
daemon as)
+AC_SUBST(CRM_DAEMON_USER)
+
+CRM_DAEMON_GROUP=`try_extract_header_define glue_config.h HA_APIGROUP haclient`
+AC_DEFINE_UNQUOTED(CRM_DAEMON_GROUP,"$CRM_DAEMON_GROUP", Group to run Booth
daemon as)
+AC_SUBST(CRM_DAEMON_GROUP)
+
# OS detection
# THIS SECTION MUST DIE!
CP=cp
@@ -515,11 +549,19 @@ AC_SUBST([LINT_FLAGS])
AC_DEFINE_UNQUOTED([SOCKETDIR], "$(eval echo ${SOCKETDIR})", [Socket
directory])
+BOOTH_LIB_DIR=${localstatedir}/lib/booth
+BOOTH_CORE_DIR=${localstatedir}/lib/booth/cores
BOOTHSYSCONFDIR=${sysconfdir}/booth
+
AC_SUBST([HAVE_LOG_CIB_DIFF])
AC_SUBST([HAVE_XML_LOG_PATCHSET])
+AC_SUBST([BOOTH_LIB_DIR])
+AC_SUBST([BOOTH_CORE_DIR])
AC_SUBST([BOOTHSYSCONFDIR])
AC_SUBST([BOOTH_BUILD_VERSION])
+
+AC_DEFINE_UNQUOTED([BOOTH_LIB_DIR], "$(eval echo ${BOOTH_LIB_DIR})", [booth
lib directory])
+AC_DEFINE_UNQUOTED([BOOTH_CORE_DIR], "$(eval echo ${BOOTH_CORE_DIR})", [booth
working directory])
AC_DEFINE_UNQUOTED([BOOTHSYSCONFDIR], "$(eval echo ${BOOTHSYSCONFDIR})",
[booth config directory])
AC_DEFINE_UNQUOTED([PACKAGE_FEATURES], "${PACKAGE_FEATURES}", [booth built-in
features])
@@ -548,6 +590,9 @@ AC_MSG_RESULT([ Logging provider
AC_MSG_RESULT([ Range2random provider = ${range2random_provider}])
AC_MSG_RESULT([ Nametag provider = ${nametag_provider}])
AC_MSG_RESULT([ Coredump nursing = ${coredump_nursing}])
+AC_MSG_RESULT([ Working directory = ${BOOTH_CORE_DIR}])
+AC_MSG_RESULT([ HA group name = ${CRM_DAEMON_GROUP}])
+AC_MSG_RESULT([ HA user name = ${CRM_DAEMON_USER}])
AC_MSG_RESULT([])
AC_MSG_RESULT([$PACKAGE build info:])
AC_MSG_RESULT([ Library SONAME = ${SONAME}])
Index: booth/src/main.c
===================================================================
--- booth.orig/src/main.c
+++ booth/src/main.c
@@ -1477,6 +1477,10 @@ static int do_server(int type)
}
cl_cdtocoredir();
prctl(PR_SET_DUMPABLE, (unsigned long)TRUE, 0UL, 0UL, 0UL);
+#else
+ if (chdir(BOOTH_CORE_DIR) < 0) {
+ log_error("cannot change working directory to %s",
BOOTH_CORE_DIR);
+ }
#endif
signal(SIGCHLD, (__sighandler_t)wait_child);
