diff options
author | Barak A. Pearlmutter <barak+git@cs.nuim.ie> | 2012-11-30 11:51:56 +0000 |
---|---|---|
committer | Barak A. Pearlmutter <barak+git@cs.nuim.ie> | 2012-11-30 12:42:23 +0000 |
commit | 04fa26caa1c9b1a430a0bb51e5f5f92e2762b1e4 (patch) | |
tree | 27c53002e063e4fee656b659dc0449f23d6a308e | |
parent | 911c365ad6abf0bff2db32f5abbc44057cdd62b7 (diff) |
fix for creation of /root/.gnupg during installation, thanks to Sébastien Villemot
debian/bbdb.emacsen-install: no longer create /root/.gnupg during
installation of the package. This is achieved by binding GNUPGHOME to
a temporary directory during bytecode compilation (Closes: #694417)
patch unmodified from attachment to http://bugs.debian/org/694417
-rwxr-xr-x | debian/bbdb.emacsen-install | 7 | ||||
-rw-r--r-- | debian/changelog | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/debian/bbdb.emacsen-install b/debian/bbdb.emacsen-install index ba90185..bbe45fe 100755 --- a/debian/bbdb.emacsen-install +++ b/debian/bbdb.emacsen-install @@ -74,6 +74,11 @@ case "${FLAVOR}" in # at ELCDIR ( cd ${ELCDIR} + + # Prevent epg from manipulating /root/.gnupg (#694417) + TMPGNUPGHOME=`mktemp -d --tmpdir gnupg.XXXXXXXXXX` + export GNUPGHOME=${TMPGNUPGHOME} + echo "Generating bbdb-autoloads..." echo "Generating bbdb-autoloads" >> $LOG make autoloads >> $LOG 2>&1 @@ -86,7 +91,7 @@ case "${FLAVOR}" in GNUSDIR=${GNUSDIR} \ MHEDIR=${MHEDIR} >> $LOG 2>&1 mv lisp/*.elc utils/*.el . - rm -rf tex utils lisp Makefile + rm -rf tex utils lisp Makefile ${TMPGNUPGHOME} ${FLAVOR} ${COMPILE} *.el >> $LOG 2>&1 ) cat > ${ELCDIR}/load-path.el <<EOF diff --git a/debian/changelog b/debian/changelog index 169ab20..8a47712 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +bbdb (2.36-2.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/bbdb.emacsen-install: no longer create /root/.gnupg during + installation of the package. This is achieved by binding GNUPGHOME to a + temporary directory during bytecode compilation (Closes: #694417) + + -- Sébastien Villemot <sebastien@debian.org> Tue, 27 Nov 2012 14:32:04 +0100 + bbdb (2.36-2) unstable; urgency=low * Update to bbdb-vcard 0.3, which better parses birthdays |