Merge branch 'master' into bananapi

This commit is contained in:
necrophcodr 2015-01-17 15:35:47 +01:00
commit 23a05099ab
50 changed files with 357 additions and 320 deletions

View file

@ -445,10 +445,10 @@ libparted.so.2 libparted-3.1_1
libparted-fs-resize.so.0 libparted-3.1_1 libparted-fs-resize.so.0 libparted-3.1_1
libntfs-3g.so.85 ntfs-3g-2014.2.15_1 libntfs-3g.so.85 ntfs-3g-2014.2.15_1
libruby.so.2.2 ruby-2.2.0_1 libruby.so.2.2 ruby-2.2.0_1
libxenctrl.so.4.4 xen-libs-4.4_1<4.5 libxenctrl.so.4.5 xen-libs-4.5<4.6_1
libxenguest.so.4.4 xen-libs-4.4_1<4.5 libxenguest.so.4.5 xen-libs-4.5<4.6_1
libxlutil.so.4.3 xen-libs-4.3_1 libxlutil.so.4.3 xen-libs-4.3_1
libxenlight.so.4.4 xen-libs-4.4_1<4.5 libxenlight.so.4.5 xen-libs-4.5<4.6_1
libxenstore.so.3.0 xen-libs-4.2.2_2 libxenstore.so.3.0 xen-libs-4.2.2_2
libvhd.so.1.0 xen-libs-4.2.2_2 libvhd.so.1.0 xen-libs-4.2.2_2
libxenstat.so.0 xen-libs-4.2.2_2 libxenstat.so.0 xen-libs-4.2.2_2
@ -1040,11 +1040,6 @@ libcgraph.so.6 graphviz-libs-2.28.0_6
libgvc.so.6 graphviz-libs-2.28.0_6 libgvc.so.6 graphviz-libs-2.28.0_6
libcdt.so.5 graphviz-libs-2.28.0_6 libcdt.so.5 graphviz-libs-2.28.0_6
libpathplan.so.4 graphviz-libs-2.28.0_6 libpathplan.so.4 graphviz-libs-2.28.0_6
libgvplugin_dot_layout.so.6 graphviz-libs-2.28.0_6
libgvplugin_gd.so.6 graphviz-libs-2.28.0_6
libgvplugin_neato_layout.so.6 graphviz-libs-2.28.0_6
libgvplugin_pango.so.6 graphviz-libs-2.28.0_6
libgvplugin_core.so.6 graphviz-libs-2.28.0_6
libflowcanvas.so.5 flowcanvas-0.7.1_1 libflowcanvas.so.5 flowcanvas-0.7.1_1
liblash.so.1 ladish-1_1 liblash.so.1 ladish-1_1
libmowgli-2.so.0 libmowgli-2.0.0_1 libmowgli-2.so.0 libmowgli-2.0.0_1

View file

@ -1,15 +1,26 @@
# Template file for 'aspell-de' # Template file for 'aspell-de'
pkgname=aspell-de pkgname=aspell-de
version=20030222 version=20030222
revision=1 revision=3
noarch=yes noarch=yes
wrksrc="aspell6-de-${version}-1" wrksrc="aspell6-de-${version}-1"
build_style=configure build_style=configure
hostmakedepends="which" hostmakedepends="aspell-devel"
makedepends="aspell-devel"
short_desc="German dictionary for aspell" short_desc="German dictionary for aspell"
homepage="http://aspell.net/" homepage="http://aspell.net/"
license="GPL-2" license="GPL-2"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>" maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
distfiles="${GNU_SITE}/aspell/dict/de/aspell6-de-${version}-1.tar.bz2" distfiles="${GNU_SITE}/aspell/dict/de/aspell6-de-${version}-1.tar.bz2"
checksum=ba6c94e11bc2e0e6e43ce0f7822c5bba5ca5ac77129ef90c190b33632416e906 checksum=ba6c94e11bc2e0e6e43ce0f7822c5bba5ca5ac77129ef90c190b33632416e906
words-de_package() {
short_desc="German dictionary word list"
noarch=yes
pkg_install() {
vmkdir usr/share/dict
precat *.cwl |
iconv --from-code=ISO-8859-1 --to-code=UTF-8 |
cut -d/ -f1 |
sort -u >${PKGDESTDIR}/usr/share/dict/ngerman
}
}

View file

@ -1,15 +1,32 @@
# Template file for 'aspell-en' # Template file for 'aspell-en'
pkgname=aspell-en pkgname=aspell-en
version=7.1 version=7.1
revision=1 revision=3
noarch=yes noarch=yes
wrksrc="aspell6-en-${version}-0" wrksrc="aspell6-en-${version}-0"
build_style=configure build_style=configure
hostmakedepends="which" hostmakedepends="aspell-devel"
makedepends="aspell-devel"
short_desc="English dictionary for aspell" short_desc="English dictionary for aspell"
homepage="http://aspell.net/" homepage="http://aspell.net/"
license="LGPL-2.1" license="LGPL-2.1"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2" distfiles="${GNU_SITE}/aspell/dict/en/aspell6-en-${version}-0.tar.bz2"
checksum=ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a checksum=ff9df3c2e8c5bb19c6a66078b36a0ef4c4dfb0fcb969e29f7b5345e26d748d0a
words-en_package() {
short_desc="English dictionary word list"
noarch=yes
pkg_install() {
vmkdir usr/share/dict
precat en-common.cwl en_US-wo_accents-only.cwl |
iconv --from-code=ISO-8859-1 --to-code=UTF-8 |
cut -d/ -f1 |
sort -u >${PKGDESTDIR}/usr/share/dict/american-english
precat en-common.cwl en_GB-ise-wo_accents-only.cwl |
iconv --from-code=ISO-8859-1 --to-code=UTF-8 |
cut -d/ -f1 |
sort -u >${PKGDESTDIR}/usr/share/dict/british-english
ln -s american-english ${PKGDESTDIR}/usr/share/dict/words
}
}

View file

@ -0,0 +1,44 @@
# Template file for 'avr-binutils'
pkgname=avr-binutils
version=2.25
revision=1
short_desc="GNU binary utilities for AVR"
maintainer="allan <mail@may.mooo.com>"
homepage="http://www.gnu.org/software/binutils/"
license="GPL-3"
distfiles="$GNU_SITE/binutils/binutils-$version.tar.gz"
checksum=cccf377168b41a52a76f46df18feb8f7285654b3c1bd69fc8265cb0fc6902f2d
wrksrc="binutils-$version"
only_for_archs="i686 x86_64"
hostmakedepends="zlib-devel"
do_configure() {
./configure \
--disable-werror \
--enable-ld=default \
--enable-shared \
--enable-gold \
--enable-plugins \
--enable-threads \
--enable-install-libbfd \
--prefix=/usr \
--target=avr \
--with-pic
make configure-host
}
do_build() {
make tooldir=/usr
}
do_install() {
make prefix="$DESTDIR"/usr tooldir="$DESTDIR"/usr install
}
post_install() {
rm -rf "$DESTDIR"/usr/share/info
rm -rf "$DESTDIR"/usr/share/locale
rm "$DESTDIR"/usr/bin/{ar,as,nm,objcopy,objdump,ranlib,strip}
}

