Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/ntp/dist resolve conflicts
details: https://anonhg.NetBSD.org/src/rev/32b2dc2d5ddc
branches: trunk
changeset: 325531:32b2dc2d5ddc
user: christos <christos%NetBSD.org@localhost>
date: Sat Dec 28 03:20:12 2013 +0000
description:
resolve conflicts
diffstat:
external/bsd/ntp/dist/ElectricFence/CHANGES | 23 -
external/bsd/ntp/dist/ElectricFence/COPYING | 339 -
external/bsd/ntp/dist/ElectricFence/Makefile.am | 31 -
external/bsd/ntp/dist/ElectricFence/Makefile.in | 576 -
external/bsd/ntp/dist/ElectricFence/README | 46 -
external/bsd/ntp/dist/ElectricFence/efence.c | 788 -
external/bsd/ntp/dist/ElectricFence/efence.h | 44 -
external/bsd/ntp/dist/ElectricFence/eftest.c | 221 -
external/bsd/ntp/dist/ElectricFence/libefence.3 | 382 -
external/bsd/ntp/dist/ElectricFence/page.c | 177 -
external/bsd/ntp/dist/ElectricFence/print.c | 172 -
external/bsd/ntp/dist/ElectricFence/tstheap.c | 63 -
external/bsd/ntp/dist/arlib/COPYING | 46 -
external/bsd/ntp/dist/arlib/INSTALL | 182 -
external/bsd/ntp/dist/arlib/Makefile.am | 15 -
external/bsd/ntp/dist/arlib/Makefile.in | 580 -
external/bsd/ntp/dist/arlib/README | 49 -
external/bsd/ntp/dist/arlib/UNSHAR.HDR | 32 -
external/bsd/ntp/dist/arlib/aclocal.m4 | 951 -
external/bsd/ntp/dist/arlib/arlib.3 | 230 -
external/bsd/ntp/dist/arlib/arlib.c | 1058 -
external/bsd/ntp/dist/arlib/arlib.h | 31 -
external/bsd/ntp/dist/arlib/arplib.h | 47 -
external/bsd/ntp/dist/arlib/configure | 5042 -----
external/bsd/ntp/dist/arlib/configure.in | 59 -
external/bsd/ntp/dist/arlib/depcomp | 530 -
external/bsd/ntp/dist/arlib/install-sh | 323 -
external/bsd/ntp/dist/arlib/missing | 360 -
external/bsd/ntp/dist/arlib/sample.c | 145 -
external/bsd/ntp/dist/clockstuff/clktest.c | 414 -
external/bsd/ntp/dist/compile | 142 -
external/bsd/ntp/dist/config.guess | 1517 -
external/bsd/ntp/dist/config.sub | 1756 -
external/bsd/ntp/dist/depcomp | 530 -
external/bsd/ntp/dist/excludes | 1 -
external/bsd/ntp/dist/html/description_files/description.jpg | Bin
external/bsd/ntp/dist/html/drivers/driver2.html | 67 -
external/bsd/ntp/dist/html/gadget.html | 42 -
external/bsd/ntp/dist/html/manyopt.html | 66 -
external/bsd/ntp/dist/include/autogen-version.def | 2 -
external/bsd/ntp/dist/include/copyright.def | 24 -
external/bsd/ntp/dist/include/debug-opt.def | 32 -
external/bsd/ntp/dist/include/homerc.def | 9 -
external/bsd/ntp/dist/include/ntp_config.h | 365 +-
external/bsd/ntp/dist/include/ntp_data_structures.h | 55 -
external/bsd/ntp/dist/include/ntp_filegen.h | 34 +-
external/bsd/ntp/dist/include/ntp_fp.h | 381 +-
external/bsd/ntp/dist/include/ntp_request.h | 115 +-
external/bsd/ntp/dist/include/ntp_sprintf.h | 15 -
external/bsd/ntp/dist/include/ntp_stdlib.h | 146 +-
external/bsd/ntp/dist/include/ntpd.h | 318 +-
external/bsd/ntp/dist/include/refclock_atom.h | 2 +-
external/bsd/ntp/dist/include/version.def | 1 -
external/bsd/ntp/dist/include/version.texi | 3 -
external/bsd/ntp/dist/kernel/README | 200 -
external/bsd/ntp/dist/kernel/chuinit.c | 76 -
external/bsd/ntp/dist/kernel/clkinit.c | 76 -
external/bsd/ntp/dist/kernel/sys/chudefs.h | 24 -
external/bsd/ntp/dist/kernel/sys/clkdefs.h | 40 -
external/bsd/ntp/dist/kernel/tty_chu.c | 278 -
external/bsd/ntp/dist/kernel/tty_chu_STREAMS.c | 605 -
external/bsd/ntp/dist/kernel/tty_clk.c | 319 -
external/bsd/ntp/dist/kernel/tty_clk_STREAMS.c | 268 -
external/bsd/ntp/dist/lib/isc/backtrace.c | 10 +-
external/bsd/ntp/dist/lib/isc/event.c | 4 +-
external/bsd/ntp/dist/lib/isc/include/isc/util.h | 13 +-
external/bsd/ntp/dist/lib/isc/inet_ntop.c | 28 +-
external/bsd/ntp/dist/lib/isc/inet_pton.c | 5 +-
external/bsd/ntp/dist/lib/isc/log.c | 18 +-
external/bsd/ntp/dist/lib/isc/netaddr.c | 35 +-
external/bsd/ntp/dist/lib/isc/result.c | 33 +-
external/bsd/ntp/dist/lib/isc/sockaddr.c | 15 +-
external/bsd/ntp/dist/lib/isc/unix/file.c | 136 +-
external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c | 16 +-
external/bsd/ntp/dist/lib/isc/unix/net.c | 9 +-
external/bsd/ntp/dist/lib/isc/unix/socket.c | 1259 +-
external/bsd/ntp/dist/lib/isc/unix/time.c | 32 +-
external/bsd/ntp/dist/libntp/atoint.c | 3 +-
external/bsd/ntp/dist/libntp/atolfp.c | 3 +-
external/bsd/ntp/dist/libntp/atouint.c | 32 +-
external/bsd/ntp/dist/libntp/audio.c | 19 +-
external/bsd/ntp/dist/libntp/authkeys.c | 658 +-
external/bsd/ntp/dist/libntp/authreadkeys.c | 33 +-
external/bsd/ntp/dist/libntp/fptoa.c | 27 -
external/bsd/ntp/dist/libntp/fptoms.c | 26 -
external/bsd/ntp/dist/libntp/hextoint.c | 3 +-
external/bsd/ntp/dist/libntp/hextolfp.c | 3 +-
external/bsd/ntp/dist/libntp/humandate.c | 32 +-
external/bsd/ntp/dist/libntp/inttoa.c | 23 -
external/bsd/ntp/dist/libntp/memmove.c | 142 -
external/bsd/ntp/dist/libntp/mfptoa.c | 25 -
external/bsd/ntp/dist/libntp/mfptoms.c | 25 -
external/bsd/ntp/dist/libntp/modetoa.c | 5 +-
external/bsd/ntp/dist/libntp/mstolfp.c | 3 +-
external/bsd/ntp/dist/libntp/msutotsf.c | 37 -
external/bsd/ntp/dist/libntp/ntp_calendar.c | 4 +-
external/bsd/ntp/dist/libntp/ntp_lineedit.c | 7 +-
external/bsd/ntp/dist/libntp/octtoint.c | 3 +-
external/bsd/ntp/dist/libntp/prettydate.c | 4 +-
external/bsd/ntp/dist/libntp/ssl_init.c | 32 +-
external/bsd/ntp/dist/libntp/strstr.c | 54 -
external/bsd/ntp/dist/libntp/tsftomsu.c | 40 -
external/bsd/ntp/dist/libntp/tstotv.c | 137 -
external/bsd/ntp/dist/libntp/tvtots.c | 161 -
external/bsd/ntp/dist/libntp/uinttoa.c | 22 -
external/bsd/ntp/dist/libopts/COPYING.gplv3 | 674 -
external/bsd/ntp/dist/libopts/COPYING.lgplv3 | 165 -
external/bsd/ntp/dist/libopts/COPYING.mbsd | 26 -
external/bsd/ntp/dist/libopts/Makefile.am | 28 -
external/bsd/ntp/dist/libopts/Makefile.in | 592 -
external/bsd/ntp/dist/libopts/README | 93 -
external/bsd/ntp/dist/libopts/ag-char-map.h | 162 -
external/bsd/ntp/dist/libopts/autoopts.c | 1184 -
external/bsd/ntp/dist/libopts/autoopts.h | 366 -
external/bsd/ntp/dist/libopts/autoopts/options.h | 1053 -
external/bsd/ntp/dist/libopts/autoopts/usage-txt.h | 404 -
external/bsd/ntp/dist/libopts/boolean.c | 93 -
external/bsd/ntp/dist/libopts/compat/compat.h | 391 -
external/bsd/ntp/dist/libopts/compat/pathfind.c | 346 -
external/bsd/ntp/dist/libopts/compat/snprintf.c | 62 -
external/bsd/ntp/dist/libopts/compat/strchr.c | 62 -
external/bsd/ntp/dist/libopts/compat/strdup.c | 21 -
external/bsd/ntp/dist/libopts/compat/windows-config.h | 148 -
external/bsd/ntp/dist/libopts/configfile.c | 1253 -
external/bsd/ntp/dist/libopts/cook.c | 295 -
external/bsd/ntp/dist/libopts/enumeration.c | 514 -
external/bsd/ntp/dist/libopts/environment.c | 243 -
external/bsd/ntp/dist/libopts/file.c | 172 -
external/bsd/ntp/dist/libopts/genshell.c | 367 -
external/bsd/ntp/dist/libopts/genshell.h | 167 -
external/bsd/ntp/dist/libopts/libopts.c | 40 -
external/bsd/ntp/dist/libopts/load.c | 542 -
external/bsd/ntp/dist/libopts/m4/libopts.m4 | 542 -
external/bsd/ntp/dist/libopts/m4/liboptschk.m4 | 42 -
external/bsd/ntp/dist/libopts/makeshell.c | 1101 -
external/bsd/ntp/dist/libopts/nested.c | 846 -
external/bsd/ntp/dist/libopts/numeric.c | 178 -
external/bsd/ntp/dist/libopts/parse-duration.c | 584 -
external/bsd/ntp/dist/libopts/parse-duration.h | 84 -
external/bsd/ntp/dist/libopts/pgusage.c | 143 -
external/bsd/ntp/dist/libopts/proto.h | 114 -
external/bsd/ntp/dist/libopts/putshell.c | 322 -
external/bsd/ntp/dist/libopts/reset.c | 136 -
external/bsd/ntp/dist/libopts/restore.c | 229 -
external/bsd/ntp/dist/libopts/save.c | 793 -
external/bsd/ntp/dist/libopts/sort.c | 338 -
external/bsd/ntp/dist/libopts/stack.c | 266 -
external/bsd/ntp/dist/libopts/streqvcmp.c | 268 -
external/bsd/ntp/dist/libopts/text_mmap.c | 385 -
external/bsd/ntp/dist/libopts/time.c | 90 -
external/bsd/ntp/dist/libopts/tokenize.c | 325 -
external/bsd/ntp/dist/libopts/usage.c | 793 -
external/bsd/ntp/dist/libopts/value-type.c | 122 -
external/bsd/ntp/dist/libopts/value-type.h | 27 -
external/bsd/ntp/dist/libopts/version.c | 159 -
external/bsd/ntp/dist/libopts/xat-attribute.c | 113 -
external/bsd/ntp/dist/libopts/xat-attribute.h | 24 -
external/bsd/ntp/dist/libparse/clk_rawdcf.c | 6 +-
external/bsd/ntp/dist/libparse/data_mbg.c | 11 +-
external/bsd/ntp/dist/libparse/info_trimble.c | 4 +-
external/bsd/ntp/dist/ltmain.sh | 9636 ----------
external/bsd/ntp/dist/m4/define_dir.m4 | 26 -
external/bsd/ntp/dist/m4/libtool.m4 | 7831 --------
external/bsd/ntp/dist/m4/ltoptions.m4 | 369 -
external/bsd/ntp/dist/m4/ltsugar.m4 | 123 -
external/bsd/ntp/dist/m4/ltversion.m4 | 23 -
external/bsd/ntp/dist/m4/lt~obsolete.m4 | 98 -
external/bsd/ntp/dist/m4/ntp_cacheversion.m4 | 120 -
external/bsd/ntp/dist/m4/ntp_dir_sep.m4 | 24 -
external/bsd/ntp/dist/m4/ntp_lib_m.m4 | 17 -
external/bsd/ntp/dist/m4/ntp_lineeditlibs.m4 | 136 -
external/bsd/ntp/dist/m4/ntp_openssl.m4 | 283 -
external/bsd/ntp/dist/m4/ntp_vpathhack.m4 | 29 -
external/bsd/ntp/dist/m4/os_cflags.m4 | 99 -
external/bsd/ntp/dist/missing | 360 -
external/bsd/ntp/dist/ntpd/complete.conf | 57 -
external/bsd/ntp/dist/ntpd/keyword-gen.c | 223 +-
external/bsd/ntp/dist/ntpd/ntp_config.c | 4543 ++--
external/bsd/ntp/dist/ntpd/ntp_control.c | 3813 ++-
external/bsd/ntp/dist/ntpd/ntp_crypto.c | 384 +-
external/bsd/ntp/dist/ntpd/ntp_data_structures.c | 201 -
external/bsd/ntp/dist/ntpd/ntp_filegen.c | 357 +-
external/bsd/ntp/dist/ntpd/ntp_intres.c | 1301 -
external/bsd/ntp/dist/ntpd/ntp_io.c | 1620 +-
external/bsd/ntp/dist/ntpd/ntp_keyword.h | 1933 +-
external/bsd/ntp/dist/ntpd/ntp_loopfilter.c | 478 +-
external/bsd/ntp/dist/ntpd/ntp_parser.c | 3416 +-
external/bsd/ntp/dist/ntpd/ntp_parser.h | 717 +-
external/bsd/ntp/dist/ntpd/ntp_parser.y | 824 +-
external/bsd/ntp/dist/ntpd/ntp_peer.c | 712 +-
external/bsd/ntp/dist/ntpd/ntp_proto.c | 1600 +-
external/bsd/ntp/dist/ntpd/ntp_refclock.c | 404 +-
external/bsd/ntp/dist/ntpd/ntp_request.c | 1205 +-
external/bsd/ntp/dist/ntpd/ntp_restrict.c | 89 +-
external/bsd/ntp/dist/ntpd/ntp_scanner.c | 195 +-
external/bsd/ntp/dist/ntpd/ntp_util.c | 673 +-
external/bsd/ntp/dist/ntpd/ntpd-opts.h | 148 +-
external/bsd/ntp/dist/ntpd/ntpd-opts.menu | 1 -
external/bsd/ntp/dist/ntpd/ntpd-opts.texi | 586 -
external/bsd/ntp/dist/ntpd/ntpd.1 | 339 -
external/bsd/ntp/dist/ntpd/ntpd.c | 1197 +-
external/bsd/ntp/dist/ntpd/refclock_acts.c | 909 +-
external/bsd/ntp/dist/ntpd/refclock_arc.c | 31 +-
external/bsd/ntp/dist/ntpd/refclock_chu.c | 61 +-
external/bsd/ntp/dist/ntpd/refclock_datum.c | 203 +-
external/bsd/ntp/dist/ntpd/refclock_heath.c | 15 +-
external/bsd/ntp/dist/ntpd/refclock_irig.c | 31 +-
external/bsd/ntp/dist/ntpd/refclock_jjy.c | 473 +-
external/bsd/ntp/dist/ntpd/refclock_jupiter.c | 102 +-
external/bsd/ntp/dist/ntpd/refclock_neoclock4x.c | 62 +-
external/bsd/ntp/dist/ntpd/refclock_nmea.c | 2091 +-
external/bsd/ntp/dist/ntpd/refclock_oncore.c | 839 +-
external/bsd/ntp/dist/ntpd/refclock_parse.c | 568 +-
external/bsd/ntp/dist/ntpd/refclock_pcf.c | 9 +-
external/bsd/ntp/dist/ntpd/refclock_shm.c | 4 +-
external/bsd/ntp/dist/ntpd/refclock_trak.c | 360 -
external/bsd/ntp/dist/ntpd/refclock_wwvb.c | 34 +-
external/bsd/ntp/dist/ntpdate/ntpdate.c | 24 +-
external/bsd/ntp/dist/ntpdate/ntptime_config.c | 554 -
external/bsd/ntp/dist/ntpdate/ntptimeset.c | 2166 --
external/bsd/ntp/dist/ntpdc/nl.pl | 10 +-
external/bsd/ntp/dist/ntpdc/ntpdc-opts.menu | 1 -
external/bsd/ntp/dist/ntpdc/ntpdc-opts.texi | 269 -
external/bsd/ntp/dist/ntpdc/ntpdc.1 | 161 -
external/bsd/ntp/dist/ntpdc/ntpdc.c | 238 +-
external/bsd/ntp/dist/ntpdc/ntpdc.h | 4 +-
external/bsd/ntp/dist/ntpdc/ntpdc_ops.c | 363 +-
external/bsd/ntp/dist/ntpq/ntpq-opts.menu | 1 -
external/bsd/ntp/dist/ntpq/ntpq-opts.texi | 229 -
external/bsd/ntp/dist/ntpq/ntpq-subs.c | 2528 ++-
external/bsd/ntp/dist/ntpq/ntpq.1 | 399 -
external/bsd/ntp/dist/ntpq/ntpq.c | 1248 +-
external/bsd/ntp/dist/ntpq/ntpq.h | 85 +-
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.menu | 1 -
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.texi | 82 -
external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.1 | 87 -
external/bsd/ntp/dist/scripts/UpdatePoint | 331 -
external/bsd/ntp/dist/scripts/VersionName | 55 -
external/bsd/ntp/dist/scripts/calc_tickadj.in | 38 -
external/bsd/ntp/dist/scripts/check--help | 22 -
external/bsd/ntp/dist/scripts/checkChangeLog | 29 -
external/bsd/ntp/dist/scripts/checktime.in | 79 -
external/bsd/ntp/dist/scripts/cvo.sh | 150 -
external/bsd/ntp/dist/scripts/fixautomakedepsmagic | 28 -
external/bsd/ntp/dist/scripts/freq_adj.in | 97 -
external/bsd/ntp/dist/scripts/genCommitLog | 16 -
external/bsd/ntp/dist/scripts/genver | 88 -
external/bsd/ntp/dist/scripts/hpadjtime.sh | 18 -
external/bsd/ntp/dist/scripts/html2man.in | 234 -
external/bsd/ntp/dist/scripts/mkver.in | 40 -
external/bsd/ntp/dist/scripts/ntp-close | 8 -
external/bsd/ntp/dist/scripts/ntp-groper | 95 -
external/bsd/ntp/dist/scripts/ntp-restart | 10 -
external/bsd/ntp/dist/scripts/ntp-status | 45 -
external/bsd/ntp/dist/scripts/ntp-wait.in | 54 -
external/bsd/ntp/dist/scripts/ntpsweep.in | 300 -
external/bsd/ntp/dist/scripts/ntptrace.in | 71 -
external/bsd/ntp/dist/scripts/rc1/postinstall | 2 -
external/bsd/ntp/dist/scripts/rc1/preinstall | 6 -
external/bsd/ntp/dist/scripts/rc1/preremove | 4 -
external/bsd/ntp/dist/scripts/rc1/prototype | 19 -
external/bsd/ntp/dist/scripts/rc1/xntp | 29 -
external/bsd/ntp/dist/scripts/rc2/local.ntpd | 64 -
external/bsd/ntp/dist/sntp/autogen-version.def | 2 -
external/bsd/ntp/dist/sntp/compile | 142 -
external/bsd/ntp/dist/sntp/config.guess | 1517 -
external/bsd/ntp/dist/sntp/config.sub | 1756 -
external/bsd/ntp/dist/sntp/crypto.c | 9 +-
external/bsd/ntp/dist/sntp/depcomp | 530 -
external/bsd/ntp/dist/sntp/header.h | 90 -
external/bsd/ntp/dist/sntp/kod_management.c | 92 +-
external/bsd/ntp/dist/sntp/libopts/autoopts.c | 1051 +-
external/bsd/ntp/dist/sntp/libopts/autoopts.h | 235 +-
external/bsd/ntp/dist/sntp/libopts/autoopts/options.h | 1266 +-
external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c | 131 +-
external/bsd/ntp/dist/sntp/libopts/configfile.c | 931 +-
external/bsd/ntp/dist/sntp/libopts/enum.c | 12 +-
external/bsd/ntp/dist/sntp/libopts/enumeration.c | 524 -
external/bsd/ntp/dist/sntp/libopts/environment.c | 261 -
external/bsd/ntp/dist/sntp/libopts/file.c | 234 +-
external/bsd/ntp/dist/sntp/libopts/find.c | 6 +-
external/bsd/ntp/dist/sntp/libopts/init.c | 10 +-
external/bsd/ntp/dist/sntp/libopts/load.c | 484 +-
external/bsd/ntp/dist/sntp/libopts/makeshell.c | 1145 +-
external/bsd/ntp/dist/sntp/libopts/nested.c | 732 +-
external/bsd/ntp/dist/sntp/libopts/numeric.c | 79 +-
external/bsd/ntp/dist/sntp/libopts/parse-duration.c | 18 +-
external/bsd/ntp/dist/sntp/libopts/pgusage.c | 4 +-
external/bsd/ntp/dist/sntp/libopts/putshell.c | 325 +-
external/bsd/ntp/dist/sntp/libopts/reset.c | 46 +-
external/bsd/ntp/dist/sntp/libopts/save.c | 409 +-
external/bsd/ntp/dist/sntp/libopts/stack.c | 52 +-
external/bsd/ntp/dist/sntp/libopts/streqvcmp.c | 73 +-
external/bsd/ntp/dist/sntp/libopts/tokenize.c | 46 +-
external/bsd/ntp/dist/sntp/libopts/usage.c | 6 +-
external/bsd/ntp/dist/sntp/libopts/value-type.c | 125 -
external/bsd/ntp/dist/sntp/libopts/value-type.h | 27 -
external/bsd/ntp/dist/sntp/libopts/xat-attribute.c | 116 -
external/bsd/ntp/dist/sntp/libopts/xat-attribute.h | 24 -
external/bsd/ntp/dist/sntp/log.c | 20 +-
external/bsd/ntp/dist/sntp/log.h | 6 +-
external/bsd/ntp/dist/sntp/ltmain.sh | 9636 ----------
external/bsd/ntp/dist/sntp/main.c | 1651 +-
external/bsd/ntp/dist/sntp/missing | 360 -
external/bsd/ntp/dist/sntp/networking.c | 527 +-
external/bsd/ntp/dist/sntp/networking.h | 37 +-
external/bsd/ntp/dist/sntp/sntp-opts.c | 6 +-
external/bsd/ntp/dist/sntp/sntp-opts.menu | 1 -
external/bsd/ntp/dist/sntp/sntp-opts.texi | 286 -
external/bsd/ntp/dist/sntp/sntp.1 | 219 -
external/bsd/ntp/dist/sntp/version.def | 1 -
external/bsd/ntp/dist/sntp/version.m4 | 1 -
external/bsd/ntp/dist/sntp/version.texi | 3 -
external/bsd/ntp/dist/util/ansi2knr.1 | 36 -
external/bsd/ntp/dist/util/ansi2knr.c | 741 -
external/bsd/ntp/dist/util/ntp-keygen-opts.c | 2010 +-
external/bsd/ntp/dist/util/ntp-keygen-opts.menu | 1 -
external/bsd/ntp/dist/util/ntp-keygen-opts.texi | 363 -
external/bsd/ntp/dist/util/ntp-keygen.1 | 190 -
external/bsd/ntp/dist/util/ntp-keygen.c | 454 +-
external/bsd/ntp/dist/util/ntptime.c | 225 +-
external/bsd/ntp/dist/version | 1 -
external/bsd/ntp/dist/version.m4 | 1 -
external/bsd/ntp/dist/ylwrap | 222 -
324 files changed, 29575 insertions(+), 103446 deletions(-)
diffs (truncated from 159251 to 300 lines):
diff -r ed3541462578 -r 32b2dc2d5ddc external/bsd/ntp/dist/ElectricFence/CHANGES
--- a/external/bsd/ntp/dist/ElectricFence/CHANGES Sat Dec 28 03:19:43 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-2.0.1
- Add work-arounds for kernel and library bugs under HP-UX.
- HP has been notified and will repair these soon.
-
-2.0.2
- Add support for DEC Alpha. Add %a pattern for printing addresses, which
- assumes they are passed in a void *.
-
-2.0.3 30-Sep-1993
- When realloc is passed a zero address, it should work the same
- way as malloc(). Fix forward declaration of mprotect() in page.c to
- use void *, not caddr_t, for addresses. IRIX 5.0.1 complained about that.
-
-2.0.4 29-May-1994
- Don't attempt to allow access to a zero-sized page when
- EF_ALLOW_MALLOC_0 is set. Attempt to un-map memory from
- Page_Delete(). If that doesn't work, fall back by protecting the
- page from all references. Un-mapping small segments of a mapping
- used to crash my SGI IRIX 5.0 system. I assume that nobody is running
- 5.0 any longer.
-
-2.0.5 20-January-1995
- Port to Linux.
diff -r ed3541462578 -r 32b2dc2d5ddc external/bsd/ntp/dist/ElectricFence/COPYING
--- a/external/bsd/ntp/dist/ElectricFence/COPYING Sat Dec 28 03:19:43 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,339 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
Home |
Main Index |
Thread Index |
Old Index