proxytunnel 1.9.1

use GitHub for homepage and stable url
depend on asciidoc and xmlto at build time
use "make install"

Closes #27832.

Signed-off-by: ilovezfs <ilovezfs@icloud.com>

Formula/proxytunnel.rb

@@ -1,9 +1,8 @@
 class Proxytunnel < Formula
   desc "Create TCP tunnels through HTTPS proxies"
-  homepage "https://proxytunnel.sourceforge.io/"
-  url "https://downloads.sourceforge.net/proxytunnel/proxytunnel-1.9.0.tgz"
-  sha256 "2ef5bbf8d81ddf291d71f865c5dab89affcc07c4cb4b3c3f23e1e9462721a6b9"
-  revision 1
+  homepage "https://github.com/proxytunnel/proxytunnel"
+  url "https://github.com/proxytunnel/proxytunnel/archive/1.9.1.tar.gz"
+  sha256 "4a68d2c33bf53c290346b0a76e2c3d25556e954ba346be68cf65ae8f73ae8007"
 
   bottle do
     cellar :any
@@ -14,46 +13,32 @@ class Proxytunnel < Formula
     sha256 "7a0c91840116c8a6cdc492d671f0426dbd1adcf8b20e1d7259ea3c42a3eb1d6f" => :mavericks
   end
 
+  depends_on "asciidoc" => :build
+  depends_on "xmlto" => :build
   depends_on "openssl"
 
+  # Remove for > 1.9.1
   # Remove conflicting strlcpy/strlcat declarations
-  patch :DATA
+  # Upstream commit 8 Nov 2016 "Make building on OSX work out of the box"
+  patch do
+    url "https://github.com/proxytunnel/proxytunnel/commit/0cfce96.patch?full_index=1"
+    sha256 "9d1341860cebfed4851896f657bf8d204dc3efdc57f973f969ca1782b55e2fe3"
+  end
+
+  # Fix "install: illegal option -- D"
+  # Upstream PR from 14 May 2018 "Makefile: don't use non-portable -D option"
+  patch do
+    url "https://github.com/proxytunnel/proxytunnel/pull/27.patch?full_index=1"
+    sha256 "981737b32526b7ff9520236175ac36831d23d71195275f68f444c3832c5db8ab"
+  end
 
   def install
+    ENV["XML_CATALOG_FILES"] = etc/"xml/catalog"
     system "make"
-    bin.install "proxytunnel"
-    man1.install "proxytunnel.1"
+    system "make", "install", "prefix=#{prefix}"
   end
 
   test do
     system "#{bin}/proxytunnel", "--version"
   end
 end
-
-__END__
-diff --git a/Makefile b/Makefile
-index 9e9ac73..8244b55 100644
---- a/Makefile
-+++ b/Makefile
-@@ -56,8 +56,6 @@ PROGNAME = proxytunnel
- # Remove strlcpy/strlcat on (open)bsd/darwin systems
- OBJ = proxytunnel.o	\
- 	base64.o	\
--	strlcpy.o	\
--	strlcat.o	\
- 	strzcat.o	\
- 	setproctitle.o	\
- 	io.o		\
-diff --git a/proxytunnel.h b/proxytunnel.h
-index b948be0..e63c72a 100644
---- a/proxytunnel.h
-+++ b/proxytunnel.h
-@@ -32,8 +32,6 @@ void closeall();
- void do_daemon();
- void initsetproctitle(int argc, char *argv[]);
- void setproctitle(const char *fmt, ...);
--size_t strlcat(char *dst, const char *src, size_t siz);
--size_t strlcpy(char *dst, const char *src, size_t siz);
- size_t strzcat(char *dst, char *format, ...);
- int main( int argc, char *argv[] );
- char * readpassphrase(const char *, char *, size_t, int);