Patchwork cups: fix host contamination issue

login
register
mail settings
Submitter Koen Kooi
Date Aug. 1, 2014, 11:04 a.m.
Message ID <1406891040-8738-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/77091/
State New
Headers show

Comments

Koen Kooi - Aug. 1, 2014, 11:04 a.m.
-I/usr/include would end up in CFLAGS if /usr/bin/gcrypt-config is
present on the host systemd.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 ...crypt-config-from-the-host-it-leads-to-SS.patch | 28 ++++++++++++++++++++++
 meta/recipes-extended/cups/cups_1.7.4.bb           |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch
Richard Purdie - Aug. 4, 2014, 9:46 a.m.
On Fri, 2014-08-01 at 13:04 +0200, Koen Kooi wrote:
> -I/usr/include would end up in CFLAGS if /usr/bin/gcrypt-config is
> present on the host systemd.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  ...crypt-config-from-the-host-it-leads-to-SS.patch | 28 ++++++++++++++++++++++
>  meta/recipes-extended/cups/cups_1.7.4.bb           |  1 +
>  2 files changed, 29 insertions(+)
>  create mode 100644 meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch

Does the patch "cups: regen configure so cups-no-gcrypt.patch has an
effect" obsolete the need for this change?

Cheers,

Richard
Koen Kooi - Aug. 4, 2014, 11:06 a.m.
Op 4 aug. 2014, om 11:46 heeft Richard Purdie <richard.purdie@linuxfoundation.org> het volgende geschreven:

> On Fri, 2014-08-01 at 13:04 +0200, Koen Kooi wrote:
>> -I/usr/include would end up in CFLAGS if /usr/bin/gcrypt-config is
>> present on the host systemd.
>> 
>> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
>> ---
>> ...crypt-config-from-the-host-it-leads-to-SS.patch | 28 ++++++++++++++++++++++
>> meta/recipes-extended/cups/cups_1.7.4.bb           |  1 +
>> 2 files changed, 29 insertions(+)
>> create mode 100644 meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch
> 
> Does the patch "cups: regen configure so cups-no-gcrypt.patch has an
> effect" obsolete the need for this change?

I haven't tested that patch, but it does look that way.

regards,

Koen
Peter Bigot - Aug. 4, 2014, 1:18 p.m.
On 08/01/2014 06:04 AM, Koen Kooi wrote:
> -I/usr/include would end up in CFLAGS if /usr/bin/gcrypt-config is
> present on the host systemd.
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

Yes, http://patches.openembedded.org/patch/77153/ should (IMO) supersede 
this.

It's my follow-up after Ross disliked 
http://patches.openembedded.org/patch/75403/ because it patched a 
generated file.

Peter

>
> ---
> ...crypt-config-from-the-host-it-leads-to-SS.patch | 28 ++++++++++++++++++++++
>   meta/recipes-extended/cups/cups_1.7.4.bb           |  1 +
>   2 files changed, 29 insertions(+)
>   create mode 100644 meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch
>
> diff --git a/meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch b/meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch
> new file mode 100644
> index 0000000..c37fd0c
> --- /dev/null
> +++ b/meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch
> @@ -0,0 +1,28 @@
> +From bfcc8b85fd1b204a3bb50d7246b3adb6da57da00 Mon Sep 17 00:00:00 2001
> +From: Koen Kooi <koen@dominion.thruhere.net>
> +Date: Fri, 1 Aug 2014 12:59:38 +0200
> +Subject: [PATCH] don't use gcrypt-config from the host, it leads to  SSLFLAGS=-I/usr/include
> +
> +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> +Upstream-status: Inapprotiate [OE-specific]
> +---
> + configure | 3 ---
> + 1 file changed, 3 deletions(-)
> +
> +diff --git a/configure b/configure
> +index 7d1e31d..01cda33 100755
> +--- a/configure
> ++++ b/configure
> +@@ -8411,9 +8411,6 @@ fi
> +             if $PKGCONFIG --exists gcrypt; then
> + 	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
> + 	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
> +-	    elif test "x$LIBGCRYPTCONFIG" != x; then
> +-	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
> +-	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
> + 	    fi
> + 	fi
> +     fi
> +--
> +1.9.0
> +
> diff --git a/meta/recipes-extended/cups/cups_1.7.4.bb b/meta/recipes-extended/cups/cups_1.7.4.bb
> index 9dae986..c15facb 100644
> --- a/meta/recipes-extended/cups/cups_1.7.4.bb
> +++ b/meta/recipes-extended/cups/cups_1.7.4.bb
> @@ -2,5 +2,6 @@ require cups.inc
>   
>   LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d"
>   
> +SRC_URI += "file://0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch"
>   SRC_URI[md5sum] = "1a2295c2b2d2f422db2e50f40ed2fb99"
>   SRC_URI[sha256sum] = "358fc7f22395a9ba07efcfc0d34a057ab5e9182b6e3297f71263a6b68fb41378"
>
>

Patch

diff --git a/meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch b/meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch
new file mode 100644
index 0000000..c37fd0c
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch
@@ -0,0 +1,28 @@ 
+From bfcc8b85fd1b204a3bb50d7246b3adb6da57da00 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Fri, 1 Aug 2014 12:59:38 +0200
+Subject: [PATCH] don't use gcrypt-config from the host, it leads to  SSLFLAGS=-I/usr/include
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+Upstream-status: Inapprotiate [OE-specific]
+---
+ configure | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure b/configure
+index 7d1e31d..01cda33 100755
+--- a/configure
++++ b/configure
+@@ -8411,9 +8411,6 @@ fi
+             if $PKGCONFIG --exists gcrypt; then
+ 	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
+ 	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
+-	    elif test "x$LIBGCRYPTCONFIG" != x; then
+-	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
+-	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
+ 	    fi
+ 	fi
+     fi
+-- 
+1.9.0
+
diff --git a/meta/recipes-extended/cups/cups_1.7.4.bb b/meta/recipes-extended/cups/cups_1.7.4.bb
index 9dae986..c15facb 100644
--- a/meta/recipes-extended/cups/cups_1.7.4.bb
+++ b/meta/recipes-extended/cups/cups_1.7.4.bb
@@ -2,5 +2,6 @@  require cups.inc
 
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d"
 
+SRC_URI += "file://0001-don-t-use-gcrypt-config-from-the-host-it-leads-to-SS.patch"
 SRC_URI[md5sum] = "1a2295c2b2d2f422db2e50f40ed2fb99"
 SRC_URI[sha256sum] = "358fc7f22395a9ba07efcfc0d34a057ab5e9182b6e3297f71263a6b68fb41378"