change log doc updates

diff --git a/ChangeLog-v2.0rc5 b/ChangeLog-v2.0rc5
index b7db207..bae5cfe 100644 (file)
--- a/ChangeLog-v2.0rc5
+++ b/ChangeLog-v2.0rc5
@@ -1,3 +1,21 @@
+commit 474a18b57d054939e6f4063d5ef491b4cee4a240
+Author: Michael Rash <mbr@cipherdyne.org>
+Date:   Mon Dec 5 22:10:47 2011 -0500
+
+    Added various files to Makefile.am so that 'make dist' continues to work
+
+commit 690fe25fa4201af8f76c28450177581ce14a1459
+Author: Michael Rash <mbr@cipherdyne.org>
+Date:   Mon Dec 5 21:14:31 2011 -0500
+
+    added CREDITS file, bumped software version, added ChangeLog files
+
+commit bcba9d6bdef6032a992e64a8bd6bd7604b83b006
+Author: Michael Rash <mbr@cipherdyne.org>
+Date:   Mon Dec 5 21:14:14 2011 -0500
+
+    added CREDITS file, bumped software version, added ChangeLog files
+
 commit 893b89a3eba5fa9945095f8df4460f912fdb0cbc
 Author: Michael Rash <mbr@cipherdyne.org>
 Date:   Sat Dec 3 21:21:29 2011 -0500

diff --git a/ShortLog-v2.0rc5 b/ShortLog-v2.0rc5
index 7095356..c08b6e9 100644 (file)
--- a/ShortLog-v2.0rc5
+++ b/ShortLog-v2.0rc5
@@ -6,7 +6,7 @@ Damien Stuart (2):
 Max Kastanas (1):
       Codebase of Fwknop client for iOS (iPhone) devices
 
-Michael Rash (85):
+Michael Rash (88):
       removed 2.0.0 branch specific ChangeLog, ShortLog and diffstat files
       Disabled read-only relocations and immediate binding compiler
          protections
@@ -111,4 +111,8 @@ Michael Rash (85):
       Added FORCE_NAT mode to the access.conf file
       minor compile fixes for FreeBSD
       minor compiler warning fix on OpenBSD
+      added CREDITS file, bumped software version, added ChangeLog files
+      added CREDITS file, bumped software version, added ChangeLog files
+      Added various files to Makefile.am so that 'make dist' continues to
+         work
 

diff --git a/diffstat-v2.0rc5 b/diffstat-v2.0rc5
index a6d3f92..f6253d0 100644 (file)
--- a/diffstat-v2.0rc5
+++ b/diffstat-v2.0rc5
@@ -1,5 +1,11 @@
+ CREDITS                                        |   17 +
  ChangeLog-v2.0.0                               | 3020 ------------------------
+ ChangeLog-v2.0rc5                              |  767 ++++++
+ Makefile.am                                    |   66 +
  ShortLog-v2.0.0                                |  654 -----
+ ShortLog-v2.0rc5                               |  114 +
+ VERSION                                        |    2 +-
+ android/project/jni/config.h                   |    6 +-
  client/Makefile.am                             |    2 +-
  client/config_init.c                           |   59 +-
  client/fwknop.c                                |   84 +-
@@ -12,14 +18,16 @@
  client/utils.h                                 |    2 +-
  common/common.h                                |    4 +-
  common/netinet_common.h                        |   11 +-
- configure.ac                                   |   64 +-
+ configure.ac                                   |   66 +-
  diffstat-v2.0.0                                | 1310 ----------
+ diffstat-v2.0rc5                               |  196 ++
  doc/fwknop.man.asciidoc                        |    8 +-
  doc/fwknopd.man.asciidoc                       |   93 +-
  doc/libfko.texi                                |   12 +-
  extras/fwknop-launcher/fwknop-launcher-lsof.pl |  350 +++
  extras/fwknop-launcher/fwknop-launcher.conf    |   30 +
- fwknop.spec                                    |    6 +-
+ extras/openwrt/package/fwknop/Makefile         |    2 +-
+ fwknop.spec                                    |    8 +-
  iphone/COPYING                                 |  340 +++
  iphone/Classes/FwknopController.h              |   30 +
  iphone/Classes/FwknopController.m              |  309 +++
@@ -130,10 +138,15 @@
  test/conf/subnet_source_match_access.conf      |    3 +
  test/hardening-check                           |  285 +++
  test/test-fwknop.pl                            | 2689 +++++++++++++++++++++
- 132 files changed, 12627 insertions(+), 6170 deletions(-)
+ win32/config.h                                 |    2 +-
+ 141 files changed, 13795 insertions(+), 6178 deletions(-)
+ create mode 100644 CREDITS
  delete mode 100644 ChangeLog-v2.0.0
+ create mode 100644 ChangeLog-v2.0rc5
  delete mode 100644 ShortLog-v2.0.0
+ create mode 100644 ShortLog-v2.0rc5
  delete mode 100644 diffstat-v2.0.0
+ create mode 100644 diffstat-v2.0rc5
  create mode 100755 extras/fwknop-launcher/fwknop-launcher-lsof.pl
  create mode 100644 extras/fwknop-launcher/fwknop-launcher.conf
  create mode 100755 iphone/COPYING