From 431a4ca6d3b582ba1e949b667fe278c93217f8cb Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 11 Jun 2015 18:42:08 +0200 Subject: migrating to aur4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .gitignore | 5 + blender-plugin-vectex/upload | 1 + cedilla/upload | 1 + clean | 4 + dash-pipe/upload | 1 + dooble-common/PKGBUILD | 4 +- dooble-common/upload | 1 + dooble-qt4/PKGBUILD | 6 +- dooble-qt4/upload | 1 + dooble/PKGBUILD | 6 +- dooble/upload | 1 + emacs-clojure-mode-git/PKGBUILD | 44 -- .../emacs-clojure-mode-git.install | 16 - emacs-clojure-mode-git/watch | 21 - emacs-clojure-mode/PKGBUILD | 29 ++ emacs-clojure-mode/emacs-clojure-mode.install | 16 + emacs-clojure-mode/upload | 1 + emacs-clojure-mode/watch | 21 + emacs-d-mode/upload | 1 + emacs-find-recursive/PKGBUILD | 3 +- emacs-find-recursive/upload | 1 + emacs-gtk2/PKGBUILD | 16 +- emacs-gtk2/gnupg21.patch | 28 -- emacs-gtk2/upload | 1 + gimp-plugin-image-reg/upload | 1 + icu-48/upload | 1 + javagnutar/upload | 1 + latex-beamer/upload | 1 + latex-fitch-uoo/upload | 1 + latex-fitch/PKGBUILD | 8 +- latex-fitch/upload | 1 + latex-fitch/watch | 6 +- lib32-libjson/upload | 1 + libntru/upload | 1 + libspoton/PKGBUILD | 12 +- libspoton/upload | 1 + loki-render/upload | 1 + nafe/.gitignore | 1 + nafe/upload | 1 + paredit/upload | 1 + pony/upload | 1 + python2-numpydoc/upload | 1 + qtchess/PKGBUILD | 4 +- qtchess/upload | 1 + spot-on/PKGBUILD | 10 +- spot-on/upload | 1 + sshcd/upload | 1 + sysvinit/upload | 1 + texlive-europecv/upload | 1 + texlive-flashcards/PKGBUILD | 22 +- texlive-flashcards/upload | 1 + untex/upload | 1 + upload | 64 +++ use/PKGBUILD | 4 +- use/upload | 1 + ...accelerated-valuators-to-the-ValuatorMask.patch | 210 ++++++++++ ...-modesetting-Fix-software-cursor-fallback.patch | 42 ++ ...sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 51 +++ ...-hook-up-the-unaccelerated-valuator-masks.patch | 134 +++++++ xorg-server-hwcursor-gamma/PKGBUILD | 49 ++- xorg-server-hwcursor-gamma/fix-CVE-2015-3164.patch | 311 ++++++++++++++ ...ogind-dont-second-guess-D-Bus-default-tim.patch | 446 +++++++++++++++++++++ ...ogind-filter-out-non-signal-messages-from.patch | 90 +++++ xorg-server-hwcursor-gamma/upload | 1 + xtux/upload | 1 + xz-java-git [disowned]/PKGBUILD | 43 ++ xz-java-git/PKGBUILD | 43 -- xz-java/upload | 1 + 68 files changed, 1594 insertions(+), 210 deletions(-) create mode 120000 blender-plugin-vectex/upload create mode 120000 cedilla/upload create mode 100755 clean create mode 120000 dash-pipe/upload create mode 120000 dooble-common/upload create mode 120000 dooble-qt4/upload create mode 120000 dooble/upload delete mode 100644 emacs-clojure-mode-git/PKGBUILD delete mode 100644 emacs-clojure-mode-git/emacs-clojure-mode-git.install delete mode 100755 emacs-clojure-mode-git/watch create mode 100644 emacs-clojure-mode/PKGBUILD create mode 100644 emacs-clojure-mode/emacs-clojure-mode.install create mode 120000 emacs-clojure-mode/upload create mode 100755 emacs-clojure-mode/watch create mode 120000 emacs-d-mode/upload create mode 120000 emacs-find-recursive/upload delete mode 100644 emacs-gtk2/gnupg21.patch create mode 120000 emacs-gtk2/upload create mode 120000 gimp-plugin-image-reg/upload create mode 120000 icu-48/upload create mode 120000 javagnutar/upload create mode 120000 latex-beamer/upload create mode 120000 latex-fitch-uoo/upload create mode 120000 latex-fitch/upload create mode 120000 lib32-libjson/upload create mode 120000 libntru/upload create mode 120000 libspoton/upload create mode 120000 loki-render/upload create mode 100644 nafe/.gitignore create mode 120000 nafe/upload create mode 120000 paredit/upload create mode 120000 pony/upload create mode 120000 python2-numpydoc/upload create mode 120000 qtchess/upload create mode 120000 spot-on/upload create mode 120000 sshcd/upload create mode 120000 sysvinit/upload create mode 120000 texlive-europecv/upload create mode 120000 texlive-flashcards/upload create mode 120000 untex/upload create mode 100755 upload create mode 120000 use/upload create mode 100644 xorg-server-hwcursor-gamma/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch create mode 100644 xorg-server-hwcursor-gamma/0001-modesetting-Fix-software-cursor-fallback.patch create mode 100644 xorg-server-hwcursor-gamma/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch create mode 100644 xorg-server-hwcursor-gamma/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch create mode 100644 xorg-server-hwcursor-gamma/fix-CVE-2015-3164.patch create mode 100644 xorg-server-hwcursor-gamma/systemd-logind-dont-second-guess-D-Bus-default-tim.patch create mode 100644 xorg-server-hwcursor-gamma/systemd-logind-filter-out-non-signal-messages-from.patch create mode 120000 xorg-server-hwcursor-gamma/upload create mode 120000 xtux/upload create mode 100644 xz-java-git [disowned]/PKGBUILD delete mode 100644 xz-java-git/PKGBUILD create mode 120000 xz-java/upload diff --git a/.gitignore b/.gitignore index 971019f..8d4ac2b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ _/ \#*\# .\#* *.swp +*.swo *.bak *.tgz @@ -33,6 +34,7 @@ release *.elc *.txt *.sty +*.log *-pkgbuild unfetchable @@ -40,3 +42,6 @@ unfetchable /texlive-flashcards/flashcards *.[0-9] tags + +.aur/ + diff --git a/blender-plugin-vectex/upload b/blender-plugin-vectex/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/blender-plugin-vectex/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/cedilla/upload b/cedilla/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/cedilla/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/clean b/clean new file mode 100755 index 0000000..fa9b429 --- /dev/null +++ b/clean @@ -0,0 +1,4 @@ +#!/bin/sh + +rm -rf */src */pkg + diff --git a/dash-pipe/upload b/dash-pipe/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/dash-pipe/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/dooble-common/PKGBUILD b/dooble-common/PKGBUILD index 5fd33b2..093994e 100644 --- a/dooble-common/PKGBUILD +++ b/dooble-common/PKGBUILD @@ -2,14 +2,14 @@ pkgname=dooble-common pkgver=1.52 -pkgrel=1 +pkgrel=2 pkgdesc='Common files for package variants for Dooble' url='http://dooble.sourceforge.net/' arch=('any') license=('custom:3-clause BSD') depends=() makedepends=('qtchooser') -source=("dooble-${pkgver}.tar.gz::http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.tar.gz?r=") +source=("dooble-${pkgver}.tar.gz::http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble-Source.tar.gz?r=") sha256sums=('407091a7dbd9d6969f0450a97e0fa9a153ea7773ae1af599a5226e7bc7467173') diff --git a/dooble-common/upload b/dooble-common/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/dooble-common/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/dooble-qt4/PKGBUILD b/dooble-qt4/PKGBUILD index 0e9f0ff..5a1259b 100644 --- a/dooble-qt4/PKGBUILD +++ b/dooble-qt4/PKGBUILD @@ -2,14 +2,14 @@ pkgname=dooble-qt4 pkgver=1.52 -pkgrel=1 +pkgrel=3 pkgdesc='A safe WebKit Web browser' url='http://dooble.sourceforge.net/' arch=('i686' 'x86_64') license=('custom:3-clause BSD') -depends=('qtwebkit' 'libspoton=0.17c' "dooble-common=${pkgver}") +depends=('qtwebkit' 'libspoton=0.22' "dooble-common=${pkgver}") makedepends=('qtwebkit' 'sed' 'coreutils') -source=("dooble-${pkgver}.tar.gz::http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.tar.gz?r=") +source=("dooble-${pkgver}.tar.gz::http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble-Source.tar.gz?r=") sha256sums=('407091a7dbd9d6969f0450a97e0fa9a153ea7773ae1af599a5226e7bc7467173') # Dependency (from ldd output) tree: diff --git a/dooble-qt4/upload b/dooble-qt4/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/dooble-qt4/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD index 5e1c5af..c2c3423 100644 --- a/dooble/PKGBUILD +++ b/dooble/PKGBUILD @@ -2,14 +2,14 @@ pkgname=dooble pkgver=1.52 -pkgrel=1 +pkgrel=3 pkgdesc='A safe WebKit Web browser' url='http://dooble.sourceforge.net/' arch=('i686' 'x86_64') license=('custom:3-clause BSD') -depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'libspoton=0.17c' "dooble-common=${pkgver}") +depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'libspoton=0.22' "dooble-common=${pkgver}") makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools' 'sed' 'coreutils') -source=("dooble-${pkgver}.tar.gz::http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.tar.gz?r=") +source=("dooble-${pkgver}.tar.gz::http://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble-Source.tar.gz?r=") sha256sums=('407091a7dbd9d6969f0450a97e0fa9a153ea7773ae1af599a5226e7bc7467173') # Dependency (from ldd output) tree: diff --git a/dooble/upload b/dooble/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/dooble/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/emacs-clojure-mode-git/PKGBUILD b/emacs-clojure-mode-git/PKGBUILD deleted file mode 100644 index df78e0b..0000000 --- a/emacs-clojure-mode-git/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: Gianni Vialetto -# Contributor: Nick Vogel - -pkgname=emacs-clojure-mode-git -pkgver=20130411 -pkgrel=1 -arch=('any') -pkgdesc="Emacs major mode for the clojure language (GIT version)" -url="https://github.com/technomancy/clojure-mode" -license="GPL3" -depends=('emacs') -optdepends=('paredit: enhanced LISP structure editing') -makedepends=('git') -provides=('emacs-clojure-mode') -replaces=('emacs-clojure-mode') -install='emacs-clojure-mode-git.install' - -_gitroot="https://github.com/technomancy/clojure-mode.git" -_gitname="clojure-mode" -build() { - cd $startdir/src - msg "Connecting to github.com GIT server...." - - if [ -d $startdir/src/$_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot - fi - - msg "GIT checkout done or server timeout" -} - -package() { - cd $startdir/src/$_gitname - - install -d $pkgdir/usr/share/emacs/site-lisp/ - - # install the files in directory created above - install -m644 clojure-mode.el -t $pkgdir/usr/share/emacs/site-lisp/ - install -m644 clojure-test-mode.el -t $pkgdir/usr/share/emacs/site-lisp/ -} - diff --git a/emacs-clojure-mode-git/emacs-clojure-mode-git.install b/emacs-clojure-mode-git/emacs-clojure-mode-git.install deleted file mode 100644 index 7710f4f..0000000 --- a/emacs-clojure-mode-git/emacs-clojure-mode-git.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install () { -echo -echo "==> To enable clojure-mode, add this to your \$HOME/.emacs:" -echo -echo " (require 'clojure-mode)" -echo -echo "==> There are also a clojurescript-mode and a clojure-test-mode" -echo "==> available - to get more information on those, please refer to" -echo "==> the package homepage." -echo -} - -post_upgrade () { - post_install $1 -} - diff --git a/emacs-clojure-mode-git/watch b/emacs-clojure-mode-git/watch deleted file mode 100755 index eb2b51d..0000000 --- a/emacs-clojure-mode-git/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f tags ] && rm tags - -wget 'https://github.com/technomancy/clojure-mode/tags' -O - 2>/dev/null | grep tag-name | grep -Po '>.* tags - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum tags > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'emacs-clojure-mode-git' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'emacs-clojure-mode-git (unfetchable)' -fi - diff --git a/emacs-clojure-mode/PKGBUILD b/emacs-clojure-mode/PKGBUILD new file mode 100644 index 0000000..1d0a483 --- /dev/null +++ b/emacs-clojure-mode/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Contributor: Gianni Vialetto +# Contributor: Nick Vogel + +pkgname=emacs-clojure-mode +pkgver=3.0.1 +pkgrel=1 +arch=('any') +pkgdesc="Emacs major mode for the clojure language" +url="https://github.com/technomancy/clojure-mode" +license="GPL3" +depends=('emacs') +optdepends=('paredit: enhanced LISP structure editing') +install='emacs-clojure-mode.install' +source=("https://github.com/clojure-emacs/clojure-mode/archive/${pkgver}.tar.gz") +sha256sums=(96f238d0d1615eddb07d15c99834e5750120f523e9ef0c14919dee1e8f1705ef) + +package () +{ + cd "${srcdir}/clojure-mode-${pkgver}" + + install -d "${pkgdir}/usr/share/emacs/site-lisp/" + + # install the files in directory created above + install -m644 clojure-test-mode.el -t "${pkgdir}/usr/share/emacs/site-lisp/" + install -m644 clojure-mode.el -t "${pkgdir}/usr/share/emacs/site-lisp/" + install -m644 clojure-mode-extra-font-locking.el -t "${pkgdir}/usr/share/emacs/site-lisp/" +} + diff --git a/emacs-clojure-mode/emacs-clojure-mode.install b/emacs-clojure-mode/emacs-clojure-mode.install new file mode 100644 index 0000000..7710f4f --- /dev/null +++ b/emacs-clojure-mode/emacs-clojure-mode.install @@ -0,0 +1,16 @@ +post_install () { +echo +echo "==> To enable clojure-mode, add this to your \$HOME/.emacs:" +echo +echo " (require 'clojure-mode)" +echo +echo "==> There are also a clojurescript-mode and a clojure-test-mode" +echo "==> available - to get more information on those, please refer to" +echo "==> the package homepage." +echo +} + +post_upgrade () { + post_install $1 +} + diff --git a/emacs-clojure-mode/upload b/emacs-clojure-mode/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/emacs-clojure-mode/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/emacs-clojure-mode/watch b/emacs-clojure-mode/watch new file mode 100755 index 0000000..eb2b51d --- /dev/null +++ b/emacs-clojure-mode/watch @@ -0,0 +1,21 @@ +#!/bin/sh + +[ -f tags ] && rm tags + +wget 'https://github.com/technomancy/clojure-mode/tags' -O - 2>/dev/null | grep tag-name | grep -Po '>.* tags + +if [ $? = 0 ]; then + [ -f unfetchable ] && rm unfetchable + md5sum tags > new-sum + touch sum + if [ "$(cat sum)" = "$(cat new-sum)" ]; then + rm new-sum + else + mv new-sum sum + echo 'emacs-clojure-mode-git' + fi +elif [ ! -f unfetchable ]; then + touch unfetchable + echo 'emacs-clojure-mode-git (unfetchable)' +fi + diff --git a/emacs-d-mode/upload b/emacs-d-mode/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/emacs-d-mode/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/emacs-find-recursive/PKGBUILD b/emacs-find-recursive/PKGBUILD index de750ee..934b89a 100644 --- a/emacs-find-recursive/PKGBUILD +++ b/emacs-find-recursive/PKGBUILD @@ -11,7 +11,8 @@ depends=('emacs') source=(http://www.webweavertech.com/ovidiu/emacs/find-recursive.txt) md5sums=('468fcc4848e4adf54af4fdbe78581b95') -build() { +package () +{ cd $startdir/src/ install -Dm644 $startdir/src/find-recursive.txt $startdir/pkg/usr/share/emacs/site-lisp/find-recursive.el } diff --git a/emacs-find-recursive/upload b/emacs-find-recursive/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/emacs-find-recursive/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/emacs-gtk2/PKGBUILD b/emacs-gtk2/PKGBUILD index ea97ba2..3105fa8 100644 --- a/emacs-gtk2/PKGBUILD +++ b/emacs-gtk2/PKGBUILD @@ -4,27 +4,19 @@ _pkgname=emacs pkgname=$_pkgname-gtk2 -pkgver=24.4 -pkgrel=2 +pkgver=24.5 +pkgrel=1 pkgdesc="The extensible, customizable, self-documenting real-time display editor. GTK2 version" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" license=('GPL3') depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'imagemagick>=6.8.4.7') install=emacs-gtk2.install -source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz{,.sig} - gnupg21.patch) -md5sums=('ad487658ad7421ad8d7b5152192eb945' - 'SKIP' - '0583d868e0e304bac3df95b7518615cd') +source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz) +sha256sums=(dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e) provides=('emacs') conflicts=('emacs') -prepare() { - cd "$srcdir"/emacs-$pkgver - patch -p1 -i ../gnupg21.patch -} - build() { cd "$srcdir"/emacs-$pkgver export ac_cv_lib_gif_EGifPutExtensionLast=yes diff --git a/emacs-gtk2/gnupg21.patch b/emacs-gtk2/gnupg21.patch deleted file mode 100644 index bbac3d9..0000000 --- a/emacs-gtk2/gnupg21.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 135a9f4b5aead507c030fb7e3e8ad13aaa91f403 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Fri, 07 Nov 2014 02:31:12 +0000 -Subject: epg: Adjust to GnuPG 2.1 key listing change - -* epg.el (epg--list-keys-1): Ignore fields after the 15th field -(bug#18979). Reported by Hideki Saito. ---- -(limited to 'lisp/epg.el') - -diff --git a/lisp/epg.el b/lisp/epg.el -index 0c74531..e4d8c1e 100644 ---- a/lisp/epg.el -+++ b/lisp/epg.el -@@ -1278,8 +1278,9 @@ callback data (if any)." - string (match-string 0) - index 0 - field 0) -- (while (eq index -- (string-match "\\([^:]+\\)?:" string index)) -+ (while (and (< field (length (car keys))) -+ (eq index -+ (string-match "\\([^:]+\\)?:" string index))) - (setq index (match-end 0)) - (aset (car keys) field (match-string 1 string)) - (setq field (1+ field)))) --- -cgit v0.9.0.2 diff --git a/emacs-gtk2/upload b/emacs-gtk2/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/emacs-gtk2/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/gimp-plugin-image-reg/upload b/gimp-plugin-image-reg/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/gimp-plugin-image-reg/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/icu-48/upload b/icu-48/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/icu-48/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/javagnutar/upload b/javagnutar/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/javagnutar/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/latex-beamer/upload b/latex-beamer/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/latex-beamer/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/latex-fitch-uoo/upload b/latex-fitch-uoo/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/latex-fitch-uoo/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/latex-fitch/PKGBUILD b/latex-fitch/PKGBUILD index e839bdb..f8bd824 100644 --- a/latex-fitch/PKGBUILD +++ b/latex-fitch/PKGBUILD @@ -3,17 +3,17 @@ pkgname=latex-fitch pkgver=1.6 -pkgrel=1 +pkgrel=2 pkgdesc="A LaTeX package for Fitch-style proofs" arch=('any') url="http://folk.uio.no/johanw/FitchSty.html" license=('GPL') depends=('tetex') install=fitch.install -source=(http://folk.uio.no/johanw/fitch.sty) +#source=(http://folk.uio.no/johanw/fitch.sty) +source=(fitch.sty) md5sums=('d62bdd0267c217d6017baef950b9205a') package() { - mkdir -p $startdir/pkg/usr/share/texmf-dist/tex/latex/fitch - cp $startdir/fitch.sty $startdir/pkg/usr/share/texmf-dist/tex/latex/fitch + install -Dm644 "${srcdir}/fitch.sty" "${pkgdir}/usr/share/texmf-dist/tex/latex/fitch" } diff --git a/latex-fitch/upload b/latex-fitch/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/latex-fitch/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/latex-fitch/watch b/latex-fitch/watch index 8dca4f7..9c62075 100755 --- a/latex-fitch/watch +++ b/latex-fitch/watch @@ -1,12 +1,12 @@ #!/bin/sh -[ -f fitch.sty ] && rm fitch.sty +[ -f fitch.sty.new ] && rm fitch.sty.new -wget 'http://folk.uio.no/johanw/fitch.sty' -O fitch.sty >/dev/null 2>/dev/null +wget 'http://folk.uio.no/johanw/fitch.sty' -O fitch.sty.new >/dev/null 2>/dev/null if [ $? = 0 ]; then [ -f unfetchable ] && rm unfetchable - md5sum fitch.sty > new-sum + md5sum fitch.sty.new > new-sum touch sum if [ "$(cat sum)" = "$(cat new-sum)" ]; then rm new-sum diff --git a/lib32-libjson/upload b/lib32-libjson/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/lib32-libjson/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/libntru/upload b/libntru/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/libntru/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/libspoton/PKGBUILD b/libspoton/PKGBUILD index afe81b2..a463f36 100644 --- a/libspoton/PKGBUILD +++ b/libspoton/PKGBUILD @@ -1,25 +1,25 @@ # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> pkgname=libspoton -pkgver=0.17c -pkgrel=1 +pkgver=0.22 +pkgrel=2 pkgdesc='Binding library for Spot-On' url='http://spot-on.sourceforge.net/' arch=('i686' 'x86_64') license=('custom:3-clause BSD') depends=('sqlite' 'libgcrypt>=1.5' 'libntru') makedepends=('sqlite' 'libgcrypt>=1.5' 'make' 'gcc' 'coreutils') -source=("spot-on-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/spot-on/Version%20${pkgver}/Spot-On.d.tar.gz") -sha256sums=('c7f0362fca988407fbcdf9e27b2a96920c58875c8a9d25100a667a0f5ce7f976') +source=("https://github.com/textbrowser/spot-on/archive/v${pkgver}.tar.gz") +sha256sums=('b6c2015274e9fca2f887f1f9638f8d6c50514987b9081c5e86044246da32ce80') build() { - cd "$srcdir/spot-on.d/libSpotOn" + cd "$srcdir/spot-on-${pkgver}/libSpotOn" make } package () { - cd "$srcdir/spot-on.d/libSpotOn" + cd "$srcdir/spot-on-${pkgver}/libSpotOn" install -dm755 -- "$pkgdir/usr/lib" install -m755 -- libspoton.so "$pkgdir/usr/lib/libspoton.so" install -dm755 -- "$pkgdir/usr/include" diff --git a/libspoton/upload b/libspoton/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/libspoton/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/loki-render/upload b/loki-render/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/loki-render/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/nafe/.gitignore b/nafe/.gitignore new file mode 100644 index 0000000..71a454a --- /dev/null +++ b/nafe/.gitignore @@ -0,0 +1 @@ +/version diff --git a/nafe/upload b/nafe/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/nafe/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/paredit/upload b/paredit/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/paredit/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/pony/upload b/pony/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/pony/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/python2-numpydoc/upload b/python2-numpydoc/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/python2-numpydoc/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/qtchess/PKGBUILD b/qtchess/PKGBUILD index b5f27c1..2f26ba9 100644 --- a/qtchess/PKGBUILD +++ b/qtchess/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> pkgname=qtchess -pkgver=3.18 +pkgver=3.20 pkgrel=1 pkgdesc='Online chess game client written in Qt' url='http://qtchess.sourceforge.net/' @@ -11,7 +11,7 @@ license=('custom:3-clause BSD') depends=('qt5-base' 'libgl') makedepends=('qt5-base' 'libgl' 'qt5-tools') source=("http://downloads.sourceforge.net/project/qtchess/Version%20${pkgver}/QtChess.d.tar.gz") -sha256sums=('9a935720018418190c1933013cc47d390fe1f22aa052d308077f561e9a62e84a') +sha256sums=('9ac063d68dc880363ebedc64f12a01ec2032cebd9c969ed711c0ec8db95db254') build() diff --git a/qtchess/upload b/qtchess/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/qtchess/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/spot-on/PKGBUILD b/spot-on/PKGBUILD index 1007671..4945129 100644 --- a/spot-on/PKGBUILD +++ b/spot-on/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> pkgname=spot-on -pkgver=0.17c +pkgver=0.22 pkgrel=1 pkgdesc='An exploratory research project investigating a variety of communications protocols' url='http://spot-on.sourceforge.net/' @@ -9,18 +9,18 @@ arch=('i686' 'x86_64') license=('custom:3-clause BSD') depends=('qt5-base' 'geoip>=1.5.1' 'libgcrypt>=1.5' 'openssl>=0.9.8' 'lksctp-tools' 'qt5-multimedia' "libspoton=${pkgver}" 'libntru') makedepends=('qt5-base' 'geoip>=1.5.1' 'libgcrypt>=1.5' 'openssl>=0.9.8' 'lksctp-tools' 'qt5-multimedia' 'qt5-tools' 'make' 'gcc') -source=("spot-on-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/spot-on/Version%20${pkgver}/Spot-On.d.tar.gz") -sha256sums=('c7f0362fca988407fbcdf9e27b2a96920c58875c8a9d25100a667a0f5ce7f976') +source=("https://github.com/textbrowser/spot-on/archive/v${pkgver}.tar.gz") +sha256sums=('b6c2015274e9fca2f887f1f9638f8d6c50514987b9081c5e86044246da32ce80') build() { - cd "$srcdir/spot-on.d/branches/$pkgver" + cd "$srcdir/spot-on-${pkgver}/branches/trunk" qmake-qt5 -o Makefile spot-on.qt5.pro make } package () { - cd "$srcdir/spot-on.d/branches/$pkgver" + cd "$srcdir/spot-on-${pkgver}/branches/trunk" install -dm755 -- "$pkgdir/usr/lib/spot-on" install -m755 -- Spot-On "$pkgdir/usr/lib/spot-on/Spot-On" install -m755 -- Spot-On-Kernel "$pkgdir/usr/lib/spot-on/Spot-On-Kernel" diff --git a/spot-on/upload b/spot-on/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/spot-on/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/sshcd/upload b/sshcd/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/sshcd/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/sysvinit/upload b/sysvinit/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/sysvinit/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/texlive-europecv/upload b/texlive-europecv/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/texlive-europecv/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/texlive-flashcards/PKGBUILD b/texlive-flashcards/PKGBUILD index 5092996..bf610be 100644 --- a/texlive-flashcards/PKGBUILD +++ b/texlive-flashcards/PKGBUILD @@ -3,7 +3,7 @@ pkgname=texlive-flashcards pkgver=1.0.1 -pkgrel=1 +pkgrel=2 license=('GPL') depends=('texlive-core') pkgdesc="A class for typesetting flashcards." @@ -13,14 +13,20 @@ install=texlive-flashcards.install source=(http://mirror.ctan.org/macros/latex/contrib/flashcards.zip) md5sums=('21f85c9b291a0d06e815ce09d89f4463') -build() +build () { - mkdir -p $pkgdir/usr/share/texmf/tex/latex/flashcards - - cd $srcdir/flashcards + cd "${srcdir}/flashcards" latex flashcards.ins - cp flashcards.cls $pkgdir/usr/share/texmf/tex/latex/flashcards - cp *.cfg $pkgdir/usr/share/texmf/tex/latex/flashcards +} + +package () +{ + cd "${srcdir}/flashcards" + mkdir -p -- "${pkgdir}/usr/share/texmf/tex/latex/flashcards" + + cp -- flashcards.cls "${pkgdir}/usr/share/texmf/tex/latex/flashcards" + cp -- *.cfg "${pkgdir}/usr/share/texmf/tex/latex/flashcards" - install -D $srcdir/flashcards/COPYING $pkgdir/usr/share/licenses/$pkgname/LICENSE + install -D -- "${srcdir}/flashcards/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } + diff --git a/texlive-flashcards/upload b/texlive-flashcards/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/texlive-flashcards/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/untex/upload b/untex/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/untex/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/upload b/upload new file mode 100755 index 0000000..0f6ca84 --- /dev/null +++ b/upload @@ -0,0 +1,64 @@ +#!/bin/bash + +set -e + +cd "$(dirname "${0}")" + +makepkg --install + +newpkg=0 +pkgname="$(. PKGBUILD && echo "${pkgname}")" +pkgver="$(. PKGBUILD && echo "${pkgver}")" +pkgrel="$(pkgrel=1 && . PKGBUILD && echo "${pkgrel}")" +epoch="$(epoch=0 && . PKGBUILD && echo "${epoch}")" +install="$(install="" && . PKGBUILD && echo "${install}")" + +if [ ! -d .aur ]; then + newpkg=1 + git clone "ssh://aur@aur4.archlinux.org/${pkgname}.git" .aur +fi + +version="${pkgver}" +if [ ! "${epoch}" = 0 ]; then + version="${epoch}:${version}" +fi +if [ ! "${pkgrel}" = 1 ]; then + version="${version}-${pkgrel}" +fi + +cp PKGBUILD .aur +if [ ! "${install}" = "" ]; then + cp "${install}" .aur + cd .aur + git add "${install}" + cd .. +fi + +( + . PKGBUILD + cd .aur + for file in "${source[@]}"; do + if [ -f ../"${file}" ]; then + cp ../"${file}" . + git add "${file}" + fi + done + cd .. +) + +cd .aur + +mksrcinfo +git add PKGBUILD .SRCINFO + +if [ ${newpkg} = 1 ]; then + git commit -m "Initial import, version ${version}" + git push origin master +elif [ ! "${pkgrel}" = 1 ]; then + git commit -m "Update package release to ${version}" + git push +else + git commit -m "Update to ${version}" + git push +fi + diff --git a/use/PKGBUILD b/use/PKGBUILD index b49c177..a8958d0 100644 --- a/use/PKGBUILD +++ b/use/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> pkgname=use -pkgver=1.11.7 +pkgver=1.12.1 pkgrel=1 pkgdesc='A utility to help casual user install multiple versions of a software package' url='http://use.sourceforge.net/' @@ -10,7 +10,7 @@ license=('custom:3-clause BSD') depends=('glibc') makedepends=('gcc' 'glibc' 'make' 'coreutils' 'perl' 'sed') source=("use-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/use/Version%20${pkgver}/use.d.tar.gz") -sha256sums=('7099e75c17932ff854528b8a17c9f62a0fd2619219693fd8e88dfe95a2605161') +sha256sums=('9efd990bd3e2cf40e74e56ecb7f849e5050e69aa24317633adbe2e1ce360efbe') build() { diff --git a/use/upload b/use/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/use/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/xorg-server-hwcursor-gamma/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch b/xorg-server-hwcursor-gamma/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch new file mode 100644 index 0000000..86744f1 --- /dev/null +++ b/xorg-server-hwcursor-gamma/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch @@ -0,0 +1,210 @@ +From e1a7f4bb5333b0271d29f785eb55f1c3273e626a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 May 2015 14:18:54 +1000 +Subject: [PATCH] dix: Add unaccelerated valuators to the ValuatorMask + +Allows a mask to carry both accelerated and unaccelerated motion at the same +time. + +This is required for xf86-input-libinput where the pointer acceleration +happens in libinput already, but parts of the server, specifically raw events +and DGA rely on device-specific unaccelerated data. + +To ease integration add this as a second set to the ValuatorMask rather than +extending all APIs to carry a second, possibly NULL set of valuators. + +Note that a valuator mask should only be used in either accel/unaccel or +standard mode at any time. Switching requires either a valuator_mask_zero() +call or unsetting all valuators one-by-one. Trying to mix the two will produce +a warning. + +The server has a shortcut for changing a mask with the +valuator_mask_drop_unaccelerated() call. This saves us from having to loop +through all valuators on every event, we can just drop the bits we know we +don't want. + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede +--- + dix/inpututils.c | 82 +++++++++++++++++++++++++++++++++++++++--- + hw/xfree86/common/xf86Module.h | 2 +- + include/input.h | 15 ++++++++ + include/inpututils.h | 2 ++ + 4 files changed, 95 insertions(+), 6 deletions(-) + +diff --git a/dix/inpututils.c b/dix/inpututils.c +index 5c2a32d..1363988 100644 +--- a/dix/inpututils.c ++++ b/dix/inpututils.c +@@ -505,11 +505,8 @@ valuator_mask_isset(const ValuatorMask *mask, int valuator) + return mask->last_bit >= valuator && BitIsOn(mask->mask, valuator); + } + +-/** +- * Set the valuator to the given floating-point data. +- */ +-void +-valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) ++static inline void ++_valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) + { + mask->last_bit = max(valuator, mask->last_bit); + SetBit(mask->mask, valuator); +@@ -517,6 +514,17 @@ valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) + } + + /** ++ * Set the valuator to the given floating-point data. ++ */ ++void ++valuator_mask_set_double(ValuatorMask *mask, int valuator, double data) ++{ ++ BUG_WARN_MSG(mask->has_unaccelerated, ++ "Do not mix valuator types, zero mask first\n"); ++ _valuator_mask_set_double(mask, valuator, data); ++} ++ ++/** + * Set the valuator to the given integer data. + */ + void +@@ -594,11 +602,15 @@ valuator_mask_unset(ValuatorMask *mask, int valuator) + + ClearBit(mask->mask, valuator); + mask->valuators[valuator] = 0.0; ++ mask->unaccelerated[valuator] = 0.0; + + for (i = 0; i <= mask->last_bit; i++) + if (valuator_mask_isset(mask, i)) + lastbit = max(lastbit, i); + mask->last_bit = lastbit; ++ ++ if (mask->last_bit == -1) ++ mask->has_unaccelerated = FALSE; + } + } + +@@ -611,6 +623,66 @@ valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src) + valuator_mask_zero(dest); + } + ++Bool ++valuator_mask_has_unaccelerated(const ValuatorMask *mask) ++{ ++ return mask->has_unaccelerated; ++} ++ ++void ++valuator_mask_drop_unaccelerated(ValuatorMask *mask) ++{ ++ memset(mask->unaccelerated, 0, sizeof(mask->unaccelerated)); ++ mask->has_unaccelerated = FALSE; ++} ++ ++/** ++ * Set both accelerated and unaccelerated value for this mask. ++ */ ++void ++valuator_mask_set_unaccelerated(ValuatorMask *mask, ++ int valuator, ++ double accel, ++ double unaccel) ++{ ++ BUG_WARN_MSG(mask->last_bit != -1 && !mask->has_unaccelerated, ++ "Do not mix valuator types, zero mask first\n"); ++ _valuator_mask_set_double(mask, valuator, accel); ++ mask->has_unaccelerated = TRUE; ++ mask->unaccelerated[valuator] = unaccel; ++} ++ ++double ++valuator_mask_get_accelerated(const ValuatorMask *mask, ++ int valuator) ++{ ++ return valuator_mask_get_double(mask, valuator); ++} ++ ++double ++valuator_mask_get_unaccelerated(const ValuatorMask *mask, ++ int valuator) ++{ ++ return mask->unaccelerated[valuator]; ++} ++ ++Bool ++valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, ++ int valuator, ++ double *accel, ++ double *unaccel) ++{ ++ if (valuator_mask_isset(mask, valuator)) { ++ if (accel) ++ *accel = valuator_mask_get_accelerated(mask, valuator); ++ if (unaccel) ++ *unaccel = valuator_mask_get_unaccelerated(mask, valuator); ++ return TRUE; ++ } ++ else ++ return FALSE; ++} ++ + int + CountBits(const uint8_t * mask, int len) + { +diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h +index e68fe9c..6133641 100644 +--- a/hw/xfree86/common/xf86Module.h ++++ b/hw/xfree86/common/xf86Module.h +@@ -81,7 +81,7 @@ typedef enum { + */ + #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4) + #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(19, 0) +-#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0) ++#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 1) + #define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0) + #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6) + +diff --git a/include/input.h b/include/input.h +index bf22dc7..0a4c4f7 100644 +--- a/include/input.h ++++ b/include/input.h +@@ -674,6 +674,21 @@ extern _X_EXPORT Bool valuator_mask_fetch(const ValuatorMask *mask, + extern _X_EXPORT Bool valuator_mask_fetch_double(const ValuatorMask *mask, + int valnum, double *val); + ++extern _X_EXPORT Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask); ++extern _X_EXPORT void valuator_mask_set_unaccelerated(ValuatorMask *mask, ++ int valuator, ++ double accel, ++ double unaccel); ++extern _X_EXPORT double valuator_mask_get_accelerated(const ValuatorMask *mask, ++ int valuator); ++extern _X_EXPORT double valuator_mask_get_unaccelerated(const ValuatorMask *mask, ++ int valuator); ++extern _X_EXPORT Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask, ++ int valuator, ++ double *accel, ++ double *unaccel); ++extern _X_HIDDEN void valuator_mask_drop_unaccelerated(ValuatorMask *mask); ++ + /* InputOption handling interface */ + extern _X_EXPORT InputOption *input_option_new(InputOption *list, + const char *key, +diff --git a/include/inpututils.h b/include/inpututils.h +index 53c96ba..4e90815 100644 +--- a/include/inpututils.h ++++ b/include/inpututils.h +@@ -36,8 +36,10 @@ extern Mask event_filters[MAXDEVICES][MAXEVENTS]; + + struct _ValuatorMask { + int8_t last_bit; /* highest bit set in mask */ ++ int8_t has_unaccelerated; + uint8_t mask[(MAX_VALUATORS + 7) / 8]; + double valuators[MAX_VALUATORS]; /* valuator data */ ++ double unaccelerated[MAX_VALUATORS]; /* valuator data */ + }; + + extern void verify_internal_event(const InternalEvent *ev); +-- +2.4.1 + diff --git a/xorg-server-hwcursor-gamma/0001-modesetting-Fix-software-cursor-fallback.patch b/xorg-server-hwcursor-gamma/0001-modesetting-Fix-software-cursor-fallback.patch new file mode 100644 index 0000000..ffb0875 --- /dev/null +++ b/xorg-server-hwcursor-gamma/0001-modesetting-Fix-software-cursor-fallback.patch @@ -0,0 +1,42 @@ +From 63e4f22d5fe3d4247cb48c969b5f7f2690665d78 Mon Sep 17 00:00:00 2001 +From: Adel Gadllah +Date: Fri, 1 May 2015 17:21:12 +0200 +Subject: [PATCH] modesetting: Fix software cursor fallback +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The code in drmmode_set_cursor does not properly handle the case where +drmModeSetCursor2 returns any other error than EINVAL and silently fails to set +a cursor. + +So only return when the drmModeSetCursor2 succeeds (i.e returns 0) and disable +the cursor2 usage on EINVAL. + +References: https://bugzilla.redhat.com/show_bug.cgi?id=1205725 +Signed-off-by: Adel Gadllah +Reviewed-by: Michel Dänzer +--- + hw/xfree86/drivers/modesetting/drmmode_display.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c +index 824500b..912abda 100644 +--- a/hw/xfree86/drivers/modesetting/drmmode_display.c ++++ b/hw/xfree86/drivers/modesetting/drmmode_display.c +@@ -396,10 +396,10 @@ drmmode_set_cursor(xf86CrtcPtr crtc) + drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, + handle, ms->cursor_width, ms->cursor_height, + cursor->bits->xhot, cursor->bits->yhot); ++ if (!ret) ++ return; + if (ret == -EINVAL) + use_set_cursor2 = FALSE; +- else +- return; + } + + ret = drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, +-- +2.1.0 + diff --git a/xorg-server-hwcursor-gamma/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/xorg-server-hwcursor-gamma/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch new file mode 100644 index 0000000..0e0b20d --- /dev/null +++ b/xorg-server-hwcursor-gamma/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch @@ -0,0 +1,51 @@ +From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Wed, 11 Feb 2015 16:26:40 +0100 +Subject: [PATCH] sdksyms.sh: Make sdksyms.sh work with gcc5. + +gcc5's cpp inserts patterns like this: + +extern + __attribute__((visibility("default"))) + int WaitForSomething(int * + ); + +This patch make sdksyms.sh work with this. Note my awk skills are weak, so +there likely is a better way to deal with this. + +Signed-off-by: Hans de Goede +--- + hw/xfree86/sdksyms.sh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +index 2305073..99b0cae 100755 +--- a/hw/xfree86/sdksyms.sh ++++ b/hw/xfree86/sdksyms.sh +@@ -350,6 +350,23 @@ BEGIN { + if (sdk) { + n = 3; + ++ # detect the following gcc5 cpp pattern and skip it: ++ # extern ++ # # 320 "../../include/os.h" 3 4 ++ # __attribute__((visibility("default"))) ++ # # 320 "../../include/os.h" ++ # Note in this case the "extern " or "extern void " always has ++ # a trailing space ++ if ($0 ~ "^extern.* $") { ++ getline; ++ getline; ++ getline; ++ getline; ++ n = 1; ++ while ($n == " ") ++ n++; ++ } ++ + # skip attribute, if any + while ($n ~ /^(__attribute__|__global)/ || + # skip modifiers, if any +-- +2.1.0 + diff --git a/xorg-server-hwcursor-gamma/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch b/xorg-server-hwcursor-gamma/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch new file mode 100644 index 0000000..6b8b1e5 --- /dev/null +++ b/xorg-server-hwcursor-gamma/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch @@ -0,0 +1,134 @@ +From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 5 May 2015 14:48:41 +1000 +Subject: [PATCH] dix: hook up the unaccelerated valuator masks + +If present, access the unaccelerated valuator mask values for DGA and XI2 raw +events. + +Signed-off-by: Peter Hutterer +Reviewed-by: Hans de Goede +--- + dix/getevents.c | 31 ++++++++++++++++++++++--------- + hw/xfree86/common/xf86Xinput.c | 4 ++++ + 2 files changed, 26 insertions(+), 9 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 6fb12c5..64bf76e 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -213,14 +213,25 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail) + } + + static void +-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data) ++set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, ++ BOOL use_unaccel, double *data) + { + int i; + ++ use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask); ++ + for (i = 0; i < valuator_mask_size(mask); i++) { + if (valuator_mask_isset(mask, i)) { ++ double v; ++ + SetBit(event->valuators.mask, i); +- data[i] = valuator_mask_get_double(mask, i); ++ ++ if (use_unaccel) ++ v = valuator_mask_get_unaccelerated(mask, i); ++ else ++ v = valuator_mask_get_double(mask, i); ++ ++ data[i] = v; + } + } + } +@@ -1138,11 +1149,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type, + valuator_mask_copy(&mask, mask_in); + + init_raw(pDev, raw, ms, type, key_code); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + + clipValuators(pDev, &mask); + +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + event = &events->device_event; + init_device_event(event, pDev, ms); +@@ -1423,9 +1434,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + num_events++; + + init_raw(pDev, raw, ms, type, buttons); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + } + ++ valuator_mask_drop_unaccelerated(&mask); ++ + /* valuators are in driver-native format (rel or abs) */ + + if (flags & POINTER_ABSOLUTE) { +@@ -1438,7 +1451,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + transformAbsolute(pDev, &mask); + clipAbsolute(pDev, &mask); + if ((flags & POINTER_NORAW) == 0 && raw) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + } + else { + transformRelative(pDev, &mask); +@@ -1446,7 +1459,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + if (flags & POINTER_ACCELERATE) + accelPointer(pDev, &mask, ms); + if ((flags & POINTER_NORAW) == 0 && raw) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + moveRelative(pDev, flags, &mask); + } +@@ -1951,7 +1964,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, + events++; + num_events++; + init_raw(dev, raw, ms, type, client_id); +- set_raw_valuators(raw, &mask, raw->valuators.data_raw); ++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw); + } + + event = &events->device_event; +@@ -2013,7 +2026,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid, + screeny = dev->spriteInfo->sprite->hotPhys.y; + } + if (need_rawevent) +- set_raw_valuators(raw, &mask, raw->valuators.data); ++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data); + + /* Indirect device touch coordinates are not used for cursor positioning. + * They are merely informational, and are provided in device coordinates. +diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c +index 1fb5b16..5ce4c71 100644 +--- a/hw/xfree86/common/xf86Xinput.c ++++ b/hw/xfree86/common/xf86Xinput.c +@@ -1137,12 +1137,16 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute, + dx = valuator_mask_get(mask, 0); + if (is_absolute) + dx -= device->last.valuators[0]; ++ else if (valuator_mask_has_unaccelerated(mask)) ++ dx = valuator_mask_get_unaccelerated(mask, 0); + } + + if (valuator_mask_isset(mask, 1)) { + dy = valuator_mask_get(mask, 1); + if (is_absolute) + dy -= device->last.valuators[1]; ++ else if (valuator_mask_has_unaccelerated(mask)) ++ dy = valuator_mask_get_unaccelerated(mask, 1); + } + + if (DGAStealMotionEvent(device, idx, dx, dy)) +-- +2.4.1 + diff --git a/xorg-server-hwcursor-gamma/PKGBUILD b/xorg-server-hwcursor-gamma/PKGBUILD index e4578d0..6c331ec 100644 --- a/xorg-server-hwcursor-gamma/PKGBUILD +++ b/xorg-server-hwcursor-gamma/PKGBUILD @@ -5,10 +5,10 @@ _pkgname=xorg-server pkgname=xorg-server-hwcursor-gamma pkgver=1.17.1 -pkgrel=5 +pkgrel=7 pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl) -provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') +provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') replaces=('glamor-egl' 'xf86-video-modesetting') arch=('i686' 'x86_64') @@ -29,6 +29,13 @@ source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2 v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch 0001-int10-Fix-error-check-for-pci_device_map_legacy.patch 0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch + 0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch + 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch + 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + fix-CVE-2015-3164.patch + systemd-logind-dont-second-guess-D-Bus-default-tim.patch + systemd-logind-filter-out-non-signal-messages-from.patch + 0001-modesetting-Fix-software-cursor-fallback.patch 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) @@ -40,25 +47,53 @@ sha256sums=('2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab' 'a73e33644682d9f430db987c192da0f7193907af50539669ebd59614a5ebd0f9' '2ea82cdbd695f21c935710847913ed58e22d3d5c0c18c96175a4a6cc1142c071' 'ca89cc013844c5b50abfde4cc5e852ecdf4368f8b069ffd069a7100843c46e90' + 'b4a4fbddebfa614d1a97e77dde98748682ee331fbf7be394480050670d6203aa' + '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7' + '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96' + 'bc6ac3e686e16f0357fd3b939c1c1f2845fdb444d5ec9c8c37fb69167cc54a28' + 'a8b9670844d784e9a0d6880f5689bbc107e071518acdbaa8c3ce5debca6b663b' + '97e4d5a6cfcf916889c493e232aec6f16d9447eb641bafb6e0afa9b27cfdc47e' + 'a0c0dbf5fe27994d52d5892c9c7cecf72792c5fa35db57b112ee7b17980faa75' 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') prepare() { cd "${_pkgname}-${pkgver}" - # Apply hardware cursors gamma adjustments patchs + + msg2 'Apply hardware cursors gamma adjustments patchs' patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch - # fix FS#43884, not yet upstream + msg2 'fix FS#43884, merged upstream' patch -Np1 -i ../os-access-fix-regression-in-server-interpreted-auth.patch - # partially fix FS#43867, not yet upstream + + msg2 'partially fix FS#43867, merged upstream' patch -Np1 -i ../v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch - # fix FS#43924, merged upstream + + msg2 'fix FS#43924, merged upstream' patch -Np1 -i ../0001-int10-Fix-error-check-for-pci_device_map_legacy.patch - # fix FS#43937, merged upstream + + msg2 'fix FS#43937, merged upstream' patch -Np1 -i ../0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch + + msg2 'fix FS#45245, merged upstream' + patch -Np1 -i ../0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch + + msg2 'fix FS#45229, merged upstream' + patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch + patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch + + msg2 'fix CVE-2015-3164, merged upstream' + patch -Np1 -i ../fix-CVE-2015-3164.patch + + msg2 'Fix FS#44304, merged upstream' + patch -Np1 -i ../systemd-logind-filter-out-non-signal-messages-from.patch + patch -Np1 -i ../systemd-logind-dont-second-guess-D-Bus-default-tim.patch + + msg2 'Fix software cursor fallback (possible fix for FS#44602)' + patch -Np1 -i ../0001-modesetting-Fix-software-cursor-fallback.patch } build() { diff --git a/xorg-server-hwcursor-gamma/fix-CVE-2015-3164.patch b/xorg-server-hwcursor-gamma/fix-CVE-2015-3164.patch new file mode 100644 index 0000000..e2ee129 --- /dev/null +++ b/xorg-server-hwcursor-gamma/fix-CVE-2015-3164.patch @@ -0,0 +1,311 @@ +From c4534a38b68aa07fb82318040dc8154fb48a9588 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 5 May 2015 16:43:42 -0400 +Subject: xwayland: Enable access control on open sockets [CVE-2015-3164 1/3] + +Xwayland currently allows wide-open access to the X sockets +it listens on, ignoring Xauth access control. + +This commit makes sure to enable access control on the sockets, +so one user can't snoop on another user's X-over-wayland +applications. + +Signed-off-by: Ray Strode +Reviewed-by: Daniel Stone +Reviewed-by: Alan Coopersmith +Signed-off-by: Keith Packard + +diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c +index 7e8d667..c5bee77 100644 +--- a/hw/xwayland/xwayland.c ++++ b/hw/xwayland/xwayland.c +@@ -483,7 +483,7 @@ listen_on_fds(struct xwl_screen *xwl_screen) + int i; + + for (i = 0; i < xwl_screen->listen_fd_count; i++) +- ListenOnOpenFD(xwl_screen->listen_fds[i], TRUE); ++ ListenOnOpenFD(xwl_screen->listen_fds[i], FALSE); + } + + static void +-- +cgit v0.10.2 +From 4b4b9086d02b80549981d205fb1f495edc373538 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 5 May 2015 16:43:43 -0400 +Subject: os: support new implicit local user access mode [CVE-2015-3164 2/3] + +If the X server is started without a '-auth' argument, then +it gets started wide open to all local users on the system. + +This isn't a great default access model, but changing it in +Xorg at this point would break backward compatibility. + +Xwayland, on the other hand is new, and much more targeted +in scope. It could, in theory, be changed to allow the much +more secure default of a "user who started X server can connect +clients to that server." + +This commit paves the way for that change, by adding a mechanism +for DDXs to opt-in to that behavior. They merely need to call + +LocalAccessScopeUser() + +in their init functions. + +A subsequent commit will add that call for Xwayland. + +Signed-off-by: Ray Strode +Reviewed-by: Daniel Stone +Reviewed-by: Alan Coopersmith +Signed-off-by: Keith Packard + +diff --git a/include/os.h b/include/os.h +index 6638c84..b2b96c8 100644 +--- a/include/os.h ++++ b/include/os.h +@@ -431,11 +431,28 @@ extern _X_EXPORT void + ResetHosts(const char *display); + + extern _X_EXPORT void ++EnableLocalAccess(void); ++ ++extern _X_EXPORT void ++DisableLocalAccess(void); ++ ++extern _X_EXPORT void + EnableLocalHost(void); + + extern _X_EXPORT void + DisableLocalHost(void); + ++#ifndef NO_LOCAL_CLIENT_CRED ++extern _X_EXPORT void ++EnableLocalUser(void); ++ ++extern _X_EXPORT void ++DisableLocalUser(void); ++ ++extern _X_EXPORT void ++LocalAccessScopeUser(void); ++#endif ++ + extern _X_EXPORT void + AccessUsingXdmcp(void); + +diff --git a/os/access.c b/os/access.c +index 8fa028e..75e7a69 100644 +--- a/os/access.c ++++ b/os/access.c +@@ -102,6 +102,10 @@ SOFTWARE. + #include + #include + ++#ifndef NO_LOCAL_CLIENT_CRED ++#include ++#endif ++ + #if defined(TCPCONN) || defined(STREAMSCONN) + #include + #endif /* TCPCONN || STREAMSCONN */ +@@ -225,6 +229,13 @@ static int LocalHostEnabled = FALSE; + static int LocalHostRequested = FALSE; + static int UsingXdmcp = FALSE; + ++static enum { ++ LOCAL_ACCESS_SCOPE_HOST = 0, ++#ifndef NO_LOCAL_CLIENT_CRED ++ LOCAL_ACCESS_SCOPE_USER, ++#endif ++} LocalAccessScope; ++ + /* FamilyServerInterpreted implementation */ + static Bool siAddrMatch(int family, void *addr, int len, HOST * host, + ClientPtr client); +@@ -237,6 +248,21 @@ static void siTypesInitialize(void); + */ + + void ++EnableLocalAccess(void) ++{ ++ switch (LocalAccessScope) { ++ case LOCAL_ACCESS_SCOPE_HOST: ++ EnableLocalHost(); ++ break; ++#ifndef NO_LOCAL_CLIENT_CRED ++ case LOCAL_ACCESS_SCOPE_USER: ++ EnableLocalUser(); ++ break; ++#endif ++ } ++} ++ ++void + EnableLocalHost(void) + { + if (!UsingXdmcp) { +@@ -249,6 +275,21 @@ EnableLocalHost(void) + * called when authorization is enabled to keep us secure + */ + void ++DisableLocalAccess(void) ++{ ++ switch (LocalAccessScope) { ++ case LOCAL_ACCESS_SCOPE_HOST: ++ DisableLocalHost(); ++ break; ++#ifndef NO_LOCAL_CLIENT_CRED ++ case LOCAL_ACCESS_SCOPE_USER: ++ DisableLocalUser(); ++ break; ++#endif ++ } ++} ++ ++void + DisableLocalHost(void) + { + HOST *self; +@@ -262,6 +303,74 @@ DisableLocalHost(void) + } + } + ++#ifndef NO_LOCAL_CLIENT_CRED ++static int GetLocalUserAddr(char **addr) ++{ ++ static const char *type = "localuser"; ++ static const char delimiter = '\0'; ++ static const char *value; ++ struct passwd *pw; ++ int length = -1; ++ ++ pw = getpwuid(getuid()); ++ ++ if (pw == NULL || pw->pw_name == NULL) ++ goto out; ++ ++ value = pw->pw_name; ++ ++ length = asprintf(addr, "%s%c%s", type, delimiter, value); ++ ++ if (length == -1) { ++ goto out; ++ } ++ ++ /* Trailing NUL */ ++ length++; ++ ++out: ++ return length; ++} ++ ++void ++EnableLocalUser(void) ++{ ++ char *addr = NULL; ++ int length = -1; ++ ++ length = GetLocalUserAddr(&addr); ++ ++ if (length == -1) ++ return; ++ ++ NewHost(FamilyServerInterpreted, addr, length, TRUE); ++ ++ free(addr); ++} ++ ++void ++DisableLocalUser(void) ++{ ++ char *addr = NULL; ++ int length = -1; ++ ++ length = GetLocalUserAddr(&addr); ++ ++ if (length == -1) ++ return; ++ ++ RemoveHost(NULL, FamilyServerInterpreted, length, addr); ++ ++ free(addr); ++} ++ ++void ++LocalAccessScopeUser(void) ++{ ++ LocalAccessScope = LOCAL_ACCESS_SCOPE_USER; ++} ++#endif ++ + /* + * called at init time when XDMCP will be used; xdmcp always + * adds local hosts manually when needed +diff --git a/os/auth.c b/os/auth.c +index 5fcb538..7da6fc6 100644 +--- a/os/auth.c ++++ b/os/auth.c +@@ -181,11 +181,11 @@ CheckAuthorization(unsigned int name_length, + + /* + * If the authorization file has at least one entry for this server, +- * disable local host access. (loadauth > 0) ++ * disable local access. (loadauth > 0) + * + * If there are zero entries (either initially or when the + * authorization file is later reloaded), or if a valid +- * authorization file was never loaded, enable local host access. ++ * authorization file was never loaded, enable local access. + * (loadauth == 0 || !loaded) + * + * If the authorization file was loaded initially (with valid +@@ -194,11 +194,11 @@ CheckAuthorization(unsigned int name_length, + */ + + if (loadauth > 0) { +- DisableLocalHost(); /* got at least one */ ++ DisableLocalAccess(); /* got at least one */ + loaded = TRUE; + } + else if (loadauth == 0 || !loaded) +- EnableLocalHost(); ++ EnableLocalAccess(); + } + if (name_length) { + for (i = 0; i < NUM_AUTHORIZATION; i++) { +-- +cgit v0.10.2 +From 76636ac12f2d1dbdf7be08222f80e7505d53c451 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Tue, 5 May 2015 16:43:44 -0400 +Subject: xwayland: default to local user if no xauth file given. + [CVE-2015-3164 3/3] + +Right now if "-auth" isn't passed on the command line, we let +any user on the system connect to the Xwayland server. + +That's clearly suboptimal, given Xwayland is generally designed +to be used by one user at a time. + +This commit changes the behavior, so only the user who started the +X server can connect clients to it. + +Signed-off-by: Ray Strode +Reviewed-by: Daniel Stone +Reviewed-by: Alan Coopersmith +Signed-off-by: Keith Packard + +diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c +index c5bee77..bc92beb 100644 +--- a/hw/xwayland/xwayland.c ++++ b/hw/xwayland/xwayland.c +@@ -702,4 +702,6 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv) + if (AddScreen(xwl_screen_init, argc, argv) == -1) { + FatalError("Couldn't add screen\n"); + } ++ ++ LocalAccessScopeUser(); + } +-- +cgit v0.10.2 + diff --git a/xorg-server-hwcursor-gamma/systemd-logind-dont-second-guess-D-Bus-default-tim.patch b/xorg-server-hwcursor-gamma/systemd-logind-dont-second-guess-D-Bus-default-tim.patch new file mode 100644 index 0000000..0245211 --- /dev/null +++ b/xorg-server-hwcursor-gamma/systemd-logind-dont-second-guess-D-Bus-default-tim.patch @@ -0,0 +1,446 @@ +From 89250c82a01062775f8f840737a757125138fbce Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Fri, 10 Apr 2015 14:19:50 -0400 +Subject: [PATCH] systemd-logind: don't second guess D-Bus default timeout + +At the moment, the X server uses a non-default timeout for D-Bus +messages to systemd-logind. The only timeouts normally used with +D-Bus are: + +1) Infinite +2) Default + +Anything else is just as arbitrary as Default, and so rarely makes +sense to use instead of Default. + +Put another way, there's little reason to be fault tolerant against +a local root running daemon (logind), that in some configurations, the +X server already depends on for proper functionality. + +This commit changes systemd-logind to just use the default timeouts. + +https://bugzilla.redhat.com/show_bug.cgi?id=1209347 +--- + hw/xfree86/os-support/linux/systemd-logind.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c +index 57c87c0..4ad41a3 100644 +--- a/hw/xfree86/os-support/linux/systemd-logind.c ++++ b/hw/xfree86/os-support/linux/systemd-logind.c +@@ -13,62 +13,60 @@ + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Author: Hans de Goede + */ + + #ifdef HAVE_XORG_CONFIG_H + #include + #endif + + #include + #include + #include + #include + + #include "os.h" + #include "dbus-core.h" + #include "xf86.h" + #include "xf86platformBus.h" + #include "xf86Xinput.h" + + #include "systemd-logind.h" + +-#define DBUS_TIMEOUT 500 /* Wait max 0.5 seconds */ +- + struct systemd_logind_info { + DBusConnection *conn; + char *session; + Bool active; + Bool vt_active; + }; + + static struct systemd_logind_info logind_info; + + static InputInfoPtr + systemd_logind_find_info_ptr_by_devnum(InputInfoPtr start, + int major, int minor) + { + InputInfoPtr pInfo; + + for (pInfo = start; pInfo; pInfo = pInfo->next) + if (pInfo->major == major && pInfo->minor == minor && + (pInfo->flags & XI86_SERVER_FD)) + return pInfo; + + return NULL; + } + + static void + systemd_logind_set_input_fd_for_all_devs(int major, int minor, int fd, + Bool enable) + { + InputInfoPtr pInfo; + + pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor); +@@ -103,61 +101,61 @@ systemd_logind_take_fd(int _major, int _minor, const char *path, + if (strstr(path, "mouse")) + return -1; + + /* Check if we already have an InputInfo entry with this major, minor + * (shared device-nodes happen ie with Wacom tablets). */ + pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor); + if (pInfo) { + LogMessage(X_INFO, "systemd-logind: returning pre-existing fd for %s %u:%u\n", + path, major, minor); + *paused_ret = FALSE; + return pInfo->fd; + } + + dbus_error_init(&error); + + msg = dbus_message_new_method_call("org.freedesktop.login1", info->session, + "org.freedesktop.login1.Session", "TakeDevice"); + if (!msg) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major, + DBUS_TYPE_UINT32, &minor, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + reply = dbus_connection_send_with_reply_and_block(info->conn, msg, +- DBUS_TIMEOUT, &error); ++ DBUS_TIMEOUT_USE_DEFAULT, &error); + if (!reply) { + LogMessage(X_ERROR, "systemd-logind: failed to take device %s: %s\n", + path, error.message); + goto cleanup; + } + + if (!dbus_message_get_args(reply, &error, + DBUS_TYPE_UNIX_FD, &fd, + DBUS_TYPE_BOOLEAN, &paused, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: TakeDevice %s: %s\n", + path, error.message); + goto cleanup; + } + + *paused_ret = paused; + + LogMessage(X_INFO, "systemd-logind: got fd for %s %u:%u fd %d paused %d\n", + path, major, minor, fd, paused); + + cleanup: + if (msg) + dbus_message_unref(msg); + if (reply) + dbus_message_unref(reply); + dbus_error_free(&error); + + return fd; + } + +@@ -180,61 +178,61 @@ systemd_logind_release_fd(int _major, int _minor, int fd) + * and minor, otherwise other InputInfo's are still referencing the fd. */ + pInfo = systemd_logind_find_info_ptr_by_devnum(xf86InputDevs, major, minor); + while (pInfo) { + matches++; + pInfo = systemd_logind_find_info_ptr_by_devnum(pInfo->next, major, minor); + } + if (matches > 1) { + LogMessage(X_INFO, "systemd-logind: not releasing fd for %u:%u, still in use\n", major, minor); + return; + } + + LogMessage(X_INFO, "systemd-logind: releasing fd for %u:%u\n", major, minor); + + dbus_error_init(&error); + + msg = dbus_message_new_method_call("org.freedesktop.login1", info->session, + "org.freedesktop.login1.Session", "ReleaseDevice"); + if (!msg) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major, + DBUS_TYPE_UINT32, &minor, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + reply = dbus_connection_send_with_reply_and_block(info->conn, msg, +- DBUS_TIMEOUT, &error); ++ DBUS_TIMEOUT_USE_DEFAULT, &error); + if (!reply) + LogMessage(X_ERROR, "systemd-logind: failed to release device: %s\n", + error.message); + + cleanup: + if (msg) + dbus_message_unref(msg); + if (reply) + dbus_message_unref(reply); + dbus_error_free(&error); + close: + if (fd != -1) + close(fd); + } + + int + systemd_logind_controls_session(void) + { + return logind_info.session ? 1 : 0; + } + + void + systemd_logind_vtenter(void) + { + struct systemd_logind_info *info = &logind_info; + InputInfoPtr pInfo; + int i; + + if (!info->session) + return; /* Not using systemd-logind */ +@@ -262,61 +260,61 @@ systemd_logind_vtenter(void) + + /* Do delayed input probing, this must be done after the above enabling */ + xf86InputEnableVTProbe(); + } + + static void + systemd_logind_ack_pause(struct systemd_logind_info *info, + dbus_int32_t minor, dbus_int32_t major) + { + DBusError error; + DBusMessage *msg = NULL; + DBusMessage *reply = NULL; + + dbus_error_init(&error); + + msg = dbus_message_new_method_call("org.freedesktop.login1", info->session, + "org.freedesktop.login1.Session", "PauseDeviceComplete"); + if (!msg) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major, + DBUS_TYPE_UINT32, &minor, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + reply = dbus_connection_send_with_reply_and_block(info->conn, msg, +- DBUS_TIMEOUT, &error); ++ DBUS_TIMEOUT_USE_DEFAULT, &error); + if (!reply) + LogMessage(X_ERROR, "systemd-logind: failed to ack pause: %s\n", + error.message); + + cleanup: + if (msg) + dbus_message_unref(msg); + if (reply) + dbus_message_unref(reply); + dbus_error_free(&error); + } + + static DBusHandlerResult + message_filter(DBusConnection * connection, DBusMessage * message, void *data) + { + struct systemd_logind_info *info = data; + struct xf86_platform_device *pdev = NULL; + InputInfoPtr pInfo = NULL; + int ack = 0, pause = 0, fd = -1; + DBusError error; + dbus_int32_t major, minor; + char *pause_str; + + if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + dbus_error_init(&error); + + if (dbus_message_is_signal(message, + "org.freedesktop.DBus", "NameOwnerChanged")) { +@@ -430,96 +428,96 @@ message_filter(DBusConnection * connection, DBusMessage * message, void *data) + } + + static void + connect_hook(DBusConnection *connection, void *data) + { + struct systemd_logind_info *info = data; + DBusError error; + DBusMessage *msg = NULL; + DBusMessage *reply = NULL; + dbus_int32_t arg; + char *session = NULL; + + dbus_error_init(&error); + + msg = dbus_message_new_method_call("org.freedesktop.login1", + "/org/freedesktop/login1", "org.freedesktop.login1.Manager", + "GetSessionByPID"); + if (!msg) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + arg = getpid(); + if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &arg, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + reply = dbus_connection_send_with_reply_and_block(connection, msg, +- DBUS_TIMEOUT, &error); ++ DBUS_TIMEOUT_USE_DEFAULT, &error); + if (!reply) { + LogMessage(X_ERROR, "systemd-logind: failed to get session: %s\n", + error.message); + goto cleanup; + } + dbus_message_unref(msg); + + if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &session, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: GetSessionByPID: %s\n", + error.message); + goto cleanup; + } + session = XNFstrdup(session); + + dbus_message_unref(reply); + reply = NULL; + + + msg = dbus_message_new_method_call("org.freedesktop.login1", + session, "org.freedesktop.login1.Session", "TakeControl"); + if (!msg) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + arg = FALSE; /* Don't forcibly take over over the session */ + if (!dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &arg, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + reply = dbus_connection_send_with_reply_and_block(connection, msg, +- DBUS_TIMEOUT, &error); ++ DBUS_TIMEOUT_USE_DEFAULT, &error); + if (!reply) { + LogMessage(X_ERROR, "systemd-logind: TakeControl failed: %s\n", + error.message); + goto cleanup; + } + + dbus_bus_add_match(connection, + "type='signal',sender='org.freedesktop.DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',path='/org/freedesktop/DBus'", + &error); + if (dbus_error_is_set(&error)) { + LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n", + error.message); + goto cleanup; + } + + /* + * HdG: This is not useful with systemd <= 208 since the signal only + * contains invalidated property names there, rather than property, val + * pairs as it should. Instead we just use the first resume / pause now. + */ + #if 0 + snprintf(match, sizeof(match), + "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged',path='%s'", + session); + dbus_bus_add_match(connection, match, &error); + if (dbus_error_is_set(&error)) { + LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n", + error.message); + goto cleanup; + } +@@ -537,61 +535,61 @@ connect_hook(DBusConnection *connection, void *data) + info->session = session; + info->vt_active = info->active = TRUE; /* The server owns the vt during init */ + session = NULL; + + cleanup: + free(session); + if (msg) + dbus_message_unref(msg); + if (reply) + dbus_message_unref(reply); + dbus_error_free(&error); + } + + static void + systemd_logind_release_control(struct systemd_logind_info *info) + { + DBusError error; + DBusMessage *msg = NULL; + DBusMessage *reply = NULL; + + dbus_error_init(&error); + + msg = dbus_message_new_method_call("org.freedesktop.login1", + info->session, "org.freedesktop.login1.Session", "ReleaseControl"); + if (!msg) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + reply = dbus_connection_send_with_reply_and_block(info->conn, msg, +- DBUS_TIMEOUT, &error); ++ DBUS_TIMEOUT_USE_DEFAULT, &error); + if (!reply) { + LogMessage(X_ERROR, "systemd-logind: ReleaseControl failed: %s\n", + error.message); + goto cleanup; + } + + cleanup: + if (msg) + dbus_message_unref(msg); + if (reply) + dbus_message_unref(reply); + dbus_error_free(&error); + } + + static void + disconnect_hook(void *data) + { + struct systemd_logind_info *info = data; + + free(info->session); + info->session = NULL; + info->conn = NULL; + } + + static struct dbus_core_hook core_hook = { + .connect = connect_hook, + .disconnect = disconnect_hook, + .data = &logind_info, + }; + +-- +2.3.3 \ No newline at end of file diff --git a/xorg-server-hwcursor-gamma/systemd-logind-filter-out-non-signal-messages-from.patch b/xorg-server-hwcursor-gamma/systemd-logind-filter-out-non-signal-messages-from.patch new file mode 100644 index 0000000..af319c5 --- /dev/null +++ b/xorg-server-hwcursor-gamma/systemd-logind-filter-out-non-signal-messages-from.patch @@ -0,0 +1,90 @@ +From e90798c142dedc4fd296936b69fe34a40d0aa35a Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Fri, 10 Apr 2015 14:19:50 -0400 +Subject: [PATCH] systemd-logind: filter out non-signal messages from message + filter + +It's possible to receive a message reply in the message filter if a +previous message call timed out locally before the reply arrived. + +The message_filter function only handles signals, at the moment, and +does not properly handle message replies. + +This commit changes the message_filter function to filter out all +non-signal messages, including spurious message replies. + +https://bugzilla.redhat.com/show_bug.cgi?id=1209347 +--- + hw/xfree86/os-support/linux/systemd-logind.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c +index 49758f4..57c87c0 100644 +--- a/hw/xfree86/os-support/linux/systemd-logind.c ++++ b/hw/xfree86/os-support/linux/systemd-logind.c +@@ -286,60 +286,63 @@ systemd_logind_ack_pause(struct systemd_logind_info *info, + DBUS_TYPE_INVALID)) { + LogMessage(X_ERROR, "systemd-logind: out of memory\n"); + goto cleanup; + } + + reply = dbus_connection_send_with_reply_and_block(info->conn, msg, + DBUS_TIMEOUT, &error); + if (!reply) + LogMessage(X_ERROR, "systemd-logind: failed to ack pause: %s\n", + error.message); + + cleanup: + if (msg) + dbus_message_unref(msg); + if (reply) + dbus_message_unref(reply); + dbus_error_free(&error); + } + + static DBusHandlerResult + message_filter(DBusConnection * connection, DBusMessage * message, void *data) + { + struct systemd_logind_info *info = data; + struct xf86_platform_device *pdev = NULL; + InputInfoPtr pInfo = NULL; + int ack = 0, pause = 0, fd = -1; + DBusError error; + dbus_int32_t major, minor; + char *pause_str; + ++ if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL) ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++ + dbus_error_init(&error); + + if (dbus_message_is_signal(message, + "org.freedesktop.DBus", "NameOwnerChanged")) { + char *name, *old_owner, *new_owner; + + dbus_message_get_args(message, &error, + DBUS_TYPE_STRING, &name, + DBUS_TYPE_STRING, &old_owner, + DBUS_TYPE_STRING, &new_owner, DBUS_TYPE_INVALID); + if (dbus_error_is_set(&error)) { + LogMessage(X_ERROR, "systemd-logind: NameOwnerChanged: %s\n", + error.message); + dbus_error_free(&error); + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (name && strcmp(name, "org.freedesktop.login1") == 0) + FatalError("systemd-logind disappeared (stopped/restarted?)\n"); + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + } + + if (strcmp(dbus_message_get_path(message), info->session) != 0) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + + if (dbus_message_is_signal(message, "org.freedesktop.login1.Session", + "PauseDevice")) { + if (!dbus_message_get_args(message, &error, + DBUS_TYPE_UINT32, &major, +-- +2.3.3 \ No newline at end of file diff --git a/xorg-server-hwcursor-gamma/upload b/xorg-server-hwcursor-gamma/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/xorg-server-hwcursor-gamma/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/xtux/upload b/xtux/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/xtux/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file diff --git a/xz-java-git [disowned]/PKGBUILD b/xz-java-git [disowned]/PKGBUILD new file mode 100644 index 0000000..88dbed7 --- /dev/null +++ b/xz-java-git [disowned]/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +pkgname=xz-java-git +pkgver=20130129 +pkgrel=1 +pkgdesc="Java library for XZ and LZMA compression" +arch=('any') +url="http://tukaani.org/xz/java.html" +license=('Public Domain') +depends=('java-runtime>=1.4') +makedepends=('git' 'java-environment>=1.4') +provides=('xz-java') +conflicts=('xz-java') + +_gitroot=http://git.tukaani.org/xz-java.git +_gitname=xz-java + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [[ -d "$_gitname" ]]; then + cd "$_gitname" && git pull origin + msg "The local files are updated." + else + git clone "$_gitroot" "$_gitname" + fi + + msg "GIT checkout done or server timeout" + msg "Starting build..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + javac -source 1.4 -target 1.4 -d . -s src -cp . $(find src | grep \\.java\$) + jar -cf xz-java.jar $(find . | grep \\.class\$) +} + +package() { + cd "$srcdir/$_gitname-build" + install -d "$pkgdir/usr/lib/" + install -m 755 xz-java.jar "$pkgdir/usr/lib/" +} diff --git a/xz-java-git/PKGBUILD b/xz-java-git/PKGBUILD deleted file mode 100644 index 88dbed7..0000000 --- a/xz-java-git/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -pkgname=xz-java-git -pkgver=20130129 -pkgrel=1 -pkgdesc="Java library for XZ and LZMA compression" -arch=('any') -url="http://tukaani.org/xz/java.html" -license=('Public Domain') -depends=('java-runtime>=1.4') -makedepends=('git' 'java-environment>=1.4') -provides=('xz-java') -conflicts=('xz-java') - -_gitroot=http://git.tukaani.org/xz-java.git -_gitname=xz-java - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - - javac -source 1.4 -target 1.4 -d . -s src -cp . $(find src | grep \\.java\$) - jar -cf xz-java.jar $(find . | grep \\.class\$) -} - -package() { - cd "$srcdir/$_gitname-build" - install -d "$pkgdir/usr/lib/" - install -m 755 xz-java.jar "$pkgdir/usr/lib/" -} diff --git a/xz-java/upload b/xz-java/upload new file mode 120000 index 0000000..1e7a8be --- /dev/null +++ b/xz-java/upload @@ -0,0 +1 @@ +../upload \ No newline at end of file -- cgit v1.2.3-70-g09d2