fix gnutls linkage in case of USE="-ssl", fixes bug #531830

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

4 files changed, 48 insertions, 18 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index a9a8b4762f66..78c0973cdcfe 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.652 2014/11/20 12:53:26 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.653 2014/12/06 23:42:11 tamiko Exp $
+
+  06 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/cups-2.0.1-fix-linkage-to-gnutls.patch, cups-2.0.1-r1.ebuild:
+  fix gnutls linkage in case of USE="-ssl", fixes bug #531830
 
   20 Nov 2014; Matthias Maier <tamiko@gentoo.org>
   +files/cups-2.0.1-xinetd-installation-fix.patch, cups-2.0.1-r1.ebuild:
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 9f5cab23e483..be7d53c6099b 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -7,6 +7,7 @@ AUX cups-1.6.0-fix-install-perms.patch 948 SHA256 4a4a885bb2e111bd67bcb90a5780f3
 AUX cups-1.7.2-systemd-socket-2.patch 11799 SHA256 aec7a98202143e26384fc46baa434f9da022b97793413c95bc1b3765449aceef SHA512 f551e6e1917303ce3e2206284f396885a9aa15bfdee6fdcd88182279cd52a26fc92f5e529b8b30edb0c58dbc749440d23515fa1246959875f525fb5e6b08d466 WHIRLPOOL 063253ffc641c1fd35d929f65c3e42374d5223afc106c2a2f2f0098d5115788573eeaad8fb2c53efe90334ef7a1605d164b1741189c8f8b77e7788097aa76923
 AUX cups-2.0.0-rename-systemd-service-files.patch 5429 SHA256 ef6e8c7aae48b3968e6185a80a7247137abfbc1609ebbaf1e631daba86f96dc3 SHA512 2219c0986fca7c1f89fd980447ada92f4e54548587a8b6d2af001a728d1594d01c5746e8136f7c6763d5846b81061d6e220f9231460e8460b3b838e7150a3d2d WHIRLPOOL b2f71be2fdc9724a9e82149820c866b00466156c30612a86ac6c824a39dfe854e77d7ede5ed782f4dc83dbde70156ef8e6e5d8399479d01e58411fead8cdd40a
 AUX cups-2.0.1-fix-compilation.patch 713 SHA256 adca276aa0ed4f4580da49a53f6301ec2c557131ac402ee731002312551deb93 SHA512 2e3c7565a1647a9d01b77ea02a38d4d965c6ae878fadd43334cfd4aaa986fde6e6e2f4c9bb0cf4fd964b4f71427b3383637b216cdbaf5b0c5967edd24e47e5ee WHIRLPOOL 230168efe3b985511e375fb79bad3c28d70deb5e3411d0cfc87f42ab7a51cbbbb9eb0d45f966ea1e416f29c67113dd83202a9414a54a3d5eac335e035b9bf3de
+AUX cups-2.0.1-fix-linkage-to-gnutls.patch 456 SHA256 091f1ffee8e7cb7d05d6291ce3a38e00a2276e5c9068f1345d04c8222ec12612 SHA512 133c49a7fb912cdd8dab15607f08b31f2ed8d9b7eddaa1db7dad68b4118dcc62fc2cfc8a2288e813cf2a2b6a2f1fea283b50343906827e01020f5070aff12283 WHIRLPOOL 26c5302b181d2ac4916c42b8f68be6aed80e29654b82e12cc637e5ed564c8f0b7bfe7fcfa89c2b66fb33e22dba54b79c6fa463c72f478b5adade6d3f6d4b185e
 AUX cups-2.0.1-rename-systemd-service-files.patch 2818 SHA256 cca42237e7b12343b939519af9ca36de3e890cb0d8cccdeb2abfa0520b56285a SHA512 1efd772c9891f214a47eaafe90ffed09f8282a89953c13180957e83be7eabb4bf4b20f7f596891144e1f8b641497239c94fd8b35c01e16a368307c4dd92c1050 WHIRLPOOL 991fb45f3ac8402c4daa6b3fcf33e12e2b6938d00730f6258d13575812f50b13a5593d9dbc840e6ac391c07bc4a7f0646fa8a16b48e1714f8701cf60971165b9
 AUX cups-2.0.1-xinetd-installation-fix.patch 600 SHA256 a8bc5324cf03d78fd5bebe25fa61ec287feca438f5bd2bd1060554fa635e1130 SHA512 9994908983edac4c46f143e7407ff8c862f96a47602ed401051ef2e6130b086760cce01987fbafe001d4d556714de44b14210d9e8f744c948a66a7267282eed2 WHIRLPOOL d89f7a523e388cac8babd0ecd2c38ad5315382f5fd8a44783c3855fe2ca721d160b0f3185c54f806a1eb9ea5fd40d62cb451aad48bd1f47dcc89e3e2c1340786
 AUX cupsd.init.d-r1 504 SHA256 4705b68372090ee7db69da1ad35131551ed1ba99032db2486ff6c31d2170ce6b SHA512 9eac4fc725b14615bb31c96a69c00a14ab2fb23fa355f1ced655f93e6364555b2710a277ceab439199a275405b016492b4c9183fab755c02354013e0904a03bc WHIRLPOOL e0ce34f4b73de6e63ba1f01b0df543cd66fecc692af8254acb3dd1147c0cd4e1f42ed7df4b18b26af0114db54c3b8c1bca526ed54146307223ac24a0b3d3502c
