From root@corp.grupos.com.br  Tue Jul 19 20:42:06 2005
Return-Path: <root@corp.grupos.com.br>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 68A7916A41F;
	Tue, 19 Jul 2005 20:42:06 +0000 (GMT)
	(envelope-from root@corp.grupos.com.br)
Received: from mail.grupos.com.br (mail.grupos.com.br [200.203.183.72])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CC8A043D46;
	Tue, 19 Jul 2005 20:42:05 +0000 (GMT)
	(envelope-from root@corp.grupos.com.br)
Received: from corp.grupos.com.br (unknown [150.162.166.55])
	by mail.grupos.com.br (Postfix) with ESMTP id AF5C311EF87;
	Tue, 19 Jul 2005 17:42:01 -0300 (BRT)
Received: from corp.grupos.com.br (localhost [127.0.0.1])
	by corp.grupos.com.br (Postfix) with ESMTP id 3C3AE5603;
	Tue, 19 Jul 2005 17:42:01 -0300 (BRT)
Received: by corp.grupos.com.br (Postfix, from userid 0)
	id 1D1C255AD; Tue, 19 Jul 2005 17:42:01 -0300 (BRT)
Message-Id: <20050719204201.1D1C255AD@corp.grupos.com.br>
Date: Tue, 19 Jul 2005 17:42:01 -0300 (BRT)
From: Marcus Grando <marcus@corp.grupos.com.br>
Reply-To: Marcus Grando <marcus@corp.grupos.com.br>
To: FreeBSD-gnats-submit@freebsd.org
Cc: anders@FreeBSD.org
Subject: Update port: security/pam-mysql to 0.6.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         83748
>Category:       ports
>Synopsis:       Update port: security/pam-mysql to 0.6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    anders
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 19 20:50:23 GMT 2005
>Closed-Date:    Fri Sep 16 20:58:13 GMT 2005
>Last-Modified:  Fri Sep 16 20:58:13 GMT 2005
>Originator:     Marcus Grando
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD corp.grupos.com.br 4.11-STABLE FreeBSD 4.11-STABLE #0: Mon Jul 11 10:07:29 BRT 2005 root@corp.grupos.com.br:/usr/obj/usr/src/sys/CORP i386


	
>Description:

- Update to 0.6.0
- Update WWW

Removed:

files/patch-aa
files/patch-ab
files/
pkg-plist

NOTE: Need test in production system.

	
>How-To-Repeat:
	
>Fix:

	

--- pam-mysql.patch begins here ---
diff -ruN pam-mysql.orig/Makefile pam-mysql/Makefile
--- pam-mysql.orig/Makefile	Sat Jul 17 09:00:03 2004
+++ pam-mysql/Makefile	Tue Jul 19 17:34:01 2005
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	pam_mysql
-PORTVERSION=	0.5
-PORTREVISION=	1
+PORTVERSION=	0.6.0
+PORTREVISION=	0
 CATEGORIES=	security databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
@@ -17,37 +17,26 @@
 
 USE_REINPLACE=	yes
 USE_MYSQL=	yes
-BROKEN_WITH_MYSQL=	41
-USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} --with-pam-mods-dir=${PREFIX}/lib --with-pam=/usr
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
+PLIST_FILES=	lib/pam_mysql.la lib/pam_mysql.so
 
-.include <bsd.port.pre.mk>
-
-post-patch:
-	${REINPLACE_CMD} -e "s@^#define DEBUG@#undef DEBUG@" ${WRKSRC}/pam_mysql.c
-
-pre-build:
-	@cd ${WRKSRC} && ${GMAKE} clean
-
-do-build:
-	${CC} -O -pipe -fpic -DPIC -Wall -I${LOCALBASE}/include -c ${WRKSRC}/pam_mysql.c -o ${WRKSRC}/pam_mysql.o
-	${LD} -x --shared -o ${WRKSRC}/pam_mysql.so ${WRKSRC}/pam_mysql.o -lpam -lcrypt -L${LOCALBASE}/lib/mysql -lmysqlclient
-
-do-install:
-	@${INSTALL_DATA} ${WRKSRC}/pam_mysql.so ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Changelog ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Readme ${DOCSDIR}
+PORTDOCS=	*
 .endif
 
 post-install:
+.if !defined(NOPORTDOCS)
+	@${INSTALL} -d -o root -g wheel -m 0755 ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/NEWS ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 	@${ECHO_MSG} "================================================================================"
 	@${ECHO_MSG} "Copy/move/symlink ${PREFIX}/lib/pam_mysql.so to /usr/lib/pam_mysql.so"
 	@${ECHO_MSG} "to be able to use it. Read files in ${PREFIX}/share/doc/pam_mysql"
 	@${ECHO_MSG} "for info on how to set up."
 	@${ECHO_MSG} "================================================================================"
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN pam-mysql.orig/distinfo pam-mysql/distinfo
--- pam-mysql.orig/distinfo	Wed Mar 31 00:11:08 2004
+++ pam-mysql/distinfo	Tue Jul 19 17:04:33 2005
@@ -1,2 +1,2 @@
-MD5 (pam_mysql-0.5.tar.gz) = 8cf002392292ae2a5774545324739a94
-SIZE (pam_mysql-0.5.tar.gz) = 11587
+MD5 (pam_mysql-0.6.0.tar.gz) = b7f59c5450d89126b7f25fa2645b1b71
+SIZE (pam_mysql-0.6.0.tar.gz) = 312187
diff -ruN pam-mysql.orig/files/patch-aa pam-mysql/files/patch-aa
--- pam-mysql.orig/files/patch-aa	Sun Jun  1 18:27:03 2003
+++ pam-mysql/files/patch-aa	Wed Dec 31 21:00:00 1969
@@ -1,90 +0,0 @@
---- pam_mysql.c.orig	Sun Sep 15 10:28:58 2002
-+++ pam_mysql.c	Thu Feb 13 14:58:21 2003
-@@ -23,6 +23,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-+#include <time.h>
- 
- 
- /* AFAIK, only FreeBSD has MD5Data() defined in md5.h
-@@ -54,7 +55,53 @@
- #define DEBUG 
- 
- #include <security/pam_modules.h>
-+#ifdef _OPENPAM
-+#include <security/pam_appl.h>
-+#else
- #include <security/pam_misc.h>
-+#endif
-+
-+#ifdef _OPENPAM
-+/* some macros not defined in OpenPAM */
-+
-+/* Good policy to strike out passwords with some characters not just
-+   free the memory */
-+
-+#define _pam_overwrite(x)        \
-+do {                             \
-+     register char *__xx__;      \
-+     if ((__xx__=(x)))           \
-+          while (*__xx__)        \
-+               *__xx__++ = '\0'; \
-+} while (0)
-+
-+/*
-+ * Don't just free it, forget it too.
-+ */
-+
-+#define _pam_drop(X) \
-+do {                 \
-+    if (X) {         \
-+        free(X);     \
-+        X=NULL;      \
-+    }                \
-+} while (0)
-+
-+#define _pam_drop_reply(/* struct pam_response * */ reply, /* int */ replies) \
-+do {                                              \
-+    int reply_i;                                  \
-+                                                  \
-+    for (reply_i=0; reply_i<replies; ++reply_i) { \
-+	if (reply[reply_i].resp) {                \
-+	    _pam_overwrite(reply[reply_i].resp);  \
-+	    free(reply[reply_i].resp);            \
-+	}                                         \
-+    }                                             \
-+    if (reply)                                    \
-+	free(reply);                              \
-+} while (0)
-+
-+#endif
- 
- struct optionstruct {
- 	char host[257];
-@@ -620,7 +667,11 @@
- 		retval = conv->conv(nargs,
- 		                    (const struct pam_message **) message,
- 		                    response, conv->appdata_ptr);
--		if ((retval != PAM_SUCCESS) && (retval != PAM_CONV_AGAIN))
-+		if ((retval != PAM_SUCCESS)
-+#ifndef _OPENPAM
-+			&& (retval != PAM_CONV_AGAIN)
-+#endif
-+		   )
- 			syslog(LOG_DEBUG, "pam_mysql: conversation failure [%s]",
- 			       pam_strerror(pamh, retval));
- 	} else {
-@@ -827,8 +878,12 @@
- 	if (retval != PAM_SUCCESS) {
- 		if (resp != NULL)
- 			_pam_drop_reply(resp,i);
-+#ifndef _OPENPAM
- 		return ((retval == PAM_CONV_AGAIN)
- 		        ? PAM_INCOMPLETE : PAM_AUTHINFO_UNAVAIL);
-+#else
-+		return PAM_AUTHINFO_UNAVAIL;
-+#endif
- 	}
- 
- 	/* we have a password so set AUTHTOK
diff -ruN pam-mysql.orig/files/patch-ab pam-mysql/files/patch-ab
--- pam-mysql.orig/files/patch-ab	Sun Jun  1 18:27:03 2003
+++ pam-mysql/files/patch-ab	Wed Dec 31 21:00:00 1969
@@ -1,18 +0,0 @@
---- Makefile.orig	Thu Nov 21 02:13:01 2002
-+++ Makefile	Mon May 19 23:41:43 2003
-@@ -3,13 +3,9 @@
- ifndef FULL_LINUX_PAM_SOURCE_TREE
- export DYNAMIC=-DPAM_DYNAMIC
- export CC=gcc
--export CFLAGS=-O2 -Dlinux -DLINUX_PAM \
--       -ansi -D_POSIX_SOURCE -Wall -Wwrite-strings \
--       -Wpointer-arith -Wcast-qual -Wcast-align -Wtraditional \
--       -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline \
--       -Wshadow -pedantic -fPIC
-+export CFLAGS+=-I${LOCALBASE}/include -fPIC
- export MKDIR=mkdir -p
--export LD_D=gcc -shared -Xlinker -x -L/usr/lib/mysql -lz
-+export LD_D=${CC} -shared -Xlinker -x -L${LOCALBASE}/lib/mysql -lz
- endif
- 
- #
diff -ruN pam-mysql.orig/pkg-descr pam-mysql/pkg-descr
--- pam-mysql.orig/pkg-descr	Sun Sep 10 09:57:49 2000
+++ pam-mysql/pkg-descr	Tue Jul 19 17:36:47 2005
@@ -1,3 +1,3 @@
 This is a PAM module for authenticating with MySQL.
 
-WWW: http://sourceforge.net/projects/pam-mysql/
+WWW: http://pam-mysql.sourceforge.net/
diff -ruN pam-mysql.orig/pkg-plist pam-mysql/pkg-plist
--- pam-mysql.orig/pkg-plist	Wed Nov  5 22:10:17 2003
+++ pam-mysql/pkg-plist	Wed Dec 31 21:00:00 1969
@@ -1,5 +0,0 @@
-lib/pam_mysql.so
-%%PORTDOCS%%%%DOCSDIR%%/Changelog
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/Readme
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- pam-mysql.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->anders 
Responsible-Changed-By: pav 
Responsible-Changed-When: Tue Jul 19 21:43:40 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=83748 
State-Changed-From-To: open->closed 
State-Changed-By: mnag 
State-Changed-When: Fri Sep 16 20:58:02 GMT 2005 
State-Changed-Why:  
Commited, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=83748 
>Unformatted:
