diff options
| -rw-r--r-- | meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb | 53 | ||||
| -rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 53 | ||||
| -rw-r--r-- | meta/recipes-extended/shadow/shadow_4.1.4.3.bb | 53 |
3 files changed, 61 insertions, 98 deletions
diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb index 1ed5d4e011..ba208f7888 100644 --- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb | |||
| @@ -1,60 +1,15 @@ | |||
| 1 | SUMMARY = "Tools to change and administer password and group data" | 1 | require shadow.inc |
| 2 | DESCRIPTION = "Tools to change and administer password and group data" | ||
| 3 | HOMEPAGE = "http://pkg-shadow.alioth.debian.org" | ||
| 4 | BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580" | ||
| 5 | SECTION = "base utils" | ||
| 6 | LICENSE = "BSD | Artistic-1.0" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ | ||
| 8 | file://src/passwd.c;beginline=8;endline=30;md5=d83888ea14ae61951982d77125947661" | ||
| 9 | 2 | ||
| 10 | PR = "r8" | 3 | PR = "r8" |
| 11 | 4 | ||
| 12 | SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ | 5 | SRC_URI += " \ |
| 13 | file://shadow.automake-1.11.patch \ | ||
| 14 | file://shadow-4.1.3-dots-in-usernames.patch \ | ||
| 15 | file://shadow-4.1.4.2-env-reset-keep-locale.patch \ | ||
| 16 | file://add_root_cmd_options.patch \ | 6 | file://add_root_cmd_options.patch \ |
| 17 | file://disable-syslog.patch \ | 7 | file://disable-syslog.patch \ |
| 18 | file://useradd.patch \ | 8 | file://useradd.patch \ |
| 19 | file://shadow_fix_for_automake-1.12.patch \ | ||
| 20 | file://add_root_cmd_groupmems.patch \ | 9 | file://add_root_cmd_groupmems.patch \ |
| 21 | " | 10 | " |
| 11 | inherit native | ||
| 22 | 12 | ||
| 23 | SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" | 13 | EXTRA_OECONF += "--without-libpam \ |
| 24 | SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" | ||
| 25 | |||
| 26 | inherit autotools gettext native | ||
| 27 | |||
| 28 | EXTRA_OECONF += "--without-audit \ | ||
| 29 | --without-libcrack \ | ||
| 30 | --without-libpam \ | ||
| 31 | --without-selinux \ | ||
| 32 | --without-nscd" | 14 | --without-nscd" |
| 33 | 15 | ||
| 34 | do_install() { | ||
| 35 | oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install | ||
| 36 | |||
| 37 | # Info dir listing isn't interesting at this point so remove it if it exists. | ||
| 38 | if [ -e "${D}${infodir}/dir" ]; then | ||
| 39 | rm -f ${D}${infodir}/dir | ||
| 40 | fi | ||
| 41 | |||
| 42 | # Enable CREATE_HOME by default. | ||
| 43 | sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs | ||
| 44 | |||
| 45 | # As we are on an embedded system, ensure the users mailbox is in | ||
| 46 | # ~/ not /var/spool/mail by default, as who knows where or how big | ||
| 47 | # /var is. The system MDA will set this later anyway. | ||
| 48 | sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs | ||
| 49 | sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs | ||
| 50 | |||
| 51 | # Disable checking emails. | ||
| 52 | sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs | ||
| 53 | |||
| 54 | # Now we don't have a mail system. Disable mail creation for now. | ||
| 55 | sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd | ||
| 56 | sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd | ||
| 57 | |||
| 58 | # Use users group by default | ||
| 59 | sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd | ||
| 60 | } | ||
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc new file mode 100644 index 0000000000..4df5e5edb9 --- /dev/null +++ b/meta/recipes-extended/shadow/shadow.inc | |||
| @@ -0,0 +1,53 @@ | |||
| 1 | SUMMARY = "Tools to change and administer password and group data" | ||
| 2 | DESCRIPTION = "Tools to change and administer password and group data" | ||
| 3 | HOMEPAGE = "http://pkg-shadow.alioth.debian.org" | ||
| 4 | BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580" | ||
| 5 | SECTION = "base utils" | ||
| 6 | LICENSE = "BSD | Artistic-1.0" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ | ||
| 8 | file://src/passwd.c;beginline=8;endline=30;md5=d83888ea14ae61951982d77125947661" | ||
| 9 | |||
| 10 | SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ | ||
| 11 | file://shadow.automake-1.11.patch \ | ||
| 12 | file://shadow_fix_for_automake-1.12.patch \ | ||
| 13 | file://shadow-4.1.3-dots-in-usernames.patch \ | ||
| 14 | file://shadow-4.1.4.2-env-reset-keep-locale.patch \ | ||
| 15 | " | ||
| 16 | |||
| 17 | SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" | ||
| 18 | SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" | ||
| 19 | |||
| 20 | inherit autotools gettext | ||
| 21 | |||
| 22 | EXTRA_OECONF += "--without-audit \ | ||
| 23 | --without-libcrack \ | ||
| 24 | --without-selinux" | ||
| 25 | |||
| 26 | do_install() { | ||
| 27 | oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install | ||
| 28 | |||
| 29 | # Info dir listing isn't interesting at this point so remove it if it exists. | ||
| 30 | if [ -e "${D}${infodir}/dir" ]; then | ||
| 31 | rm -f ${D}${infodir}/dir | ||
| 32 | fi | ||
| 33 | |||
| 34 | # Enable CREATE_HOME by default. | ||
| 35 | sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs | ||
| 36 | |||
| 37 | # As we are on an embedded system, ensure the users mailbox is in | ||
| 38 | # ~/ not /var/spool/mail by default, as who knows where or how big | ||
| 39 | # /var is. The system MDA will set this later anyway. | ||
| 40 | sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs | ||
| 41 | sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs | ||
| 42 | |||
| 43 | # Disable checking emails. | ||
| 44 | sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs | ||
| 45 | |||
| 46 | # Now we don't have a mail system. Disable mail creation for now. | ||
| 47 | sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd | ||
| 48 | sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd | ||
| 49 | |||
| 50 | # Use users group by default | ||
| 51 | sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd | ||
| 52 | } | ||
| 53 | |||
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 3abb325c3a..91ff24975d 100644 --- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb +++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb | |||
| @@ -1,11 +1,4 @@ | |||
| 1 | SUMMARY = "Tools to change and administer password and group data" | 1 | require shadow.inc |
| 2 | DESCRIPTION = "Tools to change and administer password and group data" | ||
| 3 | HOMEPAGE = "http://pkg-shadow.alioth.debian.org" | ||
| 4 | BUGTRACKER = "https://alioth.debian.org/tracker/?group_id=30580" | ||
| 5 | SECTION = "base utils" | ||
| 6 | LICENSE = "BSD | Artistic-1.0" | ||
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \ | ||
| 8 | file://src/passwd.c;beginline=8;endline=30;md5=d83888ea14ae61951982d77125947661" | ||
| 9 | 2 | ||
| 10 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ | 3 | DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ |
| 11 | shadow-native" | 4 | shadow-native" |
| @@ -13,29 +6,17 @@ RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam', '$ | |||
| 13 | base-passwd" | 6 | base-passwd" |
| 14 | PR = "r13" | 7 | PR = "r13" |
| 15 | 8 | ||
| 16 | SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \ | 9 | SRC_URI += " \ |
| 17 | file://login_defs_pam.sed \ | 10 | file://login_defs_pam.sed \ |
| 18 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ | 11 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ |
| 19 | file://shadow.automake-1.11.patch \ | ||
| 20 | file://shadow-4.1.3-dots-in-usernames.patch \ | ||
| 21 | file://shadow-4.1.4.2-env-reset-keep-locale.patch \ | ||
| 22 | file://shadow-4.1.4.2-groupmod-pam-check.patch \ | 12 | file://shadow-4.1.4.2-groupmod-pam-check.patch \ |
| 23 | file://shadow-4.1.4.2-su_no_sanitize_env.patch \ | 13 | file://shadow-4.1.4.2-su_no_sanitize_env.patch \ |
| 24 | file://shadow-update-pam-conf.patch \ | 14 | file://shadow-update-pam-conf.patch \ |
| 25 | file://shadow_fix_for_automake-1.12.patch \ | ||
| 26 | file://slackware_fix_for_glib-2.17_crypt.patch \ | 15 | file://slackware_fix_for_glib-2.17_crypt.patch \ |
| 27 | file://fix-etc-gshadow-reading.patch \ | 16 | file://fix-etc-gshadow-reading.patch \ |
| 28 | " | 17 | " |
| 29 | 18 | ||
| 30 | SRC_URI[md5sum] = "b8608d8294ac88974f27b20f991c0e79" | 19 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)}" |
| 31 | SRC_URI[sha256sum] = "633f5bb4ea0c88c55f3642c97f9d25cbef74f82e0b4cf8d54e7ad6f9f9caa778" | ||
| 32 | |||
| 33 | inherit autotools gettext | ||
| 34 | |||
| 35 | EXTRA_OECONF += "--without-audit \ | ||
| 36 | --without-libcrack \ | ||
| 37 | ${@base_contains('DISTRO_FEATURES', 'pam', '--with-libpam', '--without-libpam', d)} \ | ||
| 38 | --without-selinux" | ||
| 39 | EXTRA_OECONF_libc-uclibc += "--with-nscd=no" | 20 | EXTRA_OECONF_libc-uclibc += "--with-nscd=no" |
| 40 | 21 | ||
| 41 | # Build falsely assumes that if --enable-libpam is set, we don't need to link against | 22 | # Build falsely assumes that if --enable-libpam is set, we don't need to link against |
| @@ -64,14 +45,7 @@ PAM_SRC_URI = "file://pam.d/chfn \ | |||
| 64 | file://pam.d/passwd \ | 45 | file://pam.d/passwd \ |
| 65 | file://pam.d/su" | 46 | file://pam.d/su" |
| 66 | 47 | ||
| 67 | do_install() { | 48 | do_install_append() { |
| 68 | oe_runmake DESTDIR="${D}" sbindir="${base_sbindir}" usbindir="${sbindir}" install | ||
| 69 | |||
| 70 | # Info dir listing isn't interesting at this point so remove it if it exists. | ||
| 71 | if [ -e "${D}${infodir}/dir" ]; then | ||
| 72 | rm -f ${D}${infodir}/dir | ||
| 73 | fi | ||
| 74 | |||
| 75 | # Ensure that the image has as a /var/spool/mail dir so shadow can | 49 | # Ensure that the image has as a /var/spool/mail dir so shadow can |
| 76 | # put mailboxes there if the user reconfigures shadow to its | 50 | # put mailboxes there if the user reconfigures shadow to its |
| 77 | # defaults (see sed below). | 51 | # defaults (see sed below). |
| @@ -84,25 +58,6 @@ do_install() { | |||
| 84 | sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs | 58 | sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs |
| 85 | fi | 59 | fi |
| 86 | 60 | ||
| 87 | # Enable CREATE_HOME by default. | ||
| 88 | sed -i 's/#CREATE_HOME/CREATE_HOME/g' ${D}${sysconfdir}/login.defs | ||
| 89 | |||
| 90 | # As we are on an embedded system, ensure the users mailbox is in | ||
| 91 | # ~/ not /var/spool/mail by default, as who knows where or how big | ||
| 92 | # /var is. The system MDA will set this later anyway. | ||
| 93 | sed -i 's/MAIL_DIR/#MAIL_DIR/g' ${D}${sysconfdir}/login.defs | ||
| 94 | sed -i 's/#MAIL_FILE/MAIL_FILE/g' ${D}${sysconfdir}/login.defs | ||
| 95 | |||
| 96 | # Disable checking emails. | ||
| 97 | sed -i 's/MAIL_CHECK_ENAB/#MAIL_CHECK_ENAB/g' ${D}${sysconfdir}/login.defs | ||
| 98 | |||
| 99 | # Now we don't have a mail system. Disable mail creation for now. | ||
| 100 | sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd | ||
| 101 | sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd | ||
| 102 | |||
| 103 | # Use users group by default | ||
| 104 | sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd | ||
| 105 | |||
| 106 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} | 61 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} |
| 107 | 62 | ||
| 108 | # Move binaries to the locations we want | 63 | # Move binaries to the locations we want |
