Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Oct 2018 10:30:43 +0000 (UTC)
From:      Alex Dupre <ale@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482217 - in head/security/pam_p11: . files
Message-ID:  <201810161030.w9GAUh7h011962@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ale
Date: Tue Oct 16 10:30:43 2018
New Revision: 482217
URL: https://svnweb.freebsd.org/changeset/ports/482217

Log:
  Update to 0.2.0 release.

Added:
  head/security/pam_p11/files/patch-src_Makefile.in   (contents, props changed)
  head/security/pam_p11/files/patch-src_pam__p11.c   (contents, props changed)
Deleted:
  head/security/pam_p11/files/patch-configure
  head/security/pam_p11/files/patch-src_pam_p11.c
  head/security/pam_p11/pkg-plist
Modified:
  head/security/pam_p11/Makefile
  head/security/pam_p11/distinfo
  head/security/pam_p11/files/patch-src_test.c
  head/security/pam_p11/pkg-descr

Modified: head/security/pam_p11/Makefile
==============================================================================
--- head/security/pam_p11/Makefile	Tue Oct 16 10:27:23 2018	(r482216)
+++ head/security/pam_p11/Makefile	Tue Oct 16 10:30:43 2018	(r482217)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	pam_p11
-PORTVERSION=	0.1.5
-PORTREVISION=	3
+PORTVERSION=	0.2.0
 CATEGORIES=	security
-MASTER_SITES=	SF/opensc/${PORTNAME}
+MASTER_SITES=	https://github.com/OpenSC/pam_p11/releases/download/pam_p11-${PORTVERSION}/
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT=	PAM module using crypto tokens for auth
@@ -14,20 +13,20 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libp11.so:security/libp11
 
+USES=		libtool pkgconfig ssl
+
 OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
-USES=		libtool pkgconfig ssl
 
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
-		OPENSSL_LIBS="-L${OPENSSLLIB} -lssl"
+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
 
+PLIST_FILES=	lib/security/pam_p11.so
+
 PORTDOCS=	*
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/wiki
-	@(cd ${WRKSRC} && ${CP} NEWS ${STAGEDIR}${DOCSDIR})
-	@(cd ${WRKSRC}/doc && ${CP} README ${STAGEDIR}${DOCSDIR})
-	@(cd ${WRKSRC}/doc && ${CP} *.css *.html ${STAGEDIR}${DOCSDIR}/wiki)
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/security/pam_p11/distinfo
==============================================================================
--- head/security/pam_p11/distinfo	Tue Oct 16 10:27:23 2018	(r482216)
+++ head/security/pam_p11/distinfo	Tue Oct 16 10:30:43 2018	(r482217)
@@ -1,2 +1,3 @@
-SHA256 (pam_p11-0.1.5.tar.gz) = 74da875467c4ba156f7cb7eaec0718f92dded03f40db3c6c0423c03f44d9f25a
-SIZE (pam_p11-0.1.5.tar.gz) = 348181
+TIMESTAMP = 1539433560
+SHA256 (pam_p11-0.2.0.tar.gz) = 088d4c05d23fee9535f1b16f6c993c88b11cbed0288d5a1d0b37da2f390325a2
+SIZE (pam_p11-0.2.0.tar.gz) = 417550

Added: head/security/pam_p11/files/patch-src_Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pam_p11/files/patch-src_Makefile.in	Tue Oct 16 10:30:43 2018	(r482217)
@@ -0,0 +1,15 @@
+--- src/Makefile.in.orig	2018-10-16 10:16:04 UTC
++++ src/Makefile.in
+@@ -384,10 +384,10 @@ pam_p11_la_SOURCES = pam_p11.c base64.c 
+ 	pam_p11.exports
+ 
+ test_login_SOURCES = test.c login.c $(pam_p11_la_SOURCES)
+-test_login_LDADD = -lpam_misc
++test_login_LDADD =
+ test_login_CFLAGS = $(AM_CFLAGS) -DLIBDIR=\"$(libdir)\" -DTEST
+ test_passwd_SOURCES = test.c passwd.c $(pam_p11_la_SOURCES)
+-test_passwd_LDADD = -lpam_misc
++test_passwd_LDADD =
+ test_passwd_CFLAGS = $(AM_CFLAGS) -DLIBDIR=\"$(libdir)\" -DTEST
+ all: all-am
+ 

Added: head/security/pam_p11/files/patch-src_pam__p11.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/pam_p11/files/patch-src_pam__p11.c	Tue Oct 16 10:30:43 2018	(r482217)
@@ -0,0 +1,11 @@
+--- src/pam_p11.c.orig	2018-10-16 10:00:15 UTC
++++ src/pam_p11.c
+@@ -53,7 +53,7 @@
+ #include <security/pam_ext.h>
+ #else
+ #define pam_syslog(handle, level, msg...) syslog(level, ## msg)
+-static int pam_vprompt(pam_handle_t *pamh, int style, char **response,
++int pam_vprompt(const pam_handle_t *pamh, int style, char **response,
+ 		const char *fmt, va_list args)
+ {
+ 	int r = PAM_CRED_INSUFFICIENT;

Modified: head/security/pam_p11/files/patch-src_test.c
==============================================================================
--- head/security/pam_p11/files/patch-src_test.c	Tue Oct 16 10:27:23 2018	(r482216)
+++ head/security/pam_p11/files/patch-src_test.c	Tue Oct 16 10:30:43 2018	(r482217)
@@ -1,10 +1,23 @@
---- src/test.c.orig	2008-08-26 12:37:37.000000000 +0200
-+++ src/test.c	2008-08-26 12:37:45.000000000 +0200
-@@ -2,7 +2,6 @@
+--- src/test.c.orig	2018-05-04 14:52:04 UTC
++++ src/test.c
+@@ -22,9 +22,10 @@
+ 
+ #include <stdio.h>
  #include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
  
  #include <security/pam_appl.h>
 -#include <security/pam_misc.h>
  #include <security/pam_modules.h>
  
- int main(int argc, char **argv)
+ #ifndef LIBDIR
+@@ -42,7 +43,7 @@ int main(int argc, const char **argv)
+ 	};
+ 	pam_handle_t *pamh = NULL;
+ 	struct pam_conv conv = {
+-		misc_conv,
++		openpam_ttyconv,
+ 		NULL,
+ 	};
+ 	int r;

Modified: head/security/pam_p11/pkg-descr
==============================================================================
--- head/security/pam_p11/pkg-descr	Tue Oct 16 10:27:23 2018	(r482216)
+++ head/security/pam_p11/pkg-descr	Tue Oct 16 10:30:43 2018	(r482217)
@@ -18,4 +18,4 @@ certificate chains, certificate authorities, revocatio
 lists or OCSP. Perfect for the small installation with no
 frills.
 
-WWW: https://github.com/OpenSC/OpenSC/wiki/pam_p11-simple-RSA-authentication-with-PKCS%2311-modules
+WWW: https://github.com/OpenSC/pam_p11



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810161030.w9GAUh7h011962>