Prepare for 1.2 release candidate.v1.2-rc1libnet-1.2-rc1

9 files changed, 111 insertions, 27 deletions

diff --git a/.gitignore b/.gitignore
index f5bea2f..647e93b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,10 @@ install-sh
 jquery.js
 libnet*.changes
 libnet*.deb
-libnet-1.1.?
-libnet-1.1.?.tar.gz
+libnet-1.?
+libnet-1.?.?
+libnet-1.?.?.tar.gz
+libnet-1.?.tar.gz
 libnet-config
 libnet/*-stamp
 libnet/debian
diff --git a/README.txt b/README.txt
index 9445e87..716532b 100644
--- a/README.txt
+++ b/README.txt
@@ -1,13 +1,22 @@
-Upstream on libnet was dead.
+===============================================================================
+    LIBNET 1.1 (c) 1998 - 2004 Mike D. Schiffman <mike@infonexus.com>
+        http://www.packetfactory.net/libnet
 
-Debian and Fedora had unmerged patches.
+    LIBNET 1.1.3 and later (c) 2009 - 2013 Sam Roberts <vieuxtech@gmail.com>
+        http://github.com/sam-github/libnet
+===============================================================================
 
-I had patches to ip_offset handling (used for IP checksumming) to fix memory
-corruption bugs, and I had the start of Lua bindings.
+libnet provides a fairly portable framework for network packet construction
+an injection.
 
-I forked from packetfactory.net and am maintaining and rereleasing libnet.
+It is widely used, but had become unmaintained at packetfactory.net, and it's
+author is unreachable.
 
-Contact Sam Roberts <vieuxtech@gmail.com> if you have bugs or patches to contribute.
+This version was forked from the 1.1.3 release candidate, then bug fixed,
+actively maintained, and rereleased.
+
+Contact Sam Roberts <vieuxtech@gmail.com> if you have patches, find bugs, or
+have issues porting or building against it.
 
 Newest code is at:
 
@@ -17,3 +26,21 @@ Releases are at:
 
   http://sourceforge.net/projects/libnet-dev/
 
+Some old docs are at:
+
+  http://packetfactory.openwall.net/projects/libnet/index.html
+
+    A C library for portable packet creation and injection.
+ 
+    Libnet is an API to help with the construction and handling of network
+    packets.  It provides a portable framework for low-level network
+    packet writing and handling (use libnet in conjunction with libpcap and
+    you can write some really cool stuff).  Libnet includes packet creation
+    at the IP layer and at the link layer as well as a host of supplementary
+    and complementary functionality.  Libnet is very handy with which to
+    write network tools and network test code.  See the manpage and sample
+    test code for more detailed information.
+    
+    Your old code (circa libnet-1.0.x) WILL NOT WORK with libnet-1.1.x.
+    Read doc/MIGRATION for easy steps on porting your old code.
+
diff --git a/checklist.txt b/checklist.txt
index ed0ff0a..80f7a46 100644
--- a/checklist.txt
+++ b/checklist.txt
@@ -7,7 +7,11 @@ Pre-release:
 
 Use ../ChangeLog to update changelog.
 
-- configure.in
+- README.txt, libnet/README
+
+Sync these.
+
+- configure.ac
 
 Update version.
 
@@ -24,7 +28,7 @@ Update LDFLAGS' version-info.
 
 - Push it, ../Push
 
-- Announce release-candidate on libnet-dev-announce
+- Announce release-candidate on libnet-dev-announce and to people in doc/CONTRIB
 
 
 - Announce release on libnet-dev-announce
diff --git a/libnet/README b/libnet/README
index 5355921..716532b 100644
--- a/libnet/README
+++ b/libnet/README
@@ -1,17 +1,22 @@
 ===============================================================================
-    $Id: README,v 1.4 2004/03/01 20:26:11 mike Exp $
     LIBNET 1.1 (c) 1998 - 2004 Mike D. Schiffman <mike@infonexus.com>
-    http://www.packetfactory.net/libnet
-    LIBNET 1.1.3+ (c) 2009 - 2012 Sam Roberts <vieuxtech@gmail.com>
+        http://www.packetfactory.net/libnet
+
+    LIBNET 1.1.3 and later (c) 2009 - 2013 Sam Roberts <vieuxtech@gmail.com>
+        http://github.com/sam-github/libnet
 ===============================================================================
 
+libnet provides a fairly portable framework for network packet construction
+an injection.
 
-libnet has become unmaintained at packetfactory.net, and it's author is unreachable.
+It is widely used, but had become unmaintained at packetfactory.net, and it's
+author is unreachable.
 
 This version was forked from the 1.1.3 release candidate, then bug fixed,
 actively maintained, and rereleased.
 
-Contact Sam Roberts <vieuxtech@gmail.com> if you have patches or have found bugs.
+Contact Sam Roberts <vieuxtech@gmail.com> if you have patches, find bugs, or
+have issues porting or building against it.
 
 Newest code is at:
 
@@ -39,4 +44,3 @@ Some old docs are at:
     Your old code (circa libnet-1.0.x) WILL NOT WORK with libnet-1.1.x.
     Read doc/MIGRATION for easy steps on porting your old code.
 
-EOF
diff --git a/libnet/configure.ac b/libnet/configure.ac
index 7ace166..2688469 100644
--- a/libnet/configure.ac
+++ b/libnet/configure.ac
@@ -4,7 +4,7 @@ dnl All rights reserved.
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([libnet],[1.2])
+AC_INIT([libnet],[1.2-rc1])
 AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...)
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([src/libnet_build_ip.c])
diff --git a/libnet/doc/CHANGELOG b/libnet/doc/CHANGELOG
index a111e64..ede3c85 100644
--- a/libnet/doc/CHANGELOG
+++ b/libnet/doc/CHANGELOG
@@ -4,6 +4,55 @@
                                http://www.packetfactory.net/libnet
 ===============================================================================
 
+
+- 1.2
+
+    - Prepare for 1.2 release candidate. (Sam Roberts)
+    - Bump libnet versions in preparation for 1.2 release. (Sam Roberts)
+    - Cleaned up references to win32 pre-generated headers (Sam Roberts)
+    - VERSION is ancient and unused (Barak A. Pearlmutter)
+    - autoupdate configure.ac (Barak A. Pearlmutter)
+    - Simplify autogen.sh (suggested by Barak A. Pearlmutter) (Sam Roberts)
+    - Ignore doxygen javascript output (Sam Roberts)
+    - remove autoreconf-installed file (Barak A. Pearlmutter)
+    - Use +AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER (Sam Roberts)
+    - Automatic link options ("#pragma comment(lib, ...)") are only for MSVC (ThomasVolkert)
+    - Added guards around definitions of _GNU_SOURCE to avoid redefinitions (ThomasVolkert)
+    - Avoids several warnings for MS C/C++ compiler (ThomasVolkert)
+    - libnet_open_raw4 doesn't return a SOCKET on win32 (Sam Roberts)
+    - Remove unused STDOUT_FILENO, and dead code that used to use it. (Sam Roberts)
+    - Removed references to removed win32/in_systm.h (Sam Roberts)
+    - git ignore doxygen output (Sam Roberts)
+    - Remove automake reference to win32 header that has been removed. (Sam Roberts)
+    - Fixes error messages sometimes include newline, sometimes not. (Sam Roberts)
+    - Properly set l->err_buf if libnet_ifaddrlist() fails. (Thomas Habets)
+    - Pass build errors to caller of batch files. (Sam Roberts)
+    - dlpi: Try harder to find the device for the interface. (Thomas Habets)
+    - dlpi: Correctly extract the unit number from devices with numbers in their name. (Thomas Habets)
+    - Make interface selection work for interfaces with multiple addresses on them. (Sam Roberts)
+    - memory leak fixed, device list needs to freed after use (Sam Roberts)
+    - uint32 address properly initialized with an address (Sam Roberts)
+    - Reformatted and commented win32 specific code. (Sam Roberts)
+    - Interface selection was ignoring interfaces with ipv6. (Sam Roberts)
+    - Use simple batch file to build for win32. (Sam Roberts)
+    - Use LIBNET_API on public functions, instead of an export file. (Sam Roberts)
+    - Note about libnet_get_prand being secure only on windows. (Sam Roberts)
+    - ignore visual studio output artifacts (Sam Roberts)
+    - Don't need iphlpapi.h included. (Sam Roberts)
+    - Libnet.vcxproj file gained a ProjectGUID property. Hm. (Sam Roberts)
+    - visual studio 2010 project files (Sam Roberts)
+    - Convert uses of non-standard uint to uint32_t. (Sam Roberts)
+    - Compiled on win32 with Visual Studio 2010. (Sam Roberts)
+    - Add build instructions for Visual Studio 2010 (Sam Roberts)
+    - Documentation typo, valid should be invalid. (Sam Roberts)
+    - Replace usage of non-standard uint type with uint32_t. (Sam Roberts)
+    - define INET6 on IRIX, making libnet compile cleanly. (Thomas Habets)
+    - Use LIBNET_BSDISH_OS and LIBNET_BSD_BYTE_SWAP on all darwin architectures. (Kimmo Suominen)
+    - Added BSD byteswap for Darwin. Otherwise sendto() returns EINVAL (Emilio Escobar)
+    - Use a common header to trim cut and paste include blocks. (Sam Roberts)
+    - netinet/in.h is needed for IPPROTO_ and sockaddr_in (reported by Dirk Meyer) (Sam Roberts)
+
+
 - 1.1.6
 
     - Note about why including libnet.h breaks dnet.h/dumbnet.h (Sam Roberts)
diff --git a/libnet/doc/CONTRIB b/libnet/doc/CONTRIB
index 3feb753..dda3c19 100644
--- a/libnet/doc/CONTRIB
+++ b/libnet/doc/CONTRIB
@@ -1,7 +1,7 @@
 ===============================================================================
     $Id: CONTRIB,v 1.9 2004/11/09 07:05:06 mike Exp $
     LIBNET 1.1 (c) 1998 - 2004 Mike D. Schiffman <mike@infonexus.com>
-                               http://www.packetfactory.net/libnet
+        http://www.packetfactory.net/libnet
 ===============================================================================
 
 People who have volunteed to check libnet release candidates:
diff --git a/libnet/doc/COPYING b/libnet/doc/COPYING
index ef7b010..994b3db 100644
--- a/libnet/doc/COPYING
+++ b/libnet/doc/COPYING
@@ -1,9 +1,10 @@
-    $Id: COPYING,v 1.1.1.1 2003/06/26 21:55:10 route Exp $
-
-    libnet 1.1.x
+LIBNET 1.1.x:
     Copyright (c) 1998 - 2002 Mike D. Schiffman <mike@infonexus.com>
-                              http://www.packetfactory.net/libnet        
-    LIBNET 1.1.3+ (c) 2009 - 2012 Sam Roberts <vieuxtech@gmail.com>
+        http://www.packetfactory.net/libnet        
+
+LIBNET 1.1.3 and later:
+    Copyright (c) 2009 - 2013 Sam Roberts <vieuxtech@gmail.com>
+        http://github.com/sam-github/libnet
 
 All rights reserved.
 
@@ -28,6 +29,3 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
-
-
-EOF
diff --git a/libnet/doc/MIGRATION b/libnet/doc/MIGRATION
index b257241..8a2254e 100644
--- a/libnet/doc/MIGRATION
+++ b/libnet/doc/MIGRATION
@@ -5,7 +5,7 @@
 ===============================================================================
 
 
-    MIGRATING YOUR CODE AND QUICKSTART
+    MIGRATING YOUR CODE TO LIBNET 1.1 AND QUICKSTART
 
     Using Libnet 1.1 you will find it MUCH simpler to build and write packets
     than before.  Instead of the previous five steps (initialize memory,