Skip to contentSkip to conversation

openntpd: update to 6.2p3

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

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH 1/2 openntpd: update to 6.2p3

Other changes:
- Remove upstream patch.
- change locally computed hash to hash from the SHA256 URL.
- Add sha256sum for license file.

Signed-off-by Adam Duskett <[email protected]>
---
 ...-Revert-use-__dead-macro-from-sys-cdefs.h.patch | 91 ----------------------
 .../{0002-fix-musl.patch => 0001-fix-musl.patch}   |  0
 package/openntpd/openntpd.hash                     |  5 +-
 package/openntpd/openntpd.mk                       |  2 +-
 4 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch
 rename package/openntpd/{0002-fix-musl.patch => 0001-fix-musl.patch} (100%)
package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch deleted +0 -91
deleted file mode 100644
index 418f7a2098..0000000000
@@ -1,91 +0,0 @@
-From 17aa5d98191c4dc85d0645443fc97a12601ae8da Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Tue, 26 Sep 2017 14:55:31 +0300
-Subject: [PATCH] Revert "use __dead macro from sys/cdefs.h"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This partially reverts commit a7577667d673f49800e15461fe384817a1572eae.
-
-The musl C library does not use an internal cdefs.h header. As a result,
-the definitions in sys/cdefs.h have no effect. This breads the build as
-follows:
-
-In file included from adjfreq_linux.c:23:0:
-../src/ntpd.h:448:8: error: expected ?=?, ?,?, ?;?, ?asm? or ?__attribute__? before ?void?
- __dead void fatal(const char *, ...)
-        ^~~~
-../src/ntpd.h:450:8: error: expected ?=?, ?,?, ?;?, ?asm? or ?__attribute__? before ?void?
- __dead void fatalx(const char *, ...)
-        ^~~~
-
-Refer the related musl FAQ about cdefs.h:
-
-  http://wiki.musl-libc.org/wiki/FAQ#Q:_I.27m_trying_to_compile_something_against_musl_and_I_get_error_messages_about_sys.2Fcdefs.h
-
-Keep the compiler attribute definition.
-
-Remove also from noinst_HEADERS.
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: https://github.com/openntpd-portable/openntpd-portable/pull/45
-
- include/Makefile.am |  1 -
- include/sys/cdefs.h | 16 ----------------
- include/sys/types.h |  4 ++++
- 3 files changed, 4 insertions(+), 17 deletions(-)
- delete mode 100644 include/sys/cdefs.h
-
-diff --git a/include/Makefile.am b/include/Makefile.am
-index a552026e8f25..3a5a01620d82 100644
---- a/include/Makefile.am
-+++ b/include/Makefile.am
-@@ -1,6 +1,5 @@
- noinst_HEADERS =
- noinst_HEADERS += machine/endian.h
--noinst_HEADERS += sys/cdefs.h
- noinst_HEADERS += sys/queue.h
- noinst_HEADERS += sys/socket.h
- noinst_HEADERS += sys/types.h
-diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
-deleted file mode 100644
-index 3dec43deec28..000000000000
---- a/include/sys/cdefs.h
-+++ /dev/null
-@@ -1,16 +0,0 @@
--/*
-- * Public domain
-- * sys/cdefs.h compatibility shim
-- */
--
--#include_next <sys/cdefs.h>
--
--#ifndef LIBCOMPAT_SYS_CDEFS_H
--#define LIBCOMPAT_SYS_CDEFS_H
--
--#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
--#define __dead          __attribute__((__noreturn__))
--#define __pure          __attribute__((__const__))
--#endif
--
--#endif
-diff --git a/include/sys/types.h b/include/sys/types.h
-index 56aef0b61af8..86821c732ec3 100644
---- a/include/sys/types.h
-+++ b/include/sys/types.h
-@@ -14,6 +14,10 @@
- #include <_bsd_types.h>
- #endif
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead		__attribute__((__noreturn__))
-+#endif
-+
- #if !defined(HAVE_ATTRIBUTE__BOUNDED__) && !defined(__bounded__)
- # define __bounded__(x, y, z)
- #endif
--- 
-2.14.1
-
package/openntpd/0001-fix-musl.patch renamed from package/openntpd/0002-fix-musl.patch +0 -0
similarity index 100%
rename from package/openntpd/0002-fix-musl.patch
rename to package/openntpd/0001-fix-musl.patch
package/openntpd/openntpd.hash +4 -1
index 1a73e8dc0b..4d00b7bb9d 100644
@@ -1,2 +1,5 @@
+# from http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/SHA256
+sha256 7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a	openntpd-6.2p3.tar.gz
+
 # Locally computed
-sha256 5808a4137b008a4db20907e1a482f474734b120f254e3c5feb90db15e0820fb2  openntpd-6.2p2.tar.gz
+sha256 6c1822ee950652c12bb3773849db18794f62c63452a70d018edf23e8cba71839 COPYING
package/openntpd/openntpd.mk +1 -1
index 308a1b1258..b5a2559008 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENNTPD_VERSION = 6.2p2
+OPENNTPD_VERSION = 6.2p3
 OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
 OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause
 OPENNTPD_LICENSE_FILES = COPYING
Signature · 1 line
2.13.6
author
#1 lore raw

PATCH 2/2 openntpd: add check for LibreSSL.

Openntp looks for a crypto library with tls_config_set_ca_mem, which is available in LibreSSL but not OpenSSL. If tls_config_set_ca_mem is found, crypto support is added to the build.

Because this is not currently checked, crypto support might not be added due to the order of the build. Add a small check to see if BR2_PACKAGE_LIBRESSL is selected, and if so, add a dependency for it.

Also add a note about this in the Config.in help section.

Signed-off-by Adam Duskett <[email protected]>
---
 package/openntpd/Config.in   | 3 +++
 package/openntpd/openntpd.mk | 6 ++++++
 2 files changed, 9 insertions(+)
package/openntpd/Config.in +3 -0
index 1b856c03b8..5f8c9e8549 100644
@@ -9,6 +9,9 @@ config BR2_PACKAGE_OPENNTPD
 	  to remote NTP servers and can act as NTP server itself,
 	  redistributing the local clock. It just works.
 
+	  Note: Cryto support is only available with the LibreSSL ssl
+	  library.
+
 	  http://www.openntpd.org/
 
 comment "openntpd needs a toolchain w/ NPTL"
package/openntpd/openntpd.mk +6 -0
index b5a2559008..d53eed29de 100644
@@ -11,6 +11,12 @@ OPENNTPD_LICENSE_FILES = COPYING
 # Patching include/Makefile.am
 OPENNTPD_AUTORECONF = YES
 
+# Openntpd searches for tls_config_set_ca_mem which is only available
+# in LibreSSL
+ifeq ($(BR2_PACKAGE_LIBRESSL),y)
+OPENNTPD_DEPENDENCIES += openssl
+endif
+
 # openntpd uses pthread functions for arc4random emulation but forgets
 # to use -pthread
 OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread"
Signature · 1 line
2.13.6
#2 lore raw

PATCH 2/2 openntpd: add check for LibreSSL.

Hello,

package/openntpd/Config.in config BR2_PACKAGE_OPENNTPD · line 12

Quoted 1 line · Adam Duskett
package/openntpd/Config.in +1 -0
+	  Note: Cryto support is only available with the LibreSSL ssl

Cryto -> Crypto.

package/openntpd/Config.in config BR2_PACKAGE_OPENNTPD · line 15

Quoted 3 lines
package/openntpd/Config.in +2 -0
+	  library.
+
 	  http://www.openntpd.org/

I've reworded a bit the Config.in help text and applied to next. Thanks!

Thomas

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

PATCH 1/2 openntpd: update to 6.2p3

In reply to Adam Duskett

Hi Adam,

Quoted 2 lines · Adam Duskett

Other changes:
- Remove upstream patch.

I think you can drop the AUTORECONF as well.

Quoted 4 lines

- change locally computed hash to hash from the SHA256 URL.
- Add sha256sum for license file.

Signed-off-by Adam Duskett <[email protected]>
Quoted 8 lines
---
 ...-Revert-use-__dead-macro-from-sys-cdefs.h.patch | 91 ----------------------
 .../{0002-fix-musl.patch => 0001-fix-musl.patch}   |  0
 package/openntpd/openntpd.hash                     |  5 +-
 package/openntpd/openntpd.mk                       |  2 +-
 4 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch
 rename package/openntpd/{0002-fix-musl.patch => 0001-fix-musl.patch} (100%)

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
author
#4 lore raw

PATCH 1/2 openntpd: update to 6.2p3

Hi Baruch

Quoted 8 lines · Baruch Siach

Hi Adam,

Quoted 2 lines · Adam Duskett

Other changes:
- Remove upstream patch.

I think you can drop the AUTORECONF as well.

Still broken :\

Quoted 19 lines
Quoted 4 lines

- change locally computed hash to hash from the SHA256 URL.
- Add sha256sum for license file.

Signed-off-by Adam Duskett <[email protected]>
Quoted 8 lines
---
 ...-Revert-use-__dead-macro-from-sys-cdefs.h.patch | 91 ----------------------
 .../{0002-fix-musl.patch => 0001-fix-musl.patch}   |  0
 package/openntpd/openntpd.hash                     |  5 +-
 package/openntpd/openntpd.mk                       |  2 +-
 4 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch
 rename package/openntpd/{0002-fix-musl.patch => 0001-fix-musl.patch} (100%)

baruch

--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

#5 lore raw

PATCH 1/2 openntpd: update to 6.2p3

Hi Adam,

Quoted 8 lines · Adam Duskett
Quoted 5 lines · Baruch Siach
Quoted 2 lines · Adam Duskett

Other changes:
- Remove upstream patch.

I think you can drop the AUTORECONF as well.

Still broken :\

What is broken?

I case AUTORECONF is still necessary even after the Makefile.am patch removal, the comment needs update.

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#6 lore raw

PATCH 1/2 openntpd: update to 6.2p3

Hello,

Quoted 6 lines · Baruch Siach
Quoted 1 line

Still broken :\

What is broken?

I case AUTORECONF is still necessary even after the Makefile.am patch removal, the comment needs update.

Because our libtool patch doesn't apply to openntpd's ltmain.sh. So I've kept the AUTORECONF = YES (after updating the comment, of course).

Thanks!

Thomas

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

PATCH 1/2 openntpd: update to 6.2p3

In reply to Adam Duskett

Hello,

Quoted 6 lines · Adam Duskett

Other changes:
- Remove upstream patch.
- change locally computed hash to hash from the SHA256 URL.
- Add sha256sum for license file.

Signed-off-by Adam Duskett <[email protected]>
Quoted 8 lines
---
 ...-Revert-use-__dead-macro-from-sys-cdefs.h.patch | 91 ----------------------
 .../{0002-fix-musl.patch => 0001-fix-musl.patch}   |  0
 package/openntpd/openntpd.hash                     |  5 +-
 package/openntpd/openntpd.mk                       |  2 +-
 4 files changed, 5 insertions(+), 93 deletions(-)
 delete mode 100644 package/openntpd/0001-Revert-use-__dead-macro-from-sys-cdefs.h.patch
 rename package/openntpd/{0002-fix-musl.patch => 0001-fix-musl.patch} (100%)

Applied to next, after updating the comment that explains why AUTORECONF = YES is needed.

Thanks!

Thomas

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