Author: baggins Date: Tue Aug 2 12:21:17 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2
- fix printing over SSL, amazing apple idiots
---- Files affected:
packages/cups:
cups.spec (1.301 -> 1.302) , cups-ssl-segfault.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.301 packages/cups/cups.spec:1.302
--- packages/cups/cups.spec:1.301 Sat Jul 30 17:32:02 2011
+++ packages/cups/cups.spec Tue Aug 2 14:21:12 2011
@@ -18,7 +18,7 @@
Summary(pt_BR.UTF-8): Sistema Unix de Impressão
Name: cups
Version: 1.5.0
-Release: 1
+Release: 2
Epoch: 1
License: LGPL v2 (libraries), GPL v2 (the rest) + openssl exception
Group: Applications/Printing
@@ -43,6 +43,7 @@
Patch10: %{name}-peercred.patch
Patch11: %{name}-usb.patch
Patch12: %{name}-desktop.patch
+Patch13: %{name}-ssl-segfault.patch
URL: http://www.cups.org/
BuildRequires: acl-devel
BuildRequires: autoconf >= 2.60
@@ -312,6 +313,7 @@
# why it hasn't been merged for so long (and why no other distro uses it)
#%patch11 -p1
%patch12 -p1
+%patch13 -p1
%build
%{__aclocal} -I config-scripts
@@ -732,6 +734,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.302 2011/08/02 12:21:12 baggins
+- rel 2
+- fix printing over SSL, amazing apple idiots
+
Revision 1.301 2011/07/30 15:32:02 qboosh
- autoconf version
================================================================
Index: packages/cups/cups-ssl-segfault.patch
diff -u /dev/null packages/cups/cups-ssl-segfault.patch:1.1
--- /dev/null Tue Aug 2 14:21:17 2011
+++ packages/cups/cups-ssl-segfault.patch Tue Aug 2 14:21:12 2011
@@ -0,0 +1,26 @@
+--- cups-1.5.0/cups/http.c~ 2011-06-16 22:12:16.000000000 +0200
++++ cups-1.5.0/cups/http.c 2011-08-02 14:06:25.143633360 +0200
+@@ -3814,7 +3814,7 @@
+ BIO_ctrl(bio, BIO_C_SET_FILE_PTR, 0, (char *)http);
+
+ http->tls = SSL_new(context);
+- SSL_set_bio(http->tls_credentials, bio, bio);
++ SSL_set_bio(http->tls, bio, bio);
+
+ if (SSL_connect(http->tls) != 1)
+ {
+@@ -4173,11 +4173,11 @@
+ # ifdef HAVE_LIBSSL
+ SSL_CTX *context; /* Context for encryption */
+
+- context = SSL_get_SSL_CTX(http->tls_credentials);
++ context = SSL_get_SSL_CTX(http->tls);
+
+- SSL_shutdown(http->tls_credentials);
++ SSL_shutdown(http->tls);
+ SSL_CTX_free(context);
+- SSL_free(http->tls_credentials);
++ SSL_free(http->tls);
+
+ # elif defined(HAVE_GNUTLS)
+ gnutls_certificate_client_credentials *credentials;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.301&r2=1.302&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
