aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOllivier Robert <roberto@FreeBSD.org>2014-12-22 22:14:20 +0000
committerOllivier Robert <roberto@FreeBSD.org>2014-12-22 22:14:20 +0000
commitbd4312b94e8e0cfcaa66b12456aecccafec37236 (patch)
tree432ff0a5afba60c6598a62f94ecb11063efde18d
parentb5e14a1344528861a7016aa2c6b0f2e9630d1526 (diff)
downloadsrc-bd4312b94e8e0cfcaa66b12456aecccafec37236.tar.gz
src-bd4312b94e8e0cfcaa66b12456aecccafec37236.zip
Add back these files deleted by the previous vendor import.
Next commit will remove some files from this tree in order to avoid merging them into head as they were never merged before. Forgotten by: cy
Notes
Notes: svn path=/vendor/ntp/dist/; revision=276091
-rw-r--r--FREEBSD-Xlist2
-rw-r--r--FREEBSD-upgrade55
2 files changed, 57 insertions, 0 deletions
diff --git a/FREEBSD-Xlist b/FREEBSD-Xlist
new file mode 100644
index 000000000000..16cfc18b3215
--- /dev/null
+++ b/FREEBSD-Xlist
@@ -0,0 +1,2 @@
+*ports
+*html/pic
diff --git a/FREEBSD-upgrade b/FREEBSD-upgrade
new file mode 100644
index 000000000000..3253274b14a8
--- /dev/null
+++ b/FREEBSD-upgrade
@@ -0,0 +1,55 @@
+# ex:ts=8
+#
+# $FreeBSD$
+
+NTP 4.2.8
+ originals can be found on http://www.ntp.org/downloads.html
+
+Import
+------
+
+For the import of NTP the following files were removed:
+
+ ports/* NT files
+ html/pic/* GIF files
+ html/build/hints/solaris.xtra.4095849 Trigger merge conflict script
+
+The stripped down version was created using FREEBSD-Xlist during
+extraction:
+
+ tar -X FREEBSD-Xlist -xvzf ntp-4.2.8.tar.gz
+ mv ntp-4.2.8 4.2.8
+
+Imported by:
+ See procedure on
+https://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html
+
+Updating usr.sbin/ntp
+---------------------
+
+./configure --disable-all-clocks --enable-NMEA --enable-ONCORE
+--enable-RAWDCF --with-crypto --disable-debugging
+--enable-LOCAL-CLOCK --with-sntp --with-arlib --prefix=/usr
+
+config.h was generated by running configure and excluding almost all clock
+drivers (what is included is DCF77 -- what I use --, NMEA, Motorola OnCORE
+and local clocks).
+
+The file is then edited to edit the value of "NO_PARENB_IGNPAR" because we
+need to set no parity on the serial port (needed for DCF77). All clock
+drivers are then disabled (some of them are included by default by ntpd).
+
+Note that there are two #ifdef to support other architectures (WRT to long
+size and endianness). They'll need to be redone for each upgrade to the
+vendor branch to keep config.h in sync.
+
+ntpd/ntp_control.c is now the only file that is different from the vendor
+branch for unsigned char/int fixes and removal of a DoS.
+
+Documentation in /usr/share/doc/ntp is generated from the HTML files with
+lynx (without the GIF files of course).
+
+A patch to fix IPV6_MULTICAST_LOOP was committed to head as r222444 and
+filed as http://bugs.ntp.org/show_bug.cgi?id=1936. Check if still needed
+or re-apply on update.
+