diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2016-10-01 15:18:56 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2016-10-01 15:18:56 +0000 |
| commit | 0f7fdf26db6c03544405f1c6708018044b755ba2 (patch) | |
| tree | 18abdbcf4110c605d2d50d50f94d3a86456348da /games | |
| parent | 7d3114ba19a7155a7a39e1d6876d126b601a8826 (diff) | |
| download | pkgsrc-0f7fdf26db6c03544405f1c6708018044b755ba2.tar.gz | |
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.
Diffstat (limited to 'games')
| -rw-r--r-- | games/libggz/Makefile | 4 | ||||
| -rw-r--r-- | games/libggz/distinfo | 4 | ||||
| -rw-r--r-- | games/libggz/patches/patch-aa | 42 |
3 files changed, 39 insertions, 11 deletions
diff --git a/games/libggz/Makefile b/games/libggz/Makefile index ef92f532c79..1c1073efe4f 100644 --- a/games/libggz/Makefile +++ b/games/libggz/Makefile @@ -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/ diff --git a/games/libggz/distinfo b/games/libggz/distinfo index 95fa9721b8a..2a9f13439d2 100644 --- a/games/libggz/distinfo +++ b/games/libggz/distinfo @@ -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 diff --git a/games/libggz/patches/patch-aa b/games/libggz/patches/patch-aa index 5399771403d..b599a143636 100644 --- a/games/libggz/patches/patch-aa +++ b/games/libggz/patches/patch-aa @@ -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); |