* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/
@ 2017-10-20 7:45 Patrice Clement
0 siblings, 0 replies; 5+ messages in thread
From: Patrice Clement @ 2017-10-20 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 68461f427ce489a0799108e355d15560351734be
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Oct 10 13:14:41 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 07:45:06 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68461f42
net-misc/ntp: remove unused patch.
net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch | 35 -------------------------
1 file changed, 35 deletions(-)
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch b/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch
deleted file mode 100644
index 98ca61af459..00000000000
--- a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ur a/include/libssl_compat.h ntp-4.2.8p10/include/libssl_compat.h
---- ntp-4.2.8p10.orig/include/libssl_compat.h 2017-03-21 06:04:20.000000000 -0700
-+++ ntp-4.2.8p10/include/libssl_compat.h 2017-03-30 16:34:03.892173084 -0700
-@@ -37,7 +37,7 @@
- #endif
-
- /* ----------------------------------------------------------------- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
- /* ----------------------------------------------------------------- */
-
- # include <openssl/objects.h>
-diff -ur ntp-4.2.8p10.orig/libntp/a_md5encrypt.c ntp-4.2.8p10/libntp/a_md5encrypt.c
---- ntp-4.2.8p10.orig/libntp/a_md5encrypt.c 2017-02-01 01:47:13.000000000 -0800
-+++ ntp-4.2.8p10/libntp/a_md5encrypt.c 2017-03-30 16:55:49.830229507 -0700
-@@ -11,6 +11,7 @@
- #include "ntp.h"
- #include "ntp_md5.h" /* provides OpenSSL digest API */
- #include "isc/string.h"
-+#include "libssl_compat.h"
- /*
- * MD5authencrypt - generate message digest
- *
-diff -ur ntp-4.2.8p10.orig/libntp/libssl_compat.c ntp-4.2.8p10/libntp/libssl_compat.c
---- ntp-4.2.8p10.orig/libntp/libssl_compat.c 2017-02-01 01:47:13.000000000 -0800
-+++ ntp-4.2.8p10/libntp/libssl_compat.c 2017-03-30 16:52:17.287543795 -0700
-@@ -26,7 +26,7 @@
- /* ----------------------------------------------------------------- */
-
- /* ----------------------------------------------------------------- */
--#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
- /* ----------------------------------------------------------------- */
-
- #include "libssl_compat.h"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/
@ 2018-05-27 16:11 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2018-05-27 16:11 UTC (permalink / raw
To: gentoo-commits
commit: 704a07ba13d20e533596a869fe223ff0297bd7c5
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun May 27 12:09:33 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:10:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=704a07ba
net-misc/ntp: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/8615
net-misc/ntp/files/ntp-4.2.8_p10-ntpq-fpic.patch | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/net-misc/ntp/files/ntp-4.2.8_p10-ntpq-fpic.patch b/net-misc/ntp/files/ntp-4.2.8_p10-ntpq-fpic.patch
deleted file mode 100644
index dcf75d25bf9..00000000000
--- a/net-misc/ntp/files/ntp-4.2.8_p10-ntpq-fpic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ntp-4.2.8p10.orig/ntpq/Makefile.am 2017-03-21 06:04:21.000000000 -0700
-+++ ntp-4.2.8p10/ntpq/Makefile.am 2017-03-22 11:45:48.946630492 -0700
-@@ -23,7 +23,7 @@
- ntpq_LDADD += $(LDADD_NTP)
- noinst_HEADERS= ntpq.h
- noinst_LIBRARIES= libntpq.a
--libntpq_a_CFLAGS= -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
-+libntpq_a_CFLAGS= $(NTP_HARD_CFLAGS) -DNO_MAIN_ALLOWED -DBUILD_AS_LIB
- CLEANFILES=
- DISTCLEANFILES= .version version.c config.log $(man_MANS)
- ETAGS_ARGS= Makefile.am
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/
@ 2018-12-08 7:49 Patrick McLean
0 siblings, 0 replies; 5+ messages in thread
From: Patrick McLean @ 2018-12-08 7:49 UTC (permalink / raw
To: gentoo-commits
commit: dbdafe931121967cbf17f533f4aa3632abc6c755
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 8 07:45:03 2018 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Sat Dec 8 07:48:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdafe93
net-misc/ntp: fix libressl-2.8 patch
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
index 7ec2ee678b0..182fcefe88b 100644
--- a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
+++ b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch
@@ -5,12 +5,12 @@
#define OpenSSL_version_num SSLeay
#define OpenSSL_version SSLeay_version
+
-+# if LIBRESSL_VERSION_NUMBER < 0x20800000L
++# if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L
#define X509_get0_notBefore X509_get_notBefore
#define X509_getm_notBefore X509_get_notBefore
#define X509_get0_notAfter X509_get_notAfter
#define X509_getm_notAfter X509_get_notAfter
-+#endif /* LIBRESSL_VERSION_NUMBER < 0x20800000L */
++#endif /* !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L */
/* ----------------------------------------------------------------- */
#endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/
@ 2020-06-27 20:51 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2020-06-27 20:51 UTC (permalink / raw
To: gentoo-commits
commit: aba39b09d376eb454b6291933e4dfe647eac5a66
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jun 26 06:53:11 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 20:49:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba39b09
net-misc/ntp: remove unused files
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16427
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
net-misc/ntp/files/ntpdate.service-r1 | 14 --------------
net-misc/ntp/files/sntp.service-r2 | 14 --------------
2 files changed, 28 deletions(-)
diff --git a/net-misc/ntp/files/ntpdate.service-r1 b/net-misc/ntp/files/ntpdate.service-r1
deleted file mode 100644
index f9bc9ddefc9..00000000000
--- a/net-misc/ntp/files/ntpdate.service-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Set time via NTP using ntpdate
-After=network-online.target nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-Conflicts=systemd-timesyncd.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ntpdate -b -u $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-misc/ntp/files/sntp.service-r2 b/net-misc/ntp/files/sntp.service-r2
deleted file mode 100644
index 9bdd578ffbc..00000000000
--- a/net-misc/ntp/files/sntp.service-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Set time via SNTP
-After=network.target NetworkManager-wait-online.service nss-lookup.target
-Before=time-sync.target
-Wants=time-sync.target
-Conflicts=systemd-timesyncd.service
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/sntp -s $SERVER
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/
@ 2023-02-23 20:44 Alfredo Tupone
0 siblings, 0 replies; 5+ messages in thread
From: Alfredo Tupone @ 2023-02-23 20:44 UTC (permalink / raw
To: gentoo-commits
commit: f2d34a63df923ae18ede470a20217acd9764e465
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 22 16:46:52 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 20:44:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d34a63
net-misc/ntp: remove unused file
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29731
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
net-misc/ntp/files/ntpd.rc-r1 | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/net-misc/ntp/files/ntpd.rc-r1 b/net-misc/ntp/files/ntpd.rc-r1
deleted file mode 100644
index 7573411c9986..000000000000
--- a/net-misc/ntp/files/ntpd.rc-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="ntpd - the network time protocol daemon"
-pidfile="/var/run/ntpd.pid"
-command="/usr/sbin/ntpd"
-command_args="-p ${pidfile} ${NTPD_OPTS}"
-start_stop_daemon_args="--pidfile ${pidfile}"
-
-depend() {
- use net dns logger
- after ntp-client
-}
-
-start_pre() {
- if [ ! -f /etc/ntp.conf ] ; then
- eerror "Please create /etc/ntp.conf"
- return 1
- fi
- return 0
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-23 20:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-12-08 7:49 [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/ Patrick McLean
-- strict thread matches above, loose matches on Subject: below --
2023-02-23 20:44 Alfredo Tupone
2020-06-27 20:51 Aaron Bauman
2018-05-27 16:11 Aaron Bauman
2017-10-20 7:45 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox