summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2014-12-06 23:42:11 +0000
committerMatthias Maier <tamiko@gentoo.org>2014-12-06 23:42:11 +0000
commit1ae3222c83462a45df0d9a5ff9477657cc502a3f (patch)
tree0ed7e58d2b47dbce5af447095da7985ca12b32fb /net-print/cups/files
parentversion bump and ebuild clean up, drop old RC (diff)
downloadgentoo-2-1ae3222c83462a45df0d9a5ff9477657cc502a3f.tar.gz
gentoo-2-1ae3222c83462a45df0d9a5ff9477657cc502a3f.tar.bz2
gentoo-2-1ae3222c83462a45df0d9a5ff9477657cc502a3f.zip
fix gnutls linkage in case of USE="-ssl", fixes bug #531830
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'net-print/cups/files')
-rw-r--r--net-print/cups/files/cups-2.0.1-fix-linkage-to-gnutls.patch24
1 files changed, 24 insertions, 0 deletions
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