Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/
Date: Fri, 20 Oct 2017 07:45:32
Message-Id: 1508485506.68461f427ce489a0799108e355d15560351734be.monsieurp@gentoo
1 commit: 68461f427ce489a0799108e355d15560351734be
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Oct 10 13:14:41 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 20 07:45:06 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68461f42
7
8 net-misc/ntp: remove unused patch.
9
10 net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch | 35 -------------------------
11 1 file changed, 35 deletions(-)
12
13 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
14 deleted file mode 100644
15 index 98ca61af459..00000000000
16 --- a/net-misc/ntp/files/ntp-4.2.8_p10-libressl.patch
17 +++ /dev/null
18 @@ -1,35 +0,0 @@
19 -diff -ur a/include/libssl_compat.h ntp-4.2.8p10/include/libssl_compat.h
20 ---- ntp-4.2.8p10.orig/include/libssl_compat.h 2017-03-21 06:04:20.000000000 -0700
21 -+++ ntp-4.2.8p10/include/libssl_compat.h 2017-03-30 16:34:03.892173084 -0700
22 -@@ -37,7 +37,7 @@
23 - #endif
24 -
25 - /* ----------------------------------------------------------------- */
26 --#if OPENSSL_VERSION_NUMBER < 0x10100000L
27 -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
28 - /* ----------------------------------------------------------------- */
29 -
30 - # include <openssl/objects.h>
31 -diff -ur ntp-4.2.8p10.orig/libntp/a_md5encrypt.c ntp-4.2.8p10/libntp/a_md5encrypt.c
32 ---- ntp-4.2.8p10.orig/libntp/a_md5encrypt.c 2017-02-01 01:47:13.000000000 -0800
33 -+++ ntp-4.2.8p10/libntp/a_md5encrypt.c 2017-03-30 16:55:49.830229507 -0700
34 -@@ -11,6 +11,7 @@
35 - #include "ntp.h"
36 - #include "ntp_md5.h" /* provides OpenSSL digest API */
37 - #include "isc/string.h"
38 -+#include "libssl_compat.h"
39 - /*
40 - * MD5authencrypt - generate message digest
41 - *
42 -diff -ur ntp-4.2.8p10.orig/libntp/libssl_compat.c ntp-4.2.8p10/libntp/libssl_compat.c
43 ---- ntp-4.2.8p10.orig/libntp/libssl_compat.c 2017-02-01 01:47:13.000000000 -0800
44 -+++ ntp-4.2.8p10/libntp/libssl_compat.c 2017-03-30 16:52:17.287543795 -0700
45 -@@ -26,7 +26,7 @@
46 - /* ----------------------------------------------------------------- */
47 -
48 - /* ----------------------------------------------------------------- */
49 --#if defined(OPENSSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
50 -+#if defined(OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER)
51 - /* ----------------------------------------------------------------- */
52 -
53 - #include "libssl_compat.h"