OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 16-May-2004 12:42:45
Branch: HEAD Handle: 2004051611424400
Added files:
openpkg-src/tcpdump tcpdump.patch
Modified files:
openpkg-src/tcpdump tcpdump.spec
Log:
fix tcpdump building against latest libpcap
Summary:
Revision Changes Path
1.6 +148 -0 openpkg-src/tcpdump/tcpdump.patch
1.40 +3 -1 openpkg-src/tcpdump/tcpdump.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tcpdump/tcpdump.patch
============================================================================
$ cvs diff -u -r0 -r1.6 tcpdump.patch
--- /dev/null 2004-05-16 12:42:44.000000000 +0200
+++ tcpdump.patch 2004-05-16 12:42:44.000000000 +0200
@@ -0,0 +1,148 @@
+The following patch fixes three custom Autoconf checks by moving the
+defined test function into the include section of the AC_TRY_LINK macro
+in order to make sure it is generated _outside_ the main() function.
+Else if generated _inside_ the main() function the test will always
+generate true because at least GCC then does not detect that the
+referenced symbol is actually undefined.
+
+Index: configure.in
+--- configure.in.orig 2004-03-28 23:04:48.000000000 +0200
++++ configure.in 2004-05-16 12:36:59.000000000 +0200
+@@ -585,7 +585,7 @@
+ fi
+ if test $ac_cv_func_pcap_lib_version = "no" ; then
+ AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
+- AC_TRY_LINK([],
++ AC_TRY_LINK(
+ [
+ char *
+ return_pcap_version(void)
+@@ -594,7 +594,7 @@
+
+ return pcap_version;
+ }
+- ],
++ ],[],
+ ac_lbl_cv_pcap_version_defined=yes,
+ ac_lbl_cv_pcap_version_defined=no)
+ if test "$ac_lbl_cv_pcap_version_defined" = yes ; then
+@@ -605,7 +605,7 @@
+ fi
+ fi
+ AC_MSG_CHECKING(whether pcap_debug is defined by libpcap)
+-AC_TRY_LINK([],
++AC_TRY_LINK(
+ [
+ int
+ return_pcap_debug(void)
+@@ -614,7 +614,7 @@
+
+ return pcap_debug;
+ }
+- ],
++ ],[],
+ ac_lbl_cv_pcap_debug_defined=yes,
+ ac_lbl_cv_pcap_debug_defined=no)
+ if test "$ac_lbl_cv_pcap_debug_defined" = yes ; then
+@@ -626,7 +626,7 @@
+ # OK, what about "yydebug"?
+ #
+ AC_MSG_CHECKING(whether yydebug is defined by libpcap)
+- AC_TRY_LINK([],
++ AC_TRY_LINK(
+ [
+ int
+ return_yydebug(void)
+@@ -635,7 +635,7 @@
+
+ return yydebug;
+ }
+- ],
++ ],[]
+ ac_lbl_cv_yydebug_defined=yes,
+ ac_lbl_cv_yydebug_defined=no)
+ if test "$ac_lbl_cv_yydebug_defined" = yes ; then
+Index: configure
+--- configure.orig 2004-05-16 12:28:12.000000000 +0200
++++ configure 2004-05-16 12:37:45.000000000 +0200
+@@ -8818,10 +8818,6 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-int
+-main ()
+-{
+-
+ char *
+ return_pcap_version(void)
+ {
+@@ -8830,6 +8826,10 @@
+ return pcap_version;
+ }
+
++int
++main ()
++{
++
+ ;
+ return 0;
+ }
+@@ -8877,10 +8877,6 @@
+ /* end confdefs.h. */
+
+ int
+-main ()
+-{
+-
+-int
+ return_pcap_debug(void)
+ {
+ extern int pcap_debug;
+@@ -8888,6 +8884,10 @@
+ return pcap_debug;
+ }
+
++int
++main ()
++{
++
+ ;
+ return 0;
+ }
+@@ -8935,10 +8935,6 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+
+-int
+-main ()
+-{
+-
+ int
+ return_yydebug(void)
+ {
+@@ -8947,6 +8943,11 @@
+ return yydebug;
+ }
+
++int
++main ()
++{
++
++ ac_lbl_cv_yydebug_defined=yes
+ ;
+ return 0;
+ }
+@@ -8963,12 +8964,11 @@
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_lbl_cv_yydebug_defined=yes
++ ac_lbl_cv_yydebug_defined=no
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lbl_cv_yydebug_defined=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ if test "$ac_lbl_cv_yydebug_defined" = yes ; then
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tcpdump/tcpdump.spec
============================================================================
$ cvs diff -u -r1.39 -r1.40 tcpdump.spec
--- openpkg-src/tcpdump/tcpdump.spec 31 Mar 2004 10:43:26 -0000 1.39
+++ openpkg-src/tcpdump/tcpdump.spec 16 May 2004 10:42:44 -0000 1.40
@@ -34,10 +34,11 @@
Group: Network
License: GPL
Version: 3.8.3
-Release: 20040331
+Release: 20040516
# list of sources
Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
+Patch0: tcpdump.patch
# build information
Prefix: %{l_prefix}
@@ -63,6 +64,7 @@
%prep
%setup -q
+ %patch -p0
%{l_shtool} subst -e 's;des_;DES_;g' configure
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
