Browse Source

fix last-minute FreeBSD build issue with latest log.c

OPENBSD_5_7
Brent Cook 9 years ago
parent
commit
a533233b18
6 changed files with 18 additions and 9 deletions
  1. +13
    -4
      patches/0006-Use-LOG_NTP-syslog-facility-if-it-is-available.patch
  2. +1
    -1
      patches/0007-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch
  3. +1
    -1
      patches/0008-check-if-rdomain-support-is-available.patch
  4. +1
    -1
      patches/0009-update-ntpd.conf-to-indicate-OS-dependent-options.patch
  5. +1
    -1
      patches/0010-allow-overriding-default-user-and-file-locations.patch
  6. +1
    -1
      patches/0011-add-p-option-to-create-a-pid-file.patch

+ 13
- 4
patches/0006-Use-LOG_NTP-syslog-facility-if-it-is-available.patch View File

@ -1,4 +1,4 @@
From ce2a92acf47861cf55d00a7f8ccd7037758c0f63 Mon Sep 17 00:00:00 2001
From 245c60ac577e8969e1c235c5e1388d2f5b92278e Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:00:12 -0600
Subject: [PATCH 06/11] Use LOG_NTP syslog facility if it is available
@ -6,13 +6,22 @@ Subject: [PATCH 06/11] Use LOG_NTP syslog facility if it is available
FreeBSD PR: 114191
Submitted by: Robert Archer <freebsd@deathbeforedecaf.net>
---
src/usr.sbin/ntpd/log.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
src/usr.sbin/ntpd/log.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/usr.sbin/ntpd/log.c b/src/usr.sbin/ntpd/log.c
index 1d8304b..3b751b5 100644
index 1d8304b..5d34709 100644
--- a/src/usr.sbin/ntpd/log.c
+++ b/src/usr.sbin/ntpd/log.c
@@ -17,7 +17,7 @@
*/
#include <sys/socket.h>
-
+#include <netinet/in.h>
#include <errno.h>
#include <netdb.h>
#include <pwd.h>
@@ -30,6 +30,10 @@
#include "log.h"


+ 1
- 1
patches/0007-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch View File

@ -1,4 +1,4 @@
From 69da53e369dc71809ea54003f4c20c5f1a11eb0d Mon Sep 17 00:00:00 2001
From 7fe3c1f6e0448cd4341f1a51eb42b23a836cbae9 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:02:50 -0600
Subject: [PATCH 07/11] conditionally fill in sin_len/sin6_len if they exist


+ 1
- 1
patches/0008-check-if-rdomain-support-is-available.patch View File

@ -1,4 +1,4 @@
From f63703fb97ea4c24e89908aa8041fc059b860abf Mon Sep 17 00:00:00 2001
From 61ae467395cfbd7675ad2731e7db7f84b2ab39fd Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:05:46 -0600
Subject: [PATCH 08/11] check if rdomain support is available.


+ 1
- 1
patches/0009-update-ntpd.conf-to-indicate-OS-dependent-options.patch View File

@ -1,4 +1,4 @@
From 9c3c4a91d822a4abf6c204a73ffde3abc4b8aad8 Mon Sep 17 00:00:00 2001
From a57ccaaaeb7b17c7fc8429c7daa1fa501084d895 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:20:03 -0600
Subject: [PATCH 09/11] update ntpd.conf to indicate OS-dependent options


+ 1
- 1
patches/0010-allow-overriding-default-user-and-file-locations.patch View File

@ -1,4 +1,4 @@
From 6494b18b609fafa19fd99abf8bcd57351afcd463 Mon Sep 17 00:00:00 2001
From b35888969063fb5b34db8847dfaa54f2bd4512f4 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Thu, 1 Jan 2015 07:18:11 -0600
Subject: [PATCH 10/11] allow overriding default user and file locations


+ 1
- 1
patches/0011-add-p-option-to-create-a-pid-file.patch View File

@ -1,4 +1,4 @@
From 0dd5d9f3c994fc02889bdb90b937a38916a7da22 Mon Sep 17 00:00:00 2001
From 225c3b07fb4a6eed98a26a7068e84721c810ee5d Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Wed, 31 Dec 2014 08:26:41 -0600
Subject: [PATCH 11/11] add -p option to create a pid file


Loading…
Cancel
Save