Version bump

(Portage version: 2.1.1-r2)

3 files changed, 117 insertions, 0 deletions

diff --git a/net-analyzer/traceproto/files/digest-traceproto-1.1.1 b/net-analyzer/traceproto/files/digest-traceproto-1.1.1
index 6c24866e0fed..340c234e78e1 100644
--- a/net-analyzer/traceproto/files/digest-traceproto-1.1.1
+++ b/net-analyzer/traceproto/files/digest-traceproto-1.1.1
@@ -1 +1,3 @@
 MD5 0050c32bbeb3638732587d09eee4d218 traceproto-1.1.1.tar.gz 135394
+RMD160 250d72f1ad34eb6f2b062d910b5e0ee70ec78d5c traceproto-1.1.1.tar.gz 135394
+SHA256 5310f40c3769577e9604b07ccf1039536eaa4e24486f24a971cb9647278ae69e traceproto-1.1.1.tar.gz 135394
diff --git a/net-analyzer/traceproto/files/digest-traceproto-1.1.2_beta1 b/net-analyzer/traceproto/files/digest-traceproto-1.1.2_beta1
new file mode 100644
index 000000000000..0d4c24c5b9fe
--- /dev/null
+++ b/net-analyzer/traceproto/files/digest-traceproto-1.1.2_beta1
@@ -0,0 +1,3 @@
+MD5 ea89a34ba7f58fda7d42ae32dadd52f7 traceproto-1.1.2beta1.tar.gz 192288
+RMD160 a746ee47fa0d7b4ba78eb3227f3426003f35a4c4 traceproto-1.1.2beta1.tar.gz 192288
+SHA256 96c1985793dd9913513669772efdf5736d4bc3af8cd2a852567be64ecd028900 traceproto-1.1.2beta1.tar.gz 192288
diff --git a/net-analyzer/traceproto/files/traceproto-1.1.2_beta1.patch b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1.patch
new file mode 100644
index 000000000000..ba111e6391b3
--- /dev/null
+++ b/net-analyzer/traceproto/files/traceproto-1.1.2_beta1.patch
@@ -0,0 +1,112 @@
+diff -ru traceproto-1.1.2beta1~/configure.ac traceproto-1.1.2beta1/configure.ac
+--- traceproto-1.1.2beta1~/configure.ac	2006-12-17 16:36:48.000000000 +0100
++++ traceproto-1.1.2beta1/configure.ac	2006-12-17 17:08:01.000000000 +0100
+@@ -167,11 +167,20 @@
+ AC_ARG_ENABLE([dmalloc],
+ 	[[  --enable-dmalloc           Use the dmalloc library for debugging]],
+ 	[
+-		dmalloc_test=yes
+-		AC_MSG_RESULT([requested])
++		dmalloc_test=$enableval
+ 	],
+ 	[
+-		AC_MSG_RESULT([not requested])
++		dmalloc_test=no
++	]
++)
++AC_MSG_CHECKING(for ncurses)
++AC_ARG_ENABLE([ncurses],
++	[[  --enable-ncurses           Use the ncurses library]],
++	[
++	 	ncurses_test=$enableval
++	],
++	[
++	 	ncurses_test=no
+ 	]
+ )
+ 
+@@ -182,8 +191,10 @@
+ AC_CHECK_LIB(pcap, pcap_open_live, , AC_MSG_ERROR([ERROR - pcap check failed]))
+ AC_CHECK_LIB(net, libnet_init, , AC_MSG_ERROR([ERROR - libnet check failed]))
+ AC_CHECK_LIB(cap, cap_init, , AC_MSG_WARN([libcap check failed]))
+-AC_CHECK_LIB(ncurses, initscr, , AC_MSG_WARN([ncurses check failed]))
+-AC_CHECK_LIB(curses,  initscr, , AC_MSG_WARN([curses check failed]))
++if test "x$ncurses_test" = "xyes"; then
++	AC_CHECK_LIB(ncurses, initscr, , AC_MSG_WARN([ncurses check failed]))
++	AC_CHECK_LIB(curses,  initscr, , AC_MSG_WARN([curses check failed]))
++fi
+ AC_CHECK_LIB(termcap, tgetent)
+ if test "x$dmalloc_test" = "xyes"; then
+ 	AC_CHECK_LIB(dmalloc, malloc, ,AC_MSG_RESULT([dmalloc unavailable]))
+@@ -191,8 +202,10 @@
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/time.h unistd.h ncurses.h])
+-AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h curses.h])
++AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h stdlib.h string.h sys/time.h unistd.h])
++if test "x$ncurses_test" = "xyes"; then
++	AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h curses.h])
++fi
+ if test "x$dmalloc_test" = "xyes"; then
+ 	AC_CHECK_HEADERS([dmalloc.h])
+ fi
+diff -ru traceproto-1.1.2beta1~/tp_packet.c traceproto-1.1.2beta1/tp_packet.c
+--- traceproto-1.1.2beta1~/tp_packet.c	2006-12-17 16:36:48.000000000 +0100
++++ traceproto-1.1.2beta1/tp_packet.c	2006-12-17 16:39:50.000000000 +0100
+@@ -104,7 +104,7 @@
+ 		state.low_ttl = YES;
+ 
+ /*	tcp_hdr = ( struct libnet_tcp_hdr * ) & raw_packet[ 0 ]; */
+-	tcp_hdr = ( struct libnet_tcp_hdr * ) tp_align ( raw_packet,
++	tcp_hdr = ( struct libnet_tcp_hdr * ) tp_align ( (char *)raw_packet,
+ 					0,
+ 					sizeof ( struct libnet_tcp_hdr ) );
+ 
+@@ -171,7 +171,7 @@
+ 		state.low_ttl = YES;
+ 
+ /*	udp_hdr = ( struct libnet_udp_hdr * ) & raw_packet[ 0 ]; */
+-	udp_hdr = ( struct libnet_udp_hdr * ) tp_align ( raw_packet,
++	udp_hdr = ( struct libnet_udp_hdr * ) tp_align ( (char *)raw_packet,
+ 					0,
+ 					sizeof ( struct libnet_udp_hdr ) );
+ 
+@@ -289,12 +289,12 @@
+  * off of the packet
+  */
+ /*	eth_hdr = ( struct libnet_802_3_hdr * ) raw_packet; */
+-	eth_hdr = ( struct libnet_802_3_hdr * ) tp_align ( raw_packet,
++	eth_hdr = ( struct libnet_802_3_hdr * ) tp_align ( (char *)raw_packet,
+ 					0,
+ 					sizeof ( struct libnet_802_3_hdr ) );
+ 
+ /*	state.ip_hdr = ( struct libnet_ipv4_hdr * ) & raw_packet[ eth_offset ]; */
+-	state.ip_hdr = ( struct libnet_ipv4_hdr * ) tp_align ( raw_packet,
++	state.ip_hdr = ( struct libnet_ipv4_hdr * ) tp_align ( (char *)raw_packet,
+ 					eth_offset,
+ 					sizeof ( struct libnet_ipv4_hdr ) );
+ 
+@@ -315,19 +315,19 @@
+ 	{
+ 	case IPPROTO_ICMP:
+ /*		return parse_icmp_packet ( ( const u_char * ) & raw_packet [ ipv4_offset ] ); */
+-		return parse_icmp_packet ( ( const u_char * ) tp_align ( raw_packet,
++		return parse_icmp_packet ( ( const u_char * ) tp_align ( (char *)raw_packet,
+ 							ipv4_offset,
+ 							sizeof ( struct libnet_icmpv4_hdr ) ) );
+ 		break;
+ 	case IPPROTO_TCP:
+ /*		return parse_tcp_packet ( ( const u_char * ) & raw_packet [ ipv4_offset ] ); */
+-		return parse_tcp_packet ( ( const u_char * ) tp_align ( raw_packet,
++		return parse_tcp_packet ( ( const u_char * ) tp_align ( (char *)raw_packet,
+ 							ipv4_offset,
+ 							sizeof ( struct libnet_tcp_hdr ) ) );
+ 		break;
+ 	case IPPROTO_UDP:
+ /*		return parse_udp_packet ( ( const u_char * ) & raw_packet [ ipv4_offset ] ); */
+-		return parse_udp_packet ( ( const u_char * ) tp_align ( raw_packet,
++		return parse_udp_packet ( ( const u_char * ) tp_align ( (char *)raw_packet,
+ 							ipv4_offset,
+ 							sizeof ( struct libnet_udp_hdr ) ) );
+ 		break;