CVS commit: pkgsrc/net/freerdp

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Fri Jun 24 16:39:58 UTC 2016

Modified Files:
        pkgsrc/net/freerdp: Makefile distinfo
        pkgsrc/net/freerdp/patches: patch-libfreerdp-codec_color.c
            patch-libfreerdp-core_orders.c
Added Files:
        pkgsrc/net/freerdp/patches: patch-libfreerdp-core_crypto.c

Log Message:
Add comments to patches which didn't have any.
Add a patch to avoid scribbling on random memory if the server
certificate has more than one alternate name.
Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/freerdp/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/freerdp/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/freerdp/patches/patch-libfreerdp-codec_color.c \
    pkgsrc/net/freerdp/patches/patch-libfreerdp-core_orders.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/freerdp/patches/patch-libfreerdp-core_crypto.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/freerdp/Makefile
diff -u pkgsrc/net/freerdp/Makefile:1.15 pkgsrc/net/freerdp/Makefile:1.16
--- pkgsrc/net/freerdp/Makefile:1.15    Fri Jun 24 11:33:59 2016
+++ pkgsrc/net/freerdp/Makefile Fri Jun 24 16:39:58 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2016/06/24 11:33:59 he Exp $
+# $NetBSD: Makefile,v 1.16 2016/06/24 16:39:58 he Exp $
 
 DISTNAME=      freerdp-1.0.2
-PKGREVISION=   14
+PKGREVISION=   15
 CATEGORIES=    net
 MASTER_SITES=  http://pub.freerdp.com/releases/
 

Index: pkgsrc/net/freerdp/distinfo
diff -u pkgsrc/net/freerdp/distinfo:1.6 pkgsrc/net/freerdp/distinfo:1.7
--- pkgsrc/net/freerdp/distinfo:1.6     Wed Nov  4 00:35:01 2015
+++ pkgsrc/net/freerdp/distinfo Fri Jun 24 16:39:58 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 00:35:01 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/06/24 16:39:58 he Exp $
 
 SHA1 (freerdp-1.0.2.tar.gz) = 6c21e7f1505c64eeff056497bdd7b64551d34f5b
 RMD160 (freerdp-1.0.2.tar.gz) = cf2a584c3a3628ca068913d7e5bcd2e305211045
@@ -6,7 +6,8 @@ SHA512 (freerdp-1.0.2.tar.gz) = fa46ecaf
 Size (freerdp-1.0.2.tar.gz) = 3506620 bytes
 SHA1 (patch-CMakeLists.txt) = b107092ada08bd5caecc6fdf9428ebc447e87f83
 SHA1 (patch-client_X11_CMakeLists.txt) = cef86f1b64a562b5d7c2fa9d2f934a5167276b14
-SHA1 (patch-libfreerdp-codec_color.c) = 63bb566d4b37a8a04cbb3e1ce1071ba0d3efffad
+SHA1 (patch-libfreerdp-codec_color.c) = 61e03ac9cd67ca30b103abbb0534afef8be2f02a
+SHA1 (patch-libfreerdp-core_crypto.c) = 2a927b7bd651b0ce14b57ffa60768175ee8d212a
 SHA1 (patch-libfreerdp-core_listener.c) = 6023aa6714cf26cb3d0193978531b49bf7b06c78
-SHA1 (patch-libfreerdp-core_orders.c) = 7534fab21949795b15525a9496c129d7fd4f1956
+SHA1 (patch-libfreerdp-core_orders.c) = c05e91f86117fe6d32bcd2eee5f3d215efb02c76
 SHA1 (patch-libfreerdp-core_tcp.c) = 0a4cfac09484fd1f9ba3efb18e35540b9684e23c

Index: pkgsrc/net/freerdp/patches/patch-libfreerdp-codec_color.c
diff -u pkgsrc/net/freerdp/patches/patch-libfreerdp-codec_color.c:1.1 pkgsrc/net/freerdp/patches/patch-libfreerdp-codec_color.c:1.2
--- pkgsrc/net/freerdp/patches/patch-libfreerdp-codec_color.c:1.1       Thu Oct 10 00:09:07 2013
+++ pkgsrc/net/freerdp/patches/patch-libfreerdp-codec_color.c   Fri Jun 24 16:39:58 2016
@@ -1,4 +1,6 @@
-$NetBSD: patch-libfreerdp-codec_color.c,v 1.1 2013/10/10 00:09:07 joerg Exp $
+$NetBSD: patch-libfreerdp-codec_color.c,v 1.2 2016/06/24 16:39:58 he Exp $
+
+Make some internal functions static.
 
 --- libfreerdp-codec/color.c.orig      2013-10-09 23:34:52.000000000 +0000
 +++ libfreerdp-codec/color.c
Index: pkgsrc/net/freerdp/patches/patch-libfreerdp-core_orders.c
diff -u pkgsrc/net/freerdp/patches/patch-libfreerdp-core_orders.c:1.1 pkgsrc/net/freerdp/patches/patch-libfreerdp-core_orders.c:1.2
--- pkgsrc/net/freerdp/patches/patch-libfreerdp-core_orders.c:1.1       Thu Oct 10 00:09:07 2013
+++ pkgsrc/net/freerdp/patches/patch-libfreerdp-core_orders.c   Fri Jun 24 16:39:58 2016
@@ -1,4 +1,6 @@
-$NetBSD: patch-libfreerdp-core_orders.c,v 1.1 2013/10/10 00:09:07 joerg Exp $
+$NetBSD: patch-libfreerdp-core_orders.c,v 1.2 2016/06/24 16:39:58 he Exp $
+
+Make internal inline functions static.
 
 --- libfreerdp-core/orders.c.orig      2013-10-09 23:33:10.000000000 +0000
 +++ libfreerdp-core/orders.c

Added files:

Index: pkgsrc/net/freerdp/patches/patch-libfreerdp-core_crypto.c
diff -u /dev/null pkgsrc/net/freerdp/patches/patch-libfreerdp-core_crypto.c:1.1
--- /dev/null   Fri Jun 24 16:39:58 2016
+++ pkgsrc/net/freerdp/patches/patch-libfreerdp-core_crypto.c   Fri Jun 24 16:39:58 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-libfreerdp-core_crypto.c,v 1.1 2016/06/24 16:39:58 he Exp $
+
+Ensure proper operator order so we don't scribble randomly on other memory.
+
+--- libfreerdp-core/crypto.c.orig      2013-01-02 21:46:59.000000000 +0000
++++ libfreerdp-core/crypto.c
+@@ -443,7 +443,7 @@ char** crypto_cert_subject_alt_name(X509
+               {
+                       length = ASN1_STRING_to_UTF8(&string, subject_alt_name->d.dNSName);
+                       strings[*count] = (char*) string;
+-                      *lengths[*count] = length;
++                      (*lengths)[*count] = length;
+                       (*count)++;
+               }
+       }