rpms/wireshark/F-12 wireshark-1.2.4-disable_warning_dialog.patch, NONE, 1.1 wireshark-1.2.4-enable_lua.patch, NONE, 1.1 wireshark-1.2.4-filter_null.patch, NONE, 1.1 wireshark.spec, 1.60, 1.61

[Radek Vokál]

Author: rvokal

Update of /cvs/extras/rpms/wireshark/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25601

Modified Files:
	wireshark.spec 
Added Files:
	wireshark-1.2.4-disable_warning_dialog.patch 
	wireshark-1.2.4-enable_lua.patch 
	wireshark-1.2.4-filter_null.patch 
Log Message:
upgrade to 1.2.5, add -devel support and Lua support

wireshark-1.2.4-disable_warning_dialog.patch:
 main.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE wireshark-1.2.4-disable_warning_dialog.patch ---
diff -up wireshark-1.2.4/gtk/main.c.dialog wireshark-1.2.4/gtk/main.c
--- wireshark-1.2.4/gtk/main.c.dialog	2009-11-16 21:30:43.000000000 +0100
+++ wireshark-1.2.4/gtk/main.c	2009-12-16 10:53:52.000000000 +0100
@@ -1227,11 +1227,12 @@ set_display_filename(capture_file *cf)
 
 GtkWidget           *close_dlg = NULL;
 
-static void
+/*static void
 priv_warning_dialog_cb(gpointer dialog, gint btn _U_, gpointer data _U_)
 {
     recent.privs_warn_if_elevated = !simple_dialog_check_get(dialog);
 }
+*/
 
 #ifdef _WIN32
 static void
@@ -2559,7 +2560,7 @@ main(int argc, char *argv[])
   main_load_window_geometry(top_level);
 
   /* Tell the user not to run as root. */
-  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
+/*  if (running_with_special_privs() && recent.privs_warn_if_elevated) {
     cur_user = get_cur_username();
     cur_group = get_cur_groupname();
     priv_warning_dialog = simple_dialog(ESD_TYPE_WARN, ESD_BTN_OK,
@@ -2570,6 +2571,7 @@ main(int argc, char *argv[])
     simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
     simple_dialog_set_cb(priv_warning_dialog, priv_warning_dialog_cb, NULL);
   }
+*/
 
 #ifdef _WIN32
   /* Warn the user if npf.sys isn't loaded. */

wireshark-1.2.4-enable_lua.patch:
 template-init.lua |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE wireshark-1.2.4-enable_lua.patch ---
diff -up wireshark-1.2.4/epan/wslua/template-init.lua.enable_lua wireshark-1.2.4/epan/wslua/template-init.lua
--- wireshark-1.2.4/epan/wslua/template-init.lua.enable_lua	2009-11-16 21:30:58.000000000 +0100
+++ wireshark-1.2.4/epan/wslua/template-init.lua	2009-12-15 09:33:59.000000000 +0100
@@ -26,7 +26,7 @@
 -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 -- Lua is disabled by default, comment out the following line to enable Lua support.
-disable_lua = true; do return end;
+-- disable_lua = true; do return end;
 
 
 -- If set and we are running with special privileges this setting
@@ -39,7 +39,7 @@ if running_superuser then
     local disabled_lib = {}
     setmetatable(disabled_lib,{ __index = function() error("this package has been disabled") end } );
 
-    dofile = function() error("dofile has been disabled") end
+--    dofile = function() error("dofile has been disabled") end
     loadfile = function() error("loadfile has been disabled") end
     loadlib = function() error("loadlib has been disabled") end
     require = function() error("require has been disabled") end

wireshark-1.2.4-filter_null.patch:
 filter_autocomplete.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE wireshark-1.2.4-filter_null.patch ---
