syslog-ng: fix dyld issue and update to 3.2.4

This includes a patch by @adamv to fix a silly environ/NSGetEnviron
issue, and an additional fix to get the linker to find glib and eventlog
symbols.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 36 insertions, 4 deletions

diff --git a/Library/Formula/syslog-ng.rb b/Library/Formula/syslog-ng.rb
index 7911b779d..a5b9cac27 100644
--- a/Library/Formula/syslog-ng.rb
+++ b/Library/Formula/syslog-ng.rb
@@ -1,19 +1,51 @@
 require 'formula'
 
 class SyslogNg < Formula
-  url 'http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.2.1/source/syslog-ng_3.2.1.tar.gz'
+  url 'http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.2.4/source/syslog-ng_3.2.4.tar.gz'
   homepage 'http://www.balabit.com/network-security/syslog-ng/'
-  md5 'c0160053e24a0408d08bbfd454b110df'
+  md5 '5995f7dad0053a478b60a63f6f754203'
 
   depends_on 'pkg-config' => :build
   depends_on 'pcre'
   depends_on 'eventlog'
   depends_on 'glib'
 
+  def patches; DATA; end
+
   def install
-    system "./configure", "--disable-debug", "--disable-dependency-tracking",
+    ENV.append 'LDFLAGS', '-levtlog -lglib-2.0' # help the linker find symbols
+    system "./configure", "--disable-debug",
+                          "--disable-dependency-tracking",
                           "--enable-dynamic-linking",
-                          "--prefix=#{prefix}"
+                          "--prefix=#{prefix}",
+                          "--sysconfdir=#{etc}",
+                          "--localstatedir=#{var}"
     system "make install"
   end
 end
+
+__END__
+Fix for environ on OS X, by @adamv
+
+diff --git a/lib/gprocess.c b/lib/gprocess.c
+index 38bcb12..ed68a7f 100644
+--- a/lib/gprocess.c
++++ b/lib/gprocess.c
+@@ -51,6 +51,9 @@
+ #  include <sys/prctl.h>
+ #endif
+ 
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++
+ /*
+  * NOTES:
+  * 
+@@ -440,7 +443,6 @@ g_process_set_caps(const gchar *caps)
+ void
+ g_process_set_argv_space(gint argc, gchar **argv)
+ {
+-  extern char **environ;
+   gchar *lastargv = NULL;
+   gchar **envp    = environ;
+   gint i;