[Pkg-erlang-commits] r1285 - in erlang/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-10-17 19:34:17 +0000 (Sun, 17 Oct 2010)
New Revision: 1285

Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/odbc.patch
Log:
[erlang]
  * Refined patch to odbc.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2010-10-17 08:18:47 UTC (rev 1284)
+++ erlang/trunk/debian/changelog	2010-10-17 19:34:17 UTC (rev 1285)
@@ -1,4 +1,4 @@
-erlang (1:14.a-dfsg-3) unstable; urgency=low
+erlang (1:14.a-dfsg-3~lenny1) unstable; urgency=low
 
   * Fixed a few spelling errors in packages descriptions and Debian changelog
     entries (closes: #592995, #597464).
@@ -6,10 +6,10 @@
     (closes: #592821).
   * Switched to the old OpenSSL-based SSL implementation by default (it is
     still less buggy then the new one written in Erlang).
-  * Enabled IPv6 for odbcserver to make odbc application work in IPv6
-    environment (closes: #598525).
+  * Enabled IPv6 for odbcserver and prefer IPv4 in odbc.erl to make odbc
+    application working in IPv6-only environment (closes: #598525).
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 17 Oct 2010 12:15:42 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 17 Oct 2010 18:22:54 +0400
 
 erlang (1:14.a-dfsg-2) unstable; urgency=low
 

Modified: erlang/trunk/debian/patches/odbc.patch
===================================================================
--- erlang/trunk/debian/patches/odbc.patch	2010-10-17 08:18:47 UTC (rev 1284)
+++ erlang/trunk/debian/patches/odbc.patch	2010-10-17 19:34:17 UTC (rev 1285)
@@ -1,18 +1,38 @@
 Author: Sergei Golovan
-Description: Fixes connecting odbcserver back to Erlang VM in IPv6
+Description: Fixes connecting odbcserver back to Erlang VM in IPv6-only
  environment
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598525
 Forwarded: yes
-Last-updated: Sun, 17 Oct 2010 12:10:45 +0400
+Last-updated: Sun, 17 Oct 2010 18:22:41 +0400
 
 --- erlang-14.a-dfsg.orig/lib/odbc/c_src/odbcserver.c
 +++ erlang-14.a-dfsg/lib/odbc/c_src/odbcserver.c
-@@ -1727,7 +1727,7 @@
+@@ -1727,10 +1727,6 @@
  }
   
  /* ------------- Socket communication functions --------------------------*/
 -#define USE_IPV4
-+/* #define USE_IPV4 */
- #ifdef UNIX
- #define SOCKET int   
- #endif
+-#ifdef UNIX
+-#define SOCKET int   
+-#endif
+ 
+ #if defined WIN32 || defined USE_IPV4
+ /* Currently only an old windows compiler is supported so we do not have ipv6
+--- erlang-14.a-dfsg.orig/lib/odbc/src/odbc.erl
++++ erlang-14.a-dfsg/lib/odbc/src/odbc.erl
+@@ -431,12 +431,12 @@
+     
+     erlang:monitor(process, ClientPid),
+     
+-    Inet = case gen_tcp:listen(0, [inet6]) of
++    Inet = case gen_tcp:listen(0, [inet]) of
+ 	       {ok, Dummyport} ->
+ 		   gen_tcp:close(Dummyport),
+-		   inet6;
++		   inet;
+ 	       _ ->
+-		   inet
++		   inet6
+ 	   end,
+ 
+     {ok, ListenSocketSup} =