ports/74686: [PATCH] www/mod_auth_mysql_another: update to 2.7.0

ports at c0decafe.net ports at c0decafe.net
Sat Dec 4 19:10:20 UTC 2004 

>Number:         74686
>Category:       ports
>Synopsis:       [PATCH] www/mod_auth_mysql_another: update to 2.7.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 04 19:10:19 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     ports at c0decafe.net
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD atlantis.local 5.3-STABLE FreeBSD 5.3-STABLE #1: Thu Nov 18 20:01:57 EET 2004
>Description:
- Update to 2.7.0
- use apache2/Makefile.modules.3rd
- ports/54067's patch seems to be no longer needed

Removed file(s):
- files/patch-Makefile
- pkg-plist

Port maintainer (mbr at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- mod_auth_mysql_another-2.7.0.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/mod_auth_mysql_another.orig/Makefile /usr/ports/www/mod_auth_mysql_another/Makefile
--- /usr/ports/www/mod_auth_mysql_another.orig/Makefile	Fri Nov  7 11:12:50 2003
+++ /usr/ports/www/mod_auth_mysql_another/Makefile	Sat Dec  4 20:41:47 2004
@@ -4,54 +4,36 @@
 #
 # $FreeBSD: ports/www/mod_auth_mysql_another/Makefile,v 1.6 2003/11/07 09:12:50 marcus Exp $
 
-PORTNAME=	mod_auth_mysql_another
-PORTVERSION=	2.0
+PORTNAME=	mod_auth_mysql
+PORTVERSION=	2.7.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	modauthmysql
-DISTNAME=       mod_auth_mysql
-EXTRACT_SUFX=	.tgz
+MASTER_SITE_SUBDIR=	${PORTNAME:S/_//g}
+PKGNAMESUFFIX=	_another
 
 MAINTAINER=	mbr at FreeBSD.org
 COMMENT=	Allows users to use MySQL databases for user authentication
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.10)
-LIB_DEPENDS=   mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.else
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so.14)
-LIB_DEPENDS=   mysqlclient.14:${PORTSDIR}/databases/mysql41-client
-.else
-LIB_DEPENDS=   mysqlclient.12:${PORTSDIR}/databases/mysql40-client
-.endif
-.endif
-
-.if exists(${LOCALBASE}/include/apache2/apr.h)
-WITH_APACHE2=	yes
-.endif
-
-.if defined(WITH_APACHE2)
-APACHE_VER=	APACHE2
-PLIST_SUB=	VER="2"
-DSO=		mod_auth_mysql.la
-.else
-APACHE_VER=	APACHE1
-PLIST_SUB=	VER=""
-DSO=		mod_auth_mysql.so
-.endif
+USE_MYSQL=	YES
 
-BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${PORTSDIR}/${APACHE_PORT}
+SHORTMODNAME=	mysql_auth
+AP_FAST_BUILD=	YES
+AP_GENPLIST=	YES
+AP_INC=		${LOCALBASE}/include/mysql
+AP_LIB=		${LOCALBASE}/lib/mysql
+AP_EXTRAS=	-DAPACHE${AP_VER} -lmysqlclient -lz -lm
 
-post-patch:
-	@${SED} 's|%%LOCALBASE%%|${LOCALBASE}|g;s|%%APXS%%|${APXS}|g;s|%%APACHE_VER%%|${APACHE_VER}|g;s|%%DSO%%|${DSO}|g' \
-		${WRKDIR}/mod_auth_mysql/Makefile.orig > ${WRKDIR}/mod_auth_mysql/Makefile
+.include <bsd.port.pre.mk>
 
 .if !defined(NOPORTDOCS)
+post-build:
+	@${ECHO} "%%PORTDOCS%%%%DOCSDIR%%/README" >> ${PLIST}
+	@${ECHO} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST}
+
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
+.include "${PORTSDIR}/www/apache2/Makefile.modules.3rd"
 .include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/www/mod_auth_mysql_another.orig/distinfo /usr/ports/www/mod_auth_mysql_another/distinfo
--- /usr/ports/www/mod_auth_mysql_another.orig/distinfo	Wed Mar 31 06:12:14 2004
+++ /usr/ports/www/mod_auth_mysql_another/distinfo	Sat Dec  4 13:25:31 2004
@@ -1,2 +1,2 @@
-MD5 (mod_auth_mysql.tgz) = b6646a117703b3704091e8f19f02e43e
-SIZE (mod_auth_mysql.tgz) = 9953
+MD5 (mod_auth_mysql-2.7.0.tar.gz) = 38f1f7366baac247153749a8a4a48f8c
+SIZE (mod_auth_mysql-2.7.0.tar.gz) = 13412
diff -ruN --exclude=CVS /usr/ports/www/mod_auth_mysql_another.orig/files/patch-Makefile /usr/ports/www/mod_auth_mysql_another/files/patch-Makefile
--- /usr/ports/www/mod_auth_mysql_another.orig/files/patch-Makefile	Mon Jun 30 12:35:28 2003
+++ /usr/ports/www/mod_auth_mysql_another/files/patch-Makefile	Thu Jan  1 02:00:00 1970
@@ -1,14 +0,0 @@
---- /dev/null	Sat Apr 20 17:11:40 2002
-+++ Makefile.orig	Sat Apr 20 17:12:22 2002
-@@ -0,0 +1,11 @@
-+APXS  = %%APXS%%
-+DSO   = %%DSO%%
-+SRCS  = mod_auth_mysql.c
-+OPTS  = -D %%APACHE_VER%% -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib/mysql -lmysqlclient
-+
-+all:
-+	$(APXS) -c $(OPTS) $(SRCS)
-+
-+install:
-+	$(APXS) -i -a $(DSO)
-+
diff -ruN --exclude=CVS /usr/ports/www/mod_auth_mysql_another.orig/files/patch-mod_auth_mysql.c /usr/ports/www/mod_auth_mysql_another/files/patch-mod_auth_mysql.c
--- /usr/ports/www/mod_auth_mysql_another.orig/files/patch-mod_auth_mysql.c	Sun Jan 11 20:52:38 2004
+++ /usr/ports/www/mod_auth_mysql_another/files/patch-mod_auth_mysql.c	Sat Dec  4 20:12:17 2004
@@ -1,33 +1,10 @@
---- mod_auth_mysql.c	Sat May 10 16:12:34 2003
-+++ mod_auth_mysql.c	Sun Jan 11 13:16:47 2004
-@@ -97,6 +97,7 @@
-  * MODULE-DEFINITION-END
-  */
- 
-+#define MYSQL_CRYPT_LEN 17U
- 
- #ifdef APACHE2
- #define PCALLOC apr_pcalloc
-@@ -617,7 +618,8 @@
-   conn_rec *c = r->connection;
-   const char *sent_pw, *real_pw;
-   int res;
--  char *scrambled_sent_pw;
-+  unsigned long hash_res[2];
-+  char scrambled_sent_pw[MYSQL_CRYPT_LEN];
- 
-   if ((res = ap_get_basic_auth_pw (r, &sent_pw)))
-     return res;
-@@ -658,8 +660,10 @@
- 
-   /* if AuthMySQLScrambledPassword is On, compare the scrambled password */
-   if(sec->mysqlScrambled) {
--    scrambled_sent_pw = PCALLOC(r->pool, 33);
--    make_scrambled_password(scrambled_sent_pw, sent_pw);
-+    /* make_scrambled_password(scrambled_sent_pw, sent_pw); */
-+    hash_password(hash_res, sent_pw);
-+    snprintf(scrambled_sent_pw, sizeof scrambled_sent_pw, "%08lx%08lx",
-+    	hash_res[0], hash_res[1]);
-     if(strcmp(real_pw, scrambled_sent_pw)) {
- 	  passwords_match = 0;
-     }
+--- mod_auth_mysql.c.orig	Sat Dec  4 20:09:20 2004
++++ mod_auth_mysql.c	Sat Dec  4 20:09:33 2004
+@@ -253,7 +253,6 @@
+   #include "http_request.h"   /* for ap_hook_(check_user_id | auth_checker)*/
+   #include "ap_compat.h"
+   #include "apr_strings.h"
+-  #include "crypt.h"
+   #define LOG_ERROR_1(lvl, stat, rqst, msg, parm)  \
+ 	  ap_log_rerror (APLOG_MARK, lvl, stat, rqst, msg, parm)
+   #define LOG_ERROR_2(lvl, stat, rqst, msg, parm1, parm2)  \
diff -ruN --exclude=CVS /usr/ports/www/mod_auth_mysql_another.orig/pkg-plist /usr/ports/www/mod_auth_mysql_another/pkg-plist
--- /usr/ports/www/mod_auth_mysql_another.orig/pkg-plist	Mon Jun 30 12:35:27 2003
+++ /usr/ports/www/mod_auth_mysql_another/pkg-plist	Thu Jan  1 02:00:00 1970
@@ -1,5 +0,0 @@
-libexec/apache%%VER%%/mod_auth_mysql.so
- at exec %D/sbin/apxs -e -a -n mysql_auth %f
- at unexec %D/sbin/apxs -e -A -n mysql_auth %f
-%%PORTDOCS%%share/doc/mod_auth_mysql_another/README
-%%PORTDOCS%%@dirrm share/doc/mod_auth_mysql_another
--- mod_auth_mysql_another-2.7.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list