[Pkg-erlang-commits] r1078 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Sep 22 19:38:01 UTC 2009
Author: sgolovan
Date: 2009-09-22 19:38:01 +0000 (Tue, 22 Sep 2009)
New Revision: 1078
Added:
erlang/trunk/debian/patches/reltool.patch
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/patches/clean.patch
erlang/trunk/debian/patches/emacs.patch
erlang/trunk/debian/patches/gnu.patch
erlang/trunk/debian/patches/m68k.patch
erlang/trunk/debian/patches/man.patch
erlang/trunk/debian/patches/series
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/patches/ssl.patch
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream release (closes: #539269).
* New maintainer's email address pkg-erlang-devel at lists.alioth.debian.org
mailing list.
* Added a patch by upstream which fixes bug in reltool.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/changelog 2009-09-22 19:38:01 UTC (rev 1078)
@@ -1,8 +1,11 @@
-erlang (1:13.b.1-dfsg-7) UNRELEASED; urgency=low
+erlang (1:13.b.2-dfsg-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release (closes: #539269).
+ * New maintainer's email address pkg-erlang-devel at lists.alioth.debian.org
+ mailing list.
+ * Added a patch by upstream which fixes bug in reltool.
- -- Sergei Golovan <sgolovan at debian.org> Tue, 18 Aug 2009 04:06:32 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 22 Sep 2009 22:40:35 +0400
erlang (1:13.b.1-dfsg-6) unstable; urgency=low
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/control 2009-09-22 19:38:01 UTC (rev 1078)
@@ -1,5 +1,5 @@
Source: erlang
-Maintainer: Erlang Packagers <erlang-pkg-devel at lists.berlios.de>
+Maintainer: Debian Erlang Packagers <pkg-erlang-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
Section: interpreters
Priority: optional
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/clean.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -3,9 +3,9 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-13.b.1-dfsg.orig/Makefile.in
-+++ erlang-13.b.1-dfsg/Makefile.in
-@@ -837,6 +837,7 @@
+--- erlang-13.b.2-dfsg.orig/Makefile.in
++++ erlang-13.b.2-dfsg/Makefile.in
+@@ -838,6 +838,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
-@@ -871,3 +872,166 @@
+@@ -872,3 +873,166 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/emacs.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -14,8 +14,8 @@
(adapted from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=428054)
fixes parentheses (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=536891).
---- erlang-13.b.1-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-13.b.1-dfsg/lib/tools/emacs/erlang.el
+--- erlang-13.b.2-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang-13.b.2-dfsg/lib/tools/emacs/erlang.el
@@ -474,7 +474,7 @@
Should the flag the nil, the directory is absolute, should it be non-nil
the directory is relative to the variable `erlang-root-dir'.")
@@ -112,7 +112,7 @@
(let ((dir (substring file (match-beginning 1) (match-end 1)))
(page (substring file (match-beginning 2) (match-end 2))))
(if (fboundp 'setenv)
-@@ -3548,10 +3548,9 @@
+@@ -3548,10 +3544,9 @@
(error "Missing `end'"))
))
((eq (car (car stack)) 'begin)
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/gnu.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -10,9 +10,9 @@
(4) Skips building SSL certificate examples for GNU/Hurd (Debian GNU/Hurd has
no a random translator yet).
---- erlang-13.b.1-dfsg.orig/erts/configure.in
-+++ erlang-13.b.1-dfsg/erts/configure.in
-@@ -315,7 +315,7 @@
+--- erlang-13.b.2-dfsg.orig/erts/configure.in
++++ erlang-13.b.2-dfsg/erts/configure.in
+@@ -329,7 +329,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -21,7 +21,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -926,7 +926,7 @@
+@@ -965,7 +965,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -30,8 +30,8 @@
AC_DEFINE(USE_RECURSIVE_MALLOC_MUTEX,[1],
[Define if malloc should use a recursive mutex])
AC_MSG_CHECKING([whether dlopen() needs to be called before first call to dlerror()])
---- erlang-13.b.1-dfsg.orig/lib/common_test/Makefile
-+++ erlang-13.b.1-dfsg/lib/common_test/Makefile
+--- erlang-13.b.2-dfsg.orig/lib/common_test/Makefile
++++ erlang-13.b.2-dfsg/lib/common_test/Makefile
@@ -30,9 +30,13 @@
ifeq ($(findstring solaris,$(TARGET)),solaris)
SUB_DIRECTORIES = doc/src src priv
@@ -46,8 +46,8 @@
include vsn.mk
VSN = $(COMMON_TEST_VSN)
---- erlang-13.b.1-dfsg.orig/lib/common_test/priv/Makefile.in
-+++ erlang-13.b.1-dfsg/lib/common_test/priv/Makefile.in
+--- erlang-13.b.2-dfsg.orig/lib/common_test/priv/Makefile.in
++++ erlang-13.b.2-dfsg/lib/common_test/priv/Makefile.in
@@ -43,9 +43,13 @@
ifeq ($(findstring solaris,$(TARGET)),solaris)
XNIX = true
@@ -62,8 +62,8 @@
ifneq ($(findstring win32,$(TARGET)),win32)
---- erlang-13.b.1-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-13.b.1-dfsg/lib/os_mon/c_src/memsup.c
+--- erlang-13.b.2-dfsg.orig/lib/os_mon/c_src/memsup.c
++++ erlang-13.b.2-dfsg/lib/os_mon/c_src/memsup.c
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
@@ -76,8 +76,8 @@
#ifdef BSD4_4
#include <sys/types.h>
#include <sys/sysctl.h>
---- erlang-13.b.1-dfsg.orig/lib/ssl/Makefile
-+++ erlang-13.b.1-dfsg/lib/ssl/Makefile
+--- erlang-13.b.2-dfsg.orig/lib/ssl/Makefile
++++ erlang-13.b.2-dfsg/lib/ssl/Makefile
@@ -32,8 +32,15 @@
SKIP_BUILDING_BINARIES := true
endif
Modified: erlang/trunk/debian/patches/m68k.patch
===================================================================
--- erlang/trunk/debian/patches/m68k.patch 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/m68k.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -7,12 +7,12 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang-13.b.1-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-13.b.1-dfsg/erts/emulator/beam/binary.c
+--- erlang-13.b.2-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang-13.b.2-dfsg/erts/emulator/beam/binary.c
@@ -31,6 +31,10 @@
#include "erl_binary.h"
#include "erl_bits.h"
-
+
+#ifdef __m68k__
+erts_atomic_t erts_allocated_binaries __attribute__ ((aligned (4)));
+#endif
@@ -20,8 +20,8 @@
#ifdef DEBUG
static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
#else
---- erlang-13.b.1-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-13.b.1-dfsg/erts/emulator/beam/erl_driver.h
+--- erlang-13.b.2-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang-13.b.2-dfsg/erts/emulator/beam/erl_driver.h
@@ -516,7 +516,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 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/man.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -4,9 +4,9 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-13.b.1-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-13.b.1-dfsg/erts/etc/common/erlexec.c
-@@ -696,8 +696,10 @@
+--- erlang-13.b.2-dfsg.orig/erts/etc/common/erlexec.c
++++ erlang-13.b.2-dfsg/erts/etc/common/erlexec.c
+@@ -697,8 +697,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Added: erlang/trunk/debian/patches/reltool.patch
===================================================================
--- erlang/trunk/debian/patches/reltool.patch (rev 0)
+++ erlang/trunk/debian/patches/reltool.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -0,0 +1,27 @@
+Patch by upstream fixes bug in reltool application.
+
+The bug is triggered when you generate a target system with archive
+files and your library directories are given with absolute paths. (Library
+directories are given with the ERL_LIBS environment variable or with the
+lib_dirs configuration parameter.)
+
+--- otp_src_R13B02/lib/reltool/src/reltool_target.erl 2009-09-18 16:25:49.000000000 +0200
++++ otp_src_R13B02_patched/lib/reltool/src/reltool_target.erl 2009-09-22 17:45:33.000000000 +0200
+@@ -1014,7 +1014,7 @@
+ TargetDir2 = filename:join([TargetDir, Dir]),
+ cleanup_spec(Files, TargetDir2),
+ file:del_dir(TargetDir2);
+-cleanup_spec({create_dir, _OldDir, NewDir, Files}, TargetDir) ->
++cleanup_spec({create_dir, NewDir, _OldDir, Files}, TargetDir) ->
+ TargetDir2 = filename:join([TargetDir, NewDir]),
+ cleanup_spec(Files, TargetDir2),
+ file:del_dir(TargetDir2);
+@@ -1152,7 +1152,7 @@
+ "Progname=erl\r\n",
+ "Rootdir=", NativeRootDir, "\r\n"],
+ IniFile = filename:join([BinDir, "erl.ini"]),
+- file:write(IniFile, IniData);
++ ok = file:write_file(IniFile, IniData);
+ _ ->
+ subst_src_scripts(start_scripts(), ErtsBinDir, BinDir,
+ [{"FINAL_ROOTDIR", TargetDir2}, {"EMU", "beam"}],
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/series 2009-09-22 19:38:01 UTC (rev 1078)
@@ -7,3 +7,4 @@
m68k.patch
#native.patch
#build-options.patch
+reltool.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/sparc.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -5,9 +5,9 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-13.b.1-dfsg.orig/erts/configure.in
-+++ erlang-13.b.1-dfsg/erts/configure.in
-@@ -473,7 +473,7 @@
+--- erlang-13.b.2-dfsg.orig/erts/configure.in
++++ erlang-13.b.2-dfsg/erts/configure.in
+@@ -487,7 +487,7 @@
chk_arch_=`uname -m`
fi
case $chk_arch_ in
@@ -16,8 +16,8 @@
sparc64) ARCH=sparc64;;
sun4v) ARCH=ultrasparc;;
i86pc) ARCH=x86;;
---- erlang-13.b.1-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-13.b.1-dfsg/erts/emulator/beam/beam_emu.c
+--- erlang-13.b.2-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang-13.b.2-dfsg/erts/emulator/beam/beam_emu.c
@@ -976,16 +976,6 @@
* in registers.
*/
Modified: erlang/trunk/debian/patches/ssl.patch
===================================================================
--- erlang/trunk/debian/patches/ssl.patch 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/patches/ssl.patch 2009-09-22 19:38:01 UTC (rev 1078)
@@ -2,9 +2,9 @@
Patch adds support for IPv6 to the ssl application.
---- erlang-13.b.1-dfsg.orig/erts/configure.in
-+++ erlang-13.b.1-dfsg/erts/configure.in
-@@ -1475,6 +1475,8 @@
+--- erlang-13.b.2-dfsg.orig/erts/configure.in
++++ erlang-13.b.2-dfsg/erts/configure.in
+@@ -1546,6 +1546,8 @@
fi
fi
AC_CHECK_FUNCS([getnameinfo getipnodebyname getipnodebyaddr gethostbyname2])
@@ -13,9 +13,9 @@
AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
pread pwrite writev memmove strerror strerror_r strncasecmp \
---- erlang-13.b.1-dfsg.orig/erts/config.h.in
-+++ erlang-13.b.1-dfsg/erts/config.h.in
-@@ -241,6 +241,9 @@
+--- erlang-13.b.2-dfsg.orig/erts/config.h.in
++++ erlang-13.b.2-dfsg/erts/config.h.in
+@@ -253,6 +253,9 @@
/* Define if ipv6 is present */
#undef HAVE_IN6
@@ -25,7 +25,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-@@ -409,6 +412,9 @@
+@@ -424,6 +427,9 @@
/* Define to 1 if `ssf_data' is member of `struct sctp_send_failed'. */
#undef HAVE_STRUCT_SCTP_SEND_FAILED_SSF_DATA
@@ -35,8 +35,8 @@
/* Define to 1 if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H
---- erlang-13.b.1-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang-13.b.1-dfsg/lib/ssl/c_src/esock.c
+--- erlang-13.b.2-dfsg.orig/lib/ssl/c_src/esock.c
++++ erlang-13.b.2-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-13.b.1-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang-13.b.1-dfsg/lib/ssl/src/ssl_broker.erl
+--- erlang-13.b.2-dfsg.orig/lib/ssl/src/ssl_broker.erl
++++ erlang-13.b.2-dfsg/lib/ssl/src/ssl_broker.erl
@@ -486,7 +486,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-13.b.1-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang-13.b.1-dfsg/lib/ssl/src/ssl_prim.erl
+--- erlang-13.b.2-dfsg.orig/lib/ssl/src/ssl_prim.erl
++++ erlang-13.b.2-dfsg/lib/ssl/src/ssl_prim.erl
@@ -128,7 +128,7 @@
peername(St) when record(St, st), St#st.status =:= open ->
case ssl_server:peername_prim(ssl_server_prim, St#st.fd) of
@@ -448,8 +448,8 @@
{ok, {At, Port}};
Error ->
Error
---- erlang-13.b.1-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang-13.b.1-dfsg/lib/ssl/src/ssl_server.erl
+--- erlang-13.b.2-dfsg.orig/lib/ssl/src/ssl_server.erl
++++ erlang-13.b.2-dfsg/lib/ssl/src/ssl_server.erl
@@ -1378,7 +1378,10 @@
ip_to_string({A,B,C,D}) ->
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2009-08-18 00:06:52 UTC (rev 1077)
+++ erlang/trunk/debian/rules 2009-09-22 19:38:01 UTC (rev 1078)
@@ -489,8 +489,8 @@
binary: binary-indep binary-arch
-REL=R13B01
-DEB_REL=13.b.1-dfsg
+REL=R13B02
+DEB_REL=13.b.2-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
More information about the Pkg-erlang-commits
mailing list