Version bump (bug #454704), also patch commoncpp2 to fix bugs #421383 (buffer overflow) and #467628 (automake-1.13 build failures). Update ebuild to EAPI 5 and add USE=static-libs (bug #439302). Drop old versions and their patches.

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)

7 files changed, 76 insertions, 55 deletions

diff --git a/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch b/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch
deleted file mode 100644
index b2befd567582..000000000000
--- a/dev-cpp/commoncpp2/files/1.6.1-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-05-06 10:41:53.000000000 +0200
-+++ configure.ac	2008-05-06 10:42:19.000000000 +0200
-@@ -10,6 +10,8 @@
- 
- AC_INIT(src/thread.cpp)
- 
-+m4_pattern_allow([^LT_VERSION$])
-+
- VERSION="1.6.1"
- LT_RELEASE="1.6"
- LT_VERSION="0:1"
diff --git a/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch b/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch
deleted file mode 100644
index fcba56dccb4b..000000000000
--- a/dev-cpp/commoncpp2/files/1.6.2-autoconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-05-06 10:41:53.000000000 +0200
-+++ configure.ac	2008-05-06 10:42:19.000000000 +0200
-@@ -10,6 +10,8 @@
- 
- AC_INIT(src/thread.cpp)
- 
-+m4_pattern_allow([^LT_VERSION$])
-+
- VERSION="1.6.2"
- LT_RELEASE="1.6"
- LT_VERSION="0:2"
diff --git a/dev-cpp/commoncpp2/files/1.6.3-autoconf.patch b/dev-cpp/commoncpp2/files/1.6.3-autoconf.patch
deleted file mode 100644
index a94ac91d8b03..000000000000
--- a/dev-cpp/commoncpp2/files/1.6.3-autoconf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur commoncpp2-1.6.3.orig/configure.ac commoncpp2-1.6.3/configure.ac
---- commoncpp2-1.6.3.orig/configure.ac	2009-03-07 16:03:44.000000000 +0100
-+++ commoncpp2-1.6.3/configure.ac	2009-03-07 16:04:25.000000000 +0100
-@@ -10,6 +10,8 @@
- 
- AC_INIT(src/thread.cpp)
- 
-+m4_pattern_allow([^LT_VERSION$])
-+
- VERSION="1.6.3"
- LT_RELEASE="1.6"
- LT_VERSION="0:2"
diff --git a/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
new file mode 100644
index 000000000000..d50a3405ee6c
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-autoconf-update.patch
@@ -0,0 +1,49 @@
+diff --git a/configure.ac b/configure.ac
+index 80518db..64221e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,7 +9,8 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+-AC_INIT(src/thread.cpp)
++AC_INIT
++AC_CONFIG_SRCDIR([src/thread.cpp])
+ AC_CONFIG_MACRO_DIR([m4])
+ m4_pattern_allow(LT_VERSION)
+ 
+@@ -81,17 +82,17 @@ fi
+ AC_SUBST(ccincludedir)
+ 
+ AC_CONFIG_AUX_DIR(autoconf)
+-AC_CANONICAL_SYSTEM
++AC_CANONICAL_TARGET
+ AC_PROG_CPP
+ AC_PROG_CC
+ AC_PROG_CXXCPP
+ AC_PROG_CXX
+ OST_PROG_CC_POSIX
+ NP_PROG_MSC
+-AC_LIBTOOL_WIN32_DLL
+-AM_PROG_LIBTOOL
++
++LT_INIT([win32-dll,disable-static])
+ AM_INIT_AUTOMAKE(commoncpp2, [$VERSION])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_C_RESTRICT
+ AC_C_VOLATILE
+@@ -408,10 +409,11 @@ LIB_MAJOR=`echo $LT_VERSION | sed -e 's/[:].*$//'`
+ AC_SUBST(LIB_VERSION)
+ AC_SUBST(LIB_MAJOR)
+ 
+-AC_OUTPUT([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
++AC_CONFIG_FILES([src/ccgnu2-config src/libccext2.pc src/libccgnu2.pc
+ src/Makefile w32/Makefile w32/vs2008/Makefile w32/vs2008/ccext2.vcproj w32/vs2008/ccgnu2.vcproj w32/vs2008/common.sln m4/Makefile doc/Doxyfile
+ doc/Makefile demo/Makefile inc/Makefile inc/cc++/Makefile Makefile
+ commoncpp2.spec tests/Makefile commoncpp2.list w32/ccgnu2.dsp w32/ccext2.dsp w32/ccgnu2.vcproj w32/ccext2.vcproj])
++AC_OUTPUT
+ 
+ # if test ! -f inc/cc++/thread.h ; then
+ #   cp ${srcdir}/inc/cc++/*.h inc/cc++ ; fi
diff --git a/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch b/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
new file mode 100644
index 000000000000..b6ebf0e0f4a4
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-configure_detect_netfilter.patch
@@ -0,0 +1,14 @@
+diff --git a/m4/ost_socket.m4 b/m4/ost_socket.m4
+index bd9db7c..122c938 100644
+--- a/m4/ost_socket.m4
++++ b/m4/ost_socket.m4
+@@ -93,6 +93,9 @@ AC_DEFUN([OST_SYS_SOCKET],[
+                 AC_CHECK_HEADERS([linux/netfilter_ipv4.h linux/netfilter_ipv6.h],,,
+                     [#ifdef HAVE_LIMITS_H
+                     #include <limits.h>
++                    #endif
++                    #ifdef HAVE_NETINET_IN_H
++                    #include <netinet/in.h>
+                     #endif])
+                 if test "$ac_cv_header_linux_netfilter_ipv4_h" = "yes" &&
+                    [ test "$ac_cv_header_linux_netfilter_ipv6_h" = "yes" &&
diff --git a/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch b/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
new file mode 100644
index 000000000000..e68b00576cdb
--- /dev/null
+++ b/dev-cpp/commoncpp2/files/1.8.1-fix-buffer-overflow.patch
@@ -0,0 +1,13 @@
+diff --git a/src/inaddr.cpp b/src/inaddr.cpp
+index 5a4b9c4..50127f3 100644
+--- a/src/inaddr.cpp
++++ b/src/inaddr.cpp
+@@ -333,7 +333,7 @@ void IPV4Address::setAddress(const char *host)
+             if(ipaddr)
+                 delete[] ipaddr;
+             ipaddr = new struct in_addr[1];
+-            memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
++            memset((void *)&ipaddr[0], 0, sizeof(*ipaddr));
+             return;
+         }
+ 
diff --git a/dev-cpp/commoncpp2/files/commoncpp2-1.6.3-glibc-2.10.patch b/dev-cpp/commoncpp2/files/commoncpp2-1.6.3-glibc-2.10.patch
deleted file mode 100644
index 1f7d445d8ae9..000000000000
--- a/dev-cpp/commoncpp2/files/commoncpp2-1.6.3-glibc-2.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naurp commoncpp2-1.6.3-orig/src/cidr.cpp commoncpp2-1.6.3/src/cidr.cpp
---- commoncpp2-1.6.3-orig/src/cidr.cpp	2008-06-23 07:02:09.000000000 -0600
-+++ commoncpp2-1.6.3/src/cidr.cpp	2009-07-30 01:17:49.276744991 -0600
-@@ -198,7 +198,7 @@ void IPV4Cidr::set(const char *cp)
- 	memset(&netmask, 0, sizeof(netmask));
- 	bitset((bit_t *)&netmask, getMask(cp));
- 	setString(cbuf, sizeof(cbuf), cp);
--	ep = strchr(cp, '/');
-+	ep = (char *)strchr(cp, '/');
- 	if(ep)
- 		*ep = 0;
- 
-@@ -326,7 +326,7 @@ void IPV6Cidr::set(const char *cp)
- 	memset(&netmask, 0, sizeof(netmask));
- 	bitset((bit_t *)&netmask, getMask(cp));
- 	setString(cbuf, sizeof(cbuf), cp);
--	ep = strchr(cp, '/');
-+	ep = (char *)strchr(cp, '/');
- 	if(ep)
- 		*ep = 0;
-