Prep docs and readmes for re-release.

8 files changed, 93 insertions, 10 deletions

diff --git a/Changelog b/Changelog
index 7748f65..7748f65 100644..100755
--- a/Changelog
+++ b/Changelog
diff --git a/Clean b/Clean
index 6124abd..6730b54 100755
--- a/Clean
+++ b/Clean
@@ -4,6 +4,3 @@ set -x
 
 git clean -x -d
 
-sh ./autogen.sh
-
-
diff --git a/Prepare b/Prepare
index bdc345d..079c01e 100755
--- a/Prepare
+++ b/Prepare
@@ -2,5 +2,7 @@
 
 set -x
 
+sh ./autogen.sh
+
 CFLAGS="-O0 -g -Wall" ./configure --with-pic --enable-maintainer-mode --enable-dependency-tracking --enable-shared=no
 
diff --git a/README.txt b/README.txt
index 5323d50..f39dac5 100644
--- a/README.txt
+++ b/README.txt
@@ -17,16 +17,17 @@ Complete:
 - autotools from upstream v1.1.3-RC-01 merged to v1.1.2.1-fork
 - completed ip_offset patches being merged into ip_offset-patch
 - merge to master
+- completed ip4 options fixes
 
 
 In progresss:
 
+- update changelog
+- get host for release tarballs
+- re-release
 
 Incomplete:
 
 - lua bindings
-- build_ipv4_options is known to cause memory corruption under some conditions,
-  but fix is more complicated than others and is not merged
 - cleanup of in source comments/documentation of libnet data structures
-- re-release
 
diff --git a/libnet/README b/libnet/README
index 3043cb8..9076cf5 100644
--- a/libnet/README
+++ b/libnet/README
@@ -4,6 +4,18 @@
                                http://www.packetfactory.net/libnet
 ===============================================================================
 
+
+libnet has become unmaintained at packetfactory, and it's maintainer is unreachable.
+
+This fork is a release of the 1.1.3 release candidate, bug fixed.
+
+Home page and more info is available at:
+
+    http://github.com/sam-github/libnet
+
+Contact Sam Roberts <vieuxtech@gmail.com> if you have patches or have found bugs.
+
+
     A C library for portable packet creation and injection.
  
     Libnet is an API to help with the construction and handling of network
diff --git a/libnet/configure.in b/libnet/configure.in
index b0cdc60..8a8c2eb 100644
--- a/libnet/configure.in
+++ b/libnet/configure.in
@@ -6,7 +6,7 @@ dnl All rights reserved.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(libnet, 1.1.3rc2)
+AC_INIT(libnet, 1.1.3)
 AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...)
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([src/libnet_build_ip.c])
diff --git a/libnet/doc/CHANGELOG b/libnet/doc/CHANGELOG
index 04c71e8..d1a93d1 100644
--- a/libnet/doc/CHANGELOG
+++ b/libnet/doc/CHANGELOG
@@ -5,6 +5,72 @@
 ===============================================================================

 

 

+- 1.1.3

+

+Merged 1.1.3 release candidate from packet factory, 1.1.2, debian patches, and

+my own fixes, including bugs causing memory corruption:

+

+    - Fixed various errors, including memory corruption, when IPv4 options are

+      modified.  (Sam Roberts)

+    - Convert from latin-1 to utf-8, from Robert Scheck. (Sam Roberts)

+    - Fixed doxygen errors and warnings, and added a deveoper script to prepare

+      libnet. (Sam Roberts)

+    - Removed CVS crud, again. (Sam Roberts)

+    - Applied autotools cleanup patch from Stefanos. (Sam Roberts)

+    - Applied patch from Stefanos to remove the autotools ephemera that leaked

+      back in. (Sam Roberts)

+    - Patches from Stefanos. (Sam Roberts)

+    - Updated .so revision to be one backwards compatible interface after

+      1.1.2.1-fork's. (Sam Roberts)

+    - Fix for debian bug# 418975, IPv6 wasn't updating ip_offset. See

+      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=418975 and sample

+      test_ipv6_icmpv4.c for more information, and reproduction. (Sam Roberts)

+    - merged autogen.sh from 1.1.3, now ltmain.sh comes from autogen.sh (Sam

+      Roberts)

