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: 30-Mar-2004 15:12:00
Branch: HEAD Handle: 2004033014115900
Modified files:
openpkg-src/ethereal ethereal.patch ethereal.spec
Log:
upgrading package: ethereal 0.10.2 -> 0.10.3
Summary:
Revision Changes Path
1.8 +45 -8 openpkg-src/ethereal/ethereal.patch
1.37 +4 -2 openpkg-src/ethereal/ethereal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 ethereal.patch
--- openpkg-src/ethereal/ethereal.patch 29 Mar 2004 10:17:48 -0000 1.7
+++ openpkg-src/ethereal/ethereal.patch 30 Mar 2004 13:11:59 -0000 1.8
@@ -1,6 +1,6 @@
--- gtk/Makefile.in.orig 2004-03-29 10:48:43.000000000 +0200
+++ gtk/Makefile.in 2004-03-29 10:50:09.000000000 +0200
-@@ -511,11 +511,6 @@
+@@ -515,11 +515,6 @@
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
@@ -12,7 +12,7 @@
AR = ar
-@@ -712,7 +707,7 @@
+@@ -717,7 +717,7 @@
done
check-am: all-am
check: check-am
@@ -21,13 +21,50 @@
installdirs:
---- gtk/main.c.orig 2004-03-29 10:49:21.000000000 +0200
-+++ gtk/main.c 2004-03-29 10:49:24.000000000 +0200
-@@ -47,6 +47,7 @@
+--- gtk/main.c.orig 2004-03-30 10:49:43.000000000 +0200
++++ gtk/main.c 2004-03-30 10:49:49.000000000 +0200
+@@ -47,10 +47,7 @@
#include <string.h>
#include <ctype.h>
-+#include <unistd.h>
-
- #ifdef HAVE_UNISTD_H
+-
+-#ifdef HAVE_UNISTD_H
#include <unistd.h>
+-#endif
+
+ #ifdef HAVE_IO_H
+ #include <io.h> /* open/close on win32 */
+--- epan/inet_pton.c.orig 2004-03-30 14:52:39.000000000 +0200
++++ epan/inet_pton.c 2004-03-30 14:53:29.000000000 +0200
+@@ -15,6 +15,8 @@
+ * SOFTWARE.
+ */
+
++#if !defined(__FreeBSD__)
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+@@ -267,3 +269,4 @@
+ return (1);
+ }
+ #endif
++#endif /* #if !defined(__FreeBSD__) */
+--- Makefile.in.orig 2004-03-30 14:58:08.000000000 +0200
++++ Makefile.in 2004-03-30 14:58:21.000000000 +0200
+@@ -772,7 +772,6 @@
+ $(ethereal_optional_objects) \
+ $(ethereal_additional_libs) \
+ @SNMP_LIBS@ @SSL_LIBS@ \
+- $(plugin_ldadd) \
+ @PCRE_LIBS@ \
+ @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@
+
+@@ -796,7 +795,6 @@
+ $(ethereal_optional_objects) \
+ $(tethereal_additional_libs) \
+ @SNMP_LIBS@ @SSL_LIBS@ \
+- $(plugin_ldadd) \
+ @PCRE_LIBS@ \
+ @GLIB_LIBS@ -lm \
+ @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.36 -r1.37 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 29 Mar 2004 10:17:48 -0000 1.36
+++ openpkg-src/ethereal/ethereal.spec 30 Mar 2004 13:11:59 -0000 1.37
@@ -33,8 +33,8 @@
Class: PLUS
Group: Network
License: GPL
-Version: 0.10.2
-Release: 20040329
+Version: 0.10.3
+Release: 20040330
# package options
%option with_zlib yes
@@ -133,6 +133,8 @@
%else
--without-pcre \
%endif
+ --disable-shared \
+ --disable-static \
--disable-ipv6
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
