diff options
| author | joerg <joerg> | 2007-06-29 22:58:54 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-06-29 22:58:54 +0000 |
| commit | 3c4089d335cd8ed756f75f04a189e35d91c7dcde (patch) | |
| tree | b5419fc808c0b137e749274f692b0ad8615eb186 /www | |
| parent | 1f559be83e91e813a1d4c3afadf6e4bb1e298cee (diff) | |
| download | pkgsrc-3c4089d335cd8ed756f75f04a189e35d91c7dcde.tar.gz | |
If APR_XtOffsetOf is not defined, fallback to APR_OFFSETOF.
The compat macro was removed with APR 1.x. Also include unistd.h
if crypt.h does not exist, that's the place in DragonFly.
Diffstat (limited to 'www')
| -rw-r--r-- | www/ap-auth-mysql/distinfo | 4 | ||||
| -rw-r--r-- | www/ap-auth-mysql/patches/patch-ad | 33 |
2 files changed, 28 insertions, 9 deletions
diff --git a/www/ap-auth-mysql/distinfo b/www/ap-auth-mysql/distinfo index 631528ae46c..e1b6fea58da 100644 --- a/www/ap-auth-mysql/distinfo +++ b/www/ap-auth-mysql/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2006/05/16 02:35:37 ben Exp $ +$NetBSD: distinfo,v 1.6 2007/06/29 22:58:54 joerg Exp $ SHA1 (libapache-mod-auth-mysql_4.3.1.tar.gz) = c5563028ed6574fd087944ac0507009dfc14b749 RMD160 (libapache-mod-auth-mysql_4.3.1.tar.gz) = d64278aa11030369071f586ff2ef60becf43c062 @@ -6,5 +6,5 @@ Size (libapache-mod-auth-mysql_4.3.1.tar.gz) = 56247 bytes SHA1 (patch-aa) = c18f857317b5838c955ddfea501961e0e2a88e76 SHA1 (patch-ab) = 343dafbcfb62366b7cdaf154da774d3f7a417242 SHA1 (patch-ac) = 1ec37362ec8e3e7298580a904063d6bb67d7a97a -SHA1 (patch-ad) = 712d2efa8f53cc92ad5785e2aedc629de2699b72 +SHA1 (patch-ad) = 528d5c817b88f7b9d89aec9b8a7e430af0f29bf7 SHA1 (patch-ae) = 2e5569026965558d9490d3a8face857f5d611b1b diff --git a/www/ap-auth-mysql/patches/patch-ad b/www/ap-auth-mysql/patches/patch-ad index 2ec34a7357e..18e35246a42 100644 --- a/www/ap-auth-mysql/patches/patch-ad +++ b/www/ap-auth-mysql/patches/patch-ad @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.2 2004/07/19 00:08:41 kristerw Exp $ +$NetBSD: patch-ad,v 1.3 2007/06/29 22:58:55 joerg Exp $ ---- mod_auth_mysql.c.orig Sun Jun 27 13:34:55 2004 -+++ mod_auth_mysql.c Mon Jul 19 01:57:11 2004 +--- mod_auth_mysql.c.orig 2004-06-27 11:34:55.000000000 +0000 ++++ mod_auth_mysql.c @@ -29,14 +29,14 @@ #define SNPRINTF apr_snprintf #define PSTRDUP apr_pstrdup @@ -19,7 +19,26 @@ $NetBSD: patch-ad,v 1.2 2004/07/19 00:08:41 kristerw Exp $ #endif #include <httpd.h> -@@ -94,7 +94,7 @@ +@@ -51,12 +51,18 @@ + #include <ap_md5.h> + #endif + ++#ifndef APR_XtOffsetOf ++#define APR_XtOffsetOf(x,y) APR_OFFSETOF(x,y) ++#endif ++ + #include <mysql.h> + #include <errmsg.h> + #include <mysqld_error.h> + + #ifdef HAVE_CRYPT_H + #include <crypt.h> ++#else ++#include <unistd.h> + #endif + + #ifndef TRUE +@@ -94,7 +100,7 @@ unsigned long auth_db_client_flag = 0; #define CRYPT_MD5_ENCRYPTION_FLAG 1<<3 #endif #define PHP_MD5_ENCRYPTION_FLAG 1<<4 @@ -28,7 +47,7 @@ $NetBSD: patch-ad,v 1.2 2004/07/19 00:08:41 kristerw Exp $ #define CRYPT_ENCRYPTION_FLAG 1<<5 #endif -@@ -126,7 +126,7 @@ +@@ -126,7 +132,7 @@ static int check_crypt_MD5_encryption(co } #endif @@ -37,7 +56,7 @@ $NetBSD: patch-ad,v 1.2 2004/07/19 00:08:41 kristerw Exp $ static int check_crypt_encryption(const char *passwd, char *enc_passwd) { return (!strcmp(crypt(passwd, enc_passwd), enc_passwd)); -@@ -206,7 +206,9 @@ +@@ -206,7 +212,9 @@ encryption_type_entry supported_encrypti #if CRYPT_MD5 { "Crypt_MD5", check_crypt_MD5_encryption, CRYPT_MD5_ENCRYPTION_FLAG }, #endif @@ -47,7 +66,7 @@ $NetBSD: patch-ad,v 1.2 2004/07/19 00:08:41 kristerw Exp $ { "PHP_MD5", check_PHP_MD5_encryption, PHP_MD5_ENCRYPTION_FLAG }, /* add additional encryption types below */ { NULL, NULL, 0 } -@@ -1463,14 +1465,17 @@ +@@ -1463,14 +1471,17 @@ int mysql_authenticate_basic_user(reques return res; } |