# ChangeLog for x11-plugins/enigmail
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.190 2010/07/11 12:53:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.191 2010/07/14 22:22:05 anarchy Exp $
+
+*enigmail-1.1.2-r1 (14 Jul 2010)
+
+ 14 Jul 2010; <anarchy@gentoo.org> +files/75_enigmai-js-fixup.patch,
+ -enigmail-1.1.ebuild, -enigmail-1.1.1.ebuild, -enigmail-1.1.2.ebuild,
+ +enigmail-1.1.2-r1.ebuild:
+ Fix bug #327099, issue connecting to gpg-agent for some
11 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org> enigmail-1.1.2.ebuild,
+files/thunderbird-xul-1.9.2-arm-fixes.patch:
AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
+AUX 75_enigmai-js-fixup.patch 1260 RMD160 b89620f3495a286c1e5636b0c65b423d3a158944 SHA1 033b817e08acd35c9d4e943b24f07d9191900912 SHA256 66e3e9ddce9d191ce1417e364757f1d35873f031abd94c817e069249d18a3dd3
AUX thunderbird-xul-1.9.2-arm-fixes.patch 603 RMD160 952db59f2c3d526b04323fec830cf04c28dfb84d SHA1 b1e2f12c0b204bf2c6434303c0638750dcb1b73d SHA256 19d230805cb5d62a99fef32dfc373661dcc3361bf8d1f6077854120a5e9a9821
DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
-DIST enigmail-1.1.1.tar.gz 1280598 RMD160 ea8daa4715957e59c5d39e3ced3a29edf61a15dd SHA1 1310e2569e65a384eea1605653cca6562a941129 SHA256 8e67c45f52ab858f78f6d13c00f312b6d4db97eeae4963aeba1f7cad8648824c
DIST enigmail-1.1.2.tar.gz 1280923 RMD160 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 SHA1 d29fce2b20a36d210b12c28fcbbee965007c95aa SHA256 dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
-DIST enigmail-1.1.tar.gz 1278216 RMD160 d9dc3a0f131516bb0b3aad4c3c69eea8eff23724 SHA1 4d0d13913092dfd3f2600040d53d4d13edf4e555 SHA256 6a2daf57571bf698cfa49b0722149ed45dc4580f6a9dccb3896d9928643b14ed
DIST mozilla-thunderbird-3.0-patches-0.3.tar.bz2 3241 RMD160 bc3b163b9c5bd7c7fb497786b2dc2da4e0a4bd28 SHA1 0182b73d48cd21204504f3bb8e17f0d9a7289464 SHA256 a430c71a12fe63662d43b4eeb5b185841a4788cbbbbd7178a3c73056ba94c5cd
DIST mozilla-thunderbird-3.1-patches-0.1.tar.bz2 2451 RMD160 31b5126836b4fb6b5e62f4d1772fab2e4111320e SHA1 b86c3e93edc632801f3e331884404332b458d7b1 SHA256 79c6a48cdcf322226e39c0d8b5136506d6fb9c939c7ce531ac7f5c6ad3588d28
DIST thunderbird-3.0.4.source.tar.bz2 61094371 RMD160 ed8c905e3a6061c0ff896857fda3d96146bbc6a8 SHA1 5a6e89096da61a520e5cecb61f8afeb981f90412 SHA256 fdf28d6a9ea42c98557554ba28d0a3a8db11475eee49f16aa4a3aaf2ca1f1343
DIST thunderbird-3.1.source.tar.bz2 65633518 RMD160 bc55cf89dfe1f2c946fff8f5ec21b0377229afe7 SHA1 89e9d8099a5437ce401577fc4d526eb0dd9e51da SHA256 494090fd47944c15e3906847931d7efe77ec0e05f56dbae3a8c36d0a48616a86
-DIST thunderbird-3.1rc2.source.tar.bz2 65626643 RMD160 e5112079166ad1b38f08a761587dc9d398efae88 SHA1 49bd4be60cfa584c12ec1f188b0aa9ff54112929 SHA256 02adf7b3b2c8e5db750cf94b6e518693b8ac1c2ea438dc6eaa976e37a38ede5d
EBUILD enigmail-1.0.1-r3.ebuild 4108 RMD160 8706883241129e832b007eb466322083f3eef350 SHA1 cd04496787dd88196e12b289b5193759b4581015 SHA256 3202a5485200e9fa86adbbcabfdda1c08274a723a1243b7a92d62ee566c29550
-EBUILD enigmail-1.1.1.ebuild 4123 RMD160 48dd9c27216ca015b3c1c593a342e5ff7e2c58de SHA1 61cc16337859a64e8eb16411804282247368b967 SHA256 48db033a86ebb337ceece298b8c813af0050c048e9997d7ef857c365497d49ba
-EBUILD enigmail-1.1.2.ebuild 4210 RMD160 94c06b21b91e88958b71f0bb5cd223ee4b36b16a SHA1 dade3fcc0b8c818d38421932857416ba2233d931 SHA256 1a3ef2bd1194197940b63a09d4ace49f08d96b847eb607b49eb960fd0eeda6cb
-EBUILD enigmail-1.1.ebuild 4124 RMD160 35b6c98f46e4592d7e1880f47425e885a1a864e7 SHA1 df0d5b118b31b7b9d0472d22e16b5ce16a021eb4 SHA256 778d03960494b17498301611eb6e32afd4101e5c1c810481d24ac66a58a6d230
-MISC ChangeLog 26320 RMD160 ec3a571338c73b73e6b9b60bddf34422d7d70e22 SHA1 26d110f81e164270df8112f1dd2f0fd1a0b89c3a SHA256 8a98b56415f8b48d818d6579eabc9beea2c7f8de6cf8cf59dfd840d64376bb2f
+EBUILD enigmail-1.1.2-r1.ebuild 4260 RMD160 96b950267733c5daa3067e4b6630b6fe3c8744ec SHA1 141e045f05fdc1efd5e260ca0f714d22fddba797 SHA256 a8b8c262ec54143842d6cf1daddfb2b545e3eba5a29e037a8c995116b6ccfb66
+MISC ChangeLog 26583 RMD160 26e0058eac79f30d8e35eafcad925fe4af8156b3 SHA1 5b2b5232e2596010f8d7926d494d6430b0445a42 SHA256 834d43076b6ca0a8bcff92d5d0fa1bfa1d928ec03114f5ec7de7492e6e0bf33c
MISC metadata.xml 442 RMD160 a82cb8621928aa2ddb0dc98514764c8f105393ae SHA1 f86b5de607060bfdaab09b902f7a33379b6afceb SHA256 50b3622a408b9c241a2c6139b0eb6d1dc6bec95aa420aa60fe6eebeac36be4dd
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.1.ebuild,v 1.1 2010/06/26 14:44:05 anarchy Exp $
-
-WANT_AUTOCONF="2.1"
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
-MY_P="${P/_beta/b}"
-EMVER="${PV}"
-TBVER="3.1"
-PATCH="mozilla-thunderbird-3.1-patches-0.1"
-
-DESCRIPTION="GnuPG encryption plugin for thunderbird."
-HOMEPAGE="http://enigmail.mozdev.org"
-REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}.source.tar.bz2
- http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz
- http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2"
-IUSE="system-sqlite"
-
-DEPEND=">=mail-client/thunderbird-3.1_beta1[system-sqlite=]"
-RDEPEND="${DEPEND}
- system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
- || (
- (
- >=app-crypt/gnupg-2.0
- || (
- app-crypt/pinentry[gtk]
- app-crypt/pinentry[qt4]
- )
- )
- =app-crypt/gnupg-1.4*
- )"
-
-S="${WORKDIR}"/comm-1.9.2
-
-pkg_setup() {
- # EAPI=2 ensures they are set properly.
- export BUILD_OFFICIAL=1
- export MOZILLA_OFFICIAL=1
- export MOZ_CO_PROJECT=mail
-}
-
-src_unpack() {
- unpack thunderbird-${TBVER}.source.tar.bz2 ${PATCH}.tar.bz2 || die "unpack failed"
-}
-
-src_prepare(){
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- cd mozilla
- eautoreconf
- cd js/src
- eautoreconf
-
- # Unpack the enigmail plugin
- cd "${S}"/mailnews/extensions || die
- unpack enigmail-${EMVER}.tar.gz
- cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
- makemake2
-
- cd "${S}"
-
- # Fix installation of enigmail.js
- epatch "${FILESDIR}"/70_enigmail-fix.patch
-
- eautoreconf
-}
-
-src_configure() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- touch mail/config/mozconfig
- mozconfig_init
- mozconfig_config
-
- # tb-specific settings
- mozconfig_annotate '' \
- --with-system-nspr \
- --with-system-nss \
- --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
- --with-user-appdir=.thunderbird \
- --enable-application=mail \
- --disable-necko-wifi \
- --disable-libnotify
-
- mozconfig_use_enable system-sqlite
-
- # Finalize and report settings
- mozconfig_final
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build Thunderbird
- #
- ####################################
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- econf || die
-
- # This removes extraneous CFLAGS from the Makefiles to reduce RAM
- # requirements while compiling
- edit_makefiles
-}
-
-src_compile() {
- # Only build the parts necessary to support building enigmail
- emake -j1 export || die "make export failed"
- emake -C mozilla/modules/libreg || die "make modules/libreg failed"
- emake -C mozilla/xpcom/string || die "make xpcom/string failed"
- emake -C mozilla/xpcom || die "make xpcom failed"
- emake -C mozilla/xpcom/obsolete || die "make xpcom/obsolete failed"
-
- # Build the enigmail plugin
- einfo "Building Enigmail plugin..."
- emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-
- # Package the enigmail plugin; this may be the easiest way to collect the
- # necessary files
- emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
- declare emid
-
- cd "${T}"
- unzip "${S}"/mozilla/dist/bin/*.xpi install.rdf
- emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
- cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
- unzip "${S}"/mozilla/dist/bin/*.xpi
-}
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2.ebuild,v 1.2 2010/07/11 12:53:08 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2-r1.ebuild,v 1.1 2010/07/14 22:22:05 anarchy Exp $
WANT_AUTOCONF="2.1"
EAPI="2"
# Fix installation of enigmail.js
epatch "${FILESDIR}"/70_enigmail-fix.patch
+ epatch "${FILESDIR}"/75_enigmai-js-fixup.patch
eautoreconf
}
+++ /dev/null
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.ebuild,v 1.2 2010/06/21 15:16:54 anarchy Exp $
-
-WANT_AUTOCONF="2.1"
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib mozextension autotools
-MY_P="${P/_beta/b}"
-EMVER="${PV}"
-TBVER="3.1rc2"
-PATCH="mozilla-thunderbird-3.1-patches-0.1"
-
-DESCRIPTION="GnuPG encryption plugin for thunderbird."
-HOMEPAGE="http://enigmail.mozdev.org"
-REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/nightly/"
-SRC_URI="http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/${TBVER}/source/thunderbird-${TBVER}.source.tar.bz2
- http://www.mozilla-enigmail.org/download/source/${PN}-${EMVER}.tar.gz
- http://dev.gentoo.org/~anarchy/dist/${PATCH}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2"
-IUSE="system-sqlite"
-
-DEPEND=">=mail-client/thunderbird-3.1_beta1[system-sqlite=]"
-RDEPEND="${DEPEND}
- system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] )
- || (
- (
- >=app-crypt/gnupg-2.0
- || (
- app-crypt/pinentry[gtk]
- app-crypt/pinentry[qt4]
- )
- )
- =app-crypt/gnupg-1.4*
- )"
-
-S="${WORKDIR}"/comm-1.9.2
-
-pkg_setup() {
- # EAPI=2 ensures they are set properly.
- export BUILD_OFFICIAL=1
- export MOZILLA_OFFICIAL=1
- export MOZ_CO_PROJECT=mail
-}
-
-src_unpack() {
- unpack thunderbird-${TBVER}.source.tar.bz2 ${PATCH}.tar.bz2 || die "unpack failed"
-}
-
-src_prepare(){
- # Apply our patches
- EPATCH_SUFFIX="patch" \
- EPATCH_FORCE="yes" \
- epatch "${WORKDIR}"
-
- cd mozilla
- eautoreconf
- cd js/src
- eautoreconf
-
- # Unpack the enigmail plugin
- cd "${S}"/mailnews/extensions || die
- unpack enigmail-${EMVER}.tar.gz
- cd "${S}"/mailnews/extensions/enigmail || die "cd failed"
- makemake2
-
- cd "${S}"
-
- # Fix installation of enigmail.js
- epatch "${FILESDIR}"/70_enigmail-fix.patch
-
- eautoreconf
-}
-
-src_configure() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
-
- ####################################
- #
- # mozconfig, CFLAGS and CXXFLAGS setup
- #
- ####################################
-
- touch mail/config/mozconfig
- mozconfig_init
- mozconfig_config
-
- # tb-specific settings
- mozconfig_annotate '' \
- --with-system-nspr \
- --with-system-nss \
- --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
- --with-user-appdir=.thunderbird \
- --enable-application=mail \
- --disable-necko-wifi \
- --disable-libnotify
-
- mozconfig_use_enable system-sqlite
-
- # Finalize and report settings
- mozconfig_final
-
- # Disable no-print-directory
- MAKEOPTS=${MAKEOPTS/--no-print-directory/}
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- append-cxxflags -fno-stack-protector
- fi
-
- ####################################
- #
- # Configure and build Thunderbird
- #
- ####################################
- CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
- econf || die
-
- # This removes extraneous CFLAGS from the Makefiles to reduce RAM
- # requirements while compiling
- edit_makefiles
-}
-
-src_compile() {
- # Only build the parts necessary to support building enigmail
- emake -j1 export || die "make export failed"
- emake -C mozilla/modules/libreg || die "make modules/libreg failed"
- emake -C mozilla/xpcom/string || die "make xpcom/string failed"
- emake -C mozilla/xpcom || die "make xpcom failed"
- emake -C mozilla/xpcom/obsolete || die "make xpcom/obsolete failed"
-
- # Build the enigmail plugin
- einfo "Building Enigmail plugin..."
- emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed"
-
- # Package the enigmail plugin; this may be the easiest way to collect the
- # necessary files
- emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make xpi failed"
-}
-
-src_install() {
- declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/mozilla-thunderbird"
- declare emid
-
- cd "${T}"
- unzip "${S}"/mozilla/dist/bin/*.xpi install.rdf
- emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
-
- dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
- cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid}
- unzip "${S}"/mozilla/dist/bin/*.xpi
-}
--- /dev/null
+--- mailnews/extensions/enigmail/package/enigmail.js 2010-06-26 19:51:30.000000000 +0200
++++ mailnews/extensions/enigmail/package/enigmail.js 2010-07-10 17:34:46.000000000 +0200
+@@ -1231,7 +1231,10 @@ function () {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
++ try {
++ extensionLoc.permissions=0755;
++ }
++ catch(ex) {}
+ agentProcess = Components.classes[NS_PROCESS_UTIL_CONTRACTID].createInstance(Components.interfaces.nsIProcess);
+ agentProcess.init(extensionLoc);
+ agentProcess.run(true, [ "stop", this.gpgAgentProcess ], 2);
+@@ -1758,7 +1761,10 @@ function (domWindow) {
+ .getInstallLocation(ENIGMAIL_EXTENSION_ID);
+ var extensionLoc = installLoc.getItemFile(ENIGMAIL_EXTENSION_ID, "wrappers");
+ extensionLoc.append("gpg-agent-wrapper.sh");
+- extensionLoc.permissions=0755;
++ try {
++ extensionLoc.permissions=0755;
++ }
++ catch(ex) {}
+ args.unshift(command.path);
+ args.unshift("start");
+ command = extensionLoc;
+
projects / gentoo.git / commitdiff