OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Jun-2004 13:49:54
Branch: HEAD Handle: 2004060412495300
Modified files:
openpkg-src/tcpdump tcpdump.patch tcpdump.spec
Log:
avoid substitution of 'includes_' variable when treating 'des_cbc' in
configure, and correct usage of AC_LIBOBJ throughout configure.in and
configure
Summary:
Revision Changes Path
1.7 +75 -3 openpkg-src/tcpdump/tcpdump.patch
1.41 +2 -2 openpkg-src/tcpdump/tcpdump.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/tcpdump/tcpdump.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 tcpdump.patch
--- openpkg-src/tcpdump/tcpdump.patch 16 May 2004 10:42:44 -0000 1.6
+++ openpkg-src/tcpdump/tcpdump.patch 4 Jun 2004 11:49:53 -0000 1.7
@@ -7,7 +7,43 @@
Index: configure.in
--- configure.in.orig 2004-03-28 23:04:48.000000000 +0200
-+++ configure.in 2004-05-16 12:36:59.000000000 +0200
++++ configure.in 2004-06-04 13:23:17.308423700 +0200
+@@ -513,7 +513,7 @@
+ AC_CHECK_FUNCS(vsnprintf snprintf,,
+ [needsnprintf=yes])
+ if test $needsnprintf = yes; then
+- AC_LIBOBJ(snprintf.o)
++ AC_LIBOBJ(snprintf)
+ fi
+
+ AC_LBL_TYPE_SIGNAL
+@@ -550,7 +550,7 @@
+ #include <arpa/inet.h>], [char src[4], dst[128];
+ inet_ntop(AF_INET, src, dst, sizeof(dst));],
+ [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+- AC_LIBOBJ(inet_ntop.o)])
++ AC_LIBOBJ(inet_ntop)])
+ AC_MSG_CHECKING(for inet_pton)
+ AC_TRY_LINK([#include <sys/types.h>
+ #include <sys/socket.h>
+@@ -558,7 +558,7 @@
+ #include <arpa/inet.h>], [char src[128], dst[4];
+ inet_pton(AF_INET, src, dst);],
+ [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+- AC_LIBOBJ(inet_pton.o)])
++ AC_LIBOBJ(inet_pton)])
+ AC_MSG_CHECKING(for inet_aton)
+ AC_TRY_LINK([#include <sys/types.h>
+ #include <netinet/in.h>
+@@ -566,7 +566,7 @@
+ struct in_addr dst;
+ inet_aton(src, &dst);],
+ [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)
+- AC_LIBOBJ(inet_aton.o)])
++ AC_LIBOBJ(inet_aton)])
+
+ dnl portability macros for getaddrinfo/getnameinfo
+ dnl
@@ -585,7 +585,7 @@
fi
if test $ac_cv_func_pcap_lib_version = "no" ; then
@@ -63,8 +99,44 @@
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
+--- configure.orig 2004-03-28 23:06:09.000000000 +0200
++++ configure 2004-06-04 13:43:04.287404500 +0200
+@@ -6836,7 +6836,7 @@
+ done
+
+ if test $needsnprintf = yes; then
+- LIBOBJS="$LIBOBJS snprintf.o.$ac_objext"
++ LIBOBJS="$LIBOBJS snprintf.$ac_objext"
+ fi
+
+
+@@ -8509,7 +8509,7 @@
+
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- LIBOBJS="$LIBOBJS inet_ntop.o.$ac_objext"
++ LIBOBJS="$LIBOBJS inet_ntop.$ac_objext"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ echo "$as_me:$LINENO: checking for inet_pton" >&5
+@@ -8554,7 +8554,7 @@
+
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- LIBOBJS="$LIBOBJS inet_pton.o.$ac_objext"
++ LIBOBJS="$LIBOBJS inet_pton.$ac_objext"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ echo "$as_me:$LINENO: checking for inet_aton" >&5
+@@ -8599,7 +8599,7 @@
+
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+- LIBOBJS="$LIBOBJS inet_aton.o.$ac_objext"
++ LIBOBJS="$LIBOBJS inet_aton.$ac_objext"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+
@@ -8818,10 +8818,6 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/tcpdump/tcpdump.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 tcpdump.spec
--- openpkg-src/tcpdump/tcpdump.spec 16 May 2004 10:42:44 -0000 1.40
+++ openpkg-src/tcpdump/tcpdump.spec 4 Jun 2004 11:49:53 -0000 1.41
@@ -34,7 +34,7 @@
Group: Network
License: GPL
Version: 3.8.3
-Release: 20040516
+Release: 20040604
# list of sources
Source0: http://www.tcpdump.org/release/tcpdump-%{version}.tar.gz
@@ -65,7 +65,7 @@
%prep
%setup -q
%patch -p0
- %{l_shtool} subst -e 's;des_;DES_;g' configure
+ %{l_shtool} subst -e 's;des_cbc;DES_cbc;g' configure
%build
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
