From f6fc3feb0f9cab3fe82f8a656f9d084d655951b3 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Sat, 5 Sep 2020 22:02:29 +0300
Subject: sys-auth/passwdqc: ship our own config file

And also install the config file into the /etc/security dir

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
 sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild | 61 ++++++++++++++++++++++++++++++
 sys-auth/passwdqc/passwdqc-1.4.0.ebuild    | 47 -----------------------
 2 files changed, 61 insertions(+), 47 deletions(-)
 create mode 100644 sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
 delete mode 100644 sys-auth/passwdqc/passwdqc-1.4.0.ebuild

(limited to 'sys-auth/passwdqc')

diff --git a/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..3861096f8540
--- /dev/null
+++ b/sys-auth/passwdqc/passwdqc-1.4.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam toolchain-funcs
+
+DESCRIPTION="Password strength checking library (and PAM module)"
+HOMEPAGE="http://www.openwall.com/passwdqc/"
+SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
+
+LICENSE="Openwall BSD public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-libs/pam"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	QA_FLAGS_IGNORED="/$(get_libdir)/security/pam_passwdqc.so
+		 /usr/$(get_libdir)/libpasswdqc.so.0"
+}
+
+src_prepare() {
+	default
+	sed -i -e 's:`uname -s`:Linux:' Makefile || die
+
+	# ship our own default settings
+	cat <<- EOF > "${S}/passwdqc.conf"
+		min=8,8,8,8,8
+		max=40
+		passphrase=3
+		match=4
+		similar=deny
+		random=47
+		enforce=everyone
+		retry=3
+	EOF
+
+}
+
+_emake() {
+	emake -j1 \
+		SHARED_LIBDIR="/usr/$(get_libdir)" \
+		SECUREDIR="$(getpam_mod_dir)" \
+		CONFDIR="/etc/security" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getCC)" \
+		"$@"
+}
+
+src_compile() {
+	_emake pam utils
+}
+
+src_install() {
+	_emake DESTDIR="${ED}" install_lib install_pam install_utils
+	dodoc README PLATFORMS INTERNALS
+}
diff --git a/sys-auth/passwdqc/passwdqc-1.4.0.ebuild b/sys-auth/passwdqc/passwdqc-1.4.0.ebuild
deleted file mode 100644
index 8a292a46e9f3..000000000000
--- a/sys-auth/passwdqc/passwdqc-1.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs
-
-DESCRIPTION="Password strength checking library (and PAM module)"
-HOMEPAGE="http://www.openwall.com/passwdqc/"
-SRC_URI="http://www.openwall.com/${PN}/${P}.tar.gz"
-
-LICENSE="Openwall BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="sys-libs/pam"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	QA_FLAGS_IGNORED="/$(get_libdir)/security/pam_passwdqc.so
-		 /usr/$(get_libdir)/libpasswdqc.so.0"
-}
-
-src_prepare() {
-	default
-	sed -i -e 's:`uname -s`:Linux:' Makefile || die
-}
-
-_emake() {
-	emake -j1 \
-		SHARED_LIBDIR="/usr/$(get_libdir)" \
-		SECUREDIR="$(getpam_mod_dir)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
-		"$@"
-}
-
-src_compile() {
-	_emake pam utils
-}
-
-src_install() {
-	_emake DESTDIR="${ED}" install_lib install_pam install_utils
-	dodoc README PLATFORMS INTERNALS
-}
-- 
cgit v1.2.3-65-gdbad