Skip to contentSkip to conversation

ntp: no longer require openssl

PATCH New Adam Duskett 3 participants 6 messages Nov 7, 2017 – Nov 8, 2017

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH 1/1 ntp: no longer require openssl

4.2.8p10 no longer requires openssl to compile.

Signed-off-by Adam Duskett <[email protected]>
---
 package/ntp/Config.in |  1 -
 package/ntp/ntp.mk    | 10 ++++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)
package/ntp/Config.in +0 -1
index 1af02dbc0b..8ce9a5b0bb 100644
@@ -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...
package/ntp/ntp.mk +8 -2
index c70d6e6351..8c30b749d4 100644
@@ -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
Signature · 1 line
2.13.6
#1 lore raw

PATCH 1/1 ntp: no longer require openssl

Hello,

Quoted 3 lines · Adam Duskett

4.2.8p10 no longer requires openssl to compile.

Signed-off-by Adam Duskett <[email protected]>

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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 ntp: no longer require openssl

Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 3 lines · Adam Duskett

4.2.8p10 no longer requires openssl to compile.

Signed-off-by Adam Duskett <[email protected]>
Quoted 8 lines

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.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 ntp: no longer require openssl

Hello,

Quoted 15 lines · Peter Korsgaard
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 3 lines · Adam Duskett

4.2.8p10 no longer requires openssl to compile.

Signed-off-by Adam Duskett <[email protected]>

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).

Quoted 3 lines
Quoted 1 line

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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#4 lore raw

PATCH 1/1 ntp: no longer require openssl

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hi,

Quoted 6 lines
Quoted 1 line

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!

Signature · 1 line
Bye, Peter Korsgaard