--- enigmail-0.95.7.orig/debian/50enigmail-extension.txt +++ enigmail-0.95.7/debian/50enigmail-extension.txt @@ -0,0 +1 @@ +extension,{847b3a00-7ab1-11d4-8f02-006008948af5} --- enigmail-0.95.7.orig/debian/changelog +++ enigmail-0.95.7/debian/changelog @@ -0,0 +1,411 @@ +enigmail (2:0.95.7-1ubuntu2) jaunty; urgency=low + + * no changes upload for nss/nspr SONAME mini-transition + + -- Alexander Sack Mon, 12 Jan 2009 16:21:47 +0100 + +enigmail (2:0.95.7-1ubuntu1) jaunty; urgency=low + + Merge from debian experimental; changes: + * flip order of icedove-dev/thunderbird-dev build-depends + - update debian/control + + -- Alexander Sack Tue, 2 Dec 2008 13:10:00 +0100 + +enigmail (2:0.95.7-1) experimental; urgency=low + + * Maintainer upload :-P + * upgrade to latest and greatest enigmail 0.95.7 + - adjust debian/rules + * new enigmail needs intl headers; update configure helper + - update debian/configure.sh.THUNDERBIRD_2_0_0_0_RELEASE + + -- Alexander Sack Tue, 2 Dec 2008 13:10:00 +0100 + +enigmail (2:0.95.0+1-4) unstable; urgency=low + + * fix enigmail use-agent behaviour for gpg < 2.0 (Closes: #506631) + - add debian/patches/81_dont_use_agent_before_gpg_2.dpatch + - update debian/patches/00list.thunderbird + + -- Alexander Sack Tue, 2 Dec 2008 13:00:00 +0100 + +enigmail (2:0.95.0+1-3.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix preinst to make sure the upgrade from old version actually works. + (Closes: #486491, #468954) + * Add missing #DEBHELPER# token to preinst. + + -- Torsten Werner Sun, 12 Oct 2008 13:28:24 +0200 + +enigmail (2:0.95.0+1-3.1) unstable; urgency=low + + * Non-maintainer upload to fix a long-standing RC bug in Debian. + * Added 80_no_pragma_pushed_visibility.dpatch from Ubuntu to fix + a FTBFS with gcc-4.2. (Closes: #379260) + + -- Philipp Kern Mon, 18 Feb 2008 17:24:25 +0100 + +enigmail (2:0.95.0+1-3) unstable; urgency=low + + * make buildds happy by using icedove-dev as the primary + build-depend; keep thunderbird-dev as second. + + -- Alexander Sack Fri, 1 Jun 2006 23:53:12 +0200 + +enigmail (2:0.95.0+1-2) unstable; urgency=low + + * install enigmail-en-US.jar in right folder + + -- Alexander Sack Sun, 20 May 2006 19:30:09 +0200 + +enigmail (2:0.95.0+1-1) unstable; urgency=low + + * debianizing enigmail package, by installing to independent place + usr/lib/enigmail/extension and linking from suitable places + (e.g. usr/lib/icedove|thunderbird/extensions/ID + * drop transitional mozilla-thunderbird-enigmail package for debian + * remove old enigmail source tarball from orig.tar.gz + + -- Alexander Sack Sun, 20 May 2006 18:11:12 +0200 + +enigmail (2:0.95.0-0ubuntu3) gutsy; urgency=low + + * debian/control[.in] fix missing conflicts and replaces for + mozilla-thunderbird-enigmail -> enigmail transition + + -- Alexander Sack Tue, 15 May 2006 10:59:00 +0200 + +enigmail (2:0.95.0-0ubuntu2) gutsy; urgency=low + + * try to fix ftbfs on i386 by passing --disable-elf-dynstr-gc to + configure in case we have thunderbird 2.0. + + -- Alexander Sack Fri, 4 May 2006 12:42:00 +0200 + +enigmail (2:0.95.0-0ubuntu1) gutsy; urgency=low + + * new upstream release 0.95 + * update mozsdk to build against TBIRD 2.0.0.0 + * cleanup most obvious package cruft + * drop IPC code left-over from ancient times + * drop 80_enigmail-no-auto-check-trustdb (included upstream) + * update 50_enigmail_no_upgrade to not ship upgrade overlay + + -- Alexander Sack Fri, 4 May 2006 10:01:10 +0200 + +enigmail (2:0.94.3-0ubuntu1) feisty; urgency=low + + * new upstream release 0.94.2: + * Fix for security issue CVE-2006-5877 aka + http://bugzilla.mozdev.org/show_bug.cgi?id=9730: crash on access + to already freed memory. + * debian/patches/80_enigmail-no-auto-check-trustdb.dpatch: adapted + patch to new upstream code base + + -- Alexander Sack Tue, 13 Feb 2006 12:07:00 +0100 + +enigmail (2:0.94-0ubuntu5) edgy; urgency=low + + * debian/control: Make thunderbird dependencies less tight, so that this + package does not require an update for each thunderbird microversion + update. These generally do not break the ABI; if some update happens to do + that, we can still add a conflict/breaks to earlier enigmail versions to it. + + -- Martin Pitt Fri, 28 Jul 2006 14:51:28 +0200 + +enigmail (2:0.94-0ubuntu4.1) dapper-security; urgency=low + + * debian/control: Bump dependencies for Thunderbird 1.5.0.4. + + -- Martin Pitt Mon, 12 Jun 2006 16:39:24 +0200 + +enigmail (2:0.94-0ubuntu4) dapper; urgency=low + + * Rebuild mozilla-thunderbird-enigmail for mozilla-thunderbird 1.5.0.2 + * Stop shipping /tmp (ick) and /var/lib/mozilla-thunderbird/chrome.d + * Remove all references to obsolete update-mozilla-thunderbird-chrome + + -- Adam Conrad Thu, 18 May 2006 20:46:18 +1000 + +enigmail (2:0.94-0ubuntu3) dapper; urgency=low + + * Add 80_enigmail-no-auto-check-trustdb.dpatch that, well, makes sure + it passes --no-auto-check-trustdb to gpg invocations. + + -- Scott James Remnant Thu, 6 Apr 2006 05:37:52 +0100 + +enigmail (2:0.94-0ubuntu2) dapper; urgency=low + + * Add 10_visibility_hidden_patch.dpatch, stealing a fix from thunderbird + for the ppc/amd64 build failure triggered by wrapping system includes. + + -- Adam Conrad Wed, 15 Feb 2006 18:15:37 +1100 + +enigmail (2:0.94-0ubuntu1) dapper; urgency=low + + * Fork package to allow mozilla 1.7 to be demoted to universe. This + package now only builds the enigmail extension for mozilla-thunderbird. + * Bump debhelper compat to 4, so single-package builds behave the same + as multipackage biulds (thus minimising our diff against the original). + * Bump upstream version to 0.94, for working Thunderbird 1.5 support. + + -- Adam Conrad Wed, 15 Feb 2006 15:44:02 +1100 + +enigmail (2:0.93-1) unstable; urgency=high + + * new upstream version, fixes security issue in etch/sid + * build for mozilla 1.7.12 + (Closes: 334139) + + -- Alexander Sack Sun, 16 Oct 2005 15:00:00 +0100 + +enigmail (2:0.92.1-0ubuntu05.10) breezy-security; urgency=low + + * SECURITY UPDATE: incorrect key selection, causing information disclosure + * Update to 0.92.1, whose only change from 0.92.0 is to fix a bug where the + key selection dialog can incorrectly select a key with a user ID that does + not have additional information, which allows parties with that key to + decrypt the message. This has been assigned CVE-2005-3256 by mitre.org. + + -- Adam Conrad Thu, 20 Oct 2005 21:34:43 +1000 + +enigmail (2:0.92-4) unstable; urgency=low + + * respin for mozilla 1.7.11 and mozilla-thunderbird 1.0.7 + (Closes: 331207) + + -- Alexander Sack Oct, 2 Jul 2005 21:30:00 +0100 + +enigmail (2:0.92-3) unstable; urgency=low + + * respin for mozilla 1.7.10 (Closes: 321147) + + -- Alexander Sack Aug, 3 Jul 2005 23:55:00 +0100 + +enigmail (2:0.92-2) unstable; urgency=low + + * removed stupid amd64 gcc-3.4 dependency + + -- Alexander Sack Aug, 1 Jul 2005 15:00:00 +0100 + +enigmail (2:0.92-1ubuntu5) breezy; urgency=low + + * Update control and rules for Thunderbird 1.0.7 (no other changes) + + -- Adam Conrad Tue, 11 Oct 2005 03:34:59 +1000 + +enigmail (2:0.92-1ubuntu4) breezy; urgency=low + + * Make enigmail buildable and installable with mozilla 1.7.12, using + the same SDK tarball as the mozilla-mailnews 1.7.10 build. + + -- Stephan Hermann Mon, 26 Sep 2005 09:18:18 +0200 + +enigmail (2:0.92-1ubuntu3) breezy; urgency=low + + * Make enigmail buildable and installable with mozilla 1.7.11, using + the same SDK tarball as the mozilla-mailnews 1.7.10 build. + + -- Adam Conrad Sat, 13 Aug 2005 16:39:54 +1000 + +enigmail (2:0.92-1ubuntu2) breezy; urgency=low + + * Stop using gcc-3.4 for amd64, now that gcc-4.0 is the default compiler. + + -- Adam Conrad Mon, 1 Aug 2005 12:20:42 +1000 + +enigmail (2:0.92-1ubuntu1) breezy; urgency=low + + * Update debian/control to allow building and installation with mozilla + 1.7.10 and add debian/configure.sh.MOZILLA_1_7_10_RELEASE for the same. + + -- Adam Conrad Mon, 1 Aug 2005 10:34:26 +1000 + +enigmail (2:0.92-1) unstable; urgency=low + + * new upstream release + * gcc-4.0 transition + * no control.in patching for default build procedure anymore. + moved patching from clean target to ./debian/rules update_control + * updated sdk.mozdev releases to THUNDERBIRD_1_0_6 and + MOZILLA_RELEASE_1_7_8 + * prepared MOZILLA_RELEASE_1_7_10 + + -- Alexander Sack Thu, 21 Jul 2005 23:59:59 +0100 + +enigmail (2:0.91-4) unstable; urgency=high + + * urgency high to rush into sarge. Just a respin for new + mozilla version ... looks safe to go into testing. + + -- Alexander Sack Sun, 22 May 2005 22:00:00 +0100 + +enigmail (2:0.91-3) unstable; urgency=low + + * new upstream release enigmail 0.91. Respin for mozilla 1.7.7 + * upload to unstable. + * introduce debian/control.in file to ease maintenance due + to version upgrades + + -- Alexander Sack Mon, 18 Apr 2005 20:30:00 +0100 + +enigmail (2:0.91-2) unstable; urgency=low + + * new upstream release enigmail 0.91. Respin for mozilla 1.7.6 + + -- Alexander Sack Mon, 11 Apr 2005 23:30:00 +0100 + +enigmail (2:0.91-1) unstable; urgency=low + + * new upstream release enigmail 0.91 + + -- Alexander Sack Mon, 11 Apr 2005 22:00:00 +0100 + +enigmail (2:0.90.2-1) unstable; urgency=low + + * new upstream release enigmail 0.90.2 - plain + bugfixes and support for thunderbird 1.0.2 + * builds for mozilla-mailnews 1.7.6 (Closes: 301975,302084) + + -- Alexander Sack Tue, 29 Mar 2005 21:00:00 +0100 + +enigmail (2:0.90.1-1) unstable; urgency=low + + * new upstream release enigmail 0.90.1 + + -- Alexander Sack Sat, 12 Feb 2005 23:00:00 +0100 + +enigmail (2:0.90.0-1) unstable; urgency=low + + * new upstream release enigmail 0.90.0 + * upload to unstable + * build for mozilla 1.7.5 (Closes: 290726) + + -- Alexander Sack Sun, 16 Jan 2005 12:00:00 +0100 + +enigmail (2:0.89.5.experimental-1) experimental; urgency=low + + * new upstream release uses ipc 1.1.2 and enigmail 0.89.5 + * upstream fix: no logging on the terminal anymore + (Closes: 246736) + * fixed amd64 build problems. Setting gcc to 3.4 + (Closes: 283887) + * removed irrelevant parts from README.Debian (See: 273818) + + -- Alexander Sack Tue, 7 Dec 2004 22:00:00 +0100 + +enigmail (2:0.89.0.experimental-1) experimental; urgency=low + + * mailnews uses ipc 1.1.1 and enigmail 0.89.0 now + * hopefully will go to unstable at some point closing + really old ITP (Closes: 138190, 216928) + + -- Alexander Sack Mon, 22 Nov 2004 12:00:00 +0100 + +enigmail (2:0.89.0-2) unstable; urgency=medium + + * important small bug fix: fix old extension site + contents.rdf, that disable enigmail in thunderbird + (Closes: 286261) + * backported: fixed amd64 build problems. Setting gcc to 3.4 + (Closes: 283887) + * backported: + removed irrelevant parts from README.Debian (See: 273818) + + -- Alexander Sack Sun, 19 Dec 2004 10:00:00 +0100 + +enigmail (2:0.89.0-1) unstable; urgency=low + + * new upstream release + + -- Alexander Sack Mon, 08 Nov 2004 10:00:00 +0100 + +enigmail (2:0.86.1.debian1-1) unstable; urgency=low + + * respin for new mozilla version in testing + + -- Alexander Sack Mon, 18 Oct 2004 20:00:00 +0100 + +enigmail (2:0.86.1-0.testing.1) unstable; urgency=low + + * new upstream release for new thunderbird + + -- Alexander Sack Thu, 17 Sep 2004 20:00:00 +0100 + +enigmail (2:0.85.0.1-0.testing.1) unstable; urgency=low + + * respin for new thunderbird 0.7.3 + * includes new mozsdk for RELEASE_THUNDERBIRD_0_7_3 + + -- Alexander Sack Thu, 5 Aug 2004 20:00:00 +0100 + +enigmail (2:0.85.0-0.testing.2) unstable; urgency=low + + * fixed versioned dependency of mozilla-enigmail on + mozilla-mailnews to match current sid version + * removed accidentally applied patches for thunderbird + from the list of patches applied to the mailnews target. + Closes a (not yet posted) bug that displayed all mozilla + toolbar icons instead of the true decrypt button of enigmail + + -- Alexander Sack Thu, 29 Jul 2004 01:00:00 +0100 + +enigmail (2:0.85.0-0.testing.1) unstable; urgency=low + + * new upstream version - 0.85.0 + * produces binaries for thunderbird and mozilla-mailnews + (Closes: 138190, 216928) + * is sensible wether the distribution contains mozilla 1.6 or + 1.7.1 + * Fixed upstream: gpg boundaries are now displayed correctly in + news (Closes: 246734) + + -- Alexander Sack Mon, 26 Jul 2004 01:00:00 +0100 + +enigmail (2:0.84.2-1) unstable; urgency=low + + * new upstream release 0.84.2 + * added 50-enigmail-extension.txt and extension.part.enigmail + to extensions.d directory + + -- Alexander Sack Thu, 1 Jul 2004 15:15:00 +0100 + +enigmail (2:0.84.1-0.asac4) unstable; urgency=low + + * added 50-enigmail-extension.txt and extension.part.enigmail + to extensions.d directory + * removed upgrade menu item from enigmail menu, + because it is not applicable to debian packaged + extensions + enigmail is now its own package and therefore has + a new version scheme. hence this version is + 2:0.84.1-0.asac3 + + -- Alexander Sack Thu, 27 Jun 2004 15:15:00 +0100 + +mozilla-enigmail (0.84.1-0.asac1) unstable; urgency=low + + * new upstream release 0.84.1 packaged + + -- Alexander Sack Sun, 06 Jun 2004 16:01:20 +0100 + +mozilla-enigmail (0.84.0-0.asac1) unstable; urgency=low + + * new upstream release 0.84.0 packaged + + -- Alexander Sack Mon, 10 May 2004 01:13:20 +0100 + +mozilla-enigmail (0.83.6-0.asac2) unstable; urgency=low + + * added copyright file + * moved linked enigmail.js as config file to /etc/mozilla/enigmail.js + + -- Alexander Sack Tue, 13 Apr 2004 01:13:20 +0100 + +mozilla-enigmail (0.83.6-0.asac1) unstable; urgency=low + + * initial preview release of mozilla enigmail package + + -- Alexander Sack Tue, 13 Apr 2004 01:13:20 +0100 --- enigmail-0.95.7.orig/debian/control +++ enigmail-0.95.7/debian/control @@ -0,0 +1,21 @@ +Source: enigmail +Section: mail +Priority: optional +Maintainer: Ubuntu Mozilla Team +XSBC-Original-Maintainer: Alexander Sack +Build-Depends: debhelper (>> 4.0.0), coreutils, libidl-dev (>= 0.8.0 ), zlib1g-dev, docbook-to-man, zip, dpatch, m4, thunderbird-dev (>= 2.0.0.0) | icedove-dev (>= 2.0.0.0), autoconf2.13, sed, libnspr4-dev +Standards-Version: 3.6.1 + +Package: enigmail +Architecture: any +Depends: thunderbird | icedove | iceape-mailnews | seamonkey-mailnews, ${shlibs:Depends}, gnupg +Conflicts: thunderbird (<< 2.0.0.0~), thunderbird (>> 2.0.0.z999), icedove (<< 2.0.0.0~), icedove (>> 2.0.0.z999), iceape-mailnews (<< 1.1.1~), iceape-mailnews (>> 1.1.z999), seamonkey-mailnews (<< 1.1.1~), seamonkey-mailnews (>> 1.1.z999), mozilla-thunderbird-enigmail (<< 2:0.95.0~) +Replaces: mozilla-thunderbird-enigmail +Description: Enigmail - GPG support for Thunderbird + OpenPGP extension for Thunderbird. Enigmail allows users to access the + features provided by the popular GnuPG software from within Thunderbird. + . + Enigmail is capable of signing, authenticating, encrypting and decrypting + email. Additionally, it supports both the inline PGP format, as well as the + PGP/MIME format as described in RFC 3156. + --- enigmail-0.95.7.orig/debian/configure.sh +++ enigmail-0.95.7/debian/configure.sh @@ -0,0 +1,20 @@ +#/!bin/sh + +./configure \ + --disable-widget-hacking \ + -enable-glib2 \ + --with-default-mozilla-five-home=/usr/lib/mozilla \ + --with-system-nspr \ + --disable-ldap \ + --disable-debug \ + --enable-optimze \ + --enable-extensions=ipc,enigmail \ + --with-xpidltoolsdir=/usr/lib/mozilla/ \ + --with-idl-includes=/usr/share/idl/mozilla/ \ + --with-extra-includes=/usr/lib/mozilla/ \ + --with-extra-includes=/usr/include/mozilla/necko/,/usr/include/mozilla/mimetype/,/usr/include/mozilla/xpcom_obsolete,/usr/include/mozilla/caps/,/usr/include/mozilla/xpconnect,/usr/include/mozilla/js,/usr/include/mozilla/msgsmime/,/usr/include/mozilla/msgcompose,/usr/include/mozilla/msgbase/,/usr/include/mozilla/mailnews/,/usr/include/mozilla/msgdb/,/usr/include/mozilla/msgbaseutil,/usr/include/mozilla/mime/,/usr/include/mozilla/uconv,/usr/include/mozilla/dom,/usr/include/mozilla/pref,/usr/include/mozilla/uriloader \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --srcdir=. + --- enigmail-0.95.7.orig/debian/README.debian +++ enigmail-0.95.7/debian/README.debian @@ -0,0 +1,40 @@ +++++++++++++++++++++++++++++++++++++++ +Enigmail for Debian README +++++++++++++++++++++++++++++++++++++++ + +Installing +----------- +install enigmail using apt: + apt-get install mozilla-thunderbird-enigmail + + +Upgrading +---------- +Upgrading should be smooth since version 1.0. + +Nevertheless, if you have some problems that some +features of this package are missing or appear to +be not functional after upgrade, please try: + + 1. stop thunderbird + 2. remove XUL.mfasl, chrome.rdf and compreg.dat + from inside your profile directory + (e.g. /home/user/.mozilla-thunderbird/...) + + 3. start thunderbird + +News +------ +For latest news see my homepage listed below + - http://www.jwsdot.com/debian + +FAQ +----- +FAQ for the Debian Thunderbird is available at + - http://www.jwsdot.com/debian/faq.html + + + +Have fun + +Alexander Sack --- enigmail-0.95.7.orig/debian/extension.part.enigmail +++ enigmail-0.95.7/debian/extension.part.enigmail @@ -0,0 +1,16 @@ + + + + --- enigmail-0.95.7.orig/debian/compat +++ enigmail-0.95.7/debian/compat @@ -0,0 +1 @@ +4 --- enigmail-0.95.7.orig/debian/configure.sh.THUNDERBIRD_2_0_0_0_RELEASE +++ enigmail-0.95.7/debian/configure.sh.THUNDERBIRD_2_0_0_0_RELEASE @@ -0,0 +1,28 @@ +#/!bin/sh + +export IDL_INCLUDES="-I /usr/share/idl/${MOZ_APP_NAME}/" +export _EXTRA_INCLUDES="/usr/include/${MOZ_APP_NAME}/,/usr/include/${MOZ_APP_NAME}/xpcom/,/usr/include/${MOZ_APP_NAME}/necko/,/usr/include/${MOZ_APP_NAME}/mimetype/,/usr/include/${MOZ_APP_NAME}/xpcom_obsolete,/usr/include/${MOZ_APP_NAME}/caps/,/usr/include/${MOZ_APP_NAME}/xpconnect,/usr/include/${MOZ_APP_NAME}/js,/usr/include/${MOZ_APP_NAME}/msgsmime/,/usr/include/${MOZ_APP_NAME}/msgcompose,/usr/include/${MOZ_APP_NAME}/msgbase/,/usr/include/${MOZ_APP_NAME}/mailnews/,/usr/include/${MOZ_APP_NAME}/msgdb/,/usr/include/${MOZ_APP_NAME}/msgbaseutil,/usr/include/${MOZ_APP_NAME}/mime/,/usr/include/${MOZ_APP_NAME}/uconv,/usr/include/${MOZ_APP_NAME}/dom,/usr/include/${MOZ_APP_NAME}/pref,/usr/include/${MOZ_APP_NAME}/uriloader,/usr/include/${MOZ_APP_NAME}/string,/usr/include/${MOZ_APP_NAME}/intl" + +for _extradir in $(echo $_EXTRA_INCLUDES | tr ',' ' '); do + MOZILLA_EXTRA_INCLUDES="$MOZILLA_EXTRA_INCLUDES -I$_extradir" +done + +export MOZILLA_EXTRA_INCLUDES + +MOZILLA_SYSTEM_LDFLAGS=$(${MOZ_APP_NAME}-config --libs xpcom) ./configure \ + --disable-widget-hacking \ + --enable-glib2 \ + --disable-elf-dynstr-gc \ + --with-default-five-home=/usr/lib/${MOZ_APP_NAME} \ + --with-system-nspr \ + --with-system-nss \ + --disable-ldap \ + --disable-debug \ + --enable-optimze \ + --enable-extensions=enigmail \ + --with-xpidltoolsdir=/usr/lib/${MOZ_APP_NAME}/ \ + --with-idl-includes=/usr/share/idl/${MOZ_APP_NAME}/ \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --srcdir=. --- enigmail-0.95.7.orig/debian/allmakefiles.sh.0.94.0 +++ enigmail-0.95.7/debian/allmakefiles.sh.0.94.0 @@ -0,0 +1,97 @@ +#! /bin/sh +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# allmakefiles.sh - List of all makefiles. +# Appends the list of makefiles to the variable, MAKEFILES. +# There is no need to rerun autoconf after adding makefiles. +# You only need to run configure. +# +# Please keep the modules in this file in sync with those in +# mozilla/build/unix/modules.mk +# + +MAKEFILES="" + +# add_makefiles - Shell function to add makefiles to MAKEFILES +add_makefiles() { + MAKEFILES="$MAKEFILES $*" +} + +if [ "$srcdir" = "" ]; then + srcdir=. +fi + +# +# Common makefiles used by everyone +# +add_makefiles " +Makefile +build/Makefile +build/unix/Makefile +config/Makefile +config/autoconf.mk +config/mkdepend/Makefile +config/doxygen.cfg +" + +MAKEFILES_extensions=" +extensions/Makefile +" + +if test "$(echo $MOZ_APP_NAME) | grep thunderbird)"; then +MAKEFILES_extensions="$MAKEFILES_extensions + mail/extensions/enigmail/ui/skin/Makefile + mail/extensions/enigmail/ui/skin/tb-mac/Makefile + mail/extensions/enigmail/ui/skin/classic/Makefile + mail/extensions/enigmail/ui/content/Makefile + mail/extensions/enigmail/ui/Makefile + mail/extensions/enigmail/ipc/src/Makefile + mail/extensions/enigmail/ipc/build/build-Makefile + mail/extensions/enigmail/ipc/tests/Makefile + mail/extensions/enigmail/ipc/Makefile + mail/extensions/enigmail/ipc/public/Makefile + mail/extensions/enigmail/src/Makefile + mail/extensions/enigmail/lang/Makefile + mail/extensions/enigmail/build/Makefile + mail/extensions/enigmail/build/package/Makefile + mail/extensions/enigmail/Makefile + mail/extensions/enigmail/public/Makefile + mail/extensions/enigmail/package/Makefile" +fi + +if test "$(echo $MOZ_APP_NAME) | grep seamonkey)"; then + +MAKEFILES_extensions="$MAKEFILES_extensions + extensions/enigmail/src/Makefile + extensions/enigmail/lang/Makefile + extensions/enigmail/build/Makefile + extensions/enigmail/Makefile + extensions/enigmail/public/Makefile + extensions/enigmail/package/Makefile + extensions/enigmail/ipc/src/Makefile + extensions/enigmail/ipc/build/Makefile + extensions/enigmail/ipc/tests/Makefile + extensions/enigmail/ipc/Makefile + extensions/enigmail/ipc/public/Makefile" +fi + +add_makefiles "$MAKEFILES_extensions" --- enigmail-0.95.7.orig/debian/enigmail.links +++ enigmail-0.95.7/debian/enigmail.links @@ -0,0 +1,2 @@ +usr/lib/enigmail/extension usr/lib/icedove/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5} +usr/lib/enigmail/extension usr/lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5} --- enigmail-0.95.7.orig/debian/rules.mailnews +++ enigmail-0.95.7/debian/rules.mailnews @@ -0,0 +1,118 @@ +#!/usr/bin/make -f + +export MOZ_MAILNEWS=1 + +DESTDIR=$(CURDIR)/debian/tmp-enigmail-mn +MOZ_APP_NAME=mozilla +MOZ_APP_POSTFIX= + +ENIG_EXT_ID={847b3a00-7ab1-11d4-8f02-006008948af5} + +all_patches=$(patsubst \#%,,$(shell cat $(wildcard $(CURDIR)/debian/patches/00list.$(MOZ_APP_NAME)))) + +MOZ_VERS = $(shell mozilla-config --version) + +export XPIDL_TOOLS_DIR=/usr/lib/mozilla-thunderbird/ +export MOZSDK_EXTENSIONS_DIR=extensions/ +export MOZSDK_EXTENSIONS_DEPTH=.. +export PATCH_DEPTH=1 + +#set the correct VERSION + +ifeq ($(MOZ_VERS),1.6) +MOZSDK_VERS=MOZILLA_1_6_RELEASE +IPC_VERS=1.0.5 +ENIG_VERS=0.86.1 +endif + +ifeq ($(MOZ_VERS),1.7.3) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_3_RELEASE +IPC_VERS=1.1.2 +ENIG_VERS=0.91.0 +endif + +ifeq ($(MOZ_VERS),1.7.5) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_5_RELEASE +IPC_VERS=1.1.2 +ENIG_VERS=0.91.0 +endif + +ifeq ($(MOZ_VERS),1.7.6) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_6_RELEASE +IPC_VERS=1.1.2 +ENIG_VERS=0.91.0 +endif + +ifeq ($(MOZ_VERS),1.7.8) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_8_RELEASE +#IPC_VERS=1.1.2 +#ENIG_VERS=0.91.0 +IPC_VERS=1.1.3 +ENIG_VERS=0.92.0 +endif + +ifeq ($(MOZ_VERS),1.7.7) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_6_RELEASE +IPC_VERS=1.1.2 +ENIG_VERS=0.91.0 +endif + +ifeq ($(MOZ_VERS),1.7.10) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_10_RELEASE +IPC_VERS=1.1.3 +ENIG_VERS=0.92.0 +endif + +ifeq ($(MOZ_VERS),1.7.11) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_10_RELEASE +IPC_VERS=1.1.3 +ENIG_VERS=0.92.0 +endif + +ifeq ($(MOZ_VERS),1.7.12) # it's still the same sdk +MOZSDK_VERS=MOZILLA_1_7_10_RELEASE +IPC_VERS=1.1.3 +ENIG_VERS=0.93.0 +endif + +# TODO this could be generic matching algo +# cat ./extensions/enigmail/package/install.rdf | \ +# grep \ | head -n 1 | sed -e 's/^.*\(.*\)<\/em:id>.*$/\1/' + +patch-stamp.$(MOZ_APP_NAME): + -dpatch apply $(all_patches) + touch patch-stamp.$(MOZ_APP_NAME) + +patch: setup-source patch-stamp.$(MOZ_APP_NAME) + +dounpatch: + -dpatch deapply $(all_patches) + +clean: dounpatch + rm -rf $(CURDIR)/build-dir + rm -f $(CURDIR)/setup-source.stamp + rm -rf $(CURDIR)/debian/patched + +setup-source: setup-source.stamp + +setup-source.stamp: + mkdir -p $(CURDIR)/build-dir/ + tar -C $(CURDIR)/build-dir/ -xzvf archives/mozsdk-$(MOZSDK_VERS).tar.gz + tar -C $(CURDIR)/build-dir/mozilla/extensions -xvzf \ + archives/enigmail-$(ENIG_VERS).tar.gz + tar -C $(CURDIR)/build-dir/mozilla/extensions -xvzf archives/ipc-$(IPC_VERS).tar.gz + touch setup-source.stamp + +build: setup-source patch $(CURDIR)/build-dir/mozilla/build-stamp + +$(CURDIR)/build-dir/mozilla/build-stamp: + cp $(CURDIR)/debian/configure.sh.$(MOZSDK_VERS) $(CURDIR)/build-dir/mozilla/configure.sh + sh -c "cd build-dir/mozilla && autoconf && sh configure.sh" + sh -c "LD_LIBRARY_PATH=/usr/lib/mozilla/ && export LD_LIBRARY_PATH && make -C build-dir/mozilla" + touch $(CURDIR)/build-dir/mozilla/build-stamp + +install: build + make -C build-dir/mozilla install DESTDIR=$(DESTDIR) +# cp -f $(CURDIR)/build-dir/mozilla/extensions/enigmail/package/install.rdf debian/tmp-enigmail-mn + +.PHONY: clean install build patch --- enigmail-0.95.7.orig/debian/copyright +++ enigmail-0.95.7/debian/copyright @@ -0,0 +1,479 @@ +Enigmail is open source and dually-licensed under the GNU General +Public License (GPL) and the Mozilla Public License. + +The GPL License text can be found in /usr/share/common-licenses/GPL + +The Mozilla Public License is appended below: + + + + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + --- enigmail-0.95.7.orig/debian/enigmail.preinst +++ enigmail-0.95.7/debian/enigmail.preinst @@ -0,0 +1,13 @@ +#!/bin/sh + +if [ "$1" = "upgrade" ]; then + echo . + if test -d '/usr/lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}'; then + rm -rf '/usr/lib/thunderbird/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}' + fi + if test -d '/usr/lib/icedove/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}'; then + rm -rf '/usr/lib/icedove/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}' + fi +fi + +#DEBHELPER# --- enigmail-0.95.7.orig/debian/rules +++ enigmail-0.95.7/debian/rules @@ -0,0 +1,67 @@ +#!/usr/bin/make -f + +ifneq (,$(wildcard /usr/bin/icedove-config*)) +MOZ_APP_NAME := icedove +else +ifneq (,$(wildcard /usr/bin/thunderbird-config*)) +MOZ_APP_NAME := thunderbird +else +exit 2 +endif +endif + +REAL_MOZ_TBIRD_VERS = $(shell $(MOZ_APP_NAME)-config --version) +MOZ_TBIRD_VERS = $(shell $(MOZ_APP_NAME)-config --version) + +export NO_DIST_INSTALL= + +#set the correct VERSION + +ifeq ($(MOZ_TBIRD_VERS),1.0.7) +MOZ_TBIRD_VERS=1.0.6 +endif + +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +clean: + make -f $(CURDIR)/debian/rules.thunderbird MOZ_APP_NAME=$(MOZ_APP_NAME) clean + rm -rf $(CURDIR)/debian/tmp-enigmail + rm -rf $(CURDIR)/build-dir + rm -f $(CURDIR)/patch-stamp* + rm -f $(CURDIR)/setup-source.stamp + dh_clean + +install: + make -f $(CURDIR)/debian/rules.thunderbird MOZ_APP_NAME=$(MOZ_APP_NAME) install +# make -f $(CURDIR)/debian/rules.mailnews install +# make -f $(CURDIR)/debian/rules.mailnews clean + + +binary-arch: install + dh_clean + dh_testdir + dh_testroot + dh_installdirs + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install + + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: + +binary: binary-arch binary-indep + + +binary: binary-arch binary-indep + +.PHONY: binary clean install build binary-arch binary-indep patch --- enigmail-0.95.7.orig/debian/allmakefiles.sh.0.94.0.thunderbird +++ enigmail-0.95.7/debian/allmakefiles.sh.0.94.0.thunderbird @@ -0,0 +1,79 @@ +#! /bin/sh +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# allmakefiles.sh - List of all makefiles. +# Appends the list of makefiles to the variable, MAKEFILES. +# There is no need to rerun autoconf after adding makefiles. +# You only need to run configure. +# +# Please keep the modules in this file in sync with those in +# mozilla/build/unix/modules.mk +# + +MAKEFILES="" + +# add_makefiles - Shell function to add makefiles to MAKEFILES +add_makefiles() { + MAKEFILES="$MAKEFILES $*" +} + +if [ "$srcdir" = "" ]; then + srcdir=. +fi + +# +# Common makefiles used by everyone +# +add_makefiles " +Makefile +build/Makefile +build/unix/Makefile +config/Makefile +config/autoconf.mk +config/mkdepend/Makefile +config/doxygen.cfg +" + +MAKEFILES_extensions=" +mail/extensions/Makefile +" + +MAKEFILES_extensions="$MAKEFILES_extensions + mail/extensions/enigmail/ui/skin/Makefile + mail/extensions/enigmail/ui/skin/tb-mac/Makefile + mail/extensions/enigmail/ui/skin/classic/Makefile + mail/extensions/enigmail/ui/content/Makefile + mail/extensions/enigmail/ui/Makefile + mail/extensions/enigmail/ipc/src/Makefile + mail/extensions/enigmail/ipc/build/build-Makefile + mail/extensions/enigmail/ipc/tests/Makefile + mail/extensions/enigmail/ipc/Makefile + mail/extensions/enigmail/ipc/public/Makefile + mail/extensions/enigmail/src/Makefile + mail/extensions/enigmail/lang/Makefile + mail/extensions/enigmail/build/Makefile + mail/extensions/enigmail/build/package/Makefile + mail/extensions/enigmail/Makefile + mail/extensions/enigmail/public/Makefile + mail/extensions/enigmail/package/Makefile" + +add_makefiles "$MAKEFILES_extensions" --- enigmail-0.95.7.orig/debian/configure.sh.THUNDERBIRD_1_5_RELEASE +++ enigmail-0.95.7/debian/configure.sh.THUNDERBIRD_1_5_RELEASE @@ -0,0 +1,27 @@ +#/!bin/sh + +export IDL_INCLUDES="-I /usr/share/idl/mozilla-thunderbird/" +export _EXTRA_INCLUDES="/usr/include/mozilla-thunderbird/necko/,/usr/include/mozilla-thunderbird/mimetype/,/usr/include/mozilla-thunderbird/xpcom_obsolete,/usr/include/mozilla-thunderbird/caps/,/usr/include/mozilla-thunderbird/xpconnect,/usr/include/mozilla-thunderbird/js,/usr/include/mozilla-thunderbird/msgsmime/,/usr/include/mozilla-thunderbird/msgcompose,/usr/include/mozilla-thunderbird/msgbase/,/usr/include/mozilla-thunderbird/mailnews/,/usr/include/mozilla-thunderbird/msgdb/,/usr/include/mozilla-thunderbird/msgbaseutil,/usr/include/mozilla-thunderbird/mime/,/usr/include/mozilla-thunderbird/uconv,/usr/include/mozilla-thunderbird/dom,/usr/include/mozilla-thunderbird/pref,/usr/include/mozilla-thunderbird/uriloader" + +for _extradir in $(echo $_EXTRA_INCLUDES | tr ',' ' '); do + MOZILLA_EXTRA_INCLUDES="$MOZILLA_EXTRA_INCLUDES -I$_extradir" +done + +export MOZILLA_EXTRA_INCLUDES + +./configure \ + --disable-widget-hacking \ + --enable-glib2 \ + --with-default-mozilla-five-home=/usr/lib/mozilla-thunderbird \ + --with-system-nspr \ + --disable-ldap \ + --disable-debug \ + --enable-optimze \ + --enable-extensions=enigmail \ + --with-xpidltoolsdir=/usr/lib/mozilla-thunderbird/ \ + --with-idl-includes=/usr/share/idl/mozilla-thunderbird/ \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --srcdir=. + --- enigmail-0.95.7.orig/debian/rules.thunderbird +++ enigmail-0.95.7/debian/rules.thunderbird @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +export MOZ_THUNDERBIRD=1 + +MOZ_APP_NAME ?= thunderbird + +DESTDIR=$(CURDIR)/debian/tmp-enigmail +MOZSDK_VERS=THUNDERBIRD_2_0_0_0_RELEASE + +export MOZ_VERSIONS=1.99 +export MOZ_APP_VERSION=1.99 +export MOZ_APP_POSTFIX=-$(MOZ_APP_NAME) + + +export XPIDL_TOOLS_DIR=/usr/lib/$(MOZ_APP_NAME)/ +export MOZSDK_EXTENSIONS_DIR=mail/extensions/ +export MOZSDK_EXTENSIONS_DEPTH=../.. +export PATCH_DEPTH=2 + +ENIGMAIL_VERS=0.95.7 + +ENIG_EXT_ID={847b3a00-7ab1-11d4-8f02-006008948af5} + +all_patches=$(patsubst \#%,,$(shell cat $(wildcard $(CURDIR)/debian/patches/00list.thunderbird))) + +# TODO this could be generic matching algo +# cat ./extensions/enigmail/package/install.rdf | \ +# grep \ | head -n 1 | sed -e 's/^.*\(.*\)<\/em:id>.*$/\1/' + +patch-stamp.$(MOZ_APP_NAME): + dpatch apply $(all_patches) + touch patch-stamp.$(MOZ_APP_NAME) + +patch: setup-source patch-stamp.$(MOZ_APP_NAME) + +dounpatch: + dpatch deapply $(all_patches) + +clean: dounpatch + rm -rf $(CURDIR)/build-dir + rm -f $(CURDIR)/setup-source.stamp + rm -rf $(CURDIR)/debian/patched + +setup-source: setup-source.stamp + +setup-source.stamp: + mkdir -p $(CURDIR)/build-dir/ + tar -C $(CURDIR)/build-dir/ -xzvf archives/mozsdk-$(MOZSDK_VERS).tar.gz + rm -rf $(CURDIR)/build-dir/mozilla/$(MOZSDK_EXTENSIONS_DIR) + mkdir -p $(CURDIR)/build-dir/mozilla/$(MOZSDK_EXTENSIONS_DIR) + cp -f $(CURDIR)/build-dir/mozilla/extensions/Makefile.in $(CURDIR)/build-dir/mozilla/$(MOZSDK_EXTENSIONS_DIR) + rm -rf build-dir/mozilla/extensions/ + tar -C $(CURDIR)/build-dir/mozilla/$(MOZSDK_EXTENSIONS_DIR) -xvzf archives/enigmail-$(ENIGMAIL_VERS).tar.gz + touch setup-source.stamp + +build: setup-source patch $(CURDIR)/build-dir/mozilla/build-stamp + +$(CURDIR)/build-dir/mozilla/build-stamp: + cp $(CURDIR)/debian/configure.sh.$(MOZSDK_VERS) $(CURDIR)/build-dir/mozilla/configure.sh + cp $(CURDIR)/debian/allmakefiles.sh.0.94.0.thunderbird $(CURDIR)/build-dir/mozilla/allmakefiles.sh + sh -c "cd build-dir/mozilla && autoconf2.13 && MOZ_APP_NAME=$(MOZ_APP_NAME) sh configure.sh" + sh -c "LD_LIBRARY_PATH=/usr/lib/mozilla/ && export LD_LIBRARY_PATH && make -C build-dir/mozilla" + touch $(CURDIR)/build-dir/mozilla/build-stamp + +install: build + make -C $(CURDIR)/build-dir/mozilla install DESTDIR=$(DESTDIR) + make -C $(CURDIR)/build-dir/mozilla/$(MOZSDK_EXTENSIONS_DIR) install DESTDIR=$(DESTDIR) + cp -f $(CURDIR)/build-dir/mozilla/$(MOZSDK_EXTENSIONS_DIR)/enigmail/package/install.rdf debian/tmp-enigmail/ + cp -f $(CURDIR)/build-dir/mozilla/$(MOZSDK_EXTENSIONS_DIR)/enigmail/package/chrome.manifest $(CURDIR)/debian/tmp-enigmail/ + + +.PHONY: clean install build patch --- enigmail-0.95.7.orig/debian/enigmail.install +++ enigmail-0.95.7/debian/enigmail.install @@ -0,0 +1,7 @@ +debian/tmp-enigmail/usr/lib/*/chrome/enigmail.jar usr/lib/enigmail/extension/chrome/ +debian/tmp-enigmail/usr/lib/*/chrome/enigmail-skin-tbird.jar usr/lib/enigmail/extension/chrome/ +debian/tmp-enigmail/usr/lib/*/chrome/enigmail-en-US.jar usr/lib/enigmail/extension/chrome/ +debian/tmp-enigmail/usr/lib/*/components usr/lib/enigmail/extension/ +debian/tmp-enigmail/usr/lib/*/defaults/pref/enigmail.js usr/lib/enigmail/extension/defaults/preferences/ +debian/tmp-enigmail/install.rdf usr/lib/enigmail/extension/ +debian/tmp-enigmail/chrome.manifest usr/lib/enigmail/extension/ --- enigmail-0.95.7.orig/debian/80_enigmail-no-auto-check-trustdb.dpatch +++ enigmail-0.95.7/debian/80_enigmail-no-auto-check-trustdb.dpatch @@ -0,0 +1,89 @@ +#!/bin/sh -e +## 80_enigmail-no-auto-check-trustdb.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts < $0;; + -unpatch) patch $patch_opts -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla/mail/extensions/enigmail/package/enigmail.js.orig 2007-01-11 11:40:28.000000000 +0100 ++++ mozilla/mail/extensions/enigmail/package/enigmail.js 2007-02-13 11:59:08.000000000 +0100 +@@ -38,7 +38,7 @@ + const ERROR_BUFFER_SIZE = 16384; // 16 kB + + const PGP_BATCH_OPTS = " +batchmode +force"; +-const GPG_BATCH_OPTS = " --batch --no-tty --status-fd 2"; ++const GPG_BATCH_OPTS = " --batch --no-tty --no-auto-check-trustdb --status-fd 2"; + + const gDummyPKCS7 = 'Content-Type: multipart/mixed;\r\n boundary="------------060503030402050102040303\r\n\r\nThis is a multi-part message in MIME format.\r\n--------------060503030402050102040303\r\nContent-Type: application/x-pkcs7-mime\r\nContent-Transfer-Encoding: 8bit\r\n\r\n\r\n--------------060503030402050102040303\r\nContent-Type: application/x-enigmail-dummy\r\nContent-Transfer-Encoding: 8bit\r\n\r\n\r\n--------------060503030402050102040303--\r\n'; + +@@ -1614,7 +1614,7 @@ + + var command = this.getAgentPath(); + if (agentType == "gpg") { +- command += " --batch --no-tty --version"; ++ command += " --batch --no-tty --no-auto-check-trustdb --version"; + } else { + command += " +batchmode -h"; + } +@@ -3205,6 +3205,7 @@ + var command = this.getAgentPath(); + + if (! (recvFlags & nsIEnigmail.SEARCH_KEY)) command += GPG_BATCH_OPTS; ++ else command += " --no-auto-check-trustdb "; + + if (proxyHost) { + command += " --keyserver-options honor-http-proxy"; +@@ -3473,7 +3474,7 @@ + } + else { + // GnuPG >= v1.4.0 +- command = this.getAgentPath() + " --command-fd 0 --no-tty --batch --fixed-list --with-colons" ++ command = this.getAgentPath() + " --command-fd 0 --no-tty --batch --fixed-list --with-colons --no-auto-check-trustdb" + if (proxyHost) command+=" --keyserver-options http-proxy="+proxyHost + command +=" --keyserver "; + if (! protocol) protocol="hkp"; +@@ -4364,7 +4365,7 @@ + function(exitCodeObj, errorMsgObj) { + var command = this.getAgentPath(); + +- command += " --status-fd 2 --fixed-list-mode --with-colons --card-status"; ++ command += " --status-fd 2 --fixed-list-mode --with-colons --card-status --no-auto-check-trustdb"; + var statusMsgObj = new Object(); + var statusFlagsObj = new Object(); + +@@ -4386,6 +4387,7 @@ + + command += " --no-secmem-warning --batch --no-tty --status-fd 1 --attribute-fd 2"; + command += " --fixed-list-mode --list-keys "+keyId; ++ command += " --fixed-list-mode --no-auto-check-trustdb --list-keys "+keyId; + + var photoDataObj = new Object(); + +@@ -5036,7 +5038,7 @@ + useAgentObj.value = true; + } + +- command += " --no-tty --status-fd 1 --logger-fd 1 --command-fd 0" ++ command += " --no-tty --status-fd 1 --logger-fd 1 --command-fd 0 --no-auto-check-trustdb" + if (userId) command += " -u " + userId; + if (editCmd == "revoke") { + // escape backslashes and ' characters + --- enigmail-0.95.7.orig/debian/patches/20_enigmail-remove-seamonkey-skin-patch.dpatch +++ enigmail-0.95.7/debian/patches/20_enigmail-remove-seamonkey-skin-patch.dpatch @@ -0,0 +1,34 @@ +#!/bin/sh -e +## 20_debian-enigmail-patch.dpatch by <@hanson.personalfree.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +PATCH_FILE=build-dir/mozilla/extensions/enigmail/ui/jar.mn + +case "$1" in + -patch) + line1=$(grep -n "enigmail-skin.jar:" $PATCH_FILE | awk -F: '{ print $1 }') + cp $PATCH_FILE ${PATCH_FILE}.dorig + head -n $(expr $line1 - 1) ${PATCH_FILE}.dorig > $PATCH_FILE + ;; + + -unpatch) + cp ${PATCH_FILE}.dorig $PATCH_FILE + rm -f ${PATCH_FILE}.dorig + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + --- enigmail-0.95.7.orig/debian/patches/50_enigmail_no_upgrade.dpatch +++ enigmail-0.95.7/debian/patches/50_enigmail_no_upgrade.dpatch @@ -0,0 +1,45 @@ +#!/bin/sh -e +## debian/patches/10_debian-branding.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts < $0;; + -unpatch) patch $patch_opts -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla/extensions/enigmail/ui/jar.mn.orig 2007-04-23 13:06:44.000000000 +0000 ++++ mozilla/extensions/enigmail/ui/jar.mn 2007-04-23 13:06:54.000000000 +0000 +@@ -57,17 +57,16 @@ + content/enigmail/am-enigprefs.js (content/am-enigprefs.js) + content/enigmail/am-enigprefs-edit.xul (content/am-enigprefs-edit.xul) + content/enigmail/enigmailKeygen.xul (content/enigmailKeygen.xul) + content/enigmail/enigmailKeygen.js (content/enigmailKeygen.js) + content/enigmail/enigmailKeygenConsole.htm (content/enigmailKeygenConsole.htm) + content/enigmail/enigmailKeyserverDlg.xul (content/enigmailKeyserverDlg.xul) + content/enigmail/enigmailUserSelection.xul (content/enigmailUserSelection.xul) + content/enigmail/enigmailUserSelection.js (content/enigmailUserSelection.js) +- content/enigmail/enigmailUpgrade.xul (content/enigmailUpgrade.xul) + content/enigmail/enigmailUninstall.xul (content/enigmailUninstall.xul) + content/enigmail/enigmailNaviConsole.xul (content/enigmailNaviConsole.xul) + content/enigmail/enigmailNavigatorOverlay.xul (content/enigmailNavigatorOverlay.xul) + content/enigmail/enigmailNavigatorOverlay.js (content/enigmailNavigatorOverlay.js) + content/enigmail/enigmailMsgComposeOverlay.xul (content/enigmailMsgComposeOverlay.xul) + content/enigmail/enigmailMsgComposeOverlay.js (content/enigmailMsgComposeOverlay.js) + content/enigmail/enigmailMsgComposeHelper.js (content/enigmailMsgComposeHelper.js) + content/enigmail/enigmailMessengerOverlay.xul (content/enigmailMessengerOverlay.xul) --- enigmail-0.95.7.orig/debian/patches/70_enigmail-fix.dpatch +++ enigmail-0.95.7/debian/patches/70_enigmail-fix.dpatch @@ -0,0 +1,37 @@ +#!/bin/sh -e +## 50_mozilla-firebird-mips-xptcstubs-gcc3.dpatch by Alexander Sack +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts < $0;; + -unpatch) patch $patch_opts -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -u -w -r1.73 Makefile.in +--- mozilla/extensions/enigmail/package/Makefile.in 14 Mar 2004 16:39:18 -0000 1.73 ++++ mozilla/extensions/enigmail/package/Makefile.in 20 Mar 2004 18:20:08 -0000 +@@ -48,6 +48,8 @@ + + XPIDLSRCS = nsIEnigmail.idl + ++PREF_JS_EXPORTS=prefs/enigmail.js ++ + include $(topsrcdir)/config/rules.mk + + XPIFILE = $(XPI_MODULE)-$(XPI_MODULE_VERS).xpi --- enigmail-0.95.7.orig/debian/patches/00patch-opts +++ enigmail-0.95.7/debian/patches/00patch-opts @@ -0,0 +1,4 @@ +#!/bin/sh + +patch_opts="-d build-dir/mozilla/$MOZSDK_EXTENSIONS_DIR -p $PATCH_DEPTH" +export patch_opts --- enigmail-0.95.7.orig/debian/patches/50_enigmail_ui_locale_en_US_contents_rdf.dpatch +++ enigmail-0.95.7/debian/patches/50_enigmail_ui_locale_en_US_contents_rdf.dpatch @@ -0,0 +1,35 @@ +#!/bin/sh -e +## debian/patches/10_debian-branding.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla/extensions/enigmail/ui/locale/en-US/contents.rdf.orig 2004-06-22 21:58:39.000000000 +0000 ++++ mozilla/extensions/enigmail/ui/locale/en-US/contents.rdf 2004-06-22 21:59:09.000000000 +0000 +@@ -18,4 +18,7 @@ + + + ++ ++ + --- enigmail-0.95.7.orig/debian/patches/80_no_pragma_pushed_visibility.dpatch +++ enigmail-0.95.7/debian/patches/80_no_pragma_pushed_visibility.dpatch @@ -0,0 +1,37 @@ +#!/bin/sh -e +## 80_no_pragma_pushed_visibility.dpatch by Alexander Sack +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts.sdk ] && . debian/patches/00patch-opts.sdk +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts < $0;; + -unpatch) patch $patch_opts -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla/configure.in.orig.real 2007-08-30 14:54:31.000000000 +0000 ++++ mozilla/configure.in 2007-08-30 14:54:44.000000000 +0000 +@@ -2614,8 +2614,7 @@ + ]) + if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ + "$ac_cv_have_visibility_class_bug" = "no"; then +- VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' +- WRAP_SYSTEM_INCLUDES=1 ++ VISIBILITY_FLAGS='-fvisibility=hidden' + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug --- enigmail-0.95.7.orig/debian/patches/10_visibility_hidden_patch.dpatch +++ enigmail-0.95.7/debian/patches/10_visibility_hidden_patch.dpatch @@ -0,0 +1,141 @@ +#!/bin/sh -e +## debian/patches/10_visibility_hidden_patch.dpatch by asac@jwsdot.com +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts.sdk ] && . debian/patches/00patch-opts.sdk +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts < $0;; + -unpatch) patch $patch_opts -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla.orig/configure.in 2007-04-04 18:45:13.000000000 +0200 ++++ mozilla/configure.in 2007-04-04 18:45:22.000000000 +0200 +@@ -2513,33 +2513,33 @@ + if test "$GNU_CC"; then + AC_CACHE_CHECK(for visibility(hidden) attribute, + ac_cv_visibility_hidden, + [cat > conftest.c </dev/null 2>&1; then +- if grep '\.hidden.*foo' conftest.s >/dev/null; then ++ if egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then + ac_cv_visibility_hidden=yes + fi + fi + rm -f conftest.[cs] + ]) + if test "$ac_cv_visibility_hidden" = "yes"; then + AC_DEFINE(HAVE_VISIBILITY_HIDDEN_ATTRIBUTE) + + AC_CACHE_CHECK(for visibility(default) attribute, + ac_cv_visibility_default, + [cat > conftest.c </dev/null 2>&1; then +- if ! grep '\.hidden.*foo' conftest.s >/dev/null; then ++ if ! egrep '\.(hidden|private_extern).*foo' conftest.s >/dev/null; then + ac_cv_visibility_default=yes + fi + fi + rm -f conftest.[cs] + ]) + if test "$ac_cv_visibility_default" = "yes"; then + AC_DEFINE(HAVE_VISIBILITY_ATTRIBUTE) + +@@ -2548,45 +2548,72 @@ + [cat > conftest.c </dev/null 2>&1; then +- if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then +- if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then ++ if egrep '\.(hidden|extern_private).*foo_hidden' conftest.s >/dev/null; then ++ if ! egrep '\.(hidden|extern_private).*foo_default' conftest.s > /dev/null; then + ac_cv_visibility_pragma=yes + fi + fi + fi + rm -f conftest.[cs] + ]) + if test "$ac_cv_visibility_pragma" = "yes"; then ++ AC_CACHE_CHECK(For gcc visibility bug with class-level attributes (GCC bug 26905), ++ ac_cv_have_visibility_class_bug, ++ [cat > conftest.c < /dev/null 2>&1 ; then ++ ac_cv_have_visibility_class_bug=yes ++ else ++ if test `grep -c "@PLT" conftest.S` = 0; then ++ ac_cv_have_visibility_class_bug=yes ++ fi ++ fi ++ rm -rf conftest.{c,S} ++ ]) ++ + AC_CACHE_CHECK(For x86_64 gcc visibility bug with builtins (GCC bug 20297), + ac_cv_have_visibility_builtin_bug, + [cat > conftest.c < + #pragma GCC visibility pop + + __attribute__ ((visibility ("default"))) void Func() { + char c[[100]]; + memset(c, 0, sizeof(c)); + } + EOF + ac_cv_have_visibility_builtin_bug=no +- if ! ${CC-cc} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -o conftest.so conftest.c >/dev/null 2>&1; then ++ if ! ${CC-cc} ${CFLAGS} ${DSO_PIC_CFLAGS} ${DSO_LDOPTS} -O2 -S -o conftest.S conftest.c > /dev/null 2>&1 ; then + ac_cv_have_visibility_builtin_bug=yes ++ else ++ if test `grep -c "@PLT" conftest.S` = 0; then ++ ac_cv_visibility_builtin_bug=yes ++ fi + fi +- rm -f conftest.{c,so} ++ rm -f conftest.{c,S} + ]) +- if test "$ac_cv_have_visibility_builtin_bug" = "no"; then ++ if test "$ac_cv_have_visibility_builtin_bug" = "no" -a \ ++ "$ac_cv_have_visibility_class_bug" = "no"; then + VISIBILITY_FLAGS='-I$(DIST)/include/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h' + WRAP_SYSTEM_INCLUDES=1 + else + VISIBILITY_FLAGS='-fvisibility=hidden' + fi # have visibility pragma bug + fi # have visibility pragma + fi # have visibility(default) attribute + fi # have visibility(hidden) attribute --- enigmail-0.95.7.orig/debian/patches/00list.mozilla +++ enigmail-0.95.7/debian/patches/00list.mozilla @@ -0,0 +1,7 @@ +#20_enigmail-remove-tbird-skin-patch +50_enigmail_no_upgrade +#50_enigmail_ui_content_contents_rdf +#50_enigmail_ui_skin_contents_rdf +#50_enigmail_ui_locale_en_US_contents_rdf +70_enigmail-fix +80_enigmail-no-auto-check-trustdb --- enigmail-0.95.7.orig/debian/patches/00patch-opts.sdk +++ enigmail-0.95.7/debian/patches/00patch-opts.sdk @@ -0,0 +1,4 @@ +#!/bin/sh + +patch_opts="-d build-dir/mozilla/ -p1" +export patch_opts --- enigmail-0.95.7.orig/debian/patches/50_enigmail_build_package_contents_rdf.dpatch +++ enigmail-0.95.7/debian/patches/50_enigmail_build_package_contents_rdf.dpatch @@ -0,0 +1,36 @@ +#!/bin/sh -e +## debian/patches/10_debian-branding.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts < $0;; + -unpatch) patch $patch_opts -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla/extensions/enigmail/build/package/contents.rdf.orig 2005-01-16 01:56:19.000000000 +0000 ++++ mozilla/extensions/enigmail/build/package/contents.rdf 2005-01-16 01:56:47.000000000 +0000 +@@ -13,7 +13,7 @@ + chrome:author="Team Enigmail" + chrome:authorURL="http://enigmail.mozdev.org/" + chrome:name="enigmime" +- chrome:extension="true" ++ chrome:extension="false" + chrome:description="This is the platform dependent part of the Enigmail extension."> + + --- enigmail-0.95.7.orig/debian/patches/50_enigmail_ui_content_contents_rdf.dpatch +++ enigmail-0.95.7/debian/patches/50_enigmail_ui_content_contents_rdf.dpatch @@ -0,0 +1,36 @@ +#!/bin/sh -e +## debian/patches/10_debian-branding.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts < $0;; + -unpatch) patch $patch_opts -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla/extensions/enigmail/ui/content/contents.rdf.orig 2004-09-17 10:52:05.000000000 +0000 ++++ mozilla/extensions/enigmail/ui/content/contents.rdf 2004-09-17 10:52:15.000000000 +0000 +@@ -13,7 +13,7 @@ + chrome:author="Team Enigmail" + chrome:authorURL="http://enigmail.mozdev.org/" + chrome:name="enigmail" +- chrome:extension="true" ++ chrome:extension="false" + chrome:description="This extension adds support for OpenPGP message encryption." + chrome:settingsURL="chrome://enigmail/content/pref-enigmail.xul"> + --- enigmail-0.95.7.orig/debian/patches/50_enigmail_ui_skin_contents_rdf.dpatch +++ enigmail-0.95.7/debian/patches/50_enigmail_ui_skin_contents_rdf.dpatch @@ -0,0 +1,35 @@ +#!/bin/sh -e +## debian/patches/10_debian-branding.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- mozilla/extensions/enigmail/ui/skin/classic/contents.rdf.orig 2004-06-22 21:45:30.000000000 +0000 ++++ mozilla/extensions/enigmail/ui/skin/classic/contents.rdf 2004-06-22 21:48:15.000000000 +0000 +@@ -15,5 +15,6 @@ + + + +- ++ + --- enigmail-0.95.7.orig/debian/patches/20_enigmail-remove-tbird-skin-patch.dpatch +++ enigmail-0.95.7/debian/patches/20_enigmail-remove-tbird-skin-patch.dpatch @@ -0,0 +1,37 @@ +#!/bin/sh -e +## 20_debian-enigmail-patch.dpatch by <@hanson.personalfree.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +PATCH_FILE=build-dir/mozilla/extensions/enigmail/ui/jar.mn + +case "$1" in + -patch) + line0=$(grep -n "enigmail-skin-tbird.jar:" $PATCH_FILE | awk -F: '{ print $1 }') + line1=$(grep -n "enigmail-skin.jar:" $PATCH_FILE | awk -F: '{ print $1 }') + total_count=$(cat $PATCH_FILE | wc -l) + cp $PATCH_FILE ${PATCH_FILE}.dorig + head -n $(expr $line0 - 1) ${PATCH_FILE}.dorig > $PATCH_FILE + tail -n $(expr $total_count - $line1 + 1) ${PATCH_FILE}.dorig >> $PATCH_FILE + ;; + + -unpatch) + cp ${PATCH_FILE}.dorig $PATCH_FILE + rm -f ${PATCH_FILE}.dorig + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + --- enigmail-0.95.7.orig/debian/patches/00list.thunderbird +++ enigmail-0.95.7/debian/patches/00list.thunderbird @@ -0,0 +1,11 @@ +10_visibility_hidden_patch +#20_enigmail-remove-tbird-skin-patch +#20_enigmail-remove-seamonkey-skin-patch +#50_enigmail_src_Makefile_in +50_enigmail_no_upgrade +50_enigmail_ui_content_contents_rdf +50_enigmail_build_package_contents_rdf +#50_enigmail_ui_skin_contents_rdf +#50_enigmail_ui_locale_en_US_contents_rdf +70_enigmail-fix +80_no_pragma_pushed_visibility