summaryrefslogtreecommitdiff
path: root/security/pam-pgsql
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2002-11-24 09:21:46 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2002-11-24 09:21:46 +0000
commit4fe8f1b22b7c5cff742776a2277033b16df81bc1 (patch)
tree6fb9d0f779f2c108b85f39e95469215a6ce00a69 /security/pam-pgsql
parentUpdate to 1.6.1 (diff)
Maitainer update: Fix security/pam-pgsql on -current
Noticed on: bento PR: ports/45652 Submitted by: Mathieu Arnold <m@absolight.fr>
Notes
Notes: svn path=/head/; revision=70977
Diffstat (limited to 'security/pam-pgsql')
-rw-r--r--security/pam-pgsql/Makefile4
-rw-r--r--security/pam-pgsql/files/patch-pam_get_pass.c19
2 files changed, 18 insertions, 5 deletions
diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile
index b2ebf2778fb5..bc441b275876 100644
--- a/security/pam-pgsql/Makefile
+++ b/security/pam-pgsql/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_DEBIAN} \
MASTER_SITE_SUBDIR= pool/non-US/main/p/pam-pgsql
DISTFILES= ${PORTNAME}_${PORTVERSION}.orig${EXTRACT_SUFX}
-PATCHFILES= pam-pgsql_${PORTVERSION}-5.diff.gz
+PATCHFILES= ${PORTNAME}_${PORTVERSION}-5.diff.gz
PATCH_SITES= ${MASTER_SITES}
MAINTAINER= m@absolight.fr
@@ -33,7 +33,7 @@ MASTER_SITE_DEBIAN+= http://ftp.au.debian.org/pub/debian-non-US/${MASTER_SITE_SU
ftp://ftp.bora.net/pub/linux/debian-non-US/${MASTER_SITE_SUBDIR}/
MAKEFILE= ${FILESDIR}/Makefile.bsd
-MAKE_ARGS+= -j 2 FILESDIR=${FILESDIR}
+MAKE_ARGS+= FILESDIR=${FILESDIR}
post-install:
${CAT} ${PKGMESSAGE}
diff --git a/security/pam-pgsql/files/patch-pam_get_pass.c b/security/pam-pgsql/files/patch-pam_get_pass.c
index 55395c9158bd..a98bf1b80eb6 100644
--- a/security/pam-pgsql/files/patch-pam_get_pass.c
+++ b/security/pam-pgsql/files/patch-pam_get_pass.c
@@ -1,7 +1,6 @@
--- pam_get_pass.c.orig Mon Jan 14 17:45:55 2002
-+++ pam_get_pass.c Tue Aug 13 18:31:56 2002
-@@ -33,70 +33,7 @@
- /* $Id: pam_get_pass.c,v 1.2 2000/06/25 09:39:28 ljb Exp $ */
++++ pam_get_pass.c Sat Nov 23 20:26:10 2002
+@@ -34,68 +34,5 @@
#include <stdlib.h>
#include <security/pam_modules.h>
-#include "pam_mod_misc.h"
@@ -71,3 +70,17 @@
+#include <security/pam_mod_misc.h>
int
+@@ -125,8 +62,11 @@
+ return retval;
+
++#ifdef PAM_AUTHTOK_RECOVER_ERR
++#define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR
++#endif
+ if(!resp)
+- return PAM_AUTHTOK_RECOVER_ERR;
++ return PAM_AUTHTOK_RECOVERY_ERR;
+ if(strcmp(resp[0].resp, resp[1].resp) != 0)
+- return PAM_AUTHTOK_RECOVER_ERR;
++ return PAM_AUTHTOK_RECOVERY_ERR;
+
+ retval = pam_set_item(pamh, PAM_AUTHTOK, resp[0].resp);