OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Jun-2006 17:24:27
Branch: HEAD Handle: 2006062716242600
Added files:
openpkg-src/wireshark wireshark.patch wireshark.spec
Log:
new package: wireshark 0.99.1pre1 (Graphical Realtime Network Protocol
Analyzer)
Summary:
Revision Changes Path
1.1 +103 -0 openpkg-src/wireshark/wireshark.patch
1.1 +159 -0 openpkg-src/wireshark/wireshark.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wireshark/wireshark.patch
============================================================================
$ cvs diff -u -r0 -r1.1 wireshark.patch
--- /dev/null 2006-06-27 17:24:07 +0200
+++ wireshark.patch 2006-06-27 17:24:26 +0200
@@ -0,0 +1,103 @@
+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: configure
+--- configure.orig 2004-10-21 04:50:23.000000000 +0200
++++ configure 2004-10-23 11:44:44.242378655 +0200
+@@ -15298,6 +15298,9 @@
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcrypto $LIBS"
++case "$host_os" in
++ solaris* ) LIBS="$LIBS -lsocket -lnsl" ;;
++esac
+ cat >conftest.$ac_ext <<_ACEOF
+ /* 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.
+ #
+ register.c: $(plugin_src) $(DISSECTOR_SRC) $(srcdir)/make-reg-dotc
$(srcdir)/make-reg-dotc.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)
; \
+ 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) ; \
+ 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,
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wireshark/wireshark.spec
============================================================================
$ cvs diff -u -r0 -r1.1 wireshark.spec
--- /dev/null 2006-06-27 17:24:07 +0200
+++ wireshark.spec 2006-06-27 17:24:26 +0200
@@ -0,0 +1,159 @@
+##
+## wireshark.spec -- OpenPKG RPM Package Specification
+## Copyright (c) 2000-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2000-2006 Ralf S. Engelschall <http://engelschall.com/>
+##
+## Permission to use, copy, modify, and distribute this software for
+## any purpose with or without fee is hereby granted, provided that
+## the above copyright notice and this permission notice appear in all
+## copies.
+##
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+## IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+## SUCH DAMAGE.
+##
+
+# package information
+Name: wireshark
+Summary: Graphical Realtime Network Protocol Analyzer
+URL: http://www.wireshark.org/
+Vendor: Gerald Combs
+Packager: OpenPKG
+Distribution: OpenPKG
+Class: EVAL
+Group: Network
+License: GPL
+Version: 0.99.1pre1
+Release: 20060627
+
+# package options
+%option with_zlib yes
+%option with_adns yes
+%option with_pcre yes
+%option with_snmp yes
+%option with_ssl yes
+
+# list of sources
+Source0:
http://www.wireshark.org/download/prerelease/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
+%if "%{with_zlib}" == "yes"
+BuildPreReq: zlib
+PreReq: zlib
+%endif
+%if "%{with_ssl}" == "yes"
+BuildPreReq: openssl
+PreReq: openssl
+%endif
+%if "%{with_snmp}" == "yes"
+BuildPreReq: snmp
+PreReq: snmp
+%endif
+%if "%{with_adns}" == "yes"
+BuildPreReq: adns
+PreReq: adns
+%endif
+%if "%{with_pcre}" == "yes"
+BuildPreReq: pcre
+PreReq: pcre
+%endif
+AutoReq: no
+AutoReqProv: no
+
+%description
+ Wireshark is a free network protocol analyzer for Unix and Windows.
+ It allows you to examine data from a live network or from a capture
+ file on disk. You can interactively browse the capture data, viewing
+ summary and detail information for each packet. Wireshark has several
+ powerful features, including a rich display filter language and the
+ ability to view the reconstructed stream of a TCP session.
+
+%track
+ prog wireshark = {
+ version = %{version}
+ url = http://www.wireshark.org/download/
+ regex = wireshark-(__VER__)\.tar\.(bz2|gz)
+ }
+
+%prep
+ %setup -q
+ %patch -p0
+ %{l_shtool} subst \
+ -e 's;-Wl,-static *;;g' \
+ -e 's;-all-static *;;g' \
+ -e 's;-static *;;g' \
+ Makefile.in
+ %{l_shtool} subst \
+ -e 's;\([, ]\)encrypt;\1myencrypt;g' \
+ epan/radius_dict.c
+
+%build
+ CC="%{l_cc}" \
+ CFLAGS="%{l_cflags -O}" \
+ CPPFLAGS="%{l_cppflags}" \
+ LDFLAGS="%{l_ldflags}" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --sysconfdir=%{l_prefix}/etc/wireshark \
+ --with-plugins=%{l_prefix}/libexec/wireshark \
+ --enable-wireshark \
+ --enable-gtk2 \
+ --with-glib-prefix=%{l_prefix} \
+ --with-gtk-prefix=%{l_prefix} \
+ --with-pcap=%{l_prefix} \
+%if "%{with_zlib}" == "yes"
+ --with-zlib=%{l_prefix} \
+%else
+ --without-zlib \
+%endif
+%if "%{with_ssl}" == "yes"
+ --with-ssl=%{l_prefix} \
+%else
+ --without-ssl \
+%endif
+%if "%{with_snmp}" == "yes"
+ --with-net-snmp=%{l_prefix}/bin/net-snmp-config \
+%else
+ --without-net-snmp \
+%endif
+%if "%{with_adns}" == "yes"
+ --with-adns=%{l_prefix} \
+%else
+ --without-adns \
+%endif
+%if "%{with_pcre}" == "yes"
+ --with-pcre=%{l_prefix} \
+%else
+ --without-pcre \
+%endif
+ --without-krb5 \
+ --disable-shared \
+ --enable-static \
+ --disable-ipv6
+ %{l_make} %{l_mflags}
+
+%install
+ 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
+ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+
+%files -f files
+
+%clean
+ rm -rf $RPM_BUILD_ROOT
+
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
