[From nobody Thu Jun 25 05:54:49 2020
Received: from sonic315-20.consmr.mail.ne1.yahoo.com ([66.163.190.146])
 by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
 id 1fPsKi-0006qv-3c
 for openwrt-devel@lists.openwrt.org; Mon, 04 Jun 2018 16:27:53 +0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048;
 t=1528129655; bh=gAxGlM99XuxKZdJspaSgyF4oLJu85MjtSN9IDxFaiDw=;
 h=Date:From:To:Cc:In-Reply-To:References:Subject:From:Subject;
 b=dVqDyfyG454veo8WJlWU5ahOMSopz6qH+ne+zu4eaLRz60hjtbWNhZEE676M0+0178nlIycrHhGBQr/nhOW2Tjq/dYgZpOHcAhplLJ1iS5GIPVvSsNdQ1BM4XtRqc8OnF4yxvMLDk0JlDJTyDXQAaIAOaSMnQqwnZtCIqqFM6tol19xEDlsL22B4SYZe9GFNsgKjHnHuhq0KH4Jbbku5lWRqsHNG0qdjBlujdPPnFQwvDmDLO13gqSDIGoUZPwBF0+6XnLcDRF6zDiFW4xfFbFB3SqQrnR9l7PN8Dw5E8WoEzHTHPgMvbRYXy/hVq4X5V/zqUxMsOPVOH0bBCkdsIg==
X-YMail-OSG: u17ttPwVM1lwKWVhNcw8YuGd8o5GrYh0fKcTCV9FYAY.Y0RmIN6Zw.ZLUbyp0o2
 Yksz4jwDlyKkvmH3RY7jugKY49FQ4z43g80oY5bXv.tpM9yaZZje9TzR.aJTvE0PFZOO1g8XFwun
 66mCdVr19MB.IZoN9w7MBWbrGG6_GO68VLkvFnkA1tA5nQFoiWp9KPlm9iyflFvvD8AT2ui0Jr7X
 maVBe_ai8uMT.31oXGNS9sGGxXuysjG9204.0kQl.z5tRhbgQq55UOuhXrlWy4VKPjznY79tIjXZ
 tw59K.rWnJZf6aO31pAQPEHpXQvmVf6Ll9OA7dXIiYTd3_aCe5NyXraPiKRVSBlwHj_WlU5QK0cf
 eHSQINXoFtQqaAg_u9OZn7LLQUKItWWNobW7ETTgDQQg3RWcKqNZTZSLEZgDm1uZOEwyjl_yLqTo
 Qqu.ZVmrqJTFoNW5o6bjCbqbpd.my5yG4ctDGAmeGZEJ4IqD0c_YpMq_XtYEGMiigdzkdvR_rhjI
 6cwBp8GsVLCnKVHEKil6J7hacchyfz2GbsN5ZHQ2eyxC97zwfBMwm9wwNRfw3GU0n3eJyfW0Tvfr
 MxJCtFVplabwzIrN9V7zVcABOJgjaz70sRAneSimEzUTUxaYxZ8V4zN9oLJyv_5ZGHMjPTv43
Received: from sonic.gate.mail.ne1.yahoo.com by
 sonic315.consmr.mail.ne1.yahoo.com with HTTP; Mon, 4 Jun 2018 16:27:35 +0000
Date: Mon, 4 Jun 2018 16:27:33 +0000 (UTC)
From: Eneas Ulir de Queiroz <cote2004-github@yahoo.com>
To: Philip Prindeville <philipp_subx@redfish-solutions.com>
Cc: openwrt-devel@lists.openwrt.org
Message-ID: <410265398.1961380.1528129653990@mail.yahoo.com>
In-Reply-To: <6115FE34-E479-418E-BB89-2815AF5E4FAE@redfish-solutions.com>
References: <20180531021837.22899-1-cote2004-github@yahoo.com>
 <20180522120215.13360-4-cote2004-github@yahoo.com>
 <mailman.1937.1527733277.25356.openwrt-devel@lists.openwrt.org>
 <6115FE34-E479-418E-BB89-2815AF5E4FAE@redfish-solutions.com>
Subject: Re: [OpenWrt-Devel] [PATCH v2 1/4] openssl: Upgrade to 1.1.0h
MIME-Version: 1.0
Content-Type: multipart/alternative; 
 boundary="----=_Part_1961379_1081484806.1528129653957"
X-Mailer: WebService/1.1.11871 YMailNorrin Mozilla/5.0 (Windows NT 6.1; Win64;
 x64; rv:60.0) Gecko/20100101 Firefox/60.0
Content-Length: 129295
X-Spam-Note: CRM114 run bypassed due to message size (131564 bytes)
X-Spam-Score: -0.1 (/)
X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary:
 Content analysis details:   (-0.1 points)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 -0.0 RCVD_IN_DNSWL_NONE     RBL: Sender listed at http://www.dnswl.org/, no
 trust [66.163.190.146 listed in list.dnswl.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider
 (cote2004-github[at]yahoo.com)
 0.0 HTML_MESSAGE           BODY: HTML included in message
 -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature
 -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's
 domain
 0.1 DKIM_SIGNED            Message has a DKIM or DK signature,
 not necessarily valid
X-Mailman-Approved-At: Mon, 20 Aug 2018 03:42:23 -0700

------=_Part_1961379_1081484806.1528129653957
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

 Sorry about the typos and spacing changes.=C2=A0 This should have never ha=
ppened.=C2=A0 Thank you for pointing them out.=C2=A0 I have corrected them =
in the PR I've opened on github.=C2=A0 Since I'm new to the mailing list an=
d don't know what the best way to proceed, please advise me.=C2=A0 I have 4=
 patches all related to the openssl upgrade.=C2=A0 John asked me earlier to=
 send the whole bundle, so that people wouldn't need to search for them all=
 over the list.=C2=A0 Now I have to change just one of them.=C2=A0 Should I=
 repost all 4, or is it OK to do a V3 for just the openssl patch?
Since it's only the text I'm changing, I don't feel the need to do it right=
 away--I still have plenty of pull requests to send to the packages feed.=
=C2=A0 I will change the PR I've opened in github right away, but I feel li=
ke I'm polluting the mailing list if I do it just for some typos in the tex=
t.=C2=A0 If there are nothing else to change, my intent is to repost the pa=
tch after I'm finished with the packages feed.
By the way, here's the progress with the packages that depend on openssl (p=
ackages that were added or removed after I posted the patch are not tallied=
):
 Global Progress
---------------
Total packages=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 152=C2=A0=C2=
=A0=C2=A0 100,00%
Packages that worked right away=C2=A0=C2=A0=C2=A0 109=C2=A0=C2=A0=C2=A0=C2=
=A0 71,71%
Packages working now=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 122=C2=A0=C2=A0=C2=A0=C2=A0 80,26%
Packages that still need changes=C2=A0=C2=A0=C2=A0 30=C2=A0=C2=A0=C2=A0=C2=
=A0 19,74%
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0
PR Progress
-----------
Total packages that needed changes=C2=A0 43=C2=A0=C2=A0=C2=A0 100,00%
PRs created=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 32=C2=A0=C2=A0=C2=A0=C2=A0 74,42%
Merged PRs=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 13=C2=A0=C2=A0=C2=A0=C2=A0 30,23%
Open PRs=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 19=C2=A0=C2=A0=C2=A0=C2=A0 44,19%
PRs to open=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0 11=C2=A0=C2=A0=C2=A0=C2=A0 25,58%

As for the comment about dropping=C2=A0 the engines:=C2=A0 I'm removing the=
 patch that dropped the engines, and adding some options to control their i=
nstallation, not ditching the engines.
Cheers,
Eneas

    Em domingo, 3 de junho de 2018 14:58:42 BRT, Philip Prindeville <philip=
p_subx@redfish-solutions.com> escreveu: =20
=20
 Inline=E2=80=A6 but generally, please spellcheck yourself.

> On May 30, 2018, at 8:35 PM, Eneas U de Queiroz via openwrt-devel <openwr=
t-devel@lists.openwrt.org> wrote:
>=20
> From: Eneas U de Queiroz <cote2004-github@yahoo.com>
> Subject: [PATCH v2 1/4] openssl: Upgrade to 1.1.0h
> Date: May 30, 2018 at 8:18:34 PM MDT
> To: openwrt-devel@lists.openwrt.org
> Cc: Eneas U de Queiroz <cote2004-github@yahoo.com>
>=20
>=20
> This version brings major changes to the API, so many packages will need
> adjustments or version bumps.
> Separated the individual engines in place of the generic "hardware
> support" option.
>=20
> Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
> ---
> package/libs/openssl/Config.in=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 45 ++---
> package/libs/openssl/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 80 ++++-----
> .../patches/100-Configure-afalg-support.patch=C2=A0 =C2=A0 =C2=A0 |=C2=A0=
 13 ++
> .../libs/openssl/patches/110-openwrt_targets.patch |=C2=A0 26 +++
> .../openssl/patches/110-optimize-for-size.patch=C2=A0 =C2=A0 |=C2=A0 16 -=
-
> ..._segfault.patch =3D> 120-fix_link_segfault.patch} |=C2=A0 16 +-
> package/libs/openssl/patches/130-perl-path.patch=C2=A0 |=C2=A0 64 -------
> .../libs/openssl/patches/140-makefile-dirs.patch=C2=A0 |=C2=A0 11 --
> package/libs/openssl/patches/150-no_engines.patch=C2=A0 |=C2=A0 81 ------=
---
> .../openssl/patches/160-disable_doc_tests.patch=C2=A0 =C2=A0 |=C2=A0 58 -=
------
> package/libs/openssl/patches/170-bash_path.patch=C2=A0 |=C2=A0 8 -
> .../patches/190-remove_timestamp_check.patch=C2=A0 =C2=A0 =C2=A0 |=C2=A0 =
23 ---
> .../libs/openssl/patches/200-parallel_build.patch=C2=A0 | 184 -----------=
----------
> 13 files changed, 107 insertions(+), 518 deletions(-)
> create mode 100644 package/libs/openssl/patches/100-Configure-afalg-suppo=
rt.patch
> create mode 100644 package/libs/openssl/patches/110-openwrt_targets.patch
> delete mode 100644 package/libs/openssl/patches/110-optimize-for-size.pat=
ch
> rename package/libs/openssl/patches/{180-fix_link_segfault.patch =3D> 120=
-fix_link_segfault.patch} (52%)
> delete mode 100644 package/libs/openssl/patches/130-perl-path.patch
> delete mode 100644 package/libs/openssl/patches/140-makefile-dirs.patch
> delete mode 100644 package/libs/openssl/patches/150-no_engines.patch
> delete mode 100644 package/libs/openssl/patches/160-disable_doc_tests.pat=
ch
> delete mode 100644 package/libs/openssl/patches/170-bash_path.patch
> delete mode 100644 package/libs/openssl/patches/190-remove_timestamp_chec=
k.patch
> delete mode 100644 package/libs/openssl/patches/200-parallel_build.patch
>=20
> diff --git a/package/libs/openssl/Config.in b/package/libs/openssl/Config=
.in
> index 96d3ba3e9d..a705aa741c 100644
> --- a/package/libs/openssl/Config.in
> +++ b/package/libs/openssl/Config.in
> @@ -10,11 +10,6 @@ config OPENSSL_WITH_EC2M
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 depends on OPENSSL_WITH_EC
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 prompt "Enable ec2m support"
>=20
> -config OPENSSL_WITH_SSL3
> -=C2=A0=C2=A0=C2=A0 bool
> -=C2=A0=C2=A0=C2=A0 default n
> -=C2=A0=C2=A0=C2=A0 prompt "Enable sslv3 support"
> -
> config OPENSSL_WITH_DEPRECATED
> =C2=A0=C2=A0=C2=A0 bool
> =C2=A0=C2=A0=C2=A0 default y
> @@ -30,11 +25,6 @@ config OPENSSL_WITH_COMPRESSION
> =C2=A0=C2=A0=C2=A0 default n
> =C2=A0=C2=A0=C2=A0 prompt "Enable compression support"
>=20
> -config OPENSSL_WITH_NPN
> -=C2=A0=C2=A0=C2=A0 bool
> -=C2=A0=C2=A0=C2=A0 default y
> -=C2=A0=C2=A0=C2=A0 prompt "Enable NPN support"
> -
> config OPENSSL_WITH_PSK
> =C2=A0=C2=A0=C2=A0 bool
> =C2=A0=C2=A0=C2=A0 default y
> @@ -45,24 +35,37 @@ config OPENSSL_WITH_SRP
> =C2=A0=C2=A0=C2=A0 default y
> =C2=A0=C2=A0=C2=A0 prompt "Enable SRP support"
>=20
> -config OPENSSL_ENGINE_DIGEST
> +config OPENSSL_OPTIMIZE_SPEED
> =C2=A0=C2=A0=C2=A0 bool
> -=C2=A0=C2=A0=C2=A0 depends on OPENSSL_ENGINE_CRYPTO
> -=C2=A0=C2=A0=C2=A0 prompt "Digests acceleration support"
> +=C2=A0=C2=A0=C2=A0 default n
> +=C2=A0=C2=A0=C2=A0 prompt "Enable optimization for speed instead of size=
"
> +
> +config OPENSSL_ENGINE
> +=C2=A0=C2=A0=C2=A0 bool "Enable engine support"
> +=C2=A0=C2=A0=C2=A0 help
> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 This enables alternative cryptogra=
phy impelementations,


=E2=80=9Cimplementations=E2=80=9D


> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 most commonly for interfacig with =
external crypto devices,


=E2=80=9Cinterfacing=E2=80=9D


> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 or supporting new/alternative ciph=
ers and digests.
>=20
> -config OPENSSL_HARDWARE_SUPPORT
> +config OPENSSL_ENGINE_AFALG
> =C2=A0=C2=A0=C2=A0 bool
> -=C2=A0=C2=A0=C2=A0 default n
> -=C2=A0=C2=A0=C2=A0 prompt "Enable hardware support"
> +=C2=A0=C2=A0=C2=A0 depends on OPENSSL_ENGINE && !LINUX_3_18
> +=C2=A0=C2=A0=C2=A0 select KERNEL_AIO
> +=C2=A0=C2=A0=C2=A0 prompt "Enable acceleration support through AF_ALG en=
gine"
>=20
> -config OPENSSL_OPTIMIZE_SPEED
> +config OPENSSL_ENGINE_PADLOCK
> =C2=A0=C2=A0=C2=A0 bool
> -=C2=A0=C2=A0=C2=A0 default n
> -=C2=A0=C2=A0=C2=A0 prompt "Enable optimization for speed instead of size=
"
> +=C2=A0=C2=A0=C2=A0 depends on OPENSSL_ENGINE
> +=C2=A0=C2=A0=C2=A0 prompt "Enable VIA Padlock crypto hardware accelerati=
on engine" if TARGET_x86
> +
> +config OPENSSL_ENGINE_DIGEST
> +=C2=A0=C2=A0=C2=A0 bool
> +=C2=A0=C2=A0=C2=A0 depends on OPENSSL_ENGINE_CRYPTO
> +=C2=A0=C2=A0=C2=A0 prompt "Digests acceleration support=E2=80=9D


Use singular.


>=20
> endif
>=20
> config OPENSSL_ENGINE_CRYPTO
> =C2=A0=C2=A0=C2=A0 bool
> -=C2=A0=C2=A0=C2=A0 select OPENSSL_HARDWARE_SUPPORT
> -=C2=A0=C2=A0=C2=A0 prompt "Crypto acceleration support" if PACKAGE_libop=
enssl
> +=C2=A0=C2=A0=C2=A0 select OPENSSL_ENGINE
> +=C2=A0=C2=A0=C2=A0 prompt "Acceleration support through /dev/crypto" if =
PACKAGE_libopenssl
> diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefil=
e
> index 8409730d70..1c71a3c9ae 100644
> --- a/package/libs/openssl/Makefile
> +++ b/package/libs/openssl/Makefile
> @@ -8,8 +8,8 @@
> include $(TOPDIR)/rules.mk
>=20
> PKG_NAME:=3Dopenssl
> -PKG_BASE:=3D1.0.2
> -PKG_BUGFIX:=3Do
> +PKG_BASE:=3D1.1.0
> +PKG_BUGFIX:=3Dh
> PKG_VERSION:=3D$(PKG_BASE)$(PKG_BUGFIX)
> PKG_RELEASE:=3D1
> PKG_USE_MIPS16:=3D0
> @@ -24,22 +24,22 @@ PKG_SOURCE_URL:=3D \
> =C2=A0=C2=A0=C2=A0 http://gd.tuwien.ac.at/infosys/security/openssl/source=
/ \
> =C2=A0=C2=A0=C2=A0 http://www.openssl.org/source/ \
> =C2=A0=C2=A0=C2=A0 http://www.openssl.org/source/old/$(PKG_BASE)/
> -PKG_HASH:=3Dec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e808=
9e4d
> +PKG_HASH:=3D5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd635a62c66802=
a517
>=20
> PKG_LICENSE:=3DOpenSSL
> PKG_LICENSE_FILES:=3DLICENSE
> PKG_CPE_ID:=3Dcpe:/a:openssl:openssl
> PKG_CONFIG_DEPENDS:=3D \
> +=C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_ENGINE \
> +=C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_ENGINE_AFALG \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_ENGINE_CRYPTO \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_ENGINE_DIGEST \
> +=C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_ENGINE_PADLOCK \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_EC \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_EC2M \
> -=C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_SSL3 \
> -=C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_HARDWARE_SUPPORT \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_DEPRECATED \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_DTLS \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_COMPRESSION \
> -=C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_NPN \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_PSK \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_WITH_SRP \
> =C2=A0=C2=A0=C2=A0 CONFIG_OPENSSL_OPTIMIZE_SPEED
> @@ -101,17 +101,24 @@ This package contains the OpenSSL command-line util=
ity.
> endef
>=20
>=20
> -OPENSSL_NO_CIPHERS:=3D no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia=
 no-krb5 \
> - no-whrlpool no-whirlpool no-seed no-jpake
> -OPENSSL_OPTIONS:=3D shared no-err no-sse2 no-ssl2 no-ssl2-method no-hear=
tbeats
> +OPENSSL_NO_CIPHERS:=3D no-idea no-mdc2 no-camellia no-whirlpool no-seed
> +OPENSSL_OPTIONS:=3D shared no-err no-heartbeats
>=20
> -ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
> -=C2=A0 OPENSSL_OPTIONS +=3D -DHAVE_CRYPTODEV
> -=C2=A0 ifdef CONFIG_OPENSSL_ENGINE_DIGEST
> -=C2=A0 =C2=A0 OPENSSL_OPTIONS +=3D -DUSE_CRYPTODEV_DIGESTS
> +ifdef CONFIG_OPENSSL_ENGINE
> +=C2=A0 ifdef CONFIG_OPENSSL_ENGINE_CRYPTO
> +=C2=A0 =C2=A0 OPENSSL_OPTIONS +=3D -DHAVE_CRYPTODEV
> +=C2=A0 =C2=A0 ifdef CONFIG_OPENSSL_ENGINE_DIGEST
> +=C2=A0 =C2=A0 =C2=A0 OPENSSL_OPTIONS +=3D -DUSE_CRYPTODEV_DIGESTS
> +=C2=A0 =C2=A0 endif
> +=C2=A0 endif
> +=C2=A0 ifndef CONFIG_OPENSSL_ENGINE_AFALG
> +=C2=A0 =C2=A0 OPENSSL_OPTIONS +=3D no-afalgeng
> +=C2=A0 endif
> +=C2=A0 ifndef CONFIG_OPENSSL_ENGINE_PADLOCK
> +=C2=A0 =C2=A0 OPENSSL_OPTIONS +=3D no-hw-padlock
>=C2=A0 endif
> else
> -=C2=A0 OPENSSL_OPTIONS +=3D no-engines
> +=C2=A0 OPENSSL_OPTIONS +=3D no-engine
> endif
>=20
> ifndef CONFIG_OPENSSL_WITH_EC
> @@ -122,14 +129,6 @@ ifndef CONFIG_OPENSSL_WITH_EC2M
>=C2=A0 OPENSSL_OPTIONS +=3D no-ec2m
> endif
>=20
> -ifndef CONFIG_OPENSSL_WITH_SSL3
> -=C2=A0 OPENSSL_OPTIONS +=3D no-ssl3 no-ssl3-method
> -endif
> -
> -ifndef CONFIG_OPENSSL_HARDWARE_SUPPORT
> -=C2=A0 OPENSSL_OPTIONS +=3D no-hw
> -endif
> -
> ifndef CONFIG_OPENSSL_WITH_DEPRECATED
>=C2=A0 OPENSSL_OPTIONS +=3D no-deprecated
> endif
> @@ -144,10 +143,6 @@ else
>=C2=A0 OPENSSL_OPTIONS +=3D no-comp
> endif
>=20
> -ifndef CONFIG_OPENSSL_WITH_NPN
> -=C2=A0 OPENSSL_OPTIONS +=3D no-nextprotoneg
> -endif
> -
> ifndef CONFIG_OPENSSL_WITH_PSK
>=C2=A0 OPENSSL_OPTIONS +=3D no-psk
> endif
> @@ -164,16 +159,16 @@ ifeq ($(CONFIG_x86_64),y)
>=C2=A0 OPENSSL_TARGET:=3Dlinux-x86_64-openwrt
>=C2=A0 OPENSSL_MAKEFLAGS +=3D LIBDIR=3Dlib
> else
> -=C2=A0 OPENSSL_OPTIONS+=3Dno-sse2
> +=C2=A0 OPENSSL_OPTIONS+=3D no-sse2

Unless the absence of a space is specifically causing a problem, let=E2=80=
=99s not make whitespace-only changes.


>=C2=A0 ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)
> -=C2=A0 =C2=A0 OPENSSL_TARGET:=3Dlinux-mips-openwrt
> +=C2=A0 =C2=A0 OPENSSL_TARGET:=3Dlinux-mips32-openwrt
>=C2=A0 else ifeq ($(CONFIG_aarch64),y)
>=C2=A0 =C2=A0 OPENSSL_TARGET:=3Dlinux-aarch64-openwrt
>=C2=A0 else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y)
>=C2=A0 =C2=A0 OPENSSL_TARGET:=3Dlinux-armv4-openwrt
>=C2=A0 else
>=C2=A0 =C2=A0 OPENSSL_TARGET:=3Dlinux-generic-openwrt
> -=C2=A0 =C2=A0 OPENSSL_OPTIONS+=3Dno-perlasm
> +=C2=A0 =C2=A0 OPENSSL_OPTIONS+=3D no-perlasm

Ditto.


>=C2=A0 endif
> endif
>=20
> @@ -191,6 +186,7 @@ define Build/Configure
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(TARGET_CPPFLAG=
S) \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(TARGET_LDFLAGS=
) -ldl \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(if $(CONFIG_OP=
ENSSL_OPTIMIZE_SPEED),,-DOPENSSL_SMALL_FOOTPRINT) \
> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 -DOPENSSL_NO_AS=
YNC \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(OPENSSL_NO_CIP=
HERS) \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(OPENSSL_OPTION=
S) \
> =C2=A0=C2=A0=C2=A0 )
> @@ -215,29 +211,12 @@ define Build/Compile
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 OPENWRT_OPTIMIZATION_FLAGS=3D"$(TAR=
GET_CFLAGS)" \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(OPENSSL_MAKEFLAGS) \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 all
> -=C2=A0=C2=A0=C2=A0 +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 CROSS_COMPILE=3D"$(TARGET_CROSS)" =
\
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 CC=3D"$(TARGET_CC)" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 ASFLAGS=3D"$(TARGET_ASFLAGS) -I$(P=
KG_BUILD_DIR)/crypto -c" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 AR=3D"$(TARGET_CROSS)ar r" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 RANLIB=3D"$(TARGET_CROSS)ranlib" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 OPENWRT_OPTIMIZATION_FLAGS=3D"$(TA=
RGET_CFLAGS)" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(OPENSSL_MAKEFLAGS) \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 build-shared
> -=C2=A0=C2=A0=C2=A0 # Work around openssl build bug to link libssl.so wit=
h libcrypto.so.
> -=C2=A0=C2=A0=C2=A0 -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*
> -=C2=A0=C2=A0=C2=A0 +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 CROSS_COMPILE=3D"$(TARGET_CROSS)" =
\
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 CC=3D"$(TARGET_CC)" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 OPENWRT_OPTIMIZATION_FLAGS=3D"$(TA=
RGET_CFLAGS)" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(OPENSSL_MAKEFLAGS) \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 do_linux-shared
> =C2=A0=C2=A0=C2=A0 $(MAKE) -C $(PKG_BUILD_DIR) \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 CROSS_COMPILE=3D"$(TARGET_CROSS)" \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 CC=3D"$(TARGET_CC)" \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 INSTALL_PREFIX=3D"$(PKG_INSTALL_DI=
R)" \
> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 DESTDIR=3D"$(PKG_INSTALL_DIR)" \
> =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(OPENSSL_MAKEFLAGS) \
> -=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 install
> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 install_sw install_ssldirs
> endef
>=20
> define Build/InstallDev
> @@ -254,6 +233,11 @@ define Package/libopenssl/install
> =C2=A0=C2=A0=C2=A0 $(INSTALL_DIR) $(1)/usr/lib
> =C2=A0=C2=A0=C2=A0 $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcrypto.s=
o.* $(1)/usr/lib/
> =C2=A0=C2=A0=C2=A0 $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.*=
 $(1)/usr/lib/
