[patch] Adds a patch to make evolution work with gpg and smartcard to the evolution-data-server ebuild.

portage-add-gpg-smartcard-support-to-evolution-data-server.patch (text/plain), 7.36 KB, created by Sebastian Noack on 2006-08-12 08:10:01 UTC

diff -Naur portage/gnome-extra/evolution-data-server/evolution-data-server-1.6.2.ebuild portage.new/gnome-extra/evolution-data-server/evolution-data-server-1.6.2.ebuild
--- portage/gnome-extra/evolution-data-server/evolution-data-server-1.6.2.ebuild	2006-07-17 20:05:56.000000000 +0200
+++ portage.new/gnome-extra/evolution-data-server/evolution-data-server-1.6.2.ebuild	2006-08-12 16:50:39.000000000 +0200
@@ -74,6 +74,9 @@
 	# Resolve symbols at execution time for setgid binaries
 	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
 
+	# Makes gpg with smartcard work.
+	epatch "${FILESDIR}"/${PN}-gpg-smartcard.patch
+
 	sed -n -e '/GNOME_COMPILE_WARNINGS/,/dnl IT_PROG_INTLTOOL/p' \
 		aclocal.m4 > gnome.m4
 	export WANT_AUTOMAKE=1.9
diff -Naur portage/gnome-extra/evolution-data-server/files/evolution-data-server-gpg-smartcard.patch portage.new/gnome-extra/evolution-data-server/files/evolution-data-server-gpg-smartcard.patch
--- portage/gnome-extra/evolution-data-server/files/evolution-data-server-gpg-smartcard.patch	1970-01-01 01:00:00.000000000 +0100
+++ portage.new/gnome-extra/evolution-data-server/files/evolution-data-server-gpg-smartcard.patch	2006-08-12 16:50:06.000000000 +0200
@@ -0,0 +1,64 @@
+--- evolution-data-server-1.6.2.orig/camel/camel-gpg-context.c	2005-09-02 16:37:43.000000000 +0200
++++ evolution-data-server-1.6.2/camel/camel-gpg-context.c	2006-04-29 10:58:19.580018429 +0200
+@@ -775,6 +775,20 @@
+ 		
+ 		g_free (gpg->need_id);
+ 		gpg->need_id = userid;
++	} else if (!strncmp (status, "NEED_PASSPHRASE_PIN ", 20)) {
++		char *userid;
++		
++		status += 20;
++		
++		status = next_token (status, &userid);
++		if (!userid) {
++			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
++					     _("Failed to parse gpg passphrase request."));
++			return -1;
++		}
++		
++		g_free (gpg->need_id);
++		gpg->need_id = userid;
+ 	} else if (!strncmp (status, "GET_HIDDEN passphrase.enter", 27)) {
+ 		char *prompt, *passwd;
+ 		const char *name;
+@@ -809,6 +823,40 @@
+ 		g_free (passwd);
+ 		
+ 		gpg->send_passwd = TRUE;
++	} else if (!strncmp (status, "GET_HIDDEN passphrase.pin.ask", 29)) {
++		char *prompt, *passwd;
++		const char *name;
++		
++		name = g_hash_table_lookup (gpg->userid_hint, gpg->need_id);
++		if (!name)
++			name = gpg->need_id;
++		
++		prompt = g_strdup_printf (_("You need a PIN to unlock the key on\n"
++					    "SmartCard: \"%s\""), name);
++		
++		if ((passwd = camel_session_get_password (gpg->session, NULL, NULL, prompt,  gpg->need_id, CAMEL_SESSION_PASSWORD_SECRET, ex)) && !gpg->utf8) {
++			char *opasswd = passwd;
++			
++			if ((passwd = g_locale_to_utf8 (passwd, -1, &nread, &nwritten, NULL))) {
++				memset (opasswd, 0, strlen (opasswd));
++				g_free (opasswd);
++			} else {
++				passwd = opasswd;
++			}
++		}
++		g_free (prompt);
++		
++		if (passwd == NULL) {
++			if (!camel_exception_is_set (ex))
++				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled."));
++			return -1;
++		}
++		
++		gpg->passwd = g_strdup_printf ("%s\n", passwd);
++		memset (passwd, 0, strlen (passwd));
++		g_free (passwd);
++		
++		gpg->send_passwd = TRUE;
+ 	} else if (!strncmp (status, "GOOD_PASSPHRASE", 15)) {
+ 		gpg->bad_passwds = 0;
+ 	} else if (!strncmp (status, "BAD_PASSPHRASE", 14)) {
diff -Naur portage/gnome-extra/evolution-data-server/Manifest portage.new/gnome-extra/evolution-data-server/Manifest
--- portage/gnome-extra/evolution-data-server/Manifest	2006-07-23 05:36:10.000000000 +0200
+++ portage.new/gnome-extra/evolution-data-server/Manifest	2006-08-12 16:51:12.000000000 +0200
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX evolution-data-server-1.2.0-gentoo_etc_services.patch 815 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 SHA1 9248c74b334534f74e027fc119509673bff4542f SHA256 a64e0e4d74ac91f69c4b7a011b6325e27af6fa28a58e20f48ff09ec2a1538c5a
 MD5 ab9f8a22a7b870a6e1e2edc463949c82 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
 RMD160 d48ad5a34bfdf9f814b9ae22ba188f2f0c7f0304 files/evolution-data-server-1.2.0-gentoo_etc_services.patch 815
@@ -13,6 +10,10 @@
 MD5 e60b90d23a97fbaabc6d4d3467dc47b2 files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699
 RMD160 e0db9849069760d48f19c896c84b86a7dca8f2f1 files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699
 SHA256 84a915393a2a92f93a721a8cbbd3756184e1317d760a0c9b922daace75430135 files/evolution-data-server-1.4.2.1-calandar-crash-fix.patch 699
+AUX evolution-data-server-gpg-smartcard.patch 1993 RMD160 6f45d797b363628b64f7a5831f9979f2aedfa069 SHA1 78eda1fd404f0e27d7302d4d8307d329028f0966 SHA256 7e709036a65ccb67fbd5510c376dce986c9d196f4058722dcecf8dd32cb29d16
+MD5 e2d7e42316798bfd16d030bbabb7d16a files/evolution-data-server-gpg-smartcard.patch 1993
+RMD160 6f45d797b363628b64f7a5831f9979f2aedfa069 files/evolution-data-server-gpg-smartcard.patch 1993
+SHA256 7e709036a65ccb67fbd5510c376dce986c9d196f4058722dcecf8dd32cb29d16 files/evolution-data-server-gpg-smartcard.patch 1993
 AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403
 MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c files/evolution-data-server-no_lazy_bindings.patch 551
@@ -23,10 +24,10 @@
 MD5 2c90350bf792be97cf0ad162c22e46bb evolution-data-server-1.4.2.1.ebuild 2824
 RMD160 24cffa6fd8007028cf503d493de4e79d422be724 evolution-data-server-1.4.2.1.ebuild 2824
 SHA256 d6be2e82c5762f399c87eba775d7372d03f5bcb580a01db9571adef7573547b3 evolution-data-server-1.4.2.1.ebuild 2824
-EBUILD evolution-data-server-1.6.2.ebuild 2713 RMD160 e446662526c8f5d219e37fd0a950fca22308a06f SHA1 a6dac816f13bb0448321a7348863234e4074e7c3 SHA256 411f58ebd0407ec7b95ebfb4fb0c60194280cceb09a284b56964647771291576
-MD5 aebb08e87e2be816b2e628a9d3857264 evolution-data-server-1.6.2.ebuild 2713
-RMD160 e446662526c8f5d219e37fd0a950fca22308a06f evolution-data-server-1.6.2.ebuild 2713
-SHA256 411f58ebd0407ec7b95ebfb4fb0c60194280cceb09a284b56964647771291576 evolution-data-server-1.6.2.ebuild 2713
+EBUILD evolution-data-server-1.6.2.ebuild 2796 RMD160 0482e4f566735cc24559167764131709dfcb8253 SHA1 dcfab0f03ada85d58a198a4603feb62183d0e716 SHA256 f4a3afe356a59ac347bdf7fc96c9d4bbf037af2250614834765763664048e7b8
+MD5 8efadca7ce547cf13aa9fdc7944d7bc3 evolution-data-server-1.6.2.ebuild 2796
+RMD160 0482e4f566735cc24559167764131709dfcb8253 evolution-data-server-1.6.2.ebuild 2796
+SHA256 f4a3afe356a59ac347bdf7fc96c9d4bbf037af2250614834765763664048e7b8 evolution-data-server-1.6.2.ebuild 2796
 MISC ChangeLog 13002 RMD160 6a2f39a4145ccc0f053ac91997f70e6a58639889 SHA1 605a0c1883f62afc0fd30ca5b00ea2abe3e23feb SHA256 f9c5fad92608810cf6511b8f7dcfd2ec92f47c39c825af0746065655380d42a1
 MD5 2cdeee9de66ae49b8327052566b3fda0 ChangeLog 13002
 RMD160 6a2f39a4145ccc0f053ac91997f70e6a58639889 ChangeLog 13002
@@ -41,10 +42,3 @@
 MD5 7fd74c11700c9860da2318b520a983f8 files/digest-evolution-data-server-1.6.2 289
 RMD160 4d8c1fc955f215beddbbc5b95ac3a0c81f8912fa files/digest-evolution-data-server-1.6.2 289
 SHA256 c474de3fb11f9641e62deea95bc409b7d208389cf6deca8c15c08a39a0c70d14 files/digest-evolution-data-server-1.6.2 289
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEwusuomPajV0RnrERAntMAJ9pdfdnpugMsIzdFbMb4dWjHv/y2QCfedeu
-m9pPLM+aoTJKXoSztcaB/4s=
-=JTzN
------END PGP SIGNATURE-----