69
srcpkgs/avr-gcc/template Normal file
View file

@ -0,0 +1,69 @@
# Template build file for 'avr-gcc'
pkgname=avr-gcc
version=4.9.2
revision=1
short_desc="The GNU C Compiler for AVR"
maintainer="allan <mail@may.mooo.com>"
homepage="http://gcc.gnu.org"
license="GFDL-1.2, GPL-3, LGPL-2.1"
distfiles="$GNU_SITE/gcc/gcc-$version/gcc-$version.tar.bz2"
checksum=2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd
wrksrc="gcc-$version"
only_for_archs="i686 x86_64"
hostmakedepends="avr-binutils zlib-devel libmpc-devel cloog-devel gmp-devel mpfr-devel"
depends="avr-binutils"
nostrip=yes
do_configure() {
mkdir obj-avr
cd obj-avr
export CFLAGS="-O2 -pipe"
CONFIG_SHELL=/bin/bash ../configure \
--disable-install-libiberty \
--disable-libssp \
--disable-libstdcxx-pch \
--disable-libunwind-exceptions \
--disable-linker-build-id \
--disable-nls \
--disable-werror \
--enable-__cxa_atexit \
--enable-checking=release \
--enable-clocale=gnu \
--enable-cloog-backend=isl \
--enable-gnu-unique-object \
--enable-gold \
--enable-languages=c,c++ \
--enable-ld=default \
--enable-lto \
--enable-plugin \
--enable-shared \
--prefix=/usr \
--target=avr \
--with-gnu-as \
--with-as=/usr/bin/avr-as \
--with-gnu-ld \
--with-ld=/usr/bin/avr-ld \
--with-plugin-ld=ld.gold \
--with-system-zlib \
--without-included-gettext
}
do_build() {
cd obj-avr
make ${makejobs}
}
do_install() {
cd obj-avr
make DESTDIR="$DESTDIR" install
}
post_install() {
rm -rf "$DESTDIR"/usr/share/man/man7
rm -rf "$DESTDIR"/usr/share/info
find "$DESTDIR"/usr/lib -type f -name "*.a" \
-exec avr-strip --strip-debug {} \;
}

21
srcpkgs/avr-libc/template Normal file
View file

@ -0,0 +1,21 @@
# Template file for 'avr-libc'
pkgname=avr-libc
version=1.8.1
revision=1
short_desc="A C library for use with GCC on Atmel AVR microcontrollers"
maintainer="allan <mail@may.mooo.com>"
license="BSD"
homepage="http://savannah.nongnu.org/projects/avr-libc/"
distfiles="$NONGNU_SITE/$pkgname/$pkgname-$version.tar.bz2"
checksum=c3062a481b6b2c6959dc708571c00b0e26301897ba21171ed92acd0af7c4a969
only_for_archs="i686 x86_64"
build_style=gnu-configure
hostmakedepends="avr-binutils avr-gcc"
depends="avr-binutils avr-gcc"
nostrip=yes
do_configure() {
CC=avr-gcc CC_FOR_BUILD=avr-gcc AR=avr-ar AS=avr-as RANLIB=avr-ranlib \
./configure --host=avr --prefix=/usr
}

16
srcpkgs/avrdude/template Normal file
View file

@ -0,0 +1,16 @@
# Template file for 'avrdude'
pkgname="avrdude"
version=6.1
revision=1
build_style=gnu-configure
short_desc="An utility to manipulate ROM and EEPROM of AVR microcontrollers"
maintainer="allan <mail@may.mooo.com>"
license="GPL-2"
homepage="http://www.nongnu.org/avrdude/"
distfiles="$NONGNU_SITE/$pkgname/${pkgname}-$version.tar.gz"
checksum=9e98baca8e57cad402aaa1c7b61c8de750ed4f6fed577f7e4935db0430783d3b
only_for_archs="i686 x86_64"
hostmakedepends="flex"
makedepends="elfutils-devel libusb-compat-devel"
depends="avr-libc"
conf_files="/etc/avrdude.conf"

View file

@ -1,7 +1,7 @@
# Template file for 'bwidget' # Template file for 'bwidget'
pkgname=bwidget pkgname=bwidget
version=1.9.6 version=1.9.8
revision=3 revision=1
noarch=yes noarch=yes
makedepends="tk>=8.6" makedepends="tk>=8.6"
depends="${makedepends}" depends="${makedepends}"
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://tcllib.sourceforge.net/" homepage="http://tcllib.sourceforge.net/"
license="tcl/tk" license="tcl/tk"
distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/$version/${pkgname}-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/tcllib/BWidget/$version/${pkgname}-${version}.tar.gz"
checksum=155e9cf2c6973956a0bbde450f2df358ce1eb97a2b2950d0681a36f861e67553 checksum=545016e3ee998991308f54d8ef26bbf16144ee50fa432b9100d37ef806bdb314
do_install() { do_install() {
local _tclversion=8.6 local _tclversion=8.6

View file

@ -1,6 +1,6 @@
# Template build file for 'exiftool' # Template build file for 'exiftool'
pkgname=exiftool pkgname=exiftool
version=9.81 version=9.82
revision=1 revision=1
noarch="yes" noarch="yes"
wrksrc="Image-ExifTool-${version}" wrksrc="Image-ExifTool-${version}"
@ -13,4 +13,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/" homepage="http://www.sno.phy.queensu.ca/~phil/exiftool/"
license="GPL" license="GPL"
distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz" distfiles="http://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-${version}.tar.gz"
checksum=2dd13ff814d1333f3d81e8f8a0df9660ce1d5921bf0987709b22889247c1f7dd checksum=b200673dc2e13898cbcbfd95e6285876d39a8d3beb85ccc1abfca009396e5f4b

View file

@ -1,6 +1,6 @@
# Template file for 'flow' # Template file for 'flow'
pkgname=flow pkgname=flow
version=0.1.2 version=0.1.4
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
makedepends="ocaml elfutils-devel" makedepends="ocaml elfutils-devel"
@ -9,7 +9,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="BSD" license="BSD"
homepage="http://flowtype.org/" homepage="http://flowtype.org/"
distfiles="https://github.com/facebook/${pkgname}/archive/v${version}.tar.gz" distfiles="https://github.com/facebook/${pkgname}/archive/v${version}.tar.gz"
checksum=31ddcd3b0a6afa4ec19bab3c3aeb9b1adba7eea4d3ec5c40cc6d1ecc29d904db checksum=77131c44b8fbb0b87aa052ff0b62064a311a51ca3cd7df3cbaf813c8c585784b
do_install() { do_install() {
install -Dm755 bin/flow ${DESTDIR}/usr/bin/flow install -Dm755 bin/flow ${DESTDIR}/usr/bin/flow

View file

@ -1,7 +1,7 @@
# Template build file for 'gd'. # Template build file for 'gd'.
pkgname=gd pkgname=gd
version=2.1.0 version=2.1.1
revision=2 revision=1
wrksrc="libgd-${version}" wrksrc="libgd-${version}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--without-xpm" configure_args="--without-xpm"
@ -12,7 +12,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.libgd.org/" homepage="http://www.libgd.org/"
license="BSD" license="BSD"
distfiles="https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${version}.tar.xz" distfiles="https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${version}.tar.xz"
checksum=fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a checksum=9ada1ed45594abc998ebc942cef12b032fbad672e73efc22bc9ff54f5df2b285
gd-devel_package() { gd-devel_package() {
depends="libjpeg-turbo-devel fontconfig-devel zlib-devel libpng-devel>=1.6 gd-${version}_${revision}" depends="libjpeg-turbo-devel fontconfig-devel zlib-devel libpng-devel>=1.6 gd-${version}_${revision}"

View file

@ -1,7 +1,7 @@
# Template file for 'gdb' # Template file for 'gdb'
pkgname=gdb pkgname=gdb
version=7.8.1 version=7.8.2
revision=2 revision=1
patch_args="-Np1" patch_args="-Np1"
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-werror --disable-nls --with-system-readline configure_args="--disable-werror --disable-nls --with-system-readline
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnu.org/software/gdb/" homepage="http://www.gnu.org/software/gdb/"
license="GPL-3" license="GPL-3"
distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.xz" distfiles="http://ftp.gnu.org/gnu/gdb/gdb-$version.tar.xz"
checksum=497722b58386f4428c3474281eb3ef1c872404998b6ace907edb3bba1fabdc35 checksum=605954d5747d5f08ea4b7f48e958d1ebbf39265e18f7f36738deeabb83744485
# Package build options # Package build options
build_options="gdbserver static python" build_options="gdbserver static python"

View file

@ -1,6 +1,6 @@
# Template file for 'gmtp' # Template file for 'gmtp'
pkgname=gmtp pkgname=gmtp
version=1.3.8 version=1.3.9
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config glib-devel" hostmakedepends="pkg-config glib-devel"
@ -11,4 +11,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="BSD" license="BSD"
homepage="http://gmtp.sourceforge.net" homepage="http://gmtp.sourceforge.net"
distfiles="${SOURCEFORGE_SITE}/gmtp/gmtp-${version}.tar.gz" distfiles="${SOURCEFORGE_SITE}/gmtp/gmtp-${version}.tar.gz"
checksum=edb9aa6f2421be3090fa53c5384fdf0dfb43cafcf6c1c3621ab5eeb889ebb580 checksum=5bff5385db66f5c3e82d89edb7ca4a8ccb8c8954faf7341438080f2741dcbd2d

View file

@ -1,6 +1,6 @@
# Template file for 'go' # Template file for 'go'
pkgname=go pkgname=go
version=1.4 version=1.4.1
revision=1 revision=1
wrksrc=go wrksrc=go
hostmakedepends="git ca-certificates" hostmakedepends="git ca-certificates"
@ -9,7 +9,7 @@ maintainer="Dominik Honnef <dominik@honnef.co>"
homepage="http://golang.org/" homepage="http://golang.org/"
license="BSD" license="BSD"
distfiles="http://golang.org/dl/go${version}.src.tar.gz" distfiles="http://golang.org/dl/go${version}.src.tar.gz"
checksum=3ae9f67e45a5ca7004b28808da8b1367d328a371d641ddbe636c0fb0ae0ffdae checksum=3d9bb27ad4be51f60dc44f3d0026036ef07142797b1df1b5ae816277e6c31bb3
nostrip=yes nostrip=yes
noverifyrdeps=yes noverifyrdeps=yes

View file

@ -1,7 +1,8 @@
# Template file for 'graphviz' # Template file for 'graphviz'
pkgname=graphviz pkgname=graphviz
version=2.38.0 version=2.38.0
revision=2 revision=3
replaces="graphviz-libs<2.38.0_3"
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="automake libtool flex pkg-config libltdl-devel" hostmakedepends="automake libtool flex pkg-config libltdl-devel"
makedepends="libpng-devel>=1.6 gd-devel>=2.1 gtk+-devel librsvg-devel libltdl-devel" makedepends="libpng-devel>=1.6 gd-devel>=2.1 gtk+-devel librsvg-devel libltdl-devel"
@ -29,7 +30,6 @@ graphviz-libs_package() {
replaces="graphviz<2.28.0_6" replaces="graphviz<2.28.0_6"
pkg_install() { pkg_install() {
vmove "usr/lib/*.so.*" vmove "usr/lib/*.so.*"
vmove usr/lib/graphviz
} }
} }
graphviz-devel_package() { graphviz-devel_package() {

View file

@ -1,11 +1,11 @@
# Template file for 'jack' # Template file for 'jack'
pkgname=jack pkgname=jack
version=1.9.10 version=1.9.10
revision=4 revision=5
# XXX libffado (firewire) # XXX libffado (firewire)
hostmakedepends="pkg-config python" hostmakedepends="pkg-config python"
makedepends="eigen opus-devel libsamplerate-devel readline-devel>=6.3 dbus-devel celt-devel" makedepends="eigen opus-devel libsamplerate-devel readline-devel>=6.3 dbus-devel celt-devel"
depends="dbus" depends="python-dbus"
short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)" short_desc="JACK Audio Connection Kit low-latency sound server (pro audio)"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2, LGPL-2.1" license="GPL-2, LGPL-2.1"

12
srcpkgs/jp2a/template Normal file
View file

@ -0,0 +1,12 @@
# Template file for 'jp2a'
pkgname=jp2a
version=1.0.6
revision=1
build_style=gnu-configure
makedepends="libjpeg-turbo-devel libcurl-devel"
short_desc="JPEG image to ASCII art converter"
maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="GPL-2"
homepage="https://csl.name/jp2a"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
checksum=7869c13744b0e15c250cae88b55f0dfade17e6c2b0a03b309dbe89bd34b342d4

View file

@ -0,0 +1,13 @@
# Template file for 'konversation'
pkgname=konversation
version=1.5.1
revision=1
build_style=cmake
hostmakedepends="automoc4 cmake"
makedepends="kdelibs-devel phonon-devel kdepimlibs-devel qca-devel docbook-xml"
short_desc="A user friendly IRC client for KDE"
maintainer="TheNumb <me@thenumb.eu>"
license="GPL-3"
homepage="http://konversation.kde.org"
distfiles="http://download.kde.org/stable/${pkgname}/${version}/src/${pkgname}-${version}.tar.xz"
checksum=97838dc3cb07210c96154958237e216ad05cffa334f5e549d8619b4c70961986

View file

@ -1,6 +1,6 @@
# Template file for 'libsodium' # Template file for 'libsodium'
pkgname=libsodium pkgname=libsodium
version=1.0.1 version=1.0.2
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="lt_cv_prog_compiler_static_works=yes" configure_args="lt_cv_prog_compiler_static_works=yes"
@ -9,7 +9,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="ISC" license="ISC"
homepage="https://github.com/jedisct1/libsodium" homepage="https://github.com/jedisct1/libsodium"
distfiles="https://github.com/jedisct1/libsodium/releases/download/${version}/${pkgname}-${version}.tar.gz" distfiles="https://github.com/jedisct1/libsodium/releases/download/${version}/${pkgname}-${version}.tar.gz"
checksum=c3090887a4ef9e2d63af1c1e77f5d5a0656fadb5105ebb9fb66a302210cb3af5 checksum=961d8f10047f545ae658bcc73b8ab0bf2c312ac945968dd579d87c768e5baa19
libsodium-devel_package() { libsodium-devel_package() {
short_desc+=" - development files" short_desc+=" - development files"

View file

@ -1,4 +0,0 @@
d /run/libvirt/qemu 0755 root root -
d /run/libvirt/lxc 0755 root root -
d /run/libvirt/uml 0755 root root -
d /run/libvirt/network 0755 root root -

View file

@ -1,6 +1,6 @@
# Template file for 'libvirt' # Template file for 'libvirt'
pkgname=libvirt pkgname=libvirt
version=1.2.9 version=1.2.11
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
build_options="systemd" build_options="systemd"
@ -14,7 +14,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://libvirt.org" homepage="http://libvirt.org"
license="LGPL-2.1" license="LGPL-2.1"
distfiles="http://libvirt.org/sources/$pkgname-$version.tar.gz" distfiles="http://libvirt.org/sources/$pkgname-$version.tar.gz"
checksum=95931a5a52f451b9ab73d6a5ae11a5740e1ba69a66520c2a0cffc6068a7e8fc4 checksum=1b886429734a53fc9a201f46d77448fda963e1323246269eb0dcb4c12fb02fcc
hostmakedepends="perl pkg-config lvm2 parted" hostmakedepends="perl pkg-config lvm2 parted"
makedepends="readline-devel>=6.3 libcap-ng-devel libnl3-devel attr-devel makedepends="readline-devel>=6.3 libcap-ng-devel libnl3-devel attr-devel
@ -25,7 +25,7 @@ makedepends="readline-devel>=6.3 libcap-ng-devel libnl3-devel attr-devel
if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
configure_args+=" --with-xen" configure_args+=" --with-xen"
makedepends+=" libnuma-devel xen-devel" makedepends+=" libnuma-devel xen-devel>=4.5"
elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then elif [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
configure_args+=" --without-xen" configure_args+=" --without-xen"
makedepends+=" libnuma-devel" makedepends+=" libnuma-devel"
@ -83,10 +83,6 @@ post_install() {
rm -rf ${DESTDIR}/etc/sysconfig rm -rf ${DESTDIR}/etc/sysconfig
# Remove unused stuff. # Remove unused stuff.
rm -rf ${DESTDIR}/var/log rm -rf ${DESTDIR}/var/log
# systemd stuff.
if [ "$build_options_systemd" ]; then
vinstall ${FILESDIR}/libvirt.tmpfiles.d 644 usr/lib/tmpfiles.d libvirt.conf
fi
} }
libvirt-devel_package() { libvirt-devel_package() {

View file

@ -1,7 +1,7 @@
# Template file for 'linux3.14' # Template file for 'linux3.14'
# #
pkgname=linux3.14 pkgname=linux3.14
version=3.14.28 version=3.14.29
revision=1 revision=1
wrksrc="linux-${version}" wrksrc="linux-${version}"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -9,7 +9,7 @@ homepage="http://www.kernel.org"
license="GPL-2" license="GPL-2"
short_desc="The Linux kernel and modules (3.14 series)" short_desc="The Linux kernel and modules (3.14 series)"
distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz" distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
checksum=772dbf0f3454df3fcad2de58f2bf4d8695c657407a76957b44e00c79f1ef5321 checksum=bb38f4d3d7e6d2f873fbfdc91095128ba68da39804c5c7e1bac19dbdc0fd7442
_kernver="${version}_${revision}" _kernver="${version}_${revision}"

View file

@ -1,7 +1,7 @@
# Template file for 'linux3.18' # Template file for 'linux3.18'
# #
pkgname=linux3.18 pkgname=linux3.18
version=3.18.2 version=3.18.3
revision=1 revision=1
wrksrc="linux-${version}" wrksrc="linux-${version}"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
@ -9,7 +9,7 @@ homepage="http://www.kernel.org"
license="GPL-2" license="GPL-2"
short_desc="The Linux kernel and modules (${version%.*} series)" short_desc="The Linux kernel and modules (${version%.*} series)"
distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz" distfiles="http://www.kernel.org/pub/linux/kernel/v3.x/linux-${version}.tar.xz"
checksum=1090fa94ddddc38e514f07872315af84032ba7cdb9715c21d5a562a1072b1abf checksum=0e024cd0bba93f777e733381b1ee2d55a76e4b30e096b0668aba979390e94255
_kernver="${version}_${revision}" _kernver="${version}_${revision}"

View file

@ -1,6 +1,6 @@
# Template file for 'lua-MessagePack' # Template file for 'lua-MessagePack'
pkgname=lua-MessagePack pkgname=lua-MessagePack
version=0.3.1 version=0.3.2
revision=1 revision=1
hostmakedepends="lua>=5.2" hostmakedepends="lua>=5.2"
makedepends="lua>=5.2" makedepends="lua>=5.2"
@ -10,7 +10,7 @@ maintainer="Tj Vanderpoel (bougyman) <tj@rubyists.com>"
license="MIT" license="MIT"
homepage="https://github.com/fperrad/lua-MessagePack" homepage="https://github.com/fperrad/lua-MessagePack"
distfiles="${homepage}/archive/${version}.tar.gz" distfiles="${homepage}/archive/${version}.tar.gz"
checksum=2cc1e2458d0f1eee8f02263848fa5055894303c056fd2e49aa9c3fb54ccbb5a0 checksum=6580961958dd43455f7f74708514011e0aadf442167869fb60c53b018f041eac
do_install() { do_install() {
make PREFIX=/usr DESTDIR="${DESTDIR}" LUAVER=5.2 install make PREFIX=/usr DESTDIR="${DESTDIR}" LUAVER=5.2 install

View file

@ -1,7 +1,7 @@
# Template build file for 'perl-Net-SSLeay'. # Template build file for 'perl-Net-SSLeay'.
pkgname=perl-Net-SSLeay pkgname=perl-Net-SSLeay
version=1.66 version=1.67
revision=5 revision=1
wrksrc="${pkgname/perl-/}-${version}" wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module build_style=perl-module
hostmakedepends="perl>=5.20 libressl-openssl" hostmakedepends="perl>=5.20 libressl-openssl"
@ -12,4 +12,4 @@ maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
homepage="http://search.cpan.org/dist/Net-SSLeay/" homepage="http://search.cpan.org/dist/Net-SSLeay/"
license="BSD" license="BSD"
distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-$version.tar.gz" distfiles="${CPAN_SITE}/Net/${pkgname/perl-/}-$version.tar.gz"
checksum=5bf8fd536d900da9d38a985417302fbb1ce4a8723e445f89028479273e6cae57 checksum=1876466e7a6373649299df4a2d094060e1bda074450b107545caf3e352c37e4e

View file

@ -1,7 +1,7 @@
# Template file for 'postgresql' # Template file for 'postgresql'
pkgname=postgresql pkgname=postgresql
version=9.3.5 version=9.4.0
revision=4 revision=1
build_style=gnu-configure build_style=gnu-configure
make_build_target="world" make_build_target="world"
configure_args="--with-openssl --with-python configure_args="--with-openssl --with-python
@ -10,11 +10,11 @@ configure_args="--with-openssl --with-python
--without-bonjour --with-libxml --with-libxslt --disable-rpath --without-bonjour --with-libxml --with-libxslt --disable-rpath
--with-system-tzdata=/usr/share/zoneinfo --enable-nls" --with-system-tzdata=/usr/share/zoneinfo --enable-nls"
short_desc="Sophisticated open-source Object-Relational DBMS" short_desc="Sophisticated open-source Object-Relational DBMS"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Philipp Hirsch <itself@hanspolo.net>"
homepage="http://www.postgresql.org" homepage="http://www.postgresql.org"
license="BSD" license="BSD"
distfiles="ftp://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2" distfiles="ftp://ftp.postgresql.org/pub/source/v${version}/${pkgname}-${version}.tar.bz2"
checksum=14176ffb1f90a189e7626214365be08ea2bfc26f26994bafb4235be314b9b4b0 checksum=7a35c3cb77532f7b15702e474d7ef02f0f419527ee80a4ca6036fffb551625a5
hostmakedepends="flex docbook docbook2x openjade" hostmakedepends="flex docbook docbook2x openjade"
makedepends="libfl-devel readline-devel>=6.3 libressl-devel>=2.1.2 perl>=5.20 makedepends="libfl-devel readline-devel>=6.3 libressl-devel>=2.1.2 perl>=5.20

View file

@ -0,0 +1,29 @@
# Template file for 'python-mpd2'
pkgname=python-mpd2
version=0.5.4
revision=1
noarch=yes
build_style=python-module
python_versions="2.7 3.4"
pycompile_module="mpd2"
hostmakedepends="python-setuptools python3.4-setuptools"
makedepends="python-devel python3.4-devel"
depends="python"
short_desc="Provides a client interface for the Music Player Daemon"
maintainer="Jens E. Becker <v2px@v2px.de>"
homepage="https://github.com/Mic92/python-mpd2"
license="GPL-3"
distfiles="https://github.com/Mic92/python-mpd2/archive/v${version}.tar.gz"
checksum=04dbc3b8d90746298e42852c5b7fb5be5e7af2ca03e812059639b6c060d98c53
python3.4-mpd2_package() {
noarch=yes
depends="python3.4"
pycompile_version="3.4"
pycompile_module="mpd2"
short_desc="${short_desc/Python2/Python3.4}"
pkg_install() {
vmove usr/lib/python3.4
}
}

1
srcpkgs/python3.4-mpd2 Symbolic link
View file

@ -0,0 +1 @@
python-mpd2

View file

@ -1,6 +1,6 @@
# Template file for 'rasqal' # Template file for 'rasqal'
pkgname=rasqal pkgname=rasqal
version=0.9.32 version=0.9.33
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-static --enable-release" configure_args="--disable-static --enable-release"
@ -11,7 +11,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="LGPL-2.1" license="LGPL-2.1"
homepage="http://librdf.org/rasqal" homepage="http://librdf.org/rasqal"
distfiles="http://librdf.org/dist/source/rasqal-${version}.tar.gz" distfiles="http://librdf.org/dist/source/rasqal-${version}.tar.gz"
checksum=eeba03218e3b7dfa033934d523a1a64671a9a0f64eadc38a01e4b43367be2e8f checksum=6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
librasqal_package() { librasqal_package() {
short_desc+=" - Runtime libraries" short_desc+=" - Runtime libraries"

View file

@ -1,6 +1,6 @@
# Template file for 'runit-void' # Template file for 'runit-void'
pkgname=runit-void pkgname=runit-void
version=20141231 version=20150117
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
homepage="http://www.voidlinux.eu" homepage="http://www.voidlinux.eu"
@ -10,7 +10,7 @@ license="Public Domain"
hostmakedepends="git" hostmakedepends="git"
depends="runit" depends="runit"
conf_files="/etc/hostname /etc/locale.conf /etc/rc.conf /etc/rc.local" conf_files="/etc/hostname /etc/locale.conf /etc/rc.conf /etc/rc.local /etc/rc.shutdown"
make_dirs=" make_dirs="
/etc/zzz.d/suspend 0755 root root /etc/zzz.d/suspend 0755 root root
/etc/zzz.d/resume 0755 root root" /etc/zzz.d/resume 0755 root root"

View file

@ -1,6 +1,6 @@
# Template file for 'silc-toolkit' # Template file for 'silc-toolkit'
pkgname=silc-toolkit pkgname=silc-toolkit
version=1.1.11 version=1.1.12
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-perl=yes --with-simdir=/usr/lib/silc/modules configure_args="--with-perl=yes --with-simdir=/usr/lib/silc/modules
@ -13,7 +13,7 @@ maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="GPL-2,BSD" license="GPL-2,BSD"
homepage="http://www.silcnet.org/" homepage="http://www.silcnet.org/"
distfiles="${SOURCEFORGE_SITE}/silc/silc/client/sources/$pkgname-$version.tar.bz2" distfiles="${SOURCEFORGE_SITE}/silc/silc/client/sources/$pkgname-$version.tar.bz2"
checksum=3cce1b551663603629ba8a9d3578ed928ee0eccf1bf4ee62d2377bf5c5b476a9 checksum=be170288f79fbe34971fc26fe762a8329621e11a117f20c218857f2bbad24d6e
post_install() { post_install() {
#Remove large (useless) documentation. #Remove large (useless) documentation.

View file

@ -1,14 +1,14 @@
# Template file for 'sinit' # Template file for 'sinit'
pkgname=sinit pkgname=sinit
version=0.9.1 version=0.9.2
revision=2 revision=1
build_style=gnu-makefile build_style=gnu-makefile
short_desc="A simple init, initially based on Rich Felkers minimal init" short_desc="A simple init, initially based on Rich Felkers minimal init"
maintainer="Ypnose <linuxienATlegtuxDOTorg>" maintainer="Ypnose <linuxienATlegtuxDOTorg>"
license="MIT" license="MIT"
homepage="http://tools.suckless.org/sinit/" homepage="http://tools.suckless.org/sinit/"
distfiles="http://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="http://dl.suckless.org/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=bdd21334b263611cf7d481e3ce9e57a16285fa9155869d877e5c33744ae324cd checksum=52e74eae1eeb9dd3280cc93f96ea8cbc9a4984c75c4aaee1bd91ffd5a4aa83a5
pre_build() { pre_build() {
LD=$CC LD=$CC

17
srcpkgs/sonata/template Normal file
View file

@ -0,0 +1,17 @@
# Template file for 'sonata'
pkgname=sonata
version=1.7a2
revision=1
noarch=yes
build_style=python-module
python_versions="3.4"
pycompile_module="sonata"
hostmakedepends="python3.4-setuptools"
depends="python3.4 python3.4-mpd2 python3.4-gobject gtk+3 ${hostmakedepends}"
short_desc="An elegant GTK 3 client for the Music Player Daemon"
maintainer="Jens E. Becker <v2px@v2px.de>"
homepage="http://www.nongnu.org/sonata/"
license="GPL-3"
distfiles="https://github.com/multani/sonata/archive/v${version}.tar.gz"
checksum=40314225aa4700741e28e9770cf3753399a9e557468b66d1d56d59f4f73138e2

View file

@ -1,6 +1,6 @@
# Template file for 'swig' # Template file for 'swig'
pkgname=swig pkgname=swig
version=3.0.3 version=3.0.4
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-pcre-prefix=${XBPS_CROSS_BASE}/usr" configure_args="--with-pcre-prefix=${XBPS_CROSS_BASE}/usr"
@ -11,4 +11,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.swig.org" homepage="http://www.swig.org"
license="GPL-3" license="GPL-3"
distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
checksum=2c96717d9b0dc918d99f3ce6f4517dd499dd29fcab64ea8e73fcbcee6f43f399 checksum=410ffa80ef5535244b500933d70c1b65206333b546ca5a6c89373afb65413795

View file

@ -1,6 +1,6 @@
# Template file for 'trace-cmd' # Template file for 'trace-cmd'
pkgname=trace-cmd pkgname=trace-cmd
version=2.5 version=2.5.1
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
make_build_args="all gui doc" make_build_args="all gui doc"

View file

@ -1,6 +1,6 @@
# Template file for 'tudu' # Template file for 'tudu'
pkgname=tudu pkgname=tudu
version=0.9.1 version=0.10
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
conf_files="/etc/tudurc" conf_files="/etc/tudurc"
@ -10,4 +10,4 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="GPL-3" license="GPL-3"
homepage="http://code.meskio.net/tudu/" homepage="http://code.meskio.net/tudu/"
distfiles="http://code.meskio.net/${pkgname}/${pkgname}-${version}.tar.gz" distfiles="http://code.meskio.net/${pkgname}/${pkgname}-${version}.tar.gz"
checksum=5296f59473f93d2d91a0a602502eee155914e72d1556c17d3bef2793ed36fd16 checksum=a40f420eb08fc3b4fe3c75abc9ef3eeddf32e20ff893d17d530f020b0be4e114

View file

@ -1,6 +1,6 @@
# Template file for 'usb-modeswitch-data' # Template file for 'usb-modeswitch-data'
pkgname=usb-modeswitch-data pkgname=usb-modeswitch-data
version=20140529 version=20150115
revision=1 revision=1
build_style=gnu-makefile build_style=gnu-makefile
short_desc="Mode switching tool for controlling 'multi-mode' USB devices (data files)" short_desc="Mode switching tool for controlling 'multi-mode' USB devices (data files)"
@ -8,6 +8,6 @@ maintainer="Enno Boland <eb@s01.de>"
license="GPL-2" license="GPL-2"
homepage="http://www.draisberghof.de/usb_modeswitch/" homepage="http://www.draisberghof.de/usb_modeswitch/"
distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${version}.tar.bz2" distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${version}.tar.bz2"
checksum=53889157937109e04dafe897c098ec94f3f44f9c0c83fc6ec8417aa9a587e536 checksum=90549f589835a68279369c3dc0d47eb7338ee3bad09d737e7b85e1ab15bd2d8b
make_install_args="RULESDIR=/usr/lib/udev/rules.d" make_install_args="RULESDIR=/usr/lib/udev/rules.d"
noarch=yes noarch=yes

View file

@ -1,6 +1,6 @@
# Template file for 'usb-modeswitch' # Template file for 'usb-modeswitch'
pkgname=usb-modeswitch pkgname=usb-modeswitch
version=2.2.0 version=2.2.1
revision=2 revision=2
build_style=gnu-makefile build_style=gnu-makefile
short_desc="Mode switching tool for controlling 'multi-mode' USB devices" short_desc="Mode switching tool for controlling 'multi-mode' USB devices"
@ -11,6 +11,6 @@ makedepends="libusb-devel"
depends="tcl ${pkgname}-data" depends="tcl ${pkgname}-data"
hostmakedepends="pkg-config tcl" hostmakedepends="pkg-config tcl"
homepage="http://www.draisberghof.de/usb_modeswitch/" homepage="http://www.draisberghof.de/usb_modeswitch/"
distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-2.2.0.tar.bz2" distfiles="http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${version}.tar.bz2"
checksum=2752103de171ed5f6c8d6a6e3e73e16c9ee3e8e394dd39c5991f7680eb908a3a checksum=37d926a0b6b6d490173c57e260a69aca49feb774875fc8f2001c1d0f5e8011cb
make_install_args="UDEVDIR=/usr/lib/udev" make_install_args="UDEVDIR=/usr/lib/udev"

View file

@ -1,6 +1,6 @@
# Template file for 'vimb' # Template file for 'vimb'
pkgname=vimb pkgname=vimb
version=2.8 version=2.9
revision=3 revision=3
build_style=gnu-makefile build_style=gnu-makefile
make_build_args="$(vopt_if gtk3 GTK=3)" make_build_args="$(vopt_if gtk3 GTK=3)"
@ -11,7 +11,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
license="GPL-3" license="GPL-3"
homepage="http://fanglingsu.github.io/vimb" homepage="http://fanglingsu.github.io/vimb"
distfiles="https://github.com/fanglingsu/vimb/archive/${version}.tar.gz" distfiles="https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"
checksum=d398b0e772e1c3751ef76dc833e84b4abaa19f6b9b5e75afa63ace8b9ff12e12 checksum=179024e07c133b049d9fb7c487bed9b9a8512b633e1d857e038b26a01d2e3541
build_options="gtk3" build_options="gtk3"
build_options_default="gtk3" build_options_default="gtk3"

View file

@ -1,6 +1,6 @@
# Template file for 'void-updates' # Template file for 'void-updates'
pkgname=void-updates pkgname=void-updates
version=20141124 version=20150116
revision=1 revision=1
noarch=yes noarch=yes
build_style=gnu-makefile build_style=gnu-makefile

View file

@ -1 +0,0 @@
webkit-gtk

View file

@ -1,6 +1,6 @@
# Template file for 'webkit2gtk' # Template file for 'webkit2gtk'
pkgname=webkit2gtk pkgname=webkit2gtk
version=2.6.4 version=2.6.5
revision=1 revision=1
build_style=cmake build_style=cmake
configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc" configure_args="-DPORT=GTK -DENABLE_GTKDOC=OFF -DCMAKE_LINKER=${XBPS_CROSS_TRIPLET}-gcc"
@ -9,7 +9,7 @@ maintainer="Enno Boland <eb@s01.de>"
homepage="http://webkitgtk.org/" homepage="http://webkitgtk.org/"
license="LGPL-2.1, 2-clause-BSD" license="LGPL-2.1, 2-clause-BSD"
distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz"
checksum=beef5e24edd9b9cade22d80bf373c74d236f996fe30f49f8697a70f267772e9b checksum=b1658017cea7cc545b9e01f22af585986e21e4242825e215bc5f8e0c0dc67593
wrksrc="webkitgtk-$version" wrksrc="webkitgtk-$version"
# ETOOHUGE # ETOOHUGE

1
srcpkgs/words-de Symbolic link
View file

@ -0,0 +1 @@
aspell-de

1
srcpkgs/words-en Symbolic link
View file

@ -0,0 +1 @@
aspell-en

14
srcpkgs/xcape/template Normal file
View file

@ -0,0 +1,14 @@
# Template file for 'xcape'
pkgname=xcape
version=1.1
revision=1
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="libX11-devel libXtst-devel libXi-devel"
make_install_args="MANDIR=/share/man/man1"
short_desc="Allows you to use a single press of a modifier key as another key"
maintainer="Matt Carroll <oholiab@gmail.com>"
license="GPL-3"
homepage="https://github.com/alols/xcape"
distfiles="https://github.com/alols/xcape/archive/v${version}.tar.gz"
checksum=69ae927a6b2b1268a809b9c3af7c4f94584458f022beb6e2ca3e6bc3ba8a6d4a

View file

@ -1,37 +0,0 @@
x86/emulate: check cpl for all privileged instructions
Without this, it is possible for userspace to load its own IDT or GDT.
This is XSA-105.
Reported-by: Andrei LUTAS <vlutas@bitdefender.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Andrei LUTAS <vlutas@bitdefender.com>
--- xen/arch/x86/x86_emulate/x86_emulate.c
+++ xen/arch/x86/x86_emulate/x86_emulate.c
@@ -3314,6 +3314,7 @@ x86_emulate(
goto swint;
case 0xf4: /* hlt */
+ generate_exception_if(!mode_ring0(), EXC_GP, 0);
ctxt->retire.flags.hlt = 1;
break;
@@ -3710,6 +3711,7 @@ x86_emulate(
break;
case 2: /* lgdt */
case 3: /* lidt */
+ generate_exception_if(!mode_ring0(), EXC_GP, 0);
generate_exception_if(ea.type != OP_MEM, EXC_UD, -1);
fail_if(ops->write_segment == NULL);
memset(&reg, 0, sizeof(reg));
@@ -3738,6 +3740,7 @@ x86_emulate(
case 6: /* lmsw */
fail_if(ops->read_cr == NULL);
fail_if(ops->write_cr == NULL);
+ generate_exception_if(!mode_ring0(), EXC_GP, 0);
if ( (rc = ops->read_cr(0, &cr0, ctxt)) )
goto done;
if ( ea.type == OP_REG )

View file

@ -1,36 +0,0 @@
x86/HVM: properly bound x2APIC MSR range
While the write path change appears to be purely cosmetic (but still
gets done here for consistency), the read side mistake permitted
accesses beyond the virtual APIC page.
Note that while this isn't fully in line with the specification
(digesting MSRs 0x800-0xBFF for the x2APIC), this is the minimal
possible fix addressing the security issue and getting x2APIC related
code into a consistent shape (elsewhere a 256 rather than 1024 wide
window is being used too). This will be dealt with subsequently.
This is XSA-108.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- xen/arch/x86/hvm/hvm.c
+++ xen/arch/x86/hvm/hvm.c
@@ -4380,7 +4380,7 @@ int hvm_msr_read_intercept(unsigned int
*msr_content = vcpu_vlapic(v)->hw.apic_base_msr;
break;
- case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0x3ff:
+ case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0xff:
if ( hvm_x2apic_msr_read(v, msr, msr_content) )
goto gp_fault;
break;
@@ -4506,7 +4506,7 @@ int hvm_msr_write_intercept(unsigned int
vlapic_tdt_msr_set(vcpu_vlapic(v), msr_content);
break;
- case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0x3ff:
+ case MSR_IA32_APICBASE_MSR ... MSR_IA32_APICBASE_MSR + 0xff:
if ( hvm_x2apic_msr_write(v, msr, msr_content) )
goto gp_fault;
break;

View file

@ -1,156 +0,0 @@
x86emul: enforce privilege level restrictions when loading CS
Privilege level checks were basically missing for the CS case, the
only check that was done (RPL == DPL for nonconforming segments)
was solely covering a single special case (return to non-conforming
segment).
Additionally in long mode the L bit set requires the D bit to be clear,
as was recently pointed out for KVM by Nadav Amit
<namit@cs.technion.ac.il>.
Finally we also need to force the loaded selector's RPL to CPL (at
least as long as lret/retf emulation doesn't support privilege level
changes).
This is XSA-110.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Tim Deegan <tim@xen.org>
--- xen/arch/x86/x86_emulate/x86_emulate.c
+++ xen/arch/x86/x86_emulate/x86_emulate.c
@@ -1119,7 +1119,7 @@ realmode_load_seg(
static int
protmode_load_seg(
enum x86_segment seg,
- uint16_t sel,
+ uint16_t sel, bool_t is_ret,
struct x86_emulate_ctxt *ctxt,
const struct x86_emulate_ops *ops)
{
@@ -1185,9 +1185,23 @@ protmode_load_seg(
/* Code segment? */
if ( !(desc.b & (1u<<11)) )
goto raise_exn;
- /* Non-conforming segment: check DPL against RPL. */
- if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) )
+ if ( is_ret
+ ? /*
+ * Really rpl < cpl, but our sole caller doesn't handle
+ * privilege level changes.
+ */
+ rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl)
+ : desc.b & (1 << 10)
+ /* Conforming segment: check DPL against CPL. */
+ ? dpl > cpl
+ /* Non-conforming segment: check RPL and DPL against CPL. */
+ : rpl > cpl || dpl != cpl )
goto raise_exn;
+ /* 64-bit code segments (L bit set) must have D bit clear. */
+ if ( in_longmode(ctxt, ops) &&
+ (desc.b & (1 << 21)) && (desc.b & (1 << 22)) )
+ goto raise_exn;
+ sel = (sel ^ rpl) | cpl;
break;
case x86_seg_ss:
/* Writable data segment? */
@@ -1252,7 +1266,7 @@ protmode_load_seg(
static int
load_seg(
enum x86_segment seg,
- uint16_t sel,
+ uint16_t sel, bool_t is_ret,
struct x86_emulate_ctxt *ctxt,
const struct x86_emulate_ops *ops)
{
@@ -1261,7 +1275,7 @@ load_seg(
return X86EMUL_UNHANDLEABLE;
if ( in_protmode(ctxt, ops) )
- return protmode_load_seg(seg, sel, ctxt, ops);
+ return protmode_load_seg(seg, sel, is_ret, ctxt, ops);
return realmode_load_seg(seg, sel, ctxt, ops);
}
@@ -2003,7 +2017,7 @@ x86_emulate(
if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes),
&dst.val, op_bytes, ctxt, ops)) != 0 )
goto done;
- if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 )
+ if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 )
return rc;
break;
@@ -2357,7 +2371,7 @@ x86_emulate(
enum x86_segment seg = decode_segment(modrm_reg);
generate_exception_if(seg == decode_segment_failed, EXC_UD, -1);
generate_exception_if(seg == x86_seg_cs, EXC_UD, -1);
- if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 )
+ if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 )
goto done;
if ( seg == x86_seg_ss )
ctxt->retire.flags.mov_ss = 1;
@@ -2438,7 +2452,7 @@ x86_emulate(
&_regs.eip, op_bytes, ctxt)) )
goto done;
- if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 )
+ if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 )
goto done;
_regs.eip = eip;
break;
@@ -2662,7 +2676,7 @@ x86_emulate(
if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes,
&sel, 2, ctxt, ops)) != 0 )
goto done;
- if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 )
+ if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 )
goto done;
dst.val = src.val;
break;
@@ -2736,7 +2750,7 @@ x86_emulate(
&dst.val, op_bytes, ctxt, ops)) ||
(rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset),
&src.val, op_bytes, ctxt, ops)) ||
- (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) )
+ (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) )
goto done;
_regs.eip = dst.val;
break;
@@ -2785,7 +2799,7 @@ x86_emulate(
_regs.eflags &= mask;
_regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02;
_regs.eip = eip;
- if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 )
+ if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 )
goto done;
break;
}
@@ -3415,7 +3429,7 @@ x86_emulate(
generate_exception_if(mode_64bit(), EXC_UD, -1);
eip = insn_fetch_bytes(op_bytes);
sel = insn_fetch_type(uint16_t);
- if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 )
+ if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 )
goto done;
_regs.eip = eip;
break;
@@ -3714,7 +3728,7 @@ x86_emulate(
goto done;
}
- if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 )
+ if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 )
goto done;
_regs.eip = src.val;
@@ -3781,7 +3795,7 @@ x86_emulate(
generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1);
generate_exception_if(!mode_ring0(), EXC_GP, 0);
if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr,
- src.val, ctxt, ops)) != 0 )
+ src.val, 0, ctxt, ops)) != 0 )
goto done;
break;

View file

@ -1,14 +1,14 @@
# Template file for 'xen' # Template file for 'xen'
pkgname=xen pkgname=xen
version=4.4.1 version=4.5.0
wrksrc=xen-${version} wrksrc="xen-${version}"
revision=6 revision=1
short_desc="The Xen hypervisor utilities" short_desc="The Xen hypervisor utilities"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://xen.org" homepage="http://xen.org"
license="GPL-2" license="GPL-2"
distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz" distfiles="http://bits.xensource.com/oss-xen/release/$version/xen-$version.tar.gz"
checksum=55b49d3c4575d7791275125ff87c0f86f1d1e0f7f2718b6fd1c4f88a9bc7ea25 checksum=5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b
only_for_archs="x86_64" only_for_archs="x86_64"
@ -19,7 +19,6 @@ makedepends="
ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel ncurses-devel liblzma-devel python-devel yajl-devel libuuid-devel libglib-devel
dev86 acpica-utils pixman-devel gcc-multilib" dev86 acpica-utils pixman-devel gcc-multilib"
depends="xen-hypervisor" depends="xen-hypervisor"
replaces="runit-void<20141013_2"
build_options="systemd" build_options="systemd"
make_dirs=" make_dirs="

15
srcpkgs/yad/template Normal file
View file

@ -0,0 +1,15 @@
# Template file for 'yad'
pkgname=yad
version=0.27.0
revision=1
#wrksrc="${pkgname}-${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="intltool pkg-config"
makedepends="gtk+-devel"
short_desc="Yet Another Dialog"
maintainer="Mollusk <mollusk@homebutter.com>"
license="GPL-3"
homepage="http://sourceforge.net/projects/yad-dialog/"
distfiles="${SOURCEFORGE_SITE}/$pkgname-dialog/$pkgname-$version.tar.xz"
checksum=8a7e4e3f026c00c5c63d612d9378b2500c5a6a668e83fe5569bde2df42c0d341