Patchwork v2 cups: Shouldn't link against libgcrypt without using gcrypt functions

login
register
mail settings
Submitter Armin Kuster
Date June 9, 2014, 8:26 p.m.
Message ID <1402345571-28475-1-git-send-email-akuster@mvista.com>
Download mbox | patch
Permalink /patch/73555/
State New
Headers show

Comments

Armin Kuster - June 9, 2014, 8:26 p.m.
backported patch from cups.org to address the cryto dependency issue I am seeing.

http://www.cups.org/str.php?L4399

Signed-off-by: Armin Kuster <akuster@mvista.com>
---
 meta/recipes-extended/cups/cups.inc                |  1 +
 .../cups/cups/cups-no-gcrypt.patch                 | 40 ++++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
Saul Wold - June 9, 2014, 8:43 p.m.
On 06/09/2014 01:26 PM, Armin Kuster wrote:
> backported patch from cups.org to address the cryto dependency issue I am seeing.
>
> http://www.cups.org/str.php?L4399
>
> Signed-off-by: Armin Kuster <akuster@mvista.com>
> ---
>   meta/recipes-extended/cups/cups.inc                |  1 +
>   .../cups/cups/cups-no-gcrypt.patch                 | 40 ++++++++++++++++++++++
>   2 files changed, 41 insertions(+)
>   create mode 100644 meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
>
> diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
> index fd88552..3b8027b 100644
> --- a/meta/recipes-extended/cups/cups.inc
> +++ b/meta/recipes-extended/cups/cups.inc
> @@ -8,6 +8,7 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
>              file://use_echo_only_in_init.patch \
>              file://0001-don-t-try-to-run-generated-binaries.patch \
>              file://cups_serverbin.patch \
> +           file://cups-no-gcrypt.patch \
>   	  "
>
>   LEAD_SONAME = "libcupsdriver.so"
> diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
> new file mode 100644
> index 0000000..465d353
> --- /dev/null
> +++ b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch

Please add an Upstream-Status: Backport and included the pointer to the 
bug entry.

The patch file itself needs a Signed-off-by: tag.

Thanks
	Sau!

> @@ -0,0 +1,40 @@
> +Description: Don't build-depend on libgcrypt, as nothing is used from it
> +Author: Didier Raboud <odyx@debian.org>
> +Bug-Debian: https://bugs.debian.org/638416
> +Bug: http://www.cups.org/str.php?L????
> +Last-Update: 2014-04-07
> +--- a/config-scripts/cups-ssl.m4
> ++++ b/config-scripts/cups-ssl.m4
> +@@ -66,7 +66,6 @@
> +     dnl Then look for GNU TLS...
> +     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
> +     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
> +-    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
> + 	if $PKGCONFIG --exists gnutls; then
> + 	    have_ssl=1
> + 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
> +@@ -84,14 +83,6 @@
> + 	if test $have_ssl = 1; then
> + 	    CUPS_SERVERCERT="ssl/server.crt"
> + 	    CUPS_SERVERKEY="ssl/server.key"
> +-
> +-            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
> +
> +--- a/cups/http-private.h
> ++++ b/cups/http-private.h
> +@@ -80,7 +80,6 @@
> + #  elif defined HAVE_GNUTLS
> + #    include <gnutls/gnutls.h>
> + #    include <gnutls/x509.h>
> +-#    include <gcrypt.h>
> + #  elif defined(HAVE_CDSASSL)
> + #    include <CoreFoundation/CoreFoundation.h>
> + #    include <Security/Security.h>
>
Armin Kuster - June 9, 2014, 9:06 p.m.
Saul,

Thanks. I have booked marked 
http://openembedded.org/wiki/Commit_Patch_Message_Guidelines
and maybe I will to remember to review that.

- Armin