@@ -17,24 +18,24 @@ EBUILD cups-1.7.5-r2.ebuild 10666 SHA256 da0787e5fa181fef0cea06a48d345dc598a9501
 EBUILD cups-1.7.5.ebuild 10431 SHA256 328696896e43f0348df62ba50ee7715f8232b83367fe5941b46783ed438bd458 SHA512 a61568ac379ddd995c0f527cceecc914c5c1d45e040000a0024f7a2015f0f4e567669dac223ba1c2b246c0aecf9eff68d718f4dd000be620a21f6c510ce35b7c WHIRLPOOL 59978548be1cad588e994b57e26d67c27ed47890c6256f152976d0247d43fa8ebfdc374478187b69acd314d85913f7852283c81023f497958d505e53d17e23f7
 EBUILD cups-1.7.9999.ebuild 10621 SHA256 e27e4f543474fa2f7a00ea0bb32758a941a6c7db0267fdab9b384b25e8b51914 SHA512 2fccf3f4759eeec3bec079073a13486136e71850ea783114ecab953212f5c0fbeefde5a6683712a88799f7a8a9ad02321e6e02c45804ae737cc55273e4066be4 WHIRLPOOL 45ed707f69b10203322392649e67238868c5675e8b67ba7e98af66128b624fbab3cf261760a3a669a8d7a81200a9015f873ecc500557ae6f9cc8ec57fe366a39
 EBUILD cups-2.0.0-r2.ebuild 10350 SHA256 8d50f9037a07df7a97cb6c0ade5e348c26da12b0a4a43a9f94f9f055c1c33091 SHA512 d8f6b63e14635f36148ad5d2795321bde87f498ebc6b172f3f6dd925bc30a984a751088a3b997376e52dbd1bacc510b2c8c795a27b43bfca7e5a942f062143a4 WHIRLPOOL 06fe31e815ccb14af9e9014824e1e06a0e7f4b4b1fc77e8bfb42ae5568f326cb1b729d5bcf8f9e1380b6d0085e53f2f46ec2c59c87a5173821e9e7f63dc4fd6b
