pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

libpwquality: Update to 1.4.4

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Sun Nov 22 12:46:53 2020 +0100
Changeset:	b9b43dd74534d3af33ddbffccf23dadae3e65876

Modified Files:
	libpwquality/Makefile
	libpwquality/PLIST
	libpwquality/buildlink3.mk
	libpwquality/distinfo
Added Files:
	libpwquality/patches/patch-src_Makefile.in
Removed Files:
	libpwquality/patches/patch-src_pwquality.pc.in

Log Message:
libpwquality: Update to 1.4.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b9b43dd74534d3af33ddbffccf23dadae3e65876

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libpwquality/Makefile                          | 37 +++++++++++---------------
 libpwquality/PLIST                             | 11 +++++---
 libpwquality/buildlink3.mk                     |  2 +-
 libpwquality/distinfo                          | 10 +++----
 libpwquality/patches/patch-src_Makefile.in     | 15 +++++++++++
 libpwquality/patches/patch-src_pwquality.pc.in | 24 -----------------
 6 files changed, 44 insertions(+), 55 deletions(-)

diffs:
diff --git a/libpwquality/Makefile b/libpwquality/Makefile
index 5603152335..bd6fc30f49 100644
--- a/libpwquality/Makefile
+++ b/libpwquality/Makefile
@@ -1,41 +1,34 @@
 # $NetBSD$
 
-DISTNAME=	libpwquality-1.3.0
+DISTNAME=	libpwquality-1.4.4
 CATEGORIES=	security
-MASTER_SITES=	https://ftp.osuosl.org/pub/blfs/conglomeration/libpwquality/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=libpwquality/}
+GITHUB_RELEASE=	${DISTNAME}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-COMMENT=	Library for generating random passwords and quality checking
 HOMEPAGE=	https://github.com/libpwquality/libpwquality
+COMMENT=	Library for generating random passwords and quality checking
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=		automake autoconf aclocal gmake
-GNU_CONFIGURE=		yes
-
-CONFIG_DIR=		share/examples/pwquality
+USE_TOOLS+=	msgfmt msgmerge xgettext
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 
 CONFIGURE_ARGS+=	--disable-pam
-CONFIGURE_ARGS+=	--with-python-binary=${PYTHONBIN}
-CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/${CONFIG_DIR}
-
-INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/security
+CONFIGURE_ARGS+=	--disable-python-bindings
 
 PKGCONFIG_OVERRIDE=	src/pwquality.pc.in
 
 PY_PATCHPLIST=	yes
 
-CONF_FILES=	${CONFIG_DIR}/security/pwquality.conf \
-			${PKG_SYSCONFDIR}/security/pwquality.conf
+OWN_DIRS+=	${PKG_SYSCONFDIR}/security
+
+EGDIR=		share/examples/libpwquality
 
-pre-configure:
-	set -e; cd ${WRKSRC}; \
-	aclocal; \
-	autoconf; \
-	automake
+CONF_FILES=	${EGDIR}/security/pwquality.conf \
+		${PKG_SYSCONFDIR}/security/pwquality.conf
 
-.include "../../wip/py-cracklib/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../lang/python/extension.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../security/cracklib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libpwquality/PLIST b/libpwquality/PLIST
index f15dc4ac11..d8f5d131d7 100644
--- a/libpwquality/PLIST
+++ b/libpwquality/PLIST
@@ -4,14 +4,14 @@ bin/pwscore
 include/pwquality.h
 lib/libpwquality.la
 lib/pkgconfig/pwquality.pc
-${PYSITELIB}/pwquality.so
 man/man1/pwmake.1
 man/man1/pwscore.1
 man/man3/pwquality.3
 man/man5/pwquality.conf.5
-share/examples/pwquality/security/pwquality.conf
+share/examples/libpwquality/security/pwquality.conf
 share/locale/ar/LC_MESSAGES/libpwquality.mo
 share/locale/as/LC_MESSAGES/libpwquality.mo
+share/locale/az/LC_MESSAGES/libpwquality.mo
 share/locale/bg/LC_MESSAGES/libpwquality.mo
 share/locale/bn_IN/LC_MESSAGES/libpwquality.mo
 share/locale/ca/LC_MESSAGES/libpwquality.mo
@@ -20,12 +20,15 @@ share/locale/da/LC_MESSAGES/libpwquality.mo
 share/locale/de/LC_MESSAGES/libpwquality.mo
 share/locale/es/LC_MESSAGES/libpwquality.mo
 share/locale/eu/LC_MESSAGES/libpwquality.mo
+share/locale/fa/LC_MESSAGES/libpwquality.mo
 share/locale/fi/LC_MESSAGES/libpwquality.mo
 share/locale/fr/LC_MESSAGES/libpwquality.mo
+share/locale/fur/LC_MESSAGES/libpwquality.mo
 share/locale/gu/LC_MESSAGES/libpwquality.mo
 share/locale/he/LC_MESSAGES/libpwquality.mo
 share/locale/hi/LC_MESSAGES/libpwquality.mo
 share/locale/hu/LC_MESSAGES/libpwquality.mo
+share/locale/id/LC_MESSAGES/libpwquality.mo
 share/locale/it/LC_MESSAGES/libpwquality.mo
 share/locale/ja/LC_MESSAGES/libpwquality.mo
 share/locale/kk/LC_MESSAGES/libpwquality.mo
@@ -34,7 +37,6 @@ share/locale/kn/LC_MESSAGES/libpwquality.mo
 share/locale/ko/LC_MESSAGES/libpwquality.mo
 share/locale/ml/LC_MESSAGES/libpwquality.mo
 share/locale/mr/LC_MESSAGES/libpwquality.mo
