summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-03-22 14:39:47 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2017-04-25 15:55:35 -0400
commitd9dc6b2d4cb341958a6e37e9916ae193eb9714da (patch)
tree4e960e719a1548e75273190db01dfbb8bb59a4ab
parent3402c594e8bb25eb87c610d52fa0ce2a9b47cdba (diff)
downloadmeta-openembedded-d9dc6b2d4cb341958a6e37e9916ae193eb9714da.tar.gz
squid: Update to 3.5.23
Disable NIS on musl, it doesnt yet build Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--meta-networking/recipes-daemons/squid/squid_3.5.23.bb (renamed from meta-networking/recipes-daemons/squid/squid_3.5.20.bb)9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb
index 2e9e1f116..0fe9673af 100644
--- a/meta-networking/recipes-daemons/squid/squid_3.5.20.bb
+++ b/meta-networking/recipes-daemons/squid/squid_3.5.23.bb
@@ -22,13 +22,12 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
22 file://set_sysroot_patch.patch \ 22 file://set_sysroot_patch.patch \
23 file://squid-don-t-do-squid-conf-tests-at-build-time.patch \ 23 file://squid-don-t-do-squid-conf-tests-at-build-time.patch \
24" 24"
25SRC_URI[md5sum] = "b9e5603f00b0c40109610667d8693b22"
26SRC_URI[sha256sum] = "4384564e6227fbb4c18626d663e1b47912d3507b596ed997f2149f10dd8d70bd"
25 27
26LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \ 28LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
27 file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \ 29 file://errors/COPYRIGHT;md5=0d98c4448c368d146f31a970bb0ced21 \
28 " 30 "
29SRC_URI[md5sum] = "6a29d7dfc544205001f7a75c6996dc60"
30SRC_URI[sha256sum] = "5a114f8f7f44b5ae3c9b77d7b81aef13fe69e7f530855213d551f48b157cb5f1"
31
32DEPENDS = "libtool krb5 openldap db cyrus-sasl" 31DEPENDS = "libtool krb5 openldap db cyrus-sasl"
33 32
34inherit autotools useradd ptest 33inherit autotools useradd ptest
@@ -45,7 +44,9 @@ PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir
45PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,," 44PACKAGECONFIG[noatomics] = "squid_cv_gnu_atomics=no,squid_cv_gnu_atomics=yes,,"
46PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 45PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
47 46
48BASIC_AUTH = "DB SASL LDAP NIS" 47BASIC_AUTH = "DB SASL LDAP"
48BASIC_AUTH_append_libc-glibc = " NIS"
49
49DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 50DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
50BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}" 51BASIC_AUTH += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'PAM', '', d)}"
51 52