Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] openntpd: update to 6.8p1
@ 2020-12-09 18:02 CameronNemo
  2020-12-09 20:14 ` Duncaen
                   ` (19 more replies)
  0 siblings, 20 replies; 23+ messages in thread
From: CameronNemo @ 2020-12-09 18:02 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1072 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages openntpd
https://github.com/void-linux/void-packages/pull/27053

openntpd: update to 6.8p1
This is the first release in 3 years so definitely needs more testing.

They changed the config since the last release:

```diff
--- /etc/ntpd.conf	2020-12-09 09:51:41.839208968 -0800
+++ /etc/ntpd.conf.new-6.8p1_1	2020-12-09 08:03:15.000000000 -0800
@@ -1,7 +1,11 @@
-# $OpenBSD: ntpd.conf,v 1.14 2015/07/15 20:28:37 ajacoutot Exp $
+# $OpenBSD: ntpd.conf,v 1.16 2019/11/06 19:04:12 deraadt Exp $
 #
 # See ntpd.conf(5) and /etc/examples/ntpd.conf
 
 servers pool.ntp.org
+server time.cloudflare.com
 sensor *
-constraints from "https://www.google.com"
+
+constraint from "9.9.9.9"              # quad9 v4 without DNS
+constraint from "2620:fe::fe"          # quad9 v6 without DNS
+constraints from "www.google.com"      # intentionally not 8.8.8.8
```

A patch file from https://github.com/void-linux/void-packages/pull/27053.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openntpd-27053.patch --]
[-- Type: text/x-diff, Size: 3041 bytes --]

From d7b76976c76f3ae235bad8ecee91ea7c70cf8398 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Wed, 9 Dec 2020 10:00:19 -0800
Subject: [PATCH] openntpd: update to 6.8p1

---
 srcpkgs/openntpd/files/openntpd/run |  2 +-
 srcpkgs/openntpd/patches/musl.patch | 26 --------------------------
 srcpkgs/openntpd/template           | 15 ++++++++-------
 3 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/openntpd/patches/musl.patch

diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index d49bf2b8964..8c12021bed8 100644
--- a/srcpkgs/openntpd/files/openntpd/run
+++ b/srcpkgs/openntpd/files/openntpd/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-exec ntpd -d ${OPTS:=-s} 2>&1
+exec ntpd -d ${OPTS} 2>&1
diff --git a/srcpkgs/openntpd/patches/musl.patch b/srcpkgs/openntpd/patches/musl.patch
deleted file mode 100644
index 99f8f63f93d..00000000000
--- a/srcpkgs/openntpd/patches/musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/ntpd.h.orig
-+++ src/ntpd.h
-@@ -33,6 +33,10 @@
- 
- #include "ntp.h"
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- #define MAXIMUM(a, b)	((a) > (b) ? (a) : (b))
- 
- #ifndef NTPD_USER
---- src/log.c.orig
-+++ src/log.c
-@@ -24,6 +24,10 @@
- #include <errno.h>
- #include <time.h>
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- static int	 debug;
- static int	 verbose;
- const char	*log_procname;
diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 8a579147959..ed1cc001b3e 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,22 +1,22 @@
 # Template file for 'openntpd'
 pkgname=openntpd
-version=6.2p3
-revision=6
+version=6.8p1
+revision=1
 build_style=gnu-configure
-configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
+configure_args="--with-privsep-user=openntpd --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
 makedepends="libressl-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="MIT"
 homepage="http://openntpd.org/"
-distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz"
-checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a
+distfiles="https://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz"
+checksum=8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46
 
 conf_files="/etc/ntpd.conf"
 provides="ntp-daemon-0_1"
-system_accounts="$pkgname"
+system_accounts="openntpd"
 alternatives="
  ntpd:ntpd:/usr/bin/openntpd
  ntpd:ntpd.8:/usr/share/man/man8/openntpd.8
@@ -27,6 +27,7 @@ CFLAGS="-fcommon"
 pre_configure() {
 	autoreconf -fi
 }
