summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2011-07-20 19:18:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-27 12:02:42 +0100
commit7772a8893db25ab87025844a473f97ae56ddf170 (patch)
tree743fd9135c56cc92bb42673442b72f15e0279eeb /meta/recipes-extended
parent0eac98e900e27d0f12e612f4638ac29c7d459a9a (diff)
downloadpoky-7772a8893db25ab87025844a473f97ae56ddf170.tar.gz
shadow: update pam related configure files
add shadow-update-pam-conf.patch to update the pam related configure files in oe way rather than Fedora. (From OE-Core rev: 10e6fdd7e8fed5733f65a504148bba54bccb3c48) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch91
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.3.bb5
2 files changed, 94 insertions, 2 deletions
diff --git a/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
new file mode 100644
index 0000000000..15f8044fa2
--- /dev/null
+++ b/meta/recipes-extended/shadow/files/shadow-update-pam-conf.patch
@@ -0,0 +1,91 @@
1The system-auth in the configure files is from Fedora which put all the 4 pam type rules
2in one file.
3In yocto it obey the way with Debian/Ubuntu, and the names are common-auth, common-account,
4common-password and common-session.
5So update them with oe way.
6
7Upstream-Status: Pending
8
9Signed-off-by: Kang Kai <kai.kang@windriver.com>
10
11diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chage shadow-4.1.4.3/etc/pam.d/chage
12--- shadow-4.1.4.3/etc/pam.d.orig/chage 2011-07-20 19:02:27.384844958 +0800
13+++ shadow-4.1.4.3/etc/pam.d/chage 2011-07-20 19:03:08.964844958 +0800
14@@ -1,4 +1,4 @@
15 #%PAM-1.0
16 auth sufficient pam_rootok.so
17 account required pam_permit.so
18-password include system-auth
19+password include common-password
20diff -Nur shadow-4.1.4.3/etc/pam.d.orig/chgpasswd shadow-4.1.4.3/etc/pam.d/chgpasswd
21--- shadow-4.1.4.3/etc/pam.d.orig/chgpasswd 2011-07-20 19:02:27.384844958 +0800
22+++ shadow-4.1.4.3/etc/pam.d/chgpasswd 2011-07-20 19:03:26.544844958 +0800
23@@ -1,4 +1,4 @@
24 #%PAM-1.0
25 auth sufficient pam_rootok.so
26 account required pam_permit.so
27-password include system-auth
28+password include common-password
29diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupadd shadow-4.1.4.3/etc/pam.d/groupadd
30--- shadow-4.1.4.3/etc/pam.d.orig/groupadd 2011-07-20 19:02:27.384844958 +0800
31+++ shadow-4.1.4.3/etc/pam.d/groupadd 2011-07-20 19:04:08.124844958 +0800
32@@ -1,4 +1,4 @@
33 #%PAM-1.0
34 auth sufficient pam_rootok.so
35 account required pam_permit.so
36-password include system-auth
37+password include common-password
38diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupdel shadow-4.1.4.3/etc/pam.d/groupdel
39--- shadow-4.1.4.3/etc/pam.d.orig/groupdel 2011-07-20 19:02:27.384844958 +0800
40+++ shadow-4.1.4.3/etc/pam.d/groupdel 2011-07-20 19:04:26.114844958 +0800
41@@ -1,4 +1,4 @@
42 #%PAM-1.0
43 auth sufficient pam_rootok.so
44 account required pam_permit.so
45-password include system-auth
46+password include common-password
47diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmems shadow-4.1.4.3/etc/pam.d/groupmems
48--- shadow-4.1.4.3/etc/pam.d.orig/groupmems 2011-07-20 19:02:27.384844958 +0800
49+++ shadow-4.1.4.3/etc/pam.d/groupmems 2011-07-20 19:04:35.074844958 +0800
50@@ -1,4 +1,4 @@
51 #%PAM-1.0
52 auth sufficient pam_rootok.so
53 account required pam_permit.so
54-password include system-auth
55+password include common-password
56diff -Nur shadow-4.1.4.3/etc/pam.d.orig/groupmod shadow-4.1.4.3/etc/pam.d/groupmod
57--- shadow-4.1.4.3/etc/pam.d.orig/groupmod 2011-07-20 19:02:27.384844958 +0800
58+++ shadow-4.1.4.3/etc/pam.d/groupmod 2011-07-20 19:04:44.864844958 +0800
59@@ -1,4 +1,4 @@
60 #%PAM-1.0
61 auth sufficient pam_rootok.so
62 account required pam_permit.so
63-password include system-auth
64+password include common-password
65diff -Nur shadow-4.1.4.3/etc/pam.d.orig/useradd shadow-4.1.4.3/etc/pam.d/useradd
66--- shadow-4.1.4.3/etc/pam.d.orig/useradd 2011-07-20 19:02:27.384844958 +0800
67+++ shadow-4.1.4.3/etc/pam.d/useradd 2011-07-20 19:07:26.244844958 +0800
68@@ -1,4 +1,4 @@
69 #%PAM-1.0
70 auth sufficient pam_rootok.so
71 account required pam_permit.so
72-password include system-auth
73+password include common-password
74diff -Nur shadow-4.1.4.3/etc/pam.d.orig/userdel shadow-4.1.4.3/etc/pam.d/userdel
75--- shadow-4.1.4.3/etc/pam.d.orig/userdel 2011-07-20 19:02:27.384844958 +0800
76+++ shadow-4.1.4.3/etc/pam.d/userdel 2011-07-20 19:07:35.734844958 +0800
77@@ -1,4 +1,4 @@
78 #%PAM-1.0
79 auth sufficient pam_rootok.so
80 account required pam_permit.so
81-password include system-auth
82+password include common-password
83diff -Nur shadow-4.1.4.3/etc/pam.d.orig/usermod shadow-4.1.4.3/etc/pam.d/usermod
84--- shadow-4.1.4.3/etc/pam.d.orig/usermod 2011-07-20 19:02:27.384844958 +0800
85+++ shadow-4.1.4.3/etc/pam.d/usermod 2011-07-20 19:07:42.024844958 +0800
86@@ -1,4 +1,4 @@
87 #%PAM-1.0
88 auth sufficient pam_rootok.so
89 account required pam_permit.so
90-password include system-auth
91+password include common-password
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 5731a268aa..70d4cbb504 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
9 9
10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 10DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
11RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}" 11RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
12PR = "r2" 12PR = "r3"
13 13
14SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2 \ 14SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz2 \
15 file://login_defs_pam.sed \ 15 file://login_defs_pam.sed \
@@ -19,7 +19,8 @@ SRC_URI = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-${PV}.tar.bz
19 file://shadow-4.1.3-dots-in-usernames.patch \ 19 file://shadow-4.1.3-dots-in-usernames.patch \
20 file://shadow-4.1.4.2-env-reset-keep-locale.patch \ 20 file://shadow-4.1.4.2-env-reset-keep-locale.patch \
21 file://shadow-4.1.4.2-groupmod-pam-check.patch \ 21 file://shadow-4.1.4.2-groupmod-pam-check.patch \
22 file://shadow-4.1.4.2-su_no_sanitize_env.patch" 22 file://shadow-4.1.4.2-su_no_sanitize_env.patch \
23 file://shadow-update-pam-conf.patch"
23 24
24SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" 25SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79"
25SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" 26SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-31 12:46:25 +0000