[Pkg-erlang-commits] r1706 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Jun 25 12:14:59 UTC 2015
Author: sgolovan
Date: 2015-06-25 12:14:58 +0000 (Thu, 25 Jun 2015)
New Revision: 1706
Removed:
erlang/trunk/debian/patches/sslv3disable.patch
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/copyright
erlang/trunk/debian/patches/beamload.patch
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/javascript.patch
erlang/trunk/debian/patches/man.patch
erlang/trunk/debian/patches/series
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/patches/wx3.0-constants.patch
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream release.
* Refreshed patches, removed patch which disables SSLv3 protocol in
the ssl application because this protocol has been disabled upstream.
* Changed the license in debian/copyright because upstream relicensed
Erlang/OTP from Erlang public license to Apache 2.0 license.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/changelog 2015-06-25 12:14:58 UTC (rev 1706)
@@ -1,8 +1,12 @@
-erlang (1:17.5-dfsg-3) UNRELEASED; urgency=medium
+erlang (1:18.0-dfsg-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream release.
+ * Refreshed patches, removed patch which disables SSLv3 protocol in
+ the ssl application because this protocol has been disabled upstream.
+ * Changed the license in debian/copyright because upstream relicensed
+ Erlang/OTP from Erlang public license to Apache 2.0 license.
- -- Sergei Golovan <sgolovan at debian.org> Wed, 27 May 2015 08:38:15 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Wed, 24 Jun 2015 14:56:01 +0300
erlang (1:17.5-dfsg-2) unstable; urgency=medium
Modified: erlang/trunk/debian/copyright
===================================================================
--- erlang/trunk/debian/copyright 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/copyright 2015-06-25 12:14:58 UTC (rev 1706)
@@ -29,9 +29,13 @@
with prebuilt architecture-independent binaries. They are removed from the
source package (except for required bootstrap files).
-The files lib/megaco/standards/* and lib/ssh/standards/* have been removed
+The files lib/diameter/doc/standards/*, lib/megaco/doc/standards/*,
+lib/ssh/doc/standards/* and lib/inets/doc/archive/* have been removed
from the upstream tarball because they are not DFSG free.
+The files lib/common_test/priv/*.js have been removed from the upstream tarball
+because they are minified Javascript files.
+
============================================================================
This licence applies to lib/edoc and lib/syntax_tools
@@ -58,6 +62,8 @@
============================================================================
This licence applies to lib/eldap
+Copyright (c) 2010, Torbjorn Tornkvist
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@@ -157,291 +163,21 @@
THE POSSIBILITY OF SUCH INJURY OR DAMAGE.
============================================================================
+This license applies to the rest of the Erlang/OTP source files
-ERLANG PUBLIC LICENSE
-Version 1.1
+Copyright Ericsson AB 2002-2013. All Rights Reserved.
-1. Definitions.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
-1.1. ``Contributor'' means each entity that creates or contributes to
-the creation of Modifications.
+ http://www.apache.org/licenses/LICENSE-2.0
-1.2. ``Contributor Version'' means the combination of the Original
-Code, prior Modifications used by a Contributor, and the Modifications
-made by that particular Contributor.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
-1.3. ``Covered Code'' means the Original Code or Modifications or the
-combination of the Original Code and Modifications, in each case
-including portions thereof.
-
-1.4. ``Electronic Distribution Mechanism'' means a mechanism generally
-accepted in the software development community for the electronic
-transfer of data.
-
-1.5. ``Executable'' means Covered Code in any form other than Source
-Code.
-
-1.6. ``Initial Developer'' means the individual or entity identified
-as the Initial Developer in the Source Code notice required by Exhibit
-A.
-
-1.7. ``Larger Work'' means a work which combines Covered Code or
-portions thereof with code not governed by the terms of this License.
-
-1.8. ``License'' means this document.
-
-1.9. ``Modifications'' means any addition to or deletion from the
-substance or structure of either the Original Code or any previous
-Modifications. When Covered Code is released as a series of files, a
-Modification is:
-
-A. Any addition to or deletion from the contents of a file containing
- Original Code or previous Modifications.
-
-B. Any new file that contains any part of the Original Code or
- previous Modifications.
-
-1.10. ``Original Code'' means Source Code of computer software code
-which is described in the Source Code notice required by Exhibit A as
-Original Code, and which, at the time of its release under this
-License is not already Covered Code governed by this License.
-
-1.11. ``Source Code'' means the preferred form of the Covered Code for
-making modifications to it, including all modules it contains, plus
-any associated interface definition files, scripts used to control
-compilation and installation of an Executable, or a list of source
-code differential comparisons against either the Original Code or
-another well known, available Covered Code of the Contributor's
-choice. The Source Code can be in a compressed or archival form,
-provided the appropriate decompression or de-archiving software is
-widely available for no charge.
-
-1.12. ``You'' means an individual or a legal entity exercising rights
-under, and complying with all of the terms of, this License. For legal
-entities,``You'' includes any entity which controls, is controlled by,
-or is under common control with You. For purposes of this definition,
-``control'' means (a) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (b) ownership of fifty percent (50%) or more of the
-outstanding shares or beneficial ownership of such entity.
-
-2. Source Code License.
-
-2.1. The Initial Developer Grant.
-The Initial Developer hereby grants You a world-wide, royalty-free,
-non-exclusive license, subject to third party intellectual property
-claims:
-
-(a) to use, reproduce, modify, display, perform, sublicense and
- distribute the Original Code (or portions thereof) with or without
- Modifications, or as part of a Larger Work; and
-
-(b) under patents now or hereafter owned or controlled by Initial
- Developer, to make, have made, use and sell (``Utilize'') the
- Original Code (or portions thereof), but solely to the extent that
- any such patent is reasonably necessary to enable You to Utilize
- the Original Code (or portions thereof) and not to any greater
- extent that may be necessary to Utilize further Modifications or
- combinations.
-
-2.2. Contributor Grant.
-Each Contributor hereby grants You a world-wide, royalty-free,
-non-exclusive license, subject to third party intellectual property
-claims:
-
-(a) to use, reproduce, modify, display, perform, sublicense and
- distribute the Modifications created by such Contributor (or
- portions thereof) either on an unmodified basis, with other
- Modifications, as Covered Code or as part of a Larger Work; and
-
-(b) under patents now or hereafter owned or controlled by Contributor,
- to Utilize the Contributor Version (or portions thereof), but
- solely to the extent that any such patent is reasonably necessary
- to enable You to Utilize the Contributor Version (or portions
- thereof), and not to any greater extent that may be necessary to
- Utilize further Modifications or combinations.
-
-3. Distribution Obligations.
-
-3.1. Application of License.
-The Modifications which You contribute are governed by the terms of
-this License, including without limitation Section 2.2. The Source
-Code version of Covered Code may be distributed only under the terms
-of this License, and You must include a copy of this License with
-every copy of the Source Code You distribute. You may not offer or
-impose any terms on any Source Code version that alters or restricts
-the applicable version of this License or the recipients' rights
-hereunder. However, You may include an additional document offering
-the additional rights described in Section 3.5.
-
-3.2. Availability of Source Code.
-Any Modification which You contribute must be made available in Source
-Code form under the terms of this License either on the same media as
-an Executable version or via an accepted Electronic Distribution
-Mechanism to anyone to whom you made an Executable version available;
-and if made available via Electronic Distribution Mechanism, must
-remain available for at least twelve (12) months after the date it
-initially became available, or at least six (6) months after a
-subsequent version of that particular Modification has been made
-available to such recipients. You are responsible for ensuring that
-the Source Code version remains available even if the Electronic
-Distribution Mechanism is maintained by a third party.
-
-3.3. Description of Modifications.
-You must cause all Covered Code to which you contribute to contain a
-file documenting the changes You made to create that Covered Code and
-the date of any change. You must include a prominent statement that
-the Modification is derived, directly or indirectly, from Original
-Code provided by the Initial Developer and including the name of the
-Initial Developer in (a) the Source Code, and (b) in any notice in an
-Executable version or related documentation in which You describe the
-origin or ownership of the Covered Code.
-
-3.4. Intellectual Property Matters
-
-(a) Third Party Claims.
- If You have knowledge that a party claims an intellectual property
- right in particular functionality or code (or its utilization
- under this License), you must include a text file with the source
- code distribution titled ``LEGAL'' which describes the claim and
- the party making the claim in sufficient detail that a recipient
- will know whom to contact. If you obtain such knowledge after You
- make Your Modification available as described in Section 3.2, You
- shall promptly modify the LEGAL file in all copies You make
- available thereafter and shall take other steps (such as notifying
- appropriate mailing lists or newsgroups) reasonably calculated to
- inform those who received the Covered Code that new knowledge has
- been obtained.
-
-(b) Contributor APIs.
- If Your Modification is an application programming interface and
- You own or control patents which are reasonably necessary to
- implement that API, you must also include this information in the
- LEGAL file.
-
-3.5. Required Notices.
-You must duplicate the notice in Exhibit A in each file of the Source
-Code, and this License in any documentation for the Source Code, where
-You describe recipients' rights relating to Covered Code. If You
-created one or more Modification(s), You may add your name as a
-Contributor to the notice described in Exhibit A. If it is not
-possible to put such notice in a particular Source Code file due to
-its structure, then you must include such notice in a location (such
-as a relevant directory file) where a user would be likely to look for
-such a notice. You may choose to offer, and to charge a fee for,
-warranty, support, indemnity or liability obligations to one or more
-recipients of Covered Code. However, You may do so only on Your own
-behalf, and not on behalf of the Initial Developer or any
-Contributor. You must make it absolutely clear than any such warranty,
-support, indemnity or liability obligation is offered by You alone,
-and You hereby agree to indemnify the Initial Developer and every
-Contributor for any liability incurred by the Initial Developer or
-such Contributor as a result of warranty, support, indemnity or
-liability terms You offer.
-
-3.6. Distribution of Executable Versions.
-You may distribute Covered Code in Executable form only if the
-requirements of Section 3.1-3.5 have been met for that Covered Code,
-and if You include a notice stating that the Source Code version of
-the Covered Code is available under the terms of this License,
-including a description of how and where You have fulfilled the
-obligations of Section 3.2. The notice must be conspicuously included
-in any notice in an Executable version, related documentation or
-collateral in which You describe recipients' rights relating to the
-Covered Code. You may distribute the Executable version of Covered
-Code under a license of Your choice, which may contain terms different
-from this License, provided that You are in compliance with the terms
-of this License and that the license for the Executable version does
-not attempt to limit or alter the recipient's rights in the Source
-Code version from the rights set forth in this License. If You
-distribute the Executable version under a different license You must
-make it absolutely clear that any terms which differ from this License
-are offered by You alone, not by the Initial Developer or any
-Contributor. You hereby agree to indemnify the Initial Developer and
-every Contributor for any liability incurred by the Initial Developer
-or such Contributor as a result of any such terms You offer.
-
-3.7. Larger Works.
-You may create a Larger Work by combining Covered Code with other code
-not governed by the terms of this License and distribute the Larger
-Work as a single product. In such a case, You must make sure the
-requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-If it is impossible for You to comply with any of the terms of this
-License with respect to some or all of the Covered Code due to statute
-or regulation then You must: (a) comply with the terms of this License
-to the maximum extent possible; and (b) describe the limitations and
-the code they affect. Such description must be included in the LEGAL
-file described in Section 3.4 and must be included with all
-distributions of the Source Code. Except to the extent prohibited by
-statute or regulation, such description must be sufficiently detailed
-for a recipient of ordinary skill to be able to understand it.
-
-5. Application of this License.
-
-This License applies to code to which the Initial Developer has
-attached the notice in Exhibit A, and to related Covered Code.
-
-6. CONNECTION TO MOZILLA PUBLIC LICENSE
-
-This Erlang License is a derivative work of the Mozilla Public
-License, Version 1.0. It contains terms which differ from the Mozilla
-Public License, Version 1.0.
-
-7. DISCLAIMER OF WARRANTY.
-
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
-NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
-THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE
-IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER
-CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR
-CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART
-OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER
-EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-This License and the rights granted hereunder will terminate
-automatically if You fail to comply with terms herein and fail to cure
-such breach within 30 days of becoming aware of the breach. All
-sublicenses to the Covered Code which are properly granted shall
-survive any termination of this License. Provisions which, by their
-nature, must remain in effect beyond the termination of this License
-shall survive.
-
-9. DISCLAIMER OF LIABILITY
-Any utilization of Covered Code shall not cause the Initial Developer
-or any Contributor to be liable for any damages (neither direct nor
-indirect).
-
-10. MISCELLANEOUS
-This License represents the complete agreement concerning the subject
-matter hereof. If any provision is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to make it
-enforceable. This License shall be construed by and in accordance with
-the substantive laws of Sweden. Any dispute, controversy or claim
-arising out of or relating to this License, or the breach, termination
-or invalidity thereof, shall be subject to the exclusive jurisdiction
-of Swedish courts, with the Stockholm City Court as the first
-instance.
-
-EXHIBIT A.
-
-``The contents of this file are subject to the Erlang Public License,
-Version 1.1, (the "License"); you may not use this file except in
-compliance with the License. You should have received a copy of the
-Erlang Public License along with this software. If not, it can be
-retrieved via the world wide web at http://www.erlang.org/.
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-the License for the specific language governing rights and limitations
-under the License.
-
-The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-AB. All Rights Reserved.''
-
+On a Debian system the complete text of the Apache-2.0 license can be
+found in /usr/share/common-licenses/Apache-2.0
Modified: erlang/trunk/debian/patches/beamload.patch
===================================================================
--- erlang/trunk/debian/patches/beamload.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/beamload.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -4,7 +4,7 @@
--- a/erts/emulator/beam/beam_load.c
+++ b/erts/emulator/beam/beam_load.c
-@@ -43,7 +43,7 @@
+@@ -45,7 +45,7 @@
#include "hipe_arch.h"
#endif
Modified: erlang/trunk/debian/patches/clean.patch
===================================================================
--- erlang/trunk/debian/patches/clean.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/clean.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -5,7 +5,7 @@
--- a/Makefile.in
+++ b/Makefile.in
-@@ -1092,6 +1092,7 @@
+@@ -1093,6 +1093,7 @@
rm -f *~ *.bak config.log config.status prebuilt.files ibin/*
cd erts && ERL_TOP=$(ERL_TOP) $(MAKE) clean
cd lib && ERL_TOP=$(ERL_TOP) $(MAKE) clean BUILD_ALL=true
@@ -13,7 +13,7 @@
distclean: clean
find . -type f -name SKIP -print | xargs $(RM)
-@@ -1133,3 +1134,209 @@
+@@ -1134,3 +1135,209 @@
|| $(MAKE) BOOTSTRAP_ROOT=$(BOOTSTRAP_ROOT) bootstrap_root_clean
# ----------------------------------------------------------------------
Modified: erlang/trunk/debian/patches/docs.patch
===================================================================
--- erlang/trunk/debian/patches/docs.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/docs.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -5,7 +5,7 @@
--- a/lib/erl_docgen/priv/xsl/db_man.xsl
+++ b/lib/erl_docgen/priv/xsl/db_man.xsl
-@@ -516,7 +516,7 @@
+@@ -517,7 +517,7 @@
<xsl:text>
.RS 2</xsl:text>
<xsl:text>
.LP
</xsl:text>
<xsl:value-of select="$content"/>
@@ -14,7 +14,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
-@@ -824,7 +824,7 @@
+@@ -847,7 +847,7 @@
<xsl:template match="desc">
<xsl:text>
.RS</xsl:text>
<xsl:apply-templates/>
@@ -25,7 +25,7 @@
--- a/lib/megaco/doc/src/Makefile
+++ b/lib/megaco/doc/src/Makefile
-@@ -169,8 +169,6 @@
+@@ -170,8 +170,6 @@
$(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)"
$(INSTALL_DIR) "$(RELEASE_PATH)/man/man3"
$(INSTALL_DATA) $(MAN3DIR)/* "$(RELEASE_PATH)/man/man3"
@@ -36,7 +36,7 @@
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
-@@ -372,7 +372,7 @@
+@@ -377,7 +377,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
@@ -45,7 +45,7 @@
<tag><c>noteol</c></tag>
-@@ -381,8 +381,8 @@
+@@ -386,8 +386,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
@@ -58,7 +58,7 @@
--- a/lib/tools/Makefile
+++ b/lib/tools/Makefile
-@@ -23,7 +23,7 @@
+@@ -24,7 +24,7 @@
# Macros
# ----------------------------------------------------
@@ -69,7 +69,7 @@
VSN = $(TOOLS_VSN)
--- a/system/doc/top/Makefile
+++ b/system/doc/top/Makefile
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
GIF_FILES =
Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/emacs.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -5,7 +5,7 @@
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
-@@ -497,8 +497,8 @@
+@@ -498,8 +498,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
-@@ -1286,23 +1286,22 @@
+@@ -1292,23 +1292,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
;; backwards compatibility reasons.
-@@ -2025,7 +2024,7 @@
+@@ -2031,7 +2030,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 '()
-@@ -2036,7 +2035,7 @@
+@@ -2042,7 +2041,7 @@
(defun erlang-man-get-files (dir)
"Return files in directory DIR."
@@ -62,7 +62,7 @@
(defun erlang-man-module (&optional module)
-@@ -2056,7 +2055,7 @@
+@@ -2062,7 +2061,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))
-@@ -2197,9 +2196,9 @@
+@@ -2203,9 +2202,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 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/gnu.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -13,7 +13,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -481,7 +481,7 @@
+@@ -455,7 +455,7 @@
dnl NOTE: CPPFLAGS will be included in CFLAGS at the end
case $host_os in
@@ -22,7 +22,7 @@
win32)
# The ethread library requires _WIN32_WINNT of at least 0x0403.
# -D_WIN32_WINNT=* from CPPFLAGS is saved in ETHR_DEFS.
-@@ -1334,7 +1334,7 @@
+@@ -1330,7 +1330,7 @@
solaris*)
enable_child_waiter_thread=yes
;;
@@ -33,7 +33,7 @@
AC_DEFINE(ERTS_NEED_DLOPEN_BEFORE_DLERROR,[1],
--- a/lib/os_mon/c_src/memsup.c
+++ b/lib/os_mon/c_src/memsup.c
-@@ -98,6 +98,11 @@
+@@ -99,6 +99,11 @@
#include <time.h>
#include <errno.h>
@@ -47,9 +47,9 @@
#include <sys/sysctl.h>
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
-@@ -692,6 +692,11 @@
- inet_driver_select((d)->port, (ErlDrvEvent)(long)(d)->event, (flags), (onoff)); \
- } while(0)
+@@ -723,6 +723,11 @@
+ (((unsigned char*) (s))[1] << 8) | \
+ (((unsigned char*) (s))[0]))
+#ifdef __GNU__
+#warning "Undefined AF_LINK for GNU/Hurd"
@@ -57,11 +57,11 @@
+#endif
+
- #endif /* !__WIN32__ && !__OSE__ */
-
+ #ifdef VALGRIND
+ # include <valgrind/memcheck.h>
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -1562,7 +1562,7 @@
+@@ -1580,7 +1580,7 @@
if (!bindir) {
/* Determine bindir from absolute path to executable */
char *p;
@@ -70,7 +70,7 @@
strncpy(buffer, argv[0], sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
-@@ -1576,7 +1576,7 @@
+@@ -1594,7 +1594,7 @@
if (!rootdir) {
/* Determine rootdir from absolute path to bindir */
char *p;
@@ -81,7 +81,7 @@
--- a/erts/etc/common/escript.c
+++ b/erts/etc/common/escript.c
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
# define IS_DIRSEP(c) ((c) == '/')
# define DIRSEPSTR "/"
# define PATHSEPSTR ":"
@@ -92,7 +92,7 @@
--- a/erts/etc/unix/dyn_erl.c
+++ b/erts/etc/unix/dyn_erl.c
-@@ -149,8 +149,8 @@
+@@ -150,8 +150,8 @@
static char *
find_prog(char *origpath)
{
@@ -103,7 +103,7 @@
strcpy(relpath, origpath);
-@@ -161,7 +161,7 @@
+@@ -162,7 +162,7 @@
envpath = get_env("PATH");
if (envpath) {
/* Try to find the executable in the path */
@@ -112,7 +112,7 @@
char *beg = envpath;
char *end;
int sz;
-@@ -275,7 +275,7 @@
+@@ -276,7 +276,7 @@
/* List install dir and look for latest erts-vsn */
DIR *dp; /* Pointer to directory structure. */
struct dirent* dirp; /* Pointer to directory entry. */
@@ -121,7 +121,7 @@
dp = opendir(erl_top);
if (dp == NULL) {
-@@ -315,7 +315,7 @@
+@@ -316,7 +316,7 @@
char *p;
char *p2;
@@ -130,7 +130,7 @@
strcpy(buffer, erlpath);
-@@ -358,9 +358,9 @@
+@@ -359,9 +359,9 @@
char *p;
char *abspath;
char *bindir; /* Location of executables. */
Modified: erlang/trunk/debian/patches/hppa.patch
===================================================================
--- erlang/trunk/debian/patches/hppa.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/hppa.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -8,7 +8,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -2174,6 +2174,14 @@
+@@ -2175,6 +2175,14 @@
AC_CHECK_DECLS([posix2time, time2posix],,,[#include <time.h>])
disable_vfork=false
Modified: erlang/trunk/debian/patches/java.patch
===================================================================
--- erlang/trunk/debian/patches/java.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/java.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -8,19 +8,19 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -4746,7 +4746,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,
+@@ -4752,7 +4752,8 @@
+ dnl Make sure it's at least JDK 1.6
+ AC_CACHE_CHECK(for JDK version 1.6,
+ ac_cv_prog_javac_ver_1_6,
- [ERL_TRY_LINK_JAVA([], [for (String i : args);],
+ [ERL_TRY_LINK_JAVA([], [for (String i : args);
+ int[] values = {}; String s = new String(values, 0, values.length);],
- 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
+ ac_cv_prog_javac_ver_1_6=yes, ac_cv_prog_javac_ver_1_6=no)])
+ if test $ac_cv_prog_javac_ver_1_6 = no; then
unset -v JAVAC
--- a/lib/test_server/src/configure.in
+++ b/lib/test_server/src/configure.in
-@@ -484,7 +484,8 @@
+@@ -485,7 +485,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,
Modified: erlang/trunk/debian/patches/javascript.patch
===================================================================
--- erlang/trunk/debian/patches/javascript.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/javascript.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -1,6 +1,6 @@
--- a/lib/common_test/priv/Makefile.in
+++ b/lib/common_test/priv/Makefile.in
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
SCRIPTS =
IMAGES = tile1.jpg
CSS = ct_default.css
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/man.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -6,7 +6,7 @@
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -723,8 +723,10 @@
+@@ -727,8 +727,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/series 2015-06-25 12:14:58 UTC (rev 1706)
@@ -8,5 +8,4 @@
hppa.patch
javascript.patch
wx3.0-constants.patch
-sslv3disable.patch
beamload.patch
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/sparc.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -7,7 +7,7 @@
--- a/erts/configure.in
+++ b/erts/configure.in
-@@ -662,7 +662,7 @@
+@@ -636,7 +636,7 @@
fi
case $chk_arch_ in
@@ -18,7 +18,7 @@
i86pc) ARCH=x86;;
--- a/erts/emulator/beam/beam_emu.c
+++ b/erts/emulator/beam/beam_emu.c
-@@ -989,16 +989,6 @@
+@@ -997,16 +997,6 @@
* in registers.
*/
@@ -35,7 +35,7 @@
# define REG_x0
# define REG_xregs
# define REG_htop
-@@ -1007,7 +997,6 @@
+@@ -1015,7 +1005,6 @@
# define REG_fcalls
# define REG_tmp_arg1
# define REG_tmp_arg2
Deleted: erlang/trunk/debian/patches/sslv3disable.patch
===================================================================
--- erlang/trunk/debian/patches/sslv3disable.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/sslv3disable.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -1,90 +0,0 @@
-Description: Patch removes support for SSLv3 protocol because it is proved to
- be insecure and nobody should use it anymore.
-Author Sergei Golovan
-Bug-Debian: https://bugs.debian.org/771359
-Last-Update: Sun, 30 Nov 2014 20:20:41 +0300
-
---- a/lib/ssl/doc/src/ssl_app.xml
-+++ b/lib/ssl/doc/src/ssl_app.xml
-@@ -47,10 +47,10 @@
- </p>
- <p>Note that the environment parameters can be set on the command line,
- for instance,</p>
-- <p><c>erl ... -ssl protocol_version '[sslv3, tlsv1]' ...</c>.
-+ <p><c>erl ... -ssl protocol_version '[tlsv1.1, tlsv1]' ...</c>.
- </p>
- <taglist>
-- <tag><c><![CDATA[protocol_version = [sslv3|tlsv1] <optional>]]></c>.</tag>
-+ <tag><c><![CDATA[protocol_version = [tlsv1|tlsv1.1|tlsv1.2] <optional>]]></c>.</tag>
- <item>
- <p>Protocol that will be supported by started clients and
- servers. If this option is not set it will default to all
-@@ -58,6 +58,9 @@
- Note that this option may be overridden by the version option
- to ssl:connect/[2,3] and ssl:listen/2.
- </p>
-+ <p>For Debian GNU/Linux distribution the sslv3 protocol was
-+ disabled due to its security issues.
-+ </p>
- </item>
-
- <tag><c><![CDATA[session_lifetime = integer() <optional>]]></c></tag>
---- a/lib/ssl/doc/src/ssl.xml
-+++ b/lib/ssl/doc/src/ssl.xml
-@@ -123,7 +123,7 @@
-
- <p><c>sslsocket() - opaque to the user. </c></p>
-
-- <p><c>protocol() = sslv3 | tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>
-+ <p><c>protocol() = tlsv1 | 'tlsv1.1' | 'tlsv1.2' </c></p>
-
- <p><c>ciphers() = [ciphersuite()] | string() (according to old API)</c></p>
-
---- a/lib/ssl/src/ssl_internal.hrl
-+++ b/lib/ssl/src/ssl_internal.hrl
-@@ -67,8 +67,8 @@
- -define(TRUE, 0).
- -define(FALSE, 1).
-
---define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1, sslv3]).
---define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1, sslv3]).
-+-define(ALL_SUPPORTED_VERSIONS, ['tlsv1.2', 'tlsv1.1', tlsv1]).
-+-define(MIN_SUPPORTED_VERSIONS, ['tlsv1.1', tlsv1]).
- -define(ALL_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
- -define(MIN_DATAGRAM_SUPPORTED_VERSIONS, ['dtlsv1.2', dtlsv1]).
-
---- a/lib/ssl/src/ssl_record.hrl
-+++ b/lib/ssl/src/ssl_record.hrl
-@@ -144,6 +144,7 @@
- %% }).
-
- -define(LOWEST_MAJOR_SUPPORTED_VERSION, 3).
-+-define(LOWEST_MINOR_SUPPORTED_VERSION, 1).
-
-
- -record(generic_stream_cipher, {
---- a/lib/ssl/src/tls_record.erl
-+++ b/lib/ssl/src/tls_record.erl
-@@ -276,14 +276,20 @@
- %%--------------------------------------------------------------------
- -spec is_acceptable_version(tls_version()) -> boolean().
- is_acceptable_version({N,_})
-- when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+ when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+ true;
-+is_acceptable_version({N,M})
-+ when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
- true;
- is_acceptable_version(_) ->
- false.
-
- -spec is_acceptable_version(tls_version(), Supported :: [tls_version()]) -> boolean().
- is_acceptable_version({N,_} = Version, Versions)
-- when N >= ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+ when N > ?LOWEST_MAJOR_SUPPORTED_VERSION ->
-+ lists:member(Version, Versions);
-+is_acceptable_version({N,M} = Version, Versions)
-+ when N == ?LOWEST_MAJOR_SUPPORTED_VERSION andalso M >= ?LOWEST_MINOR_SUPPORTED_VERSION ->
- lists:member(Version, Versions);
- is_acceptable_version(_,_) ->
- false.
Modified: erlang/trunk/debian/patches/wx3.0-constants.patch
===================================================================
--- erlang/trunk/debian/patches/wx3.0-constants.patch 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/patches/wx3.0-constants.patch 2015-06-25 12:14:58 UTC (rev 1706)
@@ -8,7 +8,7 @@
--- a/lib/wx/include/wx.hrl
+++ b/lib/wx/include/wx.hrl
-@@ -744,7 +744,7 @@
+@@ -767,7 +767,7 @@
% From "checkbox.h"
-define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192).
-define(wxCHK_3STATE, 4096).
@@ -17,7 +17,7 @@
% From "checkbox.h": wxCheckBoxState
-define(wxCHK_UNCHECKED, 0).
-define(wxCHK_CHECKED, 1).
-@@ -991,10 +991,10 @@
+@@ -1014,10 +1014,10 @@
-define(wxSIZE_AUTO_WIDTH, 1).
-define(wxSETUP, 131072).
-define(wxMORE, 65536).
@@ -32,7 +32,7 @@
-define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)).
-define(wxICON_ASTERISK, ?wxICON_INFORMATION).
-define(wxICON_STOP, ?wxICON_HAND).
-@@ -1026,8 +1026,8 @@
+@@ -1049,8 +1049,8 @@
-define(wxTC_TOP, 0).
-define(wxTC_FIXEDWIDTH, 32).
-define(wxTC_RIGHTJUSTIFY, 16).
@@ -43,7 +43,7 @@
-define(wxSP_VERTICAL, ?wxVERTICAL).
-define(wxSP_HORIZONTAL, ?wxHORIZONTAL).
-define(wxSB_VERTICAL, ?wxVERTICAL).
-@@ -1048,8 +1048,8 @@
+@@ -1071,8 +1071,8 @@
-define(wxCB_SIMPLE, 4).
-define(wxLB_INT_HEIGHT, 2048).
-define(wxLB_HSCROLL, ?wxHSCROLL).
@@ -54,7 +54,7 @@
-define(wxLB_OWNERDRAW, 256).
-define(wxLB_EXTENDED, 128).
-define(wxLB_MULTIPLE, 64).
-@@ -1525,7 +1525,7 @@
+@@ -1548,7 +1548,7 @@
-define(wxUPDATE_UI_FROMIDLE, 2).
% From "dialog.h"
-define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)).
@@ -63,7 +63,7 @@
% From "dirctrlg.h"
-define(wxDIRCTRL_DIR_ONLY, 16).
-define(wxDIRCTRL_SELECT_FIRST, 32).
-@@ -2013,212 +2013,212 @@
+@@ -2036,212 +2036,212 @@
-define(wxLANGUAGE_ARABIC_YEMEN, 24).
-define(wxLANGUAGE_ARMENIAN, 25).
-define(wxLANGUAGE_ASSAMESE, 26).
@@ -481,7 +481,7 @@
% From "intl.h": wxLayoutDirection
-define(wxLayout_Default, 0).
-define(wxLayout_LeftToRight, 1).
-@@ -3705,7 +3705,7 @@
+@@ -3728,7 +3728,7 @@
-define(wxSTC_KEY_LEFT, 302).
-define(wxSTC_KEY_UP, 301).
-define(wxSTC_KEY_DOWN, 300).
@@ -490,7 +490,7 @@
-define(wxSTC_MULTILINEUNDOREDO, 4096).
-define(wxSTC_MOD_BEFOREDELETE, 2048).
-define(wxSTC_MOD_BEFOREINSERT, 1024).
-@@ -3787,7 +3787,7 @@
+@@ -3810,7 +3810,7 @@
-define(wxSTC_INDIC_TT, 2).
-define(wxSTC_INDIC_SQUIGGLE, 1).
-define(wxSTC_INDIC_PLAIN, 0).
@@ -499,7 +499,7 @@
-define(wxSTC_CASE_LOWER, 2).
-define(wxSTC_CASE_UPPER, 1).
-define(wxSTC_CASE_MIXED, 0).
-@@ -3812,7 +3812,7 @@
+@@ -3835,7 +3835,7 @@
-define(wxSTC_CHARSET_BALTIC, 186).
-define(wxSTC_CHARSET_DEFAULT, 1).
-define(wxSTC_CHARSET_ANSI, 0).
@@ -508,7 +508,7 @@
-define(wxSTC_STYLE_LASTPREDEFINED, 39).
-define(wxSTC_STYLE_CALLTIP, 38).
-define(wxSTC_STYLE_INDENTGUIDE, 37).
-@@ -3911,9 +3911,9 @@
+@@ -3934,9 +3934,9 @@
-define(wxTE_PROCESS_TAB, 64).
-define(wxTE_MULTILINE, 32).
-define(wxTE_READONLY, 16).
@@ -520,7 +520,7 @@
% From "textctrl.h": wxTextAttrAlignment
-define(wxTEXT_ALIGNMENT_DEFAULT, 0).
-define(wxTEXT_ALIGNMENT_LEFT, 1).
-@@ -3963,7 +3963,7 @@
+@@ -3986,7 +3986,7 @@
-define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)).
-define(wxRESIZE_BORDER, 64).
-define(wxTINY_CAPTION_VERT, 128).
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2015-05-27 05:38:16 UTC (rev 1705)
+++ erlang/trunk/debian/rules 2015-06-25 12:14:58 UTC (rev 1706)
@@ -503,7 +503,7 @@
binary: binary-indep binary-arch
-REL=17.5
+REL=18.0
RELDIR=$(REL)
DEB_REL=$(REL)-dfsg
More information about the Pkg-erlang-commits
mailing list