Date: Monday, October 17, 2016 @ 14:12:18 Author: heftig Revision: 278889
archrelease: copy trunk to extra-i686, extra-x86_64 Added: flatpak/repos/extra-i686/PKGBUILD (from rev 278888, flatpak/trunk/PKGBUILD) flatpak/repos/extra-i686/flatpak.install (from rev 278888, flatpak/trunk/flatpak.install) flatpak/repos/extra-x86_64/PKGBUILD (from rev 278888, flatpak/trunk/PKGBUILD) flatpak/repos/extra-x86_64/flatpak.install (from rev 278888, flatpak/trunk/flatpak.install) Deleted: flatpak/repos/extra-i686/PKGBUILD flatpak/repos/extra-i686/flatpak.install flatpak/repos/extra-x86_64/PKGBUILD flatpak/repos/extra-x86_64/flatpak.install ------------------------------+ /PKGBUILD | 140 +++++++++++++++++++++++++++++++++++++++++ /flatpak.install | 22 ++++++ extra-i686/PKGBUILD | 67 ------------------- extra-i686/flatpak.install | 11 --- extra-x86_64/PKGBUILD | 67 ------------------- extra-x86_64/flatpak.install | 11 --- 6 files changed, 162 insertions(+), 156 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-10-17 14:11:34 UTC (rev 278888) +++ extra-i686/PKGBUILD 2016-10-17 14:12:18 UTC (rev 278889) @@ -1,67 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=flatpak -pkgver=0.6.12 -pkgrel=1 -pkgdesc="Application deployment framework for desktop apps" -url="http://flatpak.org" -arch=(i686 x86_64) -license=(GPL) -depends=(dbus systemd glib2 libsoup polkit xorg-xauth libgsystem ostree fuse - json-glib libseccomp libarchive libelf libcap) -makedepends=(intltool python libxslt gobject-introspection gtk-doc git) -install=flatpak.install -_commit=41d2e453622409e4387c36d64a72af589d87e345 # tags/0.6.12^0 -source=("git+https://github.com/flatpak/flatpak#commit=$_commit" - "git://git.gnome.org/libglnx" - "git+https://github.com/projectatomic/bubblewrap") -sha256sums=('SKIP' - 'SKIP' - 'SKIP') - -prepare() { - cd $pkgname - - git submodule init - git config --local submodule.libglnx.url "$srcdir/libglnx" - git config --local submodule.bubblewrap.url "$srcdir/bubblewrap" - git submodule update - - sed -i '/locale\/C\./d' tests/make-test-runtime.sh - - NOCONFIGURE=1 ./autogen.sh -} - -pkgver() { - cd $pkgname - git describe | sed 's/-/+/g' -} - -build() { - cd $pkgname - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --sbindir=/usr/bin --libexecdir=/usr/lib/$pkgname --disable-static \ - --enable-gtk-doc --with-priv-mode=setuid - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd $pkgname - # https://github.com/flatpak/flatpak/issues/267 - # https://github.com/flatpak/flatpak/issues/268 - make -k check -} - -package() { - cd $pkgname - - make DESTDIR="$pkgdir" install - - # Fixup mode to match polkit - install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d" -} Copied: flatpak/repos/extra-i686/PKGBUILD (from rev 278888, flatpak/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-10-17 14:12:18 UTC (rev 278889) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=flatpak +pkgver=0.6.12 +pkgrel=2 +pkgdesc="Application deployment framework for desktop apps" +url="http://flatpak.org" +arch=(i686 x86_64) +license=(GPL) +depends=(dbus systemd glib2 libsoup polkit xorg-xauth libgsystem ostree fuse + json-glib libseccomp libarchive libelf libcap) +makedepends=(intltool python libxslt gobject-introspection gtk-doc git) +install=flatpak.install +_commit=41d2e453622409e4387c36d64a72af589d87e345 # tags/0.6.12^0 +source=("git+https://github.com/flatpak/flatpak#commit=$_commit" + "git://git.gnome.org/libglnx" + "git+https://github.com/projectatomic/bubblewrap") +sha256sums=('SKIP' + 'SKIP' + 'SKIP') + +prepare() { + cd $pkgname + + # CVE-2016-8659 + git cherry-pick -n da0204f4c81e7cf66943ac07317a48cad28ecf95 + + git submodule init + git config --local submodule.libglnx.url "$srcdir/libglnx" + git config --local submodule.bubblewrap.url "$srcdir/bubblewrap" + git submodule update + + sed -i '/locale\/C\./d' tests/make-test-runtime.sh + + NOCONFIGURE=1 ./autogen.sh +} + +pkgver() { + cd $pkgname + git describe | sed 's/-/+/g' +} + +build() { + cd $pkgname + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --sbindir=/usr/bin --libexecdir=/usr/lib/$pkgname --disable-static \ + --enable-gtk-doc --with-priv-mode=setuid + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd $pkgname + # https://github.com/flatpak/flatpak/issues/267 + # https://github.com/flatpak/flatpak/issues/268 + make -k check +} + +package() { + cd $pkgname + + make DESTDIR="$pkgdir" install + + # Fixup mode to match polkit + install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d" +} Deleted: extra-i686/flatpak.install =================================================================== --- extra-i686/flatpak.install 2016-10-17 14:11:34 UTC (rev 278888) +++ extra-i686/flatpak.install 2016-10-17 14:12:18 UTC (rev 278889) @@ -1,11 +0,0 @@ -post_install() { - post_upgrade $1 0 -} - -post_upgrade() { - if (( $(vercmp $2 0.6.1-3) < 0 )); then - # Generate initial /var/lib/flatpak/repo; must be present - # before non-root flatpak will try polkit auth - flatpak remote-list - fi -} Copied: flatpak/repos/extra-i686/flatpak.install (from rev 278888, flatpak/trunk/flatpak.install) =================================================================== --- extra-i686/flatpak.install (rev 0) +++ extra-i686/flatpak.install 2016-10-17 14:12:18 UTC (rev 278889) @@ -0,0 +1,11 @@ +post_install() { + post_upgrade $1 0 +} + +post_upgrade() { + if (( $(vercmp $2 0.6.1-3) < 0 )); then + # Generate initial /var/lib/flatpak/repo; must be present + # before non-root flatpak will try polkit auth + flatpak remote-list + fi +} Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-10-17 14:11:34 UTC (rev 278888) +++ extra-x86_64/PKGBUILD 2016-10-17 14:12:18 UTC (rev 278889) @@ -1,67 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=flatpak -pkgver=0.6.12 -pkgrel=1 -pkgdesc="Application deployment framework for desktop apps" -url="http://flatpak.org" -arch=(i686 x86_64) -license=(GPL) -depends=(dbus systemd glib2 libsoup polkit xorg-xauth libgsystem ostree fuse - json-glib libseccomp libarchive libelf libcap) -makedepends=(intltool python libxslt gobject-introspection gtk-doc git) -install=flatpak.install -_commit=41d2e453622409e4387c36d64a72af589d87e345 # tags/0.6.12^0 -source=("git+https://github.com/flatpak/flatpak#commit=$_commit" - "git://git.gnome.org/libglnx" - "git+https://github.com/projectatomic/bubblewrap") -sha256sums=('SKIP' - 'SKIP' - 'SKIP') - -prepare() { - cd $pkgname - - git submodule init - git config --local submodule.libglnx.url "$srcdir/libglnx" - git config --local submodule.bubblewrap.url "$srcdir/bubblewrap" - git submodule update - - sed -i '/locale\/C\./d' tests/make-test-runtime.sh - - NOCONFIGURE=1 ./autogen.sh -} - -pkgver() { - cd $pkgname - git describe | sed 's/-/+/g' -} - -build() { - cd $pkgname - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --sbindir=/usr/bin --libexecdir=/usr/lib/$pkgname --disable-static \ - --enable-gtk-doc --with-priv-mode=setuid - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd $pkgname - # https://github.com/flatpak/flatpak/issues/267 - # https://github.com/flatpak/flatpak/issues/268 - make -k check -} - -package() { - cd $pkgname - - make DESTDIR="$pkgdir" install - - # Fixup mode to match polkit - install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d" -} Copied: flatpak/repos/extra-x86_64/PKGBUILD (from rev 278888, flatpak/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-10-17 14:12:18 UTC (rev 278889) @@ -0,0 +1,70 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=flatpak +pkgver=0.6.12 +pkgrel=2 +pkgdesc="Application deployment framework for desktop apps" +url="http://flatpak.org" +arch=(i686 x86_64) +license=(GPL) +depends=(dbus systemd glib2 libsoup polkit xorg-xauth libgsystem ostree fuse + json-glib libseccomp libarchive libelf libcap) +makedepends=(intltool python libxslt gobject-introspection gtk-doc git) +install=flatpak.install +_commit=41d2e453622409e4387c36d64a72af589d87e345 # tags/0.6.12^0 +source=("git+https://github.com/flatpak/flatpak#commit=$_commit" + "git://git.gnome.org/libglnx" + "git+https://github.com/projectatomic/bubblewrap") +sha256sums=('SKIP' + 'SKIP' + 'SKIP') + +prepare() { + cd $pkgname + + # CVE-2016-8659 + git cherry-pick -n da0204f4c81e7cf66943ac07317a48cad28ecf95 + + git submodule init + git config --local submodule.libglnx.url "$srcdir/libglnx" + git config --local submodule.bubblewrap.url "$srcdir/bubblewrap" + git submodule update + + sed -i '/locale\/C\./d' tests/make-test-runtime.sh + + NOCONFIGURE=1 ./autogen.sh +} + +pkgver() { + cd $pkgname + git describe | sed 's/-/+/g' +} + +build() { + cd $pkgname + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --sbindir=/usr/bin --libexecdir=/usr/lib/$pkgname --disable-static \ + --enable-gtk-doc --with-priv-mode=setuid + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +check() { + cd $pkgname + # https://github.com/flatpak/flatpak/issues/267 + # https://github.com/flatpak/flatpak/issues/268 + make -k check +} + +package() { + cd $pkgname + + make DESTDIR="$pkgdir" install + + # Fixup mode to match polkit + install -d -o root -g 102 -m 750 "$pkgdir/usr/share/polkit-1/rules.d" +} Deleted: extra-x86_64/flatpak.install =================================================================== --- extra-x86_64/flatpak.install 2016-10-17 14:11:34 UTC (rev 278888) +++ extra-x86_64/flatpak.install 2016-10-17 14:12:18 UTC (rev 278889) @@ -1,11 +0,0 @@ -post_install() { - post_upgrade $1 0 -} - -post_upgrade() { - if (( $(vercmp $2 0.6.1-3) < 0 )); then - # Generate initial /var/lib/flatpak/repo; must be present - # before non-root flatpak will try polkit auth - flatpak remote-list - fi -} Copied: flatpak/repos/extra-x86_64/flatpak.install (from rev 278888, flatpak/trunk/flatpak.install) =================================================================== --- extra-x86_64/flatpak.install (rev 0) +++ extra-x86_64/flatpak.install 2016-10-17 14:12:18 UTC (rev 278889) @@ -0,0 +1,11 @@ +post_install() { + post_upgrade $1 0 +} + +post_upgrade() { + if (( $(vercmp $2 0.6.1-3) < 0 )); then + # Generate initial /var/lib/flatpak/repo; must be present + # before non-root flatpak will try polkit auth + flatpak remote-list + fi +}