From cc938fb3196774328f16c8ae430ba9eb2d826b8e Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Jun 10 2010 10:37:03 +0000
Subject: - Removed unapplied gnutls-gcrypt-threads patch. Fixed typos in

    descriptions for lpd and php sub-packages.

---

diff --git a/cups-gnutls-gcrypt-threads.patch b/cups-gnutls-gcrypt-threads.patch
deleted file mode 100644
index 7105d39..0000000
--- a/cups-gnutls-gcrypt-threads.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -up cups-1.4.2/config-scripts/cups-ssl.m4.gnutls-gcrypt-threads cups-1.4.2/config-scripts/cups-ssl.m4
---- cups-1.4.2/config-scripts/cups-ssl.m4.gnutls-gcrypt-threads	2010-02-15 12:21:32.000000000 +0100
-+++ cups-1.4.2/config-scripts/cups-ssl.m4	2010-02-15 12:24:57.000000000 +0100
-@@ -61,7 +61,7 @@ if test x$enable_ssl != xno; then
-     if test "x${SSLLIBS}" = "x" -a "x${enable_gnutls}" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
- 	if $PKGCONFIG --exists gnutls; then
--	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-+	    SSLLIBS="`$PKGCONFIG --libs gnutls` -lgcrypt"
- 	    SSLFLAGS=`$PKGCONFIG --cflags gnutls`
- 	    AC_DEFINE(HAVE_SSL)
- 	    AC_DEFINE(HAVE_GNUTLS)
-diff -up cups-1.4.2/cups/http.c.gnutls-gcrypt-threads cups-1.4.2/cups/http.c
---- cups-1.4.2/cups/http.c.gnutls-gcrypt-threads	2010-02-15 12:21:32.000000000 +0100
-+++ cups-1.4.2/cups/http.c	2010-02-15 12:25:57.000000000 +0100
-@@ -1161,6 +1161,12 @@ httpHead(http_t     *http,		/* I - Conne
-   return (http_send(http, HTTP_HEAD, uri));
- }
- 
-+#ifdef HAVE_GNUTLS
-+/* We always have to initialize threading in gcrypt here in libcups
-+ * even if cupsd is configured without threading, because an
-+ * application using libcups may be using threads itself. */
-+GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+#endif
- 
- /*
-  * 'httpInitialize()' - Initialize the HTTP interface library and set the
-@@ -1205,6 +1211,7 @@ httpInitialize(void)
- #endif /* WIN32 */
- 
- #ifdef HAVE_GNUTLS
-+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-   gnutls_global_init();
- #endif /* HAVE_GNUTLS */
- 
-diff -up cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads cups-1.4.2/cups/http-private.h
---- cups-1.4.2/cups/http-private.h.gnutls-gcrypt-threads	2009-04-07 17:48:14.000000000 +0200
-+++ cups-1.4.2/cups/http-private.h	2010-02-15 12:26:30.000000000 +0100
-@@ -98,6 +98,8 @@ extern BIO_METHOD *_httpBIOMethods(void)
-  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
-  */
- #    include <gnutls/gnutls.h>
-+#    include <gcrypt.h>
-+#    include <pthread.h>
- 
- typedef struct
- {
-diff -up cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads cups-1.4.2/scheduler/server.c
---- cups-1.4.2/scheduler/server.c.gnutls-gcrypt-threads	2008-09-11 00:05:29.000000000 +0200
-+++ cups-1.4.2/scheduler/server.c	2010-02-15 12:24:13.000000000 +0100
-@@ -35,6 +35,9 @@
-  */
- 
- static int	started = 0;
-+#if !defined(HAVE_LIBSSL) && defined(HAVE_GNUTLS) && defined(HAVE_PTHREAD_H)
-+GCRY_THREAD_OPTION_PTHREAD_IMPL;
-+#endif
- 
- 
- /*
-@@ -75,7 +78,9 @@ cupsdStartServer(void)
-  /*
-   * Initialize the encryption libraries...
-   */
--
-+#ifdef HAVE_PTHREAD_H
-+  gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
-+#endif /* HAVE_PTHREAD_H */
-   gnutls_global_init();
- #endif /* HAVE_LIBSSL */
- 
diff --git a/cups.spec b/cups.spec
index c929c83..ce46c64 100644
--- a/cups.spec
+++ b/cups.spec
@@ -58,7 +58,6 @@ Patch24: cups-avahi.patch
 Patch25: cups-str3382.patch
 Patch26: cups-str3503.patch
 Patch27: cups-str3399.patch
-Patch28: cups-gnutls-gcrypt-threads.patch
 Patch29: cups-0755.patch
 Patch30: cups-EAI_AGAIN.patch
 Patch31: cups-str3505.patch
@@ -195,12 +194,12 @@ natively, without needing the lp/lpr commands.
 
 %description lpd
 The Common UNIX Printing System provides a portable printing layer for 
-UNIX® operating systems. This is the package that provices standard 
+UNIX® operating systems. This is the package that provides standard 
 lpd emulation.
 
 %description php
 The Common UNIX Printing System provides a portable printing layer for
-UNIX® operating systems. This is the package that provices a PHP
+UNIX® operating systems. This is the package that provides a PHP
 module. 
 
 %prep
@@ -259,7 +258,6 @@ module.
 %patch26 -p1 -b .str3503
 # Don't treat SIGPIPE as an error.
 %patch27 -p1 -b .str3399
-#%patch28 -p1 -b .gnutls-gcrypt-threads
 # Use mode 0755 for binaries and libraries where appropriate.
 %patch29 -p1 -b .0755
 # Re-initialise the resolver on failure in httpAddrLookup().
@@ -582,6 +580,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Thu Jun 10 2010 Tim Waugh <twaugh@redhat.com>
+- Removed unapplied gnutls-gcrypt-threads patch.  Fixed typos in
+  descriptions for lpd and php sub-packages.
+
 * Wed Jun  9 2010 Tim Waugh <twaugh@redhat.com> 1:1.4.3-11
 - Use upstream method of handling SNMP quirks in PPDs (STR #3551,
   bug #581825).