[Pkg-ocaml-maint-commits] r1282 - in trunk/packages/syslog-ocaml/debian: . patches

[Eric Cooper]

Author: ecc-guest
Date: 2005-04-17 16:37:39 +0000 (Sun, 17 Apr 2005)
New Revision: 1282

Added:
   trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch
Modified:
   trunk/packages/syslog-ocaml/debian/changelog
   trunk/packages/syslog-ocaml/debian/patches/00list
Log:
support SOCK_STREAM log sockets for syslog-ng (closes #305019)


Modified: trunk/packages/syslog-ocaml/debian/changelog
===================================================================
--- trunk/packages/syslog-ocaml/debian/changelog	2005-04-17 15:12:04 UTC (rev 1281)
+++ trunk/packages/syslog-ocaml/debian/changelog	2005-04-17 16:37:39 UTC (rev 1282)
@@ -1,3 +1,9 @@
+syslog-ocaml (1.0-3) unstable; urgency=low
+
+  * Support SOCK_STREAM log sockets for syslog-ng (closes #305019)
+
+ -- Eric Cooper <ecc@cmu.edu>  Sun, 17 Apr 2005 12:31:25 -0400
+
 syslog-ocaml (1.0-2) unstable; urgency=low
 
   * Removed trunk/ directory layer.

Modified: trunk/packages/syslog-ocaml/debian/patches/00list
===================================================================
--- trunk/packages/syslog-ocaml/debian/patches/00list	2005-04-17 15:12:04 UTC (rev 1281)
+++ trunk/packages/syslog-ocaml/debian/patches/00list	2005-04-17 16:37:39 UTC (rev 1282)
@@ -1 +1,2 @@
 Makefile.dpatch
+syslog-ng.dpatch

Added: trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch
===================================================================
--- trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch	2005-04-17 15:12:04 UTC (rev 1281)
+++ trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch	2005-04-17 16:37:39 UTC (rev 1282)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## syslog-ng.dpatch by Eric Cooper <ecc@cmu.edu>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: support SOCK_STREAM log socket for syslog-ng
+
+@DPATCH@
+diff -u syslog-1.0/syslog.ml syslog-1.0-new/syslog.ml
+--- syslog-1.0/syslog.ml	2005-02-16 19:59:17.000000000 -0500
++++ syslog-1.0-new/syslog.ml	2005-04-17 12:19:54.441839339 -0400
+@@ -100,8 +100,13 @@
+ 	(match (Unix.stat logpath).Unix.st_kind with
+ 	     Unix.S_SOCK -> 
+ 	       let logaddr = Unix.ADDR_UNIX logpath in
+-		 loginfo.fd <- Unix.socket Unix.PF_UNIX SOCK_DGRAM 0;
+-		 Unix.connect loginfo.fd logaddr;
++	         (try
++		    loginfo.fd <- Unix.socket Unix.PF_UNIX SOCK_DGRAM 0;
++		    Unix.connect loginfo.fd logaddr
++		  with Unix.Unix_error (Unix.EPROTOTYPE, _, _) ->
++		    (* try again with a stream socket for syslog-ng *)
++		    loginfo.fd <- Unix.socket Unix.PF_UNIX SOCK_STREAM 0;
++		    Unix.connect loginfo.fd logaddr);
+ 		 loginfo.connected <- true;
+ 	   | Unix.S_FIFO -> 	
+ 	       loginfo.fd <- Unix.openfile logpath [Unix.O_WRONLY] 0o666;


Property changes on: trunk/packages/syslog-ocaml/debian/patches/syslog-ng.dpatch
___________________________________________________________________
Name: svn:executable
   + *