rpms/stardict/F-12 stardict-3.0.1-20.security.patch, NONE, 1.1 stardict.spec, 1.67, 1.68

[cchance]

Author: cchance

Update of /cvs/pkgs/rpms/stardict/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7213

Modified Files:
	stardict.spec 
Added Files:
	stardict-3.0.1-20.security.patch 
Log Message:
* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
- Disable netdict by default and add warnings for such option.


stardict-3.0.1-20.security.patch:
 conf.cpp     |    2 +-
 prefsdlg.cpp |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE stardict-3.0.1-20.security.patch ---
diff -up stardict-3.0.1/src/conf.cpp.orig stardict-3.0.1/src/conf.cpp
--- stardict-3.0.1/src/conf.cpp.orig	2009-12-27 03:34:19.643362105 +1000
+++ stardict-3.0.1/src/conf.cpp	2009-12-27 03:34:35.408307165 +1000
@@ -52,7 +52,7 @@ AppConf::AppConf() : 
 #else
 	add_entry("/apps/stardict/preferences/dictionary/use_custom_font", false);
 #endif
-	add_entry("/apps/stardict/preferences/network/enable_netdict", true);
+	add_entry("/apps/stardict/preferences/network/enable_netdict", false);
 	// Default stardictd server.
 	add_entry("/apps/stardict/preferences/network/server", std::string(_("dict.stardict.org")));
 	add_entry("/apps/stardict/preferences/network/port", 2628);
diff -up stardict-3.0.1/src/prefsdlg.cpp.orig stardict-3.0.1/src/prefsdlg.cpp
--- stardict-3.0.1/src/prefsdlg.cpp.orig	2009-12-27 03:35:32.412305578 +1000
+++ stardict-3.0.1/src/prefsdlg.cpp	2009-12-27 03:36:47.272583142 +1000
@@ -1037,6 +1037,10 @@ void PrefsDlg::setup_network_netdict()
     GtkWidget *hbox1 = gtk_hbox_new(FALSE, 6);
     gtk_box_pack_start(GTK_BOX(hbox1),button,false,false,0);
     gtk_box_pack_start(GTK_BOX(vbox1),hbox1,false,false,0);
+
+    label = gtk_label_new(_("Warning: Requests to remote StarDict server are sent over the network in an unencrypted form. Do not enable this if you are translating sensitive documents."));
+    gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
+    gtk_box_pack_start(GTK_BOX(vbox1),label,false,false,0);
 }
 
 void PrefsDlg::on_setup_mainwin_searchWhileTyping_ckbutton_toggled(GtkToggleButton *button, PrefsDlg *oPrefsDlg)


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/F-12/stardict.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- stardict.spec	17 Dec 2009 06:25:34 -0000	1.67
+++ stardict.spec	26 Dec 2009 18:30:27 -0000	1.68
@@ -4,7 +4,7 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	19%{?dist}
+Release:	20%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
@@ -14,20 +14,19 @@ Patch0:		stardict-3.0.1.gcc43.patch
 Patch1:		transparent_trayicon.patch
 Patch2:		stardict-3.0.1-10.gucharmap.patch
 Patch3:		stardict-3.0.1-13.bz441209.patch
-# Filed into upstream bugtracker at:
-# https://sourceforge.net/tracker/?func=detail&aid=2780881&group_id=80679&atid=560632
 Patch4:		stardict-3.0.1.gcc44.patch
+Patch5:         stardict-3.0.1-20.security.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
-#Requires: festival, speech-tools
+Requires: enchant, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
+#Requires: festival, speech-tools, espeak
 Requires(preun): GConf2
 Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
 BuildRequires: autoconf, automake, libtool
-BuildRequires: desktop-file-utils, enchant-devel, espeak-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
-#BuildRequires: festival-devel, speech-tools-devel
+BuildRequires: desktop-file-utils, enchant-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
+#BuildRequires: festival-devel, speech-tools-devel, espeak-devel
 
 %description
 StarDict is a Cross-Platform and international dictionary written in Gtk2.
@@ -41,6 +40,7 @@ It has powerful features such as "Glob-s
 %patch2 -p1 -b .3-gucharmap
 %patch3 -p1 -b .4-bz441209
 %patch4 -b .5-gcc44
+%patch5 -p1 -b .5-netdict
 
 # Remove unneeded sigc++ header files to make it sure
 # that we are using system-wide libsigc++
@@ -107,6 +107,9 @@ if which scrollkeeper-update>/dev/null 2
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-20
+- Disable netdict by default and add warnings for such option.
+
 * Thu Dec 17 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-19
 - Resolves: rhbz#475904: Disabled espeak for instance as espeak has problems when it is built with pulseaudio.