-share/locale/mr_IN/LC_MESSAGES/libpwquality.mo
 share/locale/nb/LC_MESSAGES/libpwquality.mo
 share/locale/nl/LC_MESSAGES/libpwquality.mo
 share/locale/or/LC_MESSAGES/libpwquality.mo
@@ -45,6 +47,7 @@ share/locale/pt_BR/LC_MESSAGES/libpwquality.mo
 share/locale/ru/LC_MESSAGES/libpwquality.mo
 share/locale/si/LC_MESSAGES/libpwquality.mo
 share/locale/sk/LC_MESSAGES/libpwquality.mo
+share/locale/sq/LC_MESSAGES/libpwquality.mo
 share/locale/sr/LC_MESSAGES/libpwquality.mo
 share/locale/sr@latin/LC_MESSAGES/libpwquality.mo
 share/locale/sv/LC_MESSAGES/libpwquality.mo
@@ -52,7 +55,9 @@ share/locale/ta/LC_MESSAGES/libpwquality.mo
 share/locale/te/LC_MESSAGES/libpwquality.mo
 share/locale/tr/LC_MESSAGES/libpwquality.mo
 share/locale/uk/LC_MESSAGES/libpwquality.mo
+share/locale/ur/LC_MESSAGES/libpwquality.mo
 share/locale/vi/LC_MESSAGES/libpwquality.mo
 share/locale/zh_CN/LC_MESSAGES/libpwquality.mo
 share/locale/zh_TW/LC_MESSAGES/libpwquality.mo
 share/locale/zu/LC_MESSAGES/libpwquality.mo
+@pkgdir man/man8
diff --git a/libpwquality/buildlink3.mk b/libpwquality/buildlink3.mk
index 7d09c5ab92..a33a026a1b 100644
--- a/libpwquality/buildlink3.mk
+++ b/libpwquality/buildlink3.mk
@@ -8,7 +8,7 @@ LIBPWQUALITY_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libpwquality+=	libpwquality>=1.3.0
 BUILDLINK_PKGSRCDIR.libpwquality?=	../../wip/libpwquality
 
-.include "../../wip/py-cracklib/buildlink3.mk"
+.include "../../security/cracklib/buildlink3.mk"
 .endif	# LIBPWQUALITY_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libpwquality
diff --git a/libpwquality/distinfo b/libpwquality/distinfo
index c5aa7e3d31..16d3dec813 100644
--- a/libpwquality/distinfo
+++ b/libpwquality/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (libpwquality-1.3.0.tar.bz2) = a9f2eec48b9a04a836785e18c8b1f5a69d5920f7
-RMD160 (libpwquality-1.3.0.tar.bz2) = 5ca6e8eea9c3ee277ecb9aa9b2875748fe3ff000
-SHA512 (libpwquality-1.3.0.tar.bz2) = c3817c7a5ca962b161911b97b413a0db7c34a99ba2cd191435024abdbe060e248c0f88436f24d3992dcb1b00d34b88afb731ef1fd23efc3ad1abe56d4d7d53ea
-Size (libpwquality-1.3.0.tar.bz2) = 423910 bytes
-SHA1 (patch-src_pwquality.pc.in) = a86bec68e60a29fb9e112ff88c6a8df9e48637fc
+SHA1 (libpwquality-1.4.4.tar.bz2) = 94e3f2eb67ccff1823e727d6770c3f39acbd954d
+RMD160 (libpwquality-1.4.4.tar.bz2) = dbcc85959af5894bf0cc3b5e29fedecc522d615c
+SHA512 (libpwquality-1.4.4.tar.bz2) = 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
+Size (libpwquality-1.4.4.tar.bz2) = 426923 bytes
+SHA1 (patch-src_Makefile.in) = eca8bba7156fc9c029306aeb6b422fc644ef2330
diff --git a/libpwquality/patches/patch-src_Makefile.in b/libpwquality/patches/patch-src_Makefile.in
new file mode 100644
index 0000000000..74d7db145c
--- /dev/null
+++ b/libpwquality/patches/patch-src_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Install config files to examples.
+
+--- src/Makefile.in.orig	2020-10-13 07:31:04.000000000 +0000
++++ src/Makefile.in
+@@ -393,7 +393,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ CLEANFILES = *~
+ securelibdir = @SECUREDIR@
+-secureconfdir = @SCONFIGDIR@
++secureconfdir = @datadir@/examples/libpwquality/security
+ EXTRA_DIST = libpwquality.map pwquality.conf pwquality.pc
+ include_HEADERS = pwquality.h
+ noinst_HEADERS = pwqprivate.h
diff --git a/libpwquality/patches/patch-src_pwquality.pc.in b/libpwquality/patches/patch-src_pwquality.pc.in
deleted file mode 100644
index 04fe1c307d..0000000000
--- a/libpwquality/patches/patch-src_pwquality.pc.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-# HG changeset patch
-# User Tomas Mraz <tmraz%redhat.com@localhost>
-# Date 1458546851 -3600
-# Node ID 3447d64e5ab82e9469f21371c540b09456874262
-# Parent  a4696cd7cd246f6c34a2d2f1d54d569c5e7ecd84
-Add missing parts to pwquality.pc.in
-
---- src/pwquality.pc.in.orig	2012-12-19 16:52:09.000000000 +0000
-+++ src/pwquality.pc.in
-@@ -1,5 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
- Name: pwquality
- Description: Password quality checker
- Version: @PACKAGE_VERSION@
--Libs: -lpwquality
-+Libs: -L${libdir} -lpwquality
- Libs.private: -lcrack
-+Cflags: -I${includedir}
Home | Main Index | Thread Index | Old Index