Bug 111601 - port www/mod_auth_mysql_another patch (repeat with all of patch this time)
Summary: port www/mod_auth_mysql_another patch (repeat with all of patch this time)
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Blapp
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2007-04-15 14:10 UTC by papowell
Modified: 2007-07-29 13:20 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description papowell 2007-04-15 14:10:01 UTC 
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.

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:



#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/.*.--vVnqK9y4GFLPiid6cTQPrfFqhURZvZb968kTwAhVKFBzrRMs
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- 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
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.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-04-15 14:10:09 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->mbr

Over to maintainer
Comment 2 Pav Lucistnik freebsd_committer freebsd_triage 2007-07-29 12:57:18 UTC 
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2007-07-29 13:11:15 UTC 
pav         2007-07-29 12:11:07 UTC

  FreeBSD ports repository

  Modified files:
    www/mod_auth_mysql_another/files patch-strcat 
  Log:
  - Fix build with Apache 2.2
  
  PR:             ports/111601
  Submitted by:   Patrick Powell <papowell@astart.com>
  Approved by:    maintainer timeout (mbr; 3 months)
  
  Revision  Changes    Path
  1.2       +11 -0     ports/www/mod_auth_mysql_another/files/patch-strcat
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"