-EBUILD cups-2.0.1-r1.ebuild 10443 SHA256 c6e939981994a33d8f34586452a12a7d592ebd388c75fb8f7ff300628a2adab2 SHA512 5adb8a5574b64aaf174b948453b9754441983190c0f32c3ba655b83943758d148434f5c6b5b0ada7c932eec96bce687fc1be6fc227f75cc454f3a2817e5f8867 WHIRLPOOL e4d6be318adf0f8d4d1da7e8232ab39dd8d9f88caf67a3d8fca11e6da7a1d0b216e01d7fe0ab134212924f930c14f4afcde193beadf80297a10388117dd93202
+EBUILD cups-2.0.1-r1.ebuild 10491 SHA256 c8eb196c06edb2830e6951933b3368a6d5583644b7edc91be6ca375ef2d477dd SHA512 72ad56e8e8c37cdbaa75da1601a596174e2920815596049001aa499b5d2080908bb1242d3419907aff08a3aa7046bee820660dc111ab5c603212308496e27d7f WHIRLPOOL 48d2753498984c24db620f4edc0e7c862a9573ec0d97d32fd243475d02a8366a8bc9932dcfbe14b6a7ecbb3091dee9416d7f0d8972384819cdc61923a46a7119
 EBUILD cups-9999.ebuild 10379 SHA256 091c2619d78e431f95f420f338d3d8a09ed8d14b3b82f639b6b9643dbf4bdda2 SHA512 171ce4c065e1b0c2aa685728515d76d2c95930f64c1d0f105d85e085c130e430acd317854b48256b511b1da73ffacdd1db6b3da6593b39ca7cf9d1937c1740e3 WHIRLPOOL e01daef7090562d346a1fdef7dde4c6bbe816a78be38c098233c56e162df446318ee112042cf78cd26ee933de6353adba3c83d352f1a346ca1c57dae257e4d20
-MISC ChangeLog 98858 SHA256 be834e9d5d5932304c208cdcee9bf3fafafc8d5758e72149c763afebc4a5dbea SHA512 1bdcca693c673862c21158caef4d7d3bcf30ac169fdab339a9b757b4efcd93ffb4cd690ae5a5590602b1e025d3b6c323680e235f89efdc80859128f66f388b0a WHIRLPOOL e19c392ce8a3b80aa796013e3c35e17834ce61a1292a44ef4e7dd6315019b7cddb80f33a029231d771e3acdf13b8818f51ae8cdab68263632e5582f7166311ed
+MISC ChangeLog 99042 SHA256 5f4edac6db261dbeda34c78fbd1b6977aff8ef7e112cb4cbe1c390169d4c8259 SHA512 5ffeaa0e3171ccbc53fcab22cf955abf139c1d9cf7d92768cc1a886343adc41763653edc38a025d586652d30159875f73cc11502e6d06dcf689ae987bdc1042c WHIRLPOOL f5dd5076fcba97cbf4ffafb6f6be43b4e9b86d2cdf1b184cf8211a996d27cd95ba03d5c03de80d83d6a4baf94b820f93cf9ee910837d8de34b0f08ce6a47eeb8
 MISC metadata.xml 496 SHA256 732bba7ee060b7be5e0b23d06d24c12c2bfc1c6be1440cdfebe6d5d94d145c47 SHA512 713300abb461ad923c4f6e59326fa97b2372181df4ef82bf04dd6f2d68dc0eb7c34e518cbb40ebd535cb9c4bf52d2648512002cc2cb55c6f21406cc973fa4496 WHIRLPOOL 061013ee6ddaf510964589024e39c4a05f18f0a6d2488eb5b121bb962a378348e71261f7e153f34dbb33337a2e49eb7da94e52d0cb7a128d71e9b4466f8a5933
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUbeRIAAoJELhOzYlK7nn/m5wQAI4liYnk7KFjSjrTRxrg30eH
-Nb90LNGYqRfuVoC1xUYlD9wCWDMKErFU3/X2NxYjmYMFukfz1ivEaVIUHryOsN7B
-fN+dWfFuU68dhJaiaBd9QD+yYplDMj2zkViY1CC+uXaJUlisCGYwedUBNLHmf/UR
-8yf0MBUWEsBRE7072bo6Ckwb6q0AjXJ6bkc51MzH7bWX9BsmMp+6S1+uJq4VWtGy
-h8nvbP9hHKeit0LpTJ1YAyxXCFqjiEXg6WKBSoRdXhAX+WvIyDvslsw6IQ7Ca19d
-BM7OiGEoVMdsdWhAUjsQKqTv2zoxynGwA6HQu2cgHj3hxNIMZ3oTfNlKCQxu/Ssi
-SZ2GsknCzowhw0PrP8h+e+RahwKa8SWYsYkieVGtaJraXs4za3ZMKlkQhvkhJBK3
-eGfNUE9fvVEzFLjprZqm+46ZIyffmAEtyd4sDHDc5iCLNjADloKxsXwCJSql2CsF
-yf2VXPbfD9mlXcF0/ZjUNKiGskRDhs9hilB/YcOb/rZYPxUmBIpcqTvliamMD2xa
-d7vLSqj6E6yhFMMp2yi/fJJeLgEAJCfVjoMr+xgk7zDIE3k79TCAXB2onIoyJ5O2
-GvTEHkkP+rk84Wga49HY8ADJka2nBKfgIMf99yzo9MRp7qaG8CeenY5wMrXXvdWc
-WBBNKMdjV/l9o2VUmAkI
-=tR2v
+iQIcBAEBCAAGBQJUg5RVAAoJELhOzYlK7nn/BMoP/iUU1drJnaLM8NyBTglN+etb
+IYVx863CIgSSG/9WC7E7ZzXHP6YPaOcoXyTqljZLaNqDpy8VunjTlMeOTxQnkUYa
+vXXiB0Th+kIqVGKO7EyOsEAxqxBT+ZAgxED3e8KRHjnIJRer5v03aKK6q22HR5dc
+3+s4w17cVDI5xK3ocGKJFxrTjsJn1xz0549slG8Jbf+vJ9L/Fi++vIgdnodMjA4L
+J+theQZEzHRw04waTOg/PQJxlhzlQcNaNs0cT4zlvAoRiTA+gn7KeawRKRa2LmQ5
+GKujIq1fW7mCrW3cVMA3W0nnWjMdKFwHkim92TOOcMfnCGI5xpUGKcUKQQpfbRtd
+YhfJbVPf4KrKvLLrz125Pluj0mth8BYAKDYu9Erc075pt3aE551Yrfm8rvBvNL/I
+FZxcBEG6YIJ/fAjflPx9PEdLZdwCAoO0IJj3rDdGoD5O5OsFgtNLjUbvygutl4bF
+LU/oqch6IcNI5b4Bks+pP9SlATt8MAfQQZYFrn0Rl4JJkUqiTb0mQ5BHH6QA+/ck
++Ynt8be5sRIQcdYEVrtX5C8lUuUckrHOGe6EW4D7HsDecdmZKecWKgXU7xePaNgi
+NheuHe5yp8Z798J1ELaGh9F7iJfLVb8swAe/xvrJXeOO18OZegd3dXeNxUtscihL
+B0MRnaRZydyw2d/QpdFv
+=eFNg
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-2.0.1-r1.ebuild b/net-print/cups/cups-2.0.1-r1.ebuild
index cc68764d38d2..6d543a1b729e 100644
--- a/net-print/cups/cups-2.0.1-r1.ebuild
+++ b/net-print/cups/cups-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1-r1.ebuild,v 1.2 2014/11/20 12:53:26 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-2.0.1-r1.ebuild,v 1.3 2014/12/06 23:42:11 tamiko Exp $
 
 EAPI=5
 
