Your message dated Sat, 12 Dec 2009 21:45:00 +0000
with message-id <e1njzls-0000uh...@ries.debian.org>
and subject line Bug#560342: fixed in jabberd14 1.6.1.1-4
has caused the Debian Bug report #560342,
regarding jabberd14: FTBFS with g++-4.4
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
560342: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560342
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: jabberd14
Version: 1.6.1.1-3
Severity: serious
Tags: patch

Please see attached the failed build log with g++-4.4.
Also, please see attached a quick and dirty patch to solve this.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.21.7-2.fc8xen-ec2-v1.0 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages jabberd14 depends on:
ii  adduser                       3.111      add and remove users and groups
ii  libc6                         2.10.2-2   GNU C Library: Shared libraries
ii  libgcc1                       1:4.4.2-4  GCC support library
ii  libidn11                      1.15-2     GNU Libidn library, implementation
ii  libjabberd2                   1.6.1.1-3  Runtime library for the Jabber/XMP
ii  libmysqlclient16              5.1.41-3   MySQL database client library
ii  libpopt0                      1.15-1     lib for parsing cmdline parameters
ii  libpq5                        8.4.1-1    PostgreSQL C client library
ii  libpth20                      2.0.7-14   The GNU Portable Threads
ii  libstdc++6                    4.4.2-4    The GNU Standard C++ Library v3
ii  lsb-base                      3.2-23     Linux Standard Base 3.2 init scrip
ii  openssl                       0.9.8k-7   Secure Socket Layer (SSL) binary a

jabberd14 recommends no packages.

jabberd14 suggests no packages.

-- no debconf information

-- 
Miguel Landaeta, miguel at miguel.cc
secure email with PGP 0x7D8967E9 available at http://keyserver.pgp.com/
"Faith means not wanting to know what is true." -- Nietzsche

Attachment: jabberd14_1.6.1.1-4_i386.build
Description: Binary data

diff --git a/debian/patches/00list b/debian/patches/00list
index eae1970..a868cc9 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,4 @@ fix_gnutls_api_changes
 fix_dpkg_shlibdeps_warning
 fix_installdir_locales
 fix_getaddrinfo_test
