Date: Sun, 10 Apr 2011 01:55:29 +0900 (JST) From: Fumiyuki Shimizu =?iso-2022-jp?B?GyRCQDY/ZUo4OVQbKEI=?= <fumifumi@abacustech.jp> To: FreeBSD-gnats-submit@FreeBSD.org Cc: novel@FreeBSD.org Subject: ports/156298: [PATCH] security/gnutls-devel: update to 2.99.0 Message-ID: <20110409165529.1F24C4AD12@shiraz.abacustech.jp> Resent-Message-ID: <201104091700.p39H0MWx057023@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 156298 >Category: ports >Synopsis: [PATCH] security/gnutls-devel: update to 2.99.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Apr 09 17:00:21 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Fumiyuki Shimizu >Release: FreeBSD 8.1-RELEASE amd64 >Organization: Abacus Technologies, Inc. >Environment: FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010 >Description: Hi, - Update to 2.99.0 Added file(s): - files/patch-configure - files/patch-gl-Makefile.am - files/patch-gl-Makefile.in - files/patch-gl-error.c - files/patch-gl-error.h - files/patch-gl-m4-error.m4 - files/patch-src-udp-serv.c Cheers, Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- gnutls-devel-2.99.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/Makefile /usr/home/fumifumi/gnutls-devel/Makefile --- /usr/ports/security/gnutls-devel/Makefile 2011-02-24 04:05:33.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/Makefile 2011-04-09 23:57:19.000000000 +0900 @@ -6,7 +6,7 @@ # PORTNAME= gnutls -PORTVERSION= 2.11.6 +PORTVERSION= 2.99.0 CATEGORIES= security net MASTER_SITES= http://alpha.gnu.org/gnu/gnutls/ \ ftp://ftp.gnutls.org/pub/gnutls/devel/ @@ -20,6 +20,9 @@ CONFLICTS= gnutls-[0-9]* +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + USE_BZIP2= yes USE_ICONV= yes USE_GNOME= pkgconfig ltverhack @@ -63,7 +66,7 @@ .endif .if !defined(NOPORTDOCS) -PORTDOCS= AUTHORS NEWS README THANKS +PORTDOCS= AUTHORS NEWS README THANKS .endif EXAMPLES= doc/examples/*.c diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/Makefile.man /usr/home/fumifumi/gnutls-devel/Makefile.man --- /usr/ports/security/gnutls-devel/Makefile.man 2011-02-01 03:55:59.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/Makefile.man 2011-04-10 00:52:22.000000000 +0900 @@ -528,7 +528,6 @@ gnutls_x509_crq_get_key_rsa_raw.3 \ gnutls_x509_crq_get_key_usage.3 \ gnutls_x509_crq_get_pk_algorithm.3 \ - gnutls_x509_crq_get_preferred_hash_algorithm.3 \ gnutls_x509_crq_get_subject_alt_name.3 \ gnutls_x509_crq_get_subject_alt_othername_oid.3 \ gnutls_x509_crq_get_version.3 \ diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/distinfo /usr/home/fumifumi/gnutls-devel/distinfo --- /usr/ports/security/gnutls-devel/distinfo 2011-02-24 04:05:33.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/distinfo 2011-04-09 19:39:03.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (gnutls-2.11.6.tar.bz2) = 4ea79c7a8c215f281994f81f9b8fc80787ac83f8b1c5ff2d89fc5eedd9502c3e -SIZE (gnutls-2.11.6.tar.bz2) = 7743287 +SHA256 (gnutls-2.99.0.tar.bz2) = d0afdf396026a5839fdbba5c5683e0f92af8e88eb0c031f13857008fc744addb +SIZE (gnutls-2.99.0.tar.bz2) = 6218546 diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/files/patch-configure /usr/home/fumifumi/gnutls-devel/files/patch-configure --- /usr/ports/security/gnutls-devel/files/patch-configure 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/files/patch-configure 2011-04-09 21:24:42.000000000 +0900 @@ -0,0 +1,77 @@ +--- configure.orig 2011-04-09 21:06:42.000000000 +0900 ++++ configure 2011-04-09 21:17:05.000000000 +0900 +@@ -28329,6 +28329,74 @@ + + # Code from module errno: + ++ # Code from module error: ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 ++$as_echo_n "checking for error_at_line... " >&6; } ++if test "${ac_cv_lib_error_at_line+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#include <error.h> ++int ++main () ++{ ++error_at_line (0, 0, "", 0, "an error occurred"); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_error_at_line=yes ++else ++ ac_cv_lib_error_at_line=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5 ++$as_echo "$ac_cv_lib_error_at_line" >&6; } ++ if test $ac_cv_lib_error_at_line = no; then ++ ++ ++ ++ ++ ++ ++ ++ ++ gl_LIBOBJS="$gl_LIBOBJS error.$ac_objext" ++ ++ fi ++ ++ ++ ++ ++ : ++ ++ ++ ++ ++ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error:3:c-format" ++ ++ ++ ++ XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS --flag=error_at_line:5:c-format" ++ + # Code from module extensions: + # Code from module float: + diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/files/patch-gl-Makefile.am /usr/home/fumifumi/gnutls-devel/files/patch-gl-Makefile.am --- /usr/ports/security/gnutls-devel/files/patch-gl-Makefile.am 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/files/patch-gl-Makefile.am 2011-04-09 21:25:29.000000000 +0900 @@ -0,0 +1,18 @@ +--- gl/Makefile.am.orig 2011-04-08 21:36:08.000000000 +0900 ++++ gl/Makefile.am 2011-04-09 20:46:39.000000000 +0900 +@@ -220,6 +220,15 @@ + + ## end gnulib module errno + ++## begin gnulib module error ++ ++ ++EXTRA_DIST += error.c error.h ++ ++EXTRA_libgnu_la_SOURCES += error.c ++ ++## end gnulib module error ++ + ## begin gnulib module float + + BUILT_SOURCES += $(FLOAT_H) diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/files/patch-gl-Makefile.in /usr/home/fumifumi/gnutls-devel/files/patch-gl-Makefile.in --- /usr/ports/security/gnutls-devel/files/patch-gl-Makefile.in 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/files/patch-gl-Makefile.in 2011-04-09 21:25:29.000000000 +0900 @@ -0,0 +1,37 @@ +--- gl/Makefile.in.orig 2011-04-08 22:09:17.000000000 +0900 ++++ gl/Makefile.in 2011-04-09 21:00:43.000000000 +0900 +@@ -54,7 +54,7 @@ + am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \ + $(top_srcdir)/gl/m4/alloca.m4 $(top_srcdir)/gl/m4/byteswap.m4 \ + $(top_srcdir)/gl/m4/clock_time.m4 \ +- $(top_srcdir)/gl/m4/errno_h.m4 \ ++ $(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \ + $(top_srcdir)/gl/m4/extensions.m4 \ + $(top_srcdir)/gl/m4/fcntl-o.m4 $(top_srcdir)/gl/m4/fcntl_h.m4 \ + $(top_srcdir)/gl/m4/float_h.m4 $(top_srcdir)/gl/m4/fseeko.m4 \ +@@ -1011,7 +1011,7 @@ + EXTRA_DIST = m4/gnulib-cache.m4 alignof.h alloca.c alloca.in.h \ + $(top_srcdir)/build-aux/arg-nonnull.h byteswap.in.h \ + $(top_srcdir)/build-aux/c++defs.h close-hook.h hmac-md5.c \ +- hmac.h md5.c md5.h errno.in.h float.in.h fseeko.c stdio-impl.h \ ++ hmac.h md5.c md5.h errno.in.h error.c error.h float.in.h fseeko.c stdio-impl.h \ + ftello.c stdio-impl.h getdelim.c getline.c getpass.c getpass.h \ + $(top_srcdir)/build-aux/config.rpath gettime.c gettimeofday.c \ + $(top_srcdir)/build-aux/config.rpath lseek.c malloc.c memchr.c \ +@@ -1070,7 +1070,7 @@ + verify.h version-etc.h version-etc.c version-etc-fsf.c xsize.h + libgnu_la_LIBADD = $(gl_LTLIBOBJS) @LTALLOCA@ + libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS) @LTALLOCA@ +-EXTRA_libgnu_la_SOURCES = alloca.c hmac-md5.c md5.c fseeko.c ftello.c \ ++EXTRA_libgnu_la_SOURCES = alloca.c hmac-md5.c md5.c error.c fseeko.c ftello.c \ + getdelim.c getline.c getpass.c gettime.c gettimeofday.c \ + lseek.c malloc.c memchr.c memmem.c memxor.c read-file.c \ + realloc.c snprintf.c strcasecmp.c strncasecmp.c strdup.c \ +@@ -1143,6 +1143,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-ctype.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/close-hook.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseeko.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ftello.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdelim.Plo@am__quote@ diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/files/patch-gl-error.c /usr/home/fumifumi/gnutls-devel/files/patch-gl-error.c --- /usr/ports/security/gnutls-devel/files/patch-gl-error.c 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/files/patch-gl-error.c 2011-04-09 21:25:28.000000000 +0900 @@ -0,0 +1,397 @@ +--- gl/error.c.orig 2011-04-09 20:49:33.000000000 +0900 ++++ gl/error.c 2011-04-08 09:30:44.000000000 +0900 +@@ -0,0 +1,394 @@ ++/* Error handler for noninteractive utilities ++ Copyright (C) 1990-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see <http://www.gnu.org/licenses/>. */ ++ ++/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */ ++ ++#if !_LIBC ++# include <config.h> ++#endif ++ ++#include "error.h" ++ ++#include <stdarg.h> ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#if !_LIBC && ENABLE_NLS ++# include "gettext.h" ++# define _(msgid) gettext (msgid) ++#endif ++ ++#ifdef _LIBC ++# include <libintl.h> ++# include <stdbool.h> ++# include <stdint.h> ++# include <wchar.h> ++# define mbsrtowcs __mbsrtowcs ++#endif ++ ++#if USE_UNLOCKED_IO ++# include "unlocked-io.h" ++#endif ++ ++#ifndef _ ++# define _(String) String ++#endif ++ ++/* If NULL, error will flush stdout, then print on stderr the program ++ name, a colon and a space. Otherwise, error will call this ++ function without parameters instead. */ ++void (*error_print_progname) (void); ++ ++/* This variable is incremented each time `error' is called. */ ++unsigned int error_message_count; ++ ++#ifdef _LIBC ++/* In the GNU C library, there is a predefined variable for this. */ ++ ++# define program_name program_invocation_name ++# include <errno.h> ++# include <limits.h> ++# include <libio/libioP.h> ++ ++/* In GNU libc we want do not want to use the common name `error' directly. ++ Instead make it a weak alias. */ ++extern void __error (int status, int errnum, const char *message, ...) ++ __attribute__ ((__format__ (__printf__, 3, 4))); ++extern void __error_at_line (int status, int errnum, const char *file_name, ++ unsigned int line_number, const char *message, ++ ...) ++ __attribute__ ((__format__ (__printf__, 5, 6)));; ++# define error __error ++# define error_at_line __error_at_line ++ ++# include <libio/iolibio.h> ++# define fflush(s) INTUSE(_IO_fflush) (s) ++# undef putc ++# define putc(c, fp) INTUSE(_IO_putc) (c, fp) ++ ++# include <bits/libc-lock.h> ++ ++#else /* not _LIBC */ ++ ++# include <fcntl.h> ++# include <unistd.h> ++ ++# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ ++/* Get declarations of the Win32 API functions. */ ++# define WIN32_LEAN_AND_MEAN ++# include <windows.h> ++# endif ++ ++/* The gnulib override of fcntl is not needed in this file. */ ++# undef fcntl ++ ++# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P ++# ifndef HAVE_DECL_STRERROR_R ++"this configure-time declaration test was not run" ++# endif ++char *strerror_r (); ++# endif ++ ++/* The calling program should define program_name and set it to the ++ name of the executing program. */ ++extern char *program_name; ++ ++# if HAVE_STRERROR_R || defined strerror_r ++# define __strerror_r strerror_r ++# endif /* HAVE_STRERROR_R || defined strerror_r */ ++#endif /* not _LIBC */ ++ ++#if !_LIBC ++/* Return non-zero if FD is open. */ ++static inline int ++is_open (int fd) ++{ ++# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ ++ /* On Win32: The initial state of unassigned standard file descriptors is ++ that they are open but point to an INVALID_HANDLE_VALUE. There is no ++ fcntl, and the gnulib replacement fcntl does not support F_GETFL. */ ++ return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE; ++# else ++# ifndef F_GETFL ++# error Please port fcntl to your platform ++# endif ++ return 0 <= fcntl (fd, F_GETFL); ++# endif ++} ++#endif ++ ++static inline void ++flush_stdout (void) ++{ ++#if !_LIBC ++ int stdout_fd; ++ ++# if GNULIB_FREOPEN_SAFER ++ /* Use of gnulib's freopen-safer module normally ensures that ++ fileno (stdout) == 1 ++ whenever stdout is open. */ ++ stdout_fd = STDOUT_FILENO; ++# else ++ /* POSIX states that fileno (stdout) after fclose is unspecified. But in ++ practice it is not a problem, because stdout is statically allocated and ++ the fd of a FILE stream is stored as a field in its allocated memory. */ ++ stdout_fd = fileno (stdout); ++# endif ++ /* POSIX states that fflush (stdout) after fclose is unspecified; it ++ is safe in glibc, but not on all other platforms. fflush (NULL) ++ is always defined, but too draconian. */ ++ if (0 <= stdout_fd && is_open (stdout_fd)) ++#endif ++ fflush (stdout); ++} ++ ++static void ++print_errno_message (int errnum) ++{ ++ char const *s; ++ ++#if defined HAVE_STRERROR_R || _LIBC ++ char errbuf[1024]; ++# if STRERROR_R_CHAR_P || _LIBC ++ s = __strerror_r (errnum, errbuf, sizeof errbuf); ++# else ++ if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0) ++ s = errbuf; ++ else ++ s = 0; ++# endif ++#else ++ s = strerror (errnum); ++#endif ++ ++#if !_LIBC ++ if (! s) ++ s = _("Unknown system error"); ++#endif ++ ++#if _LIBC ++ __fxprintf (NULL, ": %s", s); ++#else ++ fprintf (stderr, ": %s", s); ++#endif ++} ++ ++static void ++error_tail (int status, int errnum, const char *message, va_list args) ++{ ++#if _LIBC ++ if (_IO_fwide (stderr, 0) > 0) ++ { ++# define ALLOCA_LIMIT 2000 ++ size_t len = strlen (message) + 1; ++ wchar_t *wmessage = NULL; ++ mbstate_t st; ++ size_t res; ++ const char *tmp; ++ bool use_malloc = false; ++ ++ while (1) ++ { ++ if (__libc_use_alloca (len * sizeof (wchar_t))) ++ wmessage = (wchar_t *) alloca (len * sizeof (wchar_t)); ++ else ++ { ++ if (!use_malloc) ++ wmessage = NULL; ++ ++ wchar_t *p = (wchar_t *) realloc (wmessage, ++ len * sizeof (wchar_t)); ++ if (p == NULL) ++ { ++ free (wmessage); ++ fputws_unlocked (L"out of memory\n", stderr); ++ return; ++ } ++ wmessage = p; ++ use_malloc = true; ++ } ++ ++ memset (&st, '\0', sizeof (st)); ++ tmp = message; ++ ++ res = mbsrtowcs (wmessage, &tmp, len, &st); ++ if (res != len) ++ break; ++ ++ if (__builtin_expect (len >= SIZE_MAX / 2, 0)) ++ { ++ /* This really should not happen if everything is fine. */ ++ res = (size_t) -1; ++ break; ++ } ++ ++ len *= 2; ++ } ++ ++ if (res == (size_t) -1) ++ { ++ /* The string cannot be converted. */ ++ if (use_malloc) ++ { ++ free (wmessage); ++ use_malloc = false; ++ } ++ wmessage = (wchar_t *) L"???"; ++ } ++ ++ __vfwprintf (stderr, wmessage, args); ++ ++ if (use_malloc) ++ free (wmessage); ++ } ++ else ++#endif ++ vfprintf (stderr, message, args); ++ va_end (args); ++ ++ ++error_message_count; ++ if (errnum) ++ print_errno_message (errnum); ++#if _LIBC ++ __fxprintf (NULL, "\n"); ++#else ++ putc ('\n', stderr); ++#endif ++ fflush (stderr); ++ if (status) ++ exit (status); ++} ++ ++ ++/* Print the program name and error message MESSAGE, which is a printf-style ++ format string with optional args. ++ If ERRNUM is nonzero, print its corresponding system error message. ++ Exit with status STATUS if it is nonzero. */ ++void ++error (int status, int errnum, const char *message, ...) ++{ ++ va_list args; ++ ++#if defined _LIBC && defined __libc_ptf_call ++ /* We do not want this call to be cut short by a thread ++ cancellation. Therefore disable cancellation for now. */ ++ int state = PTHREAD_CANCEL_ENABLE; ++ __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state), ++ 0); ++#endif ++ ++ flush_stdout (); ++#ifdef _LIBC ++ _IO_flockfile (stderr); ++#endif ++ if (error_print_progname) ++ (*error_print_progname) (); ++ else ++ { ++#if _LIBC ++ __fxprintf (NULL, "%s: ", program_name); ++#else ++ fprintf (stderr, "%s: ", program_name); ++#endif ++ } ++ ++ va_start (args, message); ++ error_tail (status, errnum, message, args); ++ ++#ifdef _LIBC ++ _IO_funlockfile (stderr); ++# ifdef __libc_ptf_call ++ __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0); ++# endif ++#endif ++} ++ ++/* Sometimes we want to have at most one error per line. This ++ variable controls whether this mode is selected or not. */ ++int error_one_per_line; ++ ++void ++error_at_line (int status, int errnum, const char *file_name, ++ unsigned int line_number, const char *message, ...) ++{ ++ va_list args; ++ ++ if (error_one_per_line) ++ { ++ static const char *old_file_name; ++ static unsigned int old_line_number; ++ ++ if (old_line_number == line_number ++ && (file_name == old_file_name ++ || strcmp (old_file_name, file_name) == 0)) ++ /* Simply return and print nothing. */ ++ return; ++ ++ old_file_name = file_name; ++ old_line_number = line_number; ++ } ++ ++#if defined _LIBC && defined __libc_ptf_call ++ /* We do not want this call to be cut short by a thread ++ cancellation. Therefore disable cancellation for now. */ ++ int state = PTHREAD_CANCEL_ENABLE; ++ __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state), ++ 0); ++#endif ++ ++ flush_stdout (); ++#ifdef _LIBC ++ _IO_flockfile (stderr); ++#endif ++ if (error_print_progname) ++ (*error_print_progname) (); ++ else ++ { ++#if _LIBC ++ __fxprintf (NULL, "%s:", program_name); ++#else ++ fprintf (stderr, "%s:", program_name); ++#endif ++ } ++ ++#if _LIBC ++ __fxprintf (NULL, file_name != NULL ? "%s:%d: " : " ", ++ file_name, line_number); ++#else ++ fprintf (stderr, file_name != NULL ? "%s:%d: " : " ", ++ file_name, line_number); ++#endif ++ ++ va_start (args, message); ++ error_tail (status, errnum, message, args); ++ ++#ifdef _LIBC ++ _IO_funlockfile (stderr); ++# ifdef __libc_ptf_call ++ __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0); ++# endif ++#endif ++} ++ ++#ifdef _LIBC ++/* Make the weak alias. */ ++# undef error ++# undef error_at_line ++weak_alias (__error, error) ++weak_alias (__error_at_line, error_at_line) ++#endif diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/files/patch-gl-error.h /usr/home/fumifumi/gnutls-devel/files/patch-gl-error.h --- /usr/ports/security/gnutls-devel/files/patch-gl-error.h 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/files/patch-gl-error.h 2011-04-09 21:25:28.000000000 +0900 @@ -0,0 +1,68 @@ +--- gl/error.h.orig 2011-04-09 20:49:36.000000000 +0900 ++++ gl/error.h 2011-04-08 09:30:44.000000000 +0900 +@@ -0,0 +1,65 @@ ++/* Declaration for error-reporting function ++ Copyright (C) 1995-1997, 2003, 2006, 2008-2011 Free Software Foundation, ++ Inc. ++ This file is part of the GNU C Library. ++ ++ This program is free software: you can redistribute it and/or modify ++ it under the terms of the GNU General Public License as published by ++ the Free Software Foundation; either version 3 of the License, or ++ (at your option) any later version. ++ ++ This program is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program. If not, see <http://www.gnu.org/licenses/>. */ ++ ++#ifndef _ERROR_H ++#define _ERROR_H 1 ++ ++/* The __attribute__ feature is available in gcc versions 2.5 and later. ++ The __-protected variants of the attributes 'format' and 'printf' are ++ accepted by gcc versions 2.6.4 (effectively 2.7) and later. ++ We enable _GL_ATTRIBUTE_FORMAT only if these are supported too, because ++ gnulib and libintl do '#define printf __printf__' when they override ++ the 'printf' function. */ ++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) ++# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) ++#else ++# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */ ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* Print a message with `fprintf (stderr, FORMAT, ...)'; ++ if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). ++ If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ ++ ++extern void error (int __status, int __errnum, const char *__format, ...) ++ _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4)); ++ ++extern void error_at_line (int __status, int __errnum, const char *__fname, ++ unsigned int __lineno, const char *__format, ...) ++ _GL_ATTRIBUTE_FORMAT ((__printf__, 5, 6)); ++ ++/* If NULL, error will flush stdout, then print on stderr the program ++ name, a colon and a space. Otherwise, error will call this ++ function without parameters instead. */ ++extern void (*error_print_progname) (void); ++ ++/* This variable is incremented each time `error' is called. */ ++extern unsigned int error_message_count; ++ ++/* Sometimes we want to have at most one error per line. This ++ variable controls whether this mode is selected or not. */ ++extern int error_one_per_line; ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* error.h */ diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/files/patch-gl-m4-error.m4 /usr/home/fumifumi/gnutls-devel/files/patch-gl-m4-error.m4 --- /usr/ports/security/gnutls-devel/files/patch-gl-m4-error.m4 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/files/patch-gl-m4-error.m4 2011-04-09 21:25:59.000000000 +0900 @@ -0,0 +1,42 @@ +--- gl/m4/error.m4.orig 2011-04-09 20:48:37.000000000 +0900 ++++ gl/m4/error.m4 2011-04-08 09:30:44.000000000 +0900 +@@ -0,0 +1,39 @@ ++#serial 13 ++ ++# Copyright (C) 1996-1998, 2001-2004, 2009-2011 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++AC_DEFUN([gl_ERROR], ++[ ++ AC_FUNC_ERROR_AT_LINE ++ dnl Note: AC_FUNC_ERROR_AT_LINE does AC_LIBSOURCES([error.h, error.c]). ++ gl_PREREQ_ERROR ++]) ++ ++# Redefine AC_FUNC_ERROR_AT_LINE, because it is no longer maintained in ++# Autoconf. ++AC_DEFUN([AC_FUNC_ERROR_AT_LINE], ++[ ++ AC_LIBSOURCES([error.h, error.c])dnl ++ AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line], ++ [AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM( ++ [[#include <error.h>]], ++ [[error_at_line (0, 0, "", 0, "an error occurred");]])], ++ [ac_cv_lib_error_at_line=yes], ++ [ac_cv_lib_error_at_line=no])]) ++ if test $ac_cv_lib_error_at_line = no; then ++ AC_LIBOBJ([error]) ++ fi ++]) ++ ++# Prerequisites of lib/error.c. ++AC_DEFUN([gl_PREREQ_ERROR], ++[ ++ AC_REQUIRE([AC_FUNC_STRERROR_R]) ++ AC_REQUIRE([AC_C_INLINE]) ++ : ++]) diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/files/patch-src-udp-serv.c /usr/home/fumifumi/gnutls-devel/files/patch-src-udp-serv.c --- /usr/ports/security/gnutls-devel/files/patch-src-udp-serv.c 1970-01-01 09:00:00.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/files/patch-src-udp-serv.c 2011-04-09 21:26:28.000000000 +0900 @@ -0,0 +1,8 @@ +--- src/udp-serv.c.orig 2011-03-20 22:16:38.000000000 +0900 ++++ src/udp-serv.c 2011-04-09 20:16:23.000000000 +0900 +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <netinet/in.h> + #include <sys/socket.h> + #include <arpa/inet.h> + #include <stdlib.h> diff -ruN --exclude=CVS /usr/ports/security/gnutls-devel/pkg-plist /usr/home/fumifumi/gnutls-devel/pkg-plist --- /usr/ports/security/gnutls-devel/pkg-plist 2011-02-01 03:55:59.000000000 +0900 +++ /usr/home/fumifumi/gnutls-devel/pkg-plist 2011-04-10 00:52:12.000000000 +0900 @@ -6,6 +6,18 @@ bin/p11tool bin/psktool bin/srptool +include/gnutls/abstract.h +include/gnutls/compat.h +include/gnutls/crypto.h +include/gnutls/dtls.h +include/gnutls/extra.h +include/gnutls/gnutls.h +include/gnutls/openpgp.h +include/gnutls/openssl.h +include/gnutls/pkcs11.h +include/gnutls/pkcs12.h +include/gnutls/x509.h +%%CXX%%include/gnutls/gnutlsxx.h info/gnutls-certificate-user-use-case.png info/gnutls-client-server-use-case.png info/gnutls-extensions_st.png @@ -19,42 +31,31 @@ info/gnutls-pgp.png info/gnutls-x509.png info/pkcs11-vision.png -include/gnutls/abstract.h -include/gnutls/compat.h -include/gnutls/crypto.h -include/gnutls/extra.h -include/gnutls/gnutls.h -include/gnutls/openpgp.h -include/gnutls/openssl.h -include/gnutls/pkcs11.h -include/gnutls/pkcs12.h -include/gnutls/x509.h -%%CXX%%include/gnutls/gnutlsxx.h -%%CXX%%lib/libgnutlsxx.so.27 -%%CXX%%lib/libgnutlsxx.so -%%CXX%%lib/libgnutlsxx.la -%%CXX%%lib/libgnutlsxx.a lib/libgnutls-extra.a lib/libgnutls-extra.la lib/libgnutls-extra.so -lib/libgnutls-extra.so.44 +lib/libgnutls-extra.so.27 lib/libgnutls-openssl.a lib/libgnutls-openssl.la lib/libgnutls-openssl.so -lib/libgnutls-openssl.so.44 +lib/libgnutls-openssl.so.27 lib/libgnutls.a lib/libgnutls.la lib/libgnutls.so -lib/libgnutls.so.44 -libdata/pkgconfig/gnutls-extra.pc +lib/libgnutls.so.27 +%%CXX%%lib/libgnutlsxx.a +%%CXX%%lib/libgnutlsxx.la +%%CXX%%lib/libgnutlsxx.so +%%CXX%%lib/libgnutlsxx.so.28 libdata/pkgconfig/gnutls.pc +libdata/pkgconfig/gnutls-extra.pc %%EXAMPLESDIR%%/ex-alert.c %%EXAMPLESDIR%%/ex-cert-select-pkcs11.c %%EXAMPLESDIR%%/ex-cert-select.c %%EXAMPLESDIR%%/ex-client-psk.c %%EXAMPLESDIR%%/ex-client-resume.c %%EXAMPLESDIR%%/ex-client-srp.c -%%EXAMPLESDIR%%/ex-client-tlsia.c +%%EXAMPLESDIR%%/ex-client-udp.c %%EXAMPLESDIR%%/ex-client1.c %%EXAMPLESDIR%%/ex-client2.c %%EXAMPLESDIR%%/ex-crq.c @@ -69,17 +70,18 @@ %%EXAMPLESDIR%%/ex-verify.c %%EXAMPLESDIR%%/ex-x509-info.c %%EXAMPLESDIR%%/tcp.c -%%NLS%%share/locale/cs/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/de/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/en@boldquot/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/en@quot/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/fr/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/it/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/ms/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/nl/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/pl/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/sv/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/vi/LC_MESSAGES/libgnutls.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/libgnutls.mo +%%EXAMPLESDIR%%/udp.c +%%NLS%%share/locale/cs/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/de/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/fr/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/it/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/ms/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/nl/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/pl/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/sv/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/vi/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/en@boldquot/LC_MESSAGES/gnutls.mo +%%NLS%%share/locale/en@quot/LC_MESSAGES/gnutls.mo @dirrm %%EXAMPLESDIR%% @dirrm include/gnutls --- gnutls-devel-2.99.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110409165529.1F24C4AD12>