proxytunnel: patch out bad strlcpy/strlcat declarations

This project seems dead but the current fix is not ideal.

1 files changed, 31 insertions, 6 deletions

diff --git a/Library/Formula/proxytunnel.rb b/Library/Formula/proxytunnel.rb
index 7be477775..3309bb2f6 100644
--- a/Library/Formula/proxytunnel.rb
+++ b/Library/Formula/proxytunnel.rb
@@ -5,15 +5,40 @@ class Proxytunnel < Formula
   url 'http://downloads.sourceforge.net/proxytunnel/proxytunnel-1.9.0.tgz'
   sha1 '51d816125bb9e9bca267d35f861000eb0fa9d80b'
 
-  def install
-    if MacOS.version >= :mavericks
-      # http://trac.macports.org/browser/trunk/dports/net/proxytunnel/Portfile
-      inreplace ["proxytunnel.h", "setproctitle.c", "strlcat.c", "strzcat.c"], "strlcat", "strlcat_disable"
-      inreplace ["proxytunnel.h", "setproctitle.c", "strlcpy.c"], "strlcpy", "strlcpy_disable"
-    end
+  # Remove conflicting strlcpy/strlcat declarations
+  def patches; DATA; end
 
+  def install
     system "make"
     bin.install "proxytunnel"
     man1.install "proxytunnel.1"
   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);