[Pkg-erlang-commits] r1345 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Mon Oct 24 18:10:51 UTC 2011
Author: sgolovan
Date: 2011-10-24 18:10:51 +0000 (Mon, 24 Oct 2011)
New Revision: 1345
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/patches/clean.patch
erlang/trunk/debian/patches/docs.patch
erlang/trunk/debian/patches/emacs.patch
erlang/trunk/debian/patches/gnu.patch
erlang/trunk/debian/patches/hppa.patch
erlang/trunk/debian/patches/java.patch
erlang/trunk/debian/patches/m68k.patch
erlang/trunk/debian/patches/man.patch
erlang/trunk/debian/patches/powerpc.patch
erlang/trunk/debian/patches/rpath.patch
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/patches/ssl.patch
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream release.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/changelog 2011-10-24 18:10:51 UTC (rev 1345)
@@ -1,8 +1,8 @@
-erlang (1:14.b.3-dfsg-3) UNRELEASED; urgency=low
+erlang (1:14.b.4-dfsg-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
- -- Sergei Golovan <sgolovan at debian.org> Thu, 09 Jun 2011 20:22:42 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 24 Oct 2011 22:10:28 +0400
erlang (1:14.b.3-dfsg-2) unstable; urgency=low
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/clean.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -3,9 +3,9 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang_14.b.3-dfsg.orig/Makefile.in
-+++ erlang_14.b.3-dfsg/Makefile.in
-@@ -1008,6 +1008,7 @@
+--- erlang-14.b.4-dfsg.orig/Makefile.in
++++ erlang-14.b.4-dfsg/Makefile.in
+@@ -1010,6 +1010,7 @@
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
cd lib && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
cd lib/dialyzer && ERL_TOP=$(ERL_TOP) $(MAKE) clean
@@ -13,7 +13,7 @@
#
# Just wipe out emulator, not libraries
-@@ -1043,3 +1044,170 @@
+@@ -1045,3 +1046,170 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/docs.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -3,27 +3,27 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- erlang_14.b.3-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang_14.b.3-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
-@@ -494,7 +494,7 @@
+--- erlang-14.b.4-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
++++ erlang-14.b.4-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
+@@ -505,7 +505,7 @@
<xsl:text>
.RS 2</xsl:text>
- <xsl:text>
.LP
.LP
</xsl:text>
+ <xsl:text>
.LP
</xsl:text>
<xsl:value-of select="$content"/>
- <xsl:text>
.RE</xsl:text>
+ <xsl:text>
.RE
</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-@@ -716,7 +716,7 @@
- <xsl:text>
.TP</xsl:text>
- <xsl:text>
Types</xsl:text>
+@@ -760,7 +760,7 @@
+ <xsl:text>
.TP 3</xsl:text>
+ <xsl:text>
Types:
</xsl:text>
<xsl:apply-templates/>
- <xsl:text>
.RE</xsl:text>
+ <xsl:text>
.RE
</xsl:text>
</xsl:if>
</xsl:template>
-@@ -737,7 +737,7 @@
+@@ -781,7 +781,7 @@
<xsl:template match="desc">
<xsl:text>
.RS</xsl:text>
<xsl:apply-templates/>
@@ -32,8 +32,8 @@
</xsl:template>
---- erlang_14.b.3-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang_14.b.3-dfsg/lib/megaco/doc/src/Makefile
+--- erlang-14.b.4-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang-14.b.4-dfsg/lib/megaco/doc/src/Makefile
@@ -247,8 +247,6 @@
$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
@@ -52,8 +52,8 @@
endif
endif
---- erlang_14.b.3-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang_14.b.3-dfsg/lib/stdlib/doc/src/re.xml
+--- erlang-14.b.4-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang-14.b.4-dfsg/lib/stdlib/doc/src/re.xml
@@ -345,7 +345,7 @@
metacharacter should not match before it. Setting this without
<c>multiline</c> (at compile time) causes circumflex never to
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/emacs.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -3,8 +3,8 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang_14.b.3-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang_14.b.3-dfsg/lib/tools/emacs/erlang.el
+--- erlang-14.b.4-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-14.b.4-dfsg/lib/tools/emacs/erlang.el
@@ -496,8 +496,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" t)
@@ -16,7 +16,7 @@
"*The man directories displayed in the Erlang menu.
Each item in the list should be a list with three elements, the first
-@@ -1180,23 +1180,22 @@
+@@ -1206,23 +1206,22 @@
(or (fboundp 'eval-when-compile)
(defmacro eval-when-compile (&rest rest) nil))
@@ -43,8 +43,8 @@
+ (list 'char-after (list '1- (list 'or pos '(point))))))
;; defvar some obsolete variables, which we still support for
- ;; backwardscompatibility reasons.
-@@ -1939,7 +1938,7 @@
+ ;; backwards compatibility reasons.
+@@ -1965,7 +1964,7 @@
(defun erlang-man-make-menu-item (file)
"Create a menu item containing the name of the man page."
@@ -53,7 +53,7 @@
(let ((page (substring file (match-beginning 1) (match-end 1))))
(list (capitalize page)
(list 'lambda '()
-@@ -1950,7 +1949,7 @@
+@@ -1976,7 +1975,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -1970,7 +1969,7 @@
+@@ -1996,7 +1995,7 @@
(if (or (null module) (string= module ""))
(error "No Erlang module name given"))
(let ((dir-list erlang-man-dirs)
@@ -71,7 +71,7 @@
(file nil)
file-list)
(while (and dir-list (null file))
-@@ -2111,9 +2110,9 @@
+@@ -2137,9 +2136,9 @@
(error nil))
(if file
(let ((process-environment (copy-sequence process-environment)))
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/gnu.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -1,13 +1,18 @@
-gnu.patch by Aurelien Jarno <aurel32 at debian.org> and
-Sergei Golovan <sgolovan at debian.org>
+Author: Aurelien Jarno <aurel32 at debian.org>
+Author: Sergei Golovan <sgolovan at debian.org>
+Author: Pino Toscano <pino at debian.org>
(1) Defines GNU macros not only for Linux but also for any system
with 'gnu' substring in OS name. Fixes FTBFS on GNU/kFreeBSD and GNU/Hurd.
(2) Undefines BSD4_4 for os_mon application for GNU/Hurd;
---- erlang_14.b.3-dfsg.orig/erts/configure.in
-+++ erlang_14.b.3-dfsg/erts/configure.in
+(3) Undefines AF_LINK for GNU/Hurd;
+
+(4) Switch some PATH_MAX occurrences to MAXPATHLEN;
+
+--- erlang-14.b.4-dfsg.orig/erts/configure.in
++++ erlang-14.b.4-dfsg/erts/configure.in
@@ -385,7 +385,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
@@ -26,8 +31,8 @@
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
if test "x$ETHR_THR_LIB_BASE_TYPE" != "xposix_nptl"; then
AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
---- erlang_14.b.3-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang_14.b.3-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-14.b.4-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-14.b.4-dfsg/lib/os_mon/c_src/memsup.c
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
@@ -40,3 +45,101 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
+--- erlang-14.b.4-dfsg.orig/erts/emulator/drivers/common/inet_drv.c
++++ erlang-14.b.4-dfsg/erts/emulator/drivers/common/inet_drv.c
+@@ -401,6 +401,11 @@
+ inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
+ } while(0)
+
++#ifdef __GNU__
++#warning "Undefined AF_LINK for GNU/Hurd"
++#undef AF_LINK
++#endif
++
+
+ #endif /* __WIN32__ */
+
+--- erlang-14.b.4-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-14.b.4-dfsg/erts/etc/common/erlexec.c
+@@ -1536,7 +1536,7 @@
+ if (!bindir) {
+ /* Determine bindir from absolute path to executable */
+ char *p;
+- char buffer[PATH_MAX];
++ char buffer[MAXPATHLEN];
+ strncpy(buffer, argv[0], sizeof(buffer));
+ buffer[sizeof(buffer)-1] = '\0';
+
+@@ -1550,7 +1550,7 @@
+ if (!rootdir) {
+ /* Determine rootdir from absolute path to bindir */
+ char *p;
+- char buffer[PATH_MAX];
++ char buffer[MAXPATHLEN];
+ strncpy(buffer, bindir, sizeof(buffer));
+ buffer[sizeof(buffer)-1] = '\0';
+
+--- erlang-14.b.4-dfsg.orig/erts/etc/common/escript.c
++++ erlang-14.b.4-dfsg/erts/etc/common/escript.c
+@@ -53,7 +53,7 @@
+ # define IS_DIRSEP(c) ((c) == '/')
+ # define DIRSEPSTR "/"
+ # define PATHSEPSTR ":"
+-# define PMAX PATH_MAX
++# define PMAX MAXPATHLEN
+ # define ERL_NAME "erl"
+ #endif
+
+--- erlang-14.b.4-dfsg.orig/erts/etc/unix/dyn_erl.c
++++ erlang-14.b.4-dfsg/erts/etc/unix/dyn_erl.c
+@@ -149,8 +149,8 @@
+ static char *
+ find_prog(char *origpath)
+ {
+- char relpath[PATH_MAX];
+- char abspath[PATH_MAX];
++ char relpath[MAXPATHLEN];
++ char abspath[MAXPATHLEN];
+
+ strcpy(relpath, origpath);
+
+@@ -161,7 +161,7 @@
+ envpath = get_env("PATH");
+ if (envpath) {
+ /* Try to find the executable in the path */
+- char dir[PATH_MAX];
++ char dir[MAXPATHLEN];
+ char *beg = envpath;
+ char *end;
+ int sz;
+@@ -275,7 +275,7 @@
+ /* List install dir and look for latest erts-vsn */
+ DIR *dp; /* Pointer to directory structure. */
+ struct dirent* dirp; /* Pointer to directory entry. */
+- char latest_vsn[PATH_MAX]; /* Latest erts-vsn directory name. */
++ char latest_vsn[MAXPATHLEN];/* Latest erts-vsn directory name. */
+
+ dp = opendir(erl_top);
+ if (dp == NULL) {
+@@ -315,7 +315,7 @@
+
+ char *p;
+ char *p2;
+- char buffer[PATH_MAX];
++ char buffer[MAXPATHLEN];
+
+ strcpy(buffer, erlpath);
+
+@@ -358,9 +358,9 @@
+ char *p;
+ char *abspath;
+ char *bindir; /* Location of executables. */
+- char rootdir[PATH_MAX]; /* Root location of Erlang installation. */
+- char progname[PATH_MAX]; /* Name of this program. */
+- char erlexec[PATH_MAX]; /* Path to erlexec */
++ char rootdir[MAXPATHLEN];/* Root location of Erlang installation. */
++ char progname[MAXPATHLEN];/* Name of this program. */
++ char erlexec[MAXPATHLEN];/* Path to erlexec */
+
+ /* Determine progname */
+ abspath = find_prog(argv[0]);
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/hppa.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -6,9 +6,9 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang_14.b.3-dfsg.orig/erts/configure.in
-+++ erlang_14.b.3-dfsg/erts/configure.in
-@@ -1808,6 +1808,14 @@
+--- erlang-14.b.4-dfsg.orig/erts/configure.in
++++ erlang-14.b.4-dfsg/erts/configure.in
+@@ -1817,6 +1817,14 @@
AC_FUNC_SETVBUF_REVERSED
disable_vfork=false
Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/java.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang_14.b.3-dfsg.orig/erts/configure.in
-+++ erlang_14.b.3-dfsg/erts/configure.in
-@@ -4167,7 +4167,8 @@
+--- erlang-14.b.4-dfsg.orig/erts/configure.in
++++ erlang-14.b.4-dfsg/erts/configure.in
+@@ -4170,7 +4170,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
ac_cv_prog_javac_ver_1_5,
@@ -18,8 +18,8 @@
ac_cv_prog_javac_ver_1_5=yes, ac_cv_prog_javac_ver_1_5=no)])
if test $ac_cv_prog_javac_ver_1_5 = no; then
unset -v JAVAC
---- erlang_14.b.3-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang_14.b.3-dfsg/lib/test_server/src/configure.in
+--- erlang-14.b.4-dfsg.orig/lib/test_server/src/configure.in
++++ erlang-14.b.4-dfsg/lib/test_server/src/configure.in
@@ -399,7 +399,8 @@
dnl Make sure it's at least JDK 1.5
AC_CACHE_CHECK(for JDK version 1.5,
Modified: erlang/trunk/debian/patches/m68k.patch
===================================================================
--- erlang/trunk/debian/patches/m68k.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/m68k.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -7,8 +7,8 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang_14.b.3-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang_14.b.3-dfsg/erts/emulator/beam/binary.c
+--- erlang-14.b.4-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-14.b.4-dfsg/erts/emulator/beam/binary.c
@@ -31,6 +31,10 @@
#include "erl_binary.h"
#include "erl_bits.h"
@@ -20,8 +20,8 @@
#ifdef DEBUG
static int list_to_bitstr_buf(Eterm obj, char* buf, Uint len);
#else
---- erlang_14.b.3-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang_14.b.3-dfsg/erts/emulator/beam/erl_driver.h
+--- erlang-14.b.4-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-14.b.4-dfsg/erts/emulator/beam/erl_driver.h
@@ -563,7 +563,7 @@
EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
extern const ErlDrvTermData driver_term_nil;
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/man.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -4,9 +4,9 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang_14.b.3-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang_14.b.3-dfsg/erts/etc/common/erlexec.c
-@@ -725,8 +725,10 @@
+--- erlang-14.b.4-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-14.b.4-dfsg/erts/etc/common/erlexec.c
+@@ -728,8 +728,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/powerpc.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -2,8 +2,8 @@
Description: Patch defines HiPE architecture ppc for powerpc arch.
Last-Modified: Mon, 08 Mar 2010 12:23:16 +0300
---- erlang_14.b.3-dfsg.orig/erts/configure.in
-+++ erlang_14.b.3-dfsg/erts/configure.in
+--- erlang-14.b.4-dfsg.orig/erts/configure.in
++++ erlang-14.b.4-dfsg/erts/configure.in
@@ -625,6 +625,7 @@
x86_64) ARCH=amd64;;
amd64) ARCH=amd64;;
Modified: erlang/trunk/debian/patches/rpath.patch
===================================================================
--- erlang/trunk/debian/patches/rpath.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/rpath.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang_14.b.3-dfsg.orig/erts/configure.in
-+++ erlang_14.b.3-dfsg/erts/configure.in
-@@ -4023,9 +4023,9 @@
+--- erlang-14.b.4-dfsg.orig/erts/configure.in
++++ erlang-14.b.4-dfsg/erts/configure.in
+@@ -4026,9 +4026,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/sparc.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -5,8 +5,8 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang_14.b.3-dfsg.orig/erts/configure.in
-+++ erlang_14.b.3-dfsg/erts/configure.in
+--- erlang-14.b.4-dfsg.orig/erts/configure.in
++++ erlang-14.b.4-dfsg/erts/configure.in
@@ -614,7 +614,7 @@
fi
@@ -16,8 +16,8 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang_14.b.3-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang_14.b.3-dfsg/erts/emulator/beam/beam_emu.c
+--- erlang-14.b.4-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-14.b.4-dfsg/erts/emulator/beam/beam_emu.c
@@ -1060,16 +1060,6 @@
* in registers.
*/
Modified: erlang/trunk/debian/patches/ssl.patch
===================================================================
--- erlang/trunk/debian/patches/ssl.patch 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/patches/ssl.patch 2011-10-24 18:10:51 UTC (rev 1345)
@@ -2,9 +2,9 @@
Patch adds support for IPv6 to the ssl application.
---- erlang_14.b.3-dfsg.orig/erts/configure.in
-+++ erlang_14.b.3-dfsg/erts/configure.in
-@@ -1791,6 +1791,8 @@
+--- erlang-14.b.4-dfsg.orig/erts/configure.in
++++ erlang-14.b.4-dfsg/erts/configure.in
+@@ -1800,6 +1800,8 @@
AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
@@ -13,8 +13,8 @@
AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
pread pwrite writev memmove strerror strerror_r strncasecmp \
---- erlang_14.b.3-dfsg.orig/erts/config.h.in
-+++ erlang_14.b.3-dfsg/erts/config.h.in
+--- erlang-14.b.4-dfsg.orig/erts/config.h.in
++++ erlang-14.b.4-dfsg/erts/config.h.in
@@ -329,6 +329,9 @@
/* Define to 1 if you have the `inet_pton' function. */
#undef HAVE_INET_PTON
@@ -35,8 +35,8 @@
/* Define to 1 if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H
---- erlang_14.b.3-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang_14.b.3-dfsg/lib/ssl/c_src/esock.c
+--- erlang-14.b.4-dfsg.orig/lib/ssl/c_src/esock.c
++++ erlang-14.b.4-dfsg/lib/ssl/c_src/esock.c
@@ -132,6 +132,11 @@
#define INADDR_NONE 0xffffffff /* Should be in <netinet/in.h>. */
#endif
@@ -304,8 +304,8 @@
static Connection *new_connection(int state, FD fd)
{
Connection *cp;
---- erlang_14.b.3-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang_14.b.3-dfsg/lib/ssl/src/ssl_broker.erl
+--- erlang-14.b.4-dfsg.orig/lib/ssl/src/ssl_broker.erl
++++ erlang-14.b.4-dfsg/lib/ssl/src/ssl_broker.erl
@@ -471,7 +471,7 @@
debug(St, "peername: client = ~w~n", [Client]),
Reply = case ssl_server:peername(St#st.fd) of
@@ -428,8 +428,8 @@
get_tagged_opt(Tag, Opts, Default) ->
case lists:keysearch(Tag, 1, Opts) of
{value, {_, Value}} ->
---- erlang_14.b.3-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang_14.b.3-dfsg/lib/ssl/src/ssl_prim.erl
+--- erlang-14.b.4-dfsg.orig/lib/ssl/src/ssl_prim.erl
++++ erlang-14.b.4-dfsg/lib/ssl/src/ssl_prim.erl
@@ -118,7 +118,7 @@
peername(#st{fd = Fd, status = open}) ->
case ssl_server:peername_prim(ssl_server_prim, Fd) of
@@ -448,8 +448,8 @@
{ok, {At, Port}};
Error ->
Error
---- erlang_14.b.3-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang_14.b.3-dfsg/lib/ssl/src/ssl_server.erl
+--- erlang-14.b.4-dfsg.orig/lib/ssl/src/ssl_server.erl
++++ erlang-14.b.4-dfsg/lib/ssl/src/ssl_server.erl
@@ -1363,7 +1363,10 @@
ip_to_string({A,B,C,D}) ->
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2011-08-09 19:39:32 UTC (rev 1344)
+++ erlang/trunk/debian/rules 2011-10-24 18:10:51 UTC (rev 1345)
@@ -512,8 +512,8 @@
binary: binary-indep binary-arch
-REL=R14B03
-DEB_REL=14.b.3-dfsg
+REL=R14B04
+DEB_REL=14.b.4-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
More information about the Pkg-erlang-commits
mailing list