+fix_g++-4.4_ftbfs
diff --git a/debian/patches/fix_g++-4.4_ftbfs.dpatch b/debian/patches/fix_g++-4.4_ftbfs.dpatch
new file mode 100755
index 0000000..05f591b
--- /dev/null
+++ b/debian/patches/fix_g++-4.4_ftbfs.dpatch
@@ -0,0 +1,62 @@
+#! /bin/sh -e
+## fix_g++-4.4_ftbfs.dpatch by Miguel Landaeta <mig...@miguel.cc>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: quick and dirty hack to allow jabberd14 compilation under
+## DP: g++-4.4, a more stricter compiler than previous versions.
+
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+   -patch) patch $patch_opts -p1 < $0;;
+   -unpatch) patch $patch_opts -Rp1 < $0;;
+   *)
+      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+      exit 1;;
+esac
+
+exit 0
+...@dpatch@
+diff --git a/jabberd/lib/xmlnode.cc b/jabberd/lib/xmlnode.cc
+index 28ef9fe..d3aa513 100644
+--- a/jabberd/lib/xmlnode.cc
++++ b/jabberd/lib/xmlnode.cc
+@@ -910,8 +910,8 @@ xmlnode_list_item xmlnode_get_tags(xmlnode context_node, const char *path, xht n
+     }
+ 
+     /* separate this step from the next one, and check for a predicate in this step */
+-    start_predicate = strchr(path, '[');
+-    next_step = strchr(path, '/');
++    start_predicate = strchr((char*)path, '[');
++    next_step = strchr((char*)path, '/');
+     if (start_predicate == NULL && next_step == NULL) {
+ 	this_step = pstrdup(p, path);
+     } else if (start_predicate == NULL || start_predicate > next_step && next_step != NULL) {
+@@ -1833,7 +1833,7 @@ xmlnode xmlnode_select_by_lang(xmlnode_list_item nodes, const char* lang) {
+     if (lang != NULL && strchr(lang, '-') != NULL) {
+ 	snprintf(general_lang, sizeof(general_lang), "%s", lang);
+ 	if (strchr(lang, '-') != NULL) {
+-	    strchr(lang, '-')[0] = 0;
++	    strchr((char*)lang, '-')[0] = 0;
+ 	} else {
+ 	    general_lang[0] = 0;
+ 	}
+diff --git a/jabberd/log.cc b/jabberd/log.cc
+index 230c7d0..9a7bd13 100644
+--- a/jabberd/log.cc
++++ b/jabberd/log.cc
+@@ -86,7 +86,7 @@ static inline int _debug_log_zonefilter(char const* zone) {
+     char *pos, c = '\0';
+     if(zone != NULL && debug__zones != NULL)
+     {
+-	pos = strchr(zone,'.');
++	pos = strchr((char *)zone,'.');
+         if(pos != NULL)
+         {
+             c = *pos;

--- End Message ---
--- Begin Message ---
Source: jabberd14
Source-Version: 1.6.1.1-4

We believe that the bug you reported is fixed in the latest version of
jabberd14, which is due to be installed in the Debian FTP archive:

jabber_1.6.1.1-4_all.deb
  to main/j/jabberd14/jabber_1.6.1.1-4_all.deb
jabberd14_1.6.1.1-4.diff.gz
  to main/j/jabberd14/jabberd14_1.6.1.1-4.diff.gz
jabberd14_1.6.1.1-4.dsc
  to main/j/jabberd14/jabberd14_1.6.1.1-4.dsc
jabberd14_1.6.1.1-4_i386.deb
  to main/j/jabberd14/jabberd14_1.6.1.1-4_i386.deb
libjabberd2-dev_1.6.1.1-4_i386.deb
  to main/j/jabberd14/libjabberd2-dev_1.6.1.1-4_i386.deb
libjabberd2_1.6.1.1-4_i386.deb
  to main/j/jabberd14/libjabberd2_1.6.1.1-4_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 560...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jens Peter Secher <j...@debian.org> (supplier of updated jabberd14 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.8
Date: Fri, 11 Dec 2009 19:40:55 -0430
Source: jabberd14
Binary: jabber jabberd14 libjabberd2-dev libjabberd2
Architecture: source all i386
Version: 1.6.1.1-4
Distribution: unstable
Urgency: low
Maintainer: Miguel Landaeta <mig...@miguel.cc>
Changed-By: Jens Peter Secher <j...@debian.org>
Description: 
 jabber     - Transitional package for jabber rename
 jabberd14  - Instant messaging server using the Jabber/XMPP protocol
 libjabberd2 - Runtime library for the Jabber/XMPP instant messaging server
 libjabberd2-dev - Development files for the Jabber/XMPP instant messaging 
server
Closes: 546544 546545 546814 552281 554924 560342
Changes: 
 jabberd14 (1.6.1.1-4) unstable; urgency=low
 .
   * Fixed reading of settings from /etc/default/jabberd. (Closes: #552281).
   * Fixed detecting of IPv6 support. (Closes: #546545).
   * Fixed crashing on old ssl protocol. (Closes: #546544).
   * Added support to easy configuration using /etc/default/jabberd14
     to allow setting of basic options without editing jabber.xml.
   * Removed obsolete conffiles on upgrade. (Closes: #546814).
   * Fixed patch-system-but-no-source-readme lintian warning and bumped
     Standards-Version to 3.8.3.
   * Fixed FTBFS with g++-4.4. (Closes: #560342).
   * Fixed FTBFS with binutils-gold. (Closes: #554924).
Checksums-Sha1: 
 6ddf39081674f2eb327abf1e72a7bfe5a1df201a 1521 jabberd14_1.6.1.1-4.dsc
 647b9e4f63a4740cc9495f3c7222f6994303a4bb 27854 jabberd14_1.6.1.1-4.diff.gz
 593e09f63bb1c4b127c41480959216285a53b3bc 24524 jabber_1.6.1.1-4_all.deb
 e4d6af00bb00f6ee01f0fbcae4ed02c317fb63e8 355784 jabberd14_1.6.1.1-4_i386.deb
 78b0b87066d73d54282e3382f45d18b130bec20f 44848 
libjabberd2-dev_1.6.1.1-4_i386.deb
 a158bdfac8d85687c9a2908e82492a76ec4a5442 150506 libjabberd2_1.6.1.1-4_i386.deb
Checksums-Sha256: 
 ff0f33657a290efc5bdc6b45daeedf936945da15431d4c0f91485d9d5262b16e 1521 
jabberd14_1.6.1.1-4.dsc
 897ceaaded05fb78160dc2d9b4a223584dc568080f195150b800d4e262ef1e71 27854 
jabberd14_1.6.1.1-4.diff.gz
 78f339cd0b43ecd089eb5a04f4d2bdcb60ab8221d9df5af8b77eda8cb21a4c72 24524 
jabber_1.6.1.1-4_all.deb
 80dbb527f57676e91faecfcb3a8d626d560670ed9b9b3ca3a807b495e0e91b7a 355784 
jabberd14_1.6.1.1-4_i386.deb
 5dbbdf292687e8a5bce9d8d7b047222c8785229ed4d088c12480d74b61ba30cf 44848 
libjabberd2-dev_1.6.1.1-4_i386.deb
 0333ac752ee2d4c23164079d2b689cd5d35be0ae3f22f8923e9e95edf7639312 150506 
libjabberd2_1.6.1.1-4_i386.deb
Files: 
 2b7d43cb005369cda559bcadf34fa765 1521 net optional jabberd14_1.6.1.1-4.dsc
 58da060778a66130017e14c8c64bc14a 27854 net optional jabberd14_1.6.1.1-4.diff.gz
 e53886eb33755d16ad12882517d9860b 24524 net optional jabber_1.6.1.1-4_all.deb
 cc329fdd08dc493ef7185e8695e403c6 355784 net optional 
jabberd14_1.6.1.1-4_i386.deb
 a18fdac5ce39207398176a14ae98fbf0 44848 libdevel optional 
libjabberd2-dev_1.6.1.1-4_i386.deb
 029a6df246da3756c8bd2733b6d5d46a 150506 libs optional 
libjabberd2_1.6.1.1-4_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iJwEAQECAAYFAksj/3AACgkQiFVdEFPVQL+SIQP/UtlHTkAG9AwiEoVcVX1MKMZ2
YKpTayFRLqPAyA+k0buwKfjGrok/ODJ39UJyDbFbv+Qc2usIvHedT1SgyzAhiZRC
k/Js0hYeSS/lpQOJzcdQ4po77XWNhKUo1c6Wn3jBr3V+q568mZP0SuG0wIKQBbWx
f1DvrUTuvAwI40N9X8g=
=T/ZB
-----END PGP SIGNATURE-----



--- End Message ---

Reply via email to