From 8d6d5fe862d816fa88a361fc3c1625f5cb92fbb6 Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Wed, 12 Nov 2014 05:24:51 +0000
Subject: gnutls 3.3.10

Version bump. Removes an unnecessary dependency, adds an optional
dependency, removes the patch as that seems to be part of 3.3.10’s code
natively, and adds a simple test.

Closes #34118.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
---
 Library/Formula/gnutls.rb | 31 ++++++++-----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/gnutls.rb b/Library/Formula/gnutls.rb
index 25287e4e8..dc201e3fb 100644
--- a/Library/Formula/gnutls.rb
+++ b/Library/Formula/gnutls.rb
@@ -5,9 +5,9 @@ require "formula"
 # http://nmav.gnutls.org/2014/10/what-about-poodle.html
 class Gnutls < Formula
   homepage "http://gnutls.org"
-  url "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-3.3.9.tar.xz"
-  mirror "http://mirrors.dotsrc.org/gcrypt/gnutls/v3.3/gnutls-3.3.9.tar.xz"
-  sha256 "39166de5293a9d30ef1cd0a4d97f01fdeed7d7dbf8db95392e309256edcb13c1"
+  url "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/gnutls-3.3.10.tar.xz"
+  mirror "http://mirrors.dotsrc.org/gcrypt/gnutls/v3.3/gnutls-3.3.10.tar.xz"
+  sha256 "e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219"
 
   bottle do
     cellar :any
@@ -17,22 +17,18 @@ class Gnutls < Formula
   end
 
   depends_on "pkg-config" => :build
-  depends_on "xz"
   depends_on "libtasn1"
   depends_on "gmp"
   depends_on "nettle"
   depends_on "guile" => :optional
   depends_on "p11-kit" => :optional
+  depends_on "unbound" => :optional
 
   fails_with :llvm do
     build 2326
     cause "Undefined symbols when linking"
   end
 
-  # Fix libopts Makefile.in, corresponds to upstream commit
-  # https://gitorious.org/gnutls/gnutls/commit/db3f46aeca90f6dce42592dd723a15f988264852
-  patch :DATA
-
   def install
     args = %W[
       --disable-dependency-tracking
@@ -59,19 +55,8 @@ class Gnutls < Formula
   def post_install
     Formula["openssl"].post_install
   end
-end
 
-__END__
-diff --git a/src/libopts/Makefile.in b/src/libopts/Makefile.in
-index 3be797a..8e6d3eb 100644
---- a/src/libopts/Makefile.in
-+++ b/src/libopts/Makefile.in
-@@ -1546,7 +1546,7 @@ uninstall-am:
- 	tags tags-am uninstall uninstall-am
- 
- 
--+_NORETURN_H=$(srcdir)/compat/_Noreturn.h
-+_NORETURN_H=$(srcdir)/compat/_Noreturn.h
- @GL_GENERATE_STDNORETURN_H_TRUE@stdnoreturn.h: stdnoreturn.in.h $(top_builddir)/config.status $(_NORETURN_H)
- @GL_GENERATE_STDNORETURN_H_TRUE@	$(AM_V_GEN)rm -f $@-t $@ && \
- @GL_GENERATE_STDNORETURN_H_TRUE@	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+  test do
+    system "#{bin}/gnutls-cli", "--version"
+  end
+end
-- 
cgit v1.2.3