Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package icedove Dear release team, some small needed changes were done within the version 1:45.8.0-3 for the icedove packages. The changes in detail are: * A fixup within the starting wrapper script was added so users which want to use symlinks for the existing old ~/.icedove profile folder can use this together with the new created symlink ~/.thunderbird pointing to ~/.icedove. Otherwise Thunderbird isn't starting. * The starting wrapper has got a fix to detect the thunderbird-dbg package correctly. * A extra cherry picked patch from upstream was added to prevent nullpointer segfaults. * The apparmor profile was needed to be expanded so both existing profile folders ~/.icedove and ~/.thunderbird are usable. The following changes are visible by the debdiff append here. diff -Nru icedove-45.8.0/debian/apparmor/usr.bin.thunderbird icedove-45.8.0/debian/apparmor/usr.bin.thunderbird --- icedove-45.8.0/debian/apparmor/usr.bin.thunderbird 2017-03-15 01:37:48.000000000 +0100 +++ icedove-45.8.0/debian/apparmor/usr.bin.thunderbird 2017-03-30 01:28:32.000000000 +0200 @@ -144,12 +144,12 @@ /**/ r, # per-user thunderbird configuration - owner @{HOME}/.thunderbird/ rw, - owner @{HOME}/.thunderbird/** rw, - owner @{HOME}/.thunderbird/**/storage.sdb k, - owner @{HOME}/.thunderbird/**/*.{db,parentlock,sqlite}* k, - owner @{HOME}/.thunderbird/plugins/** rm, - owner @{HOME}/.thunderbird/**/plugins/** rm, + owner @{HOME}/.{icedove,thunderbird}/ rw, + owner @{HOME}/.{icedove,thunderbird}/** rw, + owner @{HOME}/.{icedove,thunderbird}/**/storage.sdb k, + owner @{HOME}/.{icedove,thunderbird}/**/*.{db,parentlock,sqlite}* k, + owner @{HOME}/.{icedove,thunderbird}/plugins/** rm, + owner @{HOME}/.{icedove,thunderbird}/**/plugins/** rm, owner @{HOME}/.cache/thunderbird/ rw, owner @{HOME}/.cache/thunderbird/** rw, @@ -160,7 +160,7 @@ # Extensions # /usr/share/.../extensions/... is already covered by '/usr/** r', above. # Allow 'x' for downloaded extensions, but inherit policy for safety - owner @{HOME}/.thunderbird/**/extensions/** mixrw, + owner @{HOME}/.{icedove,thunderbird}/**/extensions/** mixrw, owner @{HOME}/.mozilla/extensions/** mixr, /usr/share/xul-ext/**/*.sqlite rk, /usr/lib/xul-ext/**/*.sqlite rk, @@ -237,10 +237,10 @@ /usr/lib/gnupg2/gpg2keys_hkp ix, # silence noise from enigmail 1.9+ - deny owner @{HOME}/.thunderbird/*/.parentlock w, - deny owner @{HOME}/.thunderbird/*/panacea.dat w, - deny owner @{HOME}/.thunderbird/*/*.mab w, - deny owner @{HOME}/.thunderbird/**/*.msf w, + deny owner @{HOME}/.{icedove,thunderbird}/*/.parentlock w, + deny owner @{HOME}/.{icedove,thunderbird}/*/panacea.dat w, + deny owner @{HOME}/.{icedove,thunderbird}/*/*.mab w, + deny owner @{HOME}/.{icedove,thunderbird}/**/*.msf w, deny owner @{HOME}/.cache/thunderbird/**/_CACHE_* w, /usr/share/xul-ext/enigmail/chrome/enigmail.jar r, diff -Nru icedove-45.8.0/debian/changelog icedove-45.8.0/debian/changelog --- icedove-45.8.0/debian/changelog 2017-03-15 01:37:48.000000000 +0100 +++ icedove-45.8.0/debian/changelog 2017-03-30 01:28:32.000000000 +0200 @@ -1,3 +1,17 @@ +icedove (1:45.8.0-3) unstable; urgency=medium + + [ Carsten Schoenert ] + * [d923505] AppArmor: be more flexible on profile folders + (Closes: #858735, #858737) + * [1e04099] tb-wrapper: use readlink also on ${ID_PROFILE_FOLDER} + (Closes: #858771) + * [9f6b771] tb-wrapper: correct check for -dbg package (Closes: #858804) + * [8b5271a] rebuild patch queue from patch-queue branch + added patches: + - fixes/Bug-1273020-Add-missing-null-checks-in-ApplicationAccessi.patch + + -- Christoph Goehre <ch...@sigxcpu.org> Wed, 29 Mar 2017 19:28:32 -0400 + icedove (1:45.8.0-2) unstable; urgency=medium [ Carsten Schoenert ] diff -Nru icedove-45.8.0/debian/patches/fixes/Bug-1273020-Add-missing-null-checks-in-ApplicationAccessi.patch icedove-45.8.0/debian/patches/fixes/Bug-1273020-Add-missing-null-checks-in-ApplicationAccessi.patch --- icedove-45.8.0/debian/patches/fixes/Bug-1273020-Add-missing-null-checks-in-ApplicationAccessi.patch 1970-01-01 01:00:00.000000000 +0100 +++ icedove-45.8.0/debian/patches/fixes/Bug-1273020-Add-missing-null-checks-in-ApplicationAccessi.patch 2017-03-30 01:28:32.000000000 +0200 @@ -0,0 +1,79 @@ +From: Carsten Schoenert <c.schoen...@t-online.de> +Date: Tue, 28 Mar 2017 18:48:46 +0200 +Subject: Bug 1273020 - Add missing null checks in ApplicationAccessible. + r=surkov. + +Origin: https://hg.mozilla.org/mozilla-central/rev/8bfdf5dfcf6b +Origin: https://hg.mozilla.org/mozilla-central/rev/798f02387d36 +Bug-Debian: https://bugs.debian.org/852149 +Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1273020 +Applied-Upstream: Firefox 49.0 +--- + .../accessible/generic/ApplicationAccessible.cpp | 1 + + mozilla/accessible/generic/ApplicationAccessible.h | 30 +++++++++++++++------- + 2 files changed, 22 insertions(+), 9 deletions(-) + +diff --git a/mozilla/accessible/generic/ApplicationAccessible.cpp b/mozilla/accessible/generic/ApplicationAccessible.cpp +index 69537e2..60b83bd 100644 +--- a/mozilla/accessible/generic/ApplicationAccessible.cpp ++++ b/mozilla/accessible/generic/ApplicationAccessible.cpp +@@ -28,6 +28,7 @@ ApplicationAccessible::ApplicationAccessible() : + { + mType = eApplicationType; + mAppInfo = do_GetService("@mozilla.org/xre/app-info;1"); ++ MOZ_ASSERT(mAppInfo, "no application info"); + } + + NS_IMPL_ISUPPORTS_INHERITED0(ApplicationAccessible, Accessible) +diff --git a/mozilla/accessible/generic/ApplicationAccessible.h b/mozilla/accessible/generic/ApplicationAccessible.h +index cee5051..04f3b52 100644 +--- a/mozilla/accessible/generic/ApplicationAccessible.h ++++ b/mozilla/accessible/generic/ApplicationAccessible.h +@@ -60,16 +60,24 @@ public: + // ApplicationAccessible + void AppName(nsAString& aName) const + { +- nsAutoCString cname; +- mAppInfo->GetName(cname); +- AppendUTF8toUTF16(cname, aName); ++ MOZ_ASSERT(mAppInfo, "no application info"); ++ ++ if (mAppInfo) { ++ nsAutoCString cname; ++ mAppInfo->GetName(cname); ++ AppendUTF8toUTF16(cname, aName); ++ } + } + + void AppVersion(nsAString& aVersion) const + { +- nsAutoCString cversion; +- mAppInfo->GetVersion(cversion); +- AppendUTF8toUTF16(cversion, aVersion); ++ MOZ_ASSERT(mAppInfo, "no application info"); ++ ++ if (mAppInfo) { ++ nsAutoCString cversion; ++ mAppInfo->GetVersion(cversion); ++ AppendUTF8toUTF16(cversion, aVersion); ++ } + } + + void PlatformName(nsAString& aName) const +@@ -79,9 +87,13 @@ public: + + void PlatformVersion(nsAString& aVersion) const + { +- nsAutoCString cversion; +- mAppInfo->GetPlatformVersion(cversion); +- AppendUTF8toUTF16(cversion, aVersion); ++ MOZ_ASSERT(mAppInfo, "no application info"); ++ ++ if (mAppInfo) { ++ nsAutoCString cversion; ++ mAppInfo->GetPlatformVersion(cversion); ++ AppendUTF8toUTF16(cversion, aVersion); ++ } + } + + protected: diff -Nru icedove-45.8.0/debian/patches/series icedove-45.8.0/debian/patches/series --- icedove-45.8.0/debian/patches/series 2017-03-15 01:37:48.000000000 +0100 +++ icedove-45.8.0/debian/patches/series 2017-03-30 01:28:32.000000000 +0200 @@ -46,3 +46,4 @@ porting-arm64/Bug-1091515-Don-t-set-64KB-page-size-on-aarch64.-r-glandi.patch porting-arm64/Bug-1257055-Use-jit-arm64-Architecture-arm64.h-on-non-JIT.patch fixes/Bug-1340724-fix-SMTP-server-name-output-in-SMTP-logging.-.patch +fixes/Bug-1273020-Add-missing-null-checks-in-ApplicationAccessi.patch diff -Nru icedove-45.8.0/debian/thunderbird-wrapper.sh icedove-45.8.0/debian/thunderbird-wrapper.sh --- icedove-45.8.0/debian/thunderbird-wrapper.sh 2017-03-15 01:37:48.000000000 +0100 +++ icedove-45.8.0/debian/thunderbird-wrapper.sh 2017-03-30 01:28:32.000000000 +0200 @@ -203,7 +203,7 @@ # is the correct one to use? elif { [ -d "${ID_PROFILE_FOLDER}" ] || [ -L "${ID_PROFILE_FOLDER}" ]; } && \ { [ -d "${TB_PROFILE_FOLDER}" ] || [ -L "${TB_PROFILE_FOLDER}" ]; } && \ - [ "$(readlink -e "${TB_PROFILE_FOLDER}")" != "${ID_PROFILE_FOLDER}" ]; then + [ "$(readlink -e "${TB_PROFILE_FOLDER}")" != "$(readlink -e "${ID_PROFILE_FOLDER}")" ]; then for CHECK in ${ID_PROFILE_FOLDER} ${TB_PROFILE_FOLDER}; do FILE_CHECK=$(readlink -e "${CHECK}") @@ -244,7 +244,7 @@ if [ "${DEBUGGER}" = "1" ]; then # checking for GDB if [ -f /usr/bin/gdb ]; then - if [ -f /usr/lib/debug/usr/lib/thunderbird/thunderbird ]; then + if dpkg-query -W -f='${Version}' thunderbird-dbg &>/dev/null ; then output_info "Starting Thunderbird with GDB ..." LANG='' "${MOZ_LIBDIR}"/run-mozilla.sh -g "${MOZ_LIBDIR}"/"${MOZ_APP_NAME}" "${TB_ARGS[@]}" else unblock icedove/1:45.8.0-3 -- System Information: Debian Release: 9.0 APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system)