On 06/09/2014 01:43 PM, Saul Wold wrote:
> On 06/09/2014 01:26 PM, Armin Kuster wrote:
>> backported patch from cups.org to address the cryto dependency issue 
>> I am seeing.
>>
>> http://www.cups.org/str.php?L4399
>>
>> Signed-off-by: Armin Kuster <akuster@mvista.com>
>> ---
>>   meta/recipes-extended/cups/cups.inc                |  1 +
>>   .../cups/cups/cups-no-gcrypt.patch                 | 40 
>> ++++++++++++++++++++++
>>   2 files changed, 41 insertions(+)
>>   create mode 100644 
>> meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
>>
>> diff --git a/meta/recipes-extended/cups/cups.inc 
>> b/meta/recipes-extended/cups/cups.inc
>> index fd88552..3b8027b 100644
>> --- a/meta/recipes-extended/cups/cups.inc
>> +++ b/meta/recipes-extended/cups/cups.inc
>> @@ -8,6 +8,7 @@ SRC_URI = 
>> "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
>>              file://use_echo_only_in_init.patch \
>> file://0001-don-t-try-to-run-generated-binaries.patch \
>>              file://cups_serverbin.patch \
>> +           file://cups-no-gcrypt.patch \
>>         "
>>
>>   LEAD_SONAME = "libcupsdriver.so"
>> diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch 
>> b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
>> new file mode 100644
>> index 0000000..465d353
>> --- /dev/null
>> +++ b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
>
> Please add an Upstream-Status: Backport and included the pointer to 
> the bug entry.
>
> The patch file itself needs a Signed-off-by: tag.
>
> Thanks
>     Sau!
>
>> @@ -0,0 +1,40 @@
>> +Description: Don't build-depend on libgcrypt, as nothing is used 
>> from it
>> +Author: Didier Raboud <odyx@debian.org>
>> +Bug-Debian: https://bugs.debian.org/638416
>> +Bug: http://www.cups.org/str.php?L????
>> +Last-Update: 2014-04-07
>> +--- a/config-scripts/cups-ssl.m4
>> ++++ b/config-scripts/cups-ssl.m4
>> +@@ -66,7 +66,6 @@
>> +     dnl Then look for GNU TLS...
>> +     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a 
>> "x$PKGCONFIG" != x; then
>> +         AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
>> +-        AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
>> +     if $PKGCONFIG --exists gnutls; then
>> +         have_ssl=1
>> +         SSLLIBS=`$PKGCONFIG --libs gnutls`
>> +@@ -84,14 +83,6 @@
>> +     if test $have_ssl = 1; then
>> +         CUPS_SERVERCERT="ssl/server.crt"
>> +         CUPS_SERVERKEY="ssl/server.key"
>> +-
>> +-            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
>> +
>> +--- a/cups/http-private.h
>> ++++ b/cups/http-private.h
>> +@@ -80,7 +80,6 @@
>> + #  elif defined HAVE_GNUTLS
>> + #    include <gnutls/gnutls.h>
>> + #    include <gnutls/x509.h>
>> +-#    include <gcrypt.h>
>> + #  elif defined(HAVE_CDSASSL)
>> + #    include <CoreFoundation/CoreFoundation.h>
>> + #    include <Security/Security.h>
>>

Patch

diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index fd88552..3b8027b 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -8,6 +8,7 @@  SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
            file://use_echo_only_in_init.patch \
            file://0001-don-t-try-to-run-generated-binaries.patch \
            file://cups_serverbin.patch \
+           file://cups-no-gcrypt.patch \
 	  "
 
 LEAD_SONAME = "libcupsdriver.so"
diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
new file mode 100644
index 0000000..465d353
--- /dev/null
+++ b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
@@ -0,0 +1,40 @@ 
+Description: Don't build-depend on libgcrypt, as nothing is used from it
+Author: Didier Raboud <odyx@debian.org>
+Bug-Debian: https://bugs.debian.org/638416
+Bug: http://www.cups.org/str.php?L????
+Last-Update: 2014-04-07
+--- a/config-scripts/cups-ssl.m4
++++ b/config-scripts/cups-ssl.m4
+@@ -66,7 +66,6 @@
+     dnl Then look for GNU TLS...
+     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
+     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
+-    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
+ 	if $PKGCONFIG --exists gnutls; then
+ 	    have_ssl=1
+ 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
+@@ -84,14 +83,6 @@
+ 	if test $have_ssl = 1; then
+ 	    CUPS_SERVERCERT="ssl/server.crt"
+ 	    CUPS_SERVERKEY="ssl/server.key"
+-
+-            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
+ 
+--- a/cups/http-private.h
++++ b/cups/http-private.h
+@@ -80,7 +80,6 @@
+ #  elif defined HAVE_GNUTLS
+ #    include <gnutls/gnutls.h>
+ #    include <gnutls/x509.h>
+-#    include <gcrypt.h>
+ #  elif defined(HAVE_CDSASSL)
+ #    include <CoreFoundation/CoreFoundation.h>
+ #    include <Security/Security.h>