Browse Source

adjust patch naming convention to match ports

include naddy's patch for using the LOG_NTP syslog facility
OPENBSD_5_7
Brent Cook 10 years ago
parent
commit
59dbc42e60
11 changed files with 40 additions and 19 deletions
  1. +0
    -0
      patches/patch-client.c
  2. +0
    -0
      patches/patch-config.c
  3. +0
    -0
      patches/patch-imsg.c
  4. +23
    -0
      patches/patch-log.c
  5. +0
    -0
      patches/patch-ntp.c
  6. +10
    -0
      patches/patch-ntpd.c
  7. +0
    -10
      patches/patch-ntpd.h
  8. +0
    -0
      patches/patch-parse.y
  9. +0
    -0
      patches/patch-server.c
  10. +0
    -0
      patches/patch-util.c
  11. +7
    -9
      update.sh

patches/client.patch → patches/patch-client.c View File


patches/config.patch → patches/patch-config.c View File


patches/imsg.patch → patches/patch-imsg.c View File


+ 23
- 0
patches/patch-log.c View File

@ -0,0 +1,23 @@
$FreeBSD: head/net/openntpd/files/patch-log.c 340725 2014-01-22 17:40:44Z mat $
--- log.c.orig 2007-08-22 23:04:30.000000000 +0200
+++ log.c 2009-08-01 22:08:01.000000000 +0200
@@ -26,6 +26,10 @@
#include "ntpd.h"
+#ifndef LOG_NTP
+#define LOG_NTP LOG_DAEMON
+#endif
+
int debug;
extern int debugsyslog;
@@ -39,7 +43,7 @@ log_init(int n_debug)
debug = n_debug;
if (!debug)
- openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+ openlog(__progname, LOG_PID | LOG_NDELAY, LOG_NTP);
tzset();
}

patches/ntp.patch → patches/patch-ntp.c View File


+ 10
- 0
patches/patch-ntpd.c View File

@ -0,0 +1,10 @@
--- ntpd.orig 2014-12-28 11:51:56.363211155 -0600
+++ ntpd.c 2014-12-28 11:52:00.971211255 -0600
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include <unistd.h>
#include <err.h>

patches/ntpd.patch → patches/patch-ntpd.h View File

@ -1,13 +1,3 @@
--- ntpd.orig 2014-12-28 11:51:56.363211155 -0600
+++ ntpd.c 2014-12-28 11:52:00.971211255 -0600
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <time.h>
#include <unistd.h>
#include <err.h>
--- ntpd.orig Sun Dec 28 16:11:35 2014 --- ntpd.orig Sun Dec 28 16:11:35 2014
+++ ntpd.h Sun Dec 28 16:12:14 2014 +++ ntpd.h Sun Dec 28 16:12:14 2014
@@ -28,7 +28,6 @@ @@ -28,7 +28,6 @@

patches/parse.patch → patches/patch-parse.y View File


patches/server.patch → patches/patch-server.c View File


patches/util.patch → patches/patch-util.c View File


+ 7
- 9
update.sh View File

@ -33,7 +33,7 @@ cp $libc_inc/sha2.h include/sha2_openbsd.h
cp $libutil_src/imsg.h include/ cp $libutil_src/imsg.h include/
cp $libutil_src/imsg.c compat/ cp $libutil_src/imsg.c compat/
cp $libutil_src/imsg-buffer.c compat/ cp $libutil_src/imsg-buffer.c compat/
(cd compat; $PATCH < $patches/imsg.patch)
(cd compat; $PATCH < $patches/patch-imsg.c)
for i in explicit_bzero.c strlcpy.c strlcat.c strndup.c strnlen.c; do for i in explicit_bzero.c strlcpy.c strlcat.c strndup.c strnlen.c; do
$CP $libc_src/string/$i compat $CP $libc_src/string/$i compat
@ -53,13 +53,11 @@ $CP $libcrypto_src/crypto/arc4random_*.h compat
for i in client.c config.c control.c log.c ntp.c ntp.h ntp_dns.c ntp_msg.c \ for i in client.c config.c control.c log.c ntp.c ntp.h ntp_dns.c ntp_msg.c \
ntpd.c ntpd.h parse.y sensors.c server.c util.c \ ntpd.c ntpd.h parse.y sensors.c server.c util.c \
ntpctl.8 ntpd.8 ntpd.conf.5 ; do ntpctl.8 ntpd.8 ntpd.conf.5 ; do
echo Copying `basename $i`
file=`basename $i`
echo Copying $file
$CP $ntpd_src/$i . $CP $ntpd_src/$i .
if [ -e $patches/patch-$file ]; then
echo Patching $file
$PATCH < $patches/patch-$file
fi
done done
$PATCH < $patches/client.patch
$PATCH < $patches/config.patch
$PATCH < $patches/ntp.patch
$PATCH < $patches/ntpd.patch
$PATCH < $patches/parse.patch
$PATCH < $patches/server.patch
$PATCH < $patches/util.patch

Loading…
Cancel
Save