Patch attached.
diff -u jabberd2-2.2.1/debian/changelog jabberd2-2.2.1/debian/changelog --- jabberd2-2.2.1/debian/changelog +++ jabberd2-2.2.1/debian/changelog @@ -1,3 +1,13 @@ +jabberd2 (2.2.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Prevent an implicit pointer conversion of the return pointer from + crypt() (Closes: #493768). + * Define LDAP_DEPRECATED to continue to make use of a deprecated API + without implicitly converting returned pointers (Closes: #493765) + + -- dann frazier <[EMAIL PROTECTED]> Mon, 17 Nov 2008 19:36:16 -0700 + jabberd2 (2.2.1-1) unstable; urgency=low * New upstream release (Closes: #403750). diff -u jabberd2-2.2.1/debian/patches/00list jabberd2-2.2.1/debian/patches/00list --- jabberd2-2.2.1/debian/patches/00list +++ jabberd2-2.2.1/debian/patches/00list @@ -4,0 +5,2 @@ +jabberd2-crypt.patch +jabberd2-ldap.patch only in patch2: unchanged: --- jabberd2-2.2.1.orig/debian/patches/jabberd2-crypt.patch +++ jabberd2-2.2.1/debian/patches/jabberd2-crypt.patch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## jabberd2-crypt.dpatch by dann frazier <[EMAIL PROTECTED]> +## DP: add missing prototype for crypt function + [EMAIL PROTECTED]@ +diff -urpN jabberd2-2.2.1.orig/storage/authreg_mysql.c jabberd2-2.2.1/storage/authreg_mysql.c +--- jabberd2-2.2.1.orig/storage/authreg_mysql.c 2008-07-16 03:36:58.000000000 -0600 ++++ jabberd2-2.2.1/storage/authreg_mysql.c 2008-08-04 13:32:21.000000000 -0600 +@@ -20,6 +20,9 @@ + + /* this module talks to a MySQL server via libmysqlclient */ + ++#define _XOPEN_SOURCE 500 ++#include <unistd.h> ++ + #include "c2s.h" + #include <mysql.h> + only in patch2: unchanged: --- jabberd2-2.2.1.orig/debian/patches/jabberd2-ldap.patch +++ jabberd2-2.2.1/debian/patches/jabberd2-ldap.patch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## jabberd-ldap.dpatch by dann frazier <[EMAIL PROTECTED]> +## DP: explicitly use deprecated ldap functions + [EMAIL PROTECTED]@ +diff -urpN jabberd2-2.2.1.orig/storage/authreg_ldap.c jabberd2-2.2.1/storage/authreg_ldap.c +--- jabberd2-2.2.1.orig/storage/authreg_ldap.c 2008-07-16 03:36:58.000000000 -0600 ++++ jabberd2-2.2.1/storage/authreg_ldap.c 2008-08-04 13:27:09.000000000 -0600 +@@ -30,6 +30,7 @@ + + #include "c2s.h" + #include <lber.h> ++#define LDAP_DEPRECATED 1 + #include <ldap.h> + + #define AR_LDAP_FLAGS_NONE (0x0) +diff -urpN jabberd2-2.2.1.orig/storage/authreg_ldapfull.c jabberd2-2.2.1/storage/authreg_ldapfull.c +--- jabberd2-2.2.1.orig/storage/authreg_ldapfull.c 2008-07-16 03:36:58.000000000 -0600 ++++ jabberd2-2.2.1/storage/authreg_ldapfull.c 2008-08-04 13:27:48.000000000 -0600 +@@ -34,6 +34,7 @@ + #ifdef STORAGE_LDAP + + #include <lber.h> ++#define LDAP_DEPRECATED 1 + #include <ldap.h> + + #define LDAPFULL_PASSBUF_MAX 257 +diff -urpN jabberd2-2.2.1.orig/storage/storage_ldapvcard.c jabberd2-2.2.1/storage/storage_ldapvcard.c +--- jabberd2-2.2.1.orig/storage/storage_ldapvcard.c 2008-07-16 03:36:58.000000000 -0600 ++++ jabberd2-2.2.1/storage/storage_ldapvcard.c 2008-08-04 13:28:49.000000000 -0600 +@@ -27,6 +27,7 @@ + + #ifdef STORAGE_LDAP + ++#define LDAP_DEPRECATED 1 + #include <ldap.h> + #include <time.h> +
