Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Jun 2013 00:52:47 +0000 (UTC)
From:      Sofian Brabez <sbz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r320515 - in head/security: cracklib py-cracklib
Message-ID:  <201306110052.r5B0qlZb002507@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbz
Date: Tue Jun 11 00:52:47 2013
New Revision: 320515
URL: http://svnweb.freebsd.org/changeset/ports/320515

Log:
  - Update to 2.9.0
  - Update pkg-descr
  - Update WWW
  - Remove PYTHON OPTION in security/cracklib and made security/py-cracklib a python slave port
  
  Reviewed by:	crees
  Approved by:	sbz (myself)

Deleted:
  head/security/cracklib/pkg-plist
  head/security/py-cracklib/distinfo
  head/security/py-cracklib/pkg-descr
  head/security/py-cracklib/pkg-plist
Modified:
  head/security/cracklib/Makefile
  head/security/cracklib/distinfo
  head/security/cracklib/pkg-descr   (contents, props changed)
  head/security/py-cracklib/Makefile

Modified: head/security/cracklib/Makefile
==============================================================================
--- head/security/cracklib/Makefile	Tue Jun 11 00:39:03 2013	(r320514)
+++ head/security/cracklib/Makefile	Tue Jun 11 00:52:47 2013	(r320515)
@@ -2,39 +2,76 @@
 # $FreeBSD$
 
 PORTNAME=	cracklib
-PORTVERSION=	2.8.22
+PORTVERSION=	2.9.0
 CATEGORIES=	security
+.if defined(PYTHON_SLAVEPORT)
+CATEGORIES+=	python
+.endif
 MASTER_SITES=	SF \
 		LOCAL/${MAINTAINER:C/([^@]*)@.*/\1/}
 
 MAINTAINER=	sbz@FreeBSD.org
-COMMENT=	Password-checking library
+COMMENT?=	Password-checking library
 
 LICENSE=	LGPL21
 
-MAN3=		${PORTNAME}.3
-MLINKS=		${PORTNAME}.3 FascistCheck.3
-
+DICTPATH=	${PREFIX}/libdata/${PORTNAME}
+DICTFILE=	${DICTPATH}/pw_dict
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=--with-default-dict=${DICTPATH}
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-default-dict=${PREFIX}/libdata/${PORTNAME}
-
-OPTIONS_DEFINE=	PYTHON
-
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MPYTHON}
+.if defined(PYTHON_SLAVEPORT)
 USE_PYTHON=	yes
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=	PYTHON=""
+CONFIGURE_ARGS+=--with-python
+PLIST_FILES=	%%PYTHON_SITELIBDIR%%/_cracklib.a \
+		%%PYTHON_SITELIBDIR%%/_cracklib.la \
+		%%PYTHON_SITELIBDIR%%/_cracklib.so \
+		%%PYTHON_SITELIBDIR%%/cracklib.py \
+		%%PYTHON_SITELIBDIR%%/cracklib.pyc \
+		%%PYTHON_SITELIBDIR%%/cracklib.pyo \
+		%%PYTHON_SITELIBDIR%%/test_cracklib.py \
+		%%PYTHON_SITELIBDIR%%/test_cracklib.pyc \
+		%%PYTHON_SITELIBDIR%%/test_cracklib.pyo
 .else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=	PYTHON="@comment "
+CONFIGURE_ARGS+=--without-python
+PLIST_DIRS=	libdata/cracklib \
+		share/cracklib
+
+PLIST_FILES=	include/crack.h \
+		include/packer.h \
+		lib/libcrack.a \
+		lib/libcrack.la \
+		lib/libcrack.so \
+		lib/libcrack.so.11 \
+		libdata/cracklib/pw_dict.hwm \
+		libdata/cracklib/pw_dict.pwd \
+		libdata/cracklib/pw_dict.pwi \
+		sbin/cracklib-check \
+		sbin/cracklib-format \
+		sbin/cracklib-packer \
+		sbin/cracklib-unpacker \
+		sbin/create-cracklib-dict \
+		%%DATADIR%%/cracklib-small \
+		%%DATADIR%%/cracklib.magic
 .endif
 
