[Pkg-ocaml-maint-commits] r4667 - in /trunk/packages/syslog-ocaml: trunk/debian/changelog trunk/debian/patches/00list trunk/debian/patches/META.dpatch trunk/debian/patches/aux.dpatch upstream/syslog-ocaml_1.3.orig.tar.gz upstream/syslog-ocaml_1.4.orig.tar.gz
ecc-guest at users.alioth.debian.org
ecc-guest at users.alioth.debian.org
Thu Nov 1 21:20:09 UTC 2007
Author: ecc-guest
Date: Thu Nov 1 21:20:08 2007
New Revision: 4667
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=4667
Log:
new upstream release
Added:
trunk/packages/syslog-ocaml/upstream/syslog-ocaml_1.4.orig.tar.gz (with props)
Removed:
trunk/packages/syslog-ocaml/trunk/debian/patches/META.dpatch
trunk/packages/syslog-ocaml/upstream/syslog-ocaml_1.3.orig.tar.gz
Modified:
trunk/packages/syslog-ocaml/trunk/debian/changelog
trunk/packages/syslog-ocaml/trunk/debian/patches/00list
trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch
Modified: trunk/packages/syslog-ocaml/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/debian/changelog?rev=4667&op=diff
==============================================================================
--- trunk/packages/syslog-ocaml/trunk/debian/changelog (original)
+++ trunk/packages/syslog-ocaml/trunk/debian/changelog Thu Nov 1 21:20:08 2007
@@ -1,3 +1,9 @@
+syslog-ocaml (1.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Eric Cooper <ecc at cmu.edu> Thu, 01 Nov 2007 15:21:06 -0400
+
syslog-ocaml (1.3-7) unstable; urgency=low
* promote Homepage to a real debian/control field
Modified: trunk/packages/syslog-ocaml/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/debian/patches/00list?rev=4667&op=diff
==============================================================================
--- trunk/packages/syslog-ocaml/trunk/debian/patches/00list (original)
+++ trunk/packages/syslog-ocaml/trunk/debian/patches/00list Thu Nov 1 21:20:08 2007
@@ -1,3 +1,2 @@
Makefile.dpatch
-META.dpatch
aux.dpatch
Modified: trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch?rev=4667&op=diff
==============================================================================
--- trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch (original)
+++ trunk/packages/syslog-ocaml/trunk/debian/patches/aux.dpatch Thu Nov 1 21:20:08 2007
@@ -5,9 +5,9 @@
## DP: patch to add wrapper for send(2) with MSG_NOSIGNAL option
@DPATCH@
-diff -urNad syslog-ocaml-1.3~/Makefile syslog-ocaml-1.3/Makefile
---- syslog-ocaml-1.3~/Makefile 2007-06-12 10:55:52.000000000 -0400
-+++ syslog-ocaml-1.3/Makefile 2007-06-12 10:56:31.000000000 -0400
+diff -urNad syslog-ocaml-1.4~/Makefile syslog-ocaml-1.4/Makefile
+--- syslog-ocaml-1.4~/Makefile 2007-11-01 15:42:18.000000000 -0400
++++ syslog-ocaml-1.4/Makefile 2007-11-01 15:42:18.000000000 -0400
@@ -1,8 +1,9 @@
OCAMLMAKEFILE = /usr/share/ocamlmakefile/OCamlMakefile
DESTDIR = $(shell ocamlc -where | sed s:/usr/lib/:/usr/local/lib/:)
@@ -19,9 +19,9 @@
RESULT=syslog
PACKS=unix
-diff -urNad syslog-ocaml-1.3~/aux.ml syslog-ocaml-1.3/aux.ml
---- syslog-ocaml-1.3~/aux.ml 1969-12-31 19:00:00.000000000 -0500
-+++ syslog-ocaml-1.3/aux.ml 2007-06-12 10:55:52.000000000 -0400
+diff -urNad syslog-ocaml-1.4~/aux.ml syslog-ocaml-1.4/aux.ml
+--- syslog-ocaml-1.4~/aux.ml 1969-12-31 19:00:00.000000000 -0500
++++ syslog-ocaml-1.4/aux.ml 2007-11-01 15:42:18.000000000 -0400
@@ -0,0 +1,14 @@
+type msg_flag =
+ MSG_OOB
@@ -37,9 +37,9 @@
+ if ofs < 0 || len < 0 || ofs > String.length buf - len
+ then invalid_arg "Unix.send"
+ else unsafe_send fd buf ofs len flags
-diff -urNad syslog-ocaml-1.3~/aux_stubs.c syslog-ocaml-1.3/aux_stubs.c
---- syslog-ocaml-1.3~/aux_stubs.c 1969-12-31 19:00:00.000000000 -0500
-+++ syslog-ocaml-1.3/aux_stubs.c 2007-06-12 10:56:49.000000000 -0400
+diff -urNad syslog-ocaml-1.4~/aux_stubs.c syslog-ocaml-1.4/aux_stubs.c
+--- syslog-ocaml-1.4~/aux_stubs.c 1969-12-31 19:00:00.000000000 -0500
++++ syslog-ocaml-1.4/aux_stubs.c 2007-11-01 15:42:18.000000000 -0400
@@ -0,0 +1,31 @@
+#include <string.h>
+#include <sys/socket.h>
@@ -72,15 +72,23 @@
+ if (ret == -1) uerror("send", (value) 0);
+ return Val_int(ret);
+}
-diff -urNad syslog-ocaml-1.3~/syslog.ml syslog-ocaml-1.3/syslog.ml
---- syslog-ocaml-1.3~/syslog.ml 2007-06-12 10:52:49.000000000 -0400
-+++ syslog-ocaml-1.3/syslog.ml 2007-06-12 10:55:52.000000000 -0400
-@@ -209,7 +209,7 @@
- String.blit "<truncated>" 0 !realmsg 1012 11
- end;
- begin try
-- ignore (Unix.write loginfo.fd !realmsg 0 (String.length !realmsg))
-+ ignore (Aux.send loginfo.fd !realmsg 0 (String.length !realmsg) [Aux.MSG_NOSIGNAL])
- with
- | Unix.Unix_error(_,_,_) -> (* on error, attempt to reconnect *)
- (try close loginfo.fd
+diff -urNad syslog-ocaml-1.4~/syslog.ml syslog-ocaml-1.4/syslog.ml
+--- syslog-ocaml-1.4~/syslog.ml 2007-11-01 15:42:17.000000000 -0400
++++ syslog-ocaml-1.4/syslog.ml 2007-11-01 15:51:55.000000000 -0400
+@@ -191,14 +191,11 @@
+ (try open_connection loginfo with _ -> ());
+ if List.mem `LOG_CONS loginfo.flags then log_console str
+ in
+- let prev = Sys.signal Sys.sigpipe (Sys.Signal_handle fallback) in
+ try
+- ignore (write loginfo.fd str 0 (String.length str));
+- Sys.set_signal Sys.sigpipe prev
++ ignore (Aux.send loginfo.fd str 0 (String.length str) [Aux.MSG_NOSIGNAL])
+ with Unix_error (_, _, _) ->
+ (* on error, attempt to reconnect *)
+- fallback ();
+- Sys.set_signal Sys.sigpipe prev
++ fallback ()
+
+ let syslog ?fac loginfo lev str =
+ let msg = Buffer.create 64 in
Added: trunk/packages/syslog-ocaml/upstream/syslog-ocaml_1.4.orig.tar.gz
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/syslog-ocaml/upstream/syslog-ocaml_1.4.orig.tar.gz?rev=4667&op=file
==============================================================================
Binary file - no diff available.
Propchange: trunk/packages/syslog-ocaml/upstream/syslog-ocaml_1.4.orig.tar.gz
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list