X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id A1A37DC0AEA for ; Sat, 2 Apr 2016 23:51:26 +0000 (UTC) Received: from mail-qg0-f44.google.com (mail-qg0-f44.google.com [209.85.192.44]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 55023DC003D for ; Sat, 2 Apr 2016 23:51:25 +0000 (UTC) Received: by mail-qg0-f44.google.com with SMTP id n34so115702543qge.1 for ; Sat, 02 Apr 2016 16:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=3WpJoFoO1nxnV1uBWFnyFX35ZyTd2bA6c/U5D/gmqCw=; b=QnEkkHn7GC2zi5J95zbPF1u6/cGcFNaXa4zN1ShQr9P06I3kHNVP8o1FD+LqQPc/u6 bOoybuO3gq+gLYbaXbnSzAtSjQIaCy/B+wl416PzCVs882n4NGnF2PhOxIw2Zy086TQK J7jovBYhkuwf88cPc0gLHBfHmakRqUNxWzjZtae+WYCeTw2drnkXOBM7ELBNxpSBSjnK lylxfiAJ9GRjD9sLcK83mgwwsbC5WMbY56IhfeIXQmOlfrxUv0w9dkJyQoo7jMIyCe7y gyajYX0xZl3jQh6MGhPfwc8l9BGRH6lXebvjwd8KJrt4ALqbQTqyFGnEt+2p9MvmFx40 EsYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=3WpJoFoO1nxnV1uBWFnyFX35ZyTd2bA6c/U5D/gmqCw=; b=lkK0aeNxmMT4ISP21WMC20raXALhWHBA5qvlKWvLjs3iSwvxr8IyNQ0I0zrirQigI7 dHWIoy9vV2YwgwZuFUCKxKjnub9etWsbA7qbp5BmKmtAuApVPF/VACq/mXvkoy64EABc TsFwajsF1Wd1KxSxY7r7u5p7klemBcJh+RXBcO+efCUPwZzJFj918V2P7veb1JuNYniI dJmBD+7UmdJJG9Gk+SxvRX+2y3c+Cf8ACxeVYhdy3JTAhUZsVhH+lGaju8ArG8fzKaYS fyq68agKg1ypsRwfdV2Uvt8gGPiGPd1pkm86rjg8uX1rYz9f75N5SixO58XgIsEx0648 H6TA== X-Gm-Message-State: AD7BkJK+/GujL/YKNL4NTCO+8ez9Usij5XhLX8QkqBQyWLvtuwZuLCR7YIgUBkp8TdevZw== X-Received: by 10.140.139.72 with SMTP id 69mr44031qhl.68.1459641084606; Sat, 02 Apr 2016 16:51:24 -0700 (PDT) Received: from c134fccbdaff.ec2.internal (ec2-54-84-208-11.compute-1.amazonaws.com. [54.84.208.11]) by smtp.gmail.com with ESMTPSA id g64sm9240257qkb.44.2016.04.02.16.51.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 02 Apr 2016 16:51:23 -0700 (PDT) From: Marlus Saraiva To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] community/erlang: Update to 18.3 Date: Sat, 2 Apr 2016 23:51:17 +0000 Message-Id: <1459641077-10099-1-git-send-email-marlus.saraiva@gmail.com> X-Mailer: git-send-email 2.8.0 X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- .../0006-Do-not-install-erlang-sources.patch | 300 ++++++++++----------- .../erlang/0070-otp-update-version-18.2.2.patch | 180 ------------- community/erlang/APKBUILD | 28 +- 3 files changed, 162 insertions(+), 346 deletions(-) delete mode 100644 community/erlang/0070-otp-update-version-18.2.2.patch diff --git a/community/erlang/0006-Do-not-install-erlang-sources.patch b/community/erlang/0006-Do-not-install-erlang-sources.patch index 92fdf35..d264665 100644 --- a/community/erlang/0006-Do-not-install-erlang-sources.patch +++ b/community/erlang/0006-Do-not-install-erlang-sources.patch @@ -1,5 +1,5 @@ ---- otp_src_18.2-orig/erts/preloaded/src/Makefile -+++ otp_src_18.2-fixed/erts/preloaded/src/Makefile +--- otp_src_18.3-orig/erts/preloaded/src/Makefile ++++ otp_src_18.3-fixed/erts/preloaded/src/Makefile @@ -86,8 +86,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -9,8 +9,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/asn1/src/Makefile -+++ otp_src_18.2-fixed/lib/asn1/src/Makefile +--- otp_src_18.3-orig/lib/asn1/src/Makefile ++++ otp_src_18.3-fixed/lib/asn1/src/Makefile @@ -155,7 +155,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -20,8 +20,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" ---- otp_src_18.2-orig/lib/common_test/src/Makefile -+++ otp_src_18.2-fixed/lib/common_test/src/Makefile +--- otp_src_18.3-orig/lib/common_test/src/Makefile ++++ otp_src_18.3-fixed/lib/common_test/src/Makefile @@ -144,7 +144,7 @@ release_spec: opt @@ -31,8 +31,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/compiler/src/Makefile -+++ otp_src_18.2-fixed/lib/compiler/src/Makefile +--- otp_src_18.3-orig/lib/compiler/src/Makefile ++++ otp_src_18.3-fixed/lib/compiler/src/Makefile @@ -172,8 +172,8 @@ release_spec: opt @@ -44,8 +44,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/cosEvent/src/Makefile -+++ otp_src_18.2-fixed/lib/cosEvent/src/Makefile +--- otp_src_18.3-orig/lib/cosEvent/src/Makefile ++++ otp_src_18.3-fixed/lib/cosEvent/src/Makefile @@ -203,7 +203,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -55,8 +55,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/cosEventDomain/src/Makefile -+++ otp_src_18.2-fixed/lib/cosEventDomain/src/Makefile +--- otp_src_18.3-orig/lib/cosEventDomain/src/Makefile ++++ otp_src_18.3-fixed/lib/cosEventDomain/src/Makefile @@ -172,7 +172,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -66,8 +66,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/cosFileTransfer/src/Makefile -+++ otp_src_18.2-fixed/lib/cosFileTransfer/src/Makefile +--- otp_src_18.3-orig/lib/cosFileTransfer/src/Makefile ++++ otp_src_18.3-fixed/lib/cosFileTransfer/src/Makefile @@ -180,9 +180,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -79,8 +79,8 @@ - $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" release_docs_spec: ---- otp_src_18.2-orig/lib/cosNotification/src/Makefile -+++ otp_src_18.2-fixed/lib/cosNotification/src/Makefile +--- otp_src_18.3-orig/lib/cosNotification/src/Makefile ++++ otp_src_18.3-fixed/lib/cosNotification/src/Makefile @@ -371,8 +371,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -91,8 +91,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/cosProperty/src/Makefile -+++ otp_src_18.2-fixed/lib/cosProperty/src/Makefile +--- otp_src_18.3-orig/lib/cosProperty/src/Makefile ++++ otp_src_18.3-fixed/lib/cosProperty/src/Makefile @@ -180,8 +180,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -103,8 +103,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/cosTime/src/Makefile -+++ otp_src_18.2-fixed/lib/cosTime/src/Makefile +--- otp_src_18.3-orig/lib/cosTime/src/Makefile ++++ otp_src_18.3-fixed/lib/cosTime/src/Makefile @@ -199,8 +199,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -115,8 +115,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/cosTransactions/src/Makefile -+++ otp_src_18.2-fixed/lib/cosTransactions/src/Makefile +--- otp_src_18.3-orig/lib/cosTransactions/src/Makefile ++++ otp_src_18.3-fixed/lib/cosTransactions/src/Makefile @@ -174,7 +174,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -126,8 +126,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/crypto/src/Makefile -+++ otp_src_18.2-fixed/lib/crypto/src/Makefile +--- otp_src_18.3-orig/lib/crypto/src/Makefile ++++ otp_src_18.3-fixed/lib/crypto/src/Makefile @@ -82,8 +82,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -137,8 +137,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/debugger/src/Makefile -+++ otp_src_18.2-fixed/lib/debugger/src/Makefile +--- otp_src_18.3-orig/lib/debugger/src/Makefile ++++ otp_src_18.3-fixed/lib/debugger/src/Makefile @@ -117,7 +117,7 @@ release_spec: opt @@ -148,8 +148,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/dialyzer/src/Makefile -+++ otp_src_18.2-fixed/lib/dialyzer/src/Makefile +--- otp_src_18.3-orig/lib/dialyzer/src/Makefile ++++ otp_src_18.3-fixed/lib/dialyzer/src/Makefile @@ -152,7 +152,7 @@ release_spec: opt @@ -159,8 +159,8 @@ "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/diameter/src/Makefile -+++ otp_src_18.2-fixed/lib/diameter/src/Makefile +--- otp_src_18.3-orig/lib/diameter/src/Makefile ++++ otp_src_18.3-fixed/lib/diameter/src/Makefile @@ -251,11 +251,8 @@ $(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%) @@ -175,8 +175,8 @@ $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%: $(INSTALL_DIR) "$(RELSYSDIR)/examples/$*" ---- otp_src_18.2-orig/lib/edoc/src/Makefile -+++ otp_src_18.2-fixed/lib/edoc/src/Makefile +--- otp_src_18.3-orig/lib/edoc/src/Makefile ++++ otp_src_18.3-fixed/lib/edoc/src/Makefile @@ -88,7 +88,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin" @@ -186,8 +186,8 @@ release_docs_spec: ---- otp_src_18.2-orig/lib/eldap/src/Makefile -+++ otp_src_18.2-fixed/lib/eldap/src/Makefile +--- otp_src_18.3-orig/lib/eldap/src/Makefile ++++ otp_src_18.3-fixed/lib/eldap/src/Makefile @@ -99,10 +99,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" @@ -199,8 +199,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/erl_docgen/src/Makefile -+++ otp_src_18.2-fixed/lib/erl_docgen/src/Makefile +--- otp_src_18.3-orig/lib/erl_docgen/src/Makefile ++++ otp_src_18.3-fixed/lib/erl_docgen/src/Makefile @@ -90,8 +90,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -210,8 +210,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/et/src/Makefile -+++ otp_src_18.2-fixed/lib/et/src/Makefile +--- otp_src_18.3-orig/lib/et/src/Makefile ++++ otp_src_18.3-fixed/lib/et/src/Makefile @@ -109,7 +109,6 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -220,8 +220,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/eunit/src/Makefile -+++ otp_src_18.2-fixed/lib/eunit/src/Makefile +--- otp_src_18.3-orig/lib/eunit/src/Makefile ++++ otp_src_18.3-fixed/lib/eunit/src/Makefile @@ -120,7 +120,6 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin" @@ -230,8 +230,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/gs/src/Makefile -+++ otp_src_18.2-fixed/lib/gs/src/Makefile +--- otp_src_18.3-orig/lib/gs/src/Makefile ++++ otp_src_18.3-fixed/lib/gs/src/Makefile @@ -109,8 +109,8 @@ release_spec: opt @@ -243,8 +243,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" ---- otp_src_18.2-orig/lib/hipe/cerl/Makefile -+++ otp_src_18.2-fixed/lib/hipe/cerl/Makefile +--- otp_src_18.3-orig/lib/hipe/cerl/Makefile ++++ otp_src_18.3-fixed/lib/hipe/cerl/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -254,8 +254,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/hipe/flow/Makefile -+++ otp_src_18.2-fixed/lib/hipe/flow/Makefile +--- otp_src_18.3-orig/lib/hipe/flow/Makefile ++++ otp_src_18.3-fixed/lib/hipe/flow/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -265,8 +265,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/hipe/icode/Makefile -+++ otp_src_18.2-fixed/lib/hipe/icode/Makefile +--- otp_src_18.3-orig/lib/hipe/icode/Makefile ++++ otp_src_18.3-fixed/lib/hipe/icode/Makefile @@ -120,7 +120,7 @@ release_spec: opt @@ -276,8 +276,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/hipe/llvm/Makefile -+++ otp_src_18.2-fixed/lib/hipe/llvm/Makefile +--- otp_src_18.3-orig/lib/hipe/llvm/Makefile ++++ otp_src_18.3-fixed/lib/hipe/llvm/Makefile @@ -103,7 +103,7 @@ release_spec: opt @@ -287,8 +287,8 @@ $(INSTALL_DIR) $(RELSYSDIR)/ebin $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin ---- otp_src_18.2-orig/lib/hipe/main/Makefile -+++ otp_src_18.2-fixed/lib/hipe/main/Makefile +--- otp_src_18.3-orig/lib/hipe/main/Makefile ++++ otp_src_18.3-fixed/lib/hipe/main/Makefile @@ -118,7 +118,7 @@ release_spec: opt $(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)" @@ -298,8 +298,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/hipe/misc/Makefile -+++ otp_src_18.2-fixed/lib/hipe/misc/Makefile +--- otp_src_18.3-orig/lib/hipe/misc/Makefile ++++ otp_src_18.3-fixed/lib/hipe/misc/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -309,8 +309,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/hipe/rtl/Makefile -+++ otp_src_18.2-fixed/lib/hipe/rtl/Makefile +--- otp_src_18.3-orig/lib/hipe/rtl/Makefile ++++ otp_src_18.3-fixed/lib/hipe/rtl/Makefile @@ -105,7 +105,7 @@ release_spec: opt @@ -320,8 +320,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/hipe/util/Makefile -+++ otp_src_18.2-fixed/lib/hipe/util/Makefile +--- otp_src_18.3-orig/lib/hipe/util/Makefile ++++ otp_src_18.3-fixed/lib/hipe/util/Makefile @@ -50,7 +50,6 @@ endif MODULES = hipe_timing hipe_dot hipe_digraph $(HIPE_MODULES) @@ -339,8 +339,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/ic/src/Makefile -+++ otp_src_18.2-fixed/lib/ic/src/Makefile +--- otp_src_18.3-orig/lib/ic/src/Makefile ++++ otp_src_18.3-fixed/lib/ic/src/Makefile @@ -200,7 +200,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" @@ -350,8 +350,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client" $(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client" ---- otp_src_18.2-orig/lib/inets/src/ftp/Makefile -+++ otp_src_18.2-fixed/lib/inets/src/ftp/Makefile +--- otp_src_18.3-orig/lib/inets/src/ftp/Makefile ++++ otp_src_18.3-fixed/lib/inets/src/ftp/Makefile @@ -91,7 +91,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -361,8 +361,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/inets/src/http_client/Makefile -+++ otp_src_18.2-fixed/lib/inets/src/http_client/Makefile +--- otp_src_18.3-orig/lib/inets/src/http_client/Makefile ++++ otp_src_18.3-fixed/lib/inets/src/http_client/Makefile @@ -92,7 +92,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -372,8 +372,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/inets/src/http_lib/Makefile -+++ otp_src_18.2-fixed/lib/inets/src/http_lib/Makefile +--- otp_src_18.3-orig/lib/inets/src/http_lib/Makefile ++++ otp_src_18.3-fixed/lib/inets/src/http_lib/Makefile @@ -90,7 +90,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -383,8 +383,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/inets/src/http_server/Makefile -+++ otp_src_18.2-fixed/lib/inets/src/http_server/Makefile +--- otp_src_18.3-orig/lib/inets/src/http_server/Makefile ++++ otp_src_18.3-fixed/lib/inets/src/http_server/Makefile @@ -135,7 +135,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -394,9 +394,9 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/inets/src/inets_app/Makefile -+++ otp_src_18.2-fixed/lib/inets/src/inets_app/Makefile -@@ -116,7 +116,7 @@ +--- otp_src_18.3-orig/lib/inets/src/inets_app/Makefile ++++ otp_src_18.3-fixed/lib/inets/src/inets_app/Makefile +@@ -115,7 +115,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" @@ -405,8 +405,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/inets/src/tftp/Makefile -+++ otp_src_18.2-fixed/lib/inets/src/tftp/Makefile +--- otp_src_18.3-orig/lib/inets/src/tftp/Makefile ++++ otp_src_18.3-fixed/lib/inets/src/tftp/Makefile @@ -96,7 +96,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -416,8 +416,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/kernel/src/Makefile -+++ otp_src_18.2-fixed/lib/kernel/src/Makefile +--- otp_src_18.3-orig/lib/kernel/src/Makefile ++++ otp_src_18.3-fixed/lib/kernel/src/Makefile @@ -200,7 +200,6 @@ release_spec: opt @@ -426,8 +426,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/megaco/src/app/Makefile -+++ otp_src_18.2-fixed/lib/megaco/src/app/Makefile +--- otp_src_18.3-orig/lib/megaco/src/app/Makefile ++++ otp_src_18.3-fixed/lib/megaco/src/app/Makefile @@ -114,7 +114,7 @@ $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -437,8 +437,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/megaco/src/binary/Makefile -+++ otp_src_18.2-fixed/lib/megaco/src/binary/Makefile +--- otp_src_18.3-orig/lib/megaco/src/binary/Makefile ++++ otp_src_18.3-fixed/lib/megaco/src/binary/Makefile @@ -176,7 +176,7 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -448,8 +448,8 @@ release_docs_spec: ---- otp_src_18.2-orig/lib/megaco/src/engine/Makefile -+++ otp_src_18.2-fixed/lib/megaco/src/engine/Makefile +--- otp_src_18.3-orig/lib/megaco/src/engine/Makefile ++++ otp_src_18.3-fixed/lib/megaco/src/engine/Makefile @@ -102,7 +102,7 @@ $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -459,8 +459,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/megaco/src/flex/Makefile.in -+++ otp_src_18.2-fixed/lib/megaco/src/flex/Makefile.in +--- otp_src_18.3-orig/lib/megaco/src/flex/Makefile.in ++++ otp_src_18.3-fixed/lib/megaco/src/flex/Makefile.in @@ -268,8 +268,6 @@ $(INSTALL_DIR) "$(RELSYSDIR)/src/flex" $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" @@ -470,8 +470,8 @@ ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) $(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex" $(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib" ---- otp_src_18.2-orig/lib/megaco/src/tcp/Makefile -+++ otp_src_18.2-fixed/lib/megaco/src/tcp/Makefile +--- otp_src_18.3-orig/lib/megaco/src/tcp/Makefile ++++ otp_src_18.3-fixed/lib/megaco/src/tcp/Makefile @@ -94,7 +94,7 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -481,8 +481,8 @@ release_docs_spec: ---- otp_src_18.2-orig/lib/megaco/src/text/Makefile -+++ otp_src_18.2-fixed/lib/megaco/src/text/Makefile +--- otp_src_18.3-orig/lib/megaco/src/text/Makefile ++++ otp_src_18.3-fixed/lib/megaco/src/text/Makefile @@ -135,7 +135,7 @@ $(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -492,8 +492,8 @@ release_docs_spec: ---- otp_src_18.2-orig/lib/megaco/src/udp/Makefile -+++ otp_src_18.2-fixed/lib/megaco/src/udp/Makefile +--- otp_src_18.3-orig/lib/megaco/src/udp/Makefile ++++ otp_src_18.3-fixed/lib/megaco/src/udp/Makefile @@ -94,7 +94,7 @@ $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -503,8 +503,8 @@ release_docs_spec: ---- otp_src_18.2-orig/lib/mnesia/src/Makefile -+++ otp_src_18.2-fixed/lib/mnesia/src/Makefile +--- otp_src_18.3-orig/lib/mnesia/src/Makefile ++++ otp_src_18.3-fixed/lib/mnesia/src/Makefile @@ -133,7 +133,7 @@ release_spec: opt @@ -514,8 +514,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/observer/src/Makefile -+++ otp_src_18.2-fixed/lib/observer/src/Makefile +--- otp_src_18.3-orig/lib/observer/src/Makefile ++++ otp_src_18.3-fixed/lib/observer/src/Makefile @@ -152,7 +152,6 @@ release_spec: opt @@ -524,8 +524,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" ---- otp_src_18.2-orig/lib/odbc/src/Makefile -+++ otp_src_18.2-fixed/lib/odbc/src/Makefile +--- otp_src_18.3-orig/lib/odbc/src/Makefile ++++ otp_src_18.3-fixed/lib/odbc/src/Makefile @@ -110,7 +110,7 @@ release_spec: opt @@ -535,8 +535,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/orber/COSS/CosNaming/Makefile -+++ otp_src_18.2-fixed/lib/orber/COSS/CosNaming/Makefile +--- otp_src_18.3-orig/lib/orber/COSS/CosNaming/Makefile ++++ otp_src_18.3-fixed/lib/orber/COSS/CosNaming/Makefile @@ -145,8 +145,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" @@ -548,8 +548,8 @@ release_docs_spec: ---- otp_src_18.2-orig/lib/orber/src/Makefile -+++ otp_src_18.2-fixed/lib/orber/src/Makefile +--- otp_src_18.3-orig/lib/orber/src/Makefile ++++ otp_src_18.3-fixed/lib/orber/src/Makefile @@ -253,7 +253,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" @@ -559,8 +559,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/os_mon/src/Makefile -+++ otp_src_18.2-fixed/lib/os_mon/src/Makefile +--- otp_src_18.3-orig/lib/os_mon/src/Makefile ++++ otp_src_18.3-fixed/lib/os_mon/src/Makefile @@ -105,7 +105,6 @@ release_spec: opt @@ -569,8 +569,8 @@ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/ose/src/Makefile -+++ otp_src_18.2-fixed/lib/ose/src/Makefile +--- otp_src_18.3-orig/lib/ose/src/Makefile ++++ otp_src_18.3-fixed/lib/ose/src/Makefile @@ -94,9 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -581,8 +581,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/otp_mibs/src/Makefile -+++ otp_src_18.2-fixed/lib/otp_mibs/src/Makefile +--- otp_src_18.3-orig/lib/otp_mibs/src/Makefile ++++ otp_src_18.3-fixed/lib/otp_mibs/src/Makefile @@ -96,8 +96,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -592,8 +592,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/parsetools/src/Makefile -+++ otp_src_18.2-fixed/lib/parsetools/src/Makefile +--- otp_src_18.3-orig/lib/parsetools/src/Makefile ++++ otp_src_18.3-fixed/lib/parsetools/src/Makefile @@ -91,8 +91,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -603,8 +603,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/percept/src/Makefile -+++ otp_src_18.2-fixed/lib/percept/src/Makefile +--- otp_src_18.3-orig/lib/percept/src/Makefile ++++ otp_src_18.3-fixed/lib/percept/src/Makefile @@ -97,7 +97,6 @@ release_spec: opt @@ -613,8 +613,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" # $(INSTALL_DIR) "$(RELSYSDIR)/include" # $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/public_key/asn1/Makefile -+++ otp_src_18.2-fixed/lib/public_key/asn1/Makefile +--- otp_src_18.3-orig/lib/public_key/asn1/Makefile ++++ otp_src_18.3-fixed/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" @@ -626,8 +626,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/public_key/src/Makefile -+++ otp_src_18.2-fixed/lib/public_key/src/Makefile +--- otp_src_18.3-orig/lib/public_key/src/Makefile ++++ otp_src_18.3-fixed/lib/public_key/src/Makefile @@ -109,8 +109,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -637,8 +637,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/reltool/src/Makefile -+++ otp_src_18.2-fixed/lib/reltool/src/Makefile +--- otp_src_18.3-orig/lib/reltool/src/Makefile ++++ otp_src_18.3-fixed/lib/reltool/src/Makefile @@ -100,7 +100,7 @@ release_spec: opt @@ -648,8 +648,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/runtime_tools/src/Makefile -+++ otp_src_18.2-fixed/lib/runtime_tools/src/Makefile +--- otp_src_18.3-orig/lib/runtime_tools/src/Makefile ++++ otp_src_18.3-fixed/lib/runtime_tools/src/Makefile @@ -97,8 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -659,8 +659,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" ---- otp_src_18.2-orig/lib/sasl/src/Makefile -+++ otp_src_18.2-fixed/lib/sasl/src/Makefile +--- otp_src_18.3-orig/lib/sasl/src/Makefile ++++ otp_src_18.3-fixed/lib/sasl/src/Makefile @@ -93,7 +93,6 @@ release_spec: opt @@ -669,8 +669,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/snmp/src/agent/Makefile -+++ otp_src_18.2-fixed/lib/snmp/src/agent/Makefile +--- otp_src_18.3-orig/lib/snmp/src/agent/Makefile ++++ otp_src_18.3-fixed/lib/snmp/src/agent/Makefile @@ -131,7 +131,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -680,8 +680,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/snmp/src/app/Makefile -+++ otp_src_18.2-fixed/lib/snmp/src/app/Makefile +--- otp_src_18.3-orig/lib/snmp/src/app/Makefile ++++ otp_src_18.3-fixed/lib/snmp/src/app/Makefile @@ -132,7 +132,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -691,8 +691,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/snmp/src/compile/Makefile -+++ otp_src_18.2-fixed/lib/snmp/src/compile/Makefile +--- otp_src_18.3-orig/lib/snmp/src/compile/Makefile ++++ otp_src_18.3-fixed/lib/snmp/src/compile/Makefile @@ -123,7 +123,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -702,8 +702,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/bin" ---- otp_src_18.2-orig/lib/snmp/src/manager/Makefile -+++ otp_src_18.2-fixed/lib/snmp/src/manager/Makefile +--- otp_src_18.3-orig/lib/snmp/src/manager/Makefile ++++ otp_src_18.3-fixed/lib/snmp/src/manager/Makefile @@ -114,7 +114,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -713,8 +713,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/snmp/src/misc/Makefile -+++ otp_src_18.2-fixed/lib/snmp/src/misc/Makefile +--- otp_src_18.3-orig/lib/snmp/src/misc/Makefile ++++ otp_src_18.3-fixed/lib/snmp/src/misc/Makefile @@ -112,7 +112,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -724,8 +724,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/ssh/src/Makefile -+++ otp_src_18.2-fixed/lib/ssh/src/Makefile +--- otp_src_18.3-orig/lib/ssh/src/Makefile ++++ otp_src_18.3-fixed/lib/ssh/src/Makefile @@ -135,7 +135,7 @@ release_spec: opt @@ -735,9 +735,9 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/ssl/src/Makefile -+++ otp_src_18.2-fixed/lib/ssl/src/Makefile -@@ -141,7 +141,7 @@ +--- otp_src_18.3-orig/lib/ssl/src/Makefile ++++ otp_src_18.3-fixed/lib/ssl/src/Makefile +@@ -142,7 +142,7 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -746,8 +746,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/stdlib/src/Makefile -+++ otp_src_18.2-fixed/lib/stdlib/src/Makefile +--- otp_src_18.3-orig/lib/stdlib/src/Makefile ++++ otp_src_18.3-fixed/lib/stdlib/src/Makefile @@ -207,7 +207,6 @@ release_spec: opt @@ -756,8 +756,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/syntax_tools/src/Makefile -+++ otp_src_18.2-fixed/lib/syntax_tools/src/Makefile +--- otp_src_18.3-orig/lib/syntax_tools/src/Makefile ++++ otp_src_18.3-fixed/lib/syntax_tools/src/Makefile @@ -100,8 +100,6 @@ release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/ebin" @@ -767,8 +767,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/test_server/src/Makefile -+++ otp_src_18.2-fixed/lib/test_server/src/Makefile +--- otp_src_18.3-orig/lib/test_server/src/Makefile ++++ otp_src_18.3-fixed/lib/test_server/src/Makefile @@ -124,7 +124,6 @@ release_spec: opt @@ -777,8 +777,8 @@ $(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TS_HRL_FILES) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" ---- otp_src_18.2-orig/lib/tools/src/Makefile -+++ otp_src_18.2-fixed/lib/tools/src/Makefile +--- otp_src_18.3-orig/lib/tools/src/Makefile ++++ otp_src_18.3-fixed/lib/tools/src/Makefile @@ -107,7 +107,7 @@ release_spec: opt @@ -788,8 +788,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/typer/src/Makefile -+++ otp_src_18.2-fixed/lib/typer/src/Makefile +--- otp_src_18.3-orig/lib/typer/src/Makefile ++++ otp_src_18.3-fixed/lib/typer/src/Makefile @@ -102,9 +102,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -800,8 +800,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/webtool/src/Makefile -+++ otp_src_18.2-fixed/lib/webtool/src/Makefile +--- otp_src_18.3-orig/lib/webtool/src/Makefile ++++ otp_src_18.3-fixed/lib/webtool/src/Makefile @@ -88,8 +88,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -811,8 +811,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/wx/src/Makefile -+++ otp_src_18.2-fixed/lib/wx/src/Makefile +--- otp_src_18.3-orig/lib/wx/src/Makefile ++++ otp_src_18.3-fixed/lib/wx/src/Makefile @@ -122,9 +122,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -825,8 +825,8 @@ $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" ---- otp_src_18.2-orig/lib/xmerl/src/Makefile -+++ otp_src_18.2-fixed/lib/xmerl/src/Makefile +--- otp_src_18.3-orig/lib/xmerl/src/Makefile ++++ otp_src_18.3-fixed/lib/xmerl/src/Makefile @@ -218,9 +218,7 @@ $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/community/erlang/0070-otp-update-version-18.2.2.patch b/community/erlang/0070-otp-update-version-18.2.2.patch deleted file mode 100644 index 6b5ec35..0000000 --- a/community/erlang/0070-otp-update-version-18.2.2.patch +++ /dev/null @@ -1,180 +0,0 @@ ---- a/OTP_VERSION -+++ b/OTP_VERSION -@@ -1 +1 @@ --18.2.1 -+18.2.2 ---- a/lib/ssh/doc/src/notes.xml -+++ b/lib/ssh/doc/src/notes.xml -@@ -30,6 +30,24 @@ - notes.xml - - -+
Ssh 4.2.1 -+ -+
Fixed Bugs and Malfunctions -+ -+ -+

-+ The authentication method 'keyboard-interactive' failed -+ in the Erlang client when the server after successful -+ authentication continued by asking for zero more -+ passwords.

-+

-+ Own Id: OTP-13225

-+ -+ -+
-+ -+
-+ -
Ssh 4.2 - -
Fixed Bugs and Malfunctions ---- a/lib/ssh/src/ssh_auth.erl -+++ b/lib/ssh/src/ssh_auth.erl -@@ -477,7 +477,7 @@ keyboard_interact_get_responses(_, undefined, Password, _, _, _, _, _, - 1) when Password =/= undefined -> - [Password]; %% Password auth implemented with keyboard-interaction and passwd is known - keyboard_interact_get_responses(_, _, _, _, _, _, _, _, 0) -> -- [""]; -+ []; - keyboard_interact_get_responses(false, undefined, undefined, _, _, _, [Prompt|_], Opts, _) -> - ssh_no_io:read_line(Prompt, Opts); %% Throws error as keyboard interaction is not allowed - keyboard_interact_get_responses(true, undefined, _,IoCb, Name, Instr, PromptInfos, Opts, _) -> ---- a/lib/ssh/src/ssh_connection_handler.erl -+++ b/lib/ssh/src/ssh_connection_handler.erl -@@ -648,10 +648,12 @@ userauth_keyboard_interactive(Msg = #ssh_msg_userauth_failure{}, - userauth_keyboard_interactive_info_response(Msg=#ssh_msg_userauth_failure{}, - #state{ssh_params = #ssh{role = client}} = State) -> - userauth(Msg, State); -- - userauth_keyboard_interactive_info_response(Msg=#ssh_msg_userauth_success{}, - #state{ssh_params = #ssh{role = client}} = State) -> -- userauth(Msg, State). -+ userauth(Msg, State); -+userauth_keyboard_interactive_info_response(Msg=#ssh_msg_userauth_info_request{}, -+ #state{ssh_params = #ssh{role = client}} = State) -> -+ userauth_keyboard_interactive(Msg, State). - - %%-------------------------------------------------------------------- - -spec connected({#ssh_msg_kexinit{}, binary()}, %%| %% #ssh_msg_kexdh_init{}, ---- a/lib/ssh/test/ssh_protocol_SUITE.erl -+++ b/lib/ssh/test/ssh_protocol_SUITE.erl -@@ -48,6 +48,7 @@ all() -> - [{group,tool_tests}, - {group,kex}, - {group,service_requests}, -+ {group,authentication}, - {group,packet_size_error}, - {group,field_size_error} - ]. -@@ -78,7 +79,9 @@ groups() -> - bad_very_long_service_name, - empty_service_name, - bad_service_name_then_correct -- ]} -+ ]}, -+ {authentication, [], [client_handles_keyboard_interactive_0_pwds -+ ]} - ]. - - -@@ -516,6 +519,82 @@ bad_service_name_length(Config, LengthExcess) -> - receive_msg} - ], InitialState). - -+%%%-------------------------------------------------------------------- -+%%% This is due to a fault report (OTP-13255) with OpenSSH-6.6.1 -+client_handles_keyboard_interactive_0_pwds(Config) -> -+ {User,_Pwd} = server_user_password(Config), -+ -+ %% Create a listening socket as server socket: -+ {ok,InitialState} = ssh_trpt_test_lib:exec(listen), -+ HostPort = ssh_trpt_test_lib:server_host_port(InitialState), -+ -+ %% Start a process handling one connection on the server side: -+ spawn_link( -+ fun() -> -+ {ok,_} = -+ ssh_trpt_test_lib:exec( -+ [{set_options, [print_ops, print_messages]}, -+ {accept, [{system_dir, system_dir(Config)}, -+ {user_dir, user_dir(Config)}]}, -+ receive_hello, -+ {send, hello}, -+ -+ {send, ssh_msg_kexinit}, -+ {match, #ssh_msg_kexinit{_='_'}, receive_msg}, -+ -+ {match, #ssh_msg_kexdh_init{_='_'}, receive_msg}, -+ {send, ssh_msg_kexdh_reply}, -+ -+ {send, #ssh_msg_newkeys{}}, -+ {match, #ssh_msg_newkeys{_='_'}, receive_msg}, -+ -+ {match, #ssh_msg_service_request{name="ssh-userauth"}, receive_msg}, -+ {send, #ssh_msg_service_accept{name="ssh-userauth"}}, -+ -+ {match, #ssh_msg_userauth_request{service="ssh-connection", -+ method="none", -+ user=User, -+ _='_'}, receive_msg}, -+ {send, #ssh_msg_userauth_failure{authentications = "keyboard-interactive", -+ partial_success = false}}, -+ -+ {match, #ssh_msg_userauth_request{service="ssh-connection", -+ method="keyboard-interactive", -+ user=User, -+ _='_'}, receive_msg}, -+ {send, #ssh_msg_userauth_info_request{name = "", -+ instruction = "", -+ language_tag = "", -+ num_prompts = 1, -+ data = <<0,0,0,10,80,97,115,115,119,111,114,100,58,32,0>> -+ }}, -+ {match, #ssh_msg_userauth_info_response{num_responses = 1, -+ _='_'}, receive_msg}, -+ -+ %% the next is strange, but openssh 6.6.1 does this and this is what this testcase is about -+ {send, #ssh_msg_userauth_info_request{name = "", -+ instruction = "", -+ language_tag = "", -+ num_prompts = 0, -+ data = <<>> -+ }}, -+ {match, #ssh_msg_userauth_info_response{num_responses = 0, -+ data = <<>>, -+ _='_'}, receive_msg}, -+ %% Here we know that the tested fault is fixed -+ {send, #ssh_msg_userauth_success{}}, -+ close_socket, -+ print_state -+ ], -+ InitialState) -+ end), -+ -+ %% and finally connect to it with a regular Erlang SSH client: -+ {ok,_} = std_connect(HostPort, Config, -+ [{preferred_algorithms,[{kex,['diffie-hellman-group1-sha1']}]}] -+ ). -+ -+ - %%%================================================================ - %%%==== Internal functions ======================================== - %%%================================================================ ---- a/lib/ssh/vsn.mk -+++ b/lib/ssh/vsn.mk -@@ -1,5 +1,5 @@ - #-*-makefile-*- ; force emacs to enter makefile-mode - --SSH_VSN = 4.2 -+SSH_VSN = 4.2.1 - - APP_VSN = "ssh-$(SSH_VSN)" ---- a/otp_versions.table -+++ b/otp_versions.table -@@ -1,3 +1,4 @@ -+OTP-18.2.2 : ssh-4.2.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 : - OTP-18.2.1 : erts-7.2.1 # asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.2 debugger-4.1.1 dialyzer-2.8.2 diameter-1.11.1 edoc-0.7.17 eldap-1.2 erl_docgen-0.4.1 erl_interface-3.8.1 et-1.5.1 eunit-2.2.12 gs-1.6 hipe-3.14 ic-4.4 inets-6.1 jinterface-1.6.1 kernel-4.1.1 megaco-3.18 mnesia-4.13.2 observer-2.1.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1.1 percept-0.8.11 public_key-1.1 reltool-0.7 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2 ssl-7.2 stdlib-2.7 syntax_tools-1.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 webtool-0.9 wx-1.6 xmerl-1.3.9 : - OTP-18.2 : asn1-4.0.1 common_test-1.11.1 compiler-6.0.2 crypto-3.6.2 dialyzer-2.8.2 diameter-1.11.1 erl_docgen-0.4.1 erl_interface-3.8.1 erts-7.2 eunit-2.2.12 hipe-3.14 inets-6.1 jinterface-1.6.1 kernel-4.1.1 observer-2.1.1 parsetools-2.1.1 public_key-1.1 runtime_tools-1.9.2 sasl-2.6.1 snmp-5.2.1 ssh-4.2 ssl-7.2 stdlib-2.7 test_server-3.9.1 tools-2.8.2 typer-0.9.10 wx-1.6 xmerl-1.3.9 # cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 debugger-4.1.1 edoc-0.7.17 eldap-1.2 et-1.5.1 gs-1.6 ic-4.4 megaco-3.18 mnesia-4.13.2 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 percept-0.8.11 reltool-0.7 syntax_tools-1.7 webtool-0.9 : - OTP-18.1.5 : ssh-4.1.3 # asn1-4.0 common_test-1.11 compiler-6.0.1 cosEvent-2.2 cosEventDomain-1.2 cosFileTransfer-1.2 cosNotification-1.2 cosProperty-1.2 cosTime-1.2 cosTransactions-1.3 crypto-3.6.1 debugger-4.1.1 dialyzer-2.8.1 diameter-1.11 edoc-0.7.17 eldap-1.2 erl_docgen-0.4 erl_interface-3.8 erts-7.1 et-1.5.1 eunit-2.2.11 gs-1.6 hipe-3.13 ic-4.4 inets-6.0.3 jinterface-1.6 kernel-4.1 megaco-3.18 mnesia-4.13.2 observer-2.1 odbc-2.11.1 orber-3.8 os_mon-2.4 ose-1.1 otp_mibs-1.1 parsetools-2.1 percept-0.8.11 public_key-1.0.1 reltool-0.7 runtime_tools-1.9.1 sasl-2.6 snmp-5.2 ssl-7.1 stdlib-2.6 syntax_tools-1.7 test_server-3.9 tools-2.8.1 typer-0.9.9 webtool-0.9 wx-1.5 xmerl-1.3.8 : diff --git a/community/erlang/APKBUILD b/community/erlang/APKBUILD index 72ee42c..108b64b 100644 --- a/community/erlang/APKBUILD +++ b/community/erlang/APKBUILD @@ -2,8 +2,8 @@ # Maintainer: Marlus Saraiva pkgname=erlang -pkgver=18.2.2 -_srcver=18.2.1 +pkgver=18.3 +_srcver=18.3 pkgrel=0 pkgdesc="General-purpose programming language and runtime environment" url="http://www.erlang.org/" @@ -74,8 +74,7 @@ source="http://www.erlang.org/download/otp_src_$_srcver.tar.gz 0006-Do-not-install-erlang-sources.patch 0007-Split-off-webtool-dependency-from-tools.patch 0010-fix-nteventlog-remove.patch - 0060-set-disksup_posix_only-to-true.patch - 0070-otp-update-version-18.2.2.patch" + 0060-set-disksup_posix_only-to-true.patch" _builddir="$srcdir"/otp_src_$_srcver @@ -209,36 +208,33 @@ dev() { } -md5sums="ebb226d51f89ec54cc83ce5d417ce55e otp_src_18.2.1.tar.gz +md5sums="7e4ff32f97c36fb3dab736f8d481830b otp_src_18.3.tar.gz 11d2bfea3dd3138409337d62f2348ff2 0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch ef4b726309a749010553259080960753 0002-Remove-rpath.patch 458118f96fb0c973a30630c070bd94aa 0003-Do-not-install-C-sources.patch 1c3b158ac8408fced9a0f3630f4498f1 0004-Do-not-install-Java-sources.patch f4aa0cc27dc57ea4dcd57191b1948a4d 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch -26abd5afb14d72afd95eae574d8f13d1 0006-Do-not-install-erlang-sources.patch +a8e9e58c2444ac3994a6b418fd387369 0006-Do-not-install-erlang-sources.patch b438c37818b5c82443682c3693dd7e53 0007-Split-off-webtool-dependency-from-tools.patch 0dd300003ff68fc46dc3c839c2541d53 0010-fix-nteventlog-remove.patch -d17fbaafa9f7820ade09b239c00aede6 0060-set-disksup_posix_only-to-true.patch -fa3900d137124244371c6aca0fed285f 0070-otp-update-version-18.2.2.patch" -sha256sums="82d76ebfeeda5db64ea5b0f1a04aa0e9ac63380b278722e0e6052249bd3fe39a otp_src_18.2.1.tar.gz +d17fbaafa9f7820ade09b239c00aede6 0060-set-disksup_posix_only-to-true.patch" +sha256sums="fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 otp_src_18.3.tar.gz 536e78192f915733cbbb264883af6d9b11c9e70c2c4d3d825b58c4dbec36db86 0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch b2e5844215d7f5f5026a77342dd698d16103cc726d23f8265bcc8399d1a82bb9 0002-Remove-rpath.patch 81062f0eb9a72cbfac600fab56823161f92e1e5107b359f27f9f0ec511b8aec5 0003-Do-not-install-C-sources.patch 2ed61274decb534ab4142bd0a2116a75e3fe82d33a8ff145524173ce5773b0e2 0004-Do-not-install-Java-sources.patch 71c8a55fe036d5a04ba2c008b51d8950c3f18d83edaffb9bef2a9d19dd2f79f3 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch -cf0d060ff90925a53ca346f2b68cf61a95db855406f884894b1eb0df9b772e65 0006-Do-not-install-erlang-sources.patch +fcf2c37b3eaddd3e1bea2880c1b80f010623743ab2f43e144e0ecc7be874d4ff 0006-Do-not-install-erlang-sources.patch 9704a53bc4bd6f5624f9ce3f201128204011f4579f19b547df74d92ae22777cf 0007-Split-off-webtool-dependency-from-tools.patch 019c62ea3fee60068caa8c3152d7f96e76591fc5dc096abfcea48ec1593eb758 0010-fix-nteventlog-remove.patch -3ffda0b3acbde755b496c1a974c20e1ca580432c403944c1c16836f48e248429 0060-set-disksup_posix_only-to-true.patch -3bf9cbc80632639f5e3eb94c0e83ffd089bdfe6b992bd4ac49e0628b549de1b4 0070-otp-update-version-18.2.2.patch" -sha512sums="00fba01b61e43a88cf2df4a40053e7239541ae9177949da7524d7fa481d6892495f28d98650336f647ef3bf2ee24f62e83fd5f6dffb40c7345804b880b59569c otp_src_18.2.1.tar.gz +3ffda0b3acbde755b496c1a974c20e1ca580432c403944c1c16836f48e248429 0060-set-disksup_posix_only-to-true.patch" +sha512sums="f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 otp_src_18.3.tar.gz 172f9b0f61748bf2f04737df0451bcc9c0812db0f365f0ef7c7c244fceb991987f79a5274eea578a89cc7d077f84645d1395d9dbcbf14010268b896a080c2ccf 0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch 97c40c185b71b23ffcb924639af390b9a0be897070e396a9413e193e6d43048dfe3b86bcd0c5598b81a66ce1349de9e09f5228a452b51b6612cd947bbafb6377 0002-Remove-rpath.patch 1cae89d1e8f9d375ae08c7de2b8f7a5143bcded90eef878e97c408542a50e9a880166311820013301e46364be0ae090d3fc515b6f915ead14e787b98290beec1 0003-Do-not-install-C-sources.patch b174e3c9103aa26e3b4993ae77b849a55f733e6f8e5dd7bb641a8548aea7fcc91b99d772c91ff8864fff5c30b388438f8cb41d7ac941a86fc7bb1891f9838068 0004-Do-not-install-Java-sources.patch 923addcb1f6472829ba13ccc91ad3cef161f269478404f0a19bc4997118e06edd7459011a60769eb393eac930f30d4bd6c5526301382a5f9815862237f4664d3 0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch -cba2f58334a176883a9ae598192b56c637d6cd8a7404201aae3c1022f5f5425e8c7444e88ce2e548e1ec9cfc805e5cbc509ca05a9c4f0d040eb3e7a2d53810ec 0006-Do-not-install-erlang-sources.patch +ef9045ec689e2a6517dba7626c1225a9a265f14675d704effd324529c3d5128260ba64cebfd41185364d2c5ac9a644ccc7088d0031c14c6ff74cd60f3c5bff1f 0006-Do-not-install-erlang-sources.patch d65fcfc3a9441941c6292c33d354964a82da11cc7a411dd0440719e490075ed588c1e70690e80650561749010d737394567f12ff73bd460f0d00c792c77cfae3 0007-Split-off-webtool-dependency-from-tools.patch b7387f92f8c27a0565c7885bba4b357183c62d422616e073bc5ffad338a0e22cb5165dcb3b95bf0b920ba00831599f2216027883f4be255aa6f6150b68b7a37c 0010-fix-nteventlog-remove.patch -f3c50f8610e08173c365a575737079b0259db6fc0dfa5b1be63c281b52358bbce9e2595132a8f6a06772785d7d38d108f8da8515e2f7706cd03b6585aab4d071 0060-set-disksup_posix_only-to-true.patch -872b4d9c084d68aff6320c47497cf4aa2503fe49520970404cdb24e28c0625c045ce24125ef6d97df34175cf0f69902a26e783857fc74e967c00e9afb6b92b6c 0070-otp-update-version-18.2.2.patch" +f3c50f8610e08173c365a575737079b0259db6fc0dfa5b1be63c281b52358bbce9e2595132a8f6a06772785d7d38d108f8da8515e2f7706cd03b6585aab4d071 0060-set-disksup_posix_only-to-true.patch" -- 2.8.0 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---