[stardict] turn off netdict by default again

[Jens Petersen]

commit 61bcc410f0218904449981b8486a1d765b4d53ee
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jun 17 10:11:08 2011 +0900

    turn off netdict by default again
    
    stardict-3.0.1-20.security.patch now called stardict-default-netdict-off.patch

 stardict-default-netdict-off.patch |   26 ++++++++++++++++++++++++++
 stardict.spec                      |    9 +++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/stardict-default-netdict-off.patch b/stardict-default-netdict-off.patch
new file mode 100644
index 0000000..726d54f
--- /dev/null
+++ b/stardict-default-netdict-off.patch
@@ -0,0 +1,26 @@
+diff -up stardict-3.0.2/src/conf.cpp~ stardict-3.0.2/src/conf.cpp
+--- stardict-3.0.2/src/conf.cpp~	2010-12-22 00:42:37.000000000 +0900
++++ stardict-3.0.2/src/conf.cpp	2011-06-17 09:52:45.000000000 +0900
+@@ -103,7 +103,7 @@ AppConf::AppConf() :
+ 	add_entry("/apps/stardict/preferences/dictionary/use_custom_font", false);
+ #endif
+ #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.2/src/prefsdlg.cpp~ stardict-3.0.2/src/prefsdlg.cpp
+--- stardict-3.0.2/src/prefsdlg.cpp~	2011-01-07 03:59:38.000000000 +0900
++++ stardict-3.0.2/src/prefsdlg.cpp	2011-06-17 09:54:53.000000000 +0900
+@@ -1113,6 +1113,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 plaintext 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);
+ }
+ 
+ #if defined(_WIN32) || defined(CONFIG_GNOME)
diff --git a/stardict.spec b/stardict.spec
index ae4ddd2..f85e6ba 100644
--- a/stardict.spec
+++ b/stardict.spec
@@ -1,12 +1,13 @@
 Name:		stardict
 Summary:        A powerful dictionary platform written in GTK+2
 Version:        3.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Applications/System
 License:        GPLv3
 URL:            http://stardict.sourceforge.net
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        defaultdict.cfg
+Patch5:         stardict-default-netdict-off.patch
 Patch6:         stardict-3.0.1-gcc46.patch
 
 BuildRequires: GConf2
@@ -33,7 +34,8 @@ scan selection, and fuzzy matching.
 
 %prep
 %setup -q
-%patch6 -p1 -b .7.gcc46ct
+%patch5 -p1 -b .orig
+%patch6 -p1 -b .orig
 
 # Remove unneeded sigc++ header files to make it sure
 # that we are using system-wide libsigc++
@@ -90,6 +92,9 @@ rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 
 
 %changelog
+* Fri Jun 17 2011 Jens Petersen <petersen at redhat.com> - 3.0.2-2
+- turn off netdict by default again
+
 * Thu Jun 16 2011 Jens Petersen <petersen at redhat.com> - 3.0.2-1
 - update to 3.0.2
 - remove obsoleted patches