mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-14 08:26:57 +02:00
dev-libs/libpwquality: Sync with Gentoo
It's from Gentoo commit 05bdb9f8384d6592415d8578f48b06b89127134b.
This commit is contained in:
Flatcar Buildbot
Mathieu Tortuyaux
parent
4827032fbb
commit
526dbd75f9
@ -1,35 +0,0 @@
|
||||
https://github.com/libpwquality/libpwquality/pull/62
|
||||
|
||||
From 27057c6cbf528108c35df934280c7dd83e8d5ce9 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Wed, 7 Sep 2022 05:42:17 +0100
|
||||
Subject: [PATCH] pam_pwquality: add include for
|
||||
pam_modutil_check_user_in_passwd
|
||||
|
||||
After 9084c1b032161cdb53d5f66132a91bdc207faecf, one gets:
|
||||
```
|
||||
pam_pwquality.c: In function 'check_local_user':
|
||||
pam_pwquality.c:102:16: error: implicit declaration of function 'pam_modutil_check_user_in_passwd' [-Werror=implicit-function-declaration]
|
||||
102 | return pam_modutil_check_user_in_passwd(pamh, user, NULL) == PAM_SUCCESS;
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
cc1: some warnings being treated as errors
|
||||
make[2]: *** [Makefile:634: pam_pwquality.lo] Error 1
|
||||
make[2]: *** Waiting for unfinished jobs....
|
||||
```
|
||||
|
||||
We need to include security/pam_modutil.h when appropriate.
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/src/pam_pwquality.c
|
||||
+++ b/src/pam_pwquality.c
|
||||
@@ -34,6 +34,10 @@
|
||||
#include <security/_pam_macros.h>
|
||||
#include <security/pam_ext.h>
|
||||
|
||||
+#ifdef HAVE_PAM_CHECK_USER_IN_PASSWD
|
||||
+#include <security/pam_modutil.h>
|
||||
+#endif
|
||||
+
|
||||
/* argument parsing */
|
||||
#define PAM_DEBUG_ARG 0x0001
|
||||
|
||||
@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="|| ( BSD GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
IUSE="pam python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
|
||||
90
sdk_container/src/third_party/portage-stable/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild
vendored
Normal file
90
sdk_container/src/third_party/portage-stable/dev-libs/libpwquality/libpwquality-1.4.5-r2.ebuild
vendored
Normal file
@ -0,0 +1,90 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_OPTIONAL=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
inherit libtool pam distutils-r1
|
||||
|
||||
DESCRIPTION="Library for password quality checking and generating random passwords"
|
||||
HOMEPAGE="https://github.com/libpwquality/libpwquality"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="|| ( BSD GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
IUSE="pam python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
BDEPEND="
|
||||
>=sys-devel/gettext-0.18.2
|
||||
virtual/pkgconfig
|
||||
python? (
|
||||
${DISTUTILS_DEPS}
|
||||
${PYTHON_DEPS}
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
>=sys-libs/cracklib-2.8:=[static-libs(+)?]
|
||||
pam? ( sys-libs/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize
|
||||
|
||||
if use python ; then
|
||||
cd python || die
|
||||
distutils-r1_src_prepare
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Install library in /lib for pam
|
||||
local myeconfargs=(
|
||||
--libdir="${EPREFIX}/usr/$(get_libdir)"
|
||||
$(use_enable pam)
|
||||
--with-securedir="${EPREFIX}/$(getpam_mod_dir)"
|
||||
--disable-python-bindings
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
|
||||
if use python; then
|
||||
cd python || die
|
||||
distutils-r1_src_configure
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
if use python; then
|
||||
cd python || die
|
||||
distutils-r1_src_compile
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
default
|
||||
if use python; then
|
||||
cd python || die
|
||||
distutils-r1_src_test
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use python; then
|
||||
cd python || die
|
||||
distutils-r1_src_install
|
||||
fi
|
||||
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,87 +0,0 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
inherit pam python-r1 usr-ldscript
|
||||
|
||||
DESCRIPTION="Library for password quality checking and generating random passwords"
|
||||
HOMEPAGE="https://github.com/libpwquality/libpwquality"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="|| ( BSD GPL-2 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
IUSE="pam python static-libs"
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
BDEPEND="
|
||||
>=sys-devel/gettext-0.18.2
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="
|
||||
>=sys-libs/cracklib-2.8:=[static-libs(+)?]
|
||||
pam? ( sys-libs/pam )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.4.4-pam_pwquality-include.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
# ensure pkgconfig files go in /usr
|
||||
sed -e "s:\(pkgconfigdir *=\).*:\1 ${EPREFIX}/usr/$(get_libdir)/pkgconfig:" \
|
||||
-i src/Makefile.{am,in} || die "sed failed"
|
||||
|
||||
if use python ; then
|
||||
# bug #830397
|
||||
export SETUPTOOLS_USE_DISTUTILS=stdlib
|
||||
python_copy_sources
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Install library in /lib for pam
|
||||
configuring() {
|
||||
local sitedir
|
||||
econf \
|
||||
--libdir="${EPREFIX}/$(get_libdir)" \
|
||||
$(use_enable pam) \
|
||||
--with-securedir="${EPREFIX}/$(getpam_mod_dir)" \
|
||||
$(use_enable python python-bindings) \
|
||||
$(usex python "--with-pythonsitedir=$(use python && python_get_sitedir)" "") \
|
||||
$(use_enable static-libs static)
|
||||
}
|
||||
if_use_python_python_foreach_impl configuring
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if_use_python_python_foreach_impl default
|
||||
}
|
||||
|
||||
src_test() {
|
||||
if_use_python_python_foreach_impl default
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if_use_python_python_foreach_impl default
|
||||
if use static-libs; then
|
||||
# Do not install static libs in /lib
|
||||
mkdir -p "${ED}/usr/$(get_libdir)"
|
||||
mv "${ED}/$(get_libdir)/libpwquality.a" "${ED}/usr/$(get_libdir)/" || die
|
||||
gen_usr_ldscript libpwquality.so
|
||||
fi
|
||||
find "${ED}" -name '*.la' -delete || die
|
||||
}
|
||||
|
||||
if_use_python_python_foreach_impl() {
|
||||
if use python; then
|
||||
python_foreach_impl run_in_build_dir "$@"
|
||||
else
|
||||
"$@"
|
||||
fi
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user