V2 Fix libpam's chmod

PATCH Applied Robert Yang 3 participants 7 messages Mar 2, 2012

lore

Share & tools

lore

Robert Yang

author

2012-03-02 10:42 UTC #0 lore raw

cover V2 Fix libpam's chmod

Hi Saul,

This patch is based on oe-core, but I don't have permission to put the pull request on git://git.openembedded.org/openembedded-core-contrib, so I still put the pull request on poky-contrib.

Changes of V2:

* Update the PR bump as Koen pointed out.

//Robert

The following changes since commit 6b6aa170d5c618cfcd016dd1de926db647f7f932:

busybox: Restore 'date' compatability (2012-03-01 23:16:43 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/libpam
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/libpam

Robert Yang (1):
Fix libpam's chmod

 meta/recipes-extended/pam/libpam_1.1.5.bb |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Signature · 1 line

1.7.4.1

Robert Yang

author

2012-03-02 10:42 UTC #1 lore raw

PATCH 1/1 V2 Fix libpam's chmod

The libpam's has an error when generating the rootfs:

chmod: cannot access `/usr/sbin/unix_chkpwd': No such file or directory

This is because the following code in libpam_1.1.5.bb:

pkg_postinst_pam-plugin-unix () {

    # below is necessary to allow unix_chkpwd get user info from shadow file
    # on lsb images
    chmod 4755 ${sbindir}/unix_chkpwd
}

This is to set the setuid permission for unix_chkpwd (the lsb test requires this), but it lacks a "${D}", and we can do this in the install stage.

[YOCTO #2049]

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/pam/libpam_1.1.5.bb |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

meta/recipes-extended/pam/libpam_1.1.5.bb +3 -6

index 283f477..8dd5ac5 100644
@@ -9,7 +9,7 @@ SECTION = "base"
 LICENSE = "GPLv2+ | BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ca0395de9a86191a078b8b79302e3083"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-${PV}.tar.bz2 \
            file://99_pam \

@@ -85,10 +85,7 @@ do_install() {
 
 	install -d ${D}${sysconfdir}/pam.d/     
 	install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/
-}
 
-pkg_postinst_pam-plugin-unix () {
-    # below is necessary to allow unix_chkpwd get user info from shadow file
-    # on lsb images
-    chmod 4755 ${sbindir}/unix_chkpwd
+    # The lsb requires unix_chkpwd has setuid permission
+    chmod 4755 ${D}${sbindir}/unix_chkpwd
 }

Signature · 1 line

1.7.4.1

Richard Purdie

Applied

2012-03-02 12:33 UTC #2 lore raw

Quoted 16 lines · Robert Yang

The libpam's has an error when generating the rootfs:
chmod: cannot access `/usr/sbin/unix_chkpwd': No such file or directory
This is because the following code in libpam_1.1.5.bb:
pkg_postinst_pam-plugin-unix () {
    # below is necessary to allow unix_chkpwd get user info from shadow file
    # on lsb images
    chmod 4755 ${sbindir}/unix_chkpwd
}
This is to set the setuid permission for unix_chkpwd (the lsb test requires this), but it lacks a "${D}", and we can do this in the install stage.

Quoted 6 lines

[YOCTO #2049]
Signed-off-by Robert Yang <[email protected]>
---
 meta/recipes-extended/pam/libpam_1.1.5.bb |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

Merged to master, thanks.

Richard

Richard Purdie

2012-03-02 13:35 UTC #3 lore raw

In reply to Robert Yang

Quoted 12 lines · Robert Yang

The libpam's has an error when generating the rootfs:
chmod: cannot access `/usr/sbin/unix_chkpwd': No such file or directory
This is because the following code in libpam_1.1.5.bb:
pkg_postinst_pam-plugin-unix () {
    # below is necessary to allow unix_chkpwd get user info from shadow file
    # on lsb images
    chmod 4755 ${sbindir}/unix_chkpwd
}

Quoted 7 lines

This is to set the setuid permission for unix_chkpwd (the lsb test requires this), but it lacks a "${D}", and we can do this in the install stage.
[YOCTO #2049]
Signed-off-by Robert Yang <[email protected]>

Robert, in future patches could you use a subject line like:

[PATCH 1/1 v2] Fix libpam's chmod

instead of:

[PATCH 1/1] V2 Fix libpam's chmod

so that when the patches get applied, the V2 is stripped off?

The reason is that the value isn't particularly within the repository once merged and doesn't look good when looking through commit history.

Thanks!

Richard

Koen Kooi

2012-03-02 13:40 UTC #4 lore raw

Op 2 mrt. 2012, om 14:26 heeft Richard Purdie het volgende geschreven:

Quoted 25 lines · Robert Yang

Quoted 12 lines
The libpam's has an error when generating the rootfs:
chmod: cannot access `/usr/sbin/unix_chkpwd': No such file or directory
This is because the following code in libpam_1.1.5.bb:
pkg_postinst_pam-plugin-unix () {
   # below is necessary to allow unix_chkpwd get user info from shadow file
   # on lsb images
   chmod 4755 ${sbindir}/unix_chkpwd
}
Quoted 7 lines
This is to set the setuid permission for unix_chkpwd (the lsb test requires this), but it lacks a "${D}", and we can do this in the install stage.
[YOCTO #2049]
Signed-off-by Robert Yang <[email protected]>
Robert, in future patches could you use a subject line like:
[PATCH 1/1 v2] Fix libpam's chmod

Quoted 8 lines

instead of:
[PATCH 1/1] V2 Fix libpam's chmod
so that when the patches get applied, the V2 is stripped off?
The reason is that the value isn't particularly within the repository once merged and doesn't look good when looking through commit history.

Actually both versions above are wrong, the right version would be similar to:

libpam 1.1.5: fix chmod in postinst

We can debate the usefulness of the version specifier, but we do need to follow the commit guide for the rest.

regards,

Koen

Richard Purdie

2012-03-02 13:47 UTC #5 lore raw

Quoted 33 lines · Koen Kooi

Op 2 mrt. 2012, om 14:26 heeft Richard Purdie het volgende geschreven:
Quoted 31 lines · Robert Yang
Quoted 12 lines
The libpam's has an error when generating the rootfs:
chmod: cannot access `/usr/sbin/unix_chkpwd': No such file or directory
This is because the following code in libpam_1.1.5.bb:
pkg_postinst_pam-plugin-unix () {
   # below is necessary to allow unix_chkpwd get user info from shadow file
   # on lsb images
   chmod 4755 ${sbindir}/unix_chkpwd
}
Quoted 7 lines
This is to set the setuid permission for unix_chkpwd (the lsb test requires this), but it lacks a "${D}", and we can do this in the install stage.
[YOCTO #2049]
Signed-off-by Robert Yang <[email protected]>
Robert, in future patches could you use a subject line like:
[PATCH 1/1 v2] Fix libpam's chmod
instead of:
[PATCH 1/1] V2 Fix libpam's chmod
so that when the patches get applied, the V2 is stripped off?

Quoted 8 lines

Quoted 2 lines
The reason is that the value isn't particularly within the repository once merged and doesn't look good when looking through commit history.
Actually both versions above are wrong, the right version would be similar to:
libpam 1.1.5: fix chmod in postinst
We can debate the usefulness of the version specifier, but we do need to follow the commit guide for the rest.

Good point, I was just commenting that the patch version specifier didn't look good. As you say, the package name should be first too, as per http://wiki.openembedded.org/wiki/Commit_Patch_Message_Guidelines
under Common Errors in Patch and Commit Messages: '- Short log does not start with the file or component being modified. Such as "foo: Update to new upstream version 5.8.9"'.

If I was going to be picky, I'd suggest capitalisation of "fix" in your version ;-)

Cheers,

Richard

Koen Kooi

2012-03-02 14:14 UTC #6 lore raw

Op 2 mrt. 2012, om 14:39 heeft Richard Purdie het volgende geschreven:

Quoted 50 lines · Koen Kooi

Quoted 33 lines
Op 2 mrt. 2012, om 14:26 heeft Richard Purdie het volgende geschreven:
Quoted 31 lines · Robert Yang
Quoted 12 lines
The libpam's has an error when generating the rootfs:
chmod: cannot access `/usr/sbin/unix_chkpwd': No such file or directory
This is because the following code in libpam_1.1.5.bb:
pkg_postinst_pam-plugin-unix () {
  # below is necessary to allow unix_chkpwd get user info from shadow file
  # on lsb images
  chmod 4755 ${sbindir}/unix_chkpwd
}
Quoted 7 lines
This is to set the setuid permission for unix_chkpwd (the lsb test requires this), but it lacks a "${D}", and we can do this in the install stage.
[YOCTO #2049]
Signed-off-by Robert Yang <[email protected]>
Robert, in future patches could you use a subject line like:
[PATCH 1/1 v2] Fix libpam's chmod
instead of:
[PATCH 1/1] V2 Fix libpam's chmod
so that when the patches get applied, the V2 is stripped off?
Quoted 8 lines
Quoted 2 lines
The reason is that the value isn't particularly within the repository once merged and doesn't look good when looking through commit history.
Actually both versions above are wrong, the right version would be similar to:
libpam 1.1.5: fix chmod in postinst
We can debate the usefulness of the version specifier, but we do need to follow the commit guide for the rest.
Good point, I was just commenting that the patch version specifier didn't look good. As you say, the package name should be first too, as per http://wiki.openembedded.org/wiki/Commit_Patch_Message_Guidelines
under Common Errors in Patch and Commit Messages: '- Short log does not start with the file or component being modified. Such as "foo: Update to new upstream version 5.8.9"'.

Quoted 2 lines

If I was going to be picky, I'd suggest capitalisation of "fix" in your version ;-)

I'm a bit conflicted on that one. If I'm going to treat it as a sentence by using caps, I'd also like to use proper punctuation, which the guidelines don't allow. And that's why I said 'similar' :)

regards,

Koen