+
 post_install() {
 	# Rename files for alternatives.
 	mv ${DESTDIR}/usr/bin/{ntpd,$pkgname}

^ permalink raw reply	[flat|nested] 23+ messages in thread
* [PR PATCH] openntpd: update to 6.8p1
@ 2021-09-23 12:19 daerich
  2021-09-29 22:56 ` ericonr
  0 siblings, 1 reply; 23+ messages in thread
From: daerich @ 2021-09-23 12:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1592 bytes --]

There is a new pull request by daerich against master on the void-packages repository

https://github.com/daerich/void-packages openntpd68p1
https://github.com/void-linux/void-packages/pull/33072

openntpd: update to 6.8p1
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33072.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openntpd68p1-33072.patch --]
[-- Type: text/x-diff, Size: 2427 bytes --]

From f087abcfe3960d76c247c372b3e93b5dc910dd66 Mon Sep 17 00:00:00 2001
From: DaErich <fakefakefans@gmail.com>
Date: Tue, 21 Sep 2021 16:08:23 +0200
Subject: [PATCH] openntpd: update to 6.8p1

---
 srcpkgs/openntpd/files/openntpd/run |  2 +-
 srcpkgs/openntpd/patches/musl.patch | 26 --------------------------
 srcpkgs/openntpd/template           |  6 +++---
 3 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/openntpd/patches/musl.patch

diff --git a/srcpkgs/openntpd/files/openntpd/run b/srcpkgs/openntpd/files/openntpd/run
index 575ed8d8a031..864c0eb418fa 100644
--- a/srcpkgs/openntpd/files/openntpd/run
+++ b/srcpkgs/openntpd/files/openntpd/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r conf ] && . ./conf
-exec openntpd -d ${OPTS:=-s} 2>&1
+exec openntpd -d ${OPTS} 2>&1
diff --git a/srcpkgs/openntpd/patches/musl.patch b/srcpkgs/openntpd/patches/musl.patch
deleted file mode 100644
index 2afd78836bf5..000000000000
--- a/srcpkgs/openntpd/patches/musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/ntpd.h
-+++ b/src/ntpd.h
-@@ -33,6 +33,10 @@
- 
- #include "ntp.h"
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- #define MAXIMUM(a, b)	((a) > (b) ? (a) : (b))
- 
- #ifndef NTPD_USER
---- a/src/log.c
-+++ b/src/log.c
-@@ -24,6 +24,10 @@
- #include <errno.h>
- #include <time.h>
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- static int	 debug;
- static int	 verbose;
- const char	*log_procname;
diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 34bb4ed3a5eb..2ce73c04c0be 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,7 +1,7 @@
 # Template file for 'openntpd'
 pkgname=openntpd
-version=6.2p3
-revision=9
+version=6.8p1
+revision=1
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
 hostmakedepends="automake libtool"
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="ISC"
 homepage="http://openntpd.org/"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz"
-checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a
+checksum=8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46
 
 conf_files="/etc/ntpd.conf"
 provides="ntp-daemon-0_1"

^ permalink raw reply	[flat|nested] 23+ messages in thread
* [PR PATCH] openntpd: update to 6.8p1
@ 2020-12-09 12:22 4ricci
  2020-12-10  0:37 ` sgn
  0 siblings, 1 reply; 23+ messages in thread
From: 4ricci @ 2020-12-09 12:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 315 bytes --]

There is a new pull request by 4ricci against master on the void-packages repository

https://github.com/4ricci/void-packages openntpd-6.8p1
https://github.com/void-linux/void-packages/pull/27046

openntpd: update to 6.8p1


A patch file from https://github.com/void-linux/void-packages/pull/27046.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openntpd-6.8p1-27046.patch --]
[-- Type: text/x-diff, Size: 2392 bytes --]

From c195a6e19f4a9210ca65142f47ba54f16b546987 Mon Sep 17 00:00:00 2001
From: Roberto Ricci <ricci@disroot.org>
Date: Wed, 9 Dec 2020 13:21:18 +0100
Subject: [PATCH] openntpd: update to 6.8p1

