ports/111601: port www/mod_auth_mysql_another patch (repeat with all of patch this time)

[Patrick Powell]

>Number:         111601
>Category:       ports
>Synopsis:       port www/mod_auth_mysql_another patch (repeat with all of patch this time)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 15 13:10:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Patrick Powell
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
Astart Technologies
>Environment:
FreeBSD astart.com 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Mon Mar 12 13:59:28 PDT 2007 root at laptop.private:/usr/src/sys/i386/compile/SMP i386

>Description:
The current version of the www/mod_auth_mysql_another needs to be updated
to work with the newer/latest version of Apache 2.2.  Basically, the APR
support has changed to use different macros.



>How-To-Repeat:
    Install Apache22:
       cd /usr/ports/www/apache22; make all install
    Make mod_auth_mysql_another
    cd /usr/ports/www/mod_auth_mysql_another
      ... Errors reported are not very informative.
    The cause is that the Apr_Xt... functions/macros are
      now APR_... functions.

>Fix:
Note: the full patch seems to have been truncated from the
last posting,  here is the full patch:


To correct, add:
#define APR_XtOffsetOf APR_OFFSETOF

A new version of /usr/ports/www/mod_auth_mysql_another/files/patch-strcat:

--- mod_auth_mysql.c.orig   Wed Jun 22 09:17:45 2005
+++ mod_auth_mysql.c    Sat Apr 14 08:16:20 2007
@@ -206,7 +206,7 @@
   #define SNPRINTF apr_snprintf
   #define PSTRDUP apr_pstrdup
   #define PSTRNDUP apr_pstrndup
-  #define STRCAT ap_pstrcat
+  #define STRCAT apr_pstrcat
   #define POOL apr_pool_t
   #define POOL apr_pool_t
   #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
   #include "ap_compat.h"
@@ -255,6 +255,10 @@
   #define NOT_AUTHORIZED AUTH_REQUIRED
   #define TABLE_GET ap_table_get
   #define ISSPACE ap_isspace
+#endif
+
+#ifndef APR_XtOffsetOf
+#define APR_XtOffsetOf APR_OFFSETOF
 #endif

 #include "util_md5.h"



Note:  when trying to send the patch file using the Browse,  I got the error:

There is an error with your problem report submission. The problem was: Patch file has wrong content type: gotapplication/octet-stream but was expecting one matching text/.*.
>Release-Note:
>Audit-Trail:
>Unformatted: