Hello, please unblock pam-pgsql. I got a pre-approval by Adam in IRC. The debdiff is attached. The upload fixes #584683. Regards Jan Dittberner -- Jan Dittberner - Debian Developer GPG-key: 4096R/558FB8DD 2009-05-10 B2FF 1D95 CE8F 7A22 DF4C F09B A73E 0055 558F B8DD http://ddportfolio.debian.net/ - http://people.debian.org/~jandd/
diff -Nru pam-pgsql-0.7.1/debian/changelog pam-pgsql-0.7.1/debian/changelog --- pam-pgsql-0.7.1/debian/changelog 2010-04-02 12:51:39.000000000 +0200 +++ pam-pgsql-0.7.1/debian/changelog 2010-08-15 18:13:35.000000000 +0200 @@ -1,3 +1,14 @@ +pam-pgsql (0.7.1-2) unstable; urgency=low + + * add debian/patches/md5_64bit_584683.patch to fix MD5 issue on non- + Alpha 64bit systems (Closes: #584683) + * debian/control: + - bump Standards-Version to 3.9.1 (no changes needed) + - change debhelper dependency to 7.0.50~ to simplify backports + * remove unused debian/patches/ftbfs_544586.patch + + -- Jan Dittberner <jandd@debian.org> Sun, 15 Aug 2010 18:13:32 +0200 + pam-pgsql (0.7.1-1) unstable; urgency=low * New upstream version diff -Nru pam-pgsql-0.7.1/debian/control pam-pgsql-0.7.1/debian/control --- pam-pgsql-0.7.1/debian/control 2010-04-02 12:51:39.000000000 +0200 +++ pam-pgsql-0.7.1/debian/control 2010-08-15 18:13:35.000000000 +0200 @@ -2,9 +2,9 @@ Section: admin Priority: extra Maintainer: Jan Dittberner <jandd@debian.org> -Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 7.0.50), autotools-dev, libpam0g-dev, libpq-dev, - libmhash-dev, autoconf, automake, libtool +Standards-Version: 3.9.1 +Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libpam0g-dev, + libpq-dev, libmhash-dev, autoconf, automake, libtool Homepage: http://sourceforge.net/projects/pam-pgsql/ Vcs-Git: git://git.debian.org/git/collab-maint/pam-pgsql.git Vcs-Browser: http://git.debian.org/?p=collab-maint/pam-pgsql.git;a=summary diff -Nru pam-pgsql-0.7.1/debian/patches/ftbfs_544586.patch pam-pgsql-0.7.1/debian/patches/ftbfs_544586.patch --- pam-pgsql-0.7.1/debian/patches/ftbfs_544586.patch 2010-04-02 12:51:39.000000000 +0200 +++ pam-pgsql-0.7.1/debian/patches/ftbfs_544586.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -From 0656cb7fcbd2b8f9efcbf6848709d29dba172289 Mon Sep 17 00:00:00 2001 -From: Jan Dittberner <jan@dittberner.info> -Date: Wed, 2 Sep 2009 16:14:05 +0200 -Subject: [PATCH] apply patch for Debian bug #544586 - ---- - configure.ac | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1b70476..ad41f84 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -90,15 +90,17 @@ LDFLAGS="$old_LDFLAGS" - - AC_SUBST(PGSQL_LIB) - --if test "`uname`" = "Linux" >/dev/null 2>/dev/null; then -+case $host_os in - # Debian needs this -- PAM_MISC_LD="-lpam_misc" -- INSTALLPAM="/lib/security/" -- AC_DEFINE([LINUX], [1], [It is a linux machine]) --else -- PAM_MISC_LD="" -- INSTALLPAM="/usr/lib/" --fi -+ linux-*|kfreebsd*-gnu*) -+ PAM_MISC_LD="-lpam_misc" -+ INSTALLPAM="/lib/security/" -+ ;; -+ *) -+ PAM_MISC_LD="" -+ INSTALLPAM="/usr/lib/" -+ ;; -+esac - - AC_SUBST(PAM_MISC_LD) - AC_SUBST(INSTALLPAM) --- -1.5.6.5 - diff -Nru pam-pgsql-0.7.1/debian/patches/md5_64bit_584683.patch pam-pgsql-0.7.1/debian/patches/md5_64bit_584683.patch --- pam-pgsql-0.7.1/debian/patches/md5_64bit_584683.patch 1970-01-01 01:00:00.000000000 +0100 +++ pam-pgsql-0.7.1/debian/patches/md5_64bit_584683.patch 2010-08-15 18:13:35.000000000 +0200 @@ -0,0 +1,138 @@ +From 30361fa5f3266c0f088bbc89eb06dddbd032fc54 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com> +Date: Wed, 7 Apr 2010 15:58:04 +0200 +Subject: [PATCH] Fix md5 code under 64-bit platforms. + +The code was previously singling out the Alpha platform as 64-bit, but +that's definitely not the only platform where unsigned long is 64-bit +rather than 32. + +This change actually relies on C89 standard integers (uint32_t) so that +there is no more risk of getting it wrong. +--- + src/md5.c | 28 ++++++++++++++-------------- + src/md5.h | 10 +++------- + 2 files changed, 17 insertions(+), 21 deletions(-) + +diff --git a/src/md5.c b/src/md5.c +index 3b51e76..df24f16 100644 +--- a/src/md5.c ++++ b/src/md5.c +@@ -17,7 +17,7 @@ + #include <string.h> /* for memcpy() */ + #include "md5.h" + +-static void MD5Transform(uint32 buf[4], uint32 const in[16]); ++static void MD5Transform(uint32_t buf[4], uint32_t const in[16]); + + #ifndef HIGHFIRST + #define byteReverse(buf, len) /* Nothing */ +@@ -30,11 +30,11 @@ void byteReverse(unsigned char *buf, unsigned longs); + */ + void byteReverse(unsigned char *buf, unsigned longs) + { +- uint32 t; ++ uint32_t t; + do { +- t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 | ++ t = (uint32_t) ((unsigned) buf[3] << 8 | buf[2]) << 16 | + ((unsigned) buf[1] << 8 | buf[0]); +- *(uint32 *) buf = t; ++ *(uint32_t *) buf = t; + buf += 4; + } while (--longs); + } +@@ -62,12 +62,12 @@ void MD5Init(struct MD5Context *ctx) + */ + void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) + { +- uint32 t; ++ uint32_t t; + + /* Update bitcount */ + + t = ctx->bits[0]; +- if ((ctx->bits[0] = t + ((uint32) len << 3)) < t) ++ if ((ctx->bits[0] = t + ((uint32_t) len << 3)) < t) + ctx->bits[1]++; /* Carry from low to high */ + ctx->bits[1] += len >> 29; + +@@ -85,7 +85,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) + } + memcpy(p, buf, t); + byteReverse(ctx->in, 16); +- MD5Transform(ctx->buf, (uint32 *) ctx->in); ++ MD5Transform(ctx->buf, (uint32_t *) ctx->in); + buf += t; + len -= t; + } +@@ -94,7 +94,7 @@ void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) + while (len >= 64) { + memcpy(ctx->in, buf, 64); + byteReverse(ctx->in, 16); +- MD5Transform(ctx->buf, (uint32 *) ctx->in); ++ MD5Transform(ctx->buf, (uint32_t *) ctx->in); + buf += 64; + len -= 64; + } +@@ -129,7 +129,7 @@ void MD5Final(unsigned char *digest, struct MD5Context *ctx) + /* Two lots of padding: Pad the first block to 64 bytes */ + memset(p, 0, count); + byteReverse(ctx->in, 16); +- MD5Transform(ctx->buf, (uint32 *) ctx->in); ++ MD5Transform(ctx->buf, (uint32_t *) ctx->in); + + /* Now fill the next block with 56 bytes */ + memset(ctx->in, 0, 56); +@@ -140,10 +140,10 @@ void MD5Final(unsigned char *digest, struct MD5Context *ctx) + byteReverse(ctx->in, 14); + + /* Append length in bits and transform */ +- ((uint32 *) ctx->in)[14] = ctx->bits[0]; +- ((uint32 *) ctx->in)[15] = ctx->bits[1]; ++ ((uint32_t *) ctx->in)[14] = ctx->bits[0]; ++ ((uint32_t *) ctx->in)[15] = ctx->bits[1]; + +- MD5Transform(ctx->buf, (uint32 *) ctx->in); ++ MD5Transform(ctx->buf, (uint32_t *) ctx->in); + byteReverse((unsigned char *) ctx->buf, 4); + memcpy(digest, ctx->buf, 16); + memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ +@@ -173,9 +173,9 @@ void MD5Final(unsigned char *digest, struct MD5Context *ctx) + * reflect the addition of 16 longwords of new data. MD5Update blocks + * the data and converts bytes into longwords for this routine. + */ +-static void MD5Transform(uint32 buf[4], uint32 const in[16]) ++static void MD5Transform(uint32_t buf[4], uint32_t const in[16]) + { +- register uint32 a, b, c, d; ++ register uint32_t a, b, c, d; + + a = buf[0]; + b = buf[1]; +diff --git a/src/md5.h b/src/md5.h +index 6d8d047..a8a952f 100644 +--- a/src/md5.h ++++ b/src/md5.h +@@ -1,15 +1,11 @@ + #ifndef MD5_H + #define MD5_H + +-#ifdef __alpha +-typedef unsigned int uint32; +-#else +-typedef unsigned long uint32; +-#endif ++#include <stdint.h> + + struct MD5Context { +- uint32 buf[4]; +- uint32 bits[2]; ++ uint32_t buf[4]; ++ uint32_t bits[2]; + unsigned char in[64]; + }; + +-- +1.6.1 + diff -Nru pam-pgsql-0.7.1/debian/patches/series pam-pgsql-0.7.1/debian/patches/series --- pam-pgsql-0.7.1/debian/patches/series 2010-04-02 12:51:39.000000000 +0200 +++ pam-pgsql-0.7.1/debian/patches/series 2010-08-15 18:13:35.000000000 +0200 @@ -1 +1,2 @@ ftbfs_441679.patch +md5_64bit_584683.patch
Attachment:
signature.asc
Description: Digital signature