diff options
Diffstat (limited to 'media-sound/lilypond')
| -rw-r--r-- | media-sound/lilypond/Manifest | 5 | ||||
| -rw-r--r-- | media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch | 101 | ||||
| -rw-r--r-- | media-sound/lilypond/lilypond-2.21.4-r1.ebuild | 133 | ||||
| -rw-r--r-- | media-sound/lilypond/lilypond-2.21.5.ebuild | 2 |
4 files changed, 2 insertions, 239 deletions
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest index bc196ef89ef0..5850c630aff1 100644 --- a/media-sound/lilypond/Manifest +++ b/media-sound/lilypond/Manifest @@ -1,11 +1,8 @@ AUX 50lilypond-gentoo.el 258 BLAKE2B f7db42921301c25260128a9e1e990985883b8959cd76b9dda1d67f7515f003b6e8986cfafb3988748e0b2eac5e6b64db943b376ade3fdaa63023b0b6ea5d6fab SHA512 6cffb5df0776b0d03725c534d8fd1acc09b222d964bf6480e0220c02612d7d1348e3c27da908cdc8de929549dc52678d582d620c00cf35f82aaa2203e7b4d69e AUX lilypond-2.21.1-fix-font-size.patch 505 BLAKE2B 33f98803eea6a87082a9c724bb88ea6fc9493f97856f8c581f28c786010ce215a6626970eec602d8d311ec5e84f5485cf7a3cfd3fdc1099c8096ca5af28aeae6 SHA512 a59c00e4f2c44797e4e7656bc7f097b644399a211c691c8ca1502dfbdc0806ce9efbc24644675b2d246f585b74a17bd1895a5bb830fe10cda2e6dc7c0846848c -AUX lilypond-fix-cve-2020-17353.patch 2867 BLAKE2B 135d6ccc6ed93786189b54ea77219d527e6febd59434a10b33255e2d3c21db600ea9e231d852d188a8933c6acf5f1567f48c4b7e8f905f8bc87dda1b13d8d936 SHA512 83f513a6c4999579102b592e7babc556f49a4d04f799203ff790ec211c0744a91a17700b6742c3a2044ef90c2ce52a6f768f69f376952867715315bc8096689c -DIST lilypond-2.21.4.tar.gz 18011766 BLAKE2B fe9731a170ec6e551bd5e2259cca33e1c69ee5dedccaf39e7026afe3342da8d301f7450450122f4e102915d4469dddb89575b3a75db21e988d526d9b683bcc38 SHA512 29d671d411cf3817e8a62f208bec4c8d74a08c3a54b8856c1474cfa736e2882c5418b52af2675598093fae2b77c2ba4c812aae9164d99c9643ff18271cee6860 DIST lilypond-2.21.5.tar.gz 18005124 BLAKE2B d41f2baaeb0e72905f688bf7bd88e9acdc1eabc1bf69a05e8d5208f8ffc06197830c6b6ff1f09034eebc15fc4d94f6909848940361e06120530abc67b10aa87e SHA512 bcc72d0d040125fc9e4f7447e31af59959cae8c1afef1f6c4b7fb1fdbf037931a94d64c94b6b26e37de7d66ec52f24b2ba1b4fd0a6e0862b82eeef3c86d94958 DIST lilypond-2.21.6.tar.gz 17996701 BLAKE2B 2efbdae1bd16ab1682c14c1c0e01146d66dd408ff5d3f9b69ed38dcedd88b68c6ae3219b02e7a3967833d802488a90aecf50964f44ebb5445f887d4a532a41ad SHA512 9effceabe39a0ca5f3837e0ff1cb0d4caed87b4b76e40f7c4f618d682b2e3db8f82e461e5c9555d6c05d591be54a08370599ed8c72d1e92ba80bcabf4d21a6f7 -EBUILD lilypond-2.21.4-r1.ebuild 3053 BLAKE2B f8f2f771482766d84725f1237f65a3fd7d9f83043a9458ef0f9484609fb27e0a83586956a091cfa75b31a4c567cacf60cea51a6e8052c49d2428dd08abf0f997 SHA512 0a089d91141293c8c85f839c00b7524afb1fb4cc06a78eea49faa16d3c678c904fd393eaf1aa007015f029eaed18cc71fd4ddbf34ae78436c3c8e6c6670eee3a -EBUILD lilypond-2.21.5.ebuild 3343 BLAKE2B 77b92a732c68cefb1c1cdff69ed0e54b20b633d6b5ee1a292d543a45385bafe67594381d9b0ebbfa4a42f92cdc56509f0a0295c0c983b28bab027c525a3f93bd SHA512 6f6cb65f7e1a951ea2a1039bece43658471ff32cdfa5159649b87fd83681b3923ca2c05254417c2d54a9608afbecf004c50738be90f7e29ef6091d4b07dc208b +EBUILD lilypond-2.21.5.ebuild 3340 BLAKE2B a81e2194ec53dfba4f7dfc6159e591a2cce5b43dac3b60d193fbe8ad21f3f491ee85734cdff90e5783c5d5da36ac9dc069f8a82e3430cc425b3f9ae9692deace SHA512 800ae82e1574a273a4338127b7d08264c0f271e4a4d6d2d1677a884fd2a6718e856e8023793d8153a40d09a5ca95399e25eb32aecfc4615f6b720fb287ec8eda EBUILD lilypond-2.21.6.ebuild 3264 BLAKE2B 733deba469734f1a9b5446258c87a35a9cdc05b887e7ff97772608780614d7b317e10a1781d3907f983cc8ba36ee74069eafb2fe3db1e96acd5cc77ba70059c8 SHA512 5437df0f0642ca4375fd2c03f358c782be2cce1a5867dbec647cea56a69753f488b9a094d39f84e3093048a48f98e8b44a693fb1e4415313f0c25c8bc68c9eb0 EBUILD lilypond-9999.ebuild 3264 BLAKE2B 733deba469734f1a9b5446258c87a35a9cdc05b887e7ff97772608780614d7b317e10a1781d3907f983cc8ba36ee74069eafb2fe3db1e96acd5cc77ba70059c8 SHA512 5437df0f0642ca4375fd2c03f358c782be2cce1a5867dbec647cea56a69753f488b9a094d39f84e3093048a48f98e8b44a693fb1e4415313f0c25c8bc68c9eb0 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e diff --git a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch b/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch deleted file mode 100644 index e91947eae056..000000000000 --- a/media-sound/lilypond/files/lilypond-fix-cve-2020-17353.patch +++ /dev/null @@ -1,101 +0,0 @@ -From b84ea4740f3279516905c5db05f4074e777c16ff Mon Sep 17 00:00:00 2001 -From: Han-Wen Nienhuys <hanwenn@gmail.com> -Date: Tue, 21 Jul 2020 14:45:08 +0200 -Subject: [PATCH] scm: disable embedded-ps and embedded-svg in -dsafe mode - -This prevents executing privileged PostScript and exploiting -Ghostscript vulnerablilities - -Tested: - $ lilypond -dsafe input/regression/les-nereides.ly - (works, kinda) - - $ cat f.ly - { c4_ \markup \postscript #" (x) show " } - - $ lilypond -dsafe f - Preprocessing graphical objects.../home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: In procedure ly_make_stencil in expression (ly:make-stencil (list # #) (quote #) ...): - /home/hanwen/vc/lilypond/out/share/lilypond/current/scm/define-markup-commands.scm:1145:3: Wrong type argument in position 1 (expecting registered stencil expression): (embedded-ps " ---- - scm/define-stencil-commands.scm | 65 ++++++++++++++++++++++------------------- - 1 file changed, 35 insertions(+), 30 deletions(-) - -diff --git a/scm/define-stencil-commands.scm b/scm/define-stencil-commands.scm -index 09a2299..e388788 100644 ---- a/scm/define-stencil-commands.scm -+++ b/scm/define-stencil-commands.scm -@@ -21,36 +21,41 @@ - (define-public (ly:all-stencil-commands) - "Return the list of stencil commands that can be - defined in the output modules (@file{output-*.scm})." -- '(blank -- char -- circle -- dashed-line -- draw-line -- ellipse -- embedded-ps -- embedded-svg -- end-group-node -- glyph-string -- grob-cause -- named-glyph -- no-origin -- page-link -- path -- partial-ellipse -- placebox -- polygon -- resetcolor -- resetrotation -- resetscale -- round-filled-box -- setcolor -- setrotation -- setscale -- start-group-node -- text -- unknown -- url-link -- utf-8-string -+ (let* -+ ((commands '(blank -+ char -+ circle -+ dashed-line -+ draw-line -+ ellipse -+ end-group-node -+ glyph-string -+ grob-cause -+ named-glyph -+ no-origin -+ page-link -+ path -+ partial-ellipse -+ placebox -+ polygon -+ resetcolor -+ resetrotation -+ resetscale -+ round-filled-box -+ setcolor -+ setrotation -+ setscale -+ start-group-node -+ text -+ unknown -+ url-link -+ utf-8-string -+ ))) -+ -+ (if (ly:get-option 'safe) -+ commands -+ (append '(embedded-ps embedded-svg) -+ commands)) - )) - - ;; TODO: --- -1.9.1 - diff --git a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild b/media-sound/lilypond/lilypond-2.21.4-r1.ebuild deleted file mode 100644 index 7d751530c323..000000000000 --- a/media-sound/lilypond/lilypond-2.21.4-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) - -inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils - -if [[ "${PV}" = "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.savannah.gnu.org/git/lilypond.git" -else - MAIN_VER=$(ver_cut 1-2) - SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz" - KEYWORDS="amd64 ~arm arm64 ~hppa x86" -fi - -DESCRIPTION="GNU Music Typesetter" -HOMEPAGE="http://lilypond.org/" - -LICENSE="GPL-3 FDL-1.3" -SLOT="0" -IUSE="debug emacs guile2 profile vim-syntax" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - >=dev-texlive/texlive-metapost-2020 - >=sys-apps/texinfo-4.11 - >=sys-devel/bison-2.0 - sys-devel/flex - virtual/pkgconfig -" -RDEPEND=">=app-text/ghostscript-gpl-8.15 - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - media-fonts/tex-gyre - media-libs/fontconfig - media-libs/freetype:2 - >=x11-libs/pango-1.12.3 - emacs? ( >=app-editors/emacs-23.1:* ) - guile2? ( >=dev-scheme/guile-2.2:12 ) - !guile2? ( - >=dev-scheme/guile-1.8.2:12=[deprecated,regex] - <dev-scheme/guile-2.0:12 - ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - app-text/t1utils - dev-lang/perl - dev-libs/kpathsea - media-gfx/fontforge[png,python] - sys-devel/gettext" - -# Correct output data for tests isn't bundled with releases -RESTRICT="test" - -PATCHES=( - "${FILESDIR}"/${PN}-2.21.1-fix-font-size.patch - "${FILESDIR}"/${PN}-fix-cve-2020-17353.patch -) - -DOCS=( DEDICATION HACKING README.txt ROADMAP ) - -src_prepare() { - default - - if ! use vim-syntax ; then - sed -i 's/vim//' GNUmakefile.in || die - fi - - # respect CFLAGS - sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die - - # remove bundled texinfo file (fixes bug #448560) - rm tex/texinfo.tex || die - - eautoreconf - - xdg_environment_reset #586592 -} - -src_configure() { - # fix hardcoded `ar` - sed -i "s/AR=ar/AR=$(tc-getAR)/g" flower/GNUmakefile || die "Failed to fix ar command" - - # documentation generation currently not supported since it requires a newer - # version of texi2html than is currently in the tree - local myeconfargs=( - --with-texgyre-dir=/usr/share/fonts/tex-gyre - --disable-documentation - --disable-optimising - --disable-pipe - $(use_enable debug debugging) - $(use_enable profile profiling) - ) - - export VARTEXFONTS="${T}/fonts" # https://bugs.gentoo.org/692010 - - econf "${myeconfargs[@]}" AR="$(tc-getAR)" -} - -src_compile() { - default - - if use emacs ; then - elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \ - || die "elisp-compile failed" - fi -} - -src_install() { - emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install - - # remove elisp files since they are in the wrong directory - rm -r "${ED}"/usr/share/emacs || die - - if use emacs ; then - elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \ - || die "elisp-install failed" - elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el - fi - - python_fix_shebang "${ED}" - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/media-sound/lilypond/lilypond-2.21.5.ebuild b/media-sound/lilypond/lilypond-2.21.5.ebuild index c03d4b781515..a213efeabbd2 100644 --- a/media-sound/lilypond/lilypond-2.21.5.ebuild +++ b/media-sound/lilypond/lilypond-2.21.5.ebuild @@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then else MAIN_VER=$(ver_cut 1-2) SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86" + KEYWORDS="amd64 ~arm arm64 ~hppa x86" fi DESCRIPTION="GNU Music Typesetter" |