+.if defined(PYTHON_SLAVEPORT)
+pre-build:
+	cd ${WRKSRC}/lib && ${MAKE} libcrack.la
+
+regression-test: extract
+	@(cd ${BUILD_WKRSRC}; \
+	${PYTHON_CMD} -c \
+	"from test_${PORTNAME} import run; run(use_dictpath=\"${DICTFILE}\")")
+.else
+MAN3=		${PORTNAME}.3
+MLINKS=		${PORTNAME}.3 FascistCheck.3
+
 post-install:
 	${INSTALL_MAN} ${FILESDIR}/${MAN3} ${MAN3PREFIX}/man/man3/
-	@${MKDIR} ${PREFIX}/libdata/${PORTNAME}
-	${INSTALL_DATA} ${FILESDIR}/pw_dict* ${PREFIX}/libdata/${PORTNAME}/
+	@${MKDIR} ${DICTPATH}
+	${INSTALL_DATA} ${FILESDIR}/pw_dict* ${DICTPATH}/
+.endif
 
 .include <bsd.port.mk>

Modified: head/security/cracklib/distinfo
==============================================================================
--- head/security/cracklib/distinfo	Tue Jun 11 00:39:03 2013	(r320514)
+++ head/security/cracklib/distinfo	Tue Jun 11 00:52:47 2013	(r320515)
@@ -1,2 +1,2 @@
-SHA256 (cracklib-2.8.22.tar.gz) = feaff49bfb513ec10b2618c00d2f7f60776ba93fcc5fa22dd3479dd9cad9f770
-SIZE (cracklib-2.8.22.tar.gz) = 631796
+SHA256 (cracklib-2.9.0.tar.gz) = 17fecdfa78c0b9b47afa1533ea99b5351c3cef770bbd9c8c34391827efecbdc0
+SIZE (cracklib-2.9.0.tar.gz) = 626322

Modified: head/security/cracklib/pkg-descr
==============================================================================
--- head/security/cracklib/pkg-descr	Tue Jun 11 00:39:03 2013	(r320514)
+++ head/security/cracklib/pkg-descr	Tue Jun 11 00:52:47 2013	(r320515)
@@ -2,19 +2,4 @@ CrackLib is a library containing a C fun
 really, but you only need to use one of them) which may be used in a
 "passwd"-like program.
 
-The idea is simple: try to prevent users from choosing passwords that
-could be guessed by "Crack" by filtering them out, at source.
-
-CrackLib is an offshoot of the version 5 "Crack" software, and
-contains a considerable number of ideas nicked from the new software.
-
-
-NOTE THIS WELL: CrackLib is NOT a replacement "passwd" program.
-CrackLib is a LIBRARY.  CrackLib is what trendy marketdroid types would
-probably call an "enabler".
-
-The idea is that you wire it into your _own_ "passwd" program (if you
-have source); alternatively, you wire it into something like "shadow"
-from off of the net.  You can use it in other things, too.
-
-WWW: http://www.crypticide.com/users/alecm/
+WWW: http://sourceforge.net/projects/cracklib/

Modified: head/security/py-cracklib/Makefile
==============================================================================
--- head/security/py-cracklib/Makefile	Tue Jun 11 00:39:03 2013	(r320514)
+++ head/security/py-cracklib/Makefile	Tue Jun 11 00:52:47 2013	(r320515)
@@ -1,21 +1,22 @@
 # $FreeBSD$
 
-PORTNAME=	cracklib
-PORTVERSION=	2.8.19
-CATEGORIES=	security python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	crees@FreeBSD.org
-COMMENT=	CPython extension module wrapping the libcrack library
+COMMENT=	Python bindings for cracklib
 
-LIB_DEPENDS=	crack:${PORTSDIR}/security/cracklib
+LICENSE=	LGPL21
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYEASYINSTALL_ARCHDEP=	yes
+LIB_DEPENDS=	crack:${PORTSDIR}/security/cracklib
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+MASTERDIR=	${.CURDIR}/../cracklib
+BUILD_WRKSRC=	${WRKSRC}/python
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+PYTHON_SLAVEPORT=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+	"{s#__version__ = '[^']*'#__version__ = '${PORTVERSION}'#;}" \
+	${BUILD_WRKSRC}/*.py
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"



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