[glite-lb-logger-msg] Initial import (#1062757).
František Dvořák
valtri at fedoraproject.org
Tue Sep 30 22:22:23 UTC 2014
commit 3c6b4c30aa26fa667fb4fbfa5ee3b17dcc05a58b
Author: František Dvořák <valtri at civ.zcu.cz>
Date: Wed Oct 1 00:25:54 2014 +0200
Initial import (#1062757).
.gitignore | 1 +
glite-lb-logger-msg.spec | 88 ++++++++++++++++
man-pages.patch | 247 ++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 337 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..33ede4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/glite-lb-logger-msg-1.2.13.tar.gz
diff --git a/glite-lb-logger-msg.spec b/glite-lb-logger-msg.spec
new file mode 100644
index 0000000..bc1a11f
--- /dev/null
+++ b/glite-lb-logger-msg.spec
@@ -0,0 +1,88 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
+Name: glite-lb-logger-msg
+Version: 1.2.13
+Release: 2%{?dist}
+Summary: Plugin for sending notifications to messaging infrastructure
+
+License: ASL 2.0
+URL: http://glite.cern.ch
+Source: http://scientific.zcu.cz/emi/emi.lb.logger-msg/%{name}-%{version}.tar.gz
+# https://github.com/CESNET/glite-lb/commit/b92e20cc3a0c4088c74a7ce4c2b8e20dd7807a16
+Patch1: man-pages.patch
+
+BuildRequires: activemq-cpp-devel
+# apr-devel needed only for activemq-cpp <= 3.4 (Fedora <= 19)
+BuildRequires: apr-devel
+BuildRequires: cppunit-devel
+BuildRequires: glite-lb-logger-devel
+BuildRequires: glite-lbjp-common-log-devel
+BuildRequires: glite-lbjp-common-trio-devel
+BuildRequires: libtool
+BuildRequires: perl
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires: perl-Pod-Perldoc
+%endif
+BuildRequires: perl(Getopt::Long)
+BuildRequires: perl(Pod::Man)
+BuildRequires: perl(POSIX)
+BuildRequires: pkgconfig
+Requires: crontabs
+Requires: perl-LDAP
+Requires: glite-lb-logger%{?_isa}
+
+%description
+L&B logger plugin for delivering notification messages to messaging
+infrastructure.
+
+
+%prep
+%setup -q
+%patch1 -p2
+
+
+%build
+./configure --root=/ --prefix=%{_prefix} --libdir=%{_lib} --docdir=%{_pkgdocdir} --sysdefaultdir=%{_sysconfdir}/sysconfig
+# missing dependency on apr in .pc file for activemq-cpp <= 3.4.x
+%if 0%{?fedora} && 0%{?fedora} <= 19
+echo >> Makefile.inc
+echo "ACTIVEMQ_CPP_CFLAGS+=`pkg-config --cflags apr-1`" >> Makefile.inc
+%endif
+CFLAGS="%{?optflags}" LDFLAGS="%{?__global_ldflags}" make %{?_smp_mflags}
+
+
+%install
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/*.la
+
+
+%files
+%doc ChangeLog LICENSE config/msg.conf.example
+%dir %{_sysconfdir}/glite-lb/
+%dir %{_libdir}/glite-lb/
+%dir %{_libdir}/glite-lb/examples/
+%config(noreplace) %{_sysconfdir}/cron.d/%{name}
+%{_libdir}/activemq_cpp_plugin.so
+%{_libdir}/activemq_cpp_plugin.so.0
+%{_libdir}/activemq_cpp_plugin.so.0.0.0
+%{_libdir}/glite-lb/examples/glite-lb-cmsclient
+%{_sbindir}/glite-lb-msg-*
+%{_mandir}/man8/*.8*
+
+
+%changelog
+* Tue Sep 30 2014 František Dvořák <valtri at civ.zcu.cz> - 1.2.13-2
+- Added link to upstream man pages patch
+- Launching configure script directly
+
+* Tue Jul 01 2014 František Dvořák <valtri at civ.zcu.cz> - 1.2.13-1
+- New release 1.2.13 (L&B 4.1.2)
+- Added man pages
+- Consistent style with buildroot macro
+
+* Sun Jun 01 2014 František Dvořák <valtri at civ.zcu.cz> - 1.2.12-1
+- New release 1.2.12 (L&B 4.1.1)
+
+* Fri Feb 07 2014 František Dvořák <valtri at civ.zcu.cz> - 1.2.11-1
+- Initial package
diff --git a/man-pages.patch b/man-pages.patch
new file mode 100644
index 0000000..4d53dff
--- /dev/null
+++ b/man-pages.patch
@@ -0,0 +1,247 @@
+commit b92e20cc3a0c4088c74a7ce4c2b8e20dd7807a16
+Author: František Dvořák <valtri at civ.zcu.cz>
+Date: Mon Jun 30 23:14:41 2014 +0200
+
+ Manual pages for glite-lb-logger messaging plugin tools, enable generating from perl Pod.
+
+diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
+index a10569f..2811b66 100644
+--- a/org.glite.lb.logger-msg/Makefile
++++ b/org.glite.lb.logger-msg/Makefile
+@@ -26,6 +26,7 @@ VPATH:=${top_srcdir}/src:${top_srcdir}/interface:${top_srcdir}/test:${top_srcdir
+
+ SOURCES=\
+ config/msg.* \
++ doc/*.8 \
+ examples/*.cpp \
+ project/il.conf \
+ src/*.cpp src/msg-* \
+@@ -70,6 +71,8 @@ SOLINK:=libtool --mode=link ${CXX} -module ${LDFLAGS} -rpath ${stagedir}${prefix
+
+ HDRS:=
+
++MAN8:=glite-lb-msg-brokers.8 glite-lb-msg-config.8
++
+ COMMON_LIB:=
+
+ EXT_LIB:=${ACTIVEMQ_CPP_LIBS}
+@@ -93,7 +96,9 @@ endif
+
+ sysdefaultdir?=${sysconfdir}/default
+
+-all compile: ${PLUGIN_LIB} ${EXAMPLES} ${SCRIPTS}
++all: man compile
++
++compile: ${PLUGIN_LIB} ${EXAMPLES} ${SCRIPTS}
+
+ ${PLUGIN_LIB}: ${PLUGIN_LOBJS}
+ ${SOLINK} -o $@ ${PLUGIN_LOBJS} ${EXT_LIB} -lglite_lb_common${default_flavour} -lglite_jobid -lglite_lbu_log
+@@ -104,7 +109,7 @@ ${PLUGIN_LIB}: ${PLUGIN_LOBJS}
+ glite-lb-cmsclient: cmsclient.o
+ $(CXX) $< ${EXT_LIB} -o $@
+
+-man: ${MAN_GZ}
++man: glite-lb-msg-brokers.8
+
+ stage: compile
+ $(MAKE) install PREFIX=${stagedir}
+@@ -123,12 +128,14 @@ install:
+ -mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin
+ -mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
+ -mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/cron.d
++ -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man8
+ ${INSTALL} -m 644 ${top_srcdir}/config/msg.conf.example ${DESTDIR}${PREFIX}${docdir}
+ ${INSTALL} -m 755 ${PLUGIN_LIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}
+ ${INSTALL} -m 755 ${EXAMPLES} ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
+ ${INSTALL} -m 755 ${top_srcdir}/src/msg-brokers ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-msg-brokers
+ ${INSTALL} -m 755 msg-config.new ${DESTDIR}${PREFIX}${prefix}/sbin/glite-lb-msg-config
+ ${INSTALL} -m 644 msg.cron.new ${DESTDIR}${PREFIX}${sysconfdir}/cron.d/glite-lb-logger-msg
++ ${INSTALL} -m 644 glite-lb-msg-brokers.8 ${top_srcdir}/doc/*.8 ${DESTDIR}${PREFIX}${prefix}/share/man/man8
+
+ %.lo %.o: %.cpp
+ ${COMPILEXX} -c $< -o $@
+@@ -139,8 +146,13 @@ install:
+ clean:
+ rm -rvf .libs/ *.o *.lo ${PLUGIN_LIB} ${MAN_GZ} ${EXAMPLES} ${SCRIPTS}
+ rm -rvf dist ${package}-*.tar.gz
++ rm -fv glite-lb-msg-brokers.8
+
+ distclean:
+ rm -rvf project/changelog Makefile.inc *.spec debian/
+
++glite-lb-msg-brokers.8: msg-brokers
++ perldoc -M Pod::Man $< > $@
++ sed -i 's/^\.TH.*/.TH GLITE-LB-MSG-BROKERS 8 "June 2014" "CESNET" "Logging\&Bookkeeping"/' $@
++
+ .PHONY: default all compile man stage check install clean dist distclean distcheck
+diff --git a/org.glite.lb.logger-msg/doc/glite-lb-msg-config.8 b/org.glite.lb.logger-msg/doc/glite-lb-msg-config.8
+new file mode 100644
+index 0000000..032d2a9
+--- /dev/null
++++ b/org.glite.lb.logger-msg/doc/glite-lb-msg-config.8
+@@ -0,0 +1,53 @@
++.TH GLITE_LB_MSG_CONFIG 8 "June 2014" "CESNET" "Logging&Bookkeeping"
++
++
++.SH NAME
++glite-lb-msg-config - glite-lb-logger messaging plugin configuration generator
++
++
++.SH SYNOPSIS
++\fBglite-lb-msg-config\fR \fITEMPLATE\fR [\fITARGET\fR]
++
++
++.SH DESCRIPTION
++\fBglite-lb-msg-config\fR is a script for generating or updating glite-lb-logger messaging plugin configuration. Configuration parameters can be specified by environment variables. \fITEMPLATE\fR is the original configuration file, basic content is generated in case the original doesn't exist. \fITARGET\fR is the target configuration file. If \fITARGET\fR is not specified, the \fITEMPLATE\fR is modified instead.
++
++This script is intended primarily to be run by cron, but can be run manually by site admins to avoid waiting for the next cron cycle.
++
++
++.SH ENVIRONMENT
++
++.TP
++.B GLITE_LOCATION \fR[prefix]
++Standard prefix (typically /usr).
++
++.TP
++.B GLITE_LB_MSG_BROKER \fR[]
++The special values are: \fBfalse\fR (do nothing), \fBauto\fR (refresh messaging brokers from BDII), \fBonce\fR (refresh messaging brokers only when \fB$GLITE_LB_SETUP\fR is not set). Empty value means \fBauto\fR, any other values means broker URL list.
++
++For refreshing messaging brokers the \fBglite-lb-msg-brokers\fR(8) utility is called.
++
++.TP
++.B GLITE_LB_MSG_NETWORK \fR[PROD]
++Let \fBglite-lb-msg-brokers\fR(8) search only in specified network. Typical values are PROD or TEST-NWOB.
++
++.TP
++.B LCG_GFAL_INFOSYS \fR[lcg-bdii.cern.ch:2170]
++\fIhost\fR[:\fIport\fR] of the BDII server.
++
++.TP
++.B GLITE_LB_SETUP \fR[]
++Helper variable. It should be set, when this configuration generator is called during setup stage (when \fBonce\fR value in \fB$GLITE_LB_MSG_BROKER\fR should trigger BDII search).
++
++
++.SH BUGS
++Please report all bugs to CESNET gLite L&B issue tracker available at
++.I https://github.com/CESNET/glite-lb/issues
++
++
++.SH AUTHORS
++L&B Product Team, CESNET.
++
++
++.SH SEE ALSO
++\fBglite-lb-msg-brokers\fR(8)
+diff --git a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
+index 345a6cf..5a22e86 100644
+--- a/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
++++ b/org.glite.lb.logger-msg/project/debian.glite-lb-logger-msg.install
+@@ -2,3 +2,4 @@ etc/cron.d/*
+ usr/lib/activemq_cpp_plugin.so*
+ usr/lib/glite-lb/examples/*
+ usr/sbin/glite-lb-msg-*
++usr/share/man/man8/*
+diff --git a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+index 1b94beb..884aad0 100644
+--- a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
++++ b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+@@ -26,7 +26,11 @@ BuildRequires: glite-lbjp-common-log-devel
+ BuildRequires: glite-lbjp-common-trio-devel
+ BuildRequires: libtool
+ BuildRequires: perl
++%if 0%{?rhel} >= 7 || 0%{?fedora}
++BuildRequires: perl-Pod-Perldoc
++%endif
+ BuildRequires: perl(Getopt::Long)
++BuildRequires: perl(Pod::Man)
+ BuildRequires: perl(POSIX)
+ BuildRequires: pkgconfig
+ Requires: crontabs
+@@ -70,6 +74,7 @@ rm -rf %{buildroot}
+ %{_libdir}/activemq_cpp_plugin.so.0.0.0
+ %{_libdir}/glite-lb/examples/glite-lb-cmsclient
+ %{_sbindir}/glite-lb-msg-*
++%{_mandir}/man8/*.8*
+
+
+ %changelog
+diff --git a/org.glite.lb.logger-msg/src/msg-brokers b/org.glite.lb.logger-msg/src/msg-brokers
+index eea24a9..a330850 100755
+--- a/org.glite.lb.logger-msg/src/msg-brokers
++++ b/org.glite.lb.logger-msg/src/msg-brokers
+@@ -1,7 +1,7 @@
+ #!/usr/bin/perl
+ #+##############################################################################
+ # #
+-# File: msg-brokers #
++# File: glite-lb-msg-brokers #
+ # #
+ # Description: manipulate messaging brokers information #
+ # #
+@@ -274,17 +274,15 @@ __END__
+
+ =head1 NAME
+
+-msg-brokers - manipulate messaging brokers information
++glite-lb-msg-brokers - manipulate messaging brokers information
+
+ =head1 SYNOPSIS
+
+-B<msg-brokers> [I<OPTIONS>] B<find>|B<list>
++B<glite-lb-msg-brokers> [I<OPTIONS>] B<find>|B<list>
+
+ =head1 DESCRIPTION
+
+-B<msg-brokers> has three different modes of operation. In all cases,
+-it manipulates information about messaging brokers and reports a
+-(possibly empty) list of broker URIs, one per line.
++B<glite-lb-msg-brokers> has two different modes of operation. In all cases, it manipulates information about messaging brokers and reports a (possibly empty) list of broker URIs, one per line.
+
+ =over
+
+@@ -336,11 +334,11 @@ show the complete man page
+
+ =item B<--network> I<string>
+
+-consider only the brokers for this network
++consider only the brokers for this network (for example PROD or TEST-NWOB)
+
+ =item B<--quiet>, B<-q>
+
+-supress the printing of warnings
++suppress the printing of warnings
+
+ =item B<--sort>, B<-s>
+
+@@ -348,10 +346,27 @@ sort the brokers per elapsed time to perform the test
+
+ =back
+
+-=head1 SEE ALSO
++=head1 ENVIRONMENT
+
+-L<Net::STOMP::Client>
++=over
++
++=item B<LCG_GFAL_INFOSYS>
++
++I<host>[:I<port>] of the BDII to contact
++
++=back
+
+-=head1 AUTHOR
++=head1 BUGS
++
++Please report all bugs to CESNET gLite L&B issue tracker available at
++I<https://github.com/CESNET/glite-lb/issues>
++
++=head1 AUTHORS
+
+ Lionel Cons L<http://cern.ch/lionel.cons>
++
++L&B Product Team, CESNET L<http://cesnet.cz>
++
++=head1 SEE ALSO
++
++L<Net::STOMP::Client>
diff --git a/sources b/sources
index e69de29..acc64f2 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+3732ddc2516eb71779d3e94d6fadb46e glite-lb-logger-msg-1.2.13.tar.gz
More information about the scm-commits
mailing list