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: 06-Jul-2007 11:42:55
Branch: HEAD Handle: 2007070610425500
Modified files:
openpkg-src/wireshark wireshark.patch wireshark.spec
Log:
upgrading package: wireshark 0.99.5 -> 0.99.6
Summary:
Revision Changes Path
1.5 +15 -32 openpkg-src/wireshark/wireshark.patch
1.11 +5 -2 openpkg-src/wireshark/wireshark.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wireshark/wireshark.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 wireshark.patch
--- openpkg-src/wireshark/wireshark.patch 25 Aug 2006 06:48:16 -0000
1.4
+++ openpkg-src/wireshark/wireshark.patch 6 Jul 2007 09:42:55 -0000
1.5
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2006-08-24 00:27:51 +0200
-+++ configure 2006-08-24 08:18:06 +0200
-@@ -27650,6 +27650,9 @@
+--- configure.orig 2007-07-05 21:26:25 +0200
++++ configure 2007-07-06 09:13:40 +0200
+@@ -29700,6 +29700,9 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
@@ -12,45 +12,28 @@
/* confdefs.h. */
_ACEOF
Index: epan/dissectors/Makefile.in
---- 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 @@
+--- epan/dissectors/Makefile.in.orig 2007-07-05 21:26:07 +0200
++++ epan/dissectors/Makefile.in 2007-07-06 09:15:29 +0200
+@@ -7264,13 +7264,13 @@
#
- register.c: $(plugin_src) $(DISSECTOR_SRC)
$(top_srcdir)/tools/make-dissector-reg \
+ register.c: $(plugin_src) $(ALL_DISSECTORS_SRC)
$(top_srcdir)/tools/make-dissector-reg \
$(top_srcdir)/tools/make-dissector-reg.py
- @if test -n $(PYTHON); then \
+ @if test -n "$(PYTHON)"; then \
echo Making register.c with python ; \
$(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
- dissectors $(DISSECTOR_SRC) ; \
+ dissectors $(ALL_DISSECTORS_SRC) ; \
else \
echo Making register.c with shell script ; \
- $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
+ $(SHELL) $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
- dissectors $(plugin_src) $(DISSECTOR_SRC) ; \
+ dissectors $(plugin_src) $(ALL_DISSECTORS_SRC) ; \
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-08-24 00:26:28 +0200
-+++ epan/inet_pton.c 2006-08-24 08:18:06 +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__) */
Index: gtk/Makefile.in
---- 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 @@
+--- gtk/Makefile.in.orig 2007-07-05 21:26:08 +0200
++++ gtk/Makefile.in 2007-07-06 09:13:40 +0200
+@@ -1102,7 +1102,7 @@
done
check-am: all-am
check: check-am
@@ -60,9 +43,9 @@
install: install-am
install-exec: install-exec-am
Index: gtk/main.c
---- 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 @@
+--- gtk/main.c.orig 2007-07-05 21:22:28 +0200
++++ gtk/main.c 2007-07-06 09:13:40 +0200
+@@ -35,10 +35,7 @@
#include <string.h>
#include <ctype.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wireshark/wireshark.spec
============================================================================
$ cvs diff -u -r1.10 -r1.11 wireshark.spec
--- openpkg-src/wireshark/wireshark.spec 3 Feb 2007 08:31:54 -0000
1.10
+++ openpkg-src/wireshark/wireshark.spec 6 Jul 2007 09:42:55 -0000
1.11
@@ -32,8 +32,8 @@
Class: EVAL
Group: Capturing
License: GPL
-Version: 0.99.5
-Release: 20070203
+Version: 0.99.6
+Release: 20070706
# package options
%option with_gui yes
@@ -100,6 +100,9 @@
%setup -q
%patch -p0
%{l_shtool} subst \
+ -e 's;-Werror;;g' \
+ configure Makefile.in */Makefile.in
+ %{l_shtool} subst \
-e 's;-Wl,-static *;;g' \
-e 's;-all-static *;;g' \
-e 's;-static *;;g' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
