All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH][v2] squid: upgrade to 3.5.5
@ 2015-06-17  3:03 rongqing.li
  2015-07-06 19:26 ` Joe MacDonald
  0 siblings, 1 reply; 3+ messages in thread
From: rongqing.li @ 2015-06-17  3:03 UTC (permalink / raw)
  To: openembedded-devel

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

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}       |  9 ++---
 2 files changed, 5 insertions(+), 43 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} (88%)

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 88%
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..ac18e0f 100644
--- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
+++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
@@ -16,17 +16,16 @@ 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"
 
@@ -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() {
-- 
1.9.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH][v2] squid: upgrade to 3.5.5
  2015-06-17  3:03 [PATCH][v2] squid: upgrade to 3.5.5 rongqing.li
@ 2015-07-06 19:26 ` Joe MacDonald
  2015-07-07  0:47   ` Rongqing Li
  0 siblings, 1 reply; 3+ messages in thread
From: Joe MacDonald @ 2015-07-06 19:26 UTC (permalink / raw)
  To: openembedded-devel

Looks okay, but there's this in Martin's logs:

squid-3.5.5: squid rdepends on libpam, but it isn't a build
dependency? [build-deps]

Can you update the recipe for that?

-J.

On Tue, Jun 16, 2015 at 11:03 PM,  <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
>
> 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}       |  9 ++---
>  2 files changed, 5 insertions(+), 43 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} (88%)
>
> 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 88%
> 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..ac18e0f 100644
> --- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
> +++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
> @@ -16,17 +16,16 @@ 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"
>
> @@ -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() {
> --
> 1.9.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel



-- 
Joe MacDonald
:wq


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH][v2] squid: upgrade to 3.5.5
  2015-07-06 19:26 ` Joe MacDonald
@ 2015-07-07  0:47   ` Rongqing Li
  0 siblings, 0 replies; 3+ messages in thread
From: Rongqing Li @ 2015-07-07  0:47 UTC (permalink / raw)
  To: openembedded-devel



On 2015年07月07日 03:26, Joe MacDonald wrote:
> Looks okay, but there's this in Martin's logs:
>
> squid-3.5.5: squid rdepends on libpam, but it isn't a build
> dependency? [build-deps]
>
> Can you update the recipe for that?
>



Ok, I will see it

-Roy


> -J.
>
> On Tue, Jun 16, 2015 at 11:03 PM,  <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
>>
>> 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}       |  9 ++---
>>   2 files changed, 5 insertions(+), 43 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} (88%)
>>
>> 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 88%
>> 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..ac18e0f 100644
>> --- a/meta-networking/recipes-daemons/squid/squid_3.4.7.bb
>> +++ b/meta-networking/recipes-daemons/squid/squid_3.5.5.bb
>> @@ -16,17 +16,16 @@ 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"
>>
>> @@ -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() {
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
>

-- 
Best Reagrds,
Roy | RongQing Li


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-07  0:47 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-17  3:03 [PATCH][v2] squid: upgrade to 3.5.5 rongqing.li
2015-07-06 19:26 ` Joe MacDonald
2015-07-07  0:47   ` Rongqing Li

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.