sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (8c9c20dacfe262b28cb21aca66889b2421658146)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (8c9c20dacfe262b28cb21aca66889b2421658146)
- Date: Fri, 25 Oct 2024 04:48:05 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
security-libs/linux-pam/BUILD | 60
+++++++++++++++++++++++++++-----------
security-libs/linux-pam/CONFIGURE | 4 +-
security-libs/linux-pam/DEPENDS | 18 +++++------
security-libs/linux-pam/DETAILS | 5 +--
security-libs/linux-pam/HISTORY | 4 ++
security-libs/linux-pam/INSTALL | 2 -
6 files changed, 63 insertions(+), 30 deletions(-)
New commits:
commit 8c9c20dacfe262b28cb21aca66889b2421658146
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
security-libs/linux-pam: version 1.7.0
diff --git a/security-libs/linux-pam/BUILD b/security-libs/linux-pam/BUILD
index 5c7cb09..c1ae626 100755
--- a/security-libs/linux-pam/BUILD
+++ b/security-libs/linux-pam/BUILD
@@ -1,17 +1,43 @@
-if [ "${PAM_DOCS}" == "n" ]; then
- export SGML2LATEX=no
-fi
-
-export PS2PDF=no
-
-OPTS="--enable-shared --enable-static $OPTS" &&
-
-#autoconf &&
-./configure --libdir=/lib \
- --sbindir=/lib/security \
- --enable-securedir=/lib/security \
- --enable-read-both-confs \
- $OPTS &&
-sedit "s/examples//" Makefile &&
-sedit "s/read yes//" conf/install_conf &&
-make
+if [ "${PAM_DOCS}" == "y" ]; then
+ OPTS="docs=enabled ${OPTS}"
+fi &&
+
+OPTS="sbindir=${INSTALL_ROOT}/lib/security
+ securedir=${INSTALL_ROOT}/lib/security
+read-both-confs=true
+ ${OPTS}" &&
+
+local PREFIX=${PREFIX:-/usr} &&
+local MESON_BUILD_TYPE="${MESON_BUILD_TYPE:-release}" &&
+
+local MESON_BUILD &&
+local MESON_OPTS &&
+local BUILDER &&
+local BUILDER_OPTS="-j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS))
-C builddir/" &&
+
+if [[ $(get_spell_provider ${SPELL} MESON-BUILD) == muon ]]; then
+ MESON_BUILD="muon setup" &&
+
+ OPTS="prefix=${INSTALL_ROOT}${PREFIX} buildtype=${MESON_BUILD_TYPE}
default_library=shared libdir=${INSTALL_ROOT}/lib ${OPTS}"
+else
+ MESON_BUILD="meson setup"
+ MESON_OPTS="--prefix ${INSTALL_ROOT}${PREFIX} --buildtype
${MESON_BUILD_TYPE} --default-library shared --libdir ${INSTALL_ROOT}/lib"
+fi &&
+
+if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} NINJA-BUILD);
then
+ BUILDER="muon samu"
+elif [[ $(get_spell_provider ${SPELL} NINJA-BUILD) == samurai ]]; then
+ BUILDER="samu"
+else
+ BUILDER="ninja"
+fi &&
+
+for MO in $OPTS; do
+ MESON_OPTS+=" -D${MO}"
+done &&
+
+cd "${SOURCE_DIRECTORY}" &&
+
+${MESON_BUILD} ${MESON_OPTS} builddir/ &&
+
+${BUILDER} ${BUILDER_OPTS}
diff --git a/security-libs/linux-pam/CONFIGURE
b/security-libs/linux-pam/CONFIGURE
index 2d2a55e..208e808 100755
--- a/security-libs/linux-pam/CONFIGURE
+++ b/security-libs/linux-pam/CONFIGURE
@@ -1,4 +1,6 @@
-PATH=$PATH:/lib/security
+. "${GRIMOIRE}/MESON_CONFIGURE" &&
+
+PATH=$PATH:/lib/security &&
local chkpwd_suid_default &&
diff --git a/security-libs/linux-pam/DEPENDS b/security-libs/linux-pam/DEPENDS
index 387cfcb..6ea5fbb 100755
--- a/security-libs/linux-pam/DEPENDS
+++ b/security-libs/linux-pam/DEPENDS
@@ -1,3 +1,4 @@
+. "${GRIMOIRE}/MESON_DEPENDS" &&
depends flex &&
depends libxcrypt &&
depends smgl-fhs &&
@@ -8,16 +9,15 @@ if [ "${PAM_DOCS}" == "y" ]; then
depends linuxdoc-tools
fi &&
-optional_depends audit '--enable-audit' '--disable-audit' 'Audit
support support' &&
-optional_depends db '--enable-db=db' '--enable-db=no' 'database
backend' &&
-optional_depends GETTEXT '--enable-nls' '--disable-nls' 'NLS support'
&&
-optional_depends libselinux "--enable-selinux" "--disable-selinux" "for
selinux support" &&
-optional_depends libprelude "--enable-prelude" "--disable-prelude" "for
prelude ids support" &&
-optional_depends libtirpc '--enable-nis' '--disable-nis' 'RPC protocol,
for NIS support' &&
+optional_depends audit 'audit=enabled' 'audit=disabled' 'Audit
support support' &&
+optional_depends db 'db=db' '' 'database backend' &&
+optional_depends GETTEXT 'i18n=enabled' 'i18n=disabled' 'NLS support'
&&
+optional_depends libselinux "selinux=enabled" "selinux=disabled" "for
selinux support" &&
+optional_depends libtirpc 'ni=enableds' 'nis=disabled' 'RPC protocol, for
NIS support' &&
if is_depends_enabled $SPELL libtirpc;then
depends libnsl
fi &&
-optional_depends SSL '--enable-openssl' \
- '--disable-openssl' \
+optional_depends SSL 'openssl=enabled' \
+ 'openssl=disabled' \
'use OpenSSL crypto libraries' &&
-optional_depends systemd "--enable-logind" "--disable-logind" "for logind
support"
+optional_depends systemd "logind=enabled" "logind=disabled" "for logind
support"
diff --git a/security-libs/linux-pam/DETAILS b/security-libs/linux-pam/DETAILS
index d346e08..82e4a09 100755
--- a/security-libs/linux-pam/DETAILS
+++ b/security-libs/linux-pam/DETAILS
@@ -1,6 +1,7 @@
+. "${GRIMOIRE}/MESON_FUNCTIONS"
SPELL=linux-pam
- VERSION=1.6.1
-
SOURCE_HASH=sha512:ddb5a5f296f564b76925324550d29f15d342841a97815336789c7bb922a8663e831edeb54f3dcd1eaf297e3325c9e2e6c14b8740def5c43cf3f160a8a14fa2ea
+ VERSION=1.7.0
+
SOURCE_HASH=sha512:ab5cadb0eb5e95e36146fdbbc77eef4e5e0f38aeee4e819b080a1316f69969c3c33e4a2daf3246ded4c2e58ce517d7f1acb0d8de02a4898ff753f4c3aeec51cf
SECURITY_PATCH=5
SOURCE=Linux-PAM-$VERSION.tar.xz
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Linux-PAM-${VERSION}"
diff --git a/security-libs/linux-pam/HISTORY b/security-libs/linux-pam/HISTORY
index 9163ea9..ae8c5a4 100644
--- a/security-libs/linux-pam/HISTORY
+++ b/security-libs/linux-pam/HISTORY
@@ -1,3 +1,7 @@
+2024-10-25 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS, DETAILS, INSTALL: version 1.7.0,
converted to
+ meson build system
+
2024-04-10 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.6.1
* PRE_BUILD, patches/0001-pam_init_handlers.patch,
patches/pam_namespace.diff:
diff --git a/security-libs/linux-pam/INSTALL b/security-libs/linux-pam/INSTALL
index 131a9f3..a2773d3 100755
--- a/security-libs/linux-pam/INSTALL
+++ b/security-libs/linux-pam/INSTALL
@@ -1,4 +1,4 @@
-make install &&
+default_install &&
if [ "$PAM_CHKPWD_SUID" == "y" ]; then
chmod u+s $INSTALL_ROOT/lib/security/unix_chkpwd
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (8c9c20dacfe262b28cb21aca66889b2421658146), Pavel Vinogradov, 10/25/2024
Archive powered by MHonArc 2.6.24.