OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Aug-2006 08:48:16
Branch: HEAD Handle: 2006082507481600
Modified files:
openpkg-src/wireshark wireshark.patch wireshark.spec
Log:
upgrading package: wireshark 0.99.2 -> 0.99.3a
Summary:
Revision Changes Path
1.4 +13 -62 openpkg-src/wireshark/wireshark.patch
1.3 +2 -2 openpkg-src/wireshark/wireshark.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wireshark/wireshark.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 wireshark.patch
--- openpkg-src/wireshark/wireshark.patch 31 Jul 2006 07:28:56 -0000
1.3
+++ openpkg-src/wireshark/wireshark.patch 25 Aug 2006 06:48:16 -0000
1.4
@@ -1,26 +1,7 @@
-Index: Makefile.in
---- Makefile.in.orig 2006-07-17 22:01:47 +0200
-+++ Makefile.in 2006-07-18 08:31:25 +0200
-@@ -1006,7 +1006,6 @@
- $(wireshark_optional_objects) \
- $(wireshark_additional_libs) \
- @SNMP_LIBS@ @SSL_LIBS@ \
-- $(plugin_ldadd) \
- @PCRE_LIBS@ \
- @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
- @LIBGNUTLS_LIBS@
-@@ -1031,7 +1030,6 @@
- $(wireshark_optional_objects) \
- $(tshark_additional_libs) \
- @SNMP_LIBS@ @SSL_LIBS@ \
-- $(plugin_ldadd) \
- @PCRE_LIBS@ \
- @GLIB_LIBS@ -lm \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
Index: configure
---- configure.orig 2006-07-17 22:01:53 +0200
-+++ configure 2006-07-18 08:31:26 +0200
-@@ -27814,6 +27814,9 @@
+--- configure.orig 2006-08-24 00:27:51 +0200
++++ configure 2006-08-24 08:18:06 +0200
+@@ -27650,6 +27650,9 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
@@ -31,9 +12,9 @@
/* confdefs.h. */
_ACEOF
Index: epan/dissectors/Makefile.in
---- epan/dissectors/Makefile.in.orig 2006-07-17 22:01:21 +0200
-+++ epan/dissectors/Makefile.in 2006-07-18 08:31:26 +0200
-@@ -2483,13 +2483,13 @@
+--- epan/dissectors/Makefile.in.orig 2006-08-24 00:27:34 +0200
++++ epan/dissectors/Makefile.in 2006-08-24 08:18:06 +0200
+@@ -2508,13 +2508,13 @@
#
register.c: $(plugin_src) $(DISSECTOR_SRC)
$(top_srcdir)/tools/make-dissector-reg \
$(top_srcdir)/tools/make-dissector-reg.py
@@ -50,8 +31,8 @@
fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
Index: epan/inet_pton.c
---- epan/inet_pton.c.orig 2006-07-17 21:59:34 +0200
-+++ epan/inet_pton.c 2006-07-18 08:31:26 +0200
+--- epan/inet_pton.c.orig 2006-08-24 00:26:28 +0200
++++ epan/inet_pton.c 2006-08-24 08:18:06 +0200
@@ -15,6 +15,8 @@
* SOFTWARE.
*/
@@ -67,9 +48,9 @@
#endif
+#endif /* #if !defined(__FreeBSD__) */
Index: gtk/Makefile.in
---- gtk/Makefile.in.orig 2006-07-17 22:01:22 +0200
-+++ gtk/Makefile.in 2006-07-18 08:31:26 +0200
-@@ -1025,7 +1025,7 @@
+--- gtk/Makefile.in.orig 2006-08-24 00:27:35 +0200
++++ gtk/Makefile.in 2006-08-24 08:18:06 +0200
+@@ -1038,7 +1038,7 @@
done
check-am: all-am
check: check-am
@@ -79,8 +60,8 @@
install: install-am
install-exec: install-exec-am
Index: gtk/main.c
---- gtk/main.c.orig 2006-07-17 21:56:45 +0200
-+++ gtk/main.c 2006-07-18 08:31:26 +0200
+--- gtk/main.c.orig 2006-08-24 00:24:09 +0200
++++ gtk/main.c 2006-08-24 08:18:06 +0200
@@ -34,10 +34,7 @@
#include <string.h>
@@ -92,33 +73,3 @@
#ifdef NEED_STRERROR_H
#include "strerror.h"
-Index: Makefile.in
---- Makefile.in.orig 2006-07-31 09:07:58 +0200
-+++ Makefile.in 2006-07-31 09:08:26 +0200
-@@ -1008,7 +1008,7 @@
- @SNMP_LIBS@ @SSL_LIBS@ \
- @PCRE_LIBS@ \
- @PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
-- @LIBGNUTLS_LIBS@
-+ @LIBGNUTLS_LIBS@ @LIBGCRYPT_LIBS@
-
-
- # Additional libs that I know how to build. These will be
-@@ -1033,7 +1033,7 @@
- @PCRE_LIBS@ \
- @GLIB_LIBS@ -lm \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
-- @LIBGNUTLS_LIBS@
-+ @LIBGNUTLS_LIBS@ @LIBGCRYPT_LIBS@
-
- @[EMAIL PROTECTED] = -export-dynamic
- @[EMAIL PROTECTED] =
-@@ -1095,7 +1095,7 @@
- @PCRE_LIBS@ \
- @GLIB_LIBS@ -lm \
- @PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
-- @LIBGNUTLS_LIBS@
-+ @LIBGNUTLS_LIBS@ @LIBGCRYPT_LIBS@
-
- dftest_LDFLAGS = -export-dynamic
- dumpcap_additional_libs = \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wireshark/wireshark.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 wireshark.spec
--- openpkg-src/wireshark/wireshark.spec 31 Jul 2006 07:28:57 -0000
1.2
+++ openpkg-src/wireshark/wireshark.spec 25 Aug 2006 06:48:16 -0000
1.3
@@ -32,8 +32,8 @@
Class: EVAL
Group: Network
License: GPL
-Version: 0.99.2
-Release: 20060731
+Version: 0.99.3a
+Release: 20060825
# package options
%option with_zlib yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
