CVS commit: [pkgsrc-2016Q3] pkgsrc/games/libggz

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Oct  1 15:18:56 UTC 2016

Modified Files:
        pkgsrc/games/libggz [pkgsrc-2016Q3]: Makefile distinfo
        pkgsrc/games/libggz/patches [pkgsrc-2016Q3]: patch-aa

Log Message:
Pullup ticket #5115 - requested by joerg
games/libggz: build fix

Revisions pulled up:
- games/libggz/Makefile                                         1.11
- games/libggz/distinfo                                         1.4
- games/libggz/patches/patch-aa                                 1.2

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Sat Oct  1 13:01:12 UTC 2016

   Modified Files:
        pkgsrc/games/libggz: Makefile distinfo
        pkgsrc/games/libggz/patches: patch-aa

   Log Message:
   Fix gnutls fallout. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 pkgsrc/games/libggz/Makefile
cvs rdiff -u -r1.3 -r1.3.8.1 pkgsrc/games/libggz/distinfo
cvs rdiff -u -r1.1 -r1.1.34.1 pkgsrc/games/libggz/patches/patch-aa

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

Modified files:

Index: pkgsrc/games/libggz/Makefile
diff -u pkgsrc/games/libggz/Makefile:1.10 pkgsrc/games/libggz/Makefile:1.10.2.1
--- pkgsrc/games/libggz/Makefile:1.10   Mon Sep 19 13:04:18 2016
+++ pkgsrc/games/libggz/Makefile        Sat Oct  1 15:18:56 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2016/09/19 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2016/10/01 15:18:56 bsiegert Exp $
 #
 
 DISTNAME=      libggz-0.0.14.1
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    games
 MASTER_SITES=  http://mirrors.ibiblio.org/pub/mirrors/ggzgamingzone/ggz/0.0.14.1/
 

Index: pkgsrc/games/libggz/distinfo
diff -u pkgsrc/games/libggz/distinfo:1.3 pkgsrc/games/libggz/distinfo:1.3.8.1
--- pkgsrc/games/libggz/distinfo:1.3    Tue Nov  3 20:56:58 2015
+++ pkgsrc/games/libggz/distinfo        Sat Oct  1 15:18:56 2016
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 20:56:58 agc Exp $
+$NetBSD: distinfo,v 1.3.8.1 2016/10/01 15:18:56 bsiegert Exp $
 
 SHA1 (libggz-0.0.14.1.tar.gz) = 8a602e60606c89fd13ad93bb84a8be466fd457ef
 RMD160 (libggz-0.0.14.1.tar.gz) = 5136aba62a4e988d97451b00193c10189f7265f2
 SHA512 (libggz-0.0.14.1.tar.gz) = ca034d8196c151a59d3afec6d37270a974b2f9d9c380f46ef01238077b7c3c1b5686cb5252754523d985963e14c88e27b39da3c362e7accfbe550bdd5837634d
 Size (libggz-0.0.14.1.tar.gz) = 477382 bytes
-SHA1 (patch-aa) = 58afba0306d2609d7426c18e581caf25accf49a3
+SHA1 (patch-aa) = e35fcef50d38f103e7d41694704dc1ce2d73ca00

Index: pkgsrc/games/libggz/patches/patch-aa
diff -u pkgsrc/games/libggz/patches/patch-aa:1.1 pkgsrc/games/libggz/patches/patch-aa:1.1.34.1
--- pkgsrc/games/libggz/patches/patch-aa:1.1    Thu Jul  5 10:33:06 2012
+++ pkgsrc/games/libggz/patches/patch-aa        Sat Oct  1 15:18:56 2016
@@ -1,15 +1,43 @@
-$NetBSD: patch-aa,v 1.1 2012/07/05 10:33:06 drochner Exp $
+$NetBSD: patch-aa,v 1.1.34.1 2016/10/01 15:18:56 bsiegert Exp $
 
 fix build with gnutls-3
 
 --- src/security/ggz_tls_gnutls.c.orig 2008-01-05 19:03:41.000000000 +0000
 +++ src/security/ggz_tls_gnutls.c
-@@ -56,7 +56,7 @@ const int cipher_priority[] = {GNUTLS_CI
- const int mac_priority[] = {GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, 0};
- const int kx_priority[] = {GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0};
- const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
--const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, GNUTLS_COMP_LZO, 0};
-+const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, 0};
+@@ -52,12 +52,6 @@ static gnutls_anon_server_credentials s_
+ static gnutls_anon_client_credentials c_cred;
+ static gnutls_dh_params params;
  
+-const int cipher_priority[] = {GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_NULL, GNUTLS_CIPHER_ARCFOUR_40, GNUTLS_CIPHER_ARCFOUR_128, 0};
+-const int mac_priority[] = {GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA, 0};
+-const int kx_priority[] = {GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, 0};
+-const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
+-const int compression_priority[] = {GNUTLS_COMP_NULL, GNUTLS_COMP_ZLIB, GNUTLS_COMP_LZO, 0};
+-
  void ggz_tls_init(const char *certfile, const char *keyfile, const char *password)
  {
+       /* no cert support yet */
+@@ -109,22 +103,7 @@ int ggz_tls_enable_fd(int fdes, GGZTLSTy
+       else
+               gnutls_init(&session, GNUTLS_SERVER);
+ 
+-      if(whoami == GGZ_TLS_CLIENT) {
+-              /*gnutls_set_default_priority(session);*/
+-              gnutls_mac_set_priority(session, mac_priority);
+-              gnutls_kx_set_priority(session, kx_priority);
+-              gnutls_protocol_set_priority(session, protocol_priority);
+-              gnutls_compression_set_priority(session, compression_priority);
+-              gnutls_cipher_set_priority(session, cipher_priority);
+-      }
+-      else {
+-              /*gnutls_set_default_priority(session);*/
+-              gnutls_protocol_set_priority(session, protocol_priority);
+-              gnutls_compression_set_priority(session, compression_priority);
+-              gnutls_cipher_set_priority(session, cipher_priority);
+-              gnutls_mac_set_priority(session, mac_priority);
+-              gnutls_kx_set_priority(session, kx_priority);
+-      }
++      gnutls_set_default_priority(session);
+ 
+       /*gnutls_dh_set_prime_bits(session, 512);*/
+       if(whoami == GGZ_TLS_CLIENT) sleep(1);