merged. Bruce
On Sat, Oct 14, 2023 at 11:19 AM Yi Zhao <[email protected]> wrote: > > Changelog: > https://arthurdejong.org/nss-pam-ldapd/release-0-9-12 > > Add a patch to fix shebang to python3 for getent.py and chsh.py. > > Signed-off-by: Yi Zhao <[email protected]> > --- > ...m-fix-shebang-for-chsh.py-and-getent.patch | 34 +++++++++++++++++++ > ...ldapd_0.9.8.bb => nss-pam-ldapd_0.9.12.bb} | 5 +-- > 2 files changed, 37 insertions(+), 2 deletions(-) > create mode 100644 > recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch > rename recipes-support/nss-pam-ldapd/{nss-pam-ldapd_0.9.8.bb => > nss-pam-ldapd_0.9.12.bb} (88%) > > diff --git > a/recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch > > b/recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch > new file mode 100644 > index 0000000..86e9f7b > --- /dev/null > +++ > b/recipes-support/nss-pam-ldapd/files/0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch > @@ -0,0 +1,34 @@ > +From fb9c5b955da462695e0a662aebfa13493eaf3978 Mon Sep 17 00:00:00 2001 > +From: Yi Zhao <[email protected]> > +Date: Fri, 13 Oct 2023 22:28:25 +0800 > +Subject: [PATCH] utils/Makefile.am: fix shebang for chsh.py and getent.py > + > +Update shebang to python3 for chsh.py and getent.py to fix QA issue: > + > +WARNING: nss-pam-ldapd-0.9.12-r0 do_package_qa: QA Issue: File > +/usr/share/nslcd-utils/chsh.py in package nss-pam-ldapd contains > +reference to TMPDIR > +File /usr/share/nslcd-utils/getent.py in package nss-pam-ldapd contains > +reference to TMPDIR [buildpaths] > + > +Upstream-Status: Inappropriate [embedded specific] > + > +Signed-off-by: Yi Zhao <[email protected]> > +--- > + utils/Makefile.am | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/utils/Makefile.am b/utils/Makefile.am > +index a6bccd3..22a50d8 100644 > +--- a/utils/Makefile.am > ++++ b/utils/Makefile.am > +@@ -39,5 +39,5 @@ install-data-hook: > + set -ex; for cmd in getent chsh ; do \ > + [ -L $(DESTDIR)$(bindir)/$$cmd.$(MODULE_NAME) ] || $(LN_S) > $(utilsdir)/$$cmd.py $(DESTDIR)$(bindir)/$$cmd.$(MODULE_NAME) ; \ > + chmod a+rx $(DESTDIR)$(utilsdir)/$$cmd.py ; \ > +- sed -i -e '1 s|^#!.*|#! $(PYTHON)|;1 s|^#! \([^/].*\)|#! > /usr/bin/env \1|' $(DESTDIR)$(utilsdir)/$$cmd.py ; \ > ++ sed -i -e '1 s|/usr/bin/env python|/usr/bin/env python3|' > $(DESTDIR)$(utilsdir)/$$cmd.py ; \ > + done > +-- > +2.25.1 > + > diff --git a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb > b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb > similarity index 88% > rename from recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb > rename to recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb > index d7354c4..7f3b9e3 100644 > --- a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.8.bb > +++ b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb > @@ -16,6 +16,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" > > SRC_URI = "\ > http://arthurdejong.org/nss-pam-ldapd/${BPN}-${PV}.tar.gz \ > + > file://0001-utils-Makefile.am-fix-shebang-for-chsh.py-and-getent.patch \ > file://nslcd.init \ > file://nslcd.service \ > " > @@ -23,8 +24,8 @@ SRC_URI = "\ > inherit autotools features_check > REQUIRED_DISTRO_FEATURES = "pam" > > -SRC_URI[md5sum] = "8c99fdc54f4bf9aca8c5f53fdb1403ff" > -SRC_URI[sha256sum] = > "ef7362e7f2003da8c7beb7bcc03c30494acf712625aaac8badc6e7eb16f3453f" > +SRC_URI[md5sum] = "cc30ee0ab91d6c94b7a343ae09b5dc69" > +SRC_URI[sha256sum] = > "c6d661e74693cbf531a790631ca93b73f291fb23cc39465b09deb8da2bfb0e14" > > DEPENDS += "libpam openldap krb5" > > -- > 2.25.1 > > > > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8372): https://lists.yoctoproject.org/g/meta-virtualization/message/8372 Mute This Topic: https://lists.yoctoproject.org/mt/101961438/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
