--- Begin Message ---
Package: release.debian.org
Severity: normal
Hi release team!
I'd like to upload erlang 14.a-dfsg-3 which fixes two crashes and
a few typos in the package changelog and descriptions.
Attached is the changes between 14.a-dfsg-2 and 14.a-dfsg-3.
The following bugs are fixed:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592821
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598525
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597464
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592995
If it's possible, I'd like to see these changes in squeeze.
-- System Information:
Debian Release: 5.0.6
APT prefers stable
APT policy: (990, 'stable'), (500, 'unstable')
Architecture: i386 (x86_64)
Kernel: Linux 2.6.32-3-amd64 (SMP w/8 CPU cores)
Locale: LANG=ru_RU.CP1251, LC_CTYPE=ru_RU.CP1251 (charmap=CP1251)
Shell: /bin/sh linked to /bin/bash
diff -u erlang-14.a-dfsg/debian/changelog erlang-14.a-dfsg/debian/changelog
--- erlang-14.a-dfsg/debian/changelog
+++ erlang-14.a-dfsg/debian/changelog
@@ -1,7 +1,22 @@
+erlang (1:14.a-dfsg-3) unstable; urgency=low
+
+ * 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 and prefer IPv4 in odbc.erl to make odbc
+ application working in IPv6-only environment (closes: #598525).
+ * Overridden lintian error mesage about embedded pcre3 library because it
+ is patched and cannot be replaced by a system one.
+
+ -- Sergei Golovan <sgolo...@debian.org> Sun, 14 Nov 2010 12:25:50 +0300
+
erlang (1:14.a-dfsg-2) unstable; urgency=low
* Don't bytecompile erlang-flymake.el for Emacs flavors emacs21 and for
- all versions of Xemacs because they don't contain flymake
+ all versions of XEmacs because they don't contain flymake
(closes: #588474).
* Bumped standards version to 3.9.1.
@@ -78,7 +93,7 @@
* Removed RPATH from ssl and crypto application binaries as required by
Debian policy.
* Added libwxgtk2.4-dev and libwxgtk2.6-dev to build conflicts.
- * Added a few dpendencies for erlang-dialyzer, erlang-et, erlang-observer
+ * Added a few dependencies for erlang-dialyzer, erlang-et, erlang-observer
and erlang-examples packages which now call functions from more modules
than in 1:13.b.3.
@@ -108,12 +123,12 @@
* Added erlang-erl-docgen package to erlang-nox dependencies.
* Made dummy packages erlang-nox and erlang-x11 architecture all.
* Cleaned up working with custom substitution variables in debian/rules.
- * Reorganized debian/rules to ensure that manpages arent built twice, and
+ * Reorganized debian/rules to ensure that manpages aren't built twice, and
aren't built at all if only architecture-dependent packages are requested.
* Fixed project links in README.Debian.
* Added a new package erlang-jinterface which provides tools for
communication of Java programs with Erlang processes. This adds build
- depandency on default-jdk and as a result enables Java module for IDL
+ dependency on default-jdk and as a result enables Java module for IDL
compiler.
* Bumped standards version to 3.8.4.
@@ -200,7 +215,7 @@
DEB_BUILD_OPTIONS. By default slim runtime without debug info is built.
To remove slim option set DEB_BUILD_OPTION to 'nostrip', to add debug_info
compiler option set DEB_BUILD_OPTION to 'debug'. Or it may be set to
- 'nostrip,debug' to return to the previous level ob debug information
+ 'nostrip,debug' to return to the previous level of debug information
(closes: #532757).
* Added a few words about building Erlang packages with debug info included
to README.Debian.
@@ -275,7 +290,7 @@
for individual Erlang/OTP applications. erlang-nox and erlang-x11 are still
exist and depend on the correspondent packages.
* Overridden lintian error 'embedded-zlib' because zlib included into Erlang
- VM is patched, so using system-wide zlib will lead to unknown concequences.
+ VM is patched, so using system-wide zlib will lead to unknown consequences.
* Bumped standards version to 3.8.1.
-- Sergei Golovan <sgolo...@debian.org> Fri, 10 Apr 2009 16:32:04 +0400
@@ -330,7 +345,7 @@
erlang (1:12.b.3-dfsg-3) unstable; urgency=low
- * Fixed patches to reenable building erlang regexp driver for common_test
+ * Fixed patches to re-enable building erlang regexp driver for common_test
application on hurd-i386 architecture.
* Refreshed patches and made their description more clear.
* Made dependencies of architecture-independent packages erlang,
@@ -436,7 +451,7 @@
* Copied Erlang Emacs mode files to /usr/share/emacs/site-lisp/erlang
instead of linking which allows to loosen erlang-mode dependencies. Now it
- becomes more reliable and doesn't break in unstable until buildd compliles
+ becomes more reliable and doesn't break in unstable until buildd compiles
erlang on the corresponding architecture.
* Moved link /usr/lib/erlang/man -> /usr/share/man from erlang-base to
erlang-mode package since it is used only to allow showing manpages by
@@ -527,9 +542,9 @@
erlang (1:11.b.5dfsg-7) unstable; urgency=low
* Applied patch by Mikael Magnusson which fixes building of SCTP support
- with libsctp-dev 1.0.7, and enabled SCTP for linux architectures
+ with libsctp-dev 1.0.7, and enabled SCTP for Linux architectures
(closes: #436258).
- * Unconditionally required using clock_gettime for time correction on linux
+ * Unconditionally required using clock_gettime for time correction on Linux
architectures. As a result, the package will not build and work on 2.4
kernels.
@@ -560,7 +575,7 @@
* Overridden lintian warning desktop-command-not-in-package since
/usr/bin/erl is included into a package on which erlang-nox depends.
* Fixed cleanup patch.
- * Added patch which defines MAXHOSTNAMELEN. It is harmless on all linux
+ * Added patch which defines MAXHOSTNAMELEN. It is harmless on all Linux
architectures, but fixes orber building on hurd-i386.
* Redefined HOME environment variable to fix Erlang compiler warnings in
case when HOME points to an existent inaccessible directory.
@@ -739,7 +754,7 @@
erlang (1:11.b.1.dfsg-1) unstable; urgency=medium
[ Sergei Golovan ]
- * Removed nonfree documentation from the upstream source and added
+ * Removed non-free documentation from the upstream source and added
dfsg suffix to version number (closes: #393367).
* Removed conflicts with erlang-doc-html from all packages except
erlang-base and erlang-base-hipe.
@@ -799,7 +814,7 @@
* Use -O1 optimization flag for m68k (workaround for bug in GCC, but there
are still bugs in glibc, so it's unlikely to build erlang on m68k).
* Corrected erlang-dev short description.
- * Corrected erlang-src.patterns (moved nonsource gs application files to
+ * Corrected erlang-src.patterns (moved non-source gs application files to
erlang-x11).
* Added prerm and postinstall scripts which stop and start erlang-dependent
services (otherwise certain services, e.g. ejabberd become irresponsible
@@ -920,14 +935,14 @@
* Closes: #358179: Removed the copy of the LGPL in the copyright file.
I've put the required shorter text.
* Disabled HiPE build for mips, arm, mipsel, s390 and sparc, in hope
- that it fixe FTBS on those platforms.
+ that it fixes FTBFS on those platforms.
* Closes: #358410. erlang-src and erlang-mode are now Architecture:
all.
- * erlang-nox and erlang-x11 are now built as arch-dependant targets
+ * erlang-nox and erlang-x11 are now built as arch-dependent targets
since, practically, they depend on one of erlang-runtime to be
built.
* Added a link from /usr/lib/erlang/usr/include to /usr/include/erlang
- to fix potential FTBS of dependencies of Erlang.
+ to fix potential FTBFS of dependencies of Erlang.
* cant install erlang package (dependencie problem) (Closes: #366398)
-- Francois-Denis Gonthier <neum...@lostwebsite.net> Mon, 8 May 2006 21:06:21 -0400
@@ -981,7 +996,7 @@
* fully dpatch'ified.
* Emacs editing mode pulled from the main package and put into it's
own erlang-mode package.
- * As it was suggested a few times, I've splitted the main arch-
+ * As it was suggested a few times, I've split the main arch-
independent package in two. There is now an erlang-nox package
which include the base applications that don't require tk8.4 to
work. The applications that depend on gs and thus on tk8.4 and now
@@ -1000,7 +1015,7 @@
don't fully understand the need for it. I take care of preserving
the pristine content of the bootstrap directory instead of using the
weird preservebeam script. I suspect that might be causing some
- problems on some plateforms althought I don't really know why.
+ problems on some platforms although I don't really know why.
-- Francois-Denis Gonthier <neum...@lostwebsite.net> Wed, 28 Sep 2005 00:02:28 -0400
@@ -1051,7 +1066,7 @@
erlang (1:10.b.1a-2.2) unstable; urgency=high
* Non-maintainer upload.
- * High-urgency upload for sarge-targetted RC bugfix
+ * High-urgency upload for sarge-targeted RC bugfix
* Build with --disable-hipe on everything but amd64 (not just on i386),
for compatibility with 2.4 kernels in sarge; thanks to Lars
Wirzenius for tracking this down. Closes: #276800.
@@ -1282,7 +1297,7 @@
erlang (1:9.0-6) unstable; urgency=low
* Erlang won't build on other architectures because of my monkeying
- around with 'ecc'. Too many scripts depende on it being named
+ around with 'ecc'. Too many scripts depend on it being named
'ecc' and located in /usr/bin/ecc. And I'm not sure how many
external Erlang programs make this assumption. Going back to
conflicting with Elastic.
@@ -1322,7 +1337,7 @@
erlang (1:9.0-2) unstable; urgency=low
- * Correct a link to empd in the runtime.
+ * Correct a link to epmd in the runtime.
* Provide a menu entry.
* Add a conflict with the 'elastic' compiler, which also defines
a /usr/bin/ecc. (Closes:Bug#168407)
@@ -1441,8 +1456,8 @@
erlang (47.4.1-1) unstable; urgency=low
* the .erl files now have their own package, giving a total of 5 packages.
- * moved the .jam files and docs into their arch independant packages.
- * New upsteam release.
+ * moved the .jam files and docs into their arch independent packages.
+ * New upstream release.
-- Mark Ng <n...@debian.org> Sat, 8 May 1999 16:45:00 +1100
diff -u erlang-14.a-dfsg/debian/README.Debian erlang-14.a-dfsg/debian/README.Debian
--- erlang-14.a-dfsg/debian/README.Debian
+++ erlang-14.a-dfsg/debian/README.Debian
@@ -78,4 +78,4 @@
-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 <sgolo...@debian.org> Sun, 07 Feb 2010 11:09:54 +0300
+ -- Sergei Golovan <sgolo...@debian.org> Tue, 12 Oct 2010 11:02:27 +0400
diff -u erlang-14.a-dfsg/debian/control erlang-14.a-dfsg/debian/control
--- erlang-14.a-dfsg/debian/control
+++ erlang-14.a-dfsg/debian/control
@@ -130,7 +130,7 @@
Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
Suggests: erlang, erlang-manpages, erlang-doc
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
-Description: Erlang/OTP cryprographic modules
+Description: Erlang/OTP cryptographic modules
The Crypto Application provides functions for computation of message
digests, encryption and decryption functions. It uses OpenSSL for
actual calculations.
@@ -212,7 +212,7 @@
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP event tracer application
The Event Tracer (ET) uses the built-in trace mechanism in Erlang
- and provides tools for collecting and examinig trace data using GUI.
+ and provides tools for collecting and examining trace data using GUI.
Package: erlang-eunit
@@ -313,7 +313,7 @@
Suggests: erlang, erlang-manpages, erlang-doc
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP distributed relational/object hybrid database
- Mnesia is a distributed DataBase Management System (DBMS), appropriate
+ Mnesia is a distributed Database Management System (DBMS), appropriate
for telecommunications applications and other Erlang applications
which require continuous operation and exhibit soft real-time properties.
@@ -369,7 +369,7 @@
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP concurrency profiling tool
Percept is a tool which visualizes application level concurrency and
- helps to indentify concurrency bottlenecks.
+ helps to identify concurrency bottlenecks.
Package: erlang-pman
@@ -504,7 +504,7 @@
fprof - Another Erlang profiler; measures how time is used in Erlang
programs. Uses trace to file to minimize runtime performance
impact, and displays time for calling and called functions.
- instrument - Utility functions for obtaining and analysing resource
+ instrument - Utility functions for obtaining and analyzing resource
usage in an instrumented Erlang runtime system.
make - A make utility for Erlang similar to UNIX make.
tags - A tool for generating Emacs TAGS files from Erlang source
@@ -541,7 +541,7 @@
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2)
Description: Erlang/OTP helper for web-based tools
WebTool provides an easy way to use web-based tools with Erlang/OTP.
- It configures and starts a webserver as well as all available tools.
+ It configures and starts a web server as well as all available tools.
Package: erlang-wx
@@ -570,7 +570,7 @@
Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2)
Description: Erlang/OTP development libraries and headers
The files for application development in Erlang. They include headers for
- all applications included int Erlang/OTP distribution and C interface
+ all applications included into Erlang/OTP distribution and C interface
libraries.
@@ -662,12 +662,12 @@
.
Some of Erlang main features are:
* Clear declarative syntax and is largely free from side-effects;
- * Builtin support for real-time, concurrent and distributed programming;
- * Designed for development of robust and continously operated programs;
+ * Built-in support for real-time, concurrent and distributed programming;
+ * Designed for development of robust and continuously operated programs;
* 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.
diff -u erlang-14.a-dfsg/debian/patches/series erlang-14.a-dfsg/debian/patches/series
--- erlang-14.a-dfsg/debian/patches/series
+++ erlang-14.a-dfsg/debian/patches/series
@@ -11,4 +11,7 @@
hppa.patch
powerpc.patch
+wx.patch
+ssl_old.patch
+odbc.patch
#native.patch
#build-options.patch
diff -u erlang-14.a-dfsg/debian/lintian/erlang-base-hipe.lintian-overrides erlang-14.a-dfsg/debian/lintian/erlang-base-hipe.lintian-overrides
--- erlang-14.a-dfsg/debian/lintian/erlang-base-hipe.lintian-overrides
+++ erlang-14.a-dfsg/debian/lintian/erlang-base-hipe.lintian-overrides
@@ -1,3 +1,4 @@
-# Zlib which is embedded into Erlang VM is patched, so I'm not sure
-# if it's possible to link it to an external zlib.
+# Zlib and PCRE3 which are embedded into Erlang VM are patched, so
+# it's not possible to link them to an external zlib or pcre3.
erlang-base-hipe: embedded-zlib
+erlang-base-hipe: embedded-library
diff -u erlang-14.a-dfsg/debian/lintian/erlang-base.lintian-overrides erlang-14.a-dfsg/debian/lintian/erlang-base.lintian-overrides
--- erlang-14.a-dfsg/debian/lintian/erlang-base.lintian-overrides
+++ erlang-14.a-dfsg/debian/lintian/erlang-base.lintian-overrides
@@ -1,3 +1,4 @@
-# Zlib which is embedded into Erlang VM is patched, so I'm not sure
-# if it's possible to link it to an external zlib.
+# Zlib and PCRE3 which are embedded into Erlang VM are patched, so
+# it's not possible to link them to an external zlib or pcre3.
erlang-base: embedded-zlib
+erlang-base: embedded-library
only in patch2:
unchanged:
--- erlang-14.a-dfsg.orig/debian/patches/odbc.patch
+++ erlang-14.a-dfsg/debian/patches/odbc.patch
@@ -0,0 +1,134 @@
+Author: Upstream
+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: not-needed
+Last-updated: Sun, 14 Nov 2010 12:20:41 +0300
+
+--- erlang-14.a-dfsg.orig/lib/odbc/src/odbc.erl
++++ erlang-14.a-dfsg/lib/odbc/src/odbc.erl
+@@ -441,10 +441,12 @@ init(Args) ->
+
+ {ok, ListenSocketSup} =
+ gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE},
+- {active, false}, {nodelay, true}]),
++ {active, false}, {nodelay, true},
++ {ip, loopback}]),
+ {ok, ListenSocketOdbc} =
+ gen_tcp:listen(0, [Inet, binary, {packet, ?LENGTH_INDICATOR_SIZE},
+- {active, false}, {nodelay, true}]),
++ {active, false}, {nodelay, true},
++ {ip, loopback}]),
+
+ %% Start the port program (a c program) that utilizes the odbc driver
+ case os:find_executable(?SERVERPROG, ?SERVERDIR) of
+--- erlang-14.a-dfsg.orig/lib/odbc/c_src/odbcserver.c
++++ erlang-14.a-dfsg/lib/odbc/c_src/odbcserver.c
+@@ -1727,74 +1727,48 @@ static byte * receive_erlang_port_msg(void)
+ }
+
+ /* ------------- Socket communication functions --------------------------*/
+-#define USE_IPV4
+-#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
+- capabilities */
++#if defined(WIN32)
+ static SOCKET connect_to_erlang(const char *port)
+-{
+- SOCKET sock;
+- struct sockaddr_in sin;
+-
+- sock = socket(AF_INET, SOCK_STREAM, 0);
+-
+- memset(&sin, 0, sizeof(sin));
+- sin.sin_port = htons ((unsigned short)atoi(port));
+- sin.sin_family = AF_INET;
+- sin.sin_addr.s_addr = inet_addr("127.0.0.1");
+-
+- if (connect(sock, (struct sockaddr*)&sin, sizeof(sin)) != 0) {
+- close_socket(sock);
+- DO_EXIT(EXIT_SOCKET_CONNECT);
+- }
+- return sock;
+-}
+ #elif defined(UNIX)
+ static int connect_to_erlang(const char *port)
++#endif
+ {
+- int sock;
+-
+- struct addrinfo hints;
+- struct addrinfo *erlang_ai, *first;
+-
+- memset(&hints, 0, sizeof(hints));
+- hints.ai_family = PF_UNSPEC; /* PF_INET or PF_INET6 */
+- hints.ai_socktype = SOCK_STREAM;
+- hints.ai_protocol = IPPROTO_TCP;
+-
+- if (getaddrinfo("localhost", port, &hints, &first) != 0) {
+- DO_EXIT(EXIT_FAILURE);
+- }
++#if defined(WIN32)
++ SOCKET sock;
++#elif defined(UNIX)
++ int sock;
++#endif
++ struct sockaddr_in sin;
++
++#if defined(AF_INET6)
++ struct sockaddr_in6 sin6;
++
++ sock = socket(AF_INET6, SOCK_STREAM, 0);
++
++ memset(&sin6, 0, sizeof(sin6));
++ sin6.sin6_port = htons ((unsigned short)atoi(port));
++ sin6.sin6_family = AF_INET6;
++ sin6.sin6_addr = in6addr_loopback;
+
+- for (erlang_ai = first; erlang_ai; erlang_ai = erlang_ai->ai_next) {
++ if (connect(sock, (struct sockaddr*)&sin6, sizeof(sin6)) == 0) {
++ return sock;
++ }
++ close_socket(sock);
++#endif
++ sock = socket(AF_INET, SOCK_STREAM, 0);
++
++ memset(&sin, 0, sizeof(sin));
++ sin.sin_port = htons ((unsigned short)atoi(port));
++ sin.sin_family = AF_INET;
++ sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+
+- sock = socket(erlang_ai->ai_family, erlang_ai->ai_socktype,
+- erlang_ai->ai_protocol);
+- if (sock < 0)
+- continue;
+- if (connect(sock, (struct sockaddr*)erlang_ai->ai_addr,
+- erlang_ai->ai_addrlen) < 0) {
+- close(sock);
+- sock = -1;
+- continue;
+- } else {
+- break;
++ if (connect(sock, (struct sockaddr*)&sin, sizeof(sin)) != 0) {
++ close_socket(sock);
++ DO_EXIT(EXIT_SOCKET_CONNECT);
+ }
+- }
+- freeaddrinfo(first);
+-
+- if (sock < 0){
+- close_socket(sock);
+- DO_EXIT(EXIT_SOCKET_CONNECT);
+- }
+-
+- return sock;
++ return sock;
+ }
+-#endif
+
+ #ifdef WIN32
+ static void close_socket(SOCKET socket)
only in patch2:
unchanged:
--- erlang-14.a-dfsg.orig/debian/patches/ssl_old.patch
+++ erlang-14.a-dfsg/debian/patches/ssl_old.patch
@@ -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 ->
only in patch2:
unchanged:
--- erlang-14.a-dfsg.orig/debian/patches/wx.patch
+++ erlang-14.a-dfsg/debian/patches/wx.patch
@@ -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_");
--- End Message ---
