ALT Linux repositórios
Group :: Sistema/Bibliotecas
RPM: libnet2
Navegação
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: libnet-1.1.2.1-alt-autotools.patch
Download
Download
diff -upr libnet-1.1.2.1/acinclude.m4 libnet/acinclude.m4
--- libnet-1.1.2.1/acinclude.m4 2004-01-16 02:53:06 +0300
+++ libnet/acinclude.m4 2004-09-05 15:19:42 +0400
@@ -98,6 +98,11 @@ EOF
else
ac_libnet_have_packet_socket=`./pf_packet-test`;
fi
+
+ rm -f pf_packet-test* core core.pf_packet-test
+ ;;
+ esac])
+
if test $ac_libnet_have_packet_socket = choked; then
AC_MSG_RESULT(test program compile choked... assuming no)
elif test $ac_libnet_have_packet_socket = yes; then
@@ -108,12 +113,8 @@ EOF
AC_MSG_RESULT(no)
fi
- rm -f pf_packet-test* core core.pf_packet-test
- ;;
- esac])
-
if test $ac_libnet_have_packet_socket = yes -o $ac_libnet_have_packet_socket = probably; then
- AC_DEFINE(HAVE_PACKET_SOCKET)
+ AC_DEFINE(HAVE_PACKET_SOCKET, 1, [Define to 1 if you have packet socket])
fi
])
@@ -181,7 +182,7 @@ AC_DEFUN(AC_LIBNET_CHECK_IP_CSUM,
ip.ip_csum = 0;
],
[AC_MSG_RESULT(yes);
- AC_DEFINE(HAVE_STRUCT_IP_CSUM)],
+ AC_DEFINE(HAVE_STRUCT_IP_CSUM, 1, [Define to 1 if your struct ip contains ip_csum])],
[AC_MSG_RESULT(no);
])
])
@@ -260,7 +261,7 @@ EOF
esac])
AC_MSG_RESULT($ac_cv_lbl_unaligned_fail)
if test $ac_cv_lbl_unaligned_fail = yes ; then
- AC_DEFINE(LBL_ALIGN)
+ AC_DEFINE(LBL_ALIGN, 1, [Define to 1 if unaligned accesses fail])
fi
])
@@ -336,11 +337,11 @@ dnl failed to compile for some reason
AC_MSG_RESULT($ac_cv_libnet_endianess)
if test $ac_cv_libnet_endianess = big ; then
- AC_DEFINE(LIBNET_BIG_ENDIAN)
+ AC_DEFINE(LIBNET_BIG_ENDIAN, 1, [Define to 1 if your machine is big endian])
ENDIANESS="LIBNET_BIG_ENDIAN"
LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN"
elif test $ac_cv_libnet_endianess = lil ; then
- AC_DEFINE(LIBNET_LIL_ENDIAN)
+ AC_DEFINE(LIBNET_LIL_ENDIAN, 1, [Define to 1 if your machine is little endian])
ENDIANESS="LIBNET_LIL_ENDIAN"
LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN"
fi
diff -upr libnet-1.1.2.1/configure.in libnet/configure.in
--- libnet-1.1.2.1/configure.in 2004-03-01 23:26:11 +0300
+++ libnet/configure.in 2004-09-05 15:27:41 +0400
@@ -9,6 +9,16 @@ dnl Process this file with autoconf to p
AC_INIT(src/libnet_build_ip.c)
LIBNET_VERSION=`cat VERSION`
+
+# +1 : ? : +1 == new interface that does not break old one
+# +1 : ? : 0 == new interface that breaks old one
+# ? : ? : 0 == no new interfaces, but breaks apps
+# ? :+1 : ? == just some internal changes, nothing breaks but might work
+# better
+# CURRENT : REVISION : AGE
+LIBNET_SO_VERSION=4:0:2
+AC_SUBST(LIBNET_SO_VERSION, $LIBNET_SO_VERSION)
+
AC_MSG_RESULT(beginning autoconfiguration process for libnet-$LIBNET_VERSION...)
AC_CANONICAL_SYSTEM
@@ -21,7 +31,7 @@ dnl Check for the usual programs
dnl
AC_PROG_CC
AC_PROG_INSTALL
-AC_PROG_RANLIB
+AM_PROG_LIBTOOL
AC_CHECK_HEADERS(sys/sockio.h)
diff -upr libnet-1.1.2.1/Makefile.am libnet/Makefile.am
--- libnet-1.1.2.1/Makefile.am 2004-03-10 23:57:09 +0300
+++ libnet/Makefile.am 2004-09-05 15:06:35 +0400
@@ -12,4 +12,4 @@ SUBDIRS = include src sample
EXTRA_DIST = Makefile.am.common
-bin_scripts = libnet-config
+bin_SCRIPTS = libnet-config
diff -upr libnet-1.1.2.1/sample/Makefile.am libnet/sample/Makefile.am
--- libnet-1.1.2.1/sample/Makefile.am 2004-03-11 21:50:20 +0300
+++ libnet/sample/Makefile.am 2004-09-05 15:06:35 +0400
@@ -60,4 +60,4 @@ ip_raw_SOURCES = ip_raw.c
ip_link_SOURCES = ip_link.c
sebek_SOURCES = sebek.c
-LDADD = $(top_srcdir)/src/libnet.a
+LDADD = $(top_srcdir)/src/libnet.la
diff -upr libnet-1.1.2.1/src/Makefile.am libnet/src/Makefile.am
--- libnet-1.1.2.1/src/Makefile.am 2004-03-11 21:50:20 +0300
+++ libnet/src/Makefile.am 2004-09-05 15:26:55 +0400
@@ -8,9 +8,9 @@
include $(top_srcdir)/Makefile.am.common
-lib_LIBRARIES = libnet.a
+lib_LTLIBRARIES = libnet.la
-libnet_a_SOURCES = libnet_asn1.c \
+libnet_la_SOURCES = libnet_asn1.c \
libnet_build_802.1q.c \
libnet_build_802.1x.c \
libnet_build_802.2.c \
@@ -67,5 +67,6 @@ EXTRA_libnet_a_SOURCES = libnet_link_bpf
libnet_link_snoop.c \
libnet_link_win32.c
-libnet_a_LIBADD = @LIBOBJS@
+libnet_la_LDFLAGS = -version-info $(LIBNET_SO_VERSION)
+libnet_la_LIBADD = @LTLIBOBJS@