Release 2.0.0rc1

CHANGES

@@ -1,3 +1,84 @@
+2016-05-10 Jerry Lundström
+
+    Release 2.0.0rc1
+
+    This release brings a major update to the DSC software with the separation
+    of the Collector and the Presenter, this repository will only include
+    the Collector from now on.
+
+    Please read UPGRADE.md for information on upgrading from previous version.
+
+    Major changes / additions are:
+    - Use of Automake and rework of the Makefiles
+    - Conform to FHS 3.0
+    - Man-pages (man dsc, man dsc.conf)
+    - Continuous Integration testing using Travis-CI
+    - Compatibility testing on Debian, CentOS, FreeBSD and OpenBSD
+    - Use of Coverity Scan to find defects
+    - JSON output format, see output_format in dsc.conf(5).
+    - IPv6 support in country indexer and libgeoip is now runtime
+      configurable, see geoip_v4_dat / geoip_v6_dat in dsc.conf(5).
+    - Signal handling and optional write reports on exit, see
+      dump_reports_on_exit in dsc.conf(5).
+    - Upload scripts are deprecated
+
+    Credits:
+    - Klaus Darilion NIC.AT for GeoIP IPv6 patch.
+    - Michael Braunoeder NIC.AT for NXDOMAIN filter patch.
+    - L-root for overflow bugfix IP fragments.
+    - McStork for JSON output patch.
+
+    69ef9b4 Add -v to display version
+    7e5b403 Fix defects
+    0f64128 Add badges
+    f795ed3 Old automake needs AM_PROG_CC_C_O
+    27ae870 Fix #4: Remove old indexers, update indexers and filters
+            documentation, update authors.
+    d873411 Fix #38: Use locking to ensure we do not overwrite PID file
+    800fe83 Fix #35: GeoIP configurable. Fix debug and syslog in country
+            indexer. Add documentation and config example.
+    a1dcdf1 Avoid the checks for newer .dat files, this may have performance
+            impacts.
+    bb9a059 Add IPv6 support to country indexer and add some failure handling
+    03e16a8 Include config.h as this defines HAVE_LIBGEOIP. Thus, the geoip
+            code was not used yet.
+    7808d2e New dsyslog/dsyslogf/dfprint macro. Change fprintf to dfprintf.
+    fe47288 Fix #34: Create man-pages.
+    7a9b3c3 Fix #33: Handle most signals, new config option to dump reports
+            on exit.
+    4753eda Add a filter to track NXDOMAIN responses
+    1565952 Add info about DSP
+    05ef699 Fix make test in dist.
+    68bdc9b No default interface in conf example
+    2be98be Correct libexec directory. Install etc files in subdirectory.
+    319ac4e Only build dist. Build in a build directory.
+    96e0e73 Fix #16: conform to FHS. Automake tweaks.
+    bbcca74 Fix #23: Add missing changes for master branch
+    197ad52 No need to install autoconf/automake in Travis
+    eb95ee1 Add license to cron scripts
+    4f62420 Fix/add make dist and try it in Travis
+    ac4c634 Reconstruct repository to move out presenter. Update licenses.
+            Use pcap_layers as a git submodule. Use automake/autoconf.
+    89c7f4c Import patched pcap_layers.c code with buffer overflow bugfix
+    2787db2 Only wait a certain number of times for the files to appear
+    b5d911d Add the first test, simple run and compare gold files
+    32fd807 Fix #13: Document ability to read packets from pcap files
+    eee217e Rework some of the Makefiles based on some of the patches found in
+            the Debian packages
+    7a2a67e Fix #12: Add hash for dataset names and check for duplicates
+    ed1eba9 Add base64 for certain non-printable characters in JSON output and
+            remove extra new-line
+    580d543 Add output_format and JSON structure description to documentation
+    d2d1ed2 Fix #3: Reworked JSON output format implementation
+    2e2f90f Give option for additional output JSON/Extended JSON
+    a23b6af Ignore generated files
+    f4214f3 Add Travis CI. Remove old TODAY/tar commands. Add ifndef/def to
+            all .h files. Fix issue with arpa/nameser_compat.h on OpenBSD by
+            checking for the header file and only including it if it exists.
+            Rename configure.scan to configure.ac and change contact info and
+            version. Update configure using autoconf 2.69 on Ubuntu 14.04 LTS.
+            Set CC/CPP/CXX/CXXFLAGS in Makefile found by configure.
+
 2016-01-11 Duane Wessels
 
     added dfprintf() macro to improve code readability and avoid

Makefile.am

@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in \
 
 SUBDIRS = src cron
 
-dist_doc_DATA = README.md CHANGES LICENSE
+dist_doc_DATA = README.md CHANGES LICENSE UPGRADE.md
 
 EXTRA_DIST = doc ports autogen.sh
 

UPGRADE.md

@@ -0,0 +1,61 @@
+# Upgrade
+
+This document contains the upgrade information between the major versions
+of DSC for the eventual breaking changes, please read CHANGES for the new
+features added.
+
+# From dsc-201502251630 to v2.0.0
+
+The `dsc-201502251630` was the last version release before the use of
+version numbering.
+
+## Install Paths
+
+Since the conform to FHS 3.0 paths have been changed but will only affect
+new installations where `configure` is not touched.
+
+In previous version `INSTALLDIR` was set to `/usr/local/dsc`, this is now
+controlled by Automake and `configure` using `--prefix=DIR` or individual
+path options as below.  See `configure --help` for information about default
+paths and how to control each of them.
+
+- `upload-*` scripts was previously installed in `$INSTALLDIR/libexec`,
+  is now installed in `$libexecdir/dsc`.
+- `dsc.conf.sample` was previously installed in `$INSTALLDIR/etc`, is now
+  installed in `$sysconfdir/dsc`.
+- `dsc` was previously installed in `$INSTALLDIR/bin`, is not installed
+  in `$bindir`.
+
+## Data Files Path
+
+The path to `dsc` data files that it output has been changed to
+`$localstatedir/lib/dsc` but only affects the path in `dsc.conf.sample`
+during installation.  If you use an old configuration then `dsc` will
+store the data files in the same path as before.  This can be controlled
+by `configure --with-data-dir=DIR`.
+
+## Configuration
+
+Dataset names have been made unique so `dsc` will not start if there are
+duplicates, you need to change the configuration so that all datasets
+are unique.
+
+The following indexers have been removed since they are only aliases:
+- `cip4_addr`, use `client` instead.
+- `cip4_net`, use `client_subnet` instead.
+- `d0_bit`, use `do_bit` instead.
+
+## Upload Scripts Deprecated
+
+Altho the upload scripts are still installed they are now considered
+deprecated and will be removed in future versions.
+
+The uploads scripts where constructed for the purpose of uploading `dsc`
+data to DNS-OARC and that is a very specific purpose that does not belong
+in a software repository.  It can be replaced by instructions specific for
+each organization that needs to do it.
+
+## PID File
+
+The PID file is now locked and `dsc` will not start if another process has
+it locked.

configure.ac

@@ -33,7 +33,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 AC_PREREQ(2.61)
-AC_INIT([DSC], [2.0.0], [[email protected]], [dsc], [https://github.com/DNS-OARC/dsc/issues])
+AC_INIT([DSC], [2.0.0rc1], [[email protected]], [dsc], [https://github.com/DNS-OARC/dsc/issues])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/md_array.c])
 AC_CONFIG_HEADER([src/config.h])