diff -up wireshark-1.2.4/gtk/filter_autocomplete.c.bckp wireshark-1.2.4/gtk/filter_autocomplete.c
--- wireshark-1.2.4/gtk/filter_autocomplete.c.bckp	2009-11-16 21:30:43.000000000 +0100
+++ wireshark-1.2.4/gtk/filter_autocomplete.c	2009-12-14 15:51:18.000000000 +0100
@@ -776,7 +776,9 @@ filter_autocomplete_handle_backspace(Gtk
   GtkRequisition requisition;
   size_t prefix_len;
   gboolean protocols_only = FALSE;
-
+  
+  if (prefix == NULL) return;
+  
   /* Delete the last character in the prefix string */
   prefix_len = strlen(prefix)-1;
   prefix[prefix_len] = '\0';


Index: wireshark.spec
===================================================================
RCS file: /cvs/extras/rpms/wireshark/F-12/wireshark.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- wireshark.spec	30 Nov 2009 13:38:57 -0000	1.60
+++ wireshark.spec	18 Dec 2009 10:38:24 -0000	1.61
@@ -2,6 +2,7 @@
 #define to 0 for final version
 %define svn_version 0
 %define with_adns 0
+%define with_lua 1
 %if 0%{?rhel} != 0
 %define with_portaudio 0
 %else
@@ -10,7 +11,7 @@
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
-Version:	1.2.4
+Version:	1.2.5
 Release: 	1%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
@@ -26,6 +27,9 @@ Patch1:		wireshark-1.0.2-pie.patch
 Patch2:		wireshark-nfsv4-opts.patch
 Patch3:		wireshark-0.99.7-path.patch
 Patch4:		wireshark-1.1.2-nfs41-backchnl-decode.patch
+Patch5:		wireshark-1.2.4-filter_null.patch
+Patch6:		wireshark-1.2.4-enable_lua.patch
+Patch7:		wireshark-1.2.4-disable_warning_dialog.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +50,9 @@ BuildRequires:	adns-devel
 %if %{with_portaudio}
 BuildRequires: portaudio-devel
 %endif
-
+%if %{with_lua}
+BuildRequires:	lua-devel
+%endif
 Obsoletes:	ethereal
 Provides:	ethereal
 
@@ -68,6 +74,11 @@ Requires:	portaudio
 Obsoletes:	ethereal-gnome
 Provides:	ethereal-gnome
 
+%package devel
+Summary:        Development headers and libraries for wireshark
+Group:		Development/Libraries
+Requires:       %{name} = %{version} glibc-devel glib2-devel
+
 
 %description
 Wireshark is a network traffic analyzer for Unix-ish operating systems.
@@ -80,6 +91,11 @@ separately to GTK+ package.
 %description gnome
 Contains wireshark for Gnome 2 and desktop integration file
 
+%description devel
+The wireshark-devel package contains the header files, developer
+documentation, and libraries required for development of wireshark scripts
+and plugins.
+
 
 %prep
 %if %{svn_version}
@@ -91,6 +107,13 @@ Contains wireshark for Gnome 2 and deskt
 %patch2 -p1 
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+%if %{with_lua}
+%patch6 -p1 -b .enable_lua
+%endif
+
+%patch7 -p1 -b .dialog
 
 %build
 %ifarch s390 s390x sparcv9 sparc64
@@ -117,9 +140,14 @@ export LDFLAGS="$LDFLAGS -lm -lcrypto"
 %else
    --with-adns=no \
 %endif
+%if %{with_lua}
+   --with-lua \
+%else
+   --with-lua=no \
+%endif
    --with-ssl \
    --disable-warnings-as-errors \
-   --with-plugindir=%{_libdir}/%{name}/plugins/%{version}
+   --with-plugindir=%{_libdir}/%{name}/plugins/%{version} 
 time make %{?_smp_mflags}
 
 %install
@@ -133,9 +161,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 #symlink tshark to tethereal
 ln -s tshark $RPM_BUILD_ROOT%{_sbindir}/tethereal
 
-#empty?!
-rm -f $RPM_BUILD_ROOT%{_sbindir}/idl2wrs
-
 # install support files for usermode, gnome and kde
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark
@@ -160,6 +185,56 @@ desktop-file-install --vendor fedora    
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 image/wsicon48.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/wireshark.png
 
+#install devel files
+install -d -m 0755  $RPM_BUILD_ROOT/%{_includedir}/wireshark
+IDIR="${RPM_BUILD_ROOT}%{_includedir}/wireshark"
+mkdir -p "${IDIR}/epan"
+mkdir -p "${IDIR}/epan/ftypes"
+mkdir -p "${IDIR}/epan/dfilter"
+mkdir -p "${IDIR}/wiretap"
+install -m 644 color.h			"${IDIR}/"
+install -m 644 epan/packet.h		"${IDIR}/epan/"
+install -m 644 epan/prefs.h		"${IDIR}/epan/"
+install -m 644 epan/proto.h		"${IDIR}/epan/"
+install -m 644 epan/tvbuff.h		"${IDIR}/epan/"
+install -m 644 epan/pint.h		"${IDIR}/epan/"
+install -m 644 epan/to_str.h		"${IDIR}/epan/"
+install -m 644 epan/value_string.h	"${IDIR}/epan/"
+install -m 644 epan/column_info.h	"${IDIR}/epan/"
+install -m 644 epan/frame_data.h	"${IDIR}/epan/"
+install -m 644 epan/packet_info.h	"${IDIR}/epan/"
+install -m 644 epan/column-utils.h	"${IDIR}/epan/"
+install -m 644 epan/epan.h		"${IDIR}/epan/"
+install -m 644 epan/range.h		"${IDIR}/epan/"
+install -m 644 epan/gnuc_format_check.h	"${IDIR}/epan/"
+install -m 644 epan/ipv4.h		"${IDIR}/epan"
+install -m 644 epan/nstime.h		"${IDIR}/epan/"
+install -m 644 epan/ipv6-utils.h	"${IDIR}/epan/"
+install -m 644 epan/guid-utils.h	"${IDIR}/epan/"
+install -m 644 epan/exceptions.h	"${IDIR}/epan/"
+install -m 644 epan/address.h		"${IDIR}/epan/"
+install -m 644 epan/slab.h		"${IDIR}/epan/"
+install -m 644 epan/except.h		"${IDIR}/epan/"
+install -m 644 epan/ftypes/ftypes.h	"${IDIR}/epan/ftypes/"
+install -m 644 epan/dfilter/dfilter.h	"${IDIR}/epan/dfilter/"
+install -m 644 epan/dfilter/drange.h	"${IDIR}/epan/dfilter/"
+install -m 644 wiretap/wtap.h		"${IDIR}/wiretap/"
+
+#	Create pkg-config control file.
+mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig"
+cat > "${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/wireshark.pc" <<- "EOF"
+	prefix=%{_prefix}
+	exec_prefix=%{_prefix}
+	libdir=%{_libdir}
+	includedir=%{_includedir}
+
+	Name:		%{name}
+	Description:	Network Traffic Analyzer
+	Version:	%{version}
+	Requires:	glib-2.0
+	Libs:		-L${libdir} -lwireshark -lwiretap
+	Cflags:		-DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -I${includedir}/wireshark -I${includedir}/wireshark/epan
+EOF
 
 # Remove .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/%{version}/*.la
@@ -189,17 +264,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/tethereal
 %{_sbindir}/rawshark
 %{python_sitelib}/*
-%{_libdir}/lib*
+%{_libdir}/lib*.so.*
+%{_libdir}/wireshark/plugins
 %{_mandir}/man1/editcap.*
 %{_mandir}/man1/tshark.*
-%{_mandir}/man1/idl2wrs.*
 %{_mandir}/man1/mergecap.*
 %{_mandir}/man1/text2pcap.*
 %{_mandir}/man1/capinfos.*
 %{_mandir}/man1/dumpcap.*
 %{_mandir}/man4/wireshark-filter.*
 %{_mandir}/man1/rawshark.*
-%{_libdir}/wireshark
+#%{_libdir}/wireshark
 %config(noreplace) %{_sysconfdir}/pam.d/wireshark
 %config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
 %{_datadir}/wireshark
@@ -212,12 +287,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/wireshark
 %{_mandir}/man1/wireshark.*
 
+%files devel
+%defattr(-,root,root)
+%doc doc/README.*
+%{_includedir}/wireshark
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_mandir}/man1/idl2wrs.*
+%{_sbindir}/idl2wrs
+%if %{with_lua}
+%config(noreplace) %{_datadir}/wireshark/init.lua
+%endif
 
 %changelog
-* Mon Nov 30 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-1
+* Fri Dec 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.5-1
+- upgrade to 1.2.5
+- fixes security vulnaribilities, see http://www.wireshark.org/security/wnpa-sec-2009-09.html 
+- split -devel package (#547899, #203642, #218451)
+- removing root warning dialog (#543709)
+- enable lua support - http://wiki.wireshark.org/Lua
+- attempt to fix filter crash on 64bits
+
+* Wed Nov 18 2009 Radek Vokal <rvokal at redhat.com> - 1.2.4-1
 - upgrade to 1.2.4
 - http://www.wireshark.org/docs/relnotes/wireshark-1.2.4.html
 
+* Fri Oct 30 2009 Radek Vokal <rvokal at redhat.com> - 1.2.3-1
+- upgrade to 1.2.3
+- http://www.wireshark.org/docs/relnotes/wireshark-1.2.3.html
+
 * Mon Sep 21 2009 Radek Vokal <rvokal at redhat.com> - 1.2.2-1
 - upgrade to 1.2.2
 - http://www.wireshark.org/docs/relnotes/wireshark-1.2.2.html