diff options
43 files changed, 931 insertions, 625 deletions
diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index 753284cd4..468529e4f 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 96278 2013-08-23 11:35:11Z arodseth $ +# $Id: PKGBUILD 97340 2013-09-18 11:57:55Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gendesk -pkgver=0.5.3 +pkgver=0.5.4 pkgrel=1 pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') @@ -12,17 +12,17 @@ makedepends=('go') depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" 'http://roboticoverlords.org/images/default.png') -sha256sums=('f6f2db255bd5ea978c00f165cfd8e298a1427ec79e7ec265d50b84a8d45d0144' +sha256sums=('cc065c6285a685daf9eb0d16b035f6420b2ef204a447e750bcd03ab12a240c56' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" go build } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png" diff --git a/community/gtkglarea/PKGBUILD b/community/gtkglarea/PKGBUILD new file mode 100644 index 000000000..11d03fa3e --- /dev/null +++ b/community/gtkglarea/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> +# Contributor: Andreas B. Wagner <AndreasBWagner@pointfree.net> +# Contributor: arjan <arjan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: SpepS <dreamspepser at yahoo dot it> + +pkgname=gtkglarea +pkgver=2.0.1 +pkgrel=3 +pkgdesc="GTK/GL Area libraries" +arch=('i686' 'x86_64') +url="http://mono-project.com/GtkGLArea" +license=('GPL') +depends=('gtk2' 'glu') +options=('!libtool') +source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.0/$pkgname-$pkgver.tar.gz") +md5sums=('2a81a86cfa80a920a5454dd00fad2e1d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # DSO link fix + LDFLAGS+=" -lm" \ + ./configure --prefix=/usr \ + --enable-static=no + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/haskell-aeson/PKGBUILD b/community/haskell-aeson/PKGBUILD new file mode 100644 index 000000000..ff4d02824 --- /dev/null +++ b/community/haskell-aeson/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> + +pkgname=haskell-aeson +_hkgname=aeson +pkgver=0.6.2.0 +pkgrel=1 +pkgdesc="A JSON parsing and encoding library optimized for ease of use and high performance." +url="https://github.com/bos/aeson" +license=("GPL") +arch=('i686' 'x86_64') +makedepends=('ghc') +depends=(haskell-attoparsec haskell-blaze-builder haskell-unordered-containers haskell-mtl + haskell-syb haskell-vector haskell-dlist) +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") +install=$pkgname.install +md5sums=('1851b00fd472929ecbbf83881b09e26e') + +build() { + cd "$srcdir/$_hkgname-$pkgver" + runhaskell Setup configure -O --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/$pkgname \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd "$srcdir/$_hkgname-$pkgver" + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" +} diff --git a/community/haskell-aeson/haskell-aeson.install b/community/haskell-aeson/haskell-aeson.install new file mode 100644 index 000000000..8993bb435 --- /dev/null +++ b/community/haskell-aeson/haskell-aeson.install @@ -0,0 +1,23 @@ +HS_DIR=usr/share/haskell/haskell-aeson + +post_install() { + $HS_DIR/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + $HS_DIR/unregister.sh +} + +post_upgrade() { + $HS_DIR/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + $HS_DIR/unregister.sh +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-attoparsec/PKGBUILD b/community/haskell-attoparsec/PKGBUILD new file mode 100644 index 000000000..8c42cda7c --- /dev/null +++ b/community/haskell-attoparsec/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> + +pkgname=haskell-attoparsec +_hkgname=attoparsec +pkgver=0.10.4.0 +pkgrel=1 +pkgdesc="Conversion of LaTeX math formulas to MathML." +url="https://github.com/bos/attoparsec" +license=("GPL") +arch=('i686' 'x86_64') +makedepends=('ghc') +depends=(haskell-text) +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") +install=$pkgname.install +md5sums=('2b9ec5768797e8c649bf36efa9ef97e2') + +build() { + cd "$srcdir/$_hkgname-$pkgver" + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/$pkgname \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd "$srcdir/$_hkgname-$pkgver" + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s /usr/share/doc/$pkgname/html "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" +} diff --git a/community/haskell-attoparsec/haskell-attoparsec.install b/community/haskell-attoparsec/haskell-attoparsec.install new file mode 100644 index 000000000..1bfe3c452 --- /dev/null +++ b/community/haskell-attoparsec/haskell-attoparsec.install @@ -0,0 +1,23 @@ +HS_DIR=usr/share/haskell/haskell-attoparsec + +post_install() { + $HS_DIR/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + $HS_DIR/unregister.sh +} + +post_upgrade() { + $HS_DIR/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + $HS_DIR/unregister.sh +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-hashable/PKGBUILD b/community/haskell-hashable/PKGBUILD new file mode 100644 index 000000000..9701b8332 --- /dev/null +++ b/community/haskell-hashable/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: hauzer <hauzer at gmx dot com> +_hkgname=hashable +pkgname=haskell-hashable +pkgver=1.2.1.0 +pkgrel=1 +pkgdesc="A class for types that can be converted to a hash value" +url="http://hackage.haskell.org/package/${_hkgname}" +license=('custom:BSD3') +arch=('i686' 'x86_64') +makedepends=() +depends=('ghc' haskell-text) +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('74f7cadb836e63f4d4b1a24be401228d') + +build() { + cd "${srcdir}/${_hkgname}-${pkgver}" + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd "${srcdir}/${_hkgname}-${pkgver}" + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-hashable/haskell-hashable.install b/community/haskell-hashable/haskell-hashable.install new file mode 100644 index 000000000..de5bb4228 --- /dev/null +++ b/community/haskell-hashable/haskell-hashable.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-hashable +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/haskell-highlighting-kate/PKGBUILD b/community/haskell-highlighting-kate/PKGBUILD index 1a3c0b7d1..69c28de40 100644 --- a/community/haskell-highlighting-kate/PKGBUILD +++ b/community/haskell-highlighting-kate/PKGBUILD @@ -4,7 +4,7 @@ _hkgname=highlighting-kate pkgname=haskell-highlighting-kate -pkgver=0.5.3.9 +pkgver=0.5.5 pkgrel=1 pkgdesc="Syntax highlighting" url="http://hackage.haskell.org/package/$_hkgname" @@ -14,7 +14,7 @@ makedepends=('ghc') depends=('haskell-blaze-html>=0.4.2' 'haskell-containers' 'haskell-filepath' 'haskell-mtl' 'haskell-parsec' 'haskell-pcre-light') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=$pkgname.install -md5sums=('fa274eb5d1f7002b16a312693ad9eef0') +md5sums=('7c11a837292cc6f2d12b5bcb389bce48') build() { cd $_hkgname-$pkgver diff --git a/community/haskell-pandoc-types/PKGBUILD b/community/haskell-pandoc-types/PKGBUILD index a459b125a..b6099a70d 100644 --- a/community/haskell-pandoc-types/PKGBUILD +++ b/community/haskell-pandoc-types/PKGBUILD @@ -4,21 +4,21 @@ _hkgname=pandoc-types pkgname=haskell-pandoc-types -pkgver=1.10 -pkgrel=3 +pkgver=1.12.1 +pkgrel=1 pkgdesc="Types for representing a structured document" url="http://johnmacfarlane.net/pandoc" license=("GPL") arch=('i686' 'x86_64') makedepends=('ghc') -depends=('haskell-containers' 'haskell-syb') +depends=('haskell-containers' 'haskell-syb' 'haskell-aeson') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") install=$pkgname.install -sha256sums=('e65b983aece74d57db53c6f611f92b9df9dd876e5f022f3a8612c092d6db78f5') +sha256sums=('726df226da9cc55b986380d64bb362b66238f41fdef4c56b027d97a7fc3a163f') build() { cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + runhaskell Setup configure -O --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/$pkgname \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build diff --git a/community/haskell-texmath/PKGBUILD b/community/haskell-texmath/PKGBUILD index 183dab329..406099501 100644 --- a/community/haskell-texmath/PKGBUILD +++ b/community/haskell-texmath/PKGBUILD @@ -4,7 +4,7 @@ pkgname=haskell-texmath _hkgname=texmath -pkgver=0.6.3 +pkgver=0.6.4 pkgrel=1 pkgdesc="Conversion of LaTeX math formulas to MathML." url="https://github.com/jgm/texmath" @@ -14,11 +14,11 @@ makedepends=('ghc') depends=(haskell-containers haskell-parsec haskell-syb haskell-xml) source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-${pkgver}.tar.gz") install=$pkgname.install -md5sums=('51a759ddfc114c5b3b7abc76644bceb1') +md5sums=('d00583d680710c816c263d198cbf6311') build() { cd "$srcdir/$_hkgname-$pkgver" - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + runhaskell Setup configure -O --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/$pkgname \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build diff --git a/community/haskell-unordered-containers/PKGBUILD b/community/haskell-unordered-containers/PKGBUILD new file mode 100644 index 000000000..5c1401400 --- /dev/null +++ b/community/haskell-unordered-containers/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Martin Harvan <martinhrvn@gmail.com> +_hkgname=unordered-containers +pkgname=haskell-unordered-containers +pkgver=0.2.3.2 +pkgrel=1 +pkgdesc="Efficient hashing-based container types" +url="https://github.com/tibbe/unordered-containers" +license=('custom:BSD3') +arch=('i686' 'x86_64') +makedepends=() +depends=('ghc' 'haskell-deepseq>=1.1' 'haskell-hashable>=1.0.1.1') +options=('strip') +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=${pkgname}.install +md5sums=('3139a6b2f6fa8aca06133767a1547678') + +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + runhaskell Setup configure -O ${PKGBUILD_HASKELL_ENABLE_PROFILING:+-p } --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community/haskell-unordered-containers/haskell-unordered-containers.install b/community/haskell-unordered-containers/haskell-unordered-containers.install new file mode 100644 index 000000000..c7b2ba87f --- /dev/null +++ b/community/haskell-unordered-containers/haskell-unordered-containers.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-unordered-containers +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index 8ee3fd6a7..d37d1cd37 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 97118 2013-09-13 08:32:23Z alucryd $ +# $Id: PKGBUILD 97333 2013-09-18 07:35:44Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.6.1 -pkgrel=4 +pkgver=1.6.2 +pkgrel=1 epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64') @@ -23,7 +23,7 @@ source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgv 'lightdm-lock-screen-before-switch.patch' 'lightdm-use-login1.patch' 'Xsession') -sha256sums=('43373ed9a48277dd3bf7aa3f042a2674c707bc333c90ce8ffef8bd124116b827' +sha256sums=('b0de1dc81bb5ce81800feafb9fbc7806ef4dfc83733f0df058568e55b8a045f3' '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a' 'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD index 95b1c7d41..a21835e7d 100644 --- a/community/siege/PKGBUILD +++ b/community/siege/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 97153 2013-09-14 10:52:19Z bluewind $ +# $Id: PKGBUILD 97337 2013-09-18 09:31:58Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Sven Kauber <celeon@gmail.com> pkgname=siege -pkgver=3.0.3 +pkgver=3.0.4 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -29,4 +29,4 @@ package() { sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc" } -md5sums=('6ac0a828c02fbbe51cc437ba1addf2f0') +md5sums=('ea4180f0b02b99d0f43cf676a697c999') diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD index 0add992ea..696ae0161 100755 --- a/community/xnoise/PKGBUILD +++ b/community/xnoise/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 90300 2013-05-11 05:30:04Z fyan $ +# $Id: PKGBUILD 97326 2013-09-18 04:04:28Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: archtux <antonio dot arias99999 at gmail dot com> pkgname=xnoise -pkgver=0.2.18 +pkgver=0.2.19 pkgrel=1 pkgdesc="Media player with a slick GUI, great speed and lots of features." arch=('i686' 'x86_64') url="http://www.xnoise-media-player.com/" license=('GPL2') -depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg') +depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg' 'vala') optdepends=('gst-plugins-base: Basic media codecs' 'gst-plugins-bad: Extra media codecs' 'gst-plugins-ugly: Extra media codecs' @@ -34,4 +34,5 @@ package() { # Remove obsolete files rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala" } -sha512sums=('afe6d380f84c96d3612ed6a01a31b279b06d101252304a83be081eb25d4342e3487aa0f1955c3aa6b70297f8858d3c01be5f708a37c3741a1c2b6afd76127e9b') + +sha512sums=('3c3a735d005704342d2c27c36738b91f850e2630b431edfc1def5d26f836dc0df1ef752ca8d1eec3e90702eb27f78e46970a147a64c2156fbe53c8471eb978cb') diff --git a/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch b/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch deleted file mode 100644 index 372ecebff..000000000 --- a/core/systemd/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> -Date: Tue, 28 May 2013 20:45:34 +0200 -Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't - exist - -Since 11ec7ce, journald isn't setting the ACLs properly anymore if -the files had no ACLs to begin with: acl_set_fd fails with EINVAL. - -An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is -invalid, so make sure a mask exists before trying to set the ACL. ---- - src/journal/journald-server.c | 6 ++++-- - src/shared/acl-util.c | 28 ++++++++++++++++++++++++++++ - src/shared/acl-util.h | 1 + - 3 files changed, 33 insertions(+), 2 deletions(-) - -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index b717b92..da5b725 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) { - } - } - -- /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */ -+ /* We do not recalculate the mask unconditionally here, -+ * so that the fchmod() mask above stays intact. */ - if (acl_get_permset(entry, &permset) < 0 || -- acl_add_perm(permset, ACL_READ) < 0) { -+ acl_add_perm(permset, ACL_READ) < 0 || -+ calc_acl_mask_if_needed(&acl) < 0) { - log_warning("Failed to patch ACL on %s, ignoring: %m", f->path); - goto finish; - } -diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c -index 48bb12f..fb04e49 100644 ---- a/src/shared/acl-util.c -+++ b/src/shared/acl-util.c -@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) { - return 0; - } - -+int calc_acl_mask_if_needed(acl_t *acl_p) { -+ acl_entry_t i; -+ int found; -+ -+ assert(acl_p); -+ -+ for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i); -+ found > 0; -+ found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) { -+ -+ acl_tag_t tag; -+ -+ if (acl_get_tag_type(i, &tag) < 0) -+ return -errno; -+ -+ if (tag == ACL_MASK) -+ return 0; -+ } -+ -+ if (found < 0) -+ return -errno; -+ -+ if (acl_calc_mask(acl_p) < 0) -+ return -errno; -+ -+ return 0; -+} -+ - int search_acl_groups(char*** dst, const char* path, bool* belong) { - acl_t acl; - -diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h -index 23090d9..36ef490 100644 ---- a/src/shared/acl-util.h -+++ b/src/shared/acl-util.h -@@ -24,4 +24,5 @@ - #include <stdbool.h> - - int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry); -+int calc_acl_mask_if_needed(acl_t *acl_p); - int search_acl_groups(char*** dst, const char* path, bool* belong); --- -1.8.3 - diff --git a/core/systemd/0001-polkit-Avoid-race-condition-in-scraping-proc.patch b/core/systemd/0001-polkit-Avoid-race-condition-in-scraping-proc.patch new file mode 100644 index 000000000..d3c09781c --- /dev/null +++ b/core/systemd/0001-polkit-Avoid-race-condition-in-scraping-proc.patch @@ -0,0 +1,75 @@ +From 72fd713962ca2c2450e23b01d9e22017a7e28fd4 Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Thu, 22 Aug 2013 13:55:21 -0400 +Subject: [PATCH] polkit: Avoid race condition in scraping /proc + +If a calling process execve()s a setuid program, it can appear to be +uid 0. Since we're receiving requests over DBus, avoid this by simply +passing system-bus-name as a subject. +--- + src/shared/polkit.c | 31 +++++-------------------------- + 1 file changed, 5 insertions(+), 26 deletions(-) + +diff --git a/src/shared/polkit.c b/src/shared/polkit.c +index cea7074..1c5e9e3 100644 +--- a/src/shared/polkit.c ++++ b/src/shared/polkit.c +@@ -38,12 +38,8 @@ int verify_polkit( + + #ifdef ENABLE_POLKIT + DBusMessage *m = NULL, *reply = NULL; +- const char *unix_process = "unix-process", *pid = "pid", *starttime = "start-time", *cancel_id = ""; ++ const char *system_bus_name = "system-bus-name", *name = "name", *cancel_id = ""; + uint32_t flags = interactive ? 1 : 0; +- pid_t pid_raw; +- uint32_t pid_u32; +- unsigned long long starttime_raw; +- uint64_t starttime_u64; + DBusMessageIter iter_msg, iter_struct, iter_array, iter_dict, iter_variant; + int r; + dbus_bool_t authorized = FALSE, challenge = FALSE; +@@ -68,14 +64,6 @@ int verify_polkit( + + #ifdef ENABLE_POLKIT + +- pid_raw = bus_get_unix_process_id(c, sender, error); +- if (pid_raw == 0) +- return -EINVAL; +- +- r = get_starttime_of_pid(pid_raw, &starttime_raw); +- if (r < 0) +- return r; +- + m = dbus_message_new_method_call( + "org.freedesktop.PolicyKit1", + "/org/freedesktop/PolicyKit1/Authority", +@@ -86,22 +74,13 @@ int verify_polkit( + + dbus_message_iter_init_append(m, &iter_msg); + +- pid_u32 = (uint32_t) pid_raw; +- starttime_u64 = (uint64_t) starttime_raw; +- + if (!dbus_message_iter_open_container(&iter_msg, DBUS_TYPE_STRUCT, NULL, &iter_struct) || +- !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &unix_process) || ++ !dbus_message_iter_append_basic(&iter_struct, DBUS_TYPE_STRING, &system_bus_name) || + !dbus_message_iter_open_container(&iter_struct, DBUS_TYPE_ARRAY, "{sv}", &iter_array) || + !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) || +- !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &pid) || +- !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "u", &iter_variant) || +- !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT32, &pid_u32) || +- !dbus_message_iter_close_container(&iter_dict, &iter_variant) || +- !dbus_message_iter_close_container(&iter_array, &iter_dict) || +- !dbus_message_iter_open_container(&iter_array, DBUS_TYPE_DICT_ENTRY, NULL, &iter_dict) || +- !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &starttime) || +- !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "t", &iter_variant) || +- !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_UINT64, &starttime_u64) || ++ !dbus_message_iter_append_basic(&iter_dict, DBUS_TYPE_STRING, &name) || ++ !dbus_message_iter_open_container(&iter_dict, DBUS_TYPE_VARIANT, "s", &iter_variant) || ++ !dbus_message_iter_append_basic(&iter_variant, DBUS_TYPE_STRING, &sender) || + !dbus_message_iter_close_container(&iter_dict, &iter_variant) || + !dbus_message_iter_close_container(&iter_array, &iter_dict) || + !dbus_message_iter_close_container(&iter_struct, &iter_array) || +-- +1.8.4 + diff --git a/core/systemd/0001-swap-fix-reverse-dependencies.patch b/core/systemd/0001-swap-fix-reverse-dependencies.patch new file mode 100644 index 000000000..7e51918ab --- /dev/null +++ b/core/systemd/0001-swap-fix-reverse-dependencies.patch @@ -0,0 +1,30 @@ +From 90060fa6605446bef7078867423b691e4effa575 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Fri, 13 Sep 2013 14:46:18 +0200 +Subject: [PATCH] swap: fix reverse dependencies + +Make sure swap.target correctly requires/wants the swap units. + +This fixes https://bugs.freedesktop.org/show_bug.cgi?id=69291. + +Reported-by: Hussam Al-Tayeb +--- + src/core/swap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/swap.c b/src/core/swap.c +index 57d15eb..3950860 100644 +--- a/src/core/swap.c ++++ b/src/core/swap.c +@@ -220,7 +220,7 @@ static int swap_add_default_dependencies(Swap *s) { + } + + if (!noauto) { +- r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, (nofail ? UNIT_WANTED_BY : UNIT_REQUIRED_BY), ++ r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES), + SPECIAL_SWAP_TARGET, NULL, true); + if (r < 0) + return r; +-- +1.8.4 + diff --git a/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch b/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch deleted file mode 100644 index 84cce7121..000000000 --- a/core/systemd/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch +++ /dev/null @@ -1,255 +0,0 @@ -From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Thu, 16 May 2013 00:19:03 +0200 -Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal - runtime service - -With this change systemd-update-utmp-shutdown.service is replaced by -systemd-update-utmp.service which is started at boot and stays around -until shutdown. This allows us to properly order the unit against both -/var/log and auditd. - -https://bugzilla.redhat.com/show_bug.cgi?id=853104 -https://bugs.freedesktop.org/show_bug.cgi?id=64365 ---- - Makefile-man.am | 12 ++++++------ - Makefile.am | 8 ++++---- - ....service.xml => systemd-update-utmp.service.xml} | 16 ++++++++-------- - src/update-utmp/update-utmp.c | 2 +- - units/.gitignore | 2 +- - units/systemd-update-utmp-runlevel.service.in | 8 +++++--- - units/systemd-update-utmp-shutdown.service.in | 19 ------------------- - units/systemd-update-utmp.service.in | 21 +++++++++++++++++++++ - 8 files changed, 46 insertions(+), 42 deletions(-) - rename man/{systemd-update-utmp-runlevel.service.xml => systemd-update-utmp.service.xml} (82%) - delete mode 100644 units/systemd-update-utmp-shutdown.service.in - create mode 100644 units/systemd-update-utmp.service.in - -diff --git a/Makefile-man.am b/Makefile-man.am -index 7d62094..5888158 100644 ---- a/Makefile-man.am -+++ b/Makefile-man.am -@@ -72,7 +72,7 @@ MANPAGES += \ - man/systemd-tmpfiles.8 \ - man/systemd-tty-ask-password-agent.1 \ - man/systemd-udevd.service.8 \ -- man/systemd-update-utmp-runlevel.service.8 \ -+ man/systemd-update-utmp.service.8 \ - man/systemd.1 \ - man/systemd.automount.5 \ - man/systemd.device.5 \ -@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \ - man/systemd-udevd-control.socket.8 \ - man/systemd-udevd-kernel.socket.8 \ - man/systemd-udevd.8 \ -- man/systemd-update-utmp-shutdown.service.8 \ -+ man/systemd-update-utmp-runlevel.service.8 \ - man/systemd-update-utmp.8 \ - man/systemd-user.conf.5 - man/SD_ALERT.3: man/sd-daemon.3 -@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 - man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 - man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 - man/systemd-udevd.8: man/systemd-udevd.service.8 --man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 --man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 -+man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8 -+man/systemd-update-utmp.8: man/systemd-update-utmp.service.8 - man/systemd-user.conf.5: man/systemd-system.conf.5 - man/SD_ALERT.html: man/sd-daemon.html - $(html-alias) -@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html - man/systemd-udevd.html: man/systemd-udevd.service.html - $(html-alias) - --man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html -+man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html - $(html-alias) - --man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html -+man/systemd-update-utmp.html: man/systemd-update-utmp.service.html - $(html-alias) - - man/systemd-user.conf.html: man/systemd-system.conf.html -diff --git a/Makefile.am b/Makefile.am -index 8d8139c..4c5e6fc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \ - units/systemd-initctl.service \ - units/systemd-shutdownd.service \ - units/systemd-remount-fs.service \ -+ units/systemd-update-utmp.service \ - units/systemd-update-utmp-runlevel.service \ -- units/systemd-update-utmp-shutdown.service \ - units/systemd-tmpfiles-setup-dev.service \ - units/systemd-tmpfiles-setup.service \ - units/systemd-tmpfiles-clean.service \ -@@ -463,8 +463,8 @@ EXTRA_DIST += \ - units/systemd-initctl.service.in \ - units/systemd-shutdownd.service.in \ - units/systemd-remount-fs.service.in \ -+ units/systemd-update-utmp.service.in \ - units/systemd-update-utmp-runlevel.service.in \ -- units/systemd-update-utmp-shutdown.service.in \ - units/systemd-tmpfiles-setup-dev.service.in \ - units/systemd-tmpfiles-setup.service.in \ - units/systemd-tmpfiles-clean.service.in \ -@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \ - RUNLEVEL5_TARGET_WANTS += \ - systemd-update-utmp-runlevel.service - endif --SHUTDOWN_TARGET_WANTS += \ -- systemd-update-utmp-shutdown.service -+SYSINIT_TARGET_WANTS += \ -+ systemd-update-utmp.service - LOCAL_FS_TARGET_WANTS += \ - systemd-remount-fs.service \ - systemd-fsck-root.service \ -diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp.service.xml -similarity index 82% -rename from man/systemd-update-utmp-runlevel.service.xml -rename to man/systemd-update-utmp.service.xml -index 867b958..846fc95 100644 ---- a/man/systemd-update-utmp-runlevel.service.xml -+++ b/man/systemd-update-utmp.service.xml -@@ -19,10 +19,10 @@ - You should have received a copy of the GNU Lesser General Public License - along with systemd; If not, see <http://www.gnu.org/licenses/>. - --> --<refentry id="systemd-update-utmp-runlevel.service"> -+<refentry id="systemd-update-utmp.service"> - - <refentryinfo> -- <title>systemd-update-utmp-runlevel.service</title> -+ <title>systemd-update-utmp.service</title> - <productname>systemd</productname> - - <authorgroup> -@@ -36,21 +36,21 @@ - </refentryinfo> - - <refmeta> -- <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle> -+ <refentrytitle>systemd-update-utmp.service</refentrytitle> - <manvolnum>8</manvolnum> - </refmeta> - - <refnamediv> -+ <refname>systemd-update-utmp.service</refname> - <refname>systemd-update-utmp-runlevel.service</refname> -- <refname>systemd-update-utmp-shutdown.service</refname> - <refname>systemd-update-utmp</refname> -- <refpurpose>Write audit and utmp updates at runlevel -+ <refpurpose>Write audit and utmp updates at bootup, runlevel - changes and shutdown</refpurpose> - </refnamediv> - - <refsynopsisdiv> -+ <para><filename>systemd-update-utmp.service</filename></para> - <para><filename>systemd-update-utmp-runlevel.service</filename></para> -- <para><filename>systemd-update-utmp-shutdown.service</filename></para> - <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para> - </refsynopsisdiv> - -@@ -60,8 +60,8 @@ - <para><filename>systemd-update-utmp-runlevel.service</filename> - is a service that writes SysV runlevel changes to utmp - and wtmp, as well as the audit logs, as they -- occur. <filename>systemd-update-utmp-shutdown.service</filename> -- does the same for shut-down requests.</para> -+ occur. <filename>systemd-update-utmp.service</filename> -+ does the same for system reboots and shut-down requests.</para> - </refsect1> - - <refsect1> -diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c -index 9184025..202aa98 100644 ---- a/src/update-utmp/update-utmp.c -+++ b/src/update-utmp/update-utmp.c -@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) { - { '3', SPECIAL_RUNLEVEL3_TARGET }, - { '4', SPECIAL_RUNLEVEL4_TARGET }, - { '2', SPECIAL_RUNLEVEL2_TARGET }, -- { 'S', SPECIAL_RESCUE_TARGET }, -+ { '1', SPECIAL_RESCUE_TARGET }, - }; - const char - *interface = "org.freedesktop.systemd1.Unit", -diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in -index 27fae2c..99783e2 100644 ---- a/units/systemd-update-utmp-runlevel.service.in -+++ b/units/systemd-update-utmp-runlevel.service.in -@@ -7,12 +7,14 @@ - - [Unit] - Description=Update UTMP about System Runlevel Changes --Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) -+Documentation=man:systemd-update-utmp.service(8) man:utmp(5) - DefaultDependencies=no - RequiresMountsFor=/var/log/wtmp --After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service -+Conflicts=shutdown.target -+Requisite=systemd-update-utmp.service -+After=systemd-update-utmp.service - After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target --Before=final.target -+Before=shutdown.target - - [Service] - Type=oneshot -diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in -deleted file mode 100644 -index aa93562..0000000 ---- a/units/systemd-update-utmp-shutdown.service.in -+++ /dev/null -@@ -1,19 +0,0 @@ --# This file is part of systemd. --# --# systemd is free software; you can redistribute it and/or modify it --# under the terms of the GNU Lesser General Public License as published by --# the Free Software Foundation; either version 2.1 of the License, or --# (at your option) any later version. -- --[Unit] --Description=Update UTMP about System Shutdown --Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) --DefaultDependencies=no --RequiresMountsFor=/var/log/wtmp --After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service --After=systemd-update-utmp-runlevel.service --Before=final.target -- --[Service] --Type=oneshot --ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown -diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in -new file mode 100644 -index 0000000..e7c20a5 ---- /dev/null -+++ b/units/systemd-update-utmp.service.in -@@ -0,0 +1,21 @@ -+# This file is part of systemd. -+# -+# systemd is free software; you can redistribute it and/or modify it -+# under the terms of the GNU Lesser General Public License as published by -+# the Free Software Foundation; either version 2.1 of the License, or -+# (at your option) any later version. -+ -+[Unit] -+Description=Update UTMP about System Reboot/Shutdown -+Documentation=man:systemd-update-utmp.service(8) man:utmp(5) -+DefaultDependencies=no -+RequiresMountsFor=/var/log/wtmp -+Conflicts=shutdown.target -+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service -+Before=sysinit.target shutdown.target -+ -+[Service] -+Type=oneshot -+RemainAfterExit=yes -+ExecStart=@rootlibexecdir@/systemd-update-utmp reboot -+ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown --- -1.8.2.3 - diff --git a/core/systemd/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch b/core/systemd/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch new file mode 100644 index 000000000..4b8743464 --- /dev/null +++ b/core/systemd/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch @@ -0,0 +1,90 @@ +From 4e82fe5213bedcb70e25c0270e516d5f2706d8c8 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Mon, 16 Sep 2013 01:08:32 +0200 +Subject: [PATCH] swap: create .wants symlink to 'auto' swap devices + +As we load unit files lazily, we need to make sure something pulls in swap +units that should be started automatically, otherwise the default dependencies +will never be applied. + +This partially reinstates code removed in +commit 64347fc2b983f33e7efb0fd2bb44e133fb9f30f4. + +Also don't order swap devices after swap.target when they are 'nofail'. +--- + src/core/swap.c | 8 ++++++-- + src/fstab-generator/fstab-generator.c | 18 ++++++++++++++++-- + 2 files changed, 22 insertions(+), 4 deletions(-) + +diff --git a/src/core/swap.c b/src/core/swap.c +index 3950860..76c7d45 100644 +--- a/src/core/swap.c ++++ b/src/core/swap.c +@@ -220,8 +220,12 @@ static int swap_add_default_dependencies(Swap *s) { + } + + if (!noauto) { +- r = unit_add_two_dependencies_by_name_inverse(UNIT(s), UNIT_AFTER, (nofail ? UNIT_WANTS : UNIT_REQUIRES), +- SPECIAL_SWAP_TARGET, NULL, true); ++ if (nofail) ++ r = unit_add_dependency_by_name_inverse(UNIT(s), ++ UNIT_WANTS, SPECIAL_SWAP_TARGET, NULL, true); ++ else ++ r = unit_add_two_dependencies_by_name_inverse(UNIT(s), ++ UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SWAP_TARGET, NULL, true); + if (r < 0) + return r; + } +diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c +index 6ebe8aa..b73dfa4 100644 +--- a/src/fstab-generator/fstab-generator.c ++++ b/src/fstab-generator/fstab-generator.c +@@ -66,6 +66,7 @@ static int mount_find_pri(struct mntent *me, int *ret) { + static int add_swap(const char *what, struct mntent *me) { + _cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL, *device = NULL; + _cleanup_fclose_ FILE *f = NULL; ++ bool noauto; + int r, pri = -1; + + assert(what); +@@ -77,6 +78,8 @@ static int add_swap(const char *what, struct mntent *me) { + return pri; + } + ++ noauto = !!hasmntopt(me, "noauto"); ++ + name = unit_name_from_path(what, ".swap"); + if (!name) + return log_oom(); +@@ -97,8 +100,7 @@ static int add_swap(const char *what, struct mntent *me) { + fprintf(f, + "# Automatically generated by systemd-fstab-generator\n\n" + "[Unit]\n" +- "SourcePath=/etc/fstab\n" +- "\n" ++ "SourcePath=/etc/fstab\n\n" + "[Swap]\n" + "What=%s\n", + what); +@@ -114,6 +116,18 @@ static int add_swap(const char *what, struct mntent *me) { + return -errno; + } + ++ if (!noauto) { ++ lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL); ++ if (!lnk) ++ return log_oom(); ++ ++ mkdir_parents_label(lnk, 0755); ++ if (symlink(unit, lnk) < 0) { ++ log_error("Failed to create symlink %s: %m", lnk); ++ return -errno; ++ } ++ } ++ + return 0; + } + +-- +1.8.4 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 9b17e6d8f..6a84686ad 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,43 +3,41 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=204 +pkgver=207 pkgrel=3 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch - 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 'initcpio-hook-udev' + 'initcpio-install-systemd' 'initcpio-install-udev' - 'initcpio-install-timestamp') -md5sums=('a07619bb19f48164fbf0761d12fd39a8' - '7f39f9fde1ff7b48293ed1e3d0a6c213' - '66e3162856ded8eb7dc7383405c6e0d6' - 'e99e9189aa2f6084ac28b8ddf605aeb8' - 'fb37e34ea006c79be1c54cbb0f803414' - 'df69615503ad293c9ddf9d8b7755282d') + 0001-polkit-Avoid-race-condition-in-scraping-proc.patch + 0001-swap-fix-reverse-dependencies.patch + 0002-swap-create-.wants-symlink-to-auto-swap-devices.patch) +md5sums=('7799f3cc9d289b8db1c1fa56ae7ecd88' + '2de72238ed5c0df62a7c3b6bdaf8cb7c' + '9027b31a875e74a45623954b3b23d09f' + 'd83d45e67cd75cdbafb81c96a7485319' + '9eb0a46aa2a3a6d74117f9a174dbe168' + '182be4c729aaecde249b7b05b48a481f' + 'b54fbe35e2689ac36cda9ac4a5a86f24') prepare() { cd "$pkgname-$pkgver" - patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch" - - patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch" - - autoreconf + patch -Np1 <"$srcdir"/0001-swap-fix-reverse-dependencies.patch + patch -Np1 <"$srcdir"/0002-swap-create-.wants-symlink-to-auto-swap-devices.patch + patch -Np1 <"$srcdir"/0001-polkit-Avoid-race-condition-in-scraping-proc.patch } build() { cd "$pkgname-$pkgver" ./configure \ - --enable-static \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ @@ -61,6 +59,7 @@ check() { package_systemd() { pkgdesc="system and service manager" + license=('GPL2' 'LGPL2.1' 'MIT') depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'pam' 'util-linux' 'xz') provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" @@ -77,11 +76,13 @@ package_systemd() { etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.machine1.conf etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/bootchart.conf + etc/systemd/journald.conf + etc/systemd/logind.conf etc/systemd/system.conf etc/systemd/user.conf - etc/systemd/logind.conf - etc/systemd/journald.conf etc/udev/udev.conf) install="systemd.install" @@ -99,7 +100,7 @@ package_systemd() { rmdir "$pkgdir/etc/systemd/system/getty.target.wants" # get rid of RPM macros - rm -r "$pkgdir/etc/rpm" + rm -r "$pkgdir/usr/lib/rpm/macros.d" # add back tmpfiles.d/legacy.conf install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" @@ -110,19 +111,24 @@ package_systemd() { s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules # add mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd" install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" - install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" ### split out manpages for sysvcompat rm -rf "$srcdir/_sysvcompat" install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 + + # include MIT license, since it's technically custom + install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ + "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT" } package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" + license=('GPL2') groups=('base') conflicts=('sysvinit') depends=('sysvinit-tools' 'systemd') diff --git a/core/systemd/initcpio-hook-udev b/core/systemd/initcpio-hook-udev index 75da7e4a8..227a8d034 100644 --- a/core/systemd/initcpio-hook-udev +++ b/core/systemd/initcpio-hook-udev @@ -1,7 +1,7 @@ #!/usr/bin/ash run_earlyhook() { - udevd --daemon --resolve-names=never + /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never udevd_running=1 } diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd new file mode 100644 index 000000000..ac86d338d --- /dev/null +++ b/core/systemd/initcpio-install-systemd @@ -0,0 +1,156 @@ +#!/bin/bash + +strip_quotes() { + local len=${#1} quotes=$'[\'"]' str=${!1} + + if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then + declare -g "$1=${str:1:-1}" + fi +} + +add_udev_rule() { + # Add an udev rules file to the initcpio image. Dependencies on binaries + # will be discovered and added. + # $1: path to rules file (or name of rules file) + + local rules= rule= key= value= binary= + + rules=$(PATH=/usr/lib/udev/rules.d:/lib/udev/rules.d type -P "$1") + if [[ -z $rules ]]; then + # complain about not found rules + return 1 + fi + + add_file "$rules" + + while IFS=, read -ra rule; do + # skip empty lines, comments + [[ -z $rule || $rule = @(+([[:space:]])|#*) ]] && continue + + for pair in "${rule[@]}"; do + IFS=' =' read -r key value <<< "$pair" + case $key in + RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD}) + strip_quotes 'value' + # just take the first word as the binary name + binary=${value%% *} + if [[ ${binary:0:1} != '/' ]]; then + binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary") + fi + add_binary "$binary" + ;; + esac + done + done <"$rules" +} + +add_systemd_unit() { + # Add a systemd unit file to the initcpio image. Hard dependencies on binaries + # and other unit files will be discovered and added. + # $1: path to rules file (or name of rules file) + + local unit= rule= entry= key= value= binary= dep= + + unit=$(PATH=/usr/lib/systemd/system:/lib/systemd/system type -P "$1") + if [[ -z $unit ]]; then + # complain about not found unit file + return 1 + fi + + add_file "$unit" + + while IFS='=' read -r key values; do + read -ra values <<< "$values" + + case $key in + Requires|OnFailure) + # only add hard dependencies (not Wants) + map add_systemd_unit "${values[@]}" + ;; + Exec*) + # don't add binaries unless they are required + if [[ ${values[0]:0:1} != '-' ]]; then + add_binary "${values[0]}" + fi + ;; + esac + + done <"$unit" + + # preserve reverse soft dependency + for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do + if [[ -L $dep ]]; then + add_symlink "$dep" + fi + done + + # add hard dependencies + if [[ -d $unit.requires ]]; then + for dep in "$unit".requires/*; do + add_systemd_unit ${dep##*/} + done + fi +} + +build() { + local rules unit + + # from base + add_binary /bin/mount + add_binary /usr/bin/kmod /usr/bin/modprobe + + # systemd + add_binary /usr/lib/systemd/systemd /init + + # generate sysroot.mount and sysroot-usr.mount + add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" + + # udev rules and systemd units + map add_udev_rule "$rules" \ + 50-udev-default.rules \ + 60-persistent-storage.rules \ + 64-btrfs.rules \ + 80-drivers.rules \ + 99-systemd.rules \ + + map add_systemd_unit \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket \ + sockets.target \ + systemd-journald.service \ + systemd-udevd.service \ + systemd-udev-trigger.service \ + initrd-cleanup.service \ + initrd-fs.target \ + initrd-parse-etc.service \ + initrd-root-fs.target \ + initrd-switch-root.service \ + initrd-switch-root.target \ + initrd-udevadm-cleanup-db.service \ + initrd.target \ + systemd-fsck@.service \ + ctrl-alt-del.target + + add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" + + # libdbus needs the passwd info of the root user + # TODO: make sure this is no longer necessary when systemctl moves to sd-bus + add_file "/etc/nsswitch.conf" + add_file "/etc/passwd" + add_binary "$(readlink -f /usr/lib/libnss_files.so)" + + # udev wants /etc/group since it doesn't launch with --resolve-names=never + add_file "/etc/group" +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup in your initramfs, and is meant to +replace the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks with runtime +components will need to be ported, and will not work as intended. You also may +wish to still include the 'base' hook (before this hook) to ensure that a +rescue shell exists on your initramfs. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/systemd/initcpio-install-timestamp b/core/systemd/initcpio-install-timestamp deleted file mode 100644 index 259cc705b..000000000 --- a/core/systemd/initcpio-install-timestamp +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -build() { - add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp -} - -help() { - cat <<HELPEOF -Provides support for RD_TIMESTAMP in early userspace, which can be read by a -program such as systemd-analyze to determine boot time. -HELPEOF -} - -# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/systemd/initcpio-install-udev b/core/systemd/initcpio-install-udev index 15124b8f7..2f6f15d0b 100644 --- a/core/systemd/initcpio-install-udev +++ b/core/systemd/initcpio-install-udev @@ -4,7 +4,7 @@ build() { local rules tool add_file "/etc/udev/udev.conf" - add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd + add_binary /usr/lib/systemd/systemd-udevd add_binary /usr/bin/udevadm for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index 508b384c3..3b36f0c5d 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -42,7 +42,7 @@ post_install() { post_common # enable getty@tty1 by default, but don't track the file - systemctl enable getty@.service + systemctl enable getty@tty1.service echo ":: Append 'init=/usr/lib/systemd/systemd' to your kernel command line in your" echo " bootloader to replace sysvinit with systemd, or install systemd-sysvcompat" @@ -87,6 +87,17 @@ post_upgrade() { printf '==> The /bin/systemd symlink has been removed. Any references in your\n' printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n' fi + + if [ "$(vercmp 205-1 "$2")" -eq 1 ]; then + printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n' + printf ' protocols. You should reboot at your earliest convenience.\n' + fi + + if [ "$(vercmp 206-1 "$2")" -eq 1 ]; then + printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n' + printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n' + printf ' hook has been added which provides this functionality, and more.\n' + fi } # vim:set ts=2 sw=2 et: diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index 593f2f1e6..247a42728 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180985 2013-03-29 12:10:22Z andrea $ +# $Id: PKGBUILD 194547 2013-09-18 11:33:01Z tomegun $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64') @@ -11,13 +11,13 @@ license=('GPL') depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('d21ad78030ffd892bb2ae5c78aa37919') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('a43e644fe75bd090c47c060dcbdfdb27') build(){ mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname}-v${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index b6794784d..1d9ea1538 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 187863 2013-06-07 09:24:59Z tomegun $ +# $Id: PKGBUILD 194548 2013-09-18 11:33:02Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil -pkgver=1.9.3 -pkgrel=2 +pkgver=1.9.4 +pkgrel=1 pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') depends=('qt4' 'bluez4') makedepends=('cmake') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('fcb1480feba45dcd076b3ee54150bdf5') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('25d114ba52218f4cf44c7b4525399835') build() { mkdir build cd build - cmake ../${pkgname}-${pkgver} \ + cmake ../${pkgname}-v${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index ac7fe913b..cb3a8d257 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193833 2013-09-02 17:04:03Z giovanni $ +# $Id: PKGBUILD 194542 2013-09-18 07:51:52Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.08.31 +pkgver=2013.09.11 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('3321fc303bf02542018e5280efa1206c') +md5sums=('ea497490920aa0e67aa69c3d1dc41ed5') build() { cd ${srcdir}/live diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index 1f33526b9..3ad4e5588 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 187072 2013-06-03 11:16:56Z allan $ +# $Id: PKGBUILD 194551 2013-09-18 12:53:28Z tomegun $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=udisks2 -pkgver=2.1.0 -pkgrel=3 +pkgver=2.1.1 +pkgrel=1 pkgdesc="Disk Management Service, version 2" arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/udisks" license=('GPL2') -depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject') +depends=('glib2' 'systemd' 'polkit' 'libatasmart' 'util-linux') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python') optdepends=('parted: partition management' 'gptfdisk: GUID partition table support') options=(!libtool) source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) -sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8') +sha256sums=('013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb') build() { cd "udisks-$pkgver" @@ -23,9 +23,6 @@ build() { --with-systemdsystemunitdir=/usr/lib/systemd/system \ --localstatedir=/var --disable-static make - # fix mdadm location - sed -i -e 's#/sbin/mdadm#/usr/bin/mdadm#g' \ - "${srcdir}/udisks-${pkgver}"/data/80-udisks2.rules } package() { diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 19400ce5f..a135d161e 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -11,8 +11,8 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=23.0.1 -_debrel=deb1 +_debver=24.0 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -24,7 +24,7 @@ pkgname=($(for lang in ${_langpacks[@]} done)) epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -76,91 +76,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { done md5sums=('e88728730ecf9f0f145de5f70e362b15' - 'beec7ff5243399aaa490eeb908f89635' - 'd76b30288dc5aa89c5c73327dd93e1f1' - '0d7a7d3f9afd4f4f535813ddbe295979' - 'a3e395704283a7b04f5a2b622f4a3639' - '4957794086a29eb2aab2f9486a0749dd' - 'd42f22d4e8f0877b94e129d5898074ea' - '8d87c38d9e07847e774152f7f34b0d3a' - 'd5442982475a1948794267c6f2e8dab7' - 'cbe6d536bb393a71827721acc8b5a592' - '92966282e3cb266006c1814af8e0ff0a' - '8dc3cd2b6892457752e8232ff0bdacd2' - '36fa29d00055b28c40276ada3008da20' - '4535bbb5f058fad2635c65a77ca948af' - 'd55e19c70c143893334d76d803c6ad19' - '48ecdc05f12a84745e1f170790ab427f' - 'c50af900a16d3e7f95dd7768dd04e8a2' - 'd8f113de7e79743d4cb9beb127f0f95b' - 'ee686438c9a3ea9041c19bb75f53651a' - '358203acae7af9752fa65550ca98f02e' - '726be61d6cfefcd671c24f2f49e3bf21' - 'c15c9b35ef2bf000f3f7f8b2946aee6d' - '086b14122e3e45dac497ffe7f0873c02' - 'c9c80acbc1651ebf9d025d0d3d1cd022' - '15ef0474ce040d9600690cdd2b257ffd' - '4da96de48891501d947bce50f30d0f1a' - '05945026206a9b0f99b09c5ce788ca6b' - 'd636a741c3711d111ad0e04d905b2fd0' - '05d3bac10f8d7fc19f7941b479f44363' - '5abaab886f963e387444e47d993d9c1a' - '1a89211f0ec11c0541e4d4e983209ce9' - '815e0f6a34ed7c63c21403473bab0ac6' - 'b2e768d738718f20cf6e27f6a393f093' - 'ea65c30d06da6172848c84dc6e4e2be4' - '49e108b2ed86ae25acae56731685170d' - '8222761ee3bea5d67cd66d461e698fe6' - 'a04b35692c4df0f410bf2d196de96928' - '861e047041ef3a8f6a92967d40fe8e5f' - 'd43c967887b437c67c6d39d3c4273c49' - 'fb8a80a7d82d5a37b926e0a946240df8' - 'ffdcc759130ad0f23adee6ca8933190d' - 'dcd9b3889b7050bc3e977cfa013fc2c1' - 'd59b7828235ed96da7e309e43093923c' - '723db17fbf3ac58ed3402b44eb25c953' - '3f27760db7543ad953bf3b87bd1f61b1' - 'ac675403c62a5b898c58ab3e95770275' - '7295a8115d6a0d8706ee5ea4a4a0e1fc' - '4073b8aca4a5eb905df761ab90e8d63a' - 'f437bf5c2bdc9a29b6deff2bf3913af2' - '1a4f3e90be3aaf92763b6aa7c09db41c' - 'dbd3ae230ca8f898f55d73406881fb4b' - '2d99549940ab6ec77cabb6dacf1ecc22' - '71eba86c8ba6c60aedccbac67d730f64' - '327e3808ed2318335ddb17480254098b' - 'b3880a5392906d7547cf6f1f460fb587' - 'd3831ed5839155fedd6afe140d9b82d3' - '4bbc2b071e3a691c7e31eb203473e4fe' - 'b6a0a5958b8d7715bff75998f7a2db5a' - '12d766edda51a500763cab832d456f1c' - '7d8836f1beba05abd2f4980a739b88f6' - '6e6c387f87e66fcd0256e7dd493bd3b0' - 'acf3313e15e39c40a5e4a81a8ad8f082' - 'b297d9639d918543c6d49be2b41ecb7a' - '1a44e1284df3dea096ba6d66babcb627' - '59eff511de5712076688a1fdc1ad7cab' - '2c6d376215919347a3700e5ca189fbae' - 'c4721d42d1c5ca7c864ea676fb0eaa67' - '099efdf95306a754ff96b3b40e9442aa' - '41800618dfebb2793473d24469b42648' - 'd3af544bb441f124434a8494ea90803d' - '279690d65ff8c2d8327476df378cb560' - 'ec8d0c327f8ab2b1a4a4db2956e35aa1' - '6ac9eddd9eb0080bc0ed130f293212a6' - 'f18b1756afbfc609e474987713463cb0' - '5aa659699e413ee6c1581dd5f8abc982' - '51d5f2d0832b3e112505d097f927e237' - '194772120040d425c0f9caf7e39cd859' - '16e341fc147ac7c59927aa9fcd1d9bda' - '0f03f21b274f83dab26b13f24c62b10c' - '08e4f2dbb5812c26108043c921f96f52' - 'e698080ded6dd46631a82d4c5e2714a4' - '1ec71119addcae00dc488bce157e730b' - '52a0d08f300889601ede8f7ab149c402' - '75a0dd75f495e8b45dc8b5529cdac123' - '751faf67d7395acdf647e944582f1720' - '58da93b8de0d043e2c875bede1d339b7' - 'c7472e6661159c338b29a9f0d67534eb' - '90df70450031fbeeef121170875e2a56' - 'c34f1814457e56a2f922da4c630d6c98') + '8b54f8c36f8465987871145fd70956ce' + 'ad3a11f1485a58a0ad59d861d37a08a5' + '9761805e9011c371bb443d8f74fede3c' + '87bb6a20535feb2692aa2a6a1afa11e5' + '656dca2918d356fbe368b18fb9eac7ec' + 'e1c793ac7d7beed9d21631154c3dbe1c' + '862470f8d5ee8f8d2f68afc7f4a3d5c1' + '5d7d027fe8c821689a4fdb022fdf7b1f' + 'ab298b1e9d86dfccb6797a8f2f28c8af' + '4c3dd02509c0f7a8506b7303a410692b' + 'ebe4f9e91981bbe85d4f2024325d4cf2' + 'c7e1dae44043c1236f96739ad1117fbe' + 'b33da7699c2a2f5e0febd11e4489d382' + '63c8b3e4c079fbbd98e321035b5c6317' + 'f14d3462af09d8094393ee16f679e5ab' + '0eac6ddbcce45fd8e9a202c93a3738cb' + 'c837f374f56c0bd6efdde745dce89f8a' + '5f780c1b42835050c39db15493dff728' + '69303505295c74467a56aa2a43ea2b82' + '7c44dba21f5d03604b5dd120231a00ae' + 'a401bc653b544ac4f259cca56b79d96d' + 'abdac5ba27fc5cd2ec4d5bc514772670' + '0ddc4de7b3050ed2a49233fbe18eebb3' + '7d09b317736ba78bd6bcf86f5f6e1e11' + '14d1ceaaef00130134e017ae868db8ea' + '9ddedfef7ffea213ef4d4e1773b3ad15' + 'ae89977182d5998204b8ebc1e2603e9f' + '642cdf237587093072412720fb36485a' + '113ef967c5c05ae9ceae093064fdc116' + '90425e1d17c39090a68014c6ce7fb17b' + '0d9e0fc7162eb0aca197866ef427f481' + '95cc1695aa5bffbdcbcb773fb0430319' + '1475a2ad88c8699a9c36e07baed988e0' + '26fd5bf6e4e0a6c634ca7632fb20d69d' + '1cfb6db8de12e0698f0663fffe651962' + '47cbb471101ed09e1d43f85a38cac91f' + 'e8cb435f70c0d62b07cddf051b2e6a5b' + 'bc58060bf3539ab408f1a331ec617949' + '01e8eedc1594c13db4f8a991fcf87f83' + '91179c0d3ee8f003a848eedd2435ea3c' + '0bac7e153488e965f164d61d81de87cb' + '4dabbdfa4fe6477e862eb381eb2c4fd0' + 'a83a772712ae74ddb309cb4a7cb52f75' + 'e16444075ca17e7b5961f7e1e0a828bf' + '4df54bf6c1b1cb35a130d34f9a981eec' + '27e8f49d9a73c79515aa75304758ae22' + '4ad85b335fd26d3474548433fd20d919' + '7f63adfe80832afc40cc3774b48fdefc' + 'dbeac803ed5906af388d2130cdac5c32' + 'f82ba92549541e2d89d5040d175a11d8' + 'bd46bc7902cba8866ffedbb50c8ca2f8' + '203f1fcb9dd3de9396787fc9dab0312a' + 'da685c4c4bd727b337bb720d83de8cf5' + '42fbbda5287dfbf11619e6046bd06f8b' + '65844655106abc5fba71a2cd9bec2d26' + '4ad3f9cbb469aeca27443e39a53e8c73' + '9225277738d7a0fb8b585314ecdb642f' + '292574470c2daeda3c005b12d8a66269' + '954554b04d7aee0c6662d2edf7b48c1b' + 'f15824595b7aab31ce8cc91de781ea03' + 'c5f2c9ddb5775179be5eea13b12f843f' + 'def21db04a3b606c603412d7a0091041' + '686fcc1eefcce197c8b27363c5db6f34' + '9eb2657a7af95927274b0453056173b3' + '58e3dedcb8c0f85766aaaa0d35746b94' + '209670672c37d4befa4375528385ae4a' + 'f3b09defe2dd33f94c5aa4f3c19d726e' + '3f05b588ddea099c873203267287e296' + '91180565b17731d4ff40e6612f499527' + 'fac9050297be0dfe64473d3fe3bce03b' + 'd72a455cd79e304627db71c0ad42e42c' + 'f271b0a4b2d348edca352611da9fa79e' + '367a12e148e94885d5141a7b374523f7' + '18fb3c7bbfdf0b81a40ef5f0bd9d3c2c' + '4e5418b69f62e5d281aa98b0089149de' + 'bfdf7ae55a0994fbe3ed2359dfd2d437' + 'e7b4b504e518b16bb5d9cea8770b1b7a' + 'a8719e1294071e9e0366f686b89a793f' + 'c422789ab794748200b3d33f660b0076' + 'ac040347a410692fea6b7fdda06802cf' + '97c066c4bd823d8f3157fbb390cbaaac' + '3167b085b038f6f1bde2530a167e7405' + 'e969d0185a8c34341edba2ea2e70a476' + 'aff3452e3b6663a2e2f8870924bfded6' + '44519549cf6b052b49519c9960f97481' + 'fe67796800cb807148a39722d689a4c7' + 'b947f013e632c6d262ebdbfac53e3958' + '677267c8284fca2b3749f53eba598121') diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 9fbb5f84a..5d56ee23b 100644 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -268,10 +268,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 90641ed..1806e0c 100644
+index cc3f65e..cdd4305 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()
+@@ -3731,7 +3731,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 1918e27a6..955506d99 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,8 +14,8 @@ _pgo=true # We're getting this from Debian Sid _debname=iceweasel -_debver=23.0.1 -_debrel=deb1 +_debver=24.0 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,13 +23,13 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) -depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) +depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) +makedepends=(autoconf2.13 diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs !makeflags) if $_pgo; then @@ -37,6 +37,10 @@ if $_pgo; then options+=(!ccache) fi optdepends=('networkmanager: Location detection via available WiFi networks' + 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' + 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding' + 'gstreamer0.10-good-plugins: webm and mp4 demuxing' + 'gstreamer0.10-ugly-plugins: h.264 decoding' 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/sid/${_pkgname}" install=iceweasel.install @@ -51,22 +55,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel.desktop iceweasel-install-dir.patch vendor.js - shared-libs.patch replace-urls.txt - $_pkgname-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('43ca6c80e00f5812cb1a38d87f838e06' - '0eb0d65b6dbb035b7b8d753c68fda6aa' - '2d7ac85c32df6a4ccfcc6de7a1420bf7' +md5sums=('8f24807d67599516850a4bdca2b2fbd6' + '1f4f1347e05b15f5af137787d614ecdf' + '350feec44d359c31679dbec3de6685df' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '4f656688fe7bc0b11899369e0e23e516' + '5b32b39c033a33f45e2cfc6c3e80f20c' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0b88d6142f6131711dcb1a2d87a12ad2' - '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '6e335a517c68488941340ee1c23f97b0' - 'c8ee0925def9f018cde65950f66e5844') + 'f1594fa3567e5b70202c3432d7c00202') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -88,7 +88,6 @@ prepare() { patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/shared-libs.patch" # Replace common URLs sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do @@ -144,14 +143,12 @@ prepare() { # WebRTC build tries to execute "python" and expects Python 2 ln -s /usr/bin/python2 "$srcdir/path/python" + # Use gold, as Mozilla can use some of its features, such as safe ICF + #ln -s /usr/bin/ld.gold "$srcdir/path/ld" + # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - - # Fix tab loading icon (flickers with libpng 1.6) - # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \ - browser/themes/linux/tabbrowser/loading.png } build() { @@ -163,20 +160,26 @@ build() { export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - # Work around memory address space exhaustion during linking on i686 if [[ $CARCH == i686 ]]; then + # Work around memory address space exhaustion during linking on i686 LDFLAGS+=' -Wl,--no-keep-memory' fi if $_pgo; then - Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & - - if ! make -f client.mk build MOZ_PGO=1; then - kill $! - return 1 + if [[ $CARCH != i686 ]]; then + # Set up PGO + export DISPLAY=:99 + Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & + + if ! make -f client.mk build MOZ_PGO=1; then + kill $! + return 1 + fi + + kill $! || true + else + make -f client.mk build fi - - kill $! || true else make -f client.mk build fi diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png Binary files differdeleted file mode 100644 index 55f25e591..000000000 --- a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png +++ /dev/null diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch deleted file mode 100644 index 56e4bfc45..000000000 --- a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch +++ /dev/null @@ -1,36 +0,0 @@ - -# HG changeset patch -# User Patrick McManus <mcmanus@ducksong.com> -# Date 1365623297 14400 -# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb -# Parent 2bb26d742f5ffd2d946291fd3c688dc3d6d34f67 -bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell - -diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp ---- a/netwerk/base/src/nsProtocolProxyService.cpp -+++ b/netwerk/base/src/nsProtocolProxyService.cpp -@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal - - // Proxy auto config magic... - if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { - // Do not query PAC now. - *usePACThread = true; - return NS_OK; - } - -- // proxy info values -+ // If we aren't in manual proxy configuration mode then we don't -+ // want to honor any manual specific prefs that might be still set -+ if (mProxyConfig != PROXYCONFIG_MANUAL) -+ return NS_OK; -+ -+ // proxy info values for manual configuration mode - const char *type = nullptr; - const nsACString *host = nullptr; - int32_t port = -1; - - uint32_t proxyFlags = 0; - - if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && - !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { - diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 1539c709b..504ebca91 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -209,8 +209,8 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-18 08:01:12.000000000 -0300 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-26 22:44:10.393864883 -0300 +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-09-10 20:14:52.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-09-18 17:24:08.209539436 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -243,7 +243,7 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio - -# The default set of protocol handlers for mailto: -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s +-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s -gecko.handlerService.schemes.mailto.1.name=Gmail -gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s - @@ -281,22 +281,22 @@ diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/la remote="true"/> </window> diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in ---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in -+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2013-09-10 20:14:52.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2013-09-18 17:41:28.559462661 -0300 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> + <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> </DL><p> - <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> + <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> +- <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> + <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A> + <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A> + <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A> diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index a5af10e63..d2ea098d2 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -24,7 +24,6 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification -ac_add_options --enable-gstreamer ac_add_options --enable-pulseaudio ac_add_options --disable-crashreporter diff --git a/libre/iceweasel-libre/shared-libs.patch b/libre/iceweasel-libre/shared-libs.patch deleted file mode 100644 index 1f22b2b0d..000000000 --- a/libre/iceweasel-libre/shared-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in ---- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 -+++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 -@@ -50,7 +50,7 @@ - MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in - # Some files have been already bundled with xulrunner - ifndef SYSTEM_LIBXUL --MOZ_PKG_FATAL_WARNINGS = 1 -+MOZ_PKG_FATAL_WARNINGS = 0 - endif - - MOZ_NONLOCALIZED_PKG_LIST = \ diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index 3faac3646..e270f8d3d 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95010 2013-08-03 09:40:52Z schuay $ +# $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> _pkgname=mc pkgname=mc-libre pkgver=4.8.10 -pkgrel=1 +pkgrel=2 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64') url="http://www.ibiblio.org/mc/" @@ -15,7 +15,6 @@ depends=( 'glib2' 'gpm' 'libssh2' - 'pcre' 'slang') makedepends=('libxt' 'libx11') optdepends=( @@ -45,11 +44,14 @@ backup=('etc/mc/edit.indent.rc' 'etc/mc/mc.keymap' 'etc/mc/mc.menu' 'etc/mc/sfs.ini') -source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2") +source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2" + "fs36962.diff") build() { cd "${srcdir}/${_pkgname}-${pkgver}" + patch -Np1 < "${srcdir}/fs36962.diff" + ./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \ --with-x --libexecdir=/usr/lib @@ -69,4 +71,5 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('eb4bdc23abd4fdfa14911d53d65c8186') +md5sums=('eb4bdc23abd4fdfa14911d53d65c8186' + '7f7cf5388a5390c2ed49965492f490aa') diff --git a/libre/mc-libre/fs36962.diff b/libre/mc-libre/fs36962.diff new file mode 100644 index 000000000..0db5ed42b --- /dev/null +++ b/libre/mc-libre/fs36962.diff @@ -0,0 +1,77 @@ +diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c +--- mc-4.8.10-orig/src/filemanager/file.c 2013-08-02 22:02:40.000000000 +0400 ++++ mc-4.8.10/src/filemanager/file.c 2013-09-17 09:59:30.699635407 +0400 +@@ -1272,8 +1272,8 @@ + + /** Initialize variables for progress bars */ + static FileProgressStatus +-panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source, +- FileOpContext * ctx, filegui_dialog_type_t dialog_type) ++panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx, ++ filegui_dialog_type_t dialog_type) + { + FileProgressStatus status; + +@@ -1282,7 +1282,7 @@ + return FILE_CONT; + #endif + +- if (operation != OP_MOVE && verbose && file_op_compute_totals) ++ if (verbose && file_op_compute_totals) + { + ComputeDirSizeUI *ui; + +@@ -2378,13 +2378,6 @@ + mc_refresh (); + if (ctx->erase_at_end) + { +- /* remove files after move */ +- if (erase_list != NULL) +- { +- file_op_context_destroy_ui (ctx); +- file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM); +- } +- + while (erase_list != NULL && return_status != FILE_ABORT) + { + struct link *lp = (struct link *) erase_list->data; +@@ -2792,14 +2785,12 @@ + { + if (operation == OP_DELETE) + dialog_type = FILEGUI_DIALOG_DELETE_ITEM; ++ else if (single_entry && S_ISDIR (selection (panel)->st.st_mode)) ++ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; ++ else if (single_entry || force_single) ++ dialog_type = FILEGUI_DIALOG_ONE_ITEM; + else +- { +- dialog_type = ((operation != OP_COPY) || single_entry || force_single) +- ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM; +- +- if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode)) +- dialog_type = FILEGUI_DIALOG_MULTI_ITEM; +- } ++ dialog_type = FILEGUI_DIALOG_MULTI_ITEM; + } + + /* Initialize things */ +@@ -2844,8 +2835,8 @@ + else + source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL); + #endif /* WITH_FULL_PATHS */ +- if (panel_operate_init_totals +- (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT) ++ if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) ++ == FILE_CONT) + { + if (operation == OP_DELETE) + { +@@ -2936,7 +2927,7 @@ + goto clean_up; + } + +- if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT) ++ if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT) + { + /* Loop for every file, perform the actual copy operation */ + for (i = 0; i < panel->count; i++) diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 6fe28cc7c..0d2f2d8ea 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -5,13 +5,13 @@ pkgname=pandoc-static _pkgname=pandoc -pkgver=1.11.1 -pkgrel=2 +pkgver=1.12 +pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') -makedepends=('ghc' 'sh' 'cabal-install') +makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') options=(strip !makeflags !distcc !emptydirs) #source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig} @@ -20,9 +20,9 @@ source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src. replaces=('pandoc') provides=('pandoc') optdepends=('texlive-most: for pdf creation') -md5sums=('74acd042fcd85bee9edb093cc3fe5c2e' +md5sums=('3d5f23060cad2ff29ba2df5651e92f8a' 'SKIP' - 'ee9d5924632ac07b5049be834a1ed054') + 'c2e9f9b880468455b6e6a7f9ba7308e8') # PKGBUILD functions build() { @@ -47,7 +47,7 @@ build() { case $_hkpkg in $_pkgname-$pkgver) HOME=${srcdir}/${_pkgname}-${pkgver} \ - cabal configure --flags='-library blaze_html_0_5' \ + cabal configure --flags='-library' \ --prefix=/usr \ --libdir=${srcdir}/build/usr/lib -v diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index ec499f814..f822bb1a0 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,10 +2,7 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.11.1 -# 0.4 doesn't work with ghc 7.6 -# Use blaze_html_0_5 flag in the future -_blaze_html=0.6.1.1 +pkgver=1.12 pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' @@ -24,12 +21,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} + cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver} msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { |
