Re: [PATCH][meta-networking][v3] squid: upgrade to 3.5.5

[Joe MacDonald <Joe_MacDonald@mentor.com>]

[-- Attachment #1: Type: text/plain, Size: 7891 bytes --]

[Re: [oe] [PATCH][meta-networking][v3] squid: upgrade to 3.5.5] On 15.08.07 (Fri 10:43) Rongqing Li wrote:

> 
> 
> On 2015年08月06日 22:56, Joe MacDonald wrote:
> >[Re: [oe] [PATCH][meta-networking][v3] squid: upgrade to 3.5.5] On 15.07.31 (Fri 09:16) Rongqing Li wrote:
> >
> >>Ping
> >
> >Just getting to look at the queue again and this stood out for me:
> >
> Hi Joe:
> 
> I see several patches stayed in master-next for a long time,
> Could you consider to merge them to master?
> 
> meta-oe$ git log --oneline master-next ^master ./meta-networking/
> 4842138 opensaf: upgrade 4.5.0 -> 4.6.0
> fec751e vsftpd: upgrade 3.0.2->3.0.3
> 6c8ab71 ypbind-mt: add dependency but keep as broken
> dbb4501 stunnel: upgrade 5.17 -> 5.21
> 0531aae quagga: upgrade 0.99.23 -> 0.99.24.1
> e357ad6 netperf: fix the broken download url
> 27f7240 net-snmp: fix mib representation of timeout values
> 40c187b ypbind-mt: get parameters from dhcp
> 8f45f1b tcpslice: fix do_install
> 105f950 openvpn: upgrade 2.3.6 -> 2.3.7
> 9193170 radvd: upgrade 1.14 -> 2.11
> 085a82d netcf: upgrade 0.2.3 -> 0.2.8
> 65f4eed strongswan: upgrade to 5.3.2
> 463ab47 dovecot: upgrade 2.2.10 -> 2.2.18
> 73f0f92 crda: upgrade 3.13 -> 3.18
> b9ea02a cim-schema-exper: add new recipe for openlmi
> cdd2db1 ntp: upgrade 4.2.8p2 -> 4.2.8p3
> 1019565 squid: upgrade to 3.5.5
> dd56f0d inetutils: Fix deadlock in telnetd when cleanup
> 23b4e6c ypbind-yocto.init: add status command

Thirteen got merged yesterday, your tree may be out of date.

-J.

> 
> 
> 
> >>
> >>-Roy
> >>
> >>On 2015年07月07日 09:55, rongqing.li@windriver.com wrote:
> >>>From: Roy Li <rongqing.li@windriver.com>
> >>>
> >>>1. Remove the squid-change-ksh-referen*.patch which is not needed, since
> >>>    3.5.5 did not use ksh by default.
> >>>2. Update the checksum of COPYING,since the date in it has been changed.
> >>>3. Define BUILDCXXFLAGS, otherwise the target gcc options -std=c++11 will
> >>>    add into it, and lead to building failure since host gcc maybe not
> >>>    support "-std=c++11"
> >>>4. Assume to support GNU atomic operations by default, the running check
> >>>    on cross-compile setup does not work
> >>>5. Add the dependency on libpam
> >
> >Is PAM actually a Squid dependency now?  None of the documentation seems
> >to indicate it is mandatory.  I know the last time around it was flagged
> >as a dependency in Martin's build logs, but that's because PAM was
> >detected during the build and used, not because Squid demands it, I
> >think.  We just need explicit behaviour because the auto-detected
> >behaviour is indeterminate.
> >
> >-J.
> 
> I check the source code, did not find the configuration option,
> seems pam is a must.
> 
> like:
> http://www.rpmfind.net/linux/rpm2html/search.php?query=squid&submit=Search+...&system=&arch=
> http://www.rpmfind.net//linux/RPM/mageia/cauldron/i586/media/core/release/squid-3.5.7-1.mga6.i586.html
> 
> -Roy
> 
> >
> >>>
> >>>Signed-off-by: Roy Li <rongqing.li@windriver.com>
> >>>---
> >>>  ...ge-ksh-reference-in-krb-ldap-helper-to-sh.patch | 39 ----------------------
> >>>  .../squid/{squid_3.4.7.bb => squid_3.5.5.bb}       | 11 +++---
> >>>  2 files changed, 6 insertions(+), 44 deletions(-)
> >>>  delete mode 100644 meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
> >>>  rename meta-networking/recipes-daemons/squid/{squid_3.4.7.bb => squid_3.5.5.bb} (86%)
> >>>
> >>>diff --git a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch b/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
> >>>deleted file mode 100644
> >>>index 8e03860..0000000
> >>>--- a/meta-networking/recipes-daemons/squid/files/squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch
> >>>+++ /dev/null
> >>>@@ -1,39 +0,0 @@
> >>>-squid: change ksh reference in krb ldap helper to sh
> >>>-
> >>>-Very simple cert_tool script with no ksh specifics.
> >>>-Change it to use sh so a package dependency doesn't
> >>>-get created to ksh.
> >>>-
> >>>-Upstream-Status: Pending
> >>>-
> >>>-Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
> >>>-Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
> >>>----
> >>>- helpers/external_acl/kerberos_ldap_group/cert_tool | 6 +++---
> >>>- 1 file changed, 3 insertions(+), 3 deletions(-)
> >>>-
> >>>-diff --git a/helpers/external_acl/kerberos_ldap_group/cert_tool b/helpers/external_acl/kerberos_ldap_group/cert_tool
> >>>-index 9f14959..8c4ea11 100644
> >>>---- a/helpers/external_acl/kerberos_ldap_group/cert_tool
> >>>-+++ b/helpers/external_acl/kerberos_ldap_group/cert_tool
> >>>-@@ -1,4 +1,4 @@
> >>>--#!/bin/ksh
> >>>-+#!/bin/sh
> >>>- #
> >>>- #  -----------------------------------------------------------------------------
> >>>- #
> >>>-@@ -64,9 +64,9 @@ QUIT
> >>>- # Create database for Sun ldap and pem file for Openldap
> >>>- #
> >>>- rm ${server}_[0-9]*.pem 2>/dev/null
> >>>--let i=0
> >>>-+i=0
> >>>-  ls ${server}_[0-9]*.cert | while read file; do
> >>>-- let i=i+1
> >>>-+ i=`expr $i + 1`
> >>>-  cat  $file  >> ${server}_$i.pem
> >>>-  CA=`openssl x509 -noout -text -in  ${server}_$i.pem | grep -i "CA:.*true"`
> >>>-  if [ -n "$CA" ]; then
> >>>---
> >>>-1.9.1
> >>>-
> >>>diff --git a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
> >>>similarity index 86%
> >>>rename from meta-networking/recipes-daemons/squid/squid_3.4.7.bb
> >>>rename to meta-networking/recipes-daemons/squid/squid_3.5.5.bb
> >>>index 7b00dfc..198319d 100644
> >>>--- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
> >>>+++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
> >>>@@ -16,19 +16,18 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${MIN_VER}/${BPN}-${P
> >>>             file://Set-up-for-cross-compilation.patch \
> >>>             file://Skip-AC_RUN_IFELSE-tests.patch \
> >>>             file://Fix-flawed-dynamic-ldb-link-test-in-configure.patch \
> >>>-           file://squid-change-ksh-reference-in-krb-ldap-helper-to-sh.patch \
> >>>             file://squid-use-serial-tests-config-needed-by-ptest.patch \
> >>>             file://run-ptest \
> >>>             file://volatiles.03_squid \
> >>>  "
> >>>
> >>>  LIC_FILES_CHKSUM = "file://COPYING;md5=c492e2d6d32ec5c1aad0e0609a141ce9 \
> >>>-                    file://COPYRIGHT;md5=2900f50789c498be8e9f1eb23b55cbe9 \
> >>>+                    file://errors/COPYRIGHT;md5=0fed8f1462f6fdbc62bb431bcb618f46 \
> >>>                     "
> >>>-SRC_URI[md5sum] = "9951034b10f7ee0f45a95cfae61c57c2"
> >>>-SRC_URI[sha256sum] = "7b423f3d3495a317503ca559ea535f80445fd7c4e3c3e268cb7a8c97c61af2b6"
> >>>+SRC_URI[md5sum] = "6aac5c2e9cbbeabcbf2e9e49a178a931"
> >>>+SRC_URI[sha256sum] = "741c24a307c50f0d845d53cabb66b36d91ce9a73c8a165eae5def5e4d11e6a0d"
> >>>
> >>>-DEPENDS = "libtool krb5 openldap db cyrus-sasl"
> >>>+DEPENDS = "libtool krb5 openldap db cyrus-sasl libpam"
> >>>
> >>>  inherit autotools useradd ptest
> >>>
> >>>@@ -38,6 +37,8 @@ USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/squid --she
> >>>  PACKAGECONFIG ??= ""
> >>>  PACKAGECONFIG[libnetfilter-conntrack] = "--with-netfilter-conntrack=${includedir}, --without-netfilter-conntrack, libnetfilter-conntrack"
> >>>  EXTRA_OECONF += "--with-default-user=squid"
> >>>+export BUILDCXXFLAGS="${BUILD_CXXFLAGS}"
> >>>+CACHED_CONFIGUREVARS += "squid_cv_gnu_atomics=yes"
> >>>
> >>>  TESTDIR = "test-suite"
> >>>  do_compile_ptest() {
> >>>
> >>
> >>--
> >>Best Reagrds,
> >>Roy | RongQing Li
> >>
> >>
> 
> -- 
> Best Reagrds,
> Roy | RongQing Li
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 484 bytes --]