+    - 802.1Q and 802.1X header documentation was incorrectly using /** /** is

+      reserved for doxygen documentation comments, and they didn't have any.

+      That those packet headers, and no others, were marked that way was

+      causing man pages to be generated for them, incomplete man pages that

+      then were being hacked by debian patches 02- and 03-. (Sam Roberts)

+    - Update .so version to be one src change past the last debian release.

+      Debian patches to v1.1.2.1 used 4:0:3, in error, so we use 5:0:4, as per

+      the rules. See Makefile.am comments for reference. (Sam Roberts)

+    - Bug fixes and reproduction code for ip_offset accounting problem in

+      libnet_build_ipv4 (Sam Roberts)

+    - doxygen configuration updated, html seems fine - I don't know about the

+      man pages. (Sam Roberts)

+    - autotools merged from v1.1.3 to v1.1.2 (Sam Roberts)

+    - Remove autotools. And some garbage local files that should not have been

+      in upstream tarball. (Sam Roberts)

+    - Removed object files and cvs conflict residue contained in original

+      package. (Sam Roberts)

+    - debian patch 06 attempts to free the wrong pointer, and also leaks memory

+      from the inner loop. (Sam Roberts)

+    - libnet (inconsistently) uses various signed and/or unsigned typedefs

+      instead of char ANSI C uses char for string literals and the standard

+      library, so this generates many warnings. I've fixed a number of the

+      places where types representing null-terminated strings weren't typed

+      correctly. (Sam Roberts)

+    - 09-fix_hurd-i386_build.patch from debian source package See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - 08-fix_libnet_checksum.c.patch from debian source package See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - 07-add_libnet-cq-end-loop.patch from debian source package See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - 06-fix_libnet_pblock_coalesce_leak.patch from debian source package See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - 04-fix_libnet_build_ntp.patch from debian source package See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - 03-fix_libnet_802_1x_hdr.3.patch from debian source package See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - 02-fix_libnet_802_1q_hdr.3.patch See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - 01-fix_libnet-functions.h.3.patch from debian source package See

+      http://packages.debian.org/source/sid/libnet (Sam Roberts)

+    - strip CVS subdirectories from upstream package (Sam Roberts)

+

+From 1.1.3-rc:

+

     Added a libnet_version() function

     Fixed a bug in libnet_build_ntp() where two arguments werent used due to a

      typo

diff --git a/libnet/doc/CONTRIB b/libnet/doc/CONTRIB
index 7786749..511415c 100644
--- a/libnet/doc/CONTRIB
+++ b/libnet/doc/CONTRIB
@@ -6,7 +6,6 @@
 

 

     1.1.x CONTRIBUTERS

-

     Barbato, Luca

         . faster C checksum routine

     Beverly, Scott          <scottbeverly@xengin.com>

@@ -21,26 +20,32 @@
     Davis, Michael          <mike@datanerds.net>

         . bugfixes

     Dulai, Danny            <ddulai@stake.com>

+    Harhalakis, Stefanos    <v13@v13.gr>

+        . debian packaging and help with autotools

     Keramida, Giorgos      <keramida@ceid.upatras.gr>

         . various bugfixes

     Kuehl, Kirby            <kkuehl@cisco.com>

         . u_short -> u_long patch

         . 1.1.1 Win32 porting

         . tons and tons of other stuff

-    Roberto Larcher         <roberto.larcher@libero.it>

-        . 1.1.0 Win32 Porting

     Newsham, Tim            <tnewsham@stake.com>

         . general elitism

     O'Donnell, Adam         <javaman@west.philly.ghetto.org>

         . Solaris IPv6 address fix

     Omella, Alfredo Andres  <aandres@s21sec.com>

         . Solaris DLPI fix

+    Paleino, David          <d.paleino@gmail.com>

+        . debian packaging and help with autotools

     Raynal, Frederic        <frederic.raynal@security-labs.org>

         . cq interface

         . numerous bugfixes and suggestions

 	. keeping the project alive during my sabbatical!

+    Roberto Larcher         <roberto.larcher@libero.it>

+        . 1.1.0 Win32 Porting

     Salvatori, Alessandro

         . many many patches

+    Scheck, Robert

+        . latin-1 to utf-8 conversion from Fedora

     Sehgal, Anupma          <asehgal@cisco.com>

         . pblock sanity check oversight fix

     Schlott, Stefan         <stefan@ploing.de>