- Update to 2.8.18

- Remove patches sent upstream

PR:             ports/163218
Submitted by:   scf
Approved by:    maintainer timeout (sbz ; 57 days)

6 files changed, 20 insertions, 95 deletions

diff --git a/security/cracklib/Makefile b/security/cracklib/Makefile
index 56777fbc1ec0..2ddeebcb5b1e 100644
--- a/security/cracklib/Makefile
+++ b/security/cracklib/Makefile
@@ -6,31 +6,21 @@
 #
 
 PORTNAME=	cracklib
-PORTVERSION=	2.7
-PORTREVISION=	2
+PORTVERSION=	2.8.18
 CATEGORIES=	security
-MASTER_SITES=	http://www.crypticide.com/users/alecm/security/
-DISTNAME=	${PORTNAME},${PORTVERSION}
+MASTER_SITES=	SF
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Password-checking library
 
+LICENSE=	LGPL21
+
 MAN3=		cracklib.3
 MLINKS=		cracklib.3 FascistCheck.3
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-pre-su-install:
-	${INSTALL_DATA} ${WRKSRC}/cracklib/libcrack.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/cracklib/libcrack.so.1 ${PREFIX}/lib
-	${LN} -sf libcrack.so.1 ${PREFIX}/lib/libcrack.so
-	${INSTALL_DATA} ${WRKSRC}/cracklib/packer.h ${PREFIX}/include
-	${INSTALL_SCRIPT} ${WRKSRC}/util/mkdict ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/util/packer ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/util/testlib ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/util/testnum ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/util/teststr ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/util/unpacker ${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/cracklib.3 ${MAN3PREFIX}/man/man3
-	${MKDIR} ${PREFIX}/libdata/cracklib
+post-install:
+	${INSTALL_MAN} ${FILESDIR}/cracklib.3 ${MAN3PREFIX}/man/man3/.
 
 .include <bsd.port.mk>
diff --git a/security/cracklib/distinfo b/security/cracklib/distinfo
index afbcdfa2ce03..07104b1954ee 100644
--- a/security/cracklib/distinfo
+++ b/security/cracklib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cracklib,2.7.tar.gz) = cbbc5a43acd20658a9addc2997cb012476f130918dd0ffca99313fbd835f21d2
-SIZE (cracklib,2.7.tar.gz) = 21059
+SHA256 (cracklib-2.8.18.tar.gz) = 2b072f67f7267358459424c3ed70f7f5b70919118e6504a90d3bce37a67c1454
+SIZE (cracklib-2.8.18.tar.gz) = 587311
diff --git a/security/cracklib/files/patch-Makefile b/security/cracklib/files/patch-Makefile
deleted file mode 100644
index 93d4db588f3c..000000000000
--- a/security/cracklib/files/patch-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.orig	Wed Dec 31 02:33:53 1997
-+++ Makefile	Mon Mar 15 04:46:29 2004
-@@ -9,12 +9,12 @@
- ###
- # set this to the absolute path (less extn) of compressed dict.
- 
--DICTPATH="/usr/local/lib/pw_dict"
-+DICTPATH="/usr/local/libdata/cracklib/pw_dict"
- 
- ###
- # Set this to the path of one or more files continaing wordlists.
- 
--SRCDICTS=/usr/dict/words
-+SRCDICTS=/usr/share/dict/words
- 
- ###
- # If you have installed the cracklib-dicts directory, use this
-@@ -24,7 +24,7 @@
- 	@echo "you evidently don't know what you're doing. go read the README"
- 
- all:
--	( cd cracklib && make && exit $$? )
-+	( cd cracklib && make all && exit $$? )
- 	( cd util && make DICTPATH=$(DICTPATH) && exit $$? )
- ###	( cd passwd && make DICTPATH=$(DICTPATH) passwd && exit $$? )
- ###	touch all
diff --git a/security/cracklib/files/patch-cracklib::Makefile b/security/cracklib/files/patch-cracklib::Makefile
deleted file mode 100644
index 72cdd68f2989..000000000000
--- a/security/cracklib/files/patch-cracklib::Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- cracklib/Makefile.orig	Mon Mar 15 04:45:15 2004
-+++ cracklib/Makefile	Mon Mar 15 04:45:21 2004
-@@ -7,12 +7,24 @@
- ###
- 
- LIB=	libcrack.a
-+SHLIB=	libcrack.so.1
- OBJ=	fascist.o packlib.o rules.o stringlib.o
--CFLAGS= -O -I../cracklib -DIN_CRACKLIB
-+SHOBJ=	fascist.So packlib.So rules.So stringlib.So
-+CFLAGS+=-I../cracklib -DIN_CRACKLIB
-+
-+.SUFFIXES: .o .So
-+
-+.c.So:
-+	$(CC) $(CFLAGS) -fPIC -o $*.So -c $?
- 
- $(LIB):	$(OBJ)
- 	ar rv $(LIB) $?
- 	-ranlib $(LIB)
-+
-+$(SHLIB): $(SHOBJ)
-+	ld -shared -o ${SHLIB} ${SHOBJ}
-+
-+all:	$(LIB) $(SHLIB)
- 
- clean:
- 	-rm -f $(OBJ) $(LIB) *~
diff --git a/security/cracklib/files/patch-util::Makefile b/security/cracklib/files/patch-util::Makefile
deleted file mode 100644
index 29954fbb0d5d..000000000000
--- a/security/cracklib/files/patch-util::Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/Makefile.orig	Mon Mar 15 04:47:13 2004
-+++ util/Makefile	Mon Mar 15 04:47:19 2004
-@@ -14,7 +14,7 @@
- #SunOS users (and others?) should consider static linking of their passwd binary
- #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic
- 
--CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
-+CFLAGS+=-I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
- LIBS=	../cracklib/libcrack.a
- 
- all:	packer unpacker testnum teststr testlib
diff --git a/security/cracklib/pkg-plist b/security/cracklib/pkg-plist
index eb5f30cbfa68..303bf2642b03 100644
--- a/security/cracklib/pkg-plist
+++ b/security/cracklib/pkg-plist
@@ -1,14 +1,14 @@
-bin/mkdict
-bin/packer
-bin/testlib
-bin/testnum
-bin/teststr
-bin/unpacker
+include/crack.h
 include/packer.h
 lib/libcrack.a
+lib/libcrack.la
 lib/libcrack.so
-lib/libcrack.so.1
-libdata/cracklib/pw_dict.hwm
-libdata/cracklib/pw_dict.pwd
-libdata/cracklib/pw_dict.pwi
-@dirrm libdata/cracklib
+lib/libcrack.so.10
+sbin/cracklib-check
+sbin/cracklib-format
+sbin/cracklib-packer
+sbin/cracklib-unpacker
+sbin/create-cracklib-dict
+%%DATADIR%%/cracklib-small
+%%DATADIR%%/cracklib.magic
+@dirrm share/cracklib