@@ -94,12 +94,13 @@ RESTRICT="test"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch"
 	"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch"
-	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
 	"${FILESDIR}/${P}-rename-systemd-service-files.patch"
 	"${FILESDIR}/${P}-fix-compilation.patch"
 	"${FILESDIR}/${P}-xinetd-installation-fix.patch"
+	"${FILESDIR}/${P}-fix-linkage-to-gnutls.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
diff --git a/net-print/cups/files/cups-2.0.1-fix-linkage-to-gnutls.patch b/net-print/cups/files/cups-2.0.1-fix-linkage-to-gnutls.patch
new file mode 100644
index 000000000000..dafb6e14b0e6
--- /dev/null
+++ b/net-print/cups/files/cups-2.0.1-fix-linkage-to-gnutls.patch
@@ -0,0 +1,24 @@
+--- a/cups/usersys.c
++++ b/cups/usersys.c
+@@ -1044,7 +1044,9 @@
+ 	  options = 0;
+       }
+ 
++#ifdef HAVE_SSL
+       _httpTLSSetOptions(options);
++#endif /* HAVE_SSL */
+     }
+   }
+ 
+--- a/scheduler/conf.c
++++ b/scheduler/conf.c
+@@ -2975,7 +2975,9 @@
+         }
+       }
+ 
++#ifdef HAVE_SSL
+       _httpTLSSetOptions(options);
++#endif /* HAVE_SSL */
+     }
+     else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")
+ #ifdef HAVE_SSL