> +=C2=A0=C2=A0=C2=A0 $(if $(CONFIG_OPENSSL_ENGINE),$(INSTALL_DIR) $(1)/usr=
/lib/engines-1.1)
> +=C2=A0=C2=A0=C2=A0 $(if $(CONFIG_OPENSSL_ENGINE_AFALG),$(INSTALL_BIN) \
> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(PKG_INSTALL_DIR)/usr/lib/engines=
-1.1/afalg.so $(1)/usr/lib/engines-1.1)
> +=C2=A0=C2=A0=C2=A0 $(if $(CONFIG_OPENSSL_ENGINE_PADLOCK),$(INSTALL_BIN) =
\
> +=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(PKG_INSTALL_DIR)/usr/lib/engines=
-1.1/padlock.so $(1)/usr/lib/engines-1.1)
> endef
>=20
> define Package/openssl-util/install
> diff --git a/package/libs/openssl/patches/100-Configure-afalg-support.pat=
ch b/package/libs/openssl/patches/100-Configure-afalg-support.patch
> new file mode 100644
> index 0000000000..41b34f089e
> --- /dev/null
> +++ b/package/libs/openssl/patches/100-Configure-afalg-support.patch
> @@ -0,0 +1,13 @@
> +--- a/Configure
> ++++ b/Configure
> +@@ -1303,7 +1303,9 @@ else=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 { $no_user_defines=3D1;
> +=20
> + unless ($disabled{afalgeng}) {
> +=C2=A0 =C2=A0 $config{afalgeng}=3D"";
> +-=C2=A0 =C2=A0 if ($target =3D~ m/^linux/) {
> ++=C2=A0 =C2=A0 if ($target =3D~ m/openwrt$/) {
> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 push @{$config{engdirs}}, "afalg";
> ++=C2=A0 =C2=A0 } elsif ($target =3D~ m/^linux/) {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 my $minver =3D 4*10000 + 1*100 + 0;
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if ($config{cross_compile_prefix} eq "") {
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 my $verstr =3D `uname -r`;
> diff --git a/package/libs/openssl/patches/110-openwrt_targets.patch b/pac=
kage/libs/openssl/patches/110-openwrt_targets.patch
> new file mode 100644
> index 0000000000..bc74c8819f
> --- /dev/null
> +++ b/package/libs/openssl/patches/110-openwrt_targets.patch
> @@ -0,0 +1,26 @@
> +--- /dev/null
> ++++ b/Configurations/25-openwrt.conf
> +@@ -0,0 +1,23 @@
> ++%targets =3D (
> ++=C2=A0 =C2=A0 "linux-x86_64-openwrt" =3D> {
> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 inherit_from=C2=A0 =C2=A0 =3D> [ "linux-x86=
_64" ],
> ++=C2=A0=C2=A0=C2=A0 cflags=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =3D> add=
("\$(OPENWRT_OPTIMIZATION_FLAGS)"),
> ++=C2=A0 =C2=A0 },
> ++=C2=A0 =C2=A0 "linux-aarch64-openwrt" =3D> {
> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 inherit_from=C2=A0 =C2=A0 =3D> [ "linux-aar=
ch64" ],
> ++=C2=A0=C2=A0=C2=A0 cflags=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =3D> add=
("\$(OPENWRT_OPTIMIZATION_FLAGS)"),
> ++=C2=A0 =C2=A0 },
> ++=C2=A0 =C2=A0 "linux-armv4-openwrt" =3D> {
> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 inherit_from=C2=A0 =C2=A0 =3D> [ "linux-arm=
v4" ],
> ++=C2=A0=C2=A0=C2=A0 cflags=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =3D> add=
("\$(OPENWRT_OPTIMIZATION_FLAGS)"),
> ++=C2=A0 =C2=A0 },
> ++=C2=A0 =C2=A0 "linux-mips32-openwrt" =3D> {
> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 inherit_from=C2=A0 =C2=A0 =3D> [ "linux-mip=
s32" ],
> ++=C2=A0=C2=A0=C2=A0 cflags=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =3D> add=
("\$(OPENWRT_OPTIMIZATION_FLAGS)"),
> ++=C2=A0 =C2=A0 },
> ++=C2=A0 =C2=A0 "linux-generic-openwrt" =3D> {
> ++=C2=A0 =C2=A0 =C2=A0 =C2=A0 inherit_from=C2=A0 =C2=A0 =3D> [ "linux-gen=
eric" ],
> ++=C2=A0=C2=A0=C2=A0 cflags=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =3D> add=
("\$(OPENWRT_OPTIMIZATION_FLAGS)"),
> ++=C2=A0 =C2=A0 },
> ++);
> ++
> diff --git a/package/libs/openssl/patches/110-optimize-for-size.patch b/p=
ackage/libs/openssl/patches/110-optimize-for-size.patch
> deleted file mode 100644
> index d6d4a21111..0000000000
> --- a/package/libs/openssl/patches/110-optimize-for-size.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> ---- a/Configure
> -+++ b/Configure
> -@@ -470,6 +470,13 @@ my %table=3D(
> - "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT=
:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alp=
ha_asm}",
> - "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENT=
RANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES=
_UNROLL:${alpha_asm}",
> -=20
> -+# OpenWrt targets
> -+"linux-armv4-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fo=
mit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES=
_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_=
MAJOR).\$(SHLIB_MINOR)",
> -+"linux-aarch64-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -=
fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR =
RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shar=
ed:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
> -+"linux-x86_64-openwrt",=C2=A0=C2=A0=C2=A0 "gcc:-m64 -DL_ENDIAN -DTERMIO=
S \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::=
-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlf=
cn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
> -+"linux-mips-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fom=
it-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_=
INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SH=
LIB_MAJOR).\$(SHLIB_MINOR)",
> -+"linux-generic-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -=
fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK D=
ES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_M=
AJOR).\$(SHLIB_MINOR)",
> -+
> - # Android: linux-* but without pointers to headers and libs.
> - "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/li=
b -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_=
CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(=
SHLIB_MAJOR).\$(SHLIB_MINOR)",
> - "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV=
)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc=
_des} ${x86_gcc_opts}:".eval{my $asm=3D${x86_elf_asm};$asm=3D~s/:elf/:andro=
id/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
> diff --git a/package/libs/openssl/patches/180-fix_link_segfault.patch b/p=
ackage/libs/openssl/patches/120-fix_link_segfault.patch
> similarity index 52%
> rename from package/libs/openssl/patches/180-fix_link_segfault.patch
> rename to package/libs/openssl/patches/120-fix_link_segfault.patch
> index 3e36beb49c..703ab04108 100644
> --- a/package/libs/openssl/patches/180-fix_link_segfault.patch
> +++ b/package/libs/openssl/patches/120-fix_link_segfault.patch
> @@ -1,18 +1,26 @@
> --- a/Makefile.shared
> +++ b/Makefile.shared
> -@@ -95,7 +95,6 @@ LINK_APP=3D=C2=A0=C2=A0=C2=A0 \
> -=C2=A0 =C2=A0 LDCMD=3D"$${LDCMD:-$(CC)}"; LDFLAGS=3D"$${LDFLAGS:-$(CFLAG=
S)}"; \
> +@@ -102,9 +102,7 @@ LINK_APP=3D=C2=A0=C2=A0=C2=A0 \
> +=C2=A0 =C2=A0 LDCMD=3D"$${LDCMD:-$(CC)}"; LDFLAGS=3D"$${LDFLAGS:-$(CFLAG=
S) $(LDFLAGS)}"; \
>=C2=A0 =C2=A0 =C2=A0 LIBPATH=3D`for x in $$LIBDEPS; do echo $$x; done | se=
d -e 's/^ *-L//;t' -e d | uniq`; \
>=C2=A0 =C2=A0 =C2=A0 LIBPATH=3D`echo $$LIBPATH | sed -e 's/ /:/g'`; \
> +-=C2=A0 =C2=A0 echo LD_LIBRARY_PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \
> +-=C2=A0 =C2=A0 =C2=A0 =C2=A0 $${LDCMD} $${LDFLAGS} -o $${APPNAME:=3D$(AP=
PNAME)} $(OBJECTS) $${LIBDEPS}; \
> -=C2=A0 =C2=A0 LD_LIBRARY_PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \
> ++=C2=A0 =C2=A0 echo $${LDCMD} $${LDFLAGS} -o $${APPNAME:=3D$(APPNAME)} $=
(OBJECTS) $${LIBDEPS}; \
>=C2=A0 =C2=A0 =C2=A0 $${LDCMD} $${LDFLAGS} -o $${APPNAME:=3D$(APPNAME)} $(=
OBJECTS) $${LIBDEPS} )
>=20
>=C2=A0 LINK_SO=3D=C2=A0=C2=A0=C2=A0 \
> -@@ -105,7 +104,6 @@ LINK_SO=3D=C2=A0=C2=A0=C2=A0 \
> +@@ -114,11 +112,9 @@ LINK_SO=3D=C2=A0=C2=A0=C2=A0 \
>=C2=A0 =C2=A0 =C2=A0 SHAREDFLAGS=3D"$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDF=
LAGS)}"; \
>=C2=A0 =C2=A0 =C2=A0 LIBPATH=3D`for x in $$LIBDEPS; do echo $$x; done | se=
d -e 's/^ *-L//;t' -e d | uniq`; \
>=C2=A0 =C2=A0 =C2=A0 LIBPATH=3D`echo $$LIBPATH | sed -e 's/ /:/g'`; \
> +-=C2=A0 =C2=A0 echo LD_LIBRARY_PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \
> +-=C2=A0 =C2=A0 =C2=A0 =C2=A0 $${SHAREDCMD} $${SHAREDFLAGS} \
> ++=C2=A0 =C2=A0 echo $${SHAREDCMD} $${SHAREDFLAGS} \
> + =C2=A0=C2=A0=C2=A0 =C2=A0 =C2=A0 -o $(SHLIBNAME_FULL) \
> + =C2=A0=C2=A0=C2=A0 =C2=A0 =C2=A0 $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMS=
FLAGS $$LIBDEPS; \
> -=C2=A0 =C2=A0 LD_LIBRARY_PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \
>=C2=A0 =C2=A0 =C2=A0 $${SHAREDCMD} $${SHAREDFLAGS} \
> - =C2=A0=C2=A0=C2=A0 -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
> + =C2=A0=C2=A0=C2=A0 -o $(SHLIBNAME_FULL) \
>=C2=A0 =C2=A0=C2=A0=C2=A0 $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LI=
BDEPS \
> diff --git a/package/libs/openssl/patches/130-perl-path.patch b/package/l=
ibs/openssl/patches/130-perl-path.patch
> deleted file mode 100644
> index 2dbdc76010..0000000000
> --- a/package/libs/openssl/patches/130-perl-path.patch
> +++ /dev/null
> @@ -1,64 +0,0 @@
> ---- a/Configure
> -+++ b/Configure
> -@@ -1,4 +1,4 @@
> --:
> -+#!/usr/bin/perl
> - eval 'exec perl -S $0 ${1+"$@"}'
> -=C2=A0 =C2=A0 if $running_under_some_shell;
> - ##
> ---- a/tools/c_rehash.in
> -+++ b/tools/c_rehash.in
> -@@ -1,4 +1,4 @@
> --#!/usr/local/bin/perl
> -+#!/usr/bin/perl
> -=20
> - # Perl c_rehash script, scan all files in a directory
> - # and add symbolic links to their hash values.
> ---- a/util/clean-depend.pl
> -+++ b/util/clean-depend.pl
> -@@ -1,4 +1,4 @@
> --#!/usr/local/bin/perl -w
> -+#!/usr/bin/perl
> - # Clean the dependency list in a makefile of standard includes...
> - # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
> -=20
> ---- a/util/mkdef.pl
> -+++ b/util/mkdef.pl
> -@@ -1,4 +1,4 @@
> --#!/usr/local/bin/perl -w
> -+#!/usr/bin/perl
> - #
> - # generate a .def file
> - #
> ---- a/util/mkerr.pl
> -+++ b/util/mkerr.pl
> -@@ -1,4 +1,4 @@
> --#!/usr/local/bin/perl -w
> -+#!/usr/bin/perl
> -=20
> - my $config =3D "crypto/err/openssl.ec";
> - my $hprefix =3D "openssl/";
> ---- a/util/mkstack.pl
> -+++ b/util/mkstack.pl
> -@@ -1,4 +1,4 @@
> --#!/usr/local/bin/perl -w
> -+#!/usr/bin/perl
> -=20
> - # This is a utility that searches out "DECLARE_STACK_OF()"
> - # declarations in .h and .c files, and updates/creates/replaces
> ---- a/util/pod2man.pl
> -+++ b/util/pod2man.pl
> -@@ -1,4 +1,4 @@
> --: #!/usr/bin/perl-5.005
> -+#!/usr/bin/perl
> -=C2=A0 =C2=A0 eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
> - =C2=A0=C2=A0=C2=A0 if $running_under_some_shell;
> -=20
> ---- a/util/selftest.pl
> -+++ b/util/selftest.pl
> -@@ -1,4 +1,4 @@
> --#!/usr/local/bin/perl -w
> -+#!/usr/bin/perl
> - #
> - # Run the test suite and generate a report
> - #
> diff --git a/package/libs/openssl/patches/140-makefile-dirs.patch b/packa=
ge/libs/openssl/patches/140-makefile-dirs.patch
> deleted file mode 100644
> index 83c412f444..0000000000
> --- a/package/libs/openssl/patches/140-makefile-dirs.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- a/Makefile.org
> -+++ b/Makefile.org
> -@@ -137,7 +137,7 @@ FIPSCANLIB=3D
> -=20
> - BASEADDR=3D
> -=20
> --DIRS=3D=C2=A0 crypto ssl engines apps test tools
> -+DIRS=3D=C2=A0 crypto ssl apps


Why are we dropping =E2=80=9Cengines=E2=80=9D again?



> - ENGDIRS=3D ccgost
> - SHLIBDIRS=3D crypto ssl
> -=20
> diff --git a/package/libs/openssl/patches/150-no_engines.patch b/package/=
libs/openssl/patches/150-no_engines.patch
> deleted file mode 100644
> index 102e7a3272..0000000000
> --- a/package/libs/openssl/patches/150-no_engines.patch
> +++ /dev/null
> @@ -1,81 +0,0 @@
> ---- a/Configure
> -+++ b/Configure
> -@@ -2136,6 +2136,11 @@ EOF
> - =C2=A0=C2=A0=C2=A0 close(OUT);
> -=C2=A0 }
> -=C2=A0=20
> -+# ugly hack to disable engines
> -+if($target eq "mingwx") {
> -+=C2=A0=C2=A0=C2=A0 system("sed -e s/^LIB/XLIB/g -i engines/Makefile");
> -+}
> -+
> - print <<EOF;
> -=20
> - Configured for $target.
> ---- a/util/libeay.num
> -+++ b/util/libeay.num
> -@@ -2075,7 +2075,6 @@ PKCS7_ATTR_SIGN_it
> - UI_add_error_string=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 2633=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - KRB5_CHECKSUM_free=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 2634=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - OCSP_REQUEST_get_ext=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 2635=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> --ENGINE_load_ubsec=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 2636=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,STAT=
IC_ENGINE
> - ENGINE_register_all_digests=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 26=
37=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE
> - PKEY_USAGE_PERIOD_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 2638=C2=A0=C2=A0=C2=A0 EXIST:!EXPORT_VAR_AS_FUNCTION:V=
ARIABLE:
> - PKEY_USAGE_PERIOD_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 2638=C2=A0=C2=A0=C2=A0 EXIST:EXPORT_VAR_AS_FUNCTION:FU=
NCTION:
> -@@ -2549,7 +2548,6 @@ OCSP_RESPONSE_new
> - AES_set_encrypt_key=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 3024=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:AES
> - OCSP_resp_count=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 3025=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - KRB5_CHECKSUM_new=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3026=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> --ENGINE_load_cswift=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3027=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,STAT=
IC_ENGINE
> - OCSP_onereq_get0_id=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 3028=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - ENGINE_set_default_ciphers=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 3029=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE
> - NOTICEREF_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3030=C2=A0=C2=A0=C2=A0 EXIST:!EXPORT=
_VAR_AS_FUNCTION:VARIABLE:
> -@@ -2580,7 +2578,6 @@ ASN1_primitive_free
> - i2d_EXTENDED_KEY_USAGE=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 3052=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - i2d_OCSP_SIGNATURE=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3053=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - asn1_enc_save=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3054=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> --ENGINE_load_nuron=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3055=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,STAT=
IC_ENGINE
> - _ossl_old_des_pcbc_encrypt=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 3056=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:DES
> - PKCS12_MAC_DATA_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3057=C2=A0=C2=A0=C2=A0 EXIST:!EXPORT_VAR_AS_FUNCTI=
ON:VARIABLE:
> - PKCS12_MAC_DATA_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3057=C2=A0=C2=A0=C2=A0 EXIST:EXPORT_VAR_AS_FUNCTIO=
N:FUNCTION:
> -@@ -2604,7 +2601,6 @@ asn1_get_choice_selector
> - i2d_KRB5_CHECKSUM=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3072=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - ENGINE_set_table_flags=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 3073=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE
> - AES_options=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3074=C2=A0=C2=A0=C2=A0 EXIST::FUNCTI=
ON:AES
> --ENGINE_load_chil=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3075=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,=
STATIC_ENGINE
> - OCSP_id_cmp=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3076=C2=A0=C2=A0=C2=A0 EXIST::FUNCTI=
ON:
> - OCSP_BASICRESP_new=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3077=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - OCSP_REQUEST_get_ext_by_NID=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 30=
78=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> -@@ -2671,7 +2667,6 @@ OCSP_CRLID_it
> - OCSP_CRLID_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3127=C2=A0=C2=A0=C2=A0 EXIST:EXPORT_VAR_=
AS_FUNCTION:FUNCTION:
> - i2d_KRB5_AUTHENTBODY=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 3128=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - OCSP_REQUEST_get_ext_count=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 3129=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> --ENGINE_load_atalla=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3130=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,STAT=
IC_ENGINE
> - X509_NAME_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3131=C2=A0=C2=A0=C2=A0 EXIST:!EXPORT=
_VAR_AS_FUNCTION:VARIABLE:
> - X509_NAME_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3131=C2=A0=C2=A0=C2=A0 EXIST:EXPORT_=
VAR_AS_FUNCTION:FUNCTION:
> - USERNOTICE_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 3132=C2=A0=C2=A0=C2=A0 EXIST:!EXPORT_VAR=
_AS_FUNCTION:VARIABLE:
> -@@ -2766,8 +2761,6 @@ DES_read_2passwords
> - DES_read_password=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3207=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:DES
> - UI_UTIL_read_pw=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 3208=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> - UI_UTIL_read_pw_string=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 3209=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:
> --ENGINE_load_aep=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 3210=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,S=
TATIC_ENGINE
> --ENGINE_load_sureware=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 3211=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,STATIC_E=
NGINE
> - OPENSSL_add_all_algorithms_noconf=C2=A0 =C2=A0 =C2=A0 3212=C2=A0=C2=A0=
=C2=A0 EXIST:!VMS:FUNCTION:
> - OPENSSL_add_all_algo_noconf=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 32=
12=C2=A0=C2=A0=C2=A0 EXIST:VMS:FUNCTION:
> - OPENSSL_add_all_algorithms_conf=C2=A0 =C2=A0 =C2=A0 =C2=A0 3213=C2=A0=
=C2=A0=C2=A0 EXIST:!VMS:FUNCTION:
> -@@ -2776,7 +2769,6 @@ OPENSSL_load_builtin_modules
> - AES_ofb128_encrypt=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3215=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:AES
> - AES_ctr128_encrypt=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3216=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:AES
> - AES_cfb128_encrypt=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3217=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:AES
> --ENGINE_load_4758cca=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 3218=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,STATIC_ENGI=
NE
> - _ossl_096_des_random_seed=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 3219=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:DES
> - EVP_aes_256_ofb=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 3220=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:AES
> - EVP_aes_192_ofb=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 =C2=A0 =C2=A0 3221=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:AES
> -@@ -3111,7 +3103,6 @@ EC_GFp_nist_method
> - STORE_meth_set_modify_fn=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 3530=C2=A0=C2=A0=C2=A0 NOEXIST::FUNCTION:
> - STORE_method_set_modify_function=C2=A0 =C2=A0 =C2=A0 =C2=A0 3530=C2=A0=
=C2=A0=C2=A0 NOEXIST::FUNCTION:
> - STORE_parse_attrs_next=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =
=C2=A0 =C2=A0 3531=C2=A0=C2=A0=C2=A0 NOEXIST::FUNCTION:
> --ENGINE_load_padlock=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 3532=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:ENGINE,STATIC_ENGI=
NE
> - EC_GROUP_set_curve_name=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0 3533=C2=A0=C2=A0=C2=A0 EXIST::FUNCTION:EC
> - X509_CERT_PAIR_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3534=C2=A0=C2=A0=C2=A0 EXIST:!EXPORT_VAR_AS_FUNCTI=
ON:VARIABLE:
> - X509_CERT_PAIR_it=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 3534=C2=A0=C2=A0=C2=A0 EXIST:EXPORT_VAR_AS_FUNCTIO=
N:FUNCTION:
> diff --git a/package/libs/openssl/patches/160-disable_doc_tests.patch b/p=
ackage/libs/openssl/patches/160-disable_doc_tests.patch
> deleted file mode 100644
> index e38d44a768..0000000000
> --- a/package/libs/openssl/patches/160-disable_doc_tests.patch
> +++ /dev/null
> @@ -1,58 +0,0 @@
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -139,7 +139,7 @@ FIPSCANLIB=3D
> -=20
> - BASEADDR=3D0xFB00000
> -=20
> --DIRS=3D=C2=A0 crypto ssl engines apps test tools
> -+DIRS=3D=C2=A0 crypto ssl engines apps tools
> - ENGDIRS=3D ccgost
> - SHLIBDIRS=3D crypto ssl
> -=20
> -@@ -157,7 +157,7 @@ SDIRS=3D=C2=A0 \
> -=20
> - # tests to perform.=C2=A0 "alltests" is a special word indicating that =
all tests
> - # should be performed.
> --TESTS =3D alltests
> -+TESTS =3D
> -=20
> - MAKEFILE=3D Makefile
> -=20
> -@@ -171,7 +171,7 @@ SHELL=3D/bin/sh
> -=20
> - TOP=3D=C2=A0 =C2=A0 .
> - ONEDIRS=3Dout tmp
> --EDIRS=3D=C2=A0 times doc bugs util include certs ms shlib mt demos perl=
 sf dep VMS
> -+EDIRS=3D=C2=A0 times bugs util include certs ms shlib mt demos perl sf =
dep VMS
> - WDIRS=3D=C2=A0 windows
> - LIBS=3D=C2=A0 libcrypto.a libssl.a
> - SHARED_CRYPTO=3Dlibcrypto$(SHLIB_EXT)
> -@@ -276,7 +276,7 @@ reflect:
> -=20
> - sub_all: build_all
> -=20
> --build_all: build_libs build_apps build_tests build_tools
> -+build_all: build_libs build_apps build_tools
> -=20
> - build_libs: build_libcrypto build_libssl openssl.pc
> -=20
> -@@ -542,7 +542,7 @@ dist:
> - =C2=A0=C2=A0=C2=A0 @$(MAKE) SDIRS=3D'$(SDIRS)' clean
> - =C2=A0=C2=A0=C2=A0 @$(MAKE) TAR=3D'$(TAR)' TARFLAGS=3D'$(TARFLAGS)' $(D=
ISTTARVARS) tar
> -=20
> --install: all install_docs install_sw
> -+install: all install_sw
> -=20
> - install_sw:
> - =C2=A0=C2=A0=C2=A0 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(I=
NSTALLTOP)/bin \
> ---- a/Makefile.org
> -+++ b/Makefile.org
> -@@ -540,7 +540,7 @@ dist:
> - =C2=A0=C2=A0=C2=A0 @$(MAKE) SDIRS=3D'$(SDIRS)' clean
> - =C2=A0=C2=A0=C2=A0 @$(MAKE) TAR=3D'$(TAR)' TARFLAGS=3D'$(TARFLAGS)' $(D=
ISTTARVARS) tar
> -=20
> --install: all install_docs install_sw
> -+install: all install_sw
> -=20
> - install_sw:
> - =C2=A0=C2=A0=C2=A0 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(I=
NSTALLTOP)/bin \
> diff --git a/package/libs/openssl/patches/170-bash_path.patch b/package/l=
ibs/openssl/patches/170-bash_path.patch
> deleted file mode 100644
> index c29b59afdd..0000000000
> --- a/package/libs/openssl/patches/170-bash_path.patch
> +++ /dev/null
> @@ -1,8 +0,0 @@
> ---- a/util/domd
> -+++ b/util/domd
> -@@ -1,4 +1,4 @@
> --#!/bin/sh
> -+#!/usr/bin/env bash
> - # Do a makedepend, only leave out the standard headers
> - # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
> -=20
> diff --git a/package/libs/openssl/patches/190-remove_timestamp_check.patc=
h b/package/libs/openssl/patches/190-remove_timestamp_check.patch
> deleted file mode 100644
> index 424e66063c..0000000000
> --- a/package/libs/openssl/patches/190-remove_timestamp_check.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> ---- a/Makefile.org
> -+++ b/Makefile.org
> -@@ -185,7 +185,7 @@ TARFILE=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 ../$(NAME).tar
> - EXHEADER=3D=C2=A0 =C2=A0 =C2=A0 e_os2.h
> - HEADER=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 e_os.h
> -=20
> --all: Makefile build_all
> -+all: build_all
> -=20
> - # as we stick to -e, CLEARENV ensures that local variables in lower
> - # Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
> -@@ -404,11 +404,6 @@ openssl.pc: Makefile
> - =C2=A0=C2=A0=C2=A0 =C2=A0 =C2=A0 echo 'Version: '$(VERSION); \
> - =C2=A0=C2=A0=C2=A0 =C2=A0 =C2=A0 echo 'Requires: libssl libcrypto' ) > =
openssl.pc
> -=20
> --Makefile: Makefile.org Configure config
> --=C2=A0=C2=A0=C2=A0 @echo "Makefile is older than Makefile.org, Configur=
e or config."
> --=C2=A0=C2=A0=C2=A0 @echo "Reconfigure the source tree (via './config' o=
r 'perl Configure'), please."
> --=C2=A0=C2=A0=C2=A0 @false
> --
> - libclean:
> - =C2=A0=C2=A0=C2=A0 rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so e=
ngines/*.dll engines/*.dylib *.a engines/*.a */lib */*/lib
> -=20
> diff --git a/package/libs/openssl/patches/200-parallel_build.patch b/pack=
age/libs/openssl/patches/200-parallel_build.patch
> deleted file mode 100644
> index 0616551b6e..0000000000
> --- a/package/libs/openssl/patches/200-parallel_build.patch
> +++ /dev/null
> @@ -1,184 +0,0 @@
> ---- a/Makefile.org
> -+++ b/Makefile.org
> -@@ -282,17 +282,17 @@ build_libcrypto: build_crypto build_engi
> - build_libssl: build_ssl libssl.pc
> -=20
> - build_crypto:
> --=C2=A0=C2=A0=C2=A0 @dir=3Dcrypto; target=3Dall; $(BUILD_ONE_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@dir=3Dcrypto; target=3Dall; $(BUILD_ONE_CMD)
> - build_ssl: build_crypto
> --=C2=A0=C2=A0=C2=A0 @dir=3Dssl; target=3Dall; $(BUILD_ONE_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@dir=3Dssl; target=3Dall; $(BUILD_ONE_CMD)
> - build_engines: build_crypto
> --=C2=A0=C2=A0=C2=A0 @dir=3Dengines; target=3Dall; $(BUILD_ONE_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@dir=3Dengines; target=3Dall; $(BUILD_ONE_CMD)
> - build_apps: build_libs
> --=C2=A0=C2=A0=C2=A0 @dir=3Dapps; target=3Dall; $(BUILD_ONE_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@dir=3Dapps; target=3Dall; $(BUILD_ONE_CMD)
> - build_tests: build_libs
> --=C2=A0=C2=A0=C2=A0 @dir=3Dtest; target=3Dall; $(BUILD_ONE_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@dir=3Dtest; target=3Dall; $(BUILD_ONE_CMD)
> - build_tools: build_libs
> --=C2=A0=C2=A0=C2=A0 @dir=3Dtools; target=3Dall; $(BUILD_ONE_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@dir=3Dtools; target=3Dall; $(BUILD_ONE_CMD)
> -=20
> - all_testapps: build_libs build_testapps
> - build_testapps:
> -@@ -473,7 +473,7 @@ update: errors stacks util/libeay.num ut
> - =C2=A0=C2=A0=C2=A0 @set -e; target=3Dupdate; $(RECURSIVE_BUILD_CMD)
> -=20
> - depend:
> --=C2=A0=C2=A0=C2=A0 @set -e; target=3Ddepend; $(RECURSIVE_BUILD_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@set -e; target=3Ddepend; $(RECURSIVE_BUILD_CMD)
> -=20
> - lint:
> - =C2=A0=C2=A0=C2=A0 @set -e; target=3Dlint; $(RECURSIVE_BUILD_CMD)
> -@@ -535,9 +535,9 @@ dist:
> - =C2=A0=C2=A0=C2=A0 @$(MAKE) SDIRS=3D'$(SDIRS)' clean
> - =C2=A0=C2=A0=C2=A0 @$(MAKE) TAR=3D'$(TAR)' TARFLAGS=3D'$(TARFLAGS)' $(D=
ISTTARVARS) tar
> -=20
> --install: all install_sw
> -+install: install_sw
> -=20
> --install_sw:
> -+install_dirs:
> - =C2=A0=C2=A0=C2=A0 @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(I=
NSTALLTOP)/bin \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(INSTALLTOP)/$(=
LIBDIR) \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(INSTALLTOP)/$(=
LIBDIR)/engines \
> -@@ -546,12 +546,19 @@ install_sw:
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(OPENSSLDIR)/mi=
sc \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(OPENSSLDIR)/ce=
rts \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(OPENSSLDIR)/pr=
ivate
> -+=C2=A0=C2=A0=C2=A0 @$(PERL) $(TOP)/util/mkdir-p.pl \
> -+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man1 \
> -+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man3 \
> -+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man5 \
> -+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man7
> -+
> -+install_sw: install_dirs
> - =C2=A0=C2=A0=C2=A0 @set -e; headerlist=3D"$(EXHEADER)"; for i in $$head=
erlist;\
> - =C2=A0=C2=A0=C2=A0 do \
> - =C2=A0=C2=A0=C2=A0 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/opens=
sl/$$i; \
> - =C2=A0=C2=A0=C2=A0 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/ope=
nssl/$$i ); \
> - =C2=A0=C2=A0=C2=A0 done;
> --=C2=A0=C2=A0=C2=A0 @set -e; target=3Dinstall; $(RECURSIVE_BUILD_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@set -e; target=3Dinstall; $(RECURSIVE_BUILD_CMD)
> - =C2=A0=C2=A0=C2=A0 @set -e; liblist=3D"$(LIBS)"; for i in $$liblist ;\
> - =C2=A0=C2=A0=C2=A0 do \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 if [ -f "$$i" ]; then \
> -@@ -635,12 +642,7 @@ install_html_docs:
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 done; \
> - =C2=A0=C2=A0=C2=A0 done
> -=20
> --install_docs:
> --=C2=A0=C2=A0=C2=A0 @$(PERL) $(TOP)/util/mkdir-p.pl \
> --=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man1 \
> --=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man3 \
> --=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man5 \
> --=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 $(INSTALL_PREFIX)$(MANDIR)/man7
> -+install_docs: install_dirs
> - =C2=A0=C2=A0=C2=A0 @pod2man=3D"`cd ./util; ./pod2mantest $(PERL)`"; \
> - =C2=A0=C2=A0=C2=A0 here=3D"`pwd`"; \
> - =C2=A0=C2=A0=C2=A0 filecase=3D; \
> ---- a/Makefile.shared
> -+++ b/Makefile.shared
> -@@ -120,6 +120,7 @@ SYMLINK_SO=3D=C2=A0=C2=A0=C2=A0 \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 done; \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 fi; \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 if [ -n "$$SHLIB_SOVER" ]; then \
> -+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 [ -e "$$SHLIB$=
$SHLIB_SUFFIX" ] || \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 ( $(SET_X); rm=
 -f $$SHLIB$$SHLIB_SUFFIX; \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0 ln -s $=
$prev $$SHLIB$$SHLIB_SUFFIX ); \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 fi; \
> ---- a/crypto/Makefile
> -+++ b/crypto/Makefile
> -@@ -85,11 +85,11 @@ testapps:
> - =C2=A0=C2=A0=C2=A0 @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefil=
e reflect THIS=3D$@; fi
> -=20
> - subdirs:
> --=C2=A0=C2=A0=C2=A0 @target=3Dall; $(RECURSIVE_MAKE)
> -+=C2=A0=C2=A0=C2=A0 +@target=3Dall; $(RECURSIVE_MAKE)
> -=20
> - files:
> - =C2=A0=C2=A0=C2=A0 $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=3D$(CPUID_OB=
J)" Makefile >> $(TOP)/MINFO
> --=C2=A0=C2=A0=C2=A0 @target=3Dfiles; $(RECURSIVE_MAKE)
> -+=C2=A0=C2=A0=C2=A0 +@target=3Dfiles; $(RECURSIVE_MAKE)
> -=20
> - links:
> - =C2=A0=C2=A0=C2=A0 @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(=
EXHEADER)
> -@@ -100,7 +100,7 @@ links:
> - # lib: $(LIB): are splitted to avoid end-less loop
> - lib:=C2=A0=C2=A0=C2=A0 $(LIB)
> - =C2=A0=C2=A0=C2=A0 @touch lib
> --$(LIB):=C2=A0=C2=A0=C2=A0 $(LIBOBJ)
> -+$(LIB):=C2=A0=C2=A0=C2=A0 $(LIBOBJ) | subdirs
> - =C2=A0=C2=A0=C2=A0 $(AR) $(LIB) $(LIBOBJ)
> - =C2=A0=C2=A0=C2=A0 test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR=
)fipscanister.o
> - =C2=A0=C2=A0=C2=A0 $(RANLIB) $(LIB) || echo Never mind.
> -@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs
> - =C2=A0=C2=A0=C2=A0 fi
> -=20
> - libs:
> --=C2=A0=C2=A0=C2=A0 @target=3Dlib; $(RECURSIVE_MAKE)
> -+=C2=A0=C2=A0=C2=A0 +@target=3Dlib; $(RECURSIVE_MAKE)
> -=20
> - install:
> - =C2=A0=C2=A0=C2=A0 @[ -n "$(INSTALLTOP)" ] # should be set by top Makef=
ile...
> -@@ -120,7 +120,7 @@ install:
> - =C2=A0=C2=A0=C2=A0 (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/opens=
sl/$$i; \
> - =C2=A0=C2=A0=C2=A0 chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/ope=
nssl/$$i ); \
> - =C2=A0=C2=A0=C2=A0 done;
> --=C2=A0=C2=A0=C2=A0 @target=3Dinstall; $(RECURSIVE_MAKE)
> -+=C2=A0=C2=A0=C2=A0 +@target=3Dinstall; $(RECURSIVE_MAKE)
> -=20
> - lint:
> - =C2=A0=C2=A0=C2=A0 @target=3Dlint; $(RECURSIVE_MAKE)
> ---- a/engines/Makefile
> -+++ b/engines/Makefile
> -@@ -72,7 +72,7 @@ top:
> -=20
> - all:=C2=A0=C2=A0=C2=A0 lib subdirs
> -=20
> --lib:=C2=A0=C2=A0=C2=A0 $(LIBOBJ)
> -+lib:=C2=A0=C2=A0=C2=A0 $(LIBOBJ) | subdirs
> - =C2=A0=C2=A0=C2=A0 @if [ -n "$(SHARED_LIBS)" ]; then \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 set -e; \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 for l in $(LIBNAMES); do \
> -@@ -89,7 +89,7 @@ lib:=C2=A0=C2=A0=C2=A0 $(LIBOBJ)
> -=20
> - subdirs:
> - =C2=A0=C2=A0=C2=A0 echo $(EDIRS)
> --=C2=A0=C2=A0=C2=A0 @target=3Dall; $(RECURSIVE_MAKE)
> -+=C2=A0=C2=A0=C2=A0 +@target=3Dall; $(RECURSIVE_MAKE)
> -=20
> - files:
> - =C2=A0=C2=A0=C2=A0 $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINF=
O
> -@@ -128,7 +128,7 @@ install:
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0 mv -f $=
(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL=
_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
> - =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 done; \
> - =C2=A0=C2=A0=C2=A0 fi
> --=C2=A0=C2=A0=C2=A0 @target=3Dinstall; $(RECURSIVE_MAKE)
> -+=C2=A0=C2=A0=C2=A0 +@target=3Dinstall; $(RECURSIVE_MAKE)
> -=20
> - tags:
> - =C2=A0=C2=A0=C2=A0 ctags $(SRC)
> ---- a/test/Makefile
> -+++ b/test/Makefile
> -@@ -145,7 +145,7 @@ install:
> - tags:
> - =C2=A0=C2=A0=C2=A0 ctags $(SRC)
> -=20
> --tests:=C2=A0=C2=A0=C2=A0 exe apps $(TESTS)
> -+tests:=C2=A0=C2=A0=C2=A0 exe $(TESTS)
> -=20
> - apps:
> - =C2=A0=C2=A0=C2=A0 @(cd ..; $(MAKE) DIRS=3Dapps all)
> -@@ -586,7 +586,7 @@ $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssl
> - #=C2=A0=C2=A0=C2=A0 fi
> -=20
> - dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
> --=C2=A0=C2=A0=C2=A0 @target=3Ddummytest; $(BUILD_CMD)
> -+=C2=A0=C2=A0=C2=A0 +@target=3Ddummytest; $(BUILD_CMD)
> -=20
> - # DO NOT DELETE THIS LINE -- make depend depends on it.
> -=20
> --=20
> 2.16.1
>=20
 =20
------=_Part_1961379_1081484806.1528129653957
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

<html><head></head><body><div style=3D"font-family:Helvetica Neue, Helvetic=
a, Arial, sans-serif;font-size:13px;"><div style=3D"font-family:Helvetica N=
eue, Helvetica, Arial, sans-serif;font-size:13px;"><div></div>
            <div>Sorry about the typos and spacing changes.  This shou=
ld have never happened.  <span>Thank you for pointing them out.  =
</span>I have corrected them in the PR I've opened on github.  Since I=
'm new to the mailing list and don't know what the best way to proceed, ple=
ase advise me.  I have 4 patches all related to the openssl upgrade.&n=
bsp; John asked me earlier to send the whole bundle, so that people wouldn'=
t need to search for them all over the list.  Now I have to change jus=
t one of them.  Should I repost all 4, or is it OK to do a V3 for just=
 the openssl patch?</div><div><br></div><div>Since it's only the text I'm c=
hanging, I don't feel the need to do it right away--I still have plenty of =
pull requests to send to the packages feed.  I will change the PR I've=
 opened in github right away, but I feel like I'm polluting the mailing lis=
t if I do it just for some typos in the text.  If there are nothing el=
se to change, my intent is to repost the patch after I'm finished with the =
packages feed.</div><div><br></div><div>By the way, here's the progress wit=
h the packages that depend on openssl (packages that were added or removed =
after I posted the patch are not tallied):</div><div><br></div> <span>Globa=
l Progress<br>---------------<br>Total packages    &nbs=
p;            &=
nbsp;   152    100,00%<br>Packages that worked rig=
ht away    109     71,71%<br>Packages wo=
rking now           =
    122     80,26%<br>Packages that stil=
l need changes    30     19,74%<br>&nbsp=
;       <br>PR Progress<br>-----------<br>Tot=
al packages that needed changes  43    100,00%<br>PRs c=
reated           &nb=
sp;            =
 32     74,42%<br>Merged PRs    &nb=
sp;            =
         13    =
 30,23%<br>Open PRs         &n=
bsp;           &nbsp=
;      19     44,19%<br>PRs to=
 open           &nbs=
p;             =
11     25,58%</span><br><div><br></div><div>As for the =
comment about dropping  the engines:  I'm removing the patch that=
 dropped the engines, and adding some options to control their installation=
, not ditching the engines.</div><div><br></div><div>Cheers,</div><div><br>=
</div><div>Eneas<br></div><div><br></div>
           =20
            </div><div id=3D"ydp5447beb3yahoo_quoted_8478646294" class=3D"y=
dp5447beb3yahoo_quoted">
                <div style=3D"font-family:'Helvetica Neue', Helvetica, Aria=
l, sans-serif;font-size:13px;color:#26282a;">
                   =20
                    <div>
                        Em domingo, 3 de junho de 2018 14:58:42 BRT, Philip=
 Prindeville <philipp_subx@redfish-solutions.com> escreveu:
                    </div>
                    <div><br></div>
                    <div><br></div>
                    <div><div dir=3D"ltr">Inline=E2=80=A6 but generally, pl=
ease spellcheck yourself.<br></div><div dir=3D"ltr"><br></div><div dir=3D"l=
tr">> On May 30, 2018, at 8:35 PM, Eneas U de Queiroz via openwrt-devel =
<<a href=3D"mailto:openwrt-devel@lists.openwrt.org" rel=3D"nofollow" tar=
get=3D"_blank">openwrt-devel@lists.openwrt.org</a>> wrote:<br></div><div=
 dir=3D"ltr">> <br></div><div dir=3D"ltr">> From: Eneas U de Queiroz =
<<a href=3D"mailto:cote2004-github@yahoo.com" rel=3D"nofollow" target=3D=
"_blank">cote2004-github@yahoo.com</a>><br></div><div dir=3D"ltr">> S=
ubject: [PATCH v2 1/4] openssl: Upgrade to 1.1.0h<br></div><div dir=3D"ltr"=
>> Date: May 30, 2018 at 8:18:34 PM MDT<br></div><div dir=3D"ltr">> T=
o: <a href=3D"mailto:openwrt-devel@lists.openwrt.org" rel=3D"nofollow" targ=
et=3D"_blank">openwrt-devel@lists.openwrt.org</a><br></div><div dir=3D"ltr"=
>> Cc: Eneas U de Queiroz <<a href=3D"mailto:cote2004-github@yahoo.co=
m" rel=3D"nofollow" target=3D"_blank">cote2004-github@yahoo.com</a>><br>=
</div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">> <br></div><div =
dir=3D"ltr">> This version brings major changes to the API, so many pack=
ages will need<br></div><div dir=3D"ltr">> adjustments or version bumps.=
<br></div><div dir=3D"ltr">> Separated the individual engines in place o=
f the generic "hardware<br></div><div dir=3D"ltr">> support" option.<br>=
</div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">> Signed-off-by: =
Eneas U de Queiroz <<a href=3D"mailto:cote2004-github@yahoo.com" rel=3D"=
nofollow" target=3D"_blank">cote2004-github@yahoo.com</a>><br></div><div=
 dir=3D"ltr">> ---<br></div><div dir=3D"ltr">> package/libs/openssl/C=
onfig.in                  &nbs=
p;  |  45 ++---<br></div><div dir=3D"ltr">> package/libs/openssl/Ma=
kefile                   =
   |  80 ++++-----<br></div><div dir=3D"ltr">> .../patches/100=
-Configure-afalg-support.patch      |  13 ++<br></div><=
div dir=3D"ltr">> .../libs/openssl/patches/110-openwrt_targets.patch |&n=
bsp; 26 +++<br></div><div dir=3D"ltr">> .../openssl/patches/110-optimize=
-for-size.patch    |  16 --<br></div><div dir=3D"ltr">> .=
.._segfault.patch =3D> 120-fix_link_segfault.patch} |  16 +-<br></d=
iv><div dir=3D"ltr">> package/libs/openssl/patches/130-perl-path.patch&n=
bsp;  |  64 -------<br></div><div dir=3D"ltr">> .../libs/openssl/pa=
tches/140-makefile-dirs.patch   |  11 --<br></div><div dir=3D"ltr=
">> package/libs/openssl/patches/150-no_engines.patch  |  81 -=
--------<br></div><div dir=3D"ltr">> .../openssl/patches/160-disable_doc=
_tests.patch    |  58 -------<br></div><div dir=3D"ltr">>=
 package/libs/openssl/patches/170-bash_path.patch   |   8 -<br></=
div><div dir=3D"ltr">> .../patches/190-remove_timestamp_check.patch&nbsp=
;      |  23 ---<br></div><div dir=3D"ltr">> .../libs/ope=
nssl/patches/200-parallel_build.patch  | 184 ---------------------<br>=
</div><div dir=3D"ltr">> 13 files changed, 107 insertions(+), 518 deleti=
ons(-)<br></div><div dir=3D"ltr">> create mode 100644 package/libs/opens=
sl/patches/100-Configure-afalg-support.patch<br></div><div dir=3D"ltr">>=
 create mode 100644 package/libs/openssl/patches/110-openwrt_targets.patch<=
br></div><div dir=3D"ltr">> delete mode 100644 package/libs/openssl/patc=
hes/110-optimize-for-size.patch<br></div><div dir=3D"ltr">> rename packa=
ge/libs/openssl/patches/{180-fix_link_segfault.patch =3D> 120-fix_link_s=
egfault.patch} (52%)<br></div><div dir=3D"ltr">> delete mode 100644 pack=
age/libs/openssl/patches/130-perl-path.patch<br></div><div dir=3D"ltr">>=
 delete mode 100644 package/libs/openssl/patches/140-makefile-dirs.patch<br=
></div><div dir=3D"ltr">> delete mode 100644 package/libs/openssl/patche=
s/150-no_engines.patch<br></div><div dir=3D"ltr">> delete mode 100644 pa=
ckage/libs/openssl/patches/160-disable_doc_tests.patch<br></div><div dir=3D=
"ltr">> delete mode 100644 package/libs/openssl/patches/170-bash_path.pa=
tch<br></div><div dir=3D"ltr">> delete mode 100644 package/libs/openssl/=
patches/190-remove_timestamp_check.patch<br></div><div dir=3D"ltr">> del=
ete mode 100644 package/libs/openssl/patches/200-parallel_build.patch<br></=
div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">> diff --git a/pack=
age/libs/openssl/Config.in b/package/libs/openssl/Config.in<br></div><div d=
ir=3D"ltr">> index 96d3ba3e9d..a705aa741c 100644<br></div><div dir=3D"lt=
r">> --- a/package/libs/openssl/Config.in<br></div><div dir=3D"ltr">>=
 +++ b/package/libs/openssl/Config.in<br></div><div dir=3D"ltr">> @@ -10=
,11 +10,6 @@ config OPENSSL_WITH_EC2M<br></div><div dir=3D"ltr">>  =
       depends on OPENSSL_WITH_EC<br></div><div dir=3D"ltr">=
>         prompt "Enable ec2m support"<br></div><div=
 dir=3D"ltr">> <br></div><div dir=3D"ltr">> -config OPENSSL_WITH_SSL3=
<br></div><div dir=3D"ltr">> -    bool<br></div><div dir=
=3D"ltr">> -    default n<br></div><div dir=3D"ltr">> =
-    prompt "Enable sslv3 support"<br></div><div dir=3D"ltr"=
>> -<br></div><div dir=3D"ltr">> config OPENSSL_WITH_DEPRECATED<br></=
div><div dir=3D"ltr">>     bool<br></div><div dir=3D"ltr"=
>>     default y<br></div><div dir=3D"ltr">> @@ -30,11=
 +25,6 @@ config OPENSSL_WITH_COMPRESSION<br></div><div dir=3D"ltr">> &n=
bsp;   default n<br></div><div dir=3D"ltr">>   &nbsp=
; prompt "Enable compression support"<br></div><div dir=3D"ltr">> <br></=
div><div dir=3D"ltr">> -config OPENSSL_WITH_NPN<br></div><div dir=3D"ltr=
">> -    bool<br></div><div dir=3D"ltr">> - &nbsp=
;  default y<br></div><div dir=3D"ltr">> -    prompt=
 "Enable NPN support"<br></div><div dir=3D"ltr">> -<br></div><div dir=3D=
"ltr">> config OPENSSL_WITH_PSK<br></div><div dir=3D"ltr">>  &nb=
sp;  bool<br></div><div dir=3D"ltr">>     default y<=
br></div><div dir=3D"ltr">> @@ -45,24 +35,37 @@ config OPENSSL_WITH_SRP<=
br></div><div dir=3D"ltr">>     default y<br></div><div d=
ir=3D"ltr">>     prompt "Enable SRP support"<br></div><di=
v dir=3D"ltr">> <br></div><div dir=3D"ltr">> -config OPENSSL_ENGINE_D=
IGEST<br></div><div dir=3D"ltr">> +config OPENSSL_OPTIMIZE_SPEED<br></di=
v><div dir=3D"ltr">>     bool<br></div><div dir=3D"ltr">&=
gt; -    depends on OPENSSL_ENGINE_CRYPTO<br></div><div dir=
=3D"ltr">> -    prompt "Digests acceleration support"<br>=
</div><div dir=3D"ltr">> +    default n<br></div><div dir=
=3D"ltr">> +    prompt "Enable optimization for speed ins=
tead of size"<br></div><div dir=3D"ltr">> +<br></div><div dir=3D"ltr">&g=
t; +config OPENSSL_ENGINE<br></div><div dir=3D"ltr">> +  &nbsp=
; bool "Enable engine support"<br></div><div dir=3D"ltr">> +  =
  help<br></div><div dir=3D"ltr">> +      =
  This enables alternative cryptography impelementations,<br></div><di=
v dir=3D"ltr"><br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr">=E2=80=
=9Cimplementations=E2=80=9D<br></div><div dir=3D"ltr"><br></div><div dir=3D=
"ltr"><br></div><div dir=3D"ltr">> +      &nbsp=
; most commonly for interfacig with external crypto devices,<br></div><div =
dir=3D"ltr"><br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr">=E2=80=9C=
interfacing=E2=80=9D<br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr"><=
br></div><div dir=3D"ltr">> +        or su=
pporting new/alternative ciphers and digests.<br></div><div dir=3D"ltr">&gt=
; <br></div><div dir=3D"ltr">> -config OPENSSL_HARDWARE_SUPPORT<br></div=
><div dir=3D"ltr">> +config OPENSSL_ENGINE_AFALG<br></div><div dir=3D"lt=
r">>     bool<br></div><div dir=3D"ltr">> - &nbsp=
;  default n<br></div><div dir=3D"ltr">> -    prompt=
 "Enable hardware support"<br></div><div dir=3D"ltr">> +  &nbs=
p; depends on OPENSSL_ENGINE && !LINUX_3_18<br></div><div dir=3D"lt=
r">> +    select KERNEL_AIO<br></div><div dir=3D"ltr">&gt=
; +    prompt "Enable acceleration support through AF_ALG en=
gine"<br></div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">> -confi=
g OPENSSL_OPTIMIZE_SPEED<br></div><div dir=3D"ltr">> +config OPENSSL_ENG=
INE_PADLOCK<br></div><div dir=3D"ltr">>     bool<br></div=
><div dir=3D"ltr">> -    default n<br></div><div dir=3D"l=
tr">> -    prompt "Enable optimization for speed instead =
of size"<br></div><div dir=3D"ltr">> +    depends on OPEN=
SSL_ENGINE<br></div><div dir=3D"ltr">> +    prompt "Enabl=
e VIA Padlock crypto hardware acceleration engine" if TARGET_x86<br></div><=
div dir=3D"ltr">> +<br></div><div dir=3D"ltr">> +config OPENSSL_ENGIN=
E_DIGEST<br></div><div dir=3D"ltr">> +    bool<br></div><=
div dir=3D"ltr">> +    depends on OPENSSL_ENGINE_CRYPTO<b=
r></div><div dir=3D"ltr">> +    prompt "Digests accelerat=
ion support=E2=80=9D<br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr"><=
br></div><div dir=3D"ltr">Use singular.<br></div><div dir=3D"ltr"><br></div=
><div dir=3D"ltr"><br></div><div dir=3D"ltr">> <br></div><div dir=3D"ltr=
">> endif<br></div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">>=
 config OPENSSL_ENGINE_CRYPTO<br></div><div dir=3D"ltr">>   &n=
bsp; bool<br></div><div dir=3D"ltr">> -    select OPENSSL=
_HARDWARE_SUPPORT<br></div><div dir=3D"ltr">> -    prompt=
 "Crypto acceleration support" if PACKAGE_libopenssl<br></div><div dir=3D"l=
tr">> +    select OPENSSL_ENGINE<br></div><div dir=3D"ltr=
">> +    prompt "Acceleration support through /dev/crypto=
" if PACKAGE_libopenssl<br></div><div dir=3D"ltr">> diff --git a/package=
/libs/openssl/Makefile b/package/libs/openssl/Makefile<br></div><div dir=3D=
"ltr">> index 8409730d70..1c71a3c9ae 100644<br></div><div dir=3D"ltr">&g=
t; --- a/package/libs/openssl/Makefile<br></div><div dir=3D"ltr">> +++ b=
/package/libs/openssl/Makefile<br></div><div dir=3D"ltr">> @@ -8,8 +8,8 =
@@<br></div><div dir=3D"ltr">> include $(TOPDIR)/rules.mk<br></div><div =
dir=3D"ltr">> <br></div><div dir=3D"ltr">> PKG_NAME:=3Dopenssl<br></d=
iv><div dir=3D"ltr">> -PKG_BASE:=3D1.0.2<br></div><div dir=3D"ltr">> =
-PKG_BUGFIX:=3Do<br></div><div dir=3D"ltr">> +PKG_BASE:=3D1.1.0<br></div=
><div dir=3D"ltr">> +PKG_BUGFIX:=3Dh<br></div><div dir=3D"ltr">> PKG_=
VERSION:=3D$(PKG_BASE)$(PKG_BUGFIX)<br></div><div dir=3D"ltr">> PKG_RELE=
ASE:=3D1<br></div><div dir=3D"ltr">> PKG_USE_MIPS16:=3D0<br></div><div d=
ir=3D"ltr">> @@ -24,22 +24,22 @@ PKG_SOURCE_URL:=3D \<br></div><div dir=
=3D"ltr">>     <a href=3D"http://gd.tuwien.ac.at/infosys/=
security/openssl/source/ " rel=3D"nofollow" target=3D"_blank">http://gd.tuw=
ien.ac.at/infosys/security/openssl/source/ </a>\<br></div><div dir=3D"ltr">=
>     <a href=3D"http://www.openssl.org/source/ " rel=3D"=
nofollow" target=3D"_blank">http://www.openssl.org/source/ </a>\<br></div><=
div dir=3D"ltr">>     <a href=3D"http://www.openssl.org/s=
ource/old/$" rel=3D"nofollow" target=3D"_blank">http://www.openssl.org/sour=
ce/old/$</a>(PKG_BASE)/<br></div><div dir=3D"ltr">> -PKG_HASH:=3Dec3f5c9=
714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d<br></div><div dir=
=3D"ltr">> +PKG_HASH:=3D5835626cde9e99656585fc7aaa2302a73a7e1340bf8c14fd=
635a62c66802a517<br></div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">=
> PKG_LICENSE:=3DOpenSSL<br></div><div dir=3D"ltr">> PKG_LICENSE_FILE=
S:=3DLICENSE<br></div><div dir=3D"ltr">> PKG_CPE_ID:=3Dcpe:/a:openssl:op=
enssl<br></div><div dir=3D"ltr">> PKG_CONFIG_DEPENDS:=3D \<br></div><div=
 dir=3D"ltr">> +    CONFIG_OPENSSL_ENGINE \<br></div><div=
 dir=3D"ltr">> +    CONFIG_OPENSSL_ENGINE_AFALG \<br></di=
v><div dir=3D"ltr">>     CONFIG_OPENSSL_ENGINE_CRYPTO \<b=
r></div><div dir=3D"ltr">>     CONFIG_OPENSSL_ENGINE_DIGE=
ST \<br></div><div dir=3D"ltr">> +    CONFIG_OPENSSL_ENGI=
NE_PADLOCK \<br></div><div dir=3D"ltr">>     CONFIG_OPENS=
SL_WITH_EC \<br></div><div dir=3D"ltr">>     CONFIG_OPENS=
SL_WITH_EC2M \<br></div><div dir=3D"ltr">> -    CONFIG_OP=
ENSSL_WITH_SSL3 \<br></div><div dir=3D"ltr">> -    CONFIG=
_OPENSSL_HARDWARE_SUPPORT \<br></div><div dir=3D"ltr">>   &nbs=
p; CONFIG_OPENSSL_WITH_DEPRECATED \<br></div><div dir=3D"ltr">>  &n=
bsp;  CONFIG_OPENSSL_WITH_DTLS \<br></div><div dir=3D"ltr">>  =
   CONFIG_OPENSSL_WITH_COMPRESSION \<br></div><div dir=3D"ltr">&g=
t; -    CONFIG_OPENSSL_WITH_NPN \<br></div><div dir=3D"ltr">=
>     CONFIG_OPENSSL_WITH_PSK \<br></div><div dir=3D"ltr"=
>>     CONFIG_OPENSSL_WITH_SRP \<br></div><div dir=3D"ltr=
">>     CONFIG_OPENSSL_OPTIMIZE_SPEED<br></div><div dir=
=3D"ltr">> @@ -101,17 +101,24 @@ This package contains the OpenSSL comma=
nd-line utility.<br></div><div dir=3D"ltr">> endef<br></div><div dir=3D"=
ltr">> <br></div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">> -=
OPENSSL_NO_CIPHERS:=3D no-idea no-md2 no-mdc2 no-rc5 no-sha0 no-camellia no=
-krb5 \<br></div><div dir=3D"ltr">> - no-whrlpool no-whirlpool no-seed n=
o-jpake<br></div><div dir=3D"ltr">> -OPENSSL_OPTIONS:=3D shared no-err n=
o-sse2 no-ssl2 no-ssl2-method no-heartbeats<br></div><div dir=3D"ltr">> =
+OPENSSL_NO_CIPHERS:=3D no-idea no-mdc2 no-camellia no-whirlpool no-seed<br=
></div><div dir=3D"ltr">> +OPENSSL_OPTIONS:=3D shared no-err no-heartbea=
ts<br></div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">> -ifdef CO=
NFIG_OPENSSL_ENGINE_CRYPTO<br></div><div dir=3D"ltr">> -  OPENSSL_O=
PTIONS +=3D -DHAVE_CRYPTODEV<br></div><div dir=3D"ltr">> -  ifdef C=
ONFIG_OPENSSL_ENGINE_DIGEST<br></div><div dir=3D"ltr">> -    O=
PENSSL_OPTIONS +=3D -DUSE_CRYPTODEV_DIGESTS<br></div><div dir=3D"ltr">> =
+ifdef CONFIG_OPENSSL_ENGINE<br></div><div dir=3D"ltr">> +  ifdef C=
ONFIG_OPENSSL_ENGINE_CRYPTO<br></div><div dir=3D"ltr">> +    O=
PENSSL_OPTIONS +=3D -DHAVE_CRYPTODEV<br></div><div dir=3D"ltr">> + =
   ifdef CONFIG_OPENSSL_ENGINE_DIGEST<br></div><div dir=3D"ltr">> +=
      OPENSSL_OPTIONS +=3D -DUSE_CRYPTODEV_DIGESTS<br></div>=
<div dir=3D"ltr">> +    endif<br></div><div dir=3D"ltr">> +=
  endif<br></div><div dir=3D"ltr">> +  ifndef CONFIG_OPENSSL_E=
NGINE_AFALG<br></div><div dir=3D"ltr">> +    OPENSSL_OPTIONS +=
=3D no-afalgeng<br></div><div dir=3D"ltr">> +  endif<br></div><div =
dir=3D"ltr">> +  ifndef CONFIG_OPENSSL_ENGINE_PADLOCK<br></div><div=
 dir=3D"ltr">> +    OPENSSL_OPTIONS +=3D no-hw-padlock<br></di=
v><div dir=3D"ltr">>   endif<br></div><div dir=3D"ltr">> else<br=
></div><div dir=3D"ltr">> -  OPENSSL_OPTIONS +=3D no-engines<br></d=
iv><div dir=3D"ltr">> +  OPENSSL_OPTIONS +=3D no-engine<br></div><d=
iv dir=3D"ltr">> endif<br></div><div dir=3D"ltr">> <br></div><div dir=
=3D"ltr">> ifndef CONFIG_OPENSSL_WITH_EC<br></div><div dir=3D"ltr">> =
@@ -122,14 +129,6 @@ ifndef CONFIG_OPENSSL_WITH_EC2M<br></div><div dir=3D"l=
tr">>   OPENSSL_OPTIONS +=3D no-ec2m<br></div><div dir=3D"ltr">>=
 endif<br></div><div dir=3D"ltr">> <br></div><div dir=3D"ltr">> -ifnd=
ef CONFIG_OPENSSL_WITH_SSL3<br></div><div dir=3D"ltr">> -  OPENSSL_=
OPTIONS +=3D no-ssl3 no-ssl3-method<br></div><div dir=3D"ltr">> -endif<b=
r></div><div dir=3D"ltr">> -<br></div><div dir=3D"ltr">> -ifndef CONF=
IG_OPENSSL_HARDWARE_SUPPORT<br></div><div dir=3D"ltr">> -  OPENSSL_=
OPTIONS +=3D no-hw<br></div><div dir=3D"ltr">> -endif<br></div><div dir=
=3D"ltr">> -<br></div><div dir=3D"ltr">> ifndef CONFIG_OPENSSL_WITH_D=
EPRECATED<br></div><div dir=3D"ltr">>   OPENSSL_OPTIONS +=3D no-dep=
recated<br></div><div dir=3D"ltr">> endif<br></div><div dir=3D"ltr">>=
 @@ -144,10 +143,6 @@ else<br></div><div dir=3D"ltr">>   OPENSSL_OP=
TIONS +=3D no-comp<br></div><div dir=3D"ltr">> endif<br></div><div dir=
=3D"ltr">> <br></div><div dir=3D"ltr">> -ifndef CONFIG_OPENSSL_WITH_N=
PN<br></div><div dir=3D"ltr">> -  OPENSSL_OPTIONS +=3D no-nextproto=
neg<br></div><div dir=3D"ltr">> -endif<br></div><div dir=3D"ltr">> -<=
br></div><div dir=3D"ltr">> ifndef CONFIG_OPENSSL_WITH_PSK<br></div><div=
 dir=3D"ltr">>   OPENSSL_OPTIONS +=3D no-psk<br></div><div dir=3D"l=
tr">> endif<br></div><div dir=3D"ltr">> @@ -164,16 +159,16 @@ ifeq ($=
(CONFIG_x86_64),y)<br></div><div dir=3D"ltr">>   OPENSSL_TARGET:=3D=
linux-x86_64-openwrt<br></div><div dir=3D"ltr">>   OPENSSL_MAKEFLAG=
S +=3D LIBDIR=3Dlib<br></div><div dir=3D"ltr">> else<br></div><div dir=
=3D"ltr">> -  OPENSSL_OPTIONS+=3Dno-sse2<br></div><div dir=3D"ltr">=
> +  OPENSSL_OPTIONS+=3D no-sse2<br></div><div dir=3D"ltr"><br></di=
v><div dir=3D"ltr">Unless the absence of a space is specifically causing a =
problem, let=E2=80=99s not make whitespace-only changes.<br></div><div dir=
=3D"ltr"><br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr">>   =
ifeq ($(CONFIG_mips)$(CONFIG_mipsel),y)<br></div><div dir=3D"ltr">> -&nb=
sp;   OPENSSL_TARGET:=3Dlinux-mips-openwrt<br></div><div dir=3D"ltr">&=
gt; +    OPENSSL_TARGET:=3Dlinux-mips32-openwrt<br></div><div dir=
=3D"ltr">>   else ifeq ($(CONFIG_aarch64),y)<br></div><div dir=3D"l=
tr">>     OPENSSL_TARGET:=3Dlinux-aarch64-openwrt<br></div><di=
v dir=3D"ltr">>   else ifeq ($(CONFIG_arm)$(CONFIG_armeb),y)<br></d=
iv><div dir=3D"ltr">>     OPENSSL_TARGET:=3Dlinux-armv4-openwr=
t<br></div><div dir=3D"ltr">>   else<br></div><div dir=3D"ltr">>=
     OPENSSL_TARGET:=3Dlinux-generic-openwrt<br></div><div dir=3D=
"ltr">> -    OPENSSL_OPTIONS+=3Dno-perlasm<br></div><div dir=
=3D"ltr">> +    OPENSSL_OPTIONS+=3D no-perlasm<br></div><div d=
ir=3D"ltr"><br></div><div dir=3D"ltr">Ditto.<br></div><div dir=3D"ltr"><br>=
</div><div dir=3D"ltr"><br></div><div dir=3D"ltr">>   endif<br></di=
v><div dir=3D"ltr">> endif<br></div><div dir=3D"ltr">> <br></div><div=
 dir=3D"ltr">> @@ -191,6 +186,7 @@ define Build/Configure<br></div><div =
dir=3D"ltr">>             $=
(TARGET_CPPFLAGS) \<br></div><div dir=3D"ltr">>     &nbsp=
;       $(TARGET_LDFLAGS) -ldl \<br></div><div dir=
=3D"ltr">>             $(if=
 $(CONFIG_OPENSSL_OPTIMIZE_SPEED),,-DOPENSSL_SMALL_FOOTPRINT) \<br></div><d=
iv dir=3D"ltr">> +          &nbs=
p; -DOPENSSL_NO_ASYNC \<br></div><div dir=3D"ltr">>     &=
nbsp;       $(OPENSSL_NO_CIPHERS) \<br></div><div =
dir=3D"ltr">>             $=
(OPENSSL_OPTIONS) \<br></div><div dir=3D"ltr">>     )<br>=
</div><div dir=3D"ltr">> @@ -215,29 +211,12 @@ define Build/Compile<br><=
/div><div dir=3D"ltr">>         OPENWRT_OP=
TIMIZATION_FLAGS=3D"$(TARGET_CFLAGS)" \<br></div><div dir=3D"ltr">> &nbs=
p;       $(OPENSSL_MAKEFLAGS) \<br></div><div dir=
=3D"ltr">>         all<br></div><div dir=
=3D"ltr">> -    +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) =
\<br></div><div dir=3D"ltr">> -        CRO=
SS_COMPILE=3D"$(TARGET_CROSS)" \<br></div><div dir=3D"ltr">> - &nbs=
p;      CC=3D"$(TARGET_CC)" \<br></div><div dir=3D"ltr"=
>> -        ASFLAGS=3D"$(TARGET_ASFLAGS) -=
I$(PKG_BUILD_DIR)/crypto -c" \<br></div><div dir=3D"ltr">> -  =
      AR=3D"$(TARGET_CROSS)ar r" \<br></div><div dir=3D=
"ltr">> -        RANLIB=3D"$(TARGET_CROSS)=
ranlib" \<br></div><div dir=3D"ltr">> -      &n=
bsp; OPENWRT_OPTIMIZATION_FLAGS=3D"$(TARGET_CFLAGS)" \<br></div><div dir=3D=
"ltr">> -        $(OPENSSL_MAKEFLAGS) \<br=
></div><div dir=3D"ltr">> -        build-s=
hared<br></div><div dir=3D"ltr">> -    # Work around open=
ssl build bug to link libssl.so with libcrypto.so.<br></div><div dir=3D"ltr=
">> -    -rm $(PKG_BUILD_DIR)/libssl.so.*.*.*<br></div><d=
iv dir=3D"ltr">> -    +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD=
_DIR) \<br></div><div dir=3D"ltr">> -      &nbs=
p; CROSS_COMPILE=3D"$(TARGET_CROSS)" \<br></div><div dir=3D"ltr">> -&nbs=
p;       CC=3D"$(TARGET_CC)" \<br></div><div dir=
=3D"ltr">> -        OPENWRT_OPTIMIZATION_F=
LAGS=3D"$(TARGET_CFLAGS)" \<br></div><div dir=3D"ltr">> -  &nb=
sp;     $(OPENSSL_MAKEFLAGS) \<br></div><div dir=3D"ltr">&gt=
; -        do_linux-shared<br></div><div dir=
=3D"ltr">>     $(MAKE) -C $(PKG_BUILD_DIR) \<br></div><di=
v dir=3D"ltr">>         CROSS_COMPILE=3D"$=
(TARGET_CROSS)" \<br></div><div dir=3D"ltr">>      &=
nbsp;  CC=3D"$(TARGET_CC)" \<br></div><div dir=3D"ltr">> - &nb=
sp;      INSTALL_PREFIX=3D"$(PKG_INSTALL_DIR)" \<br></d=
iv><div dir=3D"ltr">> +        DESTDIR=3D"=
$(PKG_INSTALL_DIR)" \<br></div><div dir=3D"ltr">>     &nb=
sp;   $(OPENSSL_MAKEFLAGS) \<br></div><div dir=3D"ltr">> -&nbs=
p;       install<br></div><div dir=3D"ltr">> +&=
nbsp;       install_sw install_ssldirs<br></div><d=
iv dir=3D"ltr">> endef<br></div><div dir=3D"ltr">> <br></div><div dir=
=3D"ltr">> define Build/InstallDev<br></div><div dir=3D"ltr">> @@ -25=
4,6 +233,11 @@ define Package/libopenssl/install<br></div><div dir=3D"ltr">=
>     $(INSTALL_DIR) $(1)/usr/lib<br></div><div dir=3D"lt=
r">>     $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libcr=
ypto.so.* $(1)/usr/lib/<br></div><div dir=3D"ltr">>     $=
(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libssl.so.* $(1)/usr/lib/<br></di=
v><div dir=3D"ltr">> +    $(if $(CONFIG_OPENSSL_ENGINE),$=
(INSTALL_DIR) $(1)/usr/lib/engines-1.1)<br></div><div dir=3D"ltr">> +&nb=
sp;   $(if $(CONFIG_OPENSSL_ENGINE_AFALG),$(INSTALL_BIN) \<br></d=
iv><div dir=3D"ltr">> +        $(PKG_INSTA=
LL_DIR)/usr/lib/engines-1.1/afalg.so $(1)/usr/lib/engines-1.1)<br></div><di=
v dir=3D"ltr">> +    $(if $(CONFIG_OPENSSL_ENGINE_PADLOCK=
),$(INSTALL_BIN) \<br></div><div dir=3D"ltr">> +    &nbsp=
;   $(PKG_INSTALL_DIR)/usr/lib/engines-1.1/padlock.so $(1)/usr/li=
b/engines-1.1)<br></div><div dir=3D"ltr">> endef<br></div><div dir=3D"lt=
r">> <br></div><div dir=3D"ltr">> define Package/openssl-util/install=
<br></div><div dir=3D"ltr">> diff --git a/package/libs/openssl/patches/1=
00-Configure-afalg-support.patch b/package/libs/openssl/patches/100-Configu=
re-afalg-support.patch<br></div><div dir=3D"ltr">> new file mode 100644<=
br></div><div dir=3D"ltr">> index 0000000000..41b34f089e<br></div><div d=
ir=3D"ltr">> --- /dev/null<br></div><div dir=3D"ltr">> +++ b/package/=
libs/openssl/patches/100-Configure-afalg-support.patch<br></div><div dir=3D=
"ltr">> @@ -0,0 +1,13 @@<br></div><div dir=3D"ltr">> +--- a/Configure=
<br></div><div dir=3D"ltr">> ++++ b/Configure<br></div><div dir=3D"ltr">=
> +@@ -1303,7 +1303,9 @@ else            &=
nbsp;  { $no_user_defines=3D1;<br></div><div dir=3D"ltr">> + <br></div><=
div dir=3D"ltr">> + unless ($disabled{afalgeng}) {<br></div><div dir=3D"=
ltr">> +     $config{afalgeng}=3D"";<br></div><div dir=3D"ltr"=
>> +-    if ($target =3D~ m/^linux/) {<br></div><div dir=3D"lt=
r">> ++    if ($target =3D~ m/openwrt$/) {<br></div><div dir=
=3D"ltr">> ++        push @{$config{engdirs}}, "afal=
g";<br></div><div dir=3D"ltr">> ++    } elsif ($target =3D~ m/=
^linux/) {<br></div><div dir=3D"ltr">> +         my =
$minver =3D 4*10000 + 1*100 + 0;<br></div><div dir=3D"ltr">> +  &nb=
sp;      if ($config{cross_compile_prefix} eq "") {<br></div><div=
 dir=3D"ltr">> +             my $verstr =
=3D `uname -r`;<br></div><div dir=3D"ltr">> diff --git a/package/libs/op=
enssl/patches/110-openwrt_targets.patch b/package/libs/openssl/patches/110-=
openwrt_targets.patch<br></div><div dir=3D"ltr">> new file mode 100644<b=
r></div><div dir=3D"ltr">> index 0000000000..bc74c8819f<br></div><div di=
r=3D"ltr">> --- /dev/null<br></div><div dir=3D"ltr">> +++ b/package/l=
ibs/openssl/patches/110-openwrt_targets.patch<br></div><div dir=3D"ltr">&gt=
; @@ -0,0 +1,26 @@<br></div><div dir=3D"ltr">> +--- /dev/null<br></div><=
div dir=3D"ltr">> ++++ b/Configurations/25-openwrt.conf<br></div><div di=
r=3D"ltr">> +@@ -0,0 +1,23 @@<br></div><div dir=3D"ltr">> ++%targets =
=3D (<br></div><div dir=3D"ltr">> ++    "linux-x86_64-openwrt"=
 =3D> {<br></div><div dir=3D"ltr">> ++        inh=
erit_from    =3D> [ "linux-x86_64" ],<br></div><div dir=3D"ltr=
">> ++    cflags        =3D=
> add("\$(OPENWRT_OPTIMIZATION_FLAGS)"),<br></div><div dir=3D"ltr">> =
++    },<br></div><div dir=3D"ltr">> ++    "linux-aa=
rch64-openwrt" =3D> {<br></div><div dir=3D"ltr">> ++    &nb=
sp;   inherit_from    =3D> [ "linux-aarch64" ],<br></div>=
<div dir=3D"ltr">> ++    cflags     &=
nbsp;  =3D> add("\$(OPENWRT_OPTIMIZATION_FLAGS)"),<br></div><div di=
r=3D"ltr">> ++    },<br></div><div dir=3D"ltr">> ++  &=
nbsp; "linux-armv4-openwrt" =3D> {<br></div><div dir=3D"ltr">> ++&nbs=
p;       inherit_from    =3D> [ "linux-armv4" ]=
,<br></div><div dir=3D"ltr">> ++    cflags  &nb=
sp;     =3D> add("\$(OPENWRT_OPTIMIZATION_FLAGS)"),<br></=
div><div dir=3D"ltr">> ++    },<br></div><div dir=3D"ltr">>=
 ++    "linux-mips32-openwrt" =3D> {<br></div><div dir=3D"ltr"=
>> ++        inherit_from    =3D> [ "li=
nux-mips32" ],<br></div><div dir=3D"ltr">> ++    cflags&n=
bsp;       =3D> add("\$(OPENWRT_OPTIMIZATION_FL=
AGS)"),<br></div><div dir=3D"ltr">> ++    },<br></div><div dir=
=3D"ltr">> ++    "linux-generic-openwrt" =3D> {<br></div><d=
iv dir=3D"ltr">> ++        inherit_from   =
 =3D> [ "linux-generic" ],<br></div><div dir=3D"ltr">> ++  =
  cflags        =3D> add("\$(OPENWRT_=
OPTIMIZATION_FLAGS)"),<br></div><div dir=3D"ltr">> ++    },<br=
></div><div dir=3D"ltr">> ++);<br></div><div dir=3D"ltr">> ++<br></di=
v><div dir=3D"ltr">> diff --git a/package/libs/openssl/patches/110-optim=
ize-for-size.patch b/package/libs/openssl/patches/110-optimize-for-size.pat=
ch<br></div><div dir=3D"ltr">> deleted file mode 100644<br></div><div di=
r=3D"ltr">> index d6d4a21111..0000000000<br></div><div dir=3D"ltr">> =
--- a/package/libs/openssl/patches/110-optimize-for-size.patch<br></div><di=
v dir=3D"ltr">> +++ /dev/null<br></div><div dir=3D"ltr">> @@ -1,16 +0=
,0 @@<br></div><div dir=3D"ltr">> ---- a/Configure<br></div><div dir=3D"=
ltr">> -+++ b/Configure<br></div><div dir=3D"ltr">> -@@ -470,6 +470,1=
3 @@ my %table=3D(<br></div><div dir=3D"ltr">> - "linux-alpha-ccc","ccc:=
-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_=
CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",<br></div><div dir=
=3D"ltr">> - "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDI=
AN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR D=
ES_RISC1 DES_UNROLL:${alpha_asm}",<br></div><div dir=3D"ltr">> - <br></d=
iv><div dir=3D"ltr">> -+# OpenWrt targets<br></div><div dir=3D"ltr">>=
 -+"linux-armv4-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fom=
it-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_=
INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_M=
AJOR).\$(SHLIB_MINOR)",<br></div><div dir=3D"ltr">> -+"linux-aarch64-ope=
nwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-pointer -W=
all::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_=
UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB=
_MAJOR).\$(SHLIB_MINOR)",<br></div><div dir=3D"ltr">> -+"linux-x86_64-op=
enwrt",    "gcc:-m64 -DL_ENDIAN -DTERMIOS \$(OPENWRT_OPTIMIZ=
ATION_FLAGS) -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_=
LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPI=
C:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",<br></div><div dir=3D"ltr"=
>> -+"linux-mips-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) =
-fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK =
DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\=
$(SHLIB_MAJOR).\$(SHLIB_MINOR)",<br></div><div dir=3D"ltr">> -+"linux-ge=
neric-openwrt","gcc:-DTERMIOS \$(OPENWRT_OPTIMIZATION_FLAGS) -fomit-frame-p=
ointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UN=
ROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLI=
B_MINOR)",<br></div><div dir=3D"ltr">> -+<br></div><div dir=3D"ltr">>=
 - # Android: linux-* but without pointers to headers and libs.<br></div><d=
iv dir=3D"ltr">> - "android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B=
\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_L=
LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-sha=
red:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",<br></div><div dir=3D"ltr">=
> - "android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_=
DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_=
gcc_des} ${x86_gcc_opts}:".eval{my $asm=3D${x86_elf_asm};$asm=3D~s/:elf/:an=
droid/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR=
)",<br></div><div dir=3D"ltr">> diff --git a/package/libs/openssl/patche=
s/180-fix_link_segfault.patch b/package/libs/openssl/patches/120-fix_link_s=
egfault.patch<br></div><div dir=3D"ltr">> similarity index 52%<br></div>=
<div dir=3D"ltr">> rename from package/libs/openssl/patches/180-fix_link=
_segfault.patch<br></div><div dir=3D"ltr">> rename to package/libs/opens=
sl/patches/120-fix_link_segfault.patch<br></div><div dir=3D"ltr">> index=
 3e36beb49c..703ab04108 100644<br></div><div dir=3D"ltr">> --- a/package=
/libs/openssl/patches/180-fix_link_segfault.patch<br></div><div dir=3D"ltr"=
>> +++ b/package/libs/openssl/patches/120-fix_link_segfault.patch<br></d=
iv><div dir=3D"ltr">> @@ -1,18 +1,26 @@<br></div><div dir=3D"ltr">> -=
-- a/Makefile.shared<br></div><div dir=3D"ltr">> +++ b/Makefile.shared<b=
r></div><div dir=3D"ltr">> -@@ -95,7 +95,6 @@ LINK_APP=3D  &nb=
sp; \<br></div><div dir=3D"ltr">> -     LDCMD=3D"$${LDCMD:-$(C=
C)}"; LDFLAGS=3D"$${LDFLAGS:-$(CFLAGS)}"; \<br></div><div dir=3D"ltr">> =
+@@ -102,9 +102,7 @@ LINK_APP=3D    \<br></div><div dir=3D"l=
tr">> +     LDCMD=3D"$${LDCMD:-$(CC)}"; LDFLAGS=3D"$${LDFLAGS:=
-$(CFLAGS) $(LDFLAGS)}"; \<br></div><div dir=3D"ltr">>    &nbs=
p; LIBPATH=3D`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' =
-e d | uniq`; \<br></div><div dir=3D"ltr">>      LIBPATH=
=3D`echo $$LIBPATH | sed -e 's/ /:/g'`; \<br></div><div dir=3D"ltr">> +-=
    echo LD_LIBRARY_PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \<br></div=
><div dir=3D"ltr">> +-        $${LDCMD} $${LDFLAGS} =
-o $${APPNAME:=3D$(APPNAME)} $(OBJECTS) $${LIBDEPS}; \<br></div><div dir=3D=
"ltr">> -    LD_LIBRARY_PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \<b=
r></div><div dir=3D"ltr">> ++    echo $${LDCMD} $${LDFLAGS} -o=
 $${APPNAME:=3D$(APPNAME)} $(OBJECTS) $${LIBDEPS}; \<br></div><div dir=3D"l=
tr">>      $${LDCMD} $${LDFLAGS} -o $${APPNAME:=3D$(APPNA=
ME)} $(OBJECTS) $${LIBDEPS} )<br></div><div dir=3D"ltr">> <br></div><div=
 dir=3D"ltr">>  LINK_SO=3D    \<br></div><div dir=3D=
"ltr">> -@@ -105,7 +104,6 @@ LINK_SO=3D    \<br></div><di=
v dir=3D"ltr">> +@@ -114,11 +112,9 @@ LINK_SO=3D    \<br>=
</div><div dir=3D"ltr">>      SHAREDFLAGS=3D"$${SHAREDFLA=
GS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \<br></div><div dir=3D"ltr">>  &=
nbsp;   LIBPATH=3D`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^=
 *-L//;t' -e d | uniq`; \<br></div><div dir=3D"ltr">>    &nbsp=
; LIBPATH=3D`echo $$LIBPATH | sed -e 's/ /:/g'`; \<br></div><div dir=3D"ltr=
">> +-    echo LD_LIBRARY_PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \=
<br></div><div dir=3D"ltr">> +-         $${SHAREDCMD=
} $${SHAREDFLAGS} \<br></div><div dir=3D"ltr">> ++    echo $${=
SHAREDCMD} $${SHAREDFLAGS} \<br></div><div dir=3D"ltr">> +   &=
nbsp;      -o $(SHLIBNAME_FULL) \<br></div><div dir=3D"ltr">> =
+          $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSF=
LAGS $$LIBDEPS; \<br></div><div dir=3D"ltr">> -    LD_LIBRARY_=
PATH=3D$$LIBPATH:$$LD_LIBRARY_PATH \<br></div><div dir=3D"ltr">>  &=
nbsp;   $${SHAREDCMD} $${SHAREDFLAGS} \<br></div><div dir=3D"ltr">>=
 -     -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \<br></div><div=
 dir=3D"ltr">> +     -o $(SHLIBNAME_FULL) \<br></div><div=
 dir=3D"ltr">>      $$ALLSYMSFLAGS $$SHOBJECTS $$NOA=
LLSYMSFLAGS $$LIBDEPS \<br></div><div dir=3D"ltr">> diff --git a/package=
/libs/openssl/patches/130-perl-path.patch b/package/libs/openssl/patches/13=
0-perl-path.patch<br></div><div dir=3D"ltr">> deleted file mode 100644<b=
r></div><div dir=3D"ltr">> index 2dbdc76010..0000000000<br></div><div di=
r=3D"ltr">> --- a/package/libs/openssl/patches/130-perl-path.patch<br></=
div><div dir=3D"ltr">> +++ /dev/null<br></div><div dir=3D"ltr">> @@ -=
1,64 +0,0 @@<br></div><div dir=3D"ltr">> ---- a/Configure<br></div><div =
dir=3D"ltr">> -+++ b/Configure<br></div><div dir=3D"ltr">> -@@ -1,4 +=
1,4 @@<br></div><div dir=3D"ltr">> --:<br></div><div dir=3D"ltr">> -+=
#!/usr/bin/perl<br></div><div dir=3D"ltr">> - eval 'exec perl -S $0 ${1+=
"$@"}'<br></div><div dir=3D"ltr">> -     if $running_under_som=
e_shell;<br></div><div dir=3D"ltr">> - ##<br></div><div dir=3D"ltr">>=
 ---- a/tools/c_rehash.in<br></div><div dir=3D"ltr">> -+++ b/tools/c_reh=
ash.in<br></div><div dir=3D"ltr">> -@@ -1,4 +1,4 @@<br></div><div dir=3D=
"ltr">> --#!/usr/local/bin/perl<br></div><div dir=3D"ltr">> -+#!/usr/=
bin/perl<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> -=
 # Perl c_rehash script, scan all files in a directory<br></div><div dir=3D=
"ltr">> - # and add symbolic links to their hash values.<br></div><div d=
ir=3D"ltr">> ---- a/util/clean-depend.pl<br></div><div dir=3D"ltr">> =
-+++ b/util/clean-depend.pl<br></div><div dir=3D"ltr">> -@@ -1,4 +1,4 @@=
<br></div><div dir=3D"ltr">> --#!/usr/local/bin/perl -w<br></div><div di=
r=3D"ltr">> -+#!/usr/bin/perl<br></div><div dir=3D"ltr">> - # Clean t=
he dependency list in a makefile of standard includes...<br></div><div dir=
=3D"ltr">> - # Written by Ben Laurie <<a href=3D"mailto:ben@algroup.c=
o.uk" rel=3D"nofollow" target=3D"_blank">ben@algroup.co.uk</a>> 19 Jan 1=
999<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> ---- a=
/util/mkdef.pl<br></div><div dir=3D"ltr">> -+++ b/util/mkdef.pl<br></div=
><div dir=3D"ltr">> -@@ -1,4 +1,4 @@<br></div><div dir=3D"ltr">> --#!=
/usr/local/bin/perl -w<br></div><div dir=3D"ltr">> -+#!/usr/bin/perl<br>=
</div><div dir=3D"ltr">> - #<br></div><div dir=3D"ltr">> - # generate=
 a .def file<br></div><div dir=3D"ltr">> - #<br></div><div dir=3D"ltr">&=
gt; ---- a/util/mkerr.pl<br></div><div dir=3D"ltr">> -+++ b/util/mkerr.p=
l<br></div><div dir=3D"ltr">> -@@ -1,4 +1,4 @@<br></div><div dir=3D"ltr"=
>> --#!/usr/local/bin/perl -w<br></div><div dir=3D"ltr">> -+#!/usr/bi=
n/perl<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - m=
y $config =3D "crypto/err/openssl.ec";<br></div><div dir=3D"ltr">> - my =
$hprefix =3D "openssl/";<br></div><div dir=3D"ltr">> ---- a/util/mkstack=
.pl<br></div><div dir=3D"ltr">> -+++ b/util/mkstack.pl<br></div><div dir=
=3D"ltr">> -@@ -1,4 +1,4 @@<br></div><div dir=3D"ltr">> --#!/usr/loca=
l/bin/perl -w<br></div><div dir=3D"ltr">> -+#!/usr/bin/perl<br></div><di=
v dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - # This is a utility =
that searches out "DECLARE_STACK_OF()"<br></div><div dir=3D"ltr">> - # d=
eclarations in .h and .c files, and updates/creates/replaces<br></div><div =
dir=3D"ltr">> ---- a/util/pod2man.pl<br></div><div dir=3D"ltr">> -+++=
 b/util/pod2man.pl<br></div><div dir=3D"ltr">> -@@ -1,4 +1,4 @@<br></div=
><div dir=3D"ltr">> --: #!/usr/bin/perl-5.005<br></div><div dir=3D"ltr">=
> -+#!/usr/bin/perl<br></div><div dir=3D"ltr">> -     eval =
'exec /usr/bin/perl -S $0 ${1+"$@"}'<br></div><div dir=3D"ltr">> - &nbsp=
;   if $running_under_some_shell;<br></div><div dir=3D"ltr">> =
- <br></div><div dir=3D"ltr">> ---- a/util/selftest.pl<br></div><div dir=
=3D"ltr">> -+++ b/util/selftest.pl<br></div><div dir=3D"ltr">> -@@ -1=
,4 +1,4 @@<br></div><div dir=3D"ltr">> --#!/usr/local/bin/perl -w<br></d=
iv><div dir=3D"ltr">> -+#!/usr/bin/perl<br></div><div dir=3D"ltr">> -=
 #<br></div><div dir=3D"ltr">> - # Run the test suite and generate a rep=
ort<br></div><div dir=3D"ltr">> - #<br></div><div dir=3D"ltr">> diff =
--git a/package/libs/openssl/patches/140-makefile-dirs.patch b/package/libs=
/openssl/patches/140-makefile-dirs.patch<br></div><div dir=3D"ltr">> del=
eted file mode 100644<br></div><div dir=3D"ltr">> index 83c412f444..0000=
000000<br></div><div dir=3D"ltr">> --- a/package/libs/openssl/patches/14=
0-makefile-dirs.patch<br></div><div dir=3D"ltr">> +++ /dev/null<br></div=
><div dir=3D"ltr">> @@ -1,11 +0,0 @@<br></div><div dir=3D"ltr">> ----=
 a/Makefile.org<br></div><div dir=3D"ltr">> -+++ b/Makefile.org<br></div=
><div dir=3D"ltr">> -@@ -137,7 +137,7 @@ FIPSCANLIB=3D<br></div><div dir=
=3D"ltr">> - <br></div><div dir=3D"ltr">> - BASEADDR=3D<br></div><div=
 dir=3D"ltr">> - <br></div><div dir=3D"ltr">> --DIRS=3D   crypto=
 ssl engines apps test tools<br></div><div dir=3D"ltr">> -+DIRS=3D =
  crypto ssl apps<br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr"><br>=
</div><div dir=3D"ltr">Why are we dropping =E2=80=9Cengines=E2=80=9D again?=
<br></div><div dir=3D"ltr"><br></div><div dir=3D"ltr"><br></div><div dir=3D=
"ltr"><br></div><div dir=3D"ltr">> - ENGDIRS=3D ccgost<br></div><div dir=
=3D"ltr">> - SHLIBDIRS=3D crypto ssl<br></div><div dir=3D"ltr">> - <b=
r></div><div dir=3D"ltr">> diff --git a/package/libs/openssl/patches/150=
-no_engines.patch b/package/libs/openssl/patches/150-no_engines.patch<br></=
div><div dir=3D"ltr">> deleted file mode 100644<br></div><div dir=3D"ltr=
">> index 102e7a3272..0000000000<br></div><div dir=3D"ltr">> --- a/pa=
ckage/libs/openssl/patches/150-no_engines.patch<br></div><div dir=3D"ltr">&=
gt; +++ /dev/null<br></div><div dir=3D"ltr">> @@ -1,81 +0,0 @@<br></div>=
<div dir=3D"ltr">> ---- a/Configure<br></div><div dir=3D"ltr">> -+++ =
b/Configure<br></div><div dir=3D"ltr">> -@@ -2136,6 +2136,11 @@ EOF<br><=
/div><div dir=3D"ltr">> -     close(OUT);<br></div><div d=
ir=3D"ltr">> -   }<br></div><div dir=3D"ltr">> -   <br></di=
v><div dir=3D"ltr">> -+# ugly hack to disable engines<br></div><div dir=
=3D"ltr">> -+if($target eq "mingwx") {<br></div><div dir=3D"ltr">> -+=
    system("sed -e s/^LIB/XLIB/g -i engines/Makefile");<br><=
/div><div dir=3D"ltr">> -+}<br></div><div dir=3D"ltr">> -+<br></div><=
div dir=3D"ltr">> - print <<EOF;<br></div><div dir=3D"ltr">> - =
<br></div><div dir=3D"ltr">> - Configured for $target.<br></div><div dir=
=3D"ltr">> ---- a/util/libeay.num<br></div><div dir=3D"ltr">> -+++ b/=
util/libeay.num<br></div><div dir=3D"ltr">> -@@ -2075,7 +2075,6 @@ PKCS7=
_ATTR_SIGN_it<br></div><div dir=3D"ltr">> - UI_add_error_string  &n=
bsp;                  2633 &nb=
sp;  EXIST::FUNCTION:<br></div><div dir=3D"ltr">> - KRB5_CHECKSUM_f=
ree                    &n=
bsp; 2634    EXIST::FUNCTION:<br></div><div dir=3D"ltr">>=
 - OCSP_REQUEST_get_ext              &nb=
sp;     2635    EXIST::FUNCTION:<br></div><div dir=
=3D"ltr">> --ENGINE_load_ubsec            =
           2636    EXIST::FUNCTION:=
ENGINE,STATIC_ENGINE<br></div><div dir=3D"ltr">> - ENGINE_register_all_d=
igests             2637    EXI=
ST::FUNCTION:ENGINE<br></div><div dir=3D"ltr">> - PKEY_USAGE_PERIOD_it&n=
bsp;                   2638&nb=
sp;   EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:<br></div><div dir=
=3D"ltr">> - PKEY_USAGE_PERIOD_it          &nbs=
p;         2638    EXIST:EXPORT_VAR_AS_F=
UNCTION:FUNCTION:<br></div><div dir=3D"ltr">> -@@ -2549,7 +2548,6 @@ OCS=
P_RESPONSE_new<br></div><div dir=3D"ltr">> - AES_set_encrypt_key  &=
nbsp;                  3024 &n=
bsp;  EXIST::FUNCTION:AES<br></div><div dir=3D"ltr">> - OCSP_resp_c=
ount                    &=
nbsp;    3025    EXIST::FUNCTION:<br></div><div dir=3D"=
ltr">> - KRB5_CHECKSUM_new            &nbs=
p;          3026    EXIST::FUNCTION:<br>=
</div><div dir=3D"ltr">> --ENGINE_load_cswift       =
               3027    EX=
IST::FUNCTION:ENGINE,STATIC_ENGINE<br></div><div dir=3D"ltr">> - OCSP_on=
ereq_get0_id                  =
   3028    EXIST::FUNCTION:<br></div><div dir=3D"ltr">&=
gt; - ENGINE_set_default_ciphers            &=
nbsp; 3029    EXIST::FUNCTION:ENGINE<br></div><div dir=3D"lt=
r">> - NOTICEREF_it              &nbs=
p;             3030    EXIST:!=
EXPORT_VAR_AS_FUNCTION:VARIABLE:<br></div><div dir=3D"ltr">> -@@ -2580,7=
 +2578,6 @@ ASN1_primitive_free<br></div><div dir=3D"ltr">> - i2d_EXTEND=
ED_KEY_USAGE                  =
3052    EXIST::FUNCTION:<br></div><div dir=3D"ltr">> - i2=
d_OCSP_SIGNATURE                &nb=
sp;     3053    EXIST::FUNCTION:<br></div><div dir=
=3D"ltr">> - asn1_enc_save            &nbs=
p;              3054    EXIST:=
:FUNCTION:<br></div><div dir=3D"ltr">> --ENGINE_load_nuron    =
                   3055 &=
nbsp;  EXIST::FUNCTION:ENGINE,STATIC_ENGINE<br></div><div dir=3D"ltr">=
> - _ossl_old_des_pcbc_encrypt            =
  3056    EXIST::FUNCTION:DES<br></div><div dir=3D"ltr"=
>> - PKCS12_MAC_DATA_it              =
        3057    EXIST:!EXPORT_VAR_AS_FUN=
CTION:VARIABLE:<br></div><div dir=3D"ltr">> - PKCS12_MAC_DATA_it  &=
nbsp;                   3057&n=
bsp;   EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:<br></div><div dir=
=3D"ltr">> -@@ -2604,7 +2601,6 @@ asn1_get_choice_selector<br></div><div=
 dir=3D"ltr">> - i2d_KRB5_CHECKSUM          &nb=
sp;            3072    EXIST::FUNCT=
ION:<br></div><div dir=3D"ltr">> - ENGINE_set_table_flags    &=
nbsp;             3073    EXIS=
T::FUNCTION:ENGINE<br></div><div dir=3D"ltr">> - AES_options  &nbsp=
;                     &nb=
sp;    3074    EXIST::FUNCTION:AES<br></div><div dir=3D=
"ltr">> --ENGINE_load_chil            &nbs=
p;           3075    EXIST::FUNCTIO=
N:ENGINE,STATIC_ENGINE<br></div><div dir=3D"ltr">> - OCSP_id_cmp  &=
nbsp;                    =
      3076    EXIST::FUNCTION:<br></div><div dir=
=3D"ltr">> - OCSP_BASICRESP_new           =
           3077    EXIST::FUNCTION:=
<br></div><div dir=3D"ltr">> - OCSP_REQUEST_get_ext_by_NID    =
         3078    EXIST::FUNCTION:<br></d=
iv><div dir=3D"ltr">> -@@ -2671,7 +2667,6 @@ OCSP_CRLID_it<br></div><div=
 dir=3D"ltr">> - OCSP_CRLID_it            =
               3127    EX=
IST:EXPORT_VAR_AS_FUNCTION:FUNCTION:<br></div><div dir=3D"ltr">> - i2d_K=
RB5_AUTHENTBODY                &nbs=
p;   3128    EXIST::FUNCTION:<br></div><div dir=3D"ltr"=
>> - OCSP_REQUEST_get_ext_count           =
   3129    EXIST::FUNCTION:<br></div><div dir=3D"ltr">&=
gt; --ENGINE_load_atalla              &n=
bsp;       3130    EXIST::FUNCTION:ENGINE,STA=
TIC_ENGINE<br></div><div dir=3D"ltr">> - X509_NAME_it    &nbsp=
;                     &nb=
sp; 3131    EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:<br></div=
><div dir=3D"ltr">> - X509_NAME_it          &nb=
sp;                 3131 &nbsp=
;  EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:<br></div><div dir=3D"ltr">&g=
t; - USERNOTICE_it                &=
nbsp;          3132    EXIST:!EXPORT_VAR=
_AS_FUNCTION:VARIABLE:<br></div><div dir=3D"ltr">> -@@ -2766,8 +2761,6 @=
@ DES_read_2passwords<br></div><div dir=3D"ltr">> - DES_read_password&nb=
sp;                      =
3207    EXIST::FUNCTION:DES<br></div><div dir=3D"ltr">> -=
 UI_UTIL_read_pw                &nb=
sp;        3208    EXIST::FUNCTION:<br></div>=
<div dir=3D"ltr">> - UI_UTIL_read_pw_string        &=
nbsp;         3209    EXIST::FUNCTION:<b=
r></div><div dir=3D"ltr">> --ENGINE_load_aep        =
                 3210  &n=
bsp; EXIST::FUNCTION:ENGINE,STATIC_ENGINE<br></div><div dir=3D"ltr">> --=
ENGINE_load_sureware               =
     3211    EXIST::FUNCTION:ENGINE,STATIC_ENGINE<=
br></div><div dir=3D"ltr">> - OPENSSL_add_all_algorithms_noconf  &n=
bsp;    3212    EXIST:!VMS:FUNCTION:<br></div><div dir=
=3D"ltr">> - OPENSSL_add_all_algo_noconf        &nbs=
p;    3212    EXIST:VMS:FUNCTION:<br></div><div dir=3D"=
ltr">> - OPENSSL_add_all_algorithms_conf         321=
3    EXIST:!VMS:FUNCTION:<br></div><div dir=3D"ltr">> -@@=
 -2776,7 +2769,6 @@ OPENSSL_load_builtin_modules<br></div><div dir=3D"ltr">=
> - AES_ofb128_encrypt              &=
nbsp;       3215    EXIST::FUNCTION:AES<br></=
div><div dir=3D"ltr">> - AES_ctr128_encrypt        &=
nbsp;             3216    EXIS=
T::FUNCTION:AES<br></div><div dir=3D"ltr">> - AES_cfb128_encrypt  &=
nbsp;                   3217&n=
bsp;   EXIST::FUNCTION:AES<br></div><div dir=3D"ltr">> --ENGIN=
E_load_4758cca                &nbsp=
;    3218    EXIST::FUNCTION:ENGINE,STATIC_ENGINE<br></=
div><div dir=3D"ltr">> - _ossl_096_des_random_seed      &=
nbsp;        3219    EXIST::FUNCTION:DES<br><=
/div><div dir=3D"ltr">> - EVP_aes_256_ofb        &nb=
sp;                3220  &nbsp=
; EXIST::FUNCTION:AES<br></div><div dir=3D"ltr">> - EVP_aes_192_ofb&nbsp=
;                     &nb=
sp;  3221    EXIST::FUNCTION:AES<br></div><div dir=3D"ltr">&=
gt; -@@ -3111,7 +3103,6 @@ EC_GFp_nist_method<br></div><div dir=3D"ltr">&gt=
; - STORE_meth_set_modify_fn            &nbsp=
;   3530    NOEXIST::FUNCTION:<br></div><div dir=3D"ltr=
">> - STORE_method_set_modify_function        3530&n=
bsp;   NOEXIST::FUNCTION:<br></div><div dir=3D"ltr">> - STORE_=
parse_attrs_next                &nb=
sp; 3531    NOEXIST::FUNCTION:<br></div><div dir=3D"ltr">&gt=
; --ENGINE_load_padlock              &nb=
sp;      3532    EXIST::FUNCTION:ENGINE,STATIC_ENG=
INE<br></div><div dir=3D"ltr">> - EC_GROUP_set_curve_name    &=
nbsp;            3533    EXIST::FUN=
CTION:EC<br></div><div dir=3D"ltr">> - X509_CERT_PAIR_it    &n=
bsp;                  3534 &nb=
sp;  EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:<br></div><div dir=3D"ltr"=
>> - X509_CERT_PAIR_it              &=
nbsp;        3534    EXIST:EXPORT_VAR_AS_FUNC=
TION:FUNCTION:<br></div><div dir=3D"ltr">> diff --git a/package/libs/ope=
nssl/patches/160-disable_doc_tests.patch b/package/libs/openssl/patches/160=
-disable_doc_tests.patch<br></div><div dir=3D"ltr">> deleted file mode 1=
00644<br></div><div dir=3D"ltr">> index e38d44a768..0000000000<br></div>=
<div dir=3D"ltr">> --- a/package/libs/openssl/patches/160-disable_doc_te=
sts.patch<br></div><div dir=3D"ltr">> +++ /dev/null<br></div><div dir=3D=
"ltr">> @@ -1,58 +0,0 @@<br></div><div dir=3D"ltr">> ---- a/Makefile<=
br></div><div dir=3D"ltr">> -+++ b/Makefile<br></div><div dir=3D"ltr">&g=
t; -@@ -139,7 +139,7 @@ FIPSCANLIB=3D<br></div><div dir=3D"ltr">> - <br>=
</div><div dir=3D"ltr">> - BASEADDR=3D0xFB00000<br></div><div dir=3D"ltr=
">> - <br></div><div dir=3D"ltr">> --DIRS=3D   crypto ssl engine=
s apps test tools<br></div><div dir=3D"ltr">> -+DIRS=3D   crypto ss=
l engines apps tools<br></div><div dir=3D"ltr">> - ENGDIRS=3D ccgost<br>=
</div><div dir=3D"ltr">> - SHLIBDIRS=3D crypto ssl<br></div><div dir=3D"=
ltr">> - <br></div><div dir=3D"ltr">> -@@ -157,7 +157,7 @@ SDIRS=3D&n=
bsp; \<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - #=
 tests to perform.  "alltests" is a special word indicating that all t=
ests<br></div><div dir=3D"ltr">> - # should be performed.<br></div><div =
dir=3D"ltr">> --TESTS =3D alltests<br></div><div dir=3D"ltr">> -+TEST=
S =3D<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - MA=
KEFILE=3D Makefile<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"l=
tr">> -@@ -171,7 +171,7 @@ SHELL=3D/bin/sh<br></div><div dir=3D"ltr">&gt=
; - <br></div><div dir=3D"ltr">> - TOP=3D    .<br></div><div d=
ir=3D"ltr">> - ONEDIRS=3Dout tmp<br></div><div dir=3D"ltr">> --EDIRS=
=3D  times doc bugs util include certs ms shlib mt demos perl sf dep V=
MS<br></div><div dir=3D"ltr">> -+EDIRS=3D  times bugs util include =
certs ms shlib mt demos perl sf dep VMS<br></div><div dir=3D"ltr">> - WD=
IRS=3D  windows<br></div><div dir=3D"ltr">> - LIBS=3D   libcry=
pto.a libssl.a<br></div><div dir=3D"ltr">> - SHARED_CRYPTO=3Dlibcrypto$(=
SHLIB_EXT)<br></div><div dir=3D"ltr">> -@@ -276,7 +276,7 @@ reflect:<br>=
</div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - sub_all: bu=
ild_all<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> --=
build_all: build_libs build_apps build_tests build_tools<br></div><div dir=
=3D"ltr">> -+build_all: build_libs build_apps build_tools<br></div><div =
dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - build_libs: build_libc=
rypto build_libssl openssl.pc<br></div><div dir=3D"ltr">> - <br></div><d=
iv dir=3D"ltr">> -@@ -542,7 +542,7 @@ dist:<br></div><div dir=3D"ltr">&g=
t; -     @$(MAKE) SDIRS=3D'$(SDIRS)' clean<br></div><div dir=
=3D"ltr">> -     @$(MAKE) TAR=3D'$(TAR)' TARFLAGS=3D'$(TA=
RFLAGS)' $(DISTTARVARS) tar<br></div><div dir=3D"ltr">> - <br></div><div=
 dir=3D"ltr">> --install: all install_docs install_sw<br></div><div dir=
