From: Peter Michael Green Date: Wed, 23 Dec 2020 05:26:09 +0000 (+0000) Subject: Manual merge of version 1:20190801~dfsg-4+rpi1 and 1:20201107~dfsg-2 to produce 1... X-Git-Tag: archive/raspbian/1%20201107_dfsg-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7792e1ad5bfcb635f472958c41df814231884471;p=fontforge.git Manual merge of version 1:20190801~dfsg-4+rpi1 and 1:20201107~dfsg-2 to produce 1:20201107~dfsg-2+rpi1 --- 7792e1ad5bfcb635f472958c41df814231884471 diff --cc debian/changelog index 0b74a0c,d48088d..5da3cde --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,111 +1,120 @@@ - fontforge (1:20190801~dfsg-4+rpi1) bullseye-staging; urgency=medium ++fontforge (1:20201107~dfsg-2+rpi1) bullseye-staging; urgency=medium + ++ [changes brought forward from 1:20190801~dfsg-4+rpi1 by Peter Michael Green at Wed, 01 Apr 2020 17:53:42 +0000] + * Disable call to SplineFontFree in _MergeFont to work around use after + free bug (see debian bug 948876). + * Fix clean target. + - -- Peter Michael Green Wed, 01 Apr 2020 17:53:42 +0000 ++ -- Peter Michael Greem Wed, 23 Dec 2020 05:24:44 +0000 ++ + fontforge (1:20201107~dfsg-2) unstable; urgency=medium + + * debian/libfontforge4.install: Fix incorrect path. For example, on i386, + /usr/bin/${DEB_HOST_GNU_TYPE} resolves to /usr/bin/i686-linux-gnu which + does not exist on Debian, whereas /usr/bin/${DEB_HOST_MULTIARCH} correctly + resolves to /usr/bin/i386-linux-gnu that we need (Closes: #975460) + * debian/rules: Fix binary-indep build by adding override_dh_missing-indep + * Add debian/python3-fontforge.lintian-overrides + as Lintian fails to find libfontforge.so.4 (from libfontforge4 package) + and thus raises false library-not-linked-against-libc errors + * Update debian/libfontforge4.lintian-overrides + to point the new location of libfontforge.so.4 + * Remove obsolete debian/libfontforge-dev.links + * Add debian/patches/2004-fix-privacy-breach-logo.patch + to fix Lintian privacy-breach-logo errors in the Japanese translation + of old FontForge documentation + * Add 0003-use-local-libjs-mathjax.patch and fontforge-doc.links + to fix Lintian privacy-breach-generic warnings + * Fix Lintian link-to-shared-library-in-wrong-package warning by removing + unused usr/lib/*/libfontforge.so symlink from libfontforge4 package + * Mark libfontforge4 and python3-fontforge "Multi-Arch: same" + as suggested by Multiarch hinter + + -- Anthony Fok Tue, 24 Nov 2020 18:21:25 -0700 + + fontforge (1:20201107~dfsg-1) unstable; urgency=medium + + [ Jonas Smedegaard ] + * New upstream version 20200314~dfsg (Closes: #963194) + + Fixes two security vulnerabilities: + - CVE-2020-5395 (use-after-free in SFD_GetFontMetaData in sfd.c) + - CVE-2020-5496 (heap-based buffer overflow in the Type2NotDefSplines() + function in splinesave.c) + that were found in FontForge 20190801 (Closes: #948231) + * copyright: update overage + * use buildsystem cmake+ninja (not autotools); + build-depend on cmake ninja-build + (not libltdl-dev autoconf-archive) + * stop build-depend on chrpath + (unused since 1:20160404~dfsg-1) + * update install paths + (upstream installs appdata in correct path now) + * drop patches 0003 0004 2002 3000: + obsoleted by new upstream release + * update (and reduce) patch 2003 + * add patches cherry-picked upstream to fix a range of issues + Fixes "FTBFS on 64-bit big endian: test failures" (Closes: #961841) + * bump library API major version to 4 + * drop libgdraw package: + upstream no longer provides that as shared library + * stop ship python simple/* scripts: + No longer installed upstream + * Temporarily omit installing scripts for fontforge-extras, + seemingly not built upstream + * build sphinx documentation; + build-depend on dh-sequence-sphinxdoc + * stop ship extra libraries libgunicode.so libgutils.so: + upstream no longer provides those as shared library + + [ Hideki Yamane ] + * specify dh 13 + * fix to add ${DEB_HOST_MULTIARCH} for libfontforge.so path + * Add python3-sphinx for document build for GUI build + * Add more build options MAINTAINER_TOOLS and WRITE_PFM + + [ Anthony Fok ] + * New upstream version 20201107~dfsg (FontForge 20th Anniversary Edition) + + Display issues on Wayland are now fixed (Closes: #961640) + * Remove cherry-picked upstream patches as they are included in 20201107 + * debian/rules: Change override_dh_* to execute_before_dh_* where possible + * Remove libfontforge-dev package. Upstream has decided to stop installing + development files since 20200314 due to unstable stable API or ABI etc. + No Debian package has ever build-depended on libfontforge-dev either. + * Install README.md instead of the now nonexistent README + * debian/control: Add ${sphinxdoc:Depends} and ${sphinxdoc:Built-Using} + for python3-fontforge + * debian/rules: Remove manual call to sphinx-build + as it is already called by upstream doc/CMakeLists.txt + * Restore files that were installed to fontforge-extras and python3-fontforge + prior to the FontForge 2020 March Release by patching CMakeLists.txt + files, see debian/patches/0001-add-extra-cmake-install-rules.patch + * Add debian/libfontforge4.install as we no longer uses d-shlibs + * Add and fix other debian/*.install, debian/*.manpages and debian/rules + so that all files are installed properly + * Add debian/not-installed to remove dh_missing fail-missing errors + * Remove upstream setting that sets custom RPATH/RUNPATH. + Fixes Lintian custom-library-search-path errors. + See debian/patches/0002-remove-custom-library-search-path.patch + * Fix package description for fontforge-extras + where most provided programs have been renamed + * Add debian/clean to remove build/ and doc/sphinx/_extensions/__pycache__/ + * Add myself to the list of Uploaders and to debian/copyright + + -- Anthony Fok Wed, 18 Nov 2020 01:42:18 -0700 + + fontforge (1:20190801~dfsg-5) unstable; urgency=medium + + * build-depend on debhelper-compat (not debhelper) + * simplify rules; + build-depend on dh-sequence-python3 (not cdbs dh-buildinfo dh-python) + * stop build-depend on autotools-dev dh-autoreconf + (superfluous, handled by autoreconf) + * stop fix executable bit of python libraries + (handled by dh_python3 now, apparently) + * check testsuite during build + * copyright: fix update coverage + + -- Jonas Smedegaard Fri, 29 May 2020 20:02:39 +0200 fontforge (1:20190801~dfsg-4) unstable; urgency=high diff --cc debian/patches/series index ac86ad0,9756793..550a60c --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,6 -1,5 +1,6 @@@ - 2002_avoid_upstream_git_or_pkg.patch + 0001-add-extra-cmake-install-rules.patch + 0002-remove-custom-library-search-path.patch + 0003-use-local-libjs-mathjax.patch 2003_avoid_privacy_breach.patch - 0003-ignore-osx-files.patch - 0004-fix-wrong-xml-tag.patch - 3000-debian-bug-952408.patch + 2004-fix-privacy-breach-logo.patch +4000-use-after-free-hack.patch diff --cc debian/rules index 626e596,f06710e..3578822 --- a/debian/rules +++ b/debian/rules @@@ -28,57 -8,55 +8,59 @@@ export DEB_BUILD_MAINT_OPTIONS := harde # For cross-friendly CC variable -include /usr/share/dpkg/buildtools.mk - dev-deps = cairo2 freetype gif jpeg pango1.0 png spiro tiff5 - dev-deps += uninameslist xml2 xt glib2.0 python3.8 woff gtk-3 + # avoid libtool files in python3-fontforge or fonts in fontforge-common + export DH_OPTIONS = -X.la -X.ttf + + # build with X11 into subdir, to ensure non-X11 build is not missed + export DH_OPTIONS += -O--builddirectory=build/x + + # build with ninja (not make) per upstream recommendation + export DH_OPTIONS += -O--buildsystem=cmake+ninja - CDBS_BUILD_DEPENDS +=, $(patsubst %,$(comma) lib%-dev,$(dev-deps)) - CDBS_BUILD_DEPENDS +=, python3, python3-dev, uthash-dev DEB_CONFIGURE_EXTRA_FLAGS = \ - --prefix=/usr \ - --libdir=\$${prefix}/lib \ - --mandir=\$${prefix}/share/man \ - --enable-tile-path \ - --enable-debug-raw-points \ - --enable-fontforge-extras \ - --enable-python-scripting=3 \ - --enable-python-extension PYTHON_LIBS='$(shell python3-config --ldflags --embed)' - - DEB_CONFIGURE_FLAGS_x = --enable-gdk - DEB_CONFIGURE_FLAGS_nox = --without-x - - DEB_DH_INSTALL_SOURCEDIR = debian/tmp/x - binary-install/fontforge-nox:: DEB_DH_INSTALL_SOURCEDIR = debian/tmp/nox - - binary-install/python3-fontforge:: - find debian/python3-fontforge -name "*.la" -delete - dh_python3 -ppython3-fontforge - - binary-install/fontforge-common:: - find debian/fontforge-common/ -name "*.ttf" -delete - - binary-fixup/python-fontforge:: - chmod -x \ - debian/python3-fontforge/usr/share/fontforge/python/simple/*.py - - DEB_DH_STRIP_ARGS := '--dbgsym-migration=fontforge-dbg (<< 1:20170731~dfsg-2~)' - CDBS_BUILD_DEPENDS +=, d-shlibs (>= 0.88~) - binary-post-install/$(libpkg) binary-post-install/$(devpkg):: debian/stamp-local-shlibs-$(lib) - debian/stamp-local-shlibs-$(lib): binary-install/$(libpkg) binary-install/$(devpkg) - d-shlibmove --commit \ - --devunversioned \ - --exclude-la \ - --extralib debian/tmp/x/usr/lib/libgunicode.so \ - --extralib debian/tmp/x/usr/lib/libgutils.so \ - --movedev "debian/tmp/x/usr/include/*" usr/include/ \ - --movedev "debian/tmp/x/usr/lib/pkgconfig/*.pc" usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig \ - --override s/$(lib)$(major)-dev/$(lib)-dev/ \ - --override s/libpython3.8-1.0-dev/libpython3.8-dev/ \ - debian/tmp/x/usr/lib/$(lib).so - touch $@ - clean:: - rm -f debian/stamp-local-shlibs-$(lib) + -DENABLE_MAINTAINER_TOOLS=ON \ + -DENABLE_WRITE_PFM=ON \ + -DENABLE_TILE_PATH=ON \ + -DENABLE_DEBUG_RAW_POINTS=ON \ + -DENABLE_FONTFORGE_EXTRAS=ON + + ifneq (,$(filter nodoc,$(DEB_BUILD_OPTIONS))) + DEB_CONFIGURE_EXTRA_FLAGS += -DENABLE_DOCS=OFF + endif + + override_dh_auto_configure: + dh_auto_configure --builddirectory=build/nox -- \ + $(DEB_CONFIGURE_EXTRA_FLAGS) -DENABLE_GUI=OFF -DENABLE_DOCS=OFF + dh_auto_configure -- \ + $(DEB_CONFIGURE_EXTRA_FLAGS) + + execute_before_dh_auto_build: + dh_auto_build --builddirectory=build/nox + + override_dh_auto_install: + dh_auto_install --builddirectory=build/nox --destdir=debian/tmp/nox + dh_auto_install --destdir=debian/tmp/x + + override_dh_install: + dh_install --package=fontforge-nox --sourcedir=debian/tmp/nox + dh_install --remaining-packages --sourcedir=debian/tmp/x + + override_dh_installdocs: + dh_installdocs --all -- README.md AUTHORS + + override_dh_installman: + dh_installman --sourcedir=debian/tmp/x + + override_dh_missing-indep: + dh_missing -i --list-missing + + override_dh_strip: + dh_strip --dbgsym-migration='fontforge-dbg (<< 1:20170731~dfsg-2~)' + ++override_dh_auto_clean: ++ dh_auto_clean + rm -rf build + # track symbols using pkgkde-symbolshelper - include /usr/share/pkg-kde-tools/makefiles/1/cdbs/symbolshelper.mk - CDBS_BUILD_DEPENDS +=, pkg-kde-tools + %: + dh $@ --with pkgkde_symbolshelper