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: 31-Jul-2006 09:28:57
Branch: HEAD Handle: 2006073108285601
Modified files:
openpkg-src/wireshark wireshark.patch wireshark.spec
Log:
upgrading package: wireshark 0.99.1pre1 -> 0.99.2
Summary:
Revision Changes Path
1.3 +90 -88 openpkg-src/wireshark/wireshark.patch
1.2 +10 -6 openpkg-src/wireshark/wireshark.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wireshark/wireshark.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 wireshark.patch
--- openpkg-src/wireshark/wireshark.patch 27 Jun 2006 17:41:51 -0000
1.2
+++ openpkg-src/wireshark/wireshark.patch 31 Jul 2006 07:28:56 -0000
1.3
@@ -1,50 +1,7 @@
-Index: gtk/Makefile.in
---- gtk/Makefile.in.orig 2004-07-08 00:26:54 +0200
-+++ gtk/Makefile.in 2004-07-12 14:09:42 +0200
-@@ -945,7 +938,7 @@
- done
- check-am: all-am
- check: check-am
--all-am: Makefile $(LIBRARIES) $(HEADERS)
-+all-am: $(LIBRARIES) $(HEADERS)
- installdirs:
- install: install-am
- install-exec: install-exec-am
-Index: gtk/main.c
---- 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>
--
--#ifdef HAVE_UNISTD_H
- #include <unistd.h>
--#endif
-
- #ifdef HAVE_IO_H
- #include <io.h> /* open/close on win32 */
-Index: epan/inet_pton.c
---- 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__) */
Index: Makefile.in
---- Makefile.in.orig 2006-06-07 21:50:27 +0200
-+++ Makefile.in 2006-06-27 19:06:18 +0200
-@@ -993,7 +993,6 @@
+--- 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@ \
@@ -52,7 +9,7 @@
@PCRE_LIBS@ \
@PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ @FRAMEWORKS@ \
@LIBGNUTLS_LIBS@
-@@ -1018,7 +1017,6 @@
+@@ -1031,7 +1030,6 @@
$(wireshark_optional_objects) \
$(tshark_additional_libs) \
@SNMP_LIBS@ @SSL_LIBS@ \
@@ -61,9 +18,9 @@
@GLIB_LIBS@ -lm \
@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@ @KRB5_LIBS@ \
Index: configure
---- configure.orig 2004-10-21 04:50:23.000000000 +0200
-+++ configure 2004-10-23 11:44:44.242378655 +0200
-@@ -15298,6 +15298,9 @@
+--- configure.orig 2006-07-17 22:01:53 +0200
++++ configure 2006-07-18 08:31:26 +0200
+@@ -27814,6 +27814,9 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcrypto $LIBS"
@@ -74,49 +31,94 @@
/* confdefs.h. */
_ACEOF
Index: epan/dissectors/Makefile.in
---- epan/dissectors/Makefile.in.orig 2005-12-27 20:26:59 +0100
-+++ epan/dissectors/Makefile.in 2006-01-26 10:09:21 +0100
-@@ -2389,12 +2389,12 @@
- # All subsequent arguments are the files to scan.
+--- 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 @@
#
- register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
$(srcdir)/make-reg-dotc.py
+ register.c: $(plugin_src) $(DISSECTOR_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) $(srcdir)/make-reg-dotc.py $(srcdir) $(DISSECTOR_SRC)
; \
+ $(PYTHON) $(top_srcdir)/tools/make-dissector-reg.py $(srcdir) \
+ dissectors $(DISSECTOR_SRC) ; \
else \
echo Making register.c with shell script ; \
-- $(srcdir)/make-reg-dotc register.c $(srcdir) \
-+ $(SHELL) $(srcdir)/make-reg-dotc register.c $(srcdir) \
- $(plugin_src) $(DISSECTOR_SRC) ; \
+- $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
++ $(SHELL) $(top_srcdir)/tools/make-dissector-reg $(srcdir) \
+ dissectors $(plugin_src) $(DISSECTOR_SRC) ; \
fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-
------------------------------------------------------------------------------
-
-Work around a GCC bug that prevents Ethereal from
-linking when compiled with optimizations above -O. See
-http://www.ethereal.com/lists/ethereal-dev/200505/msg00069.html for more
-details.
-
-Index: epan/dissectors/packet-diameter.c
---- epan/dissectors/packet-diameter.c.orig 2005-05-02 23:28:44 +0200
-+++ epan/dissectors/packet-diameter.c 2005-05-15 19:35:12 +0200
-@@ -2022,13 +2022,13 @@
- { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
- "", HFILL }},
- { &hf_diameter_flags_request,
-- { "Request", "diameter.flags.request", FT_BOOLEAN, 8,
TFS(&flags_set_truth), DIAM_FLAGS_R,
-+ { "Request ", "diameter.flags.request", FT_BOOLEAN, 8,
TFS(&flags_set_truth), DIAM_FLAGS_R,
- "", HFILL }},
- { &hf_diameter_flags_proxyable,
-- { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8,
TFS(&flags_set_truth), DIAM_FLAGS_P,
-+ { "Proxyable ", "diameter.flags.proxyable", FT_BOOLEAN, 8,
TFS(&flags_set_truth), DIAM_FLAGS_P,
- "", HFILL }},
- { &hf_diameter_flags_error,
-- { "Error","diameter.flags.error", FT_BOOLEAN, 8,
TFS(&flags_set_truth), DIAM_FLAGS_E,
-+ { "Error ","diameter.flags.error", FT_BOOLEAN, 8,
TFS(&flags_set_truth), DIAM_FLAGS_E,
- "", HFILL }},
- { &hf_diameter_flags_T,
- { "T(Potentially re-transmitted message)","diameter.flags.T",
FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T,
-
+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
+@@ -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-07-17 22:01:22 +0200
++++ gtk/Makefile.in 2006-07-18 08:31:26 +0200
+@@ -1025,7 +1025,7 @@
+ done
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(LIBRARIES) $(HEADERS)
++all-am: $(LIBRARIES) $(HEADERS)
+ installdirs:
+ 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
+@@ -34,10 +34,7 @@
+
+ #include <string.h>
+ #include <ctype.h>
+-
+-#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+-#endif
+
+ #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.1 -r1.2 wireshark.spec
--- openpkg-src/wireshark/wireshark.spec 27 Jun 2006 15:24:26 -0000
1.1
+++ openpkg-src/wireshark/wireshark.spec 31 Jul 2006 07:28:57 -0000
1.2
@@ -32,8 +32,8 @@
Class: EVAL
Group: Network
License: GPL
-Version: 0.99.1pre1
-Release: 20060627
+Version: 0.99.2
+Release: 20060731
# package options
%option with_zlib yes
@@ -43,14 +43,16 @@
%option with_ssl yes
# list of sources
-Source0:
http://www.wireshark.org/download/prerelease/wireshark-%{version}.tar.gz
+Source0:
http://www.wireshark.org/download/src/wireshark-%{version}.tar.gz
Patch0: wireshark.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, glib2, gtk2, libpcap, gcc, make,
perl, sed
-PreReq: OpenPKG, openpkg >= 20040130, glib2, gtk2, libpcap
+BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make, perl, sed
+PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: glib2, gtk2, libpcap, gcrypt
+PreReq: glib2, gtk2, libpcap, gcrypt
%if "%{with_zlib}" == "yes"
BuildPreReq: zlib
PreReq: zlib
@@ -85,7 +87,7 @@
%track
prog wireshark = {
version = %{version}
- url = http://www.wireshark.org/download/
+ url = http://www.wireshark.org/download/src/
regex = wireshark-(__VER__)\.tar\.(bz2|gz)
}
@@ -115,6 +117,7 @@
--with-glib-prefix=%{l_prefix} \
--with-gtk-prefix=%{l_prefix} \
--with-pcap=%{l_prefix} \
+ --with-libgcrypt-prefix=%{l_prefix} \
%if "%{with_zlib}" == "yes"
--with-zlib=%{l_prefix} \
%else
@@ -150,6 +153,7 @@
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+ ln $RPM_BUILD_ROOT%{l_prefix}/bin/wireshark
$RPM_BUILD_ROOT%{l_prefix}/bin/ethereal
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