=3D"ltr">> -+install: all install_sw<br></div><div dir=3D"ltr">> - <b=
r></div><div dir=3D"ltr">> - install_sw:<br></div><div dir=3D"ltr">> =
-     @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INS=
TALLTOP)/bin \<br></div><div dir=3D"ltr">> ---- a/Makefile.org<br></div>=
<div dir=3D"ltr">> -+++ b/Makefile.org<br></div><div dir=3D"ltr">> -@=
@ -540,7 +540,7 @@ dist:<br></div><div dir=3D"ltr">> -   &nbsp=
; @$(MAKE) SDIRS=3D'$(SDIRS)' clean<br></div><div dir=3D"ltr">> -  =
   @$(MAKE) TAR=3D'$(TAR)' TARFLAGS=3D'$(TARFLAGS)' $(DISTTARVARS=
) tar<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> --in=
stall: all install_docs install_sw<br></div><div dir=3D"ltr">> -+install=
: all install_sw<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr=
">> - install_sw:<br></div><div dir=3D"ltr">> -     @$=
(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \<br></div=
><div dir=3D"ltr">> diff --git a/package/libs/openssl/patches/170-bash_p=
ath.patch b/package/libs/openssl/patches/170-bash_path.patch<br></div><div =
dir=3D"ltr">> deleted file mode 100644<br></div><div dir=3D"ltr">> in=
dex c29b59afdd..0000000000<br></div><div dir=3D"ltr">> --- a/package/lib=
s/openssl/patches/170-bash_path.patch<br></div><div dir=3D"ltr">> +++ /d=
ev/null<br></div><div dir=3D"ltr">> @@ -1,8 +0,0 @@<br></div><div dir=3D=
"ltr">> ---- a/util/domd<br></div><div dir=3D"ltr">> -+++ b/util/domd=
<br></div><div dir=3D"ltr">> -@@ -1,4 +1,4 @@<br></div><div dir=3D"ltr">=
> --#!/bin/sh<br></div><div dir=3D"ltr">> -+#!/usr/bin/env bash<br></=
div><div dir=3D"ltr">> - # Do a makedepend, only leave out the standard =
headers<br></div><div dir=3D"ltr">> - # Written by Ben Laurie <<a hre=
f=3D"mailto:ben@algroup.co.uk" rel=3D"nofollow" target=3D"_blank">ben@algro=
up.co.uk</a>> 19 Jan 1999<br></div><div dir=3D"ltr">> - <br></div><di=
v dir=3D"ltr">> diff --git a/package/libs/openssl/patches/190-remove_tim=
estamp_check.patch b/package/libs/openssl/patches/190-remove_timestamp_chec=
k.patch<br></div><div dir=3D"ltr">> deleted file mode 100644<br></div><d=
iv dir=3D"ltr">> index 424e66063c..0000000000<br></div><div dir=3D"ltr">=
> --- a/package/libs/openssl/patches/190-remove_timestamp_check.patch<br=
></div><div dir=3D"ltr">> +++ /dev/null<br></div><div dir=3D"ltr">> @=
@ -1,23 +0,0 @@<br></div><div dir=3D"ltr">> ---- a/Makefile.org<br></div=
><div dir=3D"ltr">> -+++ b/Makefile.org<br></div><div dir=3D"ltr">> -=
@@ -185,7 +185,7 @@ TARFILE=3D        ../$(NAME).tar<br=
></div><div dir=3D"ltr">> - EXHEADER=3D       e_os2.h<br>=
</div><div dir=3D"ltr">> - HEADER=3D         e_os.h<=
br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> --all: Mak=
efile build_all<br></div><div dir=3D"ltr">> -+all: build_all<br></div><d=
iv dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - # as we stick to -e=
, CLEARENV ensures that local variables in lower<br></div><div dir=3D"ltr">=
> - # Makefiles remain local and variable. $${VAR+VAR} is tribute to Kor=
n<br></div><div dir=3D"ltr">> -@@ -404,11 +404,6 @@ openssl.pc: Makefile=
<br></div><div dir=3D"ltr">> -         echo 'Ve=
rsion: '$(VERSION); \<br></div><div dir=3D"ltr">> -     &=
nbsp;   echo 'Requires: libssl libcrypto' ) > openssl.pc<br></div><=
div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> --Makefile: Makefile=
.org Configure config<br></div><div dir=3D"ltr">> --    @=
echo "Makefile is older than Makefile.org, Configure or config."<br></div><=
div dir=3D"ltr">> --    @echo "Reconfigure the source tre=
e (via './config' or 'perl Configure'), please."<br></div><div dir=3D"ltr">=
> --    @false<br></div><div dir=3D"ltr">> --<br></div=
><div dir=3D"ltr">> - libclean:<br></div><div dir=3D"ltr">> -  &=
nbsp;  rm -f *.map *.so *.so.* *.dylib *.dll engines/*.so engines/*.dl=
l engines/*.dylib *.a engines/*.a */lib */*/lib<br></div><div dir=3D"ltr">&=
gt; - <br></div><div dir=3D"ltr">> diff --git a/package/libs/openssl/pat=
ches/200-parallel_build.patch b/package/libs/openssl/patches/200-parallel_b=
uild.patch<br></div><div dir=3D"ltr">> deleted file mode 100644<br></div=
><div dir=3D"ltr">> index 0616551b6e..0000000000<br></div><div dir=3D"lt=
r">> --- a/package/libs/openssl/patches/200-parallel_build.patch<br></di=
v><div dir=3D"ltr">> +++ /dev/null<br></div><div dir=3D"ltr">> @@ -1,=
184 +0,0 @@<br></div><div dir=3D"ltr">> ---- a/Makefile.org<br></div><di=
v dir=3D"ltr">> -+++ b/Makefile.org<br></div><div dir=3D"ltr">> -@@ -=
282,17 +282,17 @@ build_libcrypto: build_crypto build_engi<br></div><div di=
r=3D"ltr">> - build_libssl: build_ssl libssl.pc<br></div><div dir=3D"ltr=
">> - <br></div><div dir=3D"ltr">> - build_crypto:<br></div><div dir=
=3D"ltr">> --    @dir=3Dcrypto; target=3Dall; $(BUILD_ONE=
_CMD)<br></div><div dir=3D"ltr">> -+    +@dir=3Dcrypto; t=
arget=3Dall; $(BUILD_ONE_CMD)<br></div><div dir=3D"ltr">> - build_ssl: b=
uild_crypto<br></div><div dir=3D"ltr">> --    @dir=3Dssl;=
 target=3Dall; $(BUILD_ONE_CMD)<br></div><div dir=3D"ltr">> -+ &nbs=
p;  +@dir=3Dssl; target=3Dall; $(BUILD_ONE_CMD)<br></div><div dir=3D"l=
tr">> - build_engines: build_crypto<br></div><div dir=3D"ltr">> --&nb=
sp;   @dir=3Dengines; target=3Dall; $(BUILD_ONE_CMD)<br></div><di=
v dir=3D"ltr">> -+    +@dir=3Dengines; target=3Dall; $(BU=
ILD_ONE_CMD)<br></div><div dir=3D"ltr">> - build_apps: build_libs<br></d=
iv><div dir=3D"ltr">> --    @dir=3Dapps; target=3Dall; $(=
BUILD_ONE_CMD)<br></div><div dir=3D"ltr">> -+    +@dir=3D=
apps; target=3Dall; $(BUILD_ONE_CMD)<br></div><div dir=3D"ltr">> - build=
_tests: build_libs<br></div><div dir=3D"ltr">> --    @dir=
=3Dtest; target=3Dall; $(BUILD_ONE_CMD)<br></div><div dir=3D"ltr">> -+&n=
bsp;   +@dir=3Dtest; target=3Dall; $(BUILD_ONE_CMD)<br></div><div=
 dir=3D"ltr">> - build_tools: build_libs<br></div><div dir=3D"ltr">> =
--    @dir=3Dtools; target=3Dall; $(BUILD_ONE_CMD)<br></div>=
<div dir=3D"ltr">> -+    +@dir=3Dtools; target=3Dall; $(B=
UILD_ONE_CMD)<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">&=
gt; - all_testapps: build_libs build_testapps<br></div><div dir=3D"ltr">&gt=
; - build_testapps:<br></div><div dir=3D"ltr">> -@@ -473,7 +473,7 @@ upd=
ate: errors stacks util/libeay.num ut<br></div><div dir=3D"ltr">> - &nbs=
p;   @set -e; target=3Dupdate; $(RECURSIVE_BUILD_CMD)<br></div><d=
iv dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - depend:<br></div><d=
iv dir=3D"ltr">> --    @set -e; target=3Ddepend; $(RECURS=
IVE_BUILD_CMD)<br></div><div dir=3D"ltr">> -+    +@set -e=
; target=3Ddepend; $(RECURSIVE_BUILD_CMD)<br></div><div dir=3D"ltr">> - =
<br></div><div dir=3D"ltr">> - lint:<br></div><div dir=3D"ltr">> - &n=
bsp;   @set -e; target=3Dlint; $(RECURSIVE_BUILD_CMD)<br></div><d=
iv dir=3D"ltr">> -@@ -535,9 +535,9 @@ dist:<br></div><div dir=3D"ltr">&g=
t; -     @$(MAKE) SDIRS=3D'$(SDIRS)' clean<br></div><div dir=
=3D"ltr">> -     @$(MAKE) TAR=3D'$(TAR)' TARFLAGS=3D'$(TA=
RFLAGS)' $(DISTTARVARS) tar<br></div><div dir=3D"ltr">> - <br></div><div=
 dir=3D"ltr">> --install: all install_sw<br></div><div dir=3D"ltr">> =
-+install: install_sw<br></div><div dir=3D"ltr">> - <br></div><div dir=
=3D"ltr">> --install_sw:<br></div><div dir=3D"ltr">> -+install_dirs:<=
br></div><div dir=3D"ltr">> -     @$(PERL) $(TOP)/util/mk=
dir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \<br></div><div dir=3D"ltr">&gt=
; -         $(INSTALL_PREFIX)$(INSTALLTOP)/$(=
LIBDIR) \<br></div><div dir=3D"ltr">> -       &=
nbsp; $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \<br></div><div dir=
=3D"ltr">> -@@ -546,12 +546,19 @@ install_sw:<br></div><div dir=3D"ltr">=
> -         $(INSTALL_PREFIX)$(OPENSSLDIR)=
/misc \<br></div><div dir=3D"ltr">> -       &nb=
sp; $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \<br></div><div dir=3D"ltr">> -=
         $(INSTALL_PREFIX)$(OPENSSLDIR)/priva=
te<br></div><div dir=3D"ltr">> -+    @$(PERL) $(TOP)/util=
/mkdir-p.pl \<br></div><div dir=3D"ltr">> -+     &nb=
sp;  $(INSTALL_PREFIX)$(MANDIR)/man1 \<br></div><div dir=3D"ltr">> =
-+        $(INSTALL_PREFIX)$(MANDIR)/man3 \<b=
r></div><div dir=3D"ltr">> -+        $(INS=
TALL_PREFIX)$(MANDIR)/man5 \<br></div><div dir=3D"ltr">> -+  &=
nbsp;     $(INSTALL_PREFIX)$(MANDIR)/man7<br></div><div dir=
=3D"ltr">> -+<br></div><div dir=3D"ltr">> -+install_sw: install_dirs<=
br></div><div dir=3D"ltr">> -     @set -e; headerlist=3D"=
$(EXHEADER)"; for i in $$headerlist;\<br></div><div dir=3D"ltr">> - &nbs=
p;   do \<br></div><div dir=3D"ltr">> -     (cp=
 $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \<br></div><div di=
r=3D"ltr">> -     chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP=
)/include/openssl/$$i ); \<br></div><div dir=3D"ltr">> -   &nb=
sp; done;<br></div><div dir=3D"ltr">> --    @set -e; targ=
et=3Dinstall; $(RECURSIVE_BUILD_CMD)<br></div><div dir=3D"ltr">> -+&nbsp=
;   +@set -e; target=3Dinstall; $(RECURSIVE_BUILD_CMD)<br></div><=
div dir=3D"ltr">> -     @set -e; liblist=3D"$(LIBS)"; for=
 i in $$liblist ;\<br></div><div dir=3D"ltr">> -     do \=
<br></div><div dir=3D"ltr">> -         if =
[ -f "$$i" ]; then \<br></div><div dir=3D"ltr">> -@@ -635,12 +642,7 @@ i=
nstall_html_docs:<br></div><div dir=3D"ltr">> -     &nbsp=
;   done; \<br></div><div dir=3D"ltr">> -     d=
one<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> --inst=
all_docs:<br></div><div dir=3D"ltr">> --    @$(PERL) $(TO=
P)/util/mkdir-p.pl \<br></div><div dir=3D"ltr">> --    &n=
bsp;   $(INSTALL_PREFIX)$(MANDIR)/man1 \<br></div><div dir=3D"ltr=
">> --        $(INSTALL_PREFIX)$(MANDIR)/m=
an3 \<br></div><div dir=3D"ltr">> --      &nbsp=
; $(INSTALL_PREFIX)$(MANDIR)/man5 \<br></div><div dir=3D"ltr">> -- =
       $(INSTALL_PREFIX)$(MANDIR)/man7<br></div><d=
iv dir=3D"ltr">> -+install_docs: install_dirs<br></div><div dir=3D"ltr">=
> -     @pod2man=3D"`cd ./util; ./pod2mantest $(PERL)`"; =
\<br></div><div dir=3D"ltr">> -     here=3D"`pwd`"; \<br>=
</div><div dir=3D"ltr">> -     filecase=3D; \<br></div><d=
iv dir=3D"ltr">> ---- a/Makefile.shared<br></div><div dir=3D"ltr">> -=
+++ b/Makefile.shared<br></div><div dir=3D"ltr">> -@@ -120,6 +120,7 @@ S=
YMLINK_SO=3D    \<br></div><div dir=3D"ltr">> -  &nb=
sp;          done; \<br></div><div dir=
=3D"ltr">> -         fi; \<br></div><div d=
ir=3D"ltr">> -         if [ -n "$$SHLIB_SO=
VER" ]; then \<br></div><div dir=3D"ltr">> -+     &n=
bsp;      [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \<br></div>=
<div dir=3D"ltr">> -           &=
nbsp; ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \<br></div><div dir=3D"ltr">=
> -               ln -=
s $$prev $$SHLIB$$SHLIB_SUFFIX ); \<br></div><div dir=3D"ltr">> -  =
       fi; \<br></div><div dir=3D"ltr">> ---- a=
/crypto/Makefile<br></div><div dir=3D"ltr">> -+++ b/crypto/Makefile<br><=
/div><div dir=3D"ltr">> -@@ -85,11 +85,11 @@ testapps:<br></div><div dir=
=3D"ltr">> -     @if [ -z "$(THIS)" ]; then $(MAKE) -f $(=
TOP)/Makefile reflect THIS=3D$@; fi<br></div><div dir=3D"ltr">> - <br></=
div><div dir=3D"ltr">> - subdirs:<br></div><div dir=3D"ltr">> --&nbsp=
;   @target=3Dall; $(RECURSIVE_MAKE)<br></div><div dir=3D"ltr">&g=
t; -+    +@target=3Dall; $(RECURSIVE_MAKE)<br></div><div dir=
=3D"ltr">> - <br></div><div dir=3D"ltr">> - files:<br></div><div dir=
=3D"ltr">> -     $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=
=3D$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO<br></div><div dir=3D"ltr">&=
gt; --    @target=3Dfiles; $(RECURSIVE_MAKE)<br></div><div d=
ir=3D"ltr">> -+    +@target=3Dfiles; $(RECURSIVE_MAKE)<br=
></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - links:<br>=
</div><div dir=3D"ltr">> -     @$(PERL) $(TOP)/util/mklin=
k.pl ../include/openssl $(EXHEADER)<br></div><div dir=3D"ltr">> -@@ -100=
,7 +100,7 @@ links:<br></div><div dir=3D"ltr">> - # lib: $(LIB): are spl=
itted to avoid end-less loop<br></div><div dir=3D"ltr">> - lib: &nb=
sp;  $(LIB)<br></div><div dir=3D"ltr">> -     @touch=
 lib<br></div><div dir=3D"ltr">> --$(LIB):    $(LIBOBJ)<b=
r></div><div dir=3D"ltr">> -+$(LIB):    $(LIBOBJ) | subdi=
rs<br></div><div dir=3D"ltr">> -     $(AR) $(LIB) $(LIBOB=
J)<br></div><div dir=3D"ltr">> -     test -z "$(FIPSLIBDI=
R)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o<br></div><div dir=3D"ltr">&=
gt; -     $(RANLIB) $(LIB) || echo Never mind.<br></div><div=
 dir=3D"ltr">> -@@ -111,7 +111,7 @@ shared: buildinf.h lib subdirs<br></=
div><div dir=3D"ltr">> -     fi<br></div><div dir=3D"ltr"=
>> - <br></div><div dir=3D"ltr">> - libs:<br></div><div dir=3D"ltr">&=
gt; --    @target=3Dlib; $(RECURSIVE_MAKE)<br></div><div dir=
=3D"ltr">> -+    +@target=3Dlib; $(RECURSIVE_MAKE)<br></d=
iv><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - install:<br></=
div><div dir=3D"ltr">> -     @[ -n "$(INSTALLTOP)" ] # sh=
ould be set by top Makefile...<br></div><div dir=3D"ltr">> -@@ -120,7 +1=
20,7 @@ install:<br></div><div dir=3D"ltr">> -     (cp $$=
i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \<br></div><div dir=
=3D"ltr">> -     chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)=
/include/openssl/$$i ); \<br></div><div dir=3D"ltr">> -   &nbs=
p; done;<br></div><div dir=3D"ltr">> --    @target=3Dinst=
all; $(RECURSIVE_MAKE)<br></div><div dir=3D"ltr">> -+    =
+@target=3Dinstall; $(RECURSIVE_MAKE)<br></div><div dir=3D"ltr">> - <br>=
</div><div dir=3D"ltr">> - lint:<br></div><div dir=3D"ltr">> -  =
   @target=3Dlint; $(RECURSIVE_MAKE)<br></div><div dir=3D"ltr">&g=
t; ---- a/engines/Makefile<br></div><div dir=3D"ltr">> -+++ b/engines/Ma=
kefile<br></div><div dir=3D"ltr">> -@@ -72,7 +72,7 @@ top:<br></div><div=
 dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - all:  &nbsp=
; lib subdirs<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">&=
gt; --lib:    $(LIBOBJ)<br></div><div dir=3D"ltr">> -+lib=
:    $(LIBOBJ) | subdirs<br></div><div dir=3D"ltr">> - &n=
bsp;   @if [ -n "$(SHARED_LIBS)" ]; then \<br></div><div dir=3D"l=
tr">> -         set -e; \<br></div><div di=
r=3D"ltr">> -         for l in $(LIBNAMES)=
; do \<br></div><div dir=3D"ltr">> -@@ -89,7 +89,7 @@ lib:  &n=
bsp; $(LIBOBJ)<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">=
> - subdirs:<br></div><div dir=3D"ltr">> -     echo $(=
EDIRS)<br></div><div dir=3D"ltr">> --    @target=3Dall; $=
(RECURSIVE_MAKE)<br></div><div dir=3D"ltr">> -+    +@targ=
et=3Dall; $(RECURSIVE_MAKE)<br></div><div dir=3D"ltr">> - <br></div><div=
 dir=3D"ltr">> - files:<br></div><div dir=3D"ltr">> -   &nb=
sp; $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO<br></div><d=
iv dir=3D"ltr">> -@@ -128,7 +128,7 @@ install:<br></div><div dir=3D"ltr"=
>> -               mv =
-f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INS=
TALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \<br></div><di=
v dir=3D"ltr">> -         done; \<br></div=
><div dir=3D"ltr">> -     fi<br></div><div dir=3D"ltr">&g=
t; --    @target=3Dinstall; $(RECURSIVE_MAKE)<br></div><div =
dir=3D"ltr">> -+    +@target=3Dinstall; $(RECURSIVE_MAKE)=
<br></div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - tags:<b=
r></div><div dir=3D"ltr">> -     ctags $(SRC)<br></div><d=
iv dir=3D"ltr">> ---- a/test/Makefile<br></div><div dir=3D"ltr">> -++=
+ b/test/Makefile<br></div><div dir=3D"ltr">> -@@ -145,7 +145,7 @@ insta=
ll:<br></div><div dir=3D"ltr">> - tags:<br></div><div dir=3D"ltr">> -=
     ctags $(SRC)<br></div><div dir=3D"ltr">> - <br></div=
><div dir=3D"ltr">> --tests:    exe apps $(TESTS)<br></di=
v><div dir=3D"ltr">> -+tests:    exe $(TESTS)<br></div><d=
iv dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - apps:<br></div><div=
 dir=3D"ltr">> -     @(cd ..; $(MAKE) DIRS=3Dapps all)<br=
></div><div dir=3D"ltr">> -@@ -586,7 +586,7 @@ $(DTLSTEST)$(EXE_EXT): $(=
DTLSTEST).o ssl<br></div><div dir=3D"ltr">> - #    fi<br>=
</div><div dir=3D"ltr">> - <br></div><div dir=3D"ltr">> - dummytest$(=
EXE_EXT): dummytest.o $(DLIBCRYPTO)<br></div><div dir=3D"ltr">> -- =
   @target=3Ddummytest; $(BUILD_CMD)<br></div><div dir=3D"ltr">&g=
t; -+    +@target=3Ddummytest; $(BUILD_CMD)<br></div><div di=
r=3D"ltr">> - <br></div><div dir=3D"ltr">> - # DO NOT DELETE THIS LIN=
E -- make depend depends on it.<br></div><div dir=3D"ltr">> - <br></div>=
<div dir=3D"ltr">> -- <br></div><div dir=3D"ltr">> 2.16.1<br></div><d=
iv dir=3D"ltr">> <br></div></div>
                </div>
            </div></div></body></html>
------=_Part_1961379_1081484806.1528129653957--

]