[vlc-commits] contrib/gnutls: remove debug from patch

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Nov 10 13:41:55 2013 +0100| [04e57be450f6a179f26c5e07f18ed238f1ec1ec6] | committer: Felix Paul Kühne

contrib/gnutls: remove debug from patch

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=04e57be450f6a179f26c5e07f18ed238f1ec1ec6
---

 contrib/src/gnutls/mac-keychain-lookup.patch |   24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/contrib/src/gnutls/mac-keychain-lookup.patch b/contrib/src/gnutls/mac-keychain-lookup.patch
index b42bb41..81e21c2 100644
--- a/contrib/src/gnutls/mac-keychain-lookup.patch
+++ b/contrib/src/gnutls/mac-keychain-lookup.patch
@@ -1,20 +1,20 @@
-diff -ru gnutls-plain/lib/Makefile.am gnutls/lib/Makefile.am
---- gnutls-plain/lib/Makefile.am	2013-06-02 19:33:57.000000000 +0200
-+++ gnutls/lib/Makefile.am	2013-11-10 13:04:36.000000000 +0100
+diff -ru gnutls-old/lib/Makefile.am gnutls/lib/Makefile.am
+--- gnutls-old/lib/Makefile.am	2013-06-02 19:33:57.000000000 +0200
++++ gnutls/lib/Makefile.am	2013-11-10 13:28:18.000000000 +0100
 @@ -152,6 +152,10 @@
  DISTCLEANFILES += $(defexec_DATA)
  endif
  
 +if MACOSX
-+libgnutls_la_LDFLAGS += -Wl,-framework,Security,-framework,CoreFoundation
++libgnutls_la_LDFLAGS +=  -Wl,-framework,Security,-framework,CoreFoundation
 +endif
 +
  if WINDOWS
  thirdparty_libadd += -lcrypt32
  endif
-diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
---- gnutls-plain/lib/system.c	2013-04-10 22:25:51.000000000 +0200
-+++ gnutls/lib/system.c	2013-11-10 13:01:47.000000000 +0100
+diff -ru gnutls-old/lib/system.c gnutls/lib/system.c
+--- gnutls-old/lib/system.c	2013-04-10 22:25:51.000000000 +0200
++++ gnutls/lib/system.c	2013-11-10 13:30:31.000000000 +0100
 @@ -57,6 +57,15 @@
  #undef send
  #undef select
@@ -31,7 +31,7 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
  /* System specific function wrappers.
   */
  
-@@ -550,6 +559,46 @@
+@@ -550,6 +559,40 @@
  
    return r;
  }
@@ -42,15 +42,11 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
 +{
 +    CFArrayRef anchors;
 +    int ret = 0;
-+    printf("add_system_trust\n");
-+    if (SecTrustCopyAnchorCertificates(&anchors) != 0) {
-+        printf("failure one\n");
++    if (SecTrustCopyAnchorCertificates(&anchors) != 0)
 +        return -1;
-+    }
 +
 +    CFIndex count = CFArrayGetCount(anchors);
 +    for (int i = 0; i < count; i++) {
-+        printf("looping %i\n", i);
 +        SecCertificateRef certref = (SecCertificateRef)CFArrayGetValueAtIndex(anchors, i);
 +
 +        CSSM_DATA certData;
@@ -67,8 +63,6 @@ diff -ru gnutls-plain/lib/system.c gnutls/lib/system.c
 +    }
 +    CFRelease(anchors);
 +
-+    printf("will return %i\n", ret);
-+
 +    return ret;
 +}
 +