The former is an obsolete transitional/dummy package, let's switch to
the latter package before the former disappears.
Run «wrap-and-sort -a -t -s» on debian/control.
Change-Id: Ie6b6a94f378d5df2015869569de256c4fce03a0d
As identified via the according binary build of
https://jenkins.mgm.sipwise.com/job/heartbeat-sources/ build
number 206 all the Makefiles get rebuilt if we don't apply the
debian-changes that has been used so far (see e.g. working builds
like #208 and #211).
Without this patch we get:
| [...]
| missing --run aclocal-1.7
| [....]
| missing --run automake-1.7
| [...]
| missing --run autoconf
| [...]
| /bin/bash ./config.status --recheck
| [...]
| configure: creating ./config.status
| [...]
| /bin/bash ./config.status Makefile
| config.status: creating Makefile
during the build process (tools like aclocal-1.7 and automake-1.7
aren't even available at all). The resulting heartbeat binary
doesn't use /usr/lib64 in its library path then, therefore
failing with:
| /usr/lib64/heartbeat/heartbeat: error while loading shared libraries: libstonith.so.1: cannot open shared object file: No such file or directory
One possible workaround for this would be to run:
| echo /usr/lib64 > /etc/ld.so.conf.d/heartbeat.conf; ldconfig
but to avoid possible further hidden problems with this let's
apply sipwise-debian-changes.patch. This patch is the
result of actually using the source from
| dget -u http://archive.debian.org/debian/pool/main/h/heartbeat/heartbeat_2.1.3-6lenny4.dsc
as its base since the very beginning of this repository.
dpkg-source automatically recorded those changes for us as
debian-changes file (see commit id f94588851c). We
want to be able to have a clean repository state for a decent
workflow with git and quilt. Therefore instead of using this
patch implicitly, make this patch an explicit one.
Fixes:
| dh_movefiles: debian/tmp/usr/lib/ocf/resource.d/heartbeat/SphinxSearchDaemon not found (supposed to put it in heartbeat-2)
| debian/rules:85: recipe for target 'install-stamp' failed
Editing just Makefile.in isn't enough, therefore also
adjust Makefile.am accordingly.
Fix peer-outdater linking against libglib and use
gnutls_certificate_verify_peers2 instead of
gnutls_certificate_verify_peers
Thanks: Richard Fuchs <rfuchs@sipwise.com> for the initial patch
Fixes:
| /usr/bin/pod2man --section=8 ldirectord > ldirectord.8
| ldirectord around line 389: =back doesn't take any parameters, but you said =back 4
| ldirectord around line 410: =back doesn't take any parameters, but you said =back 4
| ldirectord around line 489: =back doesn't take any parameters, but you said =back 4
| ldirectord around line 510: =back doesn't take any parameters, but you said =back 4
| ldirectord around line 558: =back doesn't take any parameters, but you said =back 4
| POD document had syntax errors at /usr/bin/pod2man line 71.
| Makefile:756: recipe for target 'ldirectord.8' failed
Also drop the ldirectord file, which is automatically generated.
Fixes:
| conf_lex.c:618:11: error: conflicting types for 'yyget_leng'
| yy_size_t yyget_leng (void );
| ^
| conf_lex.l:55:5: note: previous declaration of 'yyget_leng' was here
flex-2.5.35 used to declare:
int yyget_leng (void );
while flex-2.5.39 uses:
yy_size_t yyget_leng (void );
nowadays. We're build-depending on flex anyway so there's no point
in declaring that in heartbeat's source again. (And upstream dropped
dropped that code in recent versions as well.)
Also drop automatically generated telecom/recoverymgrd/conf_lex.c,
this adds more confusion than benefit otherwise.
Fails when compiling against Debian/jessie with:
| ucast.c: In function 'HB_make_send_sock':
| ucast.c:466:6: error: conflicting types for 'i'
| int i = 1;
| ^
As noted in #713662 "in the current /usr/include/asm-generic/socket.h both macros are defined",
patch also taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713662
Fails with:
| In file included from ../../include/clplumbing/cl_uuid.h:19:0,
| from cl_uuid.c:56:
| /usr/include/glib-2.0/glib/gtypes.h:29:2: error: #error "Only <glib.h> can be included directly."