rpms/sylpheed/devel sylpheed-2.3.1-pgpmime-signed-compose.patch, NONE, 1.1 sylpheed.spec, 1.47, 1.48

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27024

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-2.3.1-pgpmime-signed-compose.patch 
Log Message:
* Sun May 13 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3.1-3
- Patch PGP/MIME signed message compose, so it doesn't strip off
  whitespace of the "-- " body signature delimiter. It's upstream
  preference that it still does that for ISO 2022 JP to be compatible
  with a few broken MUAs that have problems with QP encoding.
- Remove .desktop categories "Application" and "X-Fedora".


sylpheed-2.3.1-pgpmime-signed-compose.patch:

--- NEW FILE sylpheed-2.3.1-pgpmime-signed-compose.patch ---
diff -Nur sylpheed-2.3.1-orig/src/compose.c sylpheed-2.3.1/src/compose.c
--- sylpheed-2.3.1-orig/src/compose.c	2007-01-12 07:14:57.000000000 +0100
+++ sylpheed-2.3.1/src/compose.c	2007-05-14 19:09:49.000000000 +0200
@@ -3037,19 +3037,20 @@
 	buf = canon_buf;
 
 #if USE_GPGME
-	/* chomp all trailing spaces */
 	if (rfc2015_is_available() && !is_draft &&
 	    compose->use_signing && !compose->account->clearsign) {
-		gchar *tmp;
-		tmp = strchomp_all(buf);
-		g_free(buf);
-		buf = tmp;
-#if 0
-		if (encoding == ENC_7BIT)
+        if ( out_charset == CS_ISO_2022_JP ) {
+            encoding = ENC_7BIT;
+            gchar *tmp;
+            /* This breaks '-- ' sig delimiters, though. */
+            tmp = strchomp_all(buf);
+            g_free(buf);
+            buf = tmp;
+        }
+        else if (encoding == ENC_7BIT)
 			encoding = ENC_QUOTED_PRINTABLE;
 		else if (encoding == ENC_8BIT)
 			encoding = ENC_BASE64;
-#endif
 	}
 
 	if (rfc2015_is_available() && !is_draft &&


Index: sylpheed.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sylpheed.spec	21 Apr 2007 08:28:42 -0000	1.47
+++ sylpheed.spec	15 May 2007 07:21:04 -0000	1.48
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -25,6 +25,7 @@
 Patch3: sylpheed-2.3.1-certsdir.patch
 Patch4: sylpheed-2.2.5-prefs_common.patch
 Patch5: sylpheed-2.3.1-apop-cve-2007-1558.patch
+Patch6: sylpheed-2.3.1-pgpmime-signed-compose.patch
 
 %description
 This program is an X based fast email client which has features
@@ -48,6 +49,7 @@
 %patch3 -p1 -b .certsdir
 %patch4 -p1 -b .prefs_common
 %patch5 -p1 -b .apop
+%patch6 -p1 -b .pgpmime-signed-compose
 
 %build
 %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -65,9 +67,8 @@
 install -m 644 sylpheed-64x64.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/sylpheed.png
 desktop-file-install --vendor %{desktopvendor} \
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	--add-category Application \
+	--remove-category Application \
 	--add-category Network \
-	--add-category X-Fedora \
 	sylpheed.desktop
 install -d $RPM_BUILD_ROOT%{_mandir}/man1/
 install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -88,6 +89,13 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun May 13 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3.1-3
+- Patch PGP/MIME signed message compose, so it doesn't strip off
+  whitespace of the "-- " body signature delimiter. It's upstream
+  preference that it still does that for ISO 2022 JP to be compatible
+  with a few broken MUAs that have problems with QP encoding.
+- Remove .desktop categories "Application" and "X-Fedora".
+
 * Sat Apr 21 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3.1-2
 - Patch APOP vulnerability (CVE-2007-1558) as in 2.4.0.
 - Patch default directory for SSL/TLS certificates.