From 0db9697dc6b8cb470cd97377638af69dc1052189 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 1 Feb 2018 14:23:40 +0000 Subject: samba, openwsman, pam-ssh-agent-auth, sblim-sfcb, passwdqc, python-pam, smbnetfs: require pam in DISTRO_FEATURES * there is explicit dependency on libpam without respecting pam in DISTRO_FEATURES so add the check to prevent people building it against broken libpam Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald --- meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb | 4 ++++ meta-networking/recipes-connectivity/samba/samba_4.7.0.bb | 7 ++++--- meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb | 3 +++ meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb | 3 +++ meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb | 3 +++ meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb | 3 +++ meta-python/recipes-devtools/python/python-pam_1.8.2.bb | 3 +++ 7 files changed, 23 insertions(+), 3 deletions(-) diff --git a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb index fefc045386..c72936c087 100644 --- a/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb +++ b/meta-filesystems/recipes-filesystems/smbnetfs/smbnetfs_git.bb @@ -11,6 +11,10 @@ HOMEPAGE ="http://sourceforge.net/projects/smbnetfs" DEPENDS = "fuse samba" DEPENDS_append_libc-musl = " libexecinfo" +# samba depends on libpam +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + inherit autotools gitpkgv pkgconfig PKGV = "${GITPKGVTAG}" diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb index 686998e5ef..854cb8af5c 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb @@ -40,9 +40,10 @@ inherit systemd waf-samba cpan-base perlnative update-rc.d # remove default added RDEPENDS on perl RDEPENDS_${PN}_remove = "perl" -#DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" -DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libbsd libaio libpam" -DEPENDS += "libldb" +DEPENDS += "readline virtual/libiconv zlib popt libtalloc libtdb libtevent libldb libbsd libaio libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" DEPENDS_append_libc-musl = " libtirpc" CFLAGS_append_libc-musl = " -I${STAGING_INCDIR}/tirpc" diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb index c4778ca38a..f618f02b5d 100644 --- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb +++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.3.bb @@ -12,6 +12,9 @@ SECTION = "Applications/System" DEPENDS = "curl libxml2 openssl libpam" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + SRCREV = "feb7ec9b004fcaea0dbe65ce8a1a79cc29dd994c" PV = "2.6.3" diff --git a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb index ff88533ff0..1638c41c88 100644 --- a/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb +++ b/meta-oe/recipes-extended/pam/pam-ssh-agent-auth_0.10.3.bb @@ -13,6 +13,9 @@ SRC_URI[sha256sum] = "3c53d358d6eaed1b211239df017c27c6f9970995d14102ae67bae16d4f DEPENDS += "libpam openssl" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + # This gets us ssh-agent, which we are almost certain to want. # RDEPENDS_${PN} += "openssh-misc" diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb index c6b9f1019b..152ae22902 100644 --- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb +++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb @@ -11,6 +11,9 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl libpam openssl sblim-sfc-common unzip-native" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + SRC_URI = "http://downloads.sourceforge.net/sblim/${BP}.tar.bz2 \ file://sfcb.service \ file://sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch \ diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb index 198db3ce72..8fc0b35912 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb @@ -21,6 +21,9 @@ SECTION = "System Environment/Base" DEPENDS += "libpam" +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" + LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" diff --git a/meta-python/recipes-devtools/python/python-pam_1.8.2.bb b/meta-python/recipes-devtools/python/python-pam_1.8.2.bb index 05bddd527b..60a3b43de5 100644 --- a/meta-python/recipes-devtools/python/python-pam_1.8.2.bb +++ b/meta-python/recipes-devtools/python/python-pam_1.8.2.bb @@ -10,3 +10,6 @@ PYPI_PACKAGE = "python-pam" inherit pypi setuptools RDEPENDS_${PN} = "libpam" + +inherit distro_features_check +REQUIRED_DISTRO_FEATURES = "pam" -- cgit 1.2.3-korg