[Pkg-erlang-commits] r1318 - in erlang/trunk/debian: . patches patterns scripts
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Jun 7 04:21:55 UTC 2011
Author: sgolovan
Date: 2011-06-07 04:21:55 +0000 (Tue, 07 Jun 2011)
New Revision: 1318
Added:
erlang/trunk/debian/erlang-diameter.links.in
erlang/trunk/debian/erlang-diameter.manpages
erlang/trunk/debian/patterns/erlang-diameter.patterns
Removed:
erlang/trunk/debian/patches/tcp.patch
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/control
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/native.patch
erlang/trunk/debian/patches/powerpc.patch
erlang/trunk/debian/patches/rpath.patch
erlang/trunk/debian/patches/series
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/patches/ssl.patch
erlang/trunk/debian/patterns/erlang-dev.patterns
erlang/trunk/debian/patterns/erlang-examples.patterns
erlang/trunk/debian/patterns/erlang-src.patterns
erlang/trunk/debian/rules
erlang/trunk/debian/scripts/analyse
Log:
* New upstream release.
* New Erlang/OTP application 'diameter'.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/changelog 2011-06-07 04:21:55 UTC (rev 1318)
@@ -1,8 +1,9 @@
-erlang (1:14.b.2-dfsg-4) UNRELEASED; urgency=low
+erlang (1:14.b.3-dfsg-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * New Erlang/OTP application 'diameter'.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 11 Apr 2011 08:38:39 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 07 Jun 2011 08:21:22 +0400
erlang (1:14.b.2-dfsg-3) unstable; urgency=low
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/control 2011-06-07 04:21:55 UTC (rev 1318)
@@ -159,6 +159,17 @@
tests etc. in single Erlang modules or entire (sets of) applications.
+Package: erlang-diameter
+Architecture: any
+Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: erlang-dev (= ${binary:Version})
+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 implementation of RFC 3588 protocol
+ Interface with which a user creates a service that sends and receives
+ messages using the Diameter protocol as defined in RFC 3588.
+
+
Package: erlang-doc
Section: doc
Architecture: all
Added: erlang/trunk/debian/erlang-diameter.links.in
===================================================================
--- erlang/trunk/debian/erlang-diameter.links.in (rev 0)
+++ erlang/trunk/debian/erlang-diameter.links.in 2011-06-07 04:21:55 UTC (rev 1318)
@@ -0,0 +1,2 @@
+usr/lib/erlang/lib/diameter- at DIAMETER_VSN@/bin/diameterc usr/bin/diameterc
+usr/share/man/man1/diameter_compile.1.gz usr/share/man/man1/diameterc.gz.1
Added: erlang/trunk/debian/erlang-diameter.manpages
===================================================================
--- erlang/trunk/debian/erlang-diameter.manpages (rev 0)
+++ erlang/trunk/debian/erlang-diameter.manpages 2011-06-07 04:21:55 UTC (rev 1318)
@@ -0,0 +1 @@
+debian/erlang-docs/usr/lib/erlang/man/man1/diameter_compile.1
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/clean.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -3,9 +3,9 @@
Erlang leaves many files after make clean. This patch contains
a hack to remove them.
---- erlang-14.b.2-dfsg.orig/Makefile.in
-+++ erlang-14.b.2-dfsg/Makefile.in
-@@ -995,6 +995,7 @@
+--- erlang_14.b.3-dfsg.orig/Makefile.in
++++ erlang_14.b.3-dfsg/Makefile.in
+@@ -1008,6 +1008,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
-@@ -1030,3 +1031,170 @@
+@@ -1043,3 +1044,170 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/docs.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -3,20 +3,9 @@
and a few bugs with docs installation.
Last-modified: Thu, 09 Dec 2010 10:45:56 +0300
---- erlang-14.b.2-dfsg.orig/Makefile.in
-+++ erlang-14.b.2-dfsg/Makefile.in
-@@ -409,7 +409,7 @@
- ERL_TOP=$(ERL_TOP) $(MAKE) TESTROOT=$(RELEASE_ROOT) $@
-
- mod2app:
-- $(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
-+ $(ERL_TOP)/bin/escript $(ERL_TOP)/lib/erl_docgen/priv/bin/xref_mod_app.escript -topdir $(ERL_TOP) -outfile $(ERL_TOP)/make/$(TARGET)/mod2app.xml
-
- # ----------------------------------------------------------------------
- ERLANG_EARS=$(BOOTSTRAP_ROOT)/bootstrap/erts
---- erlang-14.b.2-dfsg.orig/lib/erl_docgen/priv/xsl/db_man.xsl
-+++ erlang-14.b.2-dfsg/lib/erl_docgen/priv/xsl/db_man.xsl
-@@ -361,7 +361,7 @@
+--- 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 @@
<xsl:text>
.RS 2</xsl:text>
<xsl:text>
.LP
.LP
</xsl:text>
<xsl:value-of select="$content"/>
@@ -25,16 +14,16 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-@@ -573,7 +573,7 @@
- <xsl:text>
.TP</xsl:text>
- <xsl:text>
Types</xsl:text>
- <xsl:apply-templates/>
-- <xsl:text>
.RE</xsl:text>
-+ <xsl:text>
.RE
</xsl:text>
+@@ -716,7 +716,7 @@
+ <xsl:text>
.TP</xsl:text>
+ <xsl:text>
Types</xsl:text>
+ <xsl:apply-templates/>
+- <xsl:text>
.RE</xsl:text>
++ <xsl:text>
.RE
</xsl:text>
+ </xsl:if>
</xsl:template>
-
-@@ -593,7 +593,7 @@
+@@ -737,7 +737,7 @@
<xsl:template match="desc">
<xsl:text>
.RS</xsl:text>
<xsl:apply-templates/>
@@ -43,8 +32,8 @@
</xsl:template>
---- erlang-14.b.2-dfsg.orig/lib/megaco/doc/src/Makefile
-+++ erlang-14.b.2-dfsg/lib/megaco/doc/src/Makefile
+--- erlang_14.b.3-dfsg.orig/lib/megaco/doc/src/Makefile
++++ erlang_14.b.3-dfsg/lib/megaco/doc/src/Makefile
@@ -247,8 +247,6 @@
$(INSTALL_DATA) $(INFO_FILE) $(RELSYSDIR)
$(INSTALL_DIR) $(RELEASE_PATH)/man/man3
@@ -63,9 +52,9 @@
endif
endif
---- erlang-14.b.2-dfsg.orig/lib/stdlib/doc/src/re.xml
-+++ erlang-14.b.2-dfsg/lib/stdlib/doc/src/re.xml
-@@ -348,7 +348,7 @@
+--- erlang_14.b.3-dfsg.orig/lib/stdlib/doc/src/re.xml
++++ erlang_14.b.3-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
match. This option only affects the behavior of the circumflex
@@ -74,7 +63,7 @@
<tag><c>noteol</c></tag>
-@@ -357,8 +357,8 @@
+@@ -354,8 +354,8 @@
match it nor (except in multiline mode) a newline immediately
before it. Setting this without <c>multiline</c> (at compile time)
causes dollar never to match. This option affects only the
@@ -83,5 +72,5 @@
+ behavior of the dollar metacharacter. It does not affect \\Z or
+ \\z.</item>
- <tag><c>{offset, int()}</c></tag>
+ <tag><c>{offset, integer() >= 0}</c></tag>
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/emacs.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -3,9 +3,9 @@
Also, it fixes manpage name regexp matching only 3erl manpages in
section 3.
---- erlang-14.b.2-dfsg.orig/lib/tools/emacs/erlang.el
-+++ erlang-14.b.2-dfsg/lib/tools/emacs/erlang.el
-@@ -495,8 +495,8 @@
+--- erlang_14.b.3-dfsg.orig/lib/tools/emacs/erlang.el
++++ erlang_14.b.3-dfsg/lib/tools/emacs/erlang.el
+@@ -496,8 +496,8 @@
(defvar erlang-man-dirs
'(("Man - Commands" "/man/man1" t)
("Man - Modules" "/man/man3" 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
-@@ -1179,23 +1179,22 @@
+@@ -1180,23 +1180,22 @@
(or (fboundp 'eval-when-compile)
(defmacro eval-when-compile (&rest rest) nil))
@@ -44,7 +44,7 @@
;; defvar some obsolete variables, which we still support for
;; backwardscompatibility reasons.
-@@ -1938,7 +1937,7 @@
+@@ -1939,7 +1938,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 '()
-@@ -1949,7 +1948,7 @@
+@@ -1950,7 +1949,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -1969,7 +1968,7 @@
+@@ -1970,7 +1969,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))
-@@ -2110,9 +2109,9 @@
+@@ -2111,9 +2110,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-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/gnu.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -6,8 +6,8 @@
(2) Undefines BSD4_4 for os_mon application for GNU/Hurd;
---- erlang-14.b.2-dfsg.orig/erts/configure.in
-+++ erlang-14.b.2-dfsg/erts/configure.in
+--- erlang_14.b.3-dfsg.orig/erts/configure.in
++++ erlang_14.b.3-dfsg/erts/configure.in
@@ -385,7 +385,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
@@ -17,7 +17,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1189,7 +1189,7 @@
+@@ -1190,7 +1190,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -26,8 +26,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.2-dfsg.orig/lib/os_mon/c_src/memsup.c
-+++ erlang-14.b.2-dfsg/lib/os_mon/c_src/memsup.c
+--- 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
@@ -110,6 +110,11 @@
#include <memLib.h>
#endif
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/hppa.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -6,9 +6,9 @@
Forwarded: no
Last-updated: Mon, 22 Feb 2010 10:34:34 +0300
---- erlang-14.b.2-dfsg.orig/erts/configure.in
-+++ erlang-14.b.2-dfsg/erts/configure.in
-@@ -1807,6 +1807,14 @@
+--- erlang_14.b.3-dfsg.orig/erts/configure.in
++++ erlang_14.b.3-dfsg/erts/configure.in
+@@ -1808,6 +1808,14 @@
AC_FUNC_SETVBUF_REVERSED
disable_vfork=false
Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/java.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -6,9 +6,9 @@
Forwarded: yes
Last-updated: Sat, 13 Feb 2010 10:08:42 +0300
---- erlang-14.b.2-dfsg.orig/erts/configure.in
-+++ erlang-14.b.2-dfsg/erts/configure.in
-@@ -4106,7 +4106,8 @@
+--- erlang_14.b.3-dfsg.orig/erts/configure.in
++++ erlang_14.b.3-dfsg/erts/configure.in
+@@ -4167,7 +4167,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.2-dfsg.orig/lib/test_server/src/configure.in
-+++ erlang-14.b.2-dfsg/lib/test_server/src/configure.in
+--- erlang_14.b.3-dfsg.orig/lib/test_server/src/configure.in
++++ erlang_14.b.3-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-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/m68k.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -7,8 +7,8 @@
(2) Non-working networking besause of blind conversion of long to a pointer.
---- erlang-14.b.2-dfsg.orig/erts/emulator/beam/binary.c
-+++ erlang-14.b.2-dfsg/erts/emulator/beam/binary.c
+--- erlang_14.b.3-dfsg.orig/erts/emulator/beam/binary.c
++++ erlang_14.b.3-dfsg/erts/emulator/beam/binary.c
@@ -31,6 +31,10 @@
#include "erl_binary.h"
#include "erl_bits.h"
@@ -18,10 +18,10 @@
+#endif
+
#ifdef DEBUG
- static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
+ static int list_to_bitstr_buf(Eterm obj, char* buf, Uint len);
#else
---- erlang-14.b.2-dfsg.orig/erts/emulator/beam/erl_driver.h
-+++ erlang-14.b.2-dfsg/erts/emulator/beam/erl_driver.h
+--- erlang_14.b.3-dfsg.orig/erts/emulator/beam/erl_driver.h
++++ erlang_14.b.3-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-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/man.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -4,9 +4,9 @@
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
---- erlang-14.b.2-dfsg.orig/erts/etc/common/erlexec.c
-+++ erlang-14.b.2-dfsg/erts/etc/common/erlexec.c
-@@ -720,8 +720,10 @@
+--- 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 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/native.patch
===================================================================
--- erlang/trunk/debian/patches/native.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/native.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -2,8 +2,8 @@
Adds native code to all Erlang binaries if HiPE is enabled.
---- erlang-14.b.2-dfsg.orig/make/otp.mk.in
-+++ erlang-14.b.2-dfsg/make/otp.mk.in
+--- erlang_14.b.3-dfsg.orig/make/otp.mk.in
++++ erlang_14.b.3-dfsg/make/otp.mk.in
@@ -89,6 +89,11 @@
ERL_COMPILE_FLAGS += +slim
else
Modified: erlang/trunk/debian/patches/powerpc.patch
===================================================================
--- erlang/trunk/debian/patches/powerpc.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/powerpc.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -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.2-dfsg.orig/erts/configure.in
-+++ erlang-14.b.2-dfsg/erts/configure.in
+--- erlang_14.b.3-dfsg.orig/erts/configure.in
++++ erlang_14.b.3-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-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/rpath.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -4,9 +4,9 @@
Forwarded: no
Last-modified:Sat, 27 Feb 2010 09:34:43 +0300
---- erlang-14.b.2-dfsg.orig/erts/configure.in
-+++ erlang-14.b.2-dfsg/erts/configure.in
-@@ -3962,9 +3962,9 @@
+--- erlang_14.b.3-dfsg.orig/erts/configure.in
++++ erlang_14.b.3-dfsg/erts/configure.in
+@@ -4023,9 +4023,9 @@
SSL_CC_RUNTIME_LIBRARY_PATH=
SSL_LD_RUNTIME_LIBRARY_PATH=
SSL_DED_LD_RUNTIME_LIBRARY_PATH=
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/series 2011-06-07 04:21:55 UTC (rev 1318)
@@ -10,5 +10,4 @@
java.patch
hppa.patch
powerpc.patch
-tcp.patch
#native.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/sparc.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -5,8 +5,8 @@
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
---- erlang-14.b.2-dfsg.orig/erts/configure.in
-+++ erlang-14.b.2-dfsg/erts/configure.in
+--- erlang_14.b.3-dfsg.orig/erts/configure.in
++++ erlang_14.b.3-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.2-dfsg.orig/erts/emulator/beam/beam_emu.c
-+++ erlang-14.b.2-dfsg/erts/emulator/beam/beam_emu.c
+--- erlang_14.b.3-dfsg.orig/erts/emulator/beam/beam_emu.c
++++ erlang_14.b.3-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-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/ssl.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -2,9 +2,9 @@
Patch adds support for IPv6 to the ssl application.
---- erlang-14.b.2-dfsg.orig/erts/configure.in
-+++ erlang-14.b.2-dfsg/erts/configure.in
-@@ -1790,6 +1790,8 @@
+--- erlang_14.b.3-dfsg.orig/erts/configure.in
++++ erlang_14.b.3-dfsg/erts/configure.in
+@@ -1791,6 +1791,8 @@
AC_CHECK_FUNCS([getipnodebyname getipnodebyaddr gethostbyname2])
@@ -13,11 +13,11 @@
AC_CHECK_FUNCS([ieee_handler fpsetmask finite isnan isinf res_gethostbyname dlopen \
pread pwrite writev memmove strerror strerror_r strncasecmp \
---- erlang-14.b.2-dfsg.orig/erts/config.h.in
-+++ erlang-14.b.2-dfsg/erts/config.h.in
-@@ -326,6 +326,9 @@
- /* Define if ipv6 is present */
- #undef HAVE_IN6
+--- erlang_14.b.3-dfsg.orig/erts/config.h.in
++++ erlang_14.b.3-dfsg/erts/config.h.in
+@@ -329,6 +329,9 @@
+ /* Define to 1 if you have the `inet_pton' function. */
+ #undef HAVE_INET_PTON
+/* Define to 1 if you have the `inet_pton' function. */
+#undef HAVE_INET_PTON
@@ -25,7 +25,7 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-@@ -521,6 +524,9 @@
+@@ -524,6 +527,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-14.b.2-dfsg.orig/lib/ssl/c_src/esock.c
-+++ erlang-14.b.2-dfsg/lib/ssl/c_src/esock.c
+--- erlang_14.b.3-dfsg.orig/lib/ssl/c_src/esock.c
++++ erlang_14.b.3-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.2-dfsg.orig/lib/ssl/src/ssl_broker.erl
-+++ erlang-14.b.2-dfsg/lib/ssl/src/ssl_broker.erl
+--- erlang_14.b.3-dfsg.orig/lib/ssl/src/ssl_broker.erl
++++ erlang_14.b.3-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.2-dfsg.orig/lib/ssl/src/ssl_prim.erl
-+++ erlang-14.b.2-dfsg/lib/ssl/src/ssl_prim.erl
+--- erlang_14.b.3-dfsg.orig/lib/ssl/src/ssl_prim.erl
++++ erlang_14.b.3-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.2-dfsg.orig/lib/ssl/src/ssl_server.erl
-+++ erlang-14.b.2-dfsg/lib/ssl/src/ssl_server.erl
+--- erlang_14.b.3-dfsg.orig/lib/ssl/src/ssl_server.erl
++++ erlang_14.b.3-dfsg/lib/ssl/src/ssl_server.erl
@@ -1363,7 +1363,10 @@
ip_to_string({A,B,C,D}) ->
Deleted: erlang/trunk/debian/patches/tcp.patch
===================================================================
--- erlang/trunk/debian/patches/tcp.patch 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patches/tcp.patch 2011-06-07 04:21:55 UTC (rev 1318)
@@ -1,20 +0,0 @@
-Author: Upstream
-Description: Fixes bug in send_timeout handling for sockets in
- active-once mode.
-Last-Updated: Thu, 31 Mar 2011 17:55:22 +0400
-
-diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
-index b491242..59f4cfb 100644
---- a/erts/emulator/drivers/common/inet_drv.c
-+++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -8550,7 +8550,9 @@ static int tcp_deliver(tcp_descriptor* desc, int len)
- len = 0;
-
- if (!desc->inet.active) {
-- driver_cancel_timer(desc->inet.port);
-+ if (!desc->busy_on_send) {
-+ driver_cancel_timer(desc->inet.port);
-+ }
- sock_select(INETP(desc),(FD_READ|FD_CLOSE),0);
- if (desc->i_buf != NULL)
- tcp_restart_input(desc);
Modified: erlang/trunk/debian/patterns/erlang-dev.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-dev.patterns 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patterns/erlang-dev.patterns 2011-06-07 04:21:55 UTC (rev 1318)
@@ -9,6 +9,7 @@
./usr/lib/erlang/lib/cosProperty-.*/include/
./usr/lib/erlang/lib/cosTime-.*/include/
./usr/lib/erlang/lib/cosTransactions-.*/include/
+./usr/lib/erlang/lib/diameter-.*/include/
./usr/lib/erlang/lib/edoc-.*/include/
./usr/lib/erlang/lib/erl_interface-.*/include/
./usr/lib/erlang/lib/erl_interface-.*/lib/
Added: erlang/trunk/debian/patterns/erlang-diameter.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-diameter.patterns (rev 0)
+++ erlang/trunk/debian/patterns/erlang-diameter.patterns 2011-06-07 04:21:55 UTC (rev 1318)
@@ -0,0 +1 @@
+./usr/lib/erlang/lib/diameter-.*/
Modified: erlang/trunk/debian/patterns/erlang-examples.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-examples.patterns 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patterns/erlang-examples.patterns 2011-06-07 04:21:55 UTC (rev 1318)
@@ -1,4 +1,5 @@
./usr/lib/erlang/lib/asn1-.*/examples/
+./usr/lib/erlang/lib/diameter-.*/examples/
./usr/lib/erlang/lib/et-.*/examples/
./usr/lib/erlang/lib/eunit-.*/examples/
./usr/lib/erlang/lib/gs-.*/examples/
Modified: erlang/trunk/debian/patterns/erlang-src.patterns
===================================================================
--- erlang/trunk/debian/patterns/erlang-src.patterns 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/patterns/erlang-src.patterns 2011-06-07 04:21:55 UTC (rev 1318)
@@ -16,6 +16,7 @@
./usr/lib/erlang/lib/crypto-.*/src/
./usr/lib/erlang/lib/debugger-.*/src/
./usr/lib/erlang/lib/dialyzer-.*/src/
+./usr/lib/erlang/lib/diameter-.*/src/
./usr/lib/erlang/lib/docbuilder-.*/src/
./usr/lib/erlang/lib/edoc-.*/src/
./usr/lib/erlang/lib/erl_interface-.*/src/
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/rules 2011-06-07 04:21:55 UTC (rev 1318)
@@ -12,6 +12,7 @@
export HOME := $(ROOT_DIR)/debian
-include ${ROOT_DIR}/erts/vsn.mk
+-include ${ROOT_DIR}/lib/diameter/vsn.mk
-include ${ROOT_DIR}/lib/erl_interface/vsn.mk
-include ${ROOT_DIR}/lib/jinterface/vsn.mk
-include ${ROOT_DIR}/lib/ic/vsn.mk
@@ -296,13 +297,13 @@
dh_testdir
target=$$(basename $$(find make -type d |grep /)) ; \
PATH=$(ROOT_DIR)/bin:$$PATH ; \
- for m in lib/snmp lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
+ for m in lib/diameter lib/snmp lib/dialyzer lib/erl_interface lib/common_test lib/webtool erts ; do \
make -C $$m/doc/src man ERL_TOP=$(ROOT_DIR) TARGET=$$target ; \
done
#
install -d $(MAN_DIR)/man1 $(MAN_DIR)/man3 ; \
install lib/dialyzer/doc/man3/*.3 $(MAN_DIR)/man3 ; \
- for m in lib/snmp lib/erl_interface lib/common_test lib/webtool erts ; do \
+ for m in lib/diameter lib/snmp lib/erl_interface lib/common_test lib/webtool erts ; do \
install $$m/doc/man1/*.1 $(MAN_DIR)/man1 ; \
done
#
@@ -377,6 +378,7 @@
-e's/@WEBTOOL_VSN@/$(WEBTOOL_VSN)/g' \
-e's/@COMMON_TEST_VSN@/$(COMMON_TEST_VSN)/g' \
-e's/@SNMP_VSN@/$(SNMP_VSN)/g' \
+ -e's/@DIAMETER_VSN@/$(DIAMETER_VSN)/g' \
-e's/@TOOLS_VSN@/$(TOOLS_VSN)/g' <$$i >$${i%%.in} ; \
done
sed -e's/@VERSION@/$(VSN)/g' <debian/in.erlang-doc.doc-base.erlang-erts \
@@ -510,8 +512,8 @@
binary: binary-indep binary-arch
-REL=R14B02
-DEB_REL=14.b.2-dfsg
+REL=R14B03
+DEB_REL=14.b.3-dfsg
get-orig-source:
CURDIR=`pwd` && TMPDIR=`mktemp -d /tmp/erlang.XXXXXX` && \
Modified: erlang/trunk/debian/scripts/analyse
===================================================================
--- erlang/trunk/debian/scripts/analyse 2011-04-11 04:39:20 UTC (rev 1317)
+++ erlang/trunk/debian/scripts/analyse 2011-06-07 04:21:55 UTC (rev 1318)
@@ -55,7 +55,7 @@
grep -E -f debian/patterns/erlang-dev.patterns | \
cut -c 20- >> debian/erlang-dev.install
-PACKAGES='appmon asn1 common-test corba crypto debugger dialyzer docbuilder
+PACKAGES='appmon asn1 common-test corba crypto debugger dialyzer diameter docbuilder
edoc erl-docgen et eunit gs ic-java ic inets inviso jinterface megaco mnesia
observer odbc os-mon parsetools percept pman public-key reltool
runtime-tools snmp ssh ssl syntax-tools test-server toolbar tools tv
More information about the Pkg-erlang-commits
mailing list