diff options
Diffstat (limited to 'meta/recipes-extended/shadow/shadow.inc')
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index a5d77ebfe2..2834509649 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -10,10 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed80ff1c2b40843cf5768e5229cf16e5 \ | |||
10 | DEPENDS = "virtual/crypt" | 10 | DEPENDS = "virtual/crypt" |
11 | 11 | ||
12 | UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" | 12 | UPSTREAM_CHECK_URI = "https://github.com/shadow-maint/shadow/releases" |
13 | SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/${PV}/${BP}.tar.gz \ | 13 | SRC_URI = "https://github.com/shadow-maint/shadow/releases/download/v${PV}/${BP}.tar.gz \ |
14 | file://shadow-4.1.3-dots-in-usernames.patch \ | 14 | file://shadow-4.1.3-dots-in-usernames.patch \ |
15 | ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ | 15 | ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ |
16 | file://shadow-relaxed-usernames.patch \ | 16 | file://shadow-relaxed-usernames.patch \ |
17 | file://0001-Fix-out-of-tree-builds-with-respect-to-libsubid-incl.patch \ | ||
18 | file://0001-libsubid-link-to-PAM-libraries.patch \ | ||
17 | " | 19 | " |
18 | 20 | ||
19 | SRC_URI:append:class-target = " \ | 21 | SRC_URI:append:class-target = " \ |
@@ -23,15 +25,13 @@ SRC_URI:append:class-target = " \ | |||
23 | 25 | ||
24 | SRC_URI:append:class-native = " \ | 26 | SRC_URI:append:class-native = " \ |
25 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ | 27 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ |
26 | file://0002-Allow-for-setting-password-in-clear-text.patch \ | ||
27 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ | 28 | file://commonio.c-fix-unexpected-open-failure-in-chroot-env.patch \ |
28 | " | 29 | " |
29 | SRC_URI:append:class-nativesdk = " \ | 30 | SRC_URI:append:class-nativesdk = " \ |
30 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ | 31 | file://0001-Disable-use-of-syslog-for-sysroot.patch \ |
31 | " | 32 | " |
32 | 33 | ||
33 | SRC_URI[md5sum] = "3d97f11e66bfb0b14702b115fa8be480" | 34 | SRC_URI[sha256sum] = "6c4627ff9c9422b96664517ae753c944f2902e92809d0698b65f5fef11985212" |
34 | SRC_URI[sha256sum] = "3ee3081fbbcbcfea5c8916419e46bc724807bab271072104f23e7a29e9668f3a" | ||
35 | 35 | ||
36 | # Additional Policy files for PAM | 36 | # Additional Policy files for PAM |
37 | PAM_SRC_URI = "file://pam.d/chfn \ | 37 | PAM_SRC_URI = "file://pam.d/chfn \ |
@@ -115,12 +115,6 @@ do_install() { | |||
115 | # Use proper encryption for passwords | 115 | # Use proper encryption for passwords |
116 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs | 116 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs |
117 | 117 | ||
118 | # Now we don't have a mail system. Disable mail creation for now. | ||
119 | sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd | ||
120 | sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd | ||
121 | |||
122 | # Use users group by default | ||
123 | sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd | ||
124 | } | 118 | } |
125 | 119 | ||
126 | do_install:append() { | 120 | do_install:append() { |
@@ -184,13 +178,6 @@ ALTERNATIVE:${PN}-base = "newgrp groups login su" | |||
184 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" | 178 | ALTERNATIVE_LINK_NAME[login] = "${base_bindir}/login" |
185 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" | 179 | ALTERNATIVE_LINK_NAME[su] = "${base_bindir}/su" |
186 | 180 | ||
187 | ALTERNATIVE:${PN}-doc = "passwd.5 getspnam.3 groups.1 su.1 nologin.8" | ||
188 | ALTERNATIVE_LINK_NAME[passwd.5] = "${mandir}/man5/passwd.5" | ||
189 | ALTERNATIVE_LINK_NAME[getspnam.3] = "${mandir}/man3/getspnam.3" | ||
190 | ALTERNATIVE_LINK_NAME[groups.1] = "${mandir}/man1/groups.1" | ||
191 | ALTERNATIVE_LINK_NAME[su.1] = "${mandir}/man1/su.1" | ||
192 | ALTERNATIVE_LINK_NAME[nologin.8] = "${mandir}/man8/nologin.8" | ||
193 | |||
194 | PACKAGE_WRITE_DEPS += "shadow-native" | 181 | PACKAGE_WRITE_DEPS += "shadow-native" |
195 | pkg_postinst:${PN}:class-target () { | 182 | pkg_postinst:${PN}:class-target () { |
196 | if [ "x$D" != "x" ]; then | 183 | if [ "x$D" != "x" ]; then |