summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2012-03-07 11:57:35 -0800
committerSam Roberts <vieuxtech@gmail.com>2012-03-07 11:57:35 -0800
commit292b998e45220cd2065712a14dde609d11d99c0a (patch)
treecb64307106de80e788e98cdf3272676c786cd0e7
parent776bf0251c9ee57b55eb9df6257f2b43af3ed46d (diff)
downloadlibnet-292b998e45220cd2065712a14dde609d11d99c0a.tar.gz
Prep for 1.1.6 release, such as bumping versionv1.1.6-rc2libnet-1.1.6-rc2
-rwxr-xr-xChangelog2
-rw-r--r--checklist.txt9
-rw-r--r--libnet/configure.in2
-rw-r--r--libnet/doc/CHANGELOG10
-rw-r--r--libnet/src/Makefile.am3
5 files changed, 17 insertions, 9 deletions
diff --git a/Changelog b/Changelog
index 52a7c05..32b7cff 100755
--- a/Changelog
+++ b/Changelog
@@ -1 +1 @@
-git --no-pager log --no-merges --pretty=format:' %x20%x20 - %s (%an)' `git tag | tail -n 1`..HEAD .
+git --no-pager log --no-merges --pretty=format:' %x20%x20 - %s (%an)' `git tag | grep -v -- -rc | tail -n 1`..HEAD .
diff --git a/checklist.txt b/checklist.txt
index 5f44dbd..a5c4587 100644
--- a/checklist.txt
+++ b/checklist.txt
@@ -7,22 +7,21 @@ Pre-release:
Use ../ChangeLog to update changelog.
-
- configure.in
Update version.
-
- src/Makefile.am
Update LDFLAGS' version-info.
-
-- tag it
+- tag it, with -rc#
> git tag -fa libnet-x.y.z -m libnet-x.y.z
> git push --tags
+- Announce release-candidate on libnet-dev-announce
+
Post-release:
- Post tarball to source forge.
@@ -37,7 +36,5 @@ Go to:
https://sourceforge.net/projects/libnet-dev/files_beta/
-
- Announce release on libnet-dev-announce
-
diff --git a/libnet/configure.in b/libnet/configure.in
index e85b3d6..c20ffe5 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.5)
+AC_INIT(libnet, 1.1.6)
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 6fccf1c..618f02f 100644
--- a/libnet/doc/CHANGELOG
+++ b/libnet/doc/CHANGELOG
@@ -6,6 +6,16 @@
- 1.1.6
+ - Rework libnet_autobuild_ipv6() to eliminate code duplication. (Sam Roberts)
+ - Implemented libnet_autobuild_ipv6() (repolho)
+ - Implemented unix version of libnet_get_ipaddr6() (repolho)
+ - Reintroduce libnet_pblock_record_ip_offset() which is empty. (Sam Roberts)
+ - Make clear that all contributions are under libnet copyright. (Sam Roberts)
+ - Fix doc comment format errors reported by doxygen. (Sam Roberts)
+ - Update for doxygen 1.7.4. (Sam Roberts)
+ - Note that PORTED is no longer maintained. (Sam Roberts)
+ - Note that CONTRIB is no longer maintained. (Sam Roberts)
+ - Prep for upcoming 1.1.6 release. (Sam Roberts)
- Remove BUGS, it referred to non-existent code. (Sam Roberts)
- Reworked icmpv6 patch to parallel the form of icmpv4 support. (Sam Roberts)
- Don't depend on netinet/ip.h. (Sam Roberts)
diff --git a/libnet/src/Makefile.am b/libnet/src/Makefile.am
index 92b5665..977f528 100644
--- a/libnet/src/Makefile.am
+++ b/libnet/src/Makefile.am
@@ -80,6 +80,7 @@ libnet_la_LIBADD = @LTLIBOBJS@
# 1.1.3 will be 6:0:5 -> new interfaces, backwards compatible
# 1.1.4 was 6:0:5 -> probably an error on my part
# 1.1.5 is 7:0:6 -> new APIs, backwards compat
+# 1.1.6 is 8:0:7 -> new APIs, backwards compat
-libnet_la_LDFLAGS = -version-info 7:0:6 -Wl
+libnet_la_LDFLAGS = -version-info 8:0:7 -Wl