tags 713662 + patch tags 713662 + pending thanks Dear maintainer,
I've prepared an NMU for heartbeat (versioned as 1:3.0.5-3.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `-
diff -Nru heartbeat-3.0.5/debian/changelog heartbeat-3.0.5/debian/changelog --- heartbeat-3.0.5/debian/changelog 2013-05-30 20:21:57.000000000 +0200 +++ heartbeat-3.0.5/debian/changelog 2013-11-13 21:30:41.000000000 +0100 @@ -1,3 +1,14 @@ +heartbeat (1:3.0.5-3.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: ucast.c:468:6: error: conflicting types for 'i'": + add patch fix-ftbfs-lp1188428.patch from Ubuntu / Andres Rodriguez: + - Fix FTBFS by renaming a duplicated var name 'i' (struct and int), for + the struct. + (Closes: #713662, LP: #1188428) + + -- gregor herrmann <gre...@debian.org> Wed, 13 Nov 2013 21:28:58 +0100 + heartbeat (1:3.0.5-3.1) unstable; urgency=low * Non-maintainer upload. diff -Nru heartbeat-3.0.5/debian/patches/fix-ftbfs-lp1188428.patch heartbeat-3.0.5/debian/patches/fix-ftbfs-lp1188428.patch --- heartbeat-3.0.5/debian/patches/fix-ftbfs-lp1188428.patch 1970-01-01 01:00:00.000000000 +0100 +++ heartbeat-3.0.5/debian/patches/fix-ftbfs-lp1188428.patch 2013-11-13 21:28:43.000000000 +0100 @@ -0,0 +1,42 @@ +Description: Fix FTBFS + Fix FTBFS because of duplicate variable 'i' for both a struct and an + int variable. +Author: Andres Rodriguez <andres...@ubuntu.com> +Bug-Ubuntu: https://launchpad.net/bugs/1188428 +Bug-Debian: http://bugs.debian.org/713662 +Forwarded: no + +--- heartbeat-3.0.5.orig/lib/plugins/HBcomm/ucast.c ++++ heartbeat-3.0.5/lib/plugins/HBcomm/ucast.c +@@ -462,7 +462,7 @@ static int HB_make_send_sock(struct hb_m + struct ip_private *ei; + int tos; + #if defined(SO_BINDTODEVICE) +- struct ifreq i; ++ struct ifreq ifc; + #endif + #if defined(SO_REUSEPORT) + int i = 1; +@@ -499,18 +499,18 @@ static int HB_make_send_sock(struct hb_m + * + * This is so we can have redundant NICs, and heartbeat on both + */ +- strcpy(i.ifr_name, ei->interface); ++ strcpy(ifc.ifr_name, ei->interface); + + if (setsockopt(sockfd, SOL_SOCKET, SO_BINDTODEVICE, +- &i, sizeof(i)) == -1) { ++ &ifc, sizeof(ifc)) == -1) { + PILCallLog(LOG, PIL_CRIT, + "ucast: error setting option SO_BINDTODEVICE(w) on %s: %s", +- i.ifr_name, strerror(errno)); ++ ifc.ifr_name, strerror(errno)); + close(sockfd); + return -1; + } + PILCallLog(LOG, PIL_INFO, "ucast: bound send socket to device: %s", +- i.ifr_name); ++ ifc.ifr_name); + } + #endif + #if defined(SO_REUSEPORT) diff -Nru heartbeat-3.0.5/debian/patches/series heartbeat-3.0.5/debian/patches/series --- heartbeat-3.0.5/debian/patches/series 2011-10-20 15:17:00.000000000 +0200 +++ heartbeat-3.0.5/debian/patches/series 2013-11-13 21:28:43.000000000 +0100 @@ -1,3 +1,4 @@ typos.dpatch 01_docbook_path.dpatch fix-shlibdeps.patch +fix-ftbfs-lp1188428.patch
signature.asc
Description: Digital signature
