[Buildroot] [PATCH 1/1] ntp: no longer require openssl

[Buildroot] [PATCH 1/1] ntp: no longer require openssl

[Adam Duskett]

4.2.8p10 no longer requires openssl to compile.

Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
---
 package/ntp/Config.in |  1 -
 package/ntp/ntp.mk    | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package/ntp/Config.in b/package/ntp/Config.in
index 1af02dbc0b..8ce9a5b0bb 100644
--- a/package/ntp/Config.in
+++ b/package/ntp/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_NTP
 	bool "ntp"
 	select BR2_PACKAGE_LIBEVENT
-	select BR2_PACKAGE_OPENSSL
 	help
 	  Network Time Protocol suite/programs.
 	  Provides things like ntpd, ntpdate, ntpq, etc...
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index c70d6e6351..8c30b749d4 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -7,7 +7,7 @@
 NTP_VERSION_MAJOR = 4.2
 NTP_VERSION = $(NTP_VERSION_MAJOR).8p10
 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
-NTP_DEPENDENCIES = host-pkgconf libevent openssl $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 NTP_LICENSE = NTP
 NTP_LICENSE_FILES = COPYRIGHT
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
@@ -18,12 +18,18 @@ NTP_CONF_OPTS = \
 	--disable-debugging \
 	--with-yielding-select=yes \
 	--disable-local-libevent \
-	--with-crypto
 
 # 0002-ntp-syscalls-fallback.patch
 # 0003-ntpq-fpic.patch
 NTP_AUTORECONF = YES
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+NTP_CONF_OPTS += --with-crypto
+NTP_DEPENDENCIES += openssl
+else
+NTP_CONF_OPTS += --without-crypto --disable-openssl-random
+endif
+ 
 ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y)
 NTP_CONF_OPTS += --with-locfile=linux
 else
-- 
2.13.6

[Buildroot] [PATCH 1/1] ntp: no longer require openssl

[Thomas Petazzoni]

Hello,

On Tue,  7 Nov 2017 16:29:06 -0500, Adam Duskett wrote:
> 4.2.8p10 no longer requires openssl to compile.
> 
> Signed-off-by: Adam Duskett <Adamduskett@outlook.com>

Peter: I'm wondering if we should apply this to next or master. It is
not a bug fix per-se, but it fixes a kind of regression introduced with
the bump of ntp to 4.2.8p9, which was merged in 2017.02, and brought in
OpenSSL as a mandatory dependency. A user reported on Github that it
increased quite a lot the installed size (due to the additional OpenSSL
dependency).

So, I'm tempted to apply this to master. Peter, are you OK?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 1/1] ntp: no longer require openssl

[Peter Korsgaard]

>>>>> "Adam" == Adam Duskett <aduskett@gmail.com> writes:

 > 4.2.8p10 no longer requires openssl to compile.
 > Signed-off-by: Adam Duskett <Adamduskett@outlook.com>

Committed, thanks.

Is there no --enable-openssl-random? If yes, why don't we use it for the
openssl case?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/1] ntp: no longer require openssl

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Tue,  7 Nov 2017 16:29:06 -0500, Adam Duskett wrote:
 >> 4.2.8p10 no longer requires openssl to compile.
 >> 
 >> Signed-off-by: Adam Duskett <Adamduskett@outlook.com>

 > Peter: I'm wondering if we should apply this to next or master. It is
 > not a bug fix per-se, but it fixes a kind of regression introduced with
 > the bump of ntp to 4.2.8p9, which was merged in 2017.02, and brought in
 > OpenSSL as a mandatory dependency. A user reported on Github that it
 > increased quite a lot the installed size (due to the additional OpenSSL
 > dependency).

 > So, I'm tempted to apply this to master. Peter, are you OK?

Yes. I've just applied it. I will also cherry pick to the LTS branch.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/1] ntp: no longer require openssl

[Thomas Petazzoni]

Hello,

On Wed, 08 Nov 2017 13:32:32 +0100, Peter Korsgaard wrote:
> >>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:  
> 
>  > Hello,
>  > On Tue,  7 Nov 2017 16:29:06 -0500, Adam Duskett wrote:  
>  >> 4.2.8p10 no longer requires openssl to compile.
>  >> 
>  >> Signed-off-by: Adam Duskett <Adamduskett@outlook.com>  
> 
>  > Peter: I'm wondering if we should apply this to next or master. It is
>  > not a bug fix per-se, but it fixes a kind of regression introduced with
>  > the bump of ntp to 4.2.8p9, which was merged in 2017.02, and brought in
>  > OpenSSL as a mandatory dependency. A user reported on Github that it
>  > increased quite a lot the installed size (due to the additional OpenSSL
>  > dependency).  
> 
>  > So, I'm tempted to apply this to master. Peter, are you OK?  
> 
> Yes. I've just applied it. I will also cherry pick to the LTS branch.

Be careful if you cherry-pick in the LTS branch: it depends on p10
version of ntp, which was committed after 2017.02 was released. I
haven't looked if the p10 bump has already been cherry-picked in the
LTS branch.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH 1/1] ntp: no longer require openssl

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 >> Yes. I've just applied it. I will also cherry pick to the LTS branch.

 > Be careful if you cherry-pick in the LTS branch: it depends on p10
 > version of ntp, which was committed after 2017.02 was released. I
 > haven't looked if the p10 bump has already been cherry-picked in the
 > LTS branch.

Indeed. I normally try to not apply backports out of order / skip
patches to not end up in untested configurations, but thanks for the
heads up!

-- 
Bye, Peter Korsgaard