---
 srcpkgs/openntpd/patches/musl.patch | 26 --------------------------
 srcpkgs/openntpd/template           | 12 ++++--------
 2 files changed, 4 insertions(+), 34 deletions(-)
 delete mode 100644 srcpkgs/openntpd/patches/musl.patch

diff --git a/srcpkgs/openntpd/patches/musl.patch b/srcpkgs/openntpd/patches/musl.patch
deleted file mode 100644
index 99f8f63f93d..00000000000
--- a/srcpkgs/openntpd/patches/musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/ntpd.h.orig
-+++ src/ntpd.h
-@@ -33,6 +33,10 @@
- 
- #include "ntp.h"
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- #define MAXIMUM(a, b)	((a) > (b) ? (a) : (b))
- 
- #ifndef NTPD_USER
---- src/log.c.orig
-+++ src/log.c
-@@ -24,6 +24,10 @@
- #include <errno.h>
- #include <time.h>
- 
-+#if !defined(HAVE_ATTRIBUTE__DEAD) && !defined(__dead)
-+#define __dead          __attribute__((__noreturn__))
-+#endif
-+
- static int	 debug;
- static int	 verbose;
- const char	*log_procname;
diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template
index 8a579147959..825f2c3efcb 100644
--- a/srcpkgs/openntpd/template
+++ b/srcpkgs/openntpd/template
@@ -1,18 +1,17 @@
 # Template file for 'openntpd'
 pkgname=openntpd
-version=6.2p3
-revision=6
+version=6.8p1
+revision=1
 build_style=gnu-configure
 configure_args="--with-privsep-user=${pkgname} --with-cacert=/etc/ssl/certs.pem"
-hostmakedepends="automake libtool"
 makedepends="libressl-devel"
 depends="ca-certificates"
 short_desc="FREE, easy to use implementation of the Network Time Protocol"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD"
+license="ISC, BSD-3-Clause"
 homepage="http://openntpd.org/"
 distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz"
-checksum=7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a
+checksum=8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46
 
 conf_files="/etc/ntpd.conf"
 provides="ntp-daemon-0_1"
@@ -24,9 +23,6 @@ alternatives="
 
 CFLAGS="-fcommon"
 
-pre_configure() {
-	autoreconf -fi
-}
 post_install() {
 	# Rename files for alternatives.
 	mv ${DESTDIR}/usr/bin/{ntpd,$pkgname}

^ permalink raw reply	[flat|nested] 23+ messages in thread
end of thread, other threads:[~2021-10-05 21:00 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-09 18:02 [PR PATCH] openntpd: update to 6.8p1 CameronNemo
2020-12-09 20:14 ` Duncaen
2020-12-09 20:15 ` Duncaen
2020-12-10 10:05 ` 4ricci
2020-12-10 10:10 ` 4ricci
2020-12-10 10:10 ` 4ricci
2020-12-10 15:49 ` 4ricci
2020-12-10 16:33 ` [PR PATCH] [Updated] " CameronNemo
2020-12-10 17:06 ` CameronNemo
2020-12-18  2:46 ` CameronNemo
2020-12-22  1:54 ` CameronNemo
2020-12-31 20:46 ` [PR PATCH] [Updated] " CameronNemo
2020-12-31 21:05 ` CameronNemo
2021-01-29  4:02 ` ericonr
2021-08-27 11:28 ` 4ricci
2021-09-29 21:42 ` [PR PATCH] [Updated] " CameronNemo
2021-09-29 22:28 ` CameronNemo
2021-09-29 22:57 ` ericonr
2021-09-29 23:18 ` [PR PATCH] [Updated] " CameronNemo
2021-09-30  3:11 ` CameronNemo
2021-10-05 21:00 ` [PR PATCH] [Merged]: " Piraty
  -- strict thread matches above, loose matches on Subject: below --
2021-09-23 12:19 [PR PATCH] " daerich
2021-09-29 22:56 ` ericonr
2020-12-09 12:22 [PR PATCH] " 4ricci
2020-12-10  0:37 ` sgn

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).