cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnutls-3.1.12.

Browse Source 
requires a recent libc with the getopt_long() fix.
This commit is contained in:
ajacoutot 2013-06-09 09:36:44 +00:00
parent b7cd7211ec
commit 8663035a69
6 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
security/gnutls/Makefile
View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.77 2013/05/13 09:08:38 ajacoutot Exp $
# XXX check why our getopt_long(3) fails the configure test
# + rm patch-gl_unistd_in_h
# $OpenBSD: Makefile,v 1.78 2013/06/09 09:36:44 ajacoutot Exp $
COMMENT= GNU Transport Layer Security library
V= 3.1.11
V= 3.1.12
DISTNAME= gnutls-${V}
EXTRACT_SUFX= .tar.xz
CATEGORIES= security
SHARED_LIBS += gnutls 39.5 # 47.0
SHARED_LIBS += gnutls 39.6 # 47.1
SHARED_LIBS += gnutlsxx 29.1 # 29.0
SHARED_LIBS += gnutls-xssl 0.0 # 0.0
SHARED_LIBS += gnutls-openssl 27.2 # 27.2

4
security/gnutls/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnutls-3.1.11.tar.xz) = pzrFvGkkUMTJkncSXZODZ+PVuKaUU1jJhWTqZ+JUV3I=
SIZE (gnutls-3.1.11.tar.xz) = 5044120
SHA256 (gnutls-3.1.12.tar.xz) = zNODzgBUA5NkUyjtt6nKEX2N5dI+IfIyZzYIqvkZswg=
SIZE (gnutls-3.1.12.tar.xz) = 5119380

16
security/gnutls/patches/patch-doc_examples_ex-cert-select-pkcs11_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-doc_examples_ex-cert-select-pkcs11_c,v 1.5 2012/07/09 13:29:51 ajacoutot Exp $
MIN is already defined in sys/param.h.
--- doc/examples/ex-cert-select-pkcs11.c.orig Fri Jun 8 09:20:58 2012
+++ doc/examples/ex-cert-select-pkcs11.c Mon Jul 9 14:43:17 2012
@@ -24,7 +24,9 @@
#define MAX_BUF 1024
#define MSG "GET / HTTP/1.0\r\n\r\n"
+#ifndef MIN
#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
#define CAFILE "/etc/ssl/certs/ca-certificates.crt"

12
security/gnutls/patches/patch-gl_unistd_in_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gl_unistd_in_h,v 1.2 2013/03/23 13:25:04 ajacoutot Exp $
--- gl/unistd.in.h.orig Thu Mar 21 21:42:28 2013
+++ gl/unistd.in.h Sat Mar 23 14:06:39 2013
@@ -109,7 +109,7 @@
/* Get getopt(), optarg, optind, opterr, optopt.
But avoid namespace pollution on glibc systems. */
-#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT
+#if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT && !defined __OpenBSD__
# define __need_getopt
# include <getopt.h>
#endif

14
security/gnutls/patches/patch-src_libopts_genshell_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_libopts_genshell_h,v 1.1 2012/09/20 17:49:10 ajacoutot Exp $
genshell.h:147: warning: implicit declaration of function 'gettext'
--- src/libopts/genshell.h.orig Thu Sep 20 19:26:23 2012
+++ src/libopts/genshell.h Thu Sep 20 19:26:44 2012
@@ -142,6 +142,7 @@ extern tOptions genshelloptOptions;
#if defined(ENABLE_NLS)
# ifndef _
# include <stdio.h>
+# include <libintl.h>
static inline char* aoGetsText(char const* pz) {
if (pz == NULL) return NULL;
return (char*)gettext(pz);

3
security/gnutls/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.25 2013/05/13 09:08:38 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.26 2013/06/09 09:36:44 ajacoutot Exp $
@bin bin/certtool
@bin bin/crywrap
@bin bin/danetool
@ -929,6 +929,7 @@ share/locale/cs/LC_MESSAGES/gnutls.mo
share/locale/de/LC_MESSAGES/gnutls.mo
share/locale/en@boldquot/LC_MESSAGES/gnutls.mo
share/locale/en@quot/LC_MESSAGES/gnutls.mo
share/locale/eo/LC_MESSAGES/gnutls.mo
share/locale/fi/LC_MESSAGES/gnutls.mo
share/locale/fr/LC_MESSAGES/gnutls.mo
share/locale/it/LC_MESSAGES/gnutls.mo