Revision: 3904 http://gar.svn.sourceforge.net/gar/?rev=3904&view=rev Author: hson Date: 2009-03-24 09:39:33 +0000 (Tue, 24 Mar 2009)
Log Message: ----------- libnet: revert back to 1.0.2 Modified Paths: -------------- csw/mgar/pkg/libnet/trunk/Makefile csw/mgar/pkg/libnet/trunk/checksums Added Paths: ----------- csw/mgar/pkg/libnet/trunk/files/Makefile.in.diff csw/mgar/pkg/libnet/trunk/files/configure.diff csw/mgar/pkg/libnet/trunk/files/configure.in.diff Modified: csw/mgar/pkg/libnet/trunk/Makefile =================================================================== --- csw/mgar/pkg/libnet/trunk/Makefile 2009-03-24 09:17:43 UTC (rev 3903) +++ csw/mgar/pkg/libnet/trunk/Makefile 2009-03-24 09:39:33 UTC (rev 3904) @@ -1,13 +1,21 @@ GARNAME = libnet -GARVERSION = 1.1.2.1 +GARVERSION = 1.0.2a CATEGORIES = lib DESCRIPTION = The libnet packet construction library define BLURB - Libnet is a high-level API (toolkit) allowing the application programmer to construct and inject network packets. It provides a portable and simplified interface for low-level network packet shaping, handling and injection. Libnet hides much of the tedium of packet creation from the application programmer such as multiplexing, buffer management, arcane packet header information, byte-ordering, OS-dependent issues, and much more. Libnet features portable packet creation interfaces at both the IP-layer and link-layer, as well as a host of supplementary and complementary functionality. + Libnet is a high-level API (toolkit) allowing the application programmer to + construct and inject network packets. It provides a portable and simplified + interface for low-level network packet shaping, handling and injection. + Libnet hides much of the tedium of packet creation from the application + programmer such as multiplexing, buffer management, arcane packet header + information, byte-ordering, OS-dependent issues, and much more. Libnet + features portable packet creation interfaces at both the IP-layer and + link-layer, as well as a host of supplementary and complementary + functionality. endef -MASTER_SITES = http://www.packetfactory.net/libnet/dist/ +MASTER_SITES = http://www.packetfactory.net/libnet/dist/deprecated/ DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz LICENSE = doc/COPYING @@ -18,13 +26,11 @@ BUILD64 = 1 -DISTNAME = libnet +DISTNAME = Libnet-$(GARVERSION) -PATCHFILES = buildpatch -PATCHFILES += libnet_pblock_coalesce_leak.patch -PATCHFILES += libnet-cq-end-loop.patch -PATCHFILES += libnet_build_ntp.patch -PATCHFILES += libnet_checksum.c.patch +PATCHFILES = Makefile.in.diff +PATCHFILES += configure.diff +PATCHFILES += configure.in.diff CONFIGURE_ARGS = $(DIRPATHS) @@ -32,40 +38,6 @@ include gar/category.mk -post-extract-$(MODULATION): - ( cp $(FILEDIR)/ltmain.sh $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME) ) - ( cp $(FILEDIR)/libnet.pc.in $(WORKROOTDIR)/build-$(MODULATION)/$(DISTNAME)/src ) +pre-configure-modulated: + cd $(WORKSRC) && autoconf configure.in >configure @$(MAKECOOKIE) - -post-install-modulated: - @ginstall -d $(DESTDIR)$(bindir) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/libnet-config $(DESTDIR)$(bindir) - @ginstall -d $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/BUGS $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CHANGELOG $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/CONTRIB $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/COPYING $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/DESIGN_NOTES $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/MIGRATION $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PACKET_BUILDING $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/PORTED $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/RAWSOCKET_NON_SEQUITUR $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/TODO $(DESTDIR)$(docdir)/$(GARNAME) - @ginstall -d $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-functions.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-headers.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet-macros.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet.h.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1q_hdr.3 $(DESTDIR)$(mandir)/man3 - @ginstall -m 444 $(WORKDIR)/$(DISTNAME)/doc/man/man3/libnet_802_1x_hdr.3 $(DESTDIR)$(mandir)/man3 - @$(MAKECOOKIE) - -post-install-isa-sparcv8: - @ginstall -d $(DESTDIR)$(libdir) - @cp $(FILEDIR)/libnet.so.1.0.2.s $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 - @$(MAKECOOKIE) - -post-install-isa-i386: - @ginstall -d $(DESTDIR)$(libdir) - @cp $(FILEDIR)/libnet.so.1.0.2.i $(INSTALLISADIR)/opt/csw/lib/libnet.so.1.0.2 - @$(MAKECOOKIE) Modified: csw/mgar/pkg/libnet/trunk/checksums =================================================================== --- csw/mgar/pkg/libnet/trunk/checksums 2009-03-24 09:17:43 UTC (rev 3903) +++ csw/mgar/pkg/libnet/trunk/checksums 2009-03-24 09:39:33 UTC (rev 3904) @@ -1,6 +1,4 @@ -be845c41170d72c7db524f3411b50256 download/libnet-1.1.2.1.tar.gz -8bd8908d73e8b0e81e372f5ef2cf552a download/buildpatch -c074b4d206f3041a64afcde1a5b2d5d0 download/libnet_pblock_coalesce_leak.patch -ca892b6a33f04cafb6def978c97ecb45 download/libnet-cq-end-loop.patch -b49b610c4726a359bd42c3ad3211f169 download/libnet_build_ntp.patch -fe5dc7c78f5326f271c75595ff50d376 download/libnet_checksum.c.patch +ddf53f0f484184390e8c2a1bd0853667 download/libnet-1.0.2a.tar.gz +d139b591e701b4495a12eb5a85db5a67 download/Makefile.in.diff +38af7abfddd8ba307597beea9ad79d56 download/configure.diff +0f915f72620c830eb647f59a95ba44b0 download/configure.in.diff Added: csw/mgar/pkg/libnet/trunk/files/Makefile.in.diff =================================================================== --- csw/mgar/pkg/libnet/trunk/files/Makefile.in.diff (rev 0) +++ csw/mgar/pkg/libnet/trunk/files/Makefile.in.diff 2009-03-24 09:39:33 UTC (rev 3904) @@ -0,0 +1,41 @@ +--- ../build-global/Libnet-1.0.2a/Makefile.in 2001-02-05 18:51:41.000000000 +0100 ++++ Libnet-1.0.2a/Makefile.in 2009-03-24 09:03:42.454643521 +0100 +@@ -20,7 +20,7 @@ + + LIBNET = libnet + LIBPWRITE = libpwrite +-LIB = lib/$(LIBNET).a ++LIB = lib/$(LIBNET).so.1.0.2 + MAN = doc/$(LIBNET).3 + INCLUDE = include/$(LIBNET).h + INCLUDE-H = include/$(LIBNET)/$(LIBNET)-headers.h +@@ -37,7 +37,7 @@ + CC = @CC@ + ENSUREDIR = $(srcdir)/ensure-dir.sh + INSTALL_DATA= $(srcdir)/install-sh +-CFLAGS = @CFLAGS@ ++CFLAGS = -KPIC @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ + OBJECTS = src/libnet_resolve.o\ + src/libnet_socket.o\ +@@ -74,8 +74,7 @@ + supp: test example + + libnet: version.h $(OBJECTS) +- $(AR) -cr $(LIB) $(OBJECTS) +- $(RANLIB) $(LIB) ++ $(LD) -G -o $(LIB) $(OBJECTS) + + version.o: version.h + version.h: ./VERSION +@@ -99,8 +98,8 @@ + $(ENSUREDIR) $(DESTDIR)$(MAN_PREFIX) 755 + $(ENSUREDIR) $(DESTDIR)$(BIN_PREFIX) 755 + $(INSTALL_DATA) $(LIB) $(DESTDIR)$(LIB_PREFIX) +- rm -f $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).a +- cd $(DESTDIR)$(LIB_PREFIX); $(LN) -f -s $(LIBNET).a $(LIBPWRITE).a ++ $(LN) -f -s $(LIBNET).$(SOEXT).1.0.2 $(DESTDIR)$(LIB_PREFIX)$(LIBNET).$(SOEXT) ++ $(LN) -f -s $(LIBNET).$(SOEXT).1.0.2 $(DESTDIR)$(LIB_PREFIX)$(LIBPWRITE).$(SOEXT) + $(INSTALL_DATA) $(INCLUDE) $(DESTDIR)$(INC_PREFIX) + $(INSTALL_DATA) $(INCLUDE-H) $(DESTDIR)$(INC_PREFIX)$(LIBNET) + $(INSTALL_DATA) $(INCLUDE-F) $(DESTDIR)$(INC_PREFIX)$(LIBNET) Added: csw/mgar/pkg/libnet/trunk/files/configure.diff =================================================================== --- csw/mgar/pkg/libnet/trunk/files/configure.diff (rev 0) +++ csw/mgar/pkg/libnet/trunk/files/configure.diff 2009-03-24 09:39:33 UTC (rev 3904) @@ -0,0 +1,258 @@ +--- ../build-global/Libnet-1.0.2a/configure 2001-01-17 21:59:33.000000000 +0100 ++++ Libnet-1.0.2a/configure 2009-03-24 09:35:04.271359818 +0100 +@@ -880,14 +880,110 @@ + fi + fi + ++echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ++echo "configure:885: checking how to run the C preprocessor" >&5 ++# On Suns, sometimes $CPP names a directory. ++if test -n "$CPP" && test -d "$CPP"; then ++ CPP= ++fi ++if test -z "$CPP"; then ++if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then ++ echo $ac_n "(cached) $ac_c" 1>&6 ++else ++ # This must be in double quotes, not single quotes, because CPP may get ++ # substituted into the Makefile and "${CC-cc}" will confuse make. ++ CPP="${CC-cc} -E" ++ # On the NeXT, cc -E runs the code through the compiler's parser, ++ # not just through cpp. ++ cat > conftest.$ac_ext <<EOF ++#line 900 "configure" ++#include "confdefs.h" ++#include <assert.h> ++Syntax Error ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ CPP="${CC-cc} -E -traditional-cpp" ++ cat > conftest.$ac_ext <<EOF ++#line 917 "configure" ++#include "confdefs.h" ++#include <assert.h> ++Syntax Error ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ CPP="${CC-cc} -nologo -E" ++ cat > conftest.$ac_ext <<EOF ++#line 934 "configure" ++#include "confdefs.h" ++#include <assert.h> ++Syntax Error ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:940: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* ++ CPP=/lib/cpp ++fi ++rm -f conftest* ++fi ++rm -f conftest* ++fi ++rm -f conftest* ++ ac_cv_prog_CPP="$CPP" ++fi ++ CPP="$ac_cv_prog_CPP" ++else ++ ac_cv_prog_CPP="$CPP" ++fi ++echo "$ac_t""$CPP" 1>&6 ++ ++cat > conftest.$ac_ext <<EOF ++#line 965 "configure" ++#include "confdefs.h" ++#include <wchar.h> ++EOF ++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ++{ (eval echo configure:970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ++if test -z "$ac_err"; then ++ : ++else ++ echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++fi ++rm -f conftest* + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:886: checking for working const" >&5 ++echo "configure:982: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 891 "configure" ++#line 987 "configure" + #include "confdefs.h" + + int main() { +@@ -1450,101 +1546,21 @@ + EOF + + LIBNET_CONFIG_DEFINES="-D_BSD_SOURCE -D__BSD_SOURCE -D__FAVOR_BSD" +- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:1455: checking how to run the C preprocessor" >&5 +-# On Suns, sometimes $CPP names a directory. +-if test -n "$CPP" && test -d "$CPP"; then +- CPP= +-fi +-if test -z "$CPP"; then +-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- # This must be in double quotes, not single quotes, because CPP may get +- # substituted into the Makefile and "${CC-cc}" will confuse make. +- CPP="${CC-cc} -E" +- # On the NeXT, cc -E runs the code through the compiler's parser, +- # not just through cpp. +- cat > conftest.$ac_ext <<EOF +-#line 1470 "configure" +-#include "confdefs.h" +-#include <assert.h> +-Syntax Error +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- : +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- CPP="${CC-cc} -E -traditional-cpp" +- cat > conftest.$ac_ext <<EOF +-#line 1487 "configure" +-#include "confdefs.h" +-#include <assert.h> +-Syntax Error +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- : +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- CPP="${CC-cc} -nologo -E" +- cat > conftest.$ac_ext <<EOF +-#line 1504 "configure" +-#include "confdefs.h" +-#include <assert.h> +-Syntax Error +-EOF +-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +-if test -z "$ac_err"; then +- : +-else +- echo "$ac_err" >&5 +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- CPP=/lib/cpp +-fi +-rm -f conftest* +-fi +-rm -f conftest* +-fi +-rm -f conftest* +- ac_cv_prog_CPP="$CPP" +-fi +- CPP="$ac_cv_prog_CPP" +-else +- ac_cv_prog_CPP="$CPP" +-fi +-echo "$ac_t""$CPP" 1>&6 +- +-for ac_hdr in net/ethernet.h ++ for ac_hdr in net/ethernet.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1538: checking for $ac_hdr" >&5 ++echo "configure:1554: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1543 "configure" ++#line 1559 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -1657,7 +1673,7 @@ + #define HAVE_SOLARIS 1 + EOF + +- for ac_hdr in sys/bufmod.h sys/dlpi_ext.h ++ for ac_hdr in sys/bufmod.h sys/dlpi_ext.h sys/sockio.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +@@ -1835,10 +1851,10 @@ + + ADDITIONAL_LIBS='-lsocket -lnsl' + LIBNET_CONFIG_LIBS="$LIBNET_CONFIG_LIBS -lsocket -lnsl" +- MAN_PREFIX="$prefix/man/man3/" +- LIB_PREFIX="$prefix/lib/" +- INC_PREFIX="$prefix/include/" +- BIN_PREFIX="$prefix/bin/" ++ MAN_PREFIX="$mandir/man3/" ++ LIB_PREFIX="$libdir/" ++ INC_PREFIX="$includedir/" ++ BIN_PREFIX="$bindir/" + ;; + + *) +@@ -2254,11 +2270,11 @@ + s...@build_vendor@%$build_vendor%g + s...@build_os@%$build_os%g + s...@cc@%$CC%g +...@cpp@%$CPP%g + s...@install_program@%$INSTALL_PROGRAM%g + s...@install_script@%$INSTALL_SCRIPT%g + s...@install_data@%$INSTALL_DATA%g + s...@set_make@%$SET_MAKE%g +...@cpp@%$CPP%g + + CEOF + EOF Added: csw/mgar/pkg/libnet/trunk/files/configure.in.diff =================================================================== --- csw/mgar/pkg/libnet/trunk/files/configure.in.diff (rev 0) +++ csw/mgar/pkg/libnet/trunk/files/configure.in.diff 2009-03-24 09:39:33 UTC (rev 3904) @@ -0,0 +1,34 @@ +--- ../build-global/Libnet-1.0.2a/configure.in 2001-01-17 21:59:30.000000000 +0100 ++++ Libnet-1.0.2a/configure.in 2009-03-24 09:29:18.117017012 +0100 +@@ -39,6 +39,7 @@ + dnl Check compiler type. + dnl + AC_PROG_CC ++AC_TRY_CPP([#include <wchar.h>]) + + dnl + dnl Check for typedefs, structures, and compiler characteristics. +@@ -203,7 +204,7 @@ + + *solaris*) + AC_DEFINE(HAVE_SOLARIS) +- AC_CHECK_HEADERS(sys/bufmod.h sys/dlpi_ext.h) ++ AC_CHECK_HEADERS(sys/bufmod.h sys/dlpi_ext.h sys/sockio.h) + AC_MSG_CHECKING(for /dev/dlpi device) + if test -c /dev/dlpi; then + AC_MSG_RESULT(yes) +@@ -237,10 +238,10 @@ + + ADDITIONAL_LIBS='-lsocket -lnsl' + LIBNET_CONFIG_LIBS="$LIBNET_CONFIG_LIBS -lsocket -lnsl" +- MAN_PREFIX="$prefix/man/man3/" +- LIB_PREFIX="$prefix/lib/" +- INC_PREFIX="$prefix/include/" +- BIN_PREFIX="$prefix/bin/" ++ MAN_PREFIX="$mandir/man3/" ++ LIB_PREFIX="$libdir/" ++ INC_PREFIX="$includedri/" ++ BIN_PREFIX="$bindir/" + ;; + + *) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel