[arch-commits] Commit in lilypond/trunk (3 files)
Date: Tuesday, October 27, 2020 @ 00:30:19
Author: dvzrv
Revision: 734106
upgpkg: lilypond 2.20.0-4: Rebuild to fix CVE-2020-17353.
Change pkgdesc to upstream description.
Switch url to https.
Add all used licenses: FDL1.3, GPL3, OFL.
Add to pro-audio group.
Add all available soname deps in package() and the respective packages to
makedepends.
Add all direct dependencies to depends.
Remove lilyfontsize.patch which was only added due to a misbehaving desktop
environment.
Add upstream patch for CVE-2020-17353 (FS#67680).
Run autoconf in prepare() instead of autogen.sh (all heuristics in there are
not needed).
Install custom license and docs.
Update maintainer info.
Added:
lilypond/trunk/lilypond-2.20.0-CVE-2020-17353.patch
Modified:
lilypond/trunk/PKGBUILD
Deleted:
lilypond/trunk/lilyfontsize.patch
--+
PKGBUILD | 62 +++---
lilyfontsize.patch | 13 -
lilypond-2.20.0-CVE-2020-17353.patch | 76 +
3 files changed, 112 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-10-27 00:09:45 UTC (rev 734105)
+++ PKGBUILD2020-10-27 00:30:19 UTC (rev 734106)
@@ -1,45 +1,55 @@
-# Maintainer: Evgeniy Alekseev
-# Maintainer: Sergej Pupykin
-# Maintainer: Geoffroy Carrier
+# Maintainer: David Runge
+# Contributor: Evgeniy Alekseev
+# Contributor: Sergej Pupykin
+# Contributor: Geoffroy Carrier
# Contributor: William Rea
# Contributor: Robert Emil Berge
pkgname=lilypond
pkgver=2.20.0
-pkgrel=3
-pkgdesc="An automated music engraving system"
+pkgrel=4
+pkgdesc="Music engraving program, devoted to producing the highest-quality
sheet music possible"
arch=('x86_64')
-url="http://lilypond.org";
-license=('GPL')
-depends=('fontconfig' 'freetype2' 'guile1.8' 'ghostscript' 'glib2' 'pango')
+url="https://lilypond.org";
+license=('FDL1.3' 'GPL3' 'custom:OFL')
+groups=('pro-audio')
+depends=('gcc-libs' 'ghostscript' 'glibc' 'guile1.8' 'ttf-dejavu')
+# TODO: package extractpdfmark
+makedepends=('dblatex' 'fontconfig' 'fontforge' 'freetype2' 'glib2'
+'gnu-free-fonts' 'gsfonts' 'imagemagick' 'mftrace' 'netpbm' 'pango' 'python2'
+'rsync' 't1utils' 'texi2html' 'texinfo' 'texlive-core' 'tex-gyre-fonts'
+'texlive-langcyrillic' 'ttf-bitstream-vera' 'ttf-liberation'
+'ttf-linux-libertine' 'zip')
optdepends=('python2: for lilypond-book and other scripts')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
- 'gsfonts' 'texi2html' 'dblatex' 'texlive-langcyrillic'
'imagemagick'
- 'zip' 'rsync' 'netpbm' 'texlive-core' 'tex-gyre-fonts' 'python2')
options=('emptydirs')
-source=("http://lilypond.org/downloads/sources/v${pkgver%.*}/$pkgname-$pkgver.tar.gz";
- lilyfontsize.patch)
-sha256sums=('595901323fbc88d3039ca4bdbc2d8c5ce46b182edcb3ea9c0940eba849bba661'
-'17b86b7a0b09b73cb5cf8751464571cf6a785c0b1a23db425cc828855a9d8ae6')
+source=("https://lilypond.org/downloads/sources/v${pkgver%.*}/$pkgname-$pkgver.tar.gz";
+"${pkgname}-2.20.0-CVE-2020-17353.patch")
+sha512sums=('8c5749576362b8c8acaed9eed50f22fdbf986bbe1733219921e366166d9cb829ffb280bfec936647248ddc48b3441af67a4e9d4023e003fdc7522d913f83928a'
+
'99663585ceed5493cc25e34c85f68328254d55822d66767f8384d058218835d24179b938547d303f84b33dae328b2b9734748a1c58186a7f279695d76f5ac2b7')
+b2sums=('1bf4aa1db189b6a2c4be9b9f35a0ac913533640cc2ca6327492909cf71218bba7a31ca3c5a84a94746e361e2f985fe1b73e4ad6fbea13927e465f7b7f14bd16a'
+
'6a5b7ab61da2a7e96aa54c411784fc7d698afdc3cfded9bfd3e50639c083aa400edf58f5c041a360a36ac418f00c851ca45a56aa2d008baa56d5422c15a42f37')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- sed -e 's|1.82, 1.82|1.82|g' -i configure.ac # Remove version constraint on
texi2html
-
- patch -p1 -i "$srcdir/lilyfontsize.patch"
-
- ./autogen.sh --noconf
+ cd "$pkgname-$pkgver"
+ # fix CVE-2020-17353: FS#67680
+ patch -Np1 -i "../${pkgname}-2.20.0-CVE-2020-17353.patch"
+ # Remove version constraint on texi2html
+ sed -e 's|1.82, 1.82|1.82|g' -i configure.ac
+ autoconf --force --verbose
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure \
---prefix=/usr
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ depends+=('libfontconfig.so' 'libfreetype.so' 'libglib-2.0.so'
+ 'libgobject-2.0.so' 'libpangoft2-1.0.so' 'libpango-1.0.so')
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" vimdir="/usr/share/vim/vimfiles" install
+ install -vDm 644 LICENSE.OFL -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+ install -vDm 644 {AUTHORS,NEWS,README}.txt \
+-t "${pkgdir}/usr/share/doc/${pkgname}/"
}
Deleted: lilyfontsize.patch
===
--- lilyfontsize.patch 2020-10-27 00:09:45 UTC (rev 734105)
+++ li
[arch-commits] Commit in lilypond/trunk (3 files)
Date: Wednesday, December 25, 2013 @ 09:45:03
Author: bgyorgy
Revision: 102972
upgpkg: lilypond 2.16.2-4
Fix build, temporary disable .install file (FS#35814)
Added:
lilypond/trunk/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
lilypond/trunk/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
Modified:
lilypond/trunk/PKGBUILD
-+
PKGBUILD| 17 ++
lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch | 29
lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch | 63 ++
3 files changed, 105 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-12-25 07:48:18 UTC (rev 102971)
+++ PKGBUILD2013-12-25 08:45:03 UTC (rev 102972)
@@ -6,7 +6,7 @@
pkgname=lilypond
pkgver=2.16.2
-pkgrel=3
+pkgrel=4
pkgdesc="An automated music engraving system"
arch=('i686' 'x86_64')
url="http://lilypond.org";
@@ -15,9 +15,13 @@
makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
'gsfonts' 'texi2html')
options=('emptydirs')
-install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz)
-md5sums=('6db27f17d47e4f66a3b0716c65db3041')
+#install=lilypond.install
+source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz
+lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
+lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch)
+md5sums=('6db27f17d47e4f66a3b0716c65db3041'
+ '121ac86f1004338ae20ad55a5690c0ad'
+ 'fa5073506f0e4dd96fb1858e3a75e08e')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -32,6 +36,10 @@
sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|'
configure
rm -rf python/out/
+
+ # Fix build
+ patch -Np1 -i
"$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch"
+ patch -Np1 -i
"$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch"
}
build() {
@@ -39,6 +47,7 @@
export PYTHON=/usr/bin/python2
export GUILE=/usr/bin/guile1.8
export GUILE_CONFIG=/usr/bin/guile-config1.8
+ export LDFLAGS="$LDFLAGS -lpthread"
./configure --prefix=/usr --disable-documentation
make
}
Added: lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
===
--- lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
(rev 0)
+++ lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch 2013-12-25
08:45:03 UTC (rev 102972)
@@ -0,0 +1,29 @@
+From: Julien Rioux
+Date: Mon, 28 Oct 2013 20:42:43 + (+0100)
+Subject: Build: Fix compilation with GNU make 4.0
+X-Git-Tag: release/2.17.95-1~4^2
+X-Git-Url:
http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=1ca9814191d16fd3c571d93035247db039254fc1;hp=025f0236ebab947e6fe2047f20b7f74f4cec3fc4
+
+Build: Fix compilation with GNU make 4.0
+
+Fix "recipes commence before first target" error.
+
+Patch from Thomas Klausner.
+---
+
+diff --git a/stepmake/stepmake/po-targets.make
b/stepmake/stepmake/po-targets.make
+index 8919dab..8a0dd76 100644
+--- a/stepmake/stepmake/po-targets.make
b/stepmake/stepmake/po-targets.make
+@@ -37,10 +37,10 @@ ifneq ($(strip $(ALL_PO_SOURCES)),)
+--keyword=_ --keyword=_f --keyword=_i \
+$(XGETTEXT_FLAGS) $(ALL_PO_SOURCES)
+ endif
+-endif
+ sed -i '1,2d' $(po-outdir)/$(package).po
+ sed -i -e 's/^\# This file is distributed.*/$(sed-header)/'
$(po-outdir)/$(package).po
+ sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/'
$(po-outdir)/$(package).po
++endif
+
+
+ po-update: po
Added: lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
===
--- lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
(rev 0)
+++ lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch 2013-12-25
08:45:03 UTC (rev 102972)
@@ -0,0 +1,63 @@
+From: Werner Lemberg
+Date: Thu, 5 Dec 2013 14:01:48 + (+0100)
+Subject: Issue 3694: Use standard inclusion scheme for FreeType headers.
+X-Git-Url:
http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=7705e46966bfa05015fb9fb20c68da844ab88028;hp=88435714e762229ebe2715bcf6863eb89c1f8dff
+
+Issue 3694: Use standard inclusion scheme for FreeType headers.
+
+The most recent FreeType release (2.5.1) has changed locations for header
+files. Using the standard way, this is not visible to applications.
+---
+
+diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
+index 00e5cae..88af76c 100644
+--- a/lily/freetype-error.cc
b/lily/freetype-error.cc
+@@ -31,7 +31,7 @@ const struct Freetype_error_message
+ const char *err_msg;
+ } ft_errors[] =
+
+-#include
