[Pkg-erlang-commits] r1284 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sun Oct 17 08:18:48 UTC 2010
Author: sgolovan
Date: 2010-10-17 08:18:47 +0000 (Sun, 17 Oct 2010)
New Revision: 1284
Added:
erlang/trunk/debian/patches/odbc.patch
erlang/trunk/debian/patches/ssl_old.patch
erlang/trunk/debian/patches/wx.patch
Modified:
erlang/trunk/debian/README.Debian
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/patches/series
Log:
[erlang]
* Fixed a few spelling errors in packages descriptions and Debian changelog
entries (closes: #592995, #597464).
* Applised patch by upstream which fixes wx application crash
(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).
Modified: erlang/trunk/debian/README.Debian
===================================================================
--- erlang/trunk/debian/README.Debian 2010-10-11 05:59:21 UTC (rev 1283)
+++ erlang/trunk/debian/README.Debian 2010-10-17 08:18:47 UTC (rev 1284)
@@ -75,7 +75,7 @@
----------------
Note, that if you want to get Erlang documentation, you'll have to
-install erlang-manpages (for manual pages) and/or erlang-doc-html
-(for docs in HTML).
+install erlang-manpages (for manual pages) and/or erlang-doc
+(for docs in HTML and PDF).
- -- Sergei Golovan <sgolovan at debian.org> Sun, 07 Feb 2010 11:09:54 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 12 Oct 2010 11:02:27 +0400
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2010-10-11 05:59:21 UTC (rev 1283)
+++ erlang/trunk/debian/changelog 2010-10-17 08:18:47 UTC (rev 1284)
@@ -1,9 +1,15 @@
-erlang (1:14.a-dfsg-3) UNRELEASED; urgency=low
+erlang (1:14.a-dfsg-3) unstable; urgency=low
* Fixed a few spelling errors in packages descriptions and Debian changelog
- entries (closes: #592995).
+ entries (closes: #592995, #597464).
+ * Applised patch by upstream which fixes wx application crash
+ (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).
- -- Sergei Golovan <sgolovan at debian.org> Sun, 15 Aug 2010 09:09:43 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 17 Oct 2010 12:15:42 +0400
erlang (1:14.a-dfsg-2) unstable; urgency=low
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2010-10-11 05:59:21 UTC (rev 1283)
+++ erlang/trunk/debian/control 2010-10-17 08:18:47 UTC (rev 1284)
@@ -667,7 +667,7 @@
* Dynamic code replacement at runtime.
.
The Erlang distribution also includes OTP (Open Telecom Platform) which
- provides a reach set of libraries and applications.
+ provides a rich set of libraries and applications.
.
This package is a dummy package which will install Erlang/OTP runtime,
applications, sources, code examples and the Erlang editing mode for Emacs.
Added: erlang/trunk/debian/patches/odbc.patch
===================================================================
--- erlang/trunk/debian/patches/odbc.patch (rev 0)
+++ erlang/trunk/debian/patches/odbc.patch 2010-10-17 08:18:47 UTC (rev 1284)
@@ -0,0 +1,18 @@
+Author: Sergei Golovan
+Description: Fixes connecting odbcserver back to Erlang VM in IPv6
+ 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
+
+--- 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 @@
+ }
+
+ /* ------------- Socket communication functions --------------------------*/
+-#define USE_IPV4
++/* #define USE_IPV4 */
+ #ifdef UNIX
+ #define SOCKET int
+ #endif
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2010-10-11 05:59:21 UTC (rev 1283)
+++ erlang/trunk/debian/patches/series 2010-10-17 08:18:47 UTC (rev 1284)
@@ -10,5 +10,8 @@
java.patch
hppa.patch
powerpc.patch
+wx.patch
+ssl_old.patch
+odbc.patch
#native.patch
#build-options.patch
Added: erlang/trunk/debian/patches/ssl_old.patch
===================================================================
--- erlang/trunk/debian/patches/ssl_old.patch (rev 0)
+++ erlang/trunk/debian/patches/ssl_old.patch 2010-10-17 08:18:47 UTC (rev 1284)
@@ -0,0 +1,26 @@
+Author: Sergei Golovan
+Description: Makes the old SSL implementation, which is more reliable
+ then the new one, the default one
+Forwarded: not-needed
+Last-updated: Sun, 17 Oct 2010 10:21:08 +0400
+
+--- erlang-14.a-dfsg.orig/lib/ssl/src/ssl.erl
++++ erlang-14.a-dfsg/lib/ssl/src/ssl.erl
+@@ -105,7 +105,7 @@
+ connect(Address, Port, Options, infinity).
+
+ connect(Address, Port, Options0, Timeout) ->
+- case proplists:get_value(ssl_imp, Options0, new) of
++ case proplists:get_value(ssl_imp, Options0, old) of
+ new ->
+ new_connect(Address, Port, Options0, Timeout);
+ old ->
+@@ -128,7 +128,7 @@
+ listen(_Port, []) ->
+ {error, enooptions};
+ listen(Port, Options0) ->
+- case proplists:get_value(ssl_imp, Options0, new) of
++ case proplists:get_value(ssl_imp, Options0, old) of
+ new ->
+ new_listen(Port, Options0);
+ old ->
Added: erlang/trunk/debian/patches/wx.patch
===================================================================
--- erlang/trunk/debian/patches/wx.patch (rev 0)
+++ erlang/trunk/debian/patches/wx.patch 2010-10-17 08:18:47 UTC (rev 1284)
@@ -0,0 +1,26 @@
+Author: Upstream
+Description: Fixes crash in wx callback
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592821
+Forwarded: not-needed
+Last-updated: Tue, 12 Oct 2010 11:12:10 +0400
+
+--- erlang-14.a-dfsg.orig/lib/wx/c_src/wxe_impl.cpp
++++ erlang-14.a-dfsg/lib/wx/c_src/wxe_impl.cpp
+@@ -411,7 +411,7 @@
+ if(event->caller == process || // Callbacks from CB process only
+ event->op == WXE_CB_START || // Recursive event callback allow
+ // Allow connect_cb during CB i.e. msg from wxe_server.
+- event->caller == memenv->owner)
++ (memenv && event->caller == memenv->owner))
+ {
+ switch(event->op) {
+ case WXE_BATCH_END:
+@@ -669,7 +669,7 @@
+ send_msg("debug", &msg);
+ }
+
+- if(refd->pid != -1) {
++ if(((int) refd->pid) != -1) {
+ // Send terminate pid to owner
+ wxeReturn rt = wxeReturn(WXE_DRV_PORT,refd->memenv->owner, false);
+ rt.addAtom("_wxe_destroy_");
More information about the Pkg-erlang-commits
mailing list