diff -r 6f77c32cf359 -r e2fc423a4fd5 components/libnet/libnet.p5m
--- a/components/libnet/libnet.p5m	Wed Jan 11 06:57:58 2012 -0800
+++ b/components/libnet/libnet.p5m	Wed Jan 11 11:05:09 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -31,7 +31,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.arc-caseid \
-    value=PSARC/2008/409
+    value=PSARC/2011/399
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
 license libnet.license license='BSD'
@@ -52,7 +52,6 @@
 
 file $(MACH32)/libnet-config path=usr/bin/libnet-config
 file $(MACH64)/libnet-config path=usr/bin/$(MACH64)/libnet-config
-file path=usr/demo/libnet/arp-new.c
 file path=usr/demo/libnet/arp.c
 file path=usr/demo/libnet/bgp4_hdr.c
 file path=usr/demo/libnet/bgp4_notification.c
@@ -66,12 +65,14 @@
 file path=usr/demo/libnet/fddi_tcp2.c
 file path=usr/demo/libnet/get_addr.c
 file path=usr/demo/libnet/gre.c
+file path=usr/demo/libnet/hsrp.c
 file path=usr/demo/libnet/icmp_echo_cq.c
 file path=usr/demo/libnet/icmp_redirect.c
 file path=usr/demo/libnet/icmp_timeexceed.c
 file path=usr/demo/libnet/icmp_timestamp.c
 file path=usr/demo/libnet/icmp_unreach.c
 file path=usr/demo/libnet/icmp6_echoreq.c
+file path=usr/demo/libnet/icmp6_unreach.c
 file path=usr/demo/libnet/ieee.c
 file path=usr/demo/libnet/ip_link.c
 file path=usr/demo/libnet/ip_raw.c
@@ -91,12 +92,14 @@
 file path=usr/demo/libnet/synflood6.c
 file path=usr/demo/libnet/tcp1.c
 file path=usr/demo/libnet/tcp2.c
+file path=usr/demo/libnet/test_ipv4_options.c
+file path=usr/demo/libnet/test_ipv4.c
+file path=usr/demo/libnet/test_ipv6_icmpv4.c
 file path=usr/demo/libnet/tftp.c
 file path=usr/demo/libnet/tring_tcp1.c
 file path=usr/demo/libnet/tring_tcp2.c
 file path=usr/demo/libnet/udp1.c
 file path=usr/demo/libnet/udp2.c
-file path=usr/demo/libnet/win32/getopt.c
 file path=usr/include/libnet.h
 file path=usr/include/libnet/libnet-asn1.h
 file path=usr/include/libnet/libnet-functions.h
@@ -104,13 +107,12 @@
 file path=usr/include/libnet/libnet-macros.h
 file path=usr/include/libnet/libnet-structures.h
 file path=usr/include/libnet/libnet-types.h
-file usr/lib/$(MACH64)/libnet.so path=usr/lib/$(MACH64)/libnet.so.1.1.2.1
-file usr/lib/libnet.so path=usr/lib/libnet.so.1.1.2.1
+file usr/lib/$(MACH64)/libnet.so path=usr/lib/$(MACH64)/libnet.so.1.6.0
+file usr/lib/libnet.so path=usr/lib/libnet.so.1.6.0
 file libnet-functions.h.3 path=usr/share/man/man3/libnet-functions.h.3
-file libnet-headers.h.3 path=usr/share/man/man3/libnet-headers.h.3
 file libnet-macros.h.3 path=usr/share/man/man3/libnet-macros.h.3
 file libnet.h.3 path=usr/share/man/man3/libnet.h.3
-file libnet_802_1q_hdr.3 path=usr/share/man/man3/libnet_802_1q_hdr.3
-file libnet_802_1x_hdr.3 path=usr/share/man/man3/libnet_802_1x_hdr.3
-link path=usr/lib/$(MACH64)/libnet.so target=libnet.so.1.1.2.1 
-link path=usr/lib/libnet.so target=libnet.so.1.1.2.1
+link path=usr/lib/$(MACH64)/libnet.so target=libnet.so.1.6.0 
+link path=usr/lib/$(MACH64)/libnet.so.1 target=libnet.so.1.6.0 
+link path=usr/lib/libnet.so target=libnet.so.1.6.0
+link path=usr/lib/libnet.so.1 target=libnet.so.1.6.0