[pkgsrc/trunk]: pkgsrc/www/ap-auth-mysql Fix a case of invalid use of preproc...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/86a5e8a109f5
branches:  trunk
changeset: 478169:86a5e8a109f5
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Mon Jul 19 00:08:41 2004 +0000

description:
Fix a case of invalid use of preprocessing directives within macro
args that breaks compilation whith gcc 2.95.

diffstat:

 www/ap-auth-mysql/distinfo         |   4 +-
 www/ap-auth-mysql/patches/patch-ad |  49 +++++++++++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 8 deletions(-)

diffs (89 lines):

diff -r 786efd8d77c4 -r 86a5e8a109f5 www/ap-auth-mysql/distinfo
--- a/www/ap-auth-mysql/distinfo        Sun Jul 18 23:42:48 2004 +0000
+++ b/www/ap-auth-mysql/distinfo        Mon Jul 19 00:08:41 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/16 11:28:19 jdolecek Exp $
+$NetBSD: distinfo,v 1.2 2004/07/19 00:08:41 kristerw Exp $
 
 SHA1 (libapache-mod-auth-mysql_4.3.1.tar.gz) = c5563028ed6574fd087944ac0507009dfc14b749
 Size (libapache-mod-auth-mysql_4.3.1.tar.gz) = 56247 bytes
 SHA1 (patch-aa) = c18f857317b5838c955ddfea501961e0e2a88e76
 SHA1 (patch-ab) = 0afe885fc1d1b5461b0423eef347fd72511be907
 SHA1 (patch-ac) = fb32367d7b77a3df6728f2ad93a7c46e76a0e454
-SHA1 (patch-ad) = ea796e555cc2e52af424e2e70484692656095858
+SHA1 (patch-ad) = 712d2efa8f53cc92ad5785e2aedc629de2699b72
diff -r 786efd8d77c4 -r 86a5e8a109f5 www/ap-auth-mysql/patches/patch-ad
--- a/www/ap-auth-mysql/patches/patch-ad        Sun Jul 18 23:42:48 2004 +0000
+++ b/www/ap-auth-mysql/patches/patch-ad        Mon Jul 19 00:08:41 2004 +0000
@@ -1,8 +1,25 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/16 11:28:19 jdolecek Exp $
+$NetBSD: patch-ad,v 1.2 2004/07/19 00:08:41 kristerw Exp $
 
---- mod_auth_mysql.c.orig      2003-11-18 13:59:00.000000000 +0100
-+++ mod_auth_mysql.c
-@@ -62,7 +62,7 @@ static int   auth_db_override = 1;
+--- mod_auth_mysql.c.orig      Sun Jun 27 13:34:55 2004
++++ mod_auth_mysql.c   Mon Jul 19 01:57:11 2004
+@@ -29,14 +29,14 @@
+ #define SNPRINTF apr_snprintf
+ #define PSTRDUP apr_pstrdup
+ #define PSTRCAT apr_pstrcat
+-#define APACHELOG(severity, handle, message ...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, 0, handle->server, message)
++#define APACHELOG(severity, handle, message...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, 0, handle->server, message)
+ #else
+ #define PALLOC ap_palloc
+ #define PCALLOC ap_pcalloc
+ #define SNPRINTF ap_snprintf
+ #define PSTRDUP ap_pstrdup
+ #define PSTRCAT ap_pstrcat
+-#define APACHELOG(severity, handle, message ...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, handle->server, message)
++#define APACHELOG(severity, handle, message...) ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_##severity, handle->server, message)
+ #endif
+ 
+ #include <httpd.h>
+@@ -94,7 +94,7 @@
  #define CRYPT_MD5_ENCRYPTION_FLAG     1<<3
  #endif
  #define PHP_MD5_ENCRYPTION_FLAG               1<<4
@@ -11,7 +28,7 @@
  #define CRYPT_ENCRYPTION_FLAG         1<<5
  #endif
  
-@@ -94,7 +94,7 @@ static int check_crypt_MD5_encryption(co
+@@ -126,7 +126,7 @@
  }
  #endif
  
@@ -20,7 +37,7 @@
  static int check_crypt_encryption(const char *passwd, char *enc_passwd)
  {
        return (!strcmp(crypt(passwd, enc_passwd), enc_passwd));
-@@ -165,7 +165,9 @@ encryption_type_entry supported_encrypti
+@@ -206,7 +206,9 @@
  #if CRYPT_MD5
        { "Crypt_MD5",          check_crypt_MD5_encryption,             CRYPT_MD5_ENCRYPTION_FLAG },
  #endif
@@ -30,3 +47,23 @@
        { "PHP_MD5",            check_PHP_MD5_encryption,               PHP_MD5_ENCRYPTION_FLAG },
        /* add additional encryption types below */
        { NULL,                 NULL,                                   0 }
+@@ -1463,14 +1465,17 @@
+               return res;
+       }
+ 
++#ifdef APACHE2
+       APACHELOG(DEBUG, r,
+               "Starting basic user auth for [%s] in %s, child pid %i",
+-#ifdef APACHE2
+               r->user,
++              sec->dir, getpid());
+ #else
++      APACHELOG(DEBUG, r,
++              "Starting basic user auth for [%s] in %s, child pid %i",
+               c->user,
+-#endif
+               sec->dir, getpid());
++#endif
+ 
+ #ifdef APACHE2
+       switch (mysql_check_user_password(r, r->user, sent_pw, sec)) {