diff options
| -rw-r--r-- | security/pam-mysql/Makefile | 31 | ||||
| -rw-r--r-- | security/pam-mysql/PLIST | 8 | ||||
| -rw-r--r-- | security/pam-mysql/distinfo | 9 | ||||
| -rw-r--r-- | security/pam-mysql/patches/patch-aa | 93 |
4 files changed, 20 insertions, 121 deletions
diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile index e40721dbe8e..65a317f5e8c 100644 --- a/security/pam-mysql/Makefile +++ b/security/pam-mysql/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2006/03/04 21:30:37 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2006/03/07 01:22:16 joerg Exp $ -DISTNAME= pam_mysql-0.5 -PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 2 +DISTNAME= pam_mysql-0.7RC1 +PKGNAME= ${DISTNAME:S/_/-/:S/RC/rc/} CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pam-mysql/} @@ -10,26 +9,20 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pam-mysql.sourceforge.net/ COMMENT= PAM module for authenticating with MySQL -WRKSRC= ${WRKDIR}/pam_mysql DOCDIR= ${PREFIX}/share/doc/pam-mysql -INSTALLATION_DIRS= lib +GNU_CONFIGURE= yes +USE_LIBTOOL= yes -do-build: - ${CC} -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 \ - ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/mysql -lmysqlclient \ - -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib +CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client:Q} +CONFIGURE_ARGS+= --with-pam-mods-dir=${PREFIX:Q}/lib/security +CONFIGURE_ARGS+= --disable-static -do-install: - ${INSTALL_LIB} ${WRKSRC}/pam_mysql.so ${PREFIX}/lib - ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/Changelog ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/Readme ${DOCDIR} +post-install: + ${INSTALL_DATA_DIR} ${DOCDIR:Q} + cd ${WRKSRC:Q} && ${INSTALL_DATA} CREDITS ChangeLog README ${DOCDIR:Q} +.include "../../security/openssl/buildlink3.mk" .include "../../mk/mysql.buildlink3.mk" .include "../../mk/pam.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/pam-mysql/PLIST b/security/pam-mysql/PLIST index a7c2ec3b1c5..2096c55b259 100644 --- a/security/pam-mysql/PLIST +++ b/security/pam-mysql/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/05/05 20:16:42 xtraeme Exp $ -lib/pam_mysql.so +@comment $NetBSD: PLIST,v 1.2 2006/03/07 01:22:16 joerg Exp $ +lib/security/pam_mysql.la share/doc/pam-mysql/CREDITS -share/doc/pam-mysql/Changelog -share/doc/pam-mysql/Readme +share/doc/pam-mysql/ChangeLog +share/doc/pam-mysql/README @dirrm share/doc/pam-mysql diff --git a/security/pam-mysql/distinfo b/security/pam-mysql/distinfo index 71ed4e3b134..9cc51ef3ffa 100644 --- a/security/pam-mysql/distinfo +++ b/security/pam-mysql/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2005/05/05 20:16:42 xtraeme Exp $ +$NetBSD: distinfo,v 1.2 2006/03/07 01:22:16 joerg Exp $ -SHA1 (pam_mysql-0.5.tar.gz) = 6e974a3ee78a968b0069c4abbd1d8602c145e177 -RMD160 (pam_mysql-0.5.tar.gz) = 788246f050ce0b531799af3e8d816248b974638f -Size (pam_mysql-0.5.tar.gz) = 11587 bytes -SHA1 (patch-aa) = 05300eb46da816015567195dc755f39522d1f5d8 +SHA1 (pam_mysql-0.7RC1.tar.gz) = a139c4b4bf1a2e591a016069405428eb862f7690 +RMD160 (pam_mysql-0.7RC1.tar.gz) = ffa908bf2f458c48571f0f172f841ef861ad0b47 +Size (pam_mysql-0.7RC1.tar.gz) = 335240 bytes diff --git a/security/pam-mysql/patches/patch-aa b/security/pam-mysql/patches/patch-aa deleted file mode 100644 index 49a87441465..00000000000 --- a/security/pam-mysql/patches/patch-aa +++ /dev/null @@ -1,93 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/05/05 20:16:42 xtraeme Exp $ - ---- 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 - |