[prev in list] [next in list] [prev in thread] [next in thread] 

List:       cups-commit
Subject:    [cups.commit] [CUPS] r10439 - in branches/branch-1.5: cups packaging
From:       cups-dev () easysw ! com
Date:       2012-04-23 23:49:20
Message-ID: 11211-cups.commit () news ! easysw ! com
[Download RAW message or body]

Author: mike
Date: 2012-04-23 16:49:19 -0700 (Mon, 23 Apr 2012)
New Revision: 10439
Log:
Mirror fix from trunk, fix EPM list.


Modified:
   branches/branch-1.5/cups/http.c
   branches/branch-1.5/packaging/cups.list.in

Modified: branches/branch-1.5/cups/http.c
===================================================================
--- branches/branch-1.5/cups/http.c	2012-04-23 23:38:47 UTC (rev 10438)
+++ branches/branch-1.5/cups/http.c	2012-04-23 23:49:19 UTC (rev 10439)
@@ -3902,7 +3902,9 @@
   http->tls = SSL_new(context);
   SSL_set_bio(http->tls, bio, bio);
 
+#   ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
   SSL_set_tlsext_host_name(http->tls, hostname);
+#   endif /* HAVE_SSL_SET_TLSEXT_HOST_NAME */
 
   if (SSL_connect(http->tls) != 1)
   {

Modified: branches/branch-1.5/packaging/cups.list.in
===================================================================
--- branches/branch-1.5/packaging/cups.list.in	2012-04-23 23:38:47 UTC (rev 10438)
+++ branches/branch-1.5/packaging/cups.list.in	2012-04-23 23:49:19 UTC (rev 10439)
@@ -3,7 +3,7 @@
 #
 #   ESP Package Manager (EPM) file list for CUPS.
 #
-#   Copyright 2007-2011 by Apple Inc.
+#   Copyright 2007-2012 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -15,7 +15,7 @@
 
 # Product information
 %product CUPS
-%copyright 2007-2011 by Apple Inc.
+%copyright 2007-2012 by Apple Inc.
 %vendor Apple Inc.
 #%license LICENSE.txt
 %readme LICENSE.txt
@@ -26,7 +26,7 @@
 %version @CUPS_VERSION@
 %format all
 %description CUPS is the standards-based, open source printing system developed by
-%description Apple Inc. for Mac OS ® X and other UNIX ®-like operating systems.
+%description Apple Inc. for OS X and other UNIX ®-like operating systems.
 
 %format rpm
 %provides lpd

_______________________________________________
cups-commit mailing list
cups-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/cups-commit

[prev in list] [next in list] [prev in thread] [next in thread]