summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-02-26 03:35:58 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-02-26 03:35:58 +0000
commit3f23b6bf0b09b0edd47e2c763b3be136bc2fe274 (patch)
tree3be88fe725fc529471a0a3ca5af4b509e2ff88b1
parent58e4d57ed9a8604dff646ccdfee54f9019ca5d13 (diff)
Wed Feb 26 03:32:51 UTC 2014
-rw-r--r--community/asunder/PKGBUILD33
-rw-r--r--community/asunder/asunder.install14
-rw-r--r--community/dbmail/PKGBUILD4
-rw-r--r--community/dmenu/PKGBUILD26
-rw-r--r--community/envoy/PKGBUILD6
-rw-r--r--community/gnote/PKGBUILD6
-rw-r--r--community/gnuradio/PKGBUILD8
-rw-r--r--community/haskell-haskeline/PKGBUILD8
-rw-r--r--community/haskell-terminfo/PKGBUILD8
-rw-r--r--community/python-levenshtein/PKGBUILD11
-rw-r--r--community/quassel/PKGBUILD16
-rw-r--r--community/synergy/PKGBUILD24
-rw-r--r--community/tellico/PKGBUILD6
-rw-r--r--community/texmaker/PKGBUILD10
-rw-r--r--community/unifdef/PKGBUILD6
-rw-r--r--community/virtualbox-modules-lts/PKGBUILD6
-rw-r--r--community/virtualbox-modules/PKGBUILD6
-rw-r--r--community/widelands/PKGBUILD15
-rw-r--r--community/xnee/PKGBUILD6
-rw-r--r--community/xnee/xnee.changelog3
-rw-r--r--core/s-nail/PKGBUILD6
-rw-r--r--extra/ardour/PKGBUILD8
-rw-r--r--extra/glsof/PKGBUILD38
-rw-r--r--extra/glsof/glsof-filemonitor2
-rw-r--r--extra/glsof/glsof-queries2
-rw-r--r--extra/ntfs-3g/PKGBUILD (renamed from extra/ntfs-3g_ntfsprogs/PKGBUILD)0
-rw-r--r--extra/telepathy-glib/PKGBUILD6
-rw-r--r--extra/tumbler/PKGBUILD6
-rw-r--r--kernels/gradm/PKGBUILD9
-rw-r--r--kernels/gradm/usr.patch115
-rw-r--r--kernels/linux-libre-grsec/PKGBUILD12
-rw-r--r--kernels/linux-libre-grsec/config.i6862
-rw-r--r--kernels/linux-libre-grsec/known-exploit-detection.patch410
-rw-r--r--kernels/xen/ChangeLog7
-rw-r--r--kernels/xen/PKGBUILD75
-rw-r--r--kernels/xen/xsa73-4.3-unstable.patch105
-rw-r--r--kernels/xen/xsa75-4.3-unstable.patch55
-rw-r--r--kernels/xen/xsa78.patch23
-rw-r--r--libre/bfgminer-libre/PKGBUILD18
-rw-r--r--libre/handbrake-svn/PKGBUILD171
-rw-r--r--libre/handbrake-svn/handbrake-svn.install14
-rw-r--r--libre/liferea-libre/PKGBUILD10
-rw-r--r--libre/xbmc-libre/PKGBUILD19
-rw-r--r--pcr/ruby-bundler/PKGBUILD37
-rw-r--r--pcr/tunnels-git/PKGBUILD58
-rw-r--r--pcr/xfce-theme-greybird/PKGBUILD18
46 files changed, 722 insertions, 726 deletions
diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD
new file mode 100644
index 000000000..f7e1d6723
--- /dev/null
+++ b/community/asunder/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 103408 2014-01-05 18:15:51Z xyne $
+# Maintainer: Xyne <ac xunilhcra enyx, backwards>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: cs-cam - me.at.camdaniel.com
+# Contributor: Sebastien Piccand <sebcactus gmail com>
+
+pkgname=asunder
+pkgver=2.4
+pkgrel=2
+pkgdesc="a graphical CD ripper and encoder"
+arch=('i686' 'x86_64')
+url="http://littlesvr.ca/asunder/"
+license=('GPL2')
+depends=('gtk2' 'libcddb' 'cdparanoia' 'desktop-file-utils')
+makedepends=('pkgconfig' 'intltool' 'gettext')
+optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \
+ 'flac: for flac support')
+source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('11d36dcff71797e34a8e225e8fbd9e15')
+sha256sums=('90c2e13891697062661f3c1614b8781ce2e42963135174b8ba3ed6c3931cd293')
+install="$pkgname".install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
+
diff --git a/community/asunder/asunder.install b/community/asunder/asunder.install
new file mode 100644
index 000000000..735ba2d4a
--- /dev/null
+++ b/community/asunder/asunder.install
@@ -0,0 +1,14 @@
+post_install()
+{
+ update-desktop-database -q
+}
+
+post_upgrade()
+{
+ post_install
+}
+
+post_remove()
+{
+ post_install
+} \ No newline at end of file
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index c4879af58..2c81bdd85 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 105965 2014-02-20 09:01:49Z spupykin $
+# $Id: PKGBUILD 106198 2014-02-25 10:18:17Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
pkgname=dbmail
pkgver=3.1.10
-pkgrel=3
+pkgrel=4
pkgdesc="Fast and scalable sql based mail services"
arch=('i686' 'x86_64')
depends=('gmime' 'libzdb' 'mhash' 'libevent')
diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD
index 9a45dd17f..8f4f34194 100644
--- a/community/dmenu/PKGBUILD
+++ b/community/dmenu/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 69620 2012-04-20 14:11:11Z bpiotrowski $
+# $Id: PKGBUILD 106204 2014-02-25 11:21:42Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: Thayer Williams <thayer@archlinux.org>
# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
pkgname=dmenu
-pkgver=4.5
-pkgrel=3
+pkgver=4.5.13.5ed5e90
+pkgrel=1
pkgdesc="A generic menu for X"
url="http://tools.suckless.org/dmenu/"
arch=('i686' 'x86_64')
license=('MIT')
depends=('sh' 'libxinerama')
-source=(http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz)
-md5sums=('9c46169ed703732ec52ed946c27d84b4')
+makedepends=('git')
+source=(git://git.suckless.org/dmenu#commit=5ed5e90bf)
+md5sums=('SKIP')
+
+pkgver() {
+ cd $pkgname
+ echo 4.5.$(git rev-list 7f45b3f7a..@ --count).$(git rev-parse --short HEAD)
+}
build(){
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname
make \
X11INC=/usr/include/X11 \
X11LIB=/usr/lib/X11
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make PREFIX=/usr DESTDIR=$pkgdir install
- install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ cd $pkgname
+ make PREFIX=/usr DESTDIR="$pkgdir" install
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/community/envoy/PKGBUILD b/community/envoy/PKGBUILD
index 868b969a9..e73f98926 100644
--- a/community/envoy/PKGBUILD
+++ b/community/envoy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 101179 2013-11-18 17:42:55Z eric $
+# $Id: PKGBUILD 106194 2014-02-25 08:40:55Z bpiotrowski $
# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
pkgname=envoy
-pkgver=5
+pkgver=7
pkgrel=1
pkgdesc="A ssh-agent/gpg-agent keychain and process monitor"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ optdepends=('gnupg: gpg-agent support')
makedepends=('ragel')
source=("$pkgname-$pkgver.tar.gz::https://github.com/vodik/$pkgname/archive/v$pkgver.tar.gz"
"clique.tar.gz::https://github.com/vodik/clique/archive/v0.1.tar.gz")
-md5sums=('feee9b1a0eed31360324ea868d081801'
+md5sums=('a4eb7a7356519605797b1d22b81dcf36'
'8c4f3fd488fc8f92196a8aa42ac9567e')
prepare() {
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index 95a640912..f584187a2 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 100334 2013-11-02 11:34:59Z ioni $
+# $Id: PKGBUILD 106214 2014-02-25 15:12:42Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: uastasi <uastasi@archlinux.us>
pkgname=gnote
-pkgver=3.10.1
+pkgver=3.10.3
pkgrel=1
pkgdesc="A note taking application."
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf' 'l
makedepends=('intltool' 'itstool' 'boost')
install=gnote.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8466343c43cb5fb223a7abfe43e6e963f64403f96a3c823f5a37474e83d5e1a0')
+sha256sums=('02e3c60dc49f3b040d86f0bb8c86af563dec91fcae1037bfda05a33a2cb8c5fd')
build() {
cd $pkgname-$pkgver
diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD
index 32dcfb539..4a8602e0b 100644
--- a/community/gnuradio/PKGBUILD
+++ b/community/gnuradio/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 102721 2013-12-17 19:43:24Z kkeen $
+# $Id: PKGBUILD 106243 2014-02-25 20:49:30Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Dominik Heidler <dheidler@gmail.com>
# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com>
pkgname=gnuradio
pkgver=3.7.2.1
-pkgrel=1
+pkgrel=2
pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd."
arch=('i686' 'x86_64')
url="http://gnuradio.org"
license=('GPL')
depends=('fftw' 'python2-numpy' 'cppunit' 'swig' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd')
-makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah')
+makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah' 'glu')
optdepends=('python2-cheetah: gnuradio-companion'
'python2-lxml: gnuradio-companion'
'pygtk: gnuradio-companion'
@@ -29,6 +29,7 @@ install=gnuradio.install
# 'qwtplot3d'
# todo
+# fix FS#38293
# add gr-osmosdr-git to optdepends
# split the gui components?
# build doxygen docs?
@@ -58,6 +59,7 @@ build() {
-DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
-DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
-DENABLE_GRC=ON \
+ -DENABLE_GR_WXGUI=ON \
-DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
make
}
diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD
index e23e3426b..102cd82ee 100644
--- a/community/haskell-haskeline/PKGBUILD
+++ b/community/haskell-haskeline/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 103338 2014-01-03 11:10:00Z bpiotrowski $
+# $Id: PKGBUILD 106230 2014-02-25 15:57:18Z bpiotrowski $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
# Package generated by cabal2arch 0.7.6
_hkgname=haskeline
pkgname=haskell-haskeline
-pkgver=0.7.0.3
-pkgrel=3
+pkgver=0.7.1.2
+pkgrel=1
pkgdesc="A command-line interface for user input, written in Haskell."
url="http://hackage.haskell.org/package/haskeline"
license=('custom:BSD3')
@@ -15,7 +15,7 @@ depends=('ghc=7.6.3-1' 'sh' 'haskell-utf8-string=0.3.7-5' 'haskell-mtl=2.1.2-3'
install=${pkgname}.install
options=('staticlibs')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('3a78043dc80b5510202e71e77c0a9923')
+md5sums=('5a34c091ffff2564a1ea4bec0a3aaf71')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD
index bbd5e49f5..cfe3159d8 100644
--- a/community/haskell-terminfo/PKGBUILD
+++ b/community/haskell-terminfo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103340 2014-01-03 11:10:44Z bpiotrowski $
+# $Id: PKGBUILD 106226 2014-02-25 15:47:36Z bpiotrowski $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
_hkgname=terminfo
pkgname=haskell-terminfo
-pkgver=0.3.2.5
-pkgrel=3
+pkgver=0.4.0.0
+pkgrel=1
pkgdesc="Haskell bindings to the terminfo library."
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
@@ -14,7 +14,7 @@ depends=('ghc=7.6.3-1' 'sh')
options=('staticlibs')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install=${pkgname}.install
-md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3')
+md5sums=('1995cacd80dd6ee3744c3a93f21081ae')
build() {
cd "${srcdir}/${_hkgname}-${pkgver}"
diff --git a/community/python-levenshtein/PKGBUILD b/community/python-levenshtein/PKGBUILD
index f38df5c3f..b8ac020c6 100644
--- a/community/python-levenshtein/PKGBUILD
+++ b/community/python-levenshtein/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104954 2014-01-28 15:04:34Z fyan $
+# $Id: PKGBUILD 106222 2014-02-25 15:25:23Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Thomas S Hatch <thatch45@gmail.com>
# Contributor: shamrok <szamrok@gmail.com>
@@ -6,8 +6,8 @@
pkgbase=python-levenshtein
pkgname=(python-levenshtein python2-levenshtein)
-pkgver=0.11.1
-pkgrel=2
+pkgver=0.11.2
+pkgrel=1
pkgdesc="Python extension for computing string edit distances and similarities"
url="http://pypi.python.org/pypi/python-Levenshtein/"
license=("GPL")
@@ -17,9 +17,6 @@ source=("http://pypi.python.org/packages/source/p/python-Levenshtein/python-Leve
prepare() {
cp -r python-Levenshtein-$pkgver python2-Levenshtein-$pkgver
-
- cd python-Levenshtein-$pkgver
- sed -i "s|[)].read|, encoding='utf8').read|" setup.py
}
package_python-levenshtein() {
@@ -36,4 +33,4 @@ package_python2-levenshtein() {
python2 setup.py build install -O1 --prefix=/usr --root="$pkgdir"
}
-sha512sums=('335f29253ec7bba8d54881dfe093ac194626cdaad0cc6ed08327917d6187cdfe1fbb3d003744f991587f8dc800aa1d361e3aa0b276b31ecfe7a43d83ea0d660b')
+sha512sums=('67d701e841c9a846948a1f2c70ea06c6473e3ae1437f73df2a2747d576024889a12e00c4a61e95b6c14826554b1ebaf65375cf5be4f26df3b208568403192bf3')
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index 7833c5f1d..1555cd3d8 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100661 2013-11-07 19:56:29Z jelle $
+# $Id: PKGBUILD 106196 2014-02-25 09:51:25Z bpiotrowski $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgbase=quassel
pkgname=('quassel-client' 'quassel-core')
-pkgver=0.9.1
-pkgrel=3
+pkgver=0.9.2
+pkgrel=1
pkgdesc="QT4 irc client with a separated core"
arch=('i686' 'x86_64')
url="http://quassel-irc.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'qt4' 'icu' 'kdelibs')
source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
$pkgbase.service
$pkgbase.conf)
-sha256sums=('39e97bd67160d6575a57d4f71c4b1be5c13461ca238baef462ab43164419864e'
+sha256sums=('f04d01602509c1d950602502e5f51aba47d99c73a9c70e77c563bb7749fc53c0'
'88b5b693ad7eea7fb2d084da29c6abc26ea5fa990668f9807d462778243f1d6a'
'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
@@ -58,18 +58,18 @@ build() {
-Wno-dev
make
-
+
}
package_quassel-core() {
pkgdesc="Qt4 IRC client with a separated core - core only"
-depends=('qt4' 'icu')
+depends=('qt4' 'icu' 'qca')
backup=(etc/conf.d/quassel)
install=quassel.install
cd $srcdir/build
make DESTDIR="${pkgdir}" install
-
+
# Remove unneeded pixmap icons
rm -r $pkgdir/usr/share
@@ -82,7 +82,7 @@ install=quassel.install
package_quassel-client() {
pkgdesc="Qt4 IRC client with a separated core - client only"
-depends=('qt4' 'kdelibs')
+depends=('qt4' 'kdebase-runtime')
install=quassel-client.install
cd $srcdir/build-client
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index f3ec7583b..dc269589d 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -5,20 +5,20 @@
# Contributor: Michael Düll <mail@akurei.me>
pkgname=synergy
-pkgver=1.4.15
-pkgrel=3
+pkgver=1.4.16
+pkgrel=1
pkgdesc="Share a single mouse and keyboard between multiple computers"
url="http://synergy-foss.org"
arch=('i686' 'x86_64')
depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++')
-makedepends=('libxt' 'cmake' 'qt4' 'unzip')
-optdepends=('qt4: gui support')
+makedepends=('libxt' 'cmake' 'qt5-base' 'unzip')
+optdepends=('qt5-base: gui support')
license=('GPL2')
-source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
+source=("http://fossfiles.com/synergy/synergy-${pkgver}-r1969-Source.tar.gz"
"synergys.socket"
"synergys.service"
"unfuck-cryptopp-thanks-gentoo.patch")
-sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73'
+sha1sums=('c489e8f3262d5ad5dbcb5257c8354f459bd68f1f'
'947406e72351145c65ba9884ed175bf781482d46'
'00f2259c31c9551c0830d9e889fd0a0790cf9045'
'129151952e6d25504ca823aee8ebe93ce3d376ce')
@@ -30,11 +30,11 @@ build() {
# You and Fedora are our only friends in this crazy world.
patch -Np1 < "${srcdir}/unfuck-cryptopp-thanks-gentoo.patch"
- cmake -D CMAKE_INSTALL_PREFIX=/usr .
- make
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" .
+ make -j1
cd src/gui
- qmake-qt4
+ qmake
make
}
@@ -48,6 +48,12 @@ package() {
# install config
install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example"
+ install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced"
+ install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic"
+
+ # install manfiles
+ install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
+ install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
# install systemd service and socket
install -d "$pkgdir/usr/lib/systemd/system"
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index 2fad295bf..4e78e6dc8 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98964 2013-10-21 20:10:32Z jlichtblau $
+# $Id: PKGBUILD 106241 2014-02-25 20:21:46Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ray Rashif <schiv@archlinux.org
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,12 +6,12 @@
pkgname=tellico
pkgver=2.3.8
-pkgrel=2
+pkgrel=3
pkgdesc="A collection manager for KDE"
arch=('i686' 'x86_64')
url="http://tellico-project.org/"
license=('GPL')
-depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'libkcddb' 'poppler-qt' 'kdemultimedia-audiocd-kio')
+depends=('kdebase-runtime' 'qimageblitz' 'kdepimlibs' 'yaz' 'exempi' 'libksane' 'taglib' 'libkcddb' 'poppler-qt' 'kdemultimedia-audiocd-kio')
makedepends=('automoc4' 'cmake')
install=$pkgname.install
changelog=$pkgname.changelog
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index 7e5ff0973..26d1a8d5d 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 100064 2013-11-01 05:49:38Z cinelli $
+# $Id: PKGBUILD 106218 2014-02-25 15:20:41Z bpiotrowski $
# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
pkgname=texmaker
-pkgver=4.1
+pkgver=4.1.1
pkgrel=1
pkgdesc='Free cross-platform LaTeX editor'
arch=('i686' 'x86_64')
@@ -10,11 +10,11 @@ url="http://www.xm1math.net/texmaker/index.html"
license=('GPL')
depends=('poppler-qt5' 'qt5-webkit' 'desktop-file-utils')
optdepends=('ghostscript: LaTeX to HTML conversion command'
- 'ibus-qt5: accented characters support'
- 'poppler: PDF rendering support')
+ 'ibus-qt5: accented characters support'
+ 'poppler: PDF rendering support')
install="$pkgname.install"
source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('97ef7f97e73d69283391e467e5758275')
+md5sums=('0b26fe9e29b37eeaf98e568a096d2dad')
build() {
cd "$pkgname-$pkgver"
diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD
index fd8b122d0..3a78e0429 100644
--- a/community/unifdef/PKGBUILD
+++ b/community/unifdef/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 90818 2013-05-14 10:59:48Z spupykin $
+# $Id: PKGBUILD 106192 2014-02-25 08:09:55Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=unifdef
-pkgver=2.8
+pkgver=2.10
pkgrel=1
pkgdesc="Remove #ifdef'ed lines"
arch=(i686 x86_64)
@@ -10,7 +10,7 @@ url="http://dotat.at/prog/unifdef/"
license=('GPL')
depends=()
source=("http://dotat.at/prog/unifdef/unifdef-$pkgver.tar.gz")
-md5sums=('1cfb5fa5dcab6e6246c07897a1a304b4')
+md5sums=('5161cb017a14997cd20cdf5f5704ced1')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 5f207b037..85114c1f5 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 106042 2014-02-21 16:17:57Z andyrtr $
+# $Id: PKGBUILD 106256 2014-02-25 22:06:47Z seblu $
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Sébastien Luttringer
pkgbase=virtualbox-modules-lts
pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.3.6
-pkgrel=6
+pkgver=4.3.8
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index e191a90f0..49051463d 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 106041 2014-02-21 14:56:19Z thomas $
+# $Id: PKGBUILD 106250 2014-02-25 21:38:16Z seblu $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer
pkgbase=virtualbox-modules
pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.3.6
-pkgrel=5
+pkgver=4.3.8
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index b24052d85..6490ec8ac 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 102284 2013-12-07 10:37:19Z bpiotrowski $
+# $Id: PKGBUILD 106252 2014-02-25 21:52:04Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <rabyte*gmail>
pkgname=widelands
-pkgver=17
-_realver=build17
-pkgrel=11
+pkgver=18
+_realver=build${pkgver}
+pkgrel=1
pkgdesc="A realtime strategy game with emphasis on economy and transport"
arch=('i686' 'x86_64')
url="http://widelands.org/"
license=('GPL')
depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2' 'boost-libs')
makedepends=('cmake' 'boost' 'mesa')
-source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
+source=("https://launchpad.net/widelands/${_realver}/build-${pkgver}/+download/$pkgname-$_realver-src.tar.bz2"
$pkgname.desktop
$pkgname.png
$pkgname.sh)
-md5sums=('bdc9bc0aa631af1aa7fb450507611a58'
+md5sums=('01efe8db8cd25ffeb4f82b8b4ab6652e'
'15820bf099fd6f16251fe70a75c534bb'
'3dfda7e9ca76ca00dd98d745d0ceb328'
'7cae50aba5ed0cd2cfeea79124637b46')
@@ -25,9 +25,6 @@ md5sums=('bdc9bc0aa631af1aa7fb450507611a58'
build() {
cd $srcdir/$pkgname-$_realver-src
- sed -i "1 i #include <unistd.h>" src/main.cc
- sed -i "/Boost_USE_STATIC_LIBS/d" CMakeLists.txt
-
mkdir -p build/compile && cd build/compile
cmake ../.. -DCMAKE_BUILD_TYPE=Release \
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index 33808659a..f18e73770 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105302 2014-02-04 19:29:39Z jlichtblau $
+# $Id: PKGBUILD 106236 2014-02-25 19:42:02Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
pkgname=xnee
-pkgver=3.17
+pkgver=3.18
pkgrel=1
pkgdesc="A program to record, distribute, and replay X (X11) protocol data"
arch=('i686' 'x86_64')
@@ -33,3 +33,5 @@ package() {
#.desktop file
install -Dm644 "${srcdir}"/gnee.desktop "${pkgdir}"/usr/share/applications/gnee.desktop
}
+sha256sums=('24d521b604f3118faf1bd087619feb230cda38bf3721000828e670e0f311cb48'
+ 'de42d419a46083e39a9b6d60c045c1cd68deb793cc5166a86df81dff608387c1')
diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog
index aa157b6be..44d09c1b0 100644
--- a/community/xnee/xnee.changelog
+++ b/community/xnee/xnee.changelog
@@ -1,3 +1,6 @@
+2014-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * xnee 3.18-1
+
2014-02-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* xnee 3.17-1
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 9ebf3b848..8886d2574 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 206340 2014-02-24 06:14:05Z bisson $
+# $Id: PKGBUILD 206421 2014-02-25 22:05:10Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
pkgname=s-nail
-pkgver=14.6
+pkgver=14.6.1
pkgrel=1
pkgdesc='Mail processing system with a command syntax reminiscent of ed'
url='http://sdaoden.users.sourceforge.net/code.html#s-nail'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64')
depends=('openssl')
optdepends=('smtp-forwarder: for sending mail')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz")
-sha1sums=('57603cdc3dea79fda699cc172c33ccae75b1d794')
+sha1sums=('b46808c716c5ae04f0ff51e7f9f4049a7f1dc5c8')
groups=('base')
backup=('etc/mail.rc')
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index e82cc4ad8..7d8e12c98 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 205866 2014-02-12 07:12:24Z schiv $
+# $Id: PKGBUILD 206373 2014-02-25 08:09:13Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Contributor: see .contrib
pkgname=ardour
_pkgname=Ardour3
-pkgver=3.5.308
-pkgrel=2
+pkgver=3.5.357
+pkgrel=1
pkgdesc="Professional-grade digital audio workstation"
arch=('i686' 'x86_64')
url="http://ardour.org/"
@@ -18,7 +18,7 @@ optdepends=('xjadeo: video monitoring')
install=$pkgname.install
source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
"$pkgname.desktop")
-md5sums=('710e084d5edeb3c216c8fdd57f6ed744'
+md5sums=('c59265d859263903b60298d47182d785'
'316bd21ece5e2208a104fd09cac521af')
prepare() {
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
deleted file mode 100644
index 0a7733c79..000000000
--- a/extra/glsof/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 193595 2013-08-24 22:19:33Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=glsof
-pkgver=2.4.0
-_fmver=2.4.0
-_qver=1.0.0
-pkgrel=1
-pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
-arch=('i686' 'x86_64')
-url="http://glsof.sourceforge.net/"
-license=('GPL3')
-depends=('sh' 'java-runtime' 'lsof')
-source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}.tar.gz \
- http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
- http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
- glsof-filemonitor glsof-queries)
-sha1sums=('a605167063492da724ae75fab0492b9cc44fa93f'
- 'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
- 'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
- '9c3097119aa98723c5c59196e6089226829cf09d'
- '2797c326904af16a254c3e39b8c529ea14ef37e5')
-
-package() {
- cd "${srcdir}"
- install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor"
- install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries"
- install -d "${pkgdir}/usr/share/java/glsof"
- install -D -m644 filemonitor/*.jar "${pkgdir}/usr/share/java/glsof"
- install -D -m644 filemonitor/*.txt "${pkgdir}/usr/share/java/glsof"
- if [ "$CARCH" = "i686" ]; then
- install -D -m644 queries_linux32/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
- install -D -m644 queries_linux32/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
- elif [ "$CARCH" = "x86_64" ]; then
- install -D -m644 queries_linux64/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
- install -D -m644 queries_linux64/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
- fi
-}
diff --git a/extra/glsof/glsof-filemonitor b/extra/glsof/glsof-filemonitor
deleted file mode 100644
index 9dff4c0e7..000000000
--- a/extra/glsof/glsof-filemonitor
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -Djava.security.policy=/usr/share/java/glsof/security-client.txt -jar /usr/share/java/glsof/filemonitor.jar
diff --git a/extra/glsof/glsof-queries b/extra/glsof/glsof-queries
deleted file mode 100644
index 1e9c4fc9d..000000000
--- a/extra/glsof/glsof-queries
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar /usr/share/java/glsof/queries.jar
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g/PKGBUILD
index d329507db..d329507db 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g/PKGBUILD
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index dea1911a4..2487d7362 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198696 2013-11-02 08:04:56Z ioni $
+# $Id: PKGBUILD 206393 2014-02-25 10:32:28Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
pkgname=telepathy-glib
-pkgver=0.22.0
+pkgver=0.22.1
pkgrel=1
pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ options=('!emptydirs')
depends=('dbus-glib')
makedepends=('libxslt' 'vala' 'gobject-introspection')
source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('c333ceb21a9ca1c52a0e6e36432943d1')
+md5sums=('278298d4f669cc913485cf7215d37f6a')
build() {
cd $pkgname-$pkgver
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 72e26070c..1347471d4 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198466 2013-10-30 15:02:49Z allan $
+# $Id: PKGBUILD 206371 2014-02-25 07:17:41Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan Jezek <honzin.jezek@gmail.com>
pkgname=tumbler
-pkgver=0.1.29
+pkgver=0.1.30
pkgrel=1
pkgdesc="D-Bus service for applications to request thumbnails"
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ optdepends=('ffmpegthumbnailer: for video thumbnails'
'libopenraw: for RAW thumbnails'
'freetype2: for font thumbnails')
source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
-sha256sums=('c3bac4ee609e22be6c7f01a4fdf6086bc6b57940d82f99570a2d9d547a32fc93')
+sha256sums=('e7c20d79c830465f8b3b792893f05e8b8d5ba90aec4973e7517e07ef31537304')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/kernels/gradm/PKGBUILD b/kernels/gradm/PKGBUILD
index 52e0582b7..6ca4aacd9 100644
--- a/kernels/gradm/PKGBUILD
+++ b/kernels/gradm/PKGBUILD
@@ -5,8 +5,8 @@
pkgname=gradm
pkgver=3.0
-_timestamp=201311242038
-pkgrel=2
+_timestamp=201401291757
+pkgrel=4
pkgdesc='Administrative interface for the grsecurity Role Based Access Control system'
arch=(i686 x86_64 mips64el)
url=http://grsecurity.net/
@@ -14,14 +14,12 @@ license=(GPL2)
depends=(pam)
source=(
http://grsecurity.net/stable/$pkgname-$pkgver-$_timestamp.tar.gz
- usr.patch
learn_config
policy
)
build() {
cd "$srcdir/$pkgname"
- patch -Np1 < ../usr.patch
sed -i -e 's/^CFLAGS :=/CFLAGS +=/' -e 's:sbin:usr/bin:' Makefile
make
}
@@ -33,7 +31,6 @@ package() {
rm -rf "$pkgdir/dev"
}
-sha256sums=('9d9040ef2be90b6a4db5b68ba5b7bc658cbbcdb8c71c643b8f95373e4a892e55'
- '7342323d2da3724afe745506690a1a5b194f3f0e959811ca320d820bf74c9ffa'
+sha256sums=('9c99714e6d10797a7348c6ffe2561dfcfe5e7659c9d86118d381b8bdb09ae7a6'
'ec8e824e8a29a67be76bf853814ee85e80c4063009e5693d5db8cdb45bd45813'
'61c0e84098e8386e5496dafce559558adef32e2a4a1241a9fa3bd56eab192dcd')
diff --git a/kernels/gradm/usr.patch b/kernels/gradm/usr.patch
deleted file mode 100644
index b3e5e77ab..000000000
--- a/kernels/gradm/usr.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff --git a/gradm_adm.c b/gradm_adm.c
-index bdcfd7d..9681b3c 100644
---- a/gradm_adm.c
-+++ b/gradm_adm.c
-@@ -72,12 +72,13 @@ add_gradm_acl(struct role_acl *role)
-
- gradm_name = gr_strdup(gradm_realpath);
- if (gr_enable && strcmp(gradm_name, GRADM_PATH)) {
-- printf("You are attempting to use a gradm binary other "
-- "than the installed version. Depending on your "
-+ printf("You are attempting to use a gradm binary (%s) other "
-+ "than the installed version (%s). Depending on your "
- "policy, you could be locking yourself out of "
- "your machine by enabling the RBAC system with "
- "this binary. Press \'y\' if you wish to ignore "
-- "this warning, or any other key to cancel.\n>");
-+ "this warning, or any other key to cancel.\n>",
-+ gradm_name, GRADM_PATH);
- if (getchar() != 'y')
- exit(EXIT_FAILURE);
- }
-@@ -259,11 +260,6 @@ static void add_fulllearn_shutdown_acl(void)
- ADD_OBJ("/dev/urandom", "r");
- ADD_OBJ("/dev/random", "r");
- ADD_OBJ("/etc", "r");
-- ADD_OBJ("/bin", "rx");
-- ADD_OBJ("/sbin", "rx");
-- ADD_OBJ("/lib", "rx");
-- ADD_OBJ("/lib32", "rx");
-- ADD_OBJ("/lib64", "rx");
- ADD_OBJ("/usr", "rx");
- ADD_OBJ("/proc", "r");
- ADD_OBJ("/boot", "h");
-@@ -276,9 +272,9 @@ static void add_fulllearn_shutdown_acl(void)
- ADD_OBJ("/proc/slabinfo", "h");
- ADD_OBJ("/proc/modules", "h");
- ADD_OBJ("/proc/kallsyms", "h");
-- ADD_OBJ("/lib/modules", "hs");
-- ADD_OBJ("/lib32/modules", "hs");
-- ADD_OBJ("/lib64/modules", "hs");
-+ ADD_OBJ("/usr/lib/modules", "hs");
-+ ADD_OBJ("/usr/lib32/modules", "hs");
-+ ADD_OBJ("/usr/lib64/modules", "hs");
- ADD_OBJ("/etc/ssh", "h");
- add_cap_acl(current_subject, "-CAP_ALL", NULL);
-
-diff --git a/gradm_analyze.c b/gradm_analyze.c
-index 74ec86f..da365a4 100644
---- a/gradm_analyze.c
-+++ b/gradm_analyze.c
-@@ -778,17 +778,17 @@ analyze_acls(void)
- errs_found++;
- }
-
-- if (!stat("/lib/modules", &fstat) && !check_permission(role, def_acl, "/lib/modules", &chk)) {
-+ if (!stat("/usr/lib/modules", &fstat) && !check_permission(role, def_acl, "/usr/lib/modules", &chk)) {
- fprintf(stderr,
-- "Writing access is allowed by role %s to /lib/modules, the directory which "
-+ "Writing access is allowed by role %s to /usr/lib/modules, the directory which "
- "holds kernel modules.\n\n",
- role->rolename);
- errs_found++;
- }
-
-- if (!stat("/lib64/modules", &fstat) && !check_permission(role, def_acl, "/lib64/modules", &chk)) {
-+ if (!stat("/usr/lib64/modules", &fstat) && !check_permission(role, def_acl, "/usr/lib64/modules", &chk)) {
- fprintf(stderr,
-- "Writing access is allowed by role %s to /lib64/modules, the directory which "
-+ "Writing access is allowed by role %s to /usr/lib64/modules, the directory which "
- "holds kernel modules.\n\n",
- role->rolename);
- errs_found++;
-diff --git a/gradm_defs.h b/gradm_defs.h
-index 961a7b9..56d6378 100644
---- a/gradm_defs.h
-+++ b/gradm_defs.h
-@@ -4,9 +4,9 @@
- #ifndef GRSEC_DIR
- #define GRSEC_DIR "/etc/grsec"
- #endif
--#define GRLEARN_PATH "/sbin/grlearn"
--#define GRADM_PATH "/sbin/gradm"
--#define GRPAM_PATH "/sbin/gradm_pam"
-+#define GRLEARN_PATH "/usr/bin/grlearn"
-+#define GRADM_PATH "/usr/bin/gradm"
-+#define GRPAM_PATH "/usr/bin/gradm_pam"
- #define GRDEV_PATH "/dev/grsec"
- #define GR_POLICY_PATH GRSEC_DIR "/policy"
- #define GR_PW_PATH GRSEC_DIR "/pw"
-diff --git a/gradm_fulllearn.c b/gradm_fulllearn.c
-index 4d10060..6ce744d 100644
---- a/gradm_fulllearn.c
-+++ b/gradm_fulllearn.c
-@@ -449,8 +449,8 @@ static const char *initial_roles_str =
- "\t/proc/slabinfo\th\n"
- "\t/proc/modules\th\n"
- "\t/proc/kallsyms\th\n"
--"\t/lib/modules\ths\n"
--"\t/lib64/modules\ths\n"
-+"\t/usr/lib/modules\ths\n"
-+"\t/usr/lib64/modules\ths\n"
- "\t/etc/ssh\th\n"
- "}\n\n"
- "role admin sA\n"
-@@ -463,10 +463,6 @@ static const char *initial_roles_str =
- "\t/dev/urandom r\n"
- "\t/dev/random r\n"
- "\t/etc r\n"
--"\t/bin rx\n"
--"\t/sbin rx\n"
--"\t/lib rx\n"
--"\t/lib64 rx\n"
- "\t/usr rx\n"
- "\t/proc r\n"
- "\t$grsec_denied\n"
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index 1bc252caf..e17657146 100644
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -41,11 +41,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'0006-rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-no.patch'
'0001-syscalls.h-use-gcc-alias-instead-of-assembler-aliase.patch'
'i8042-fix-aliases.patch'
+ 'module-blacklist.conf'
+ 'sysctl.conf'
+ 'known-exploit-detection.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
'3659d30b1d06dd5b7874ae04c946863b'
'0022d89a923e5e871ba53db1f969e46e'
- 'c7dae5d3fbb294ea14e67915ac86a37a'
+ '21da34d98cc007a78a11660863537c0d'
'd4b95575b9cc32b7ba4ad8624972ddf9'
'5f66bed97a5c37e48eb2f71b2d354b9a'
'2967cecc3af9f954ccc822fd63dca6ff'
@@ -61,6 +64,9 @@ md5sums=('98a8e803e0ed08557f3cdd4d56b0ddc1'
'a724515b350b29c53f20e631c6cf9a14'
'e6fa278c092ad83780e2dd0568e24ca6'
'93dbf73af819b77f03453a9c6de2bb47'
+ 'f93ef6157fbb23820bd5ae08fd3f451e'
+ '0db7629711f4ed76bd1f9da9f97bc4ea'
+ 'cb789bf97bc65fd4cf240d99df9c24c0'
'ac92b702b8497d2be14f96e077a7f48f')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
@@ -118,6 +124,10 @@ prepare() {
# Fix i8042 aliases
patch -p1 -i "${srcdir}/i8042-fix-aliases.patch"
+ # add known exploit detection patch
+ # http://lkml.org/lkml/2013/12/12/358
+ patch -Np1 -i "${srcdir}/known-exploit-detection.patch"
+
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile
sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/kernels/linux-libre-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686
index 5bbdedd4a..07840923d 100644
--- a/kernels/linux-libre-grsec/config.i686
+++ b/kernels/linux-libre-grsec/config.i686
@@ -497,7 +497,7 @@ CONFIG_KEXEC=y
CONFIG_PHYSICAL_START=0x1000000
CONFIG_RELOCATABLE=y
CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_HOTPLUG_CPU=y
# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
diff --git a/kernels/linux-libre-grsec/known-exploit-detection.patch b/kernels/linux-libre-grsec/known-exploit-detection.patch
index 4837a9ce5..7629b4d85 100644
--- a/kernels/linux-libre-grsec/known-exploit-detection.patch
+++ b/kernels/linux-libre-grsec/known-exploit-detection.patch
@@ -1,147 +1,29 @@
-diff --git a/include/linux/exploit.h b/include/linux/exploit.h
-new file mode 100644
-index 0000000..a8df72a
---- /dev/null
-+++ b/include/linux/exploit.h
-@@ -0,0 +1,23 @@
-+#ifndef _LINUX_EXPLOIT_H
-+#define _LINUX_EXPLOIT_H
-+
-+#ifdef CONFIG_EXPLOIT_DETECTION
-+extern void _exploit(const char *id);
-+
-+#define exploit_on(cond, id) \
-+ do { \
-+ if (unlikely(cond)) \
-+ _exploit(id); \
-+ } while (0)
-+
-+#else
-+
-+#define exploit_on(cond, id) \
-+ do { \
-+ } while (0)
-+
-+#endif
-+
-+#define exploit(id) exploit_on(true, id)
-+
-+#endif
-diff --git a/security/Kconfig b/security/Kconfig
-index e9c6ac7..a828dfb 100644
---- a/security/Kconfig
-+++ b/security/Kconfig
-@@ -167,5 +167,17 @@ config DEFAULT_SECURITY
- default "yama" if DEFAULT_SECURITY_YAMA
- default "" if DEFAULT_SECURITY_DAC
-
--endmenu
-+config EXPLOIT_DETECTION
-+ bool "Known exploit detection"
-+ depends on PRINTK
-+ default y
-+ help
-+ This option enables the detection of users/programs who attempt to
-+ break into the kernel using publicly known (past) exploits.
-+
-+ Upon detection, a message will be printed in the kernel log.
-
-+ The runtime overhead of enabling this option is extremely small, so
-+ you are recommended to say Y.
-+
-+endmenu
-diff --git a/security/Makefile b/security/Makefile
-index c26c81e..d152a1d 100644
---- a/security/Makefile
-+++ b/security/Makefile
-@@ -28,3 +28,5 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o
- # Object integrity file lists
- subdir-$(CONFIG_INTEGRITY) += integrity
- obj-$(CONFIG_INTEGRITY) += integrity/built-in.o
-+
-+obj-$(CONFIG_EXPLOIT_DETECTION) += exploit.o
-diff --git a/security/exploit.c b/security/exploit.c
-new file mode 100644
-index 0000000..a732613
---- /dev/null
-+++ b/security/exploit.c
-@@ -0,0 +1,28 @@
-+#include <linux/cred.h>
+diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
+index 3432443..f5af562 100644
+--- a/arch/x86/kernel/msr.c
++++ b/arch/x86/kernel/msr.c
+@@ -38,6 +38,7 @@
+ #include <linux/uaccess.h>
+ #include <linux/gfp.h>
+ #include <linux/grsecurity.h>
+#include <linux/exploit.h>
-+#include <linux/printk.h>
-+#include <linux/ratelimit.h>
-+#include <linux/sched.h>
-+
-+void _exploit(const char *id)
-+{
-+ /*
-+ * This function needs to be super defensive/conservative, since
-+ * userspace can easily get to it from several different contexts.
-+ * We don't want it to become an attack vector in itself!
-+ *
-+ * We can assume that we're in process context, but spinlocks may
-+ * be held, etc.
-+ */
-+
-+ struct task_struct *task = current;
-+ pid_t pid = task_pid_nr(task);
-+ uid_t uid = from_kuid(&init_user_ns, current_uid());
-+ char comm[sizeof(task->comm)];
-+
-+ get_task_comm(comm, task);
-+
-+ pr_warn_ratelimited("warning: possible %s exploit attempt by pid=%u uid=%u comm=%s\n",
-+ id, pid, uid, comm);
-+}
-+EXPORT_SYMBOL(_exploit);
-diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
-index 75cef3f..65811d4 100644
---- a/include/uapi/linux/audit.h
-+++ b/include/uapi/linux/audit.h
-@@ -131,6 +131,7 @@
- #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */
- #define AUDIT_ANOM_ABEND 1701 /* Process ended abnormally */
- #define AUDIT_ANOM_LINK 1702 /* Suspicious use of file links */
-+#define AUDIT_ANOM_EXPLOIT 1703 /* Known exploit attempt */
- #define AUDIT_INTEGRITY_DATA 1800 /* Data integrity verification */
- #define AUDIT_INTEGRITY_METADATA 1801 /* Metadata integrity verification */
- #define AUDIT_INTEGRITY_STATUS 1802 /* Integrity enable status */
-diff --git a/security/exploit.c b/security/exploit.c
-index a732613..3d8ee5b 100644
---- a/security/exploit.c
-+++ b/security/exploit.c
-@@ -1,3 +1,4 @@
-+#include <linux/audit.h>
- #include <linux/cred.h>
- #include <linux/exploit.h>
- #include <linux/printk.h>
-@@ -19,9 +20,24 @@ void _exploit(const char *id)
- pid_t pid = task_pid_nr(task);
- uid_t uid = from_kuid(&init_user_ns, current_uid());
- char comm[sizeof(task->comm)];
-+#ifdef CONFIG_AUDIT
-+ struct audit_buffer *ab;
-+#endif
- get_task_comm(comm, task);
+ #include <asm/processor.h>
+ #include <asm/msr.h>
+@@ -184,8 +185,10 @@ static int msr_open(struct inode *inode, struct file *file)
+ unsigned int cpu = iminor(file_inode(file));
+ struct cpuinfo_x86 *c;
-+#ifdef CONFIG_AUDIT
-+ ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_ANOM_EXPLOIT);
-+ if (ab) {
-+ audit_log_format(ab, "exploit id=%s pid=%u uid=%u auid=%u ses=%u comm=",
-+ id, pid, uid,
-+ from_kuid(&init_user_ns, audit_get_loginuid(task)),
-+ audit_get_sessionid(task));
-+ audit_log_untrustedstring(ab, comm);
-+ audit_log_end(ab);
+- if (!capable(CAP_SYS_RAWIO))
++ if (!capable(CAP_SYS_RAWIO)) {
++ exploit("CVE-2013-0268");
+ return -EPERM;
+ }
-+#endif
-+
- pr_warn_ratelimited("warning: possible %s exploit attempt by pid=%u uid=%u comm=%s\n",
- id, pid, uid, comm);
- }
+
+ if (cpu >= nr_cpu_ids || !cpu_online(cpu))
+ return -ENXIO; /* No such CPU */
diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
-index bf34577..48490c1 100644
+index ee52ddd..be4c296 100644
--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
@@ -32,6 +32,7 @@
@@ -150,9 +32,9 @@ index bf34577..48490c1 100644
#include <linux/dma_remapping.h>
+#include <linux/exploit.h>
- struct eb_objects {
- struct list_head objects;
-@@ -785,8 +786,10 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
+ #define __EXEC_OBJECT_HAS_PIN (1<<31)
+ #define __EXEC_OBJECT_HAS_FENCE (1<<30)
+@@ -878,8 +879,10 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
* the worst case where we need to allocate the entire
* relocation tree as a single array.
*/
@@ -164,30 +46,6 @@ index bf34577..48490c1 100644
relocs_total += exec[i].relocation_count;
length = exec[i].relocation_count *
-diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
-index 88458fa..fad04f1 100644
---- a/arch/x86/kernel/msr.c
-+++ b/arch/x86/kernel/msr.c
-@@ -37,6 +37,7 @@
- #include <linux/notifier.h>
- #include <linux/uaccess.h>
- #include <linux/gfp.h>
-+#include <linux/exploit.h>
-
- #include <asm/processor.h>
- #include <asm/msr.h>
-@@ -174,8 +175,10 @@ static int msr_open(struct inode *inode, struct file *file)
- unsigned int cpu = iminor(file_inode(file));
- struct cpuinfo_x86 *c;
-
-- if (!capable(CAP_SYS_RAWIO))
-+ if (!capable(CAP_SYS_RAWIO)) {
-+ exploit("CVE-2013-0268");
- return -EPERM;
-+ }
-
- if (cpu >= nr_cpu_ids || !cpu_online(cpu))
- return -ENXIO; /* No such CPU */
diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c
index b1ce4c7..2fe83f0 100644
--- a/fs/hfs/trans.c
@@ -212,50 +70,6 @@ index b1ce4c7..2fe83f0 100644
dst = out;
dstlen = HFS_MAX_NAMELEN;
if (nls_io) {
-diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 13fb113..df7a51a 100644
---- a/kernel/user_namespace.c
-+++ b/kernel/user_namespace.c
-@@ -22,6 +22,7 @@
- #include <linux/ctype.h>
- #include <linux/projid.h>
- #include <linux/fs_struct.h>
-+#include <linux/exploit.h>
-
- static struct kmem_cache *user_ns_cachep __read_mostly;
-
-@@ -806,11 +807,15 @@ static bool new_idmap_permitted(const struct file *file,
- kuid_t uid = make_kuid(ns->parent, id);
- if (uid_eq(uid, file->f_cred->fsuid))
- return true;
-+
-+ exploit_on(uid_eq(uid, current_fsuid()), "CVE-2013-1959");
- }
- else if (cap_setid == CAP_SETGID) {
- kgid_t gid = make_kgid(ns->parent, id);
- if (gid_eq(gid, file->f_cred->fsgid))
- return true;
-+
-+ exploit_on(gid_eq(gid, current_fsgid()), "CVE-2013-1959");
- }
- }
-
-@@ -822,9 +827,12 @@ static bool new_idmap_permitted(const struct file *file,
- * (CAP_SETUID or CAP_SETGID) over the parent user namespace.
- * And the opener of the id file also had the approprpiate capability.
- */
-- if (ns_capable(ns->parent, cap_setid) &&
-- file_ns_capable(file, ns->parent, cap_setid))
-- return true;
-+ if (ns_capable(ns->parent, cap_setid)) {
-+ if (file_ns_capable(file, ns->parent, cap_setid))
-+ return true;
-+
-+ exploit("CVE-2013-1959");
-+ }
-
- return false;
- }
diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
index 968ce41..5f47a1a 100644
--- a/fs/hfsplus/catalog.c
@@ -304,8 +118,49 @@ index 4a4fea0..2d5e283 100644
err = -EIO;
goto out;
}
+diff --git a/include/linux/exploit.h b/include/linux/exploit.h
+new file mode 100644
+index 0000000..a8df72a
+--- /dev/null
++++ b/include/linux/exploit.h
+@@ -0,0 +1,23 @@
++#ifndef _LINUX_EXPLOIT_H
++#define _LINUX_EXPLOIT_H
++
++#ifdef CONFIG_EXPLOIT_DETECTION
++extern void _exploit(const char *id);
++
++#define exploit_on(cond, id) \
++ do { \
++ if (unlikely(cond)) \
++ _exploit(id); \
++ } while (0)
++
++#else
++
++#define exploit_on(cond, id) \
++ do { \
++ } while (0)
++
++#endif
++
++#define exploit(id) exploit_on(true, id)
++
++#endif
+diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
+index 44b05a0..0a820b4 100644
+--- a/include/uapi/linux/audit.h
++++ b/include/uapi/linux/audit.h
+@@ -134,6 +134,7 @@
+ #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */
+ #define AUDIT_ANOM_ABEND 1701 /* Process ended abnormally */
+ #define AUDIT_ANOM_LINK 1702 /* Suspicious use of file links */
++#define AUDIT_ANOM_EXPLOIT 1703 /* Known exploit attempt */
+ #define AUDIT_INTEGRITY_DATA 1800 /* Data integrity verification */
+ #define AUDIT_INTEGRITY_METADATA 1801 /* Metadata integrity verification */
+ #define AUDIT_INTEGRITY_STATUS 1802 /* Integrity enable status */
diff --git a/kernel/events/core.c b/kernel/events/core.c
-index 953c143..32b9383 100644
+index 11b21f0..a881843 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -39,6 +39,7 @@
@@ -316,7 +171,7 @@ index 953c143..32b9383 100644
#include "internal.h"
-@@ -5721,6 +5722,7 @@ static void sw_perf_event_destroy(struct perf_event *event)
+@@ -5772,6 +5773,7 @@ static void sw_perf_event_destroy(struct perf_event *event)
static int perf_swevent_init(struct perf_event *event)
{
u64 event_id = event->attr.config;
@@ -324,8 +179,52 @@ index 953c143..32b9383 100644
if (event->attr.type != PERF_TYPE_SOFTWARE)
return -ENOENT;
+diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
+index 583473e..4614b6e 100644
+--- a/kernel/user_namespace.c
++++ b/kernel/user_namespace.c
+@@ -22,6 +22,7 @@
+ #include <linux/ctype.h>
+ #include <linux/projid.h>
+ #include <linux/fs_struct.h>
++#include <linux/exploit.h>
+
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+
+@@ -827,11 +828,15 @@ static bool new_idmap_permitted(const struct file *file,
+ kuid_t uid = make_kuid(ns->parent, id);
+ if (uid_eq(uid, file->f_cred->fsuid))
+ return true;
++
++ exploit_on(uid_eq(uid, current_fsuid()), "CVE-2013-1959");
+ }
+ else if (cap_setid == CAP_SETGID) {
+ kgid_t gid = make_kgid(ns->parent, id);
+ if (gid_eq(gid, file->f_cred->fsgid))
+ return true;
++
++ exploit_on(gid_eq(gid, current_fsgid()), "CVE-2013-1959");
+ }
+ }
+
+@@ -843,9 +848,12 @@ static bool new_idmap_permitted(const struct file *file,
+ * (CAP_SETUID or CAP_SETGID) over the parent user namespace.
+ * And the opener of the id file also had the approprpiate capability.
+ */
+- if (ns_capable(ns->parent, cap_setid) &&
+- file_ns_capable(file, ns->parent, cap_setid))
+- return true;
++ if (ns_capable(ns->parent, cap_setid)) {
++ if (file_ns_capable(file, ns->parent, cap_setid))
++ return true;
++
++ exploit("CVE-2013-1959");
++ }
+
+ return false;
+ }
diff --git a/net/core/sock.c b/net/core/sock.c
-index 0b39e7a..c16246f 100644
+index 997c88b..5fc9f05 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -117,6 +117,7 @@
@@ -336,7 +235,7 @@ index 0b39e7a..c16246f 100644
#include <asm/uaccess.h>
-@@ -1753,8 +1754,10 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
+@@ -1758,8 +1759,10 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
int i;
err = -EMSGSIZE;
@@ -348,3 +247,86 @@ index 0b39e7a..c16246f 100644
timeo = sock_sndtimeo(sk, noblock);
while (!skb) {
+diff --git a/security/Kconfig b/security/Kconfig
+index 0ebde71..9afec5d 100644
+--- a/security/Kconfig
++++ b/security/Kconfig
+@@ -1120,5 +1120,17 @@ config DEFAULT_SECURITY
+ default "yama" if DEFAULT_SECURITY_YAMA
+ default "" if DEFAULT_SECURITY_DAC
+
+-endmenu
++config EXPLOIT_DETECTION
++ bool "Known exploit detection"
++ depends on PRINTK
++ default y
++ help
++ This option enables the detection of users/programs who attempt to
++ break into the kernel using publicly known (past) exploits.
+
++ Upon detection, a message will be printed in the kernel log.
++
++ The runtime overhead of enabling this option is extremely small, so
++ you are recommended to say Y.
++
++endmenu
+diff --git a/security/Makefile b/security/Makefile
+index a5918e0..abc70cd 100644
+--- a/security/Makefile
++++ b/security/Makefile
+@@ -27,3 +27,5 @@ obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o
+ # Object integrity file lists
+ subdir-$(CONFIG_INTEGRITY) += integrity
+ obj-$(CONFIG_INTEGRITY) += integrity/built-in.o
++
++obj-$(CONFIG_EXPLOIT_DETECTION) += exploit.o
+diff --git a/security/exploit.c b/security/exploit.c
+new file mode 100644
+index 0000000..3d8ee5b
+--- /dev/null
++++ b/security/exploit.c
+@@ -0,0 +1,44 @@
++#include <linux/audit.h>
++#include <linux/cred.h>
++#include <linux/exploit.h>
++#include <linux/printk.h>
++#include <linux/ratelimit.h>
++#include <linux/sched.h>
++
++void _exploit(const char *id)
++{
++ /*
++ * This function needs to be super defensive/conservative, since
++ * userspace can easily get to it from several different contexts.
++ * We don't want it to become an attack vector in itself!
++ *
++ * We can assume that we're in process context, but spinlocks may
++ * be held, etc.
++ */
++
++ struct task_struct *task = current;
++ pid_t pid = task_pid_nr(task);
++ uid_t uid = from_kuid(&init_user_ns, current_uid());
++ char comm[sizeof(task->comm)];
++#ifdef CONFIG_AUDIT
++ struct audit_buffer *ab;
++#endif
++
++ get_task_comm(comm, task);
++
++#ifdef CONFIG_AUDIT
++ ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_ANOM_EXPLOIT);
++ if (ab) {
++ audit_log_format(ab, "exploit id=%s pid=%u uid=%u auid=%u ses=%u comm=",
++ id, pid, uid,
++ from_kuid(&init_user_ns, audit_get_loginuid(task)),
++ audit_get_sessionid(task));
++ audit_log_untrustedstring(ab, comm);
++ audit_log_end(ab);
++ }
++#endif
++
++ pr_warn_ratelimited("warning: possible %s exploit attempt by pid=%u uid=%u comm=%s\n",
++ id, pid, uid, comm);
++}
++EXPORT_SYMBOL(_exploit);
diff --git a/kernels/xen/ChangeLog b/kernels/xen/ChangeLog
index 63c33c223..8f9ef80fe 100644
--- a/kernels/xen/ChangeLog
+++ b/kernels/xen/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-19 David Sutton <kantras - gmail.com>
+ * 4.3.2-1:
+ New upstream release
+ Removed unnecessary security patches (since now integrated into source)
+ Attempts to pull down additional required source file to ensure not corrupted
+ Added missing dependancy libseccomp
+
2013-11-25 David Sutton <kantras - gmail.com>
* 4.3.1-2:
Changed bluez dependancy from bluez4 to bluez
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
index 6ff16c8cd..e19b5c06f 100644
--- a/kernels/xen/PKGBUILD
+++ b/kernels/xen/PKGBUILD
@@ -5,8 +5,8 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=xen
-pkgver=4.3.1
-pkgrel=2
+pkgver=4.3.2
+pkgrel=1
pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)"
arch=(i686 x86_64)
url="http://www.xenproject.org/"
@@ -21,6 +21,15 @@ options=(!buildflags !strip)
install=$pkgname.install
changelog=ChangeLog
source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
+ http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz
+ http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz
+ http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz
+ http://xenbits.xen.org/xen-extfiles/newlib-1.16.0.tar.gz
+ http://xenbits.xen.org/xen-extfiles/pciutils-2.2.9.tar.bz2
+ http://xenbits.xen.org/xen-extfiles/polarssl-1.1.4-gpl.tgz
+ http://xenbits.xen.org/xen-extfiles/grub-0.97.tar.gz
+ http://xenbits.xen.org/xen-extfiles/tpm_emulator-0.7.4.tar.gz
+ http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2
xen.install
09_xen
bios_workaround.patch
@@ -38,11 +47,27 @@ source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
conf.d-xenstored
tmpfiles.d-$pkgname.conf
grub.conf
- xsa73-4.3-unstable.patch
- xsa75-4.3-unstable.patch
- xsa78.patch
$pkgname.conf)
-sha256sums=('3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd'
+noextract=(lwip-1.3.0.tar.gz
+ zlib-1.2.3.tar.gz
+ newlib-1.16.0.tar.gz
+ pciutils-2.2.9.tar.bz2
+ polarssl-1.1.4-gpl.tgz
+ grub-0.97.tar.gz
+ tpm_emulator-0.7.4.tar.gz
+ gmp-4.3.2.tar.bz2
+ ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz)
+
+sha256sums=('17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69'
+ '632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c'
+ '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f'
+ '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e'
+ 'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07'
+ 'f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24'
+ '2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6'
+ '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b'
+ '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459'
+ '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775'
'0f6ebf3437974d1708c9e74005b976479ab8ff28adec394208153bf404b411f8'
'74a957d783458b7481c7a09c3ed94ec2e07ee7943e4b7fa33d3684b8d585139e'
'914cc983da1fe89ff125d751c979b4968f8952da21b19b900fcd4e6b33e14552'
@@ -60,11 +85,17 @@ sha256sums=('3b5b7cc508b1739753585b5c25635471cdcef680e8770a78bf6ef9333d26a9fd'
'0e1ad0a6a72b0c22025a556c23235a8f663427f1e769c45fe39d1c525bf82eff'
'40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
'78398fb27edfedb432b5f4e4bf87b5dbee41f180c623d29f758234a49d8bf4b4'
- '18f62049d714c3460df1f698663e42d0f8a16b9b4f62e66b40fdea635a348be5'
- '4bac312d49a4a88633af652c09128ba1bba2ca97e2e56e5fe7da6e4671c56ccb'
- 'bb13b280bb456c1d7c8f468e23e336e6b2d06eb364c6823f1b426fcfe09f6ed3'
'50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c')
-sha512sums=('f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf37835528aca33a0f9e04c82d5f8c4ba79c03a1780d2b72cbb90cc26f77275'
+sha512sums=('ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302'
+ 'c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4'
+ '1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d'
+ '021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e'
+ '40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3'
+ '2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5'
+ '88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad'
+ 'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb'
+ '4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35'
+ '2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf'
'78bfb62166ffcf136e12985809b3f412e0145a7f17388a559071f644970ccdfd2a02fe9aa4a180069b923c2e4354b061a4057096de856497f10d9cac57eae4b3'
'8667a97e10f09c5ce5ba604e38a073b7d7944f4d24c5c78a7235443b65a8cc7b6e7de90e40aa335bb17fda0858d6b517ba1e8b5a0bd6bba4ad75ad44b73f6c9c'
'7118bf02ff5338e70b3f27f8ea390cd05ea37a4ceabb4adc9d32fc57329e35e98330f0e865261dd4e670436e1a725832598888d44b1e2b17b351f59318860878'
@@ -82,9 +113,6 @@ sha512sums=('f5250ad5ad3defc5dc1207eb6208a3928128ef57ac4162018bd92b750dc1df1eaaf
'c996d48737ad31528b0b2b1379e3ebae948d290de9ddc71f33c7c56f0634466bc7afb2eab847e851c19e3c13bb99468a0778d908606486959a40ff3272189bd3'
'53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef'
'04000a802e96c11929cb94c9a2bcafbb4307620192388441d979ea85836c3395954dea53d449c1cc25c3a0a30c49d318b8de59a053c6254f5a81e87864648a9c'
- '78c94d3e473abaf857213754c7f0ef1a0dd06354cd137d1567a48d92b4106cbefd112f1dcecc90bc1f8c75d76a0e8a3425408f777044de8ec754bcda32bb7f97'
- '4fb6f678dccc9f23f2c3b27617718bc6c0a87505f7483f4d07563b7b2cc37d57d3b5ef658ee5867258916c5c2695a5086cc7790196aed85357c6d3168c06749b'
- 'b55cb25f88acc348e6777063f241269730f06482fe430706ac500cbd7127bc7c70188f84a282dc8a0369cc838999d47a09afc33fc9f24b5c214bdf59352c414c'
'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b')
prepare() {
@@ -101,14 +129,19 @@ prepare() {
# Uncomment line below if you want to enable ATI Passthrough support (some reported successes)
#patch -Np1 -i ../ati-passthrough.patch
- # Add Security Patches
- patch -Np1 -i ../xsa73-4.3-unstable.patch
- patch -Np1 -i ../xsa75-4.3-unstable.patch
- patch -Np1 -i ../xsa78.patch
-
# Fix Install Paths
sed -i 's:/sbin:/bin:' config/StdGNU.mk
+ # Copy supporting tarballs into place
+ cp ../lwip-1.3.0.tar.gz stubdom/
+ cp ../zlib-1.2.3.tar.gz stubdom/
+ cp ../newlib-1.16.0.tar.gz stubdom/
+ cp ../pciutils-2.2.9.tar.bz2 stubdom/
+ cp ../polarssl-1.1.4-gpl.tgz stubdom/
+ cp ../grub-0.97.tar.gz stubdom/
+ cp ../tpm_emulator-0.7.4.tar.gz stubdom/
+ cp ../gmp-4.3.2.tar.bz2 stubdom/
+
}
build() {
@@ -157,10 +190,8 @@ package() {
fi
# Compress and move syms file to a different directory
- if [ "$CARCH" == "x86_64" ]; then
- gzip boot/$pkgname-syms-$pkgver
- mv boot/$pkgname-syms-$pkgver.gz usr/share/xen
- fi
+ gzip boot/$pkgname-syms-$pkgver
+ mv boot/$pkgname-syms-$pkgver.gz usr/share/xen
##### Kill unwanted stuff #####
# hypervisor symlinks
diff --git a/kernels/xen/xsa73-4.3-unstable.patch b/kernels/xen/xsa73-4.3-unstable.patch
deleted file mode 100644
index aa36b40a1..000000000
--- a/kernels/xen/xsa73-4.3-unstable.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 068bfa76bbd52430e65853375e1d5db99d193e2f Mon Sep 17 00:00:00 2001
-From: Andrew Cooper <andrew.cooper3@citrix.com>
-Date: Thu, 31 Oct 2013 20:49:00 +0000
-Subject: [PATCH] gnttab: correct locking order reversal
-
-Coverity ID 1087189
-
-Correct a lock order reversal between a domains page allocation and grant
-table locks.
-
-This is CVE-2013-4494 / XSA-73.
-
-Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
-
-Consolidate error handling.
-
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-by: Keir Fraser <keir@xen.org>
-Tested-by: Matthew Daley <mattjd@gmail.com>
----
- xen/common/grant_table.c | 52 +++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 44 insertions(+), 8 deletions(-)
-
-diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
-index f42bc7a..48df928 100644
---- a/xen/common/grant_table.c
-+++ b/xen/common/grant_table.c
-@@ -1518,6 +1518,8 @@ gnttab_transfer(
-
- for ( i = 0; i < count; i++ )
- {
-+ bool_t okay;
-+
- if (i && hypercall_preempt_check())
- return i;
-
-@@ -1626,16 +1628,18 @@ gnttab_transfer(
- * pages when it is dying.
- */
- if ( unlikely(e->is_dying) ||
-- unlikely(e->tot_pages >= e->max_pages) ||
-- unlikely(!gnttab_prepare_for_transfer(e, d, gop.ref)) )
-+ unlikely(e->tot_pages >= e->max_pages) )
- {
-- if ( !e->is_dying )
-- gdprintk(XENLOG_INFO, "gnttab_transfer: "
-- "Transferee has no reservation "
-- "headroom (%d,%d) or provided a bad grant ref (%08x) "
-- "or is dying (%d)\n",
-- e->tot_pages, e->max_pages, gop.ref, e->is_dying);
- spin_unlock(&e->page_alloc_lock);
-+
-+ if ( e->is_dying )
-+ gdprintk(XENLOG_INFO, "gnttab_transfer: "
-+ "Transferee (d%d) is dying\n", e->domain_id);
-+ else
-+ gdprintk(XENLOG_INFO, "gnttab_transfer: "
-+ "Transferee (d%d) has no headroom (tot %u, max %u)\n",
-+ e->domain_id, e->tot_pages, e->max_pages);
-+
- rcu_unlock_domain(e);
- put_gfn(d, gop.mfn);
- page->count_info &= ~(PGC_count_mask|PGC_allocated);
-@@ -1647,6 +1651,38 @@ gnttab_transfer(
- /* Okay, add the page to 'e'. */
- if ( unlikely(domain_adjust_tot_pages(e, 1) == 1) )
- get_knownalive_domain(e);
-+
-+ /*
-+ * We must drop the lock to avoid a possible deadlock in
-+ * gnttab_prepare_for_transfer. We have reserved a page in e so can
-+ * safely drop the lock and re-aquire it later to add page to the
-+ * pagelist.
-+ */
-+ spin_unlock(&e->page_alloc_lock);
-+ okay = gnttab_prepare_for_transfer(e, d, gop.ref);
-+ spin_lock(&e->page_alloc_lock);
-+
-+ if ( unlikely(!okay) || unlikely(e->is_dying) )
-+ {
-+ bool_t drop_dom_ref = (domain_adjust_tot_pages(e, -1) == 0);
-+
-+ spin_unlock(&e->page_alloc_lock);
-+
-+ if ( okay /* i.e. e->is_dying due to the surrounding if() */ )
-+ gdprintk(XENLOG_INFO, "gnttab_transfer: "
-+ "Transferee (d%d) is now dying\n", e->domain_id);
-+
-+ if ( drop_dom_ref )
-+ put_domain(e);
-+ rcu_unlock_domain(e);
-+
-+ put_gfn(d, gop.mfn);
-+ page->count_info &= ~(PGC_count_mask|PGC_allocated);
-+ free_domheap_page(page);
-+ gop.status = GNTST_general_error;
-+ goto copyback;
-+ }
-+
- page_list_add_tail(page, &e->page_list);
- page_set_owner(page, e);
-
---
-1.7.10.4
-
diff --git a/kernels/xen/xsa75-4.3-unstable.patch b/kernels/xen/xsa75-4.3-unstable.patch
deleted file mode 100644
index 6c0c5bca1..000000000
--- a/kernels/xen/xsa75-4.3-unstable.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-nested VMX: VMLANUCH/VMRESUME emulation must check permission first thing
-
-Otherwise uninitialized data may be used, leading to crashes.
-
-This is XSA-75.
-
-Reported-and-tested-by: Jeff Zimmerman <Jeff_Zimmerman@McAfee.com>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-Reviewed-and-tested-by: Andrew Cooper <andrew.cooper3@citrix.com>
-
---- a/xen/arch/x86/hvm/vmx/vvmx.c
-+++ b/xen/arch/x86/hvm/vmx/vvmx.c
-@@ -1508,15 +1508,10 @@ static void clear_vvmcs_launched(struct
- }
- }
-
--int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs)
-+static int nvmx_vmresume(struct vcpu *v, struct cpu_user_regs *regs)
- {
- struct nestedvmx *nvmx = &vcpu_2_nvmx(v);
- struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
-- int rc;
--
-- rc = vmx_inst_check_privilege(regs, 0);
-- if ( rc != X86EMUL_OKAY )
-- return rc;
-
- /* check VMCS is valid and IO BITMAP is set */
- if ( (nvcpu->nv_vvmcxaddr != VMCX_EADDR) &&
-@@ -1535,6 +1530,10 @@ int nvmx_handle_vmresume(struct cpu_user
- struct vcpu *v = current;
- struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
- struct nestedvmx *nvmx = &vcpu_2_nvmx(v);
-+ int rc = vmx_inst_check_privilege(regs, 0);
-+
-+ if ( rc != X86EMUL_OKAY )
-+ return rc;
-
- if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR )
- {
-@@ -1554,10 +1553,13 @@ int nvmx_handle_vmresume(struct cpu_user
- int nvmx_handle_vmlaunch(struct cpu_user_regs *regs)
- {
- bool_t launched;
-- int rc;
- struct vcpu *v = current;
- struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
- struct nestedvmx *nvmx = &vcpu_2_nvmx(v);
-+ int rc = vmx_inst_check_privilege(regs, 0);
-+
-+ if ( rc != X86EMUL_OKAY )
-+ return rc;
-
- if ( vcpu_nestedhvm(v).nv_vvmcxaddr == VMCX_EADDR )
- {
diff --git a/kernels/xen/xsa78.patch b/kernels/xen/xsa78.patch
deleted file mode 100644
index 180506cdd..000000000
--- a/kernels/xen/xsa78.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-VT-d: fix TLB flushing in dma_pte_clear_one()
-
-The third parameter of __intel_iommu_iotlb_flush() is to indicate
-whether the to be flushed entry was a present one. A few lines before,
-we bailed if !dma_pte_present(*pte), so there's no need to check the
-flag here again - we can simply always pass TRUE here.
-
-This is CVE-2013-6375 / XSA-78.
-
-Suggested-by: Cheng Yueqiang <yqcheng.2008@phdis.smu.edu.sg>
-Signed-off-by: Jan Beulich <jbeulich@suse.com>
-
---- a/xen/drivers/passthrough/vtd/iommu.c
-+++ b/xen/drivers/passthrough/vtd/iommu.c
-@@ -646,7 +646,7 @@ static void dma_pte_clear_one(struct dom
- iommu_flush_cache_entry(pte, sizeof(struct dma_pte));
-
- if ( !this_cpu(iommu_dont_flush_iotlb) )
-- __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K , 0, 1);
-+ __intel_iommu_iotlb_flush(domain, addr >> PAGE_SHIFT_4K, 1, 1);
-
- unmap_vtd_domain_page(page);
-
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index eb98f4aa9..01f21dc28 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103233 2013-12-30 17:04:09Z tredaelli $
+# $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Andy Weidenbaum <archbaum@gmail.com>
_pkgname=bfgminer
pkgname=bfgminer-libre
-pkgver=3.9.0
+pkgver=3.10.0
pkgrel=1
pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ url='https://bitcointalk.org/index.php?topic=168174.0'
license=('GPL3')
source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
remove-dangerous-rpath.patch)
-sha256sums=('4250ec5ccb0fd9bd8c6d35608b13b3e2f07857e46abc09b94514a2fd2af80f40'
+sha256sums=('12458aed84abc4a953532fe0645772492701e5d627f56f62d382aa0f458a10d5'
'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
prepare() {
@@ -31,12 +31,12 @@ build() {
cd "$srcdir"/$_pkgname-$pkgver
./configure --prefix=/usr \
- --enable-cpumining \
- --enable-bfsb \
- --enable-metabank \
- --enable-scrypt \
- --enable-opencl \
- --with-udevrulesdir=/usr/lib/udev/rules.d
+ --enable-cpumining \
+ --enable-bfsb \
+ --enable-metabank \
+ --enable-scrypt \
+ --enable-opencl \
+ --with-udevrulesdir=/usr/lib/udev/rules.d
# --enable-knc (FS#33640)
make
}
diff --git a/libre/handbrake-svn/PKGBUILD b/libre/handbrake-svn/PKGBUILD
new file mode 100644
index 000000000..5166674d2
--- /dev/null
+++ b/libre/handbrake-svn/PKGBUILD
@@ -0,0 +1,171 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
+# Contributor (Arch): Sebastien Piccand <sebcactus gmail com>
+
+pkgname=('handbrake-svn' 'handbrake-cli-svn')
+_pkgver=0.9.9.1
+pkgver=6019
+url="http://handbrake.fr/"
+license=('GPL')
+
+pkgrel=5
+arch=('i686' 'x86_64')
+makedepends=('intltool' 'python2' 'gcc-libs' 'libnotify'
+ 'gst-plugins-base' 'gtk3' 'dbus-glib')
+
+# The format is: handbrake_name:[system_name|tarball]
+# This list should pretty closely correspond to `grep contrib/ make/include/main.defs`
+# _config_loc
+# format: "ignored:pacman_pkgname"
+# For packages that optionally use the system's versions. The
+# build system is not modified, in order that if the module version
+# is used, it fails early (assuming the network is down).
+# _config_mod
+# format: "module_name:file_name"
+# For packages that are built as modules.
+# _config_sys
+# format: "module_name:pacman_pkgname"
+# For modules that we *force* to be the system versions.
+# _config_ign
+# format: "ignored"
+# For modules that are optional, but we don't want to download.
+declare -ag _contrib_{loc,sys,mod,ign}
+_contrib_loc+=('pkgconfig') # FEATURE.local_pkgconfig
+_contrib_loc+=('autoconf' # FEATURE.local_autotools
+ 'automake'
+ 'libtool'
+ 'm4')
+# a52dec is patched to make private things public
+_contrib_mod+=('a52dec:a52dec-0.7.4.tar.gz') # always
+_contrib_loc+=('bzip2') # HAS.bz2
+_contrib_loc+=('fontconfig'
+ 'freetype:freetype2'
+ 'fribidi'
+ 'libxml2'
+ 'libass'
+ 'libogg'
+ 'libvorbis'
+ 'libtheora'
+ 'libsamplerate')
+#_contrib_sys+=('fdk-aac:libfdk-aac') # FEATURE.fdk_aac
+_contrib_mod+=('fdk-aac:fdk-aac-v0.1.1-6-gbae4553.tar.bz2') # FEATURE.fdk_aac
+_contrib_ign+=('faac') # FEATURE.faac
+#_contrib_sys+=('mp4v2:libmp4v2') # FEATURE.mp4v2
+_contrib_mod+=('mp4v2:mp4v2-trunk-r355.tar.bz2') # FEATURE.mp4v2
+# libmkv is patched to add features
+_contrib_mod+=('libmkv:libmkv-0.6.5-0-g82075ae.tar.gz') # FEATURE.libmkv
+_contrib_sys+=('lame') # always
+# Using system ffmpeg will break PGS subtitle processing
+# https://forum.handbrake.fr/viewtopic.php?f=13&t=27581
+_contrib_mod+=('ffmpeg:libav-v10_alpha2.tar.bz2') # always
+_contrib_sys+=('libdvdread') # always
+# I don't even know, but system libdvdnav doesn't work
+_contrib_mod+=('libdvdnav:libdvdnav-a5c1325.tar.bz2') # always
+_contrib_sys+=('libbluray') # # always
+_contrib_ign+=('libmfx') # FEATURE.qsv
+_contrib_sys+=('x264') # always
+_contrib_loc+=('zlib') # HAS.libz
+_contrib_loc+=('yasm') # FEATURE.local_yasm
+
+makedepends+=("${_contrib_loc[@]#*:}" "${_contrib_sys[@]#*:}")
+
+source=("https://repo.parabolagnulinux.org/other/$pkgname/HandBrake-svn${pkgver}.tar.gz")
+for _f in "${_contrib_mod[@]#*:}"; do
+ source+=("http://download.handbrake.fr/handbrake/contrib/${_f}")
+ noextract+=("${_f}")
+done; unset _f
+sha256sums=('098c2e5cad18784d3b9ac164891c87770eba055e6508bbc70d73680862473208'
+ '54981ab08fc09a675b9924372cf0cca5aa5363b918c4c19065c2d40e2858be47'
+ 'f08584d59a02db5facf548ae860c64d2870db63477f605af763c161a1508dcbc'
+ '5b7d4e62df506b1246463da82cc2f02415eb462e6ccd5848f98f5cdcfc1f3d4f'
+ '7314a296c68f42b826164074a96e247e52d8ef9287c21ebc5fe1bf9e73643e97'
+ '83e7f34585160a90f3c218a485e02a22a54b2fd4f1b025589bd210820dcf637e'
+ 'd190ce2ca4d1d9878145acd9c1b8ac76636c3b6d12066e8cc87ee674f943fb2a')
+
+mksource=("HandBrake-svn${pkgver}::svn://svn.handbrake.fr/HandBrake/trunk")
+mkmd5sums=('SKIP')
+
+prepare() {
+ cd "$srcdir/HandBrake-svn$pkgver"
+
+ # Use Python 2
+ sed -i 's/python /python2 /' gtk/src/Makefile.am
+
+ local contrib
+ # Use more system libs
+ for contrib in "${_contrib_sys[@]}"; do
+ sed -i \
+ -e "s/MODULES += contrib\/${contrib%:*}\$/#& # provided by ${contrib#*:}/" \
+ make/include/main.defs
+ done
+ # Use the pre-downloaded files
+ mkdir -p download
+ for contrib in "${_contrib_mod[@]}"; do
+ ln -srf "${srcdir}/${contrib[@]#*:}" download/
+ done
+
+ # Fix libhb to work with the stable release of libmp4v2
+ if in_array libmp4v2 "${makedepends[@]}"; then
+ local arg='\([^,)]*\)'
+ sed -i \
+ -e "s/MP4Close(${arg})/MP4Close(\1, 0)/" \
+ -e "s/MP4Create(${arg},${arg},${arg})/MP4Create(\1,\3)/" \
+ -e "s/MP4Optimize(${arg},${arg},${arg})/MP4Optimize(\1,\2)/" \
+ -e "s/MP4Read(${arg},${arg})/MP4Read(\1)/" \
+ libhb/decmetadata.c libhb/muxmp4.c
+ fi
+
+ # Fix configure.ac to work with automake 1.13
+ if in_array automake "${makedepends[@]}"; then
+ cd gtk
+ sed -i \
+ -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
+ -e '/AM_PROG_CC_STDC/d' \
+ -e 's/$pkg_gudev"/gmodule-2.0 $pkg_gudev"/' \
+ configure.ac
+ autoreconf -vi
+ fi
+}
+
+build() {
+ cd "$srcdir/HandBrake-svn$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --force \
+ --disable-gtk-update-checks
+ cd build
+ make -j1
+}
+
+package_handbrake-svn() {
+ pkgdesc="Multithreaded video transcoder"
+ depends=('bzip2' 'gcc-libs' 'gst-plugins-base' 'libnotify' 'dbus-glib'
+ 'fribidi' 'libass' 'gtk3' 'fontconfig' 'freetype2' 'libxml2'
+ 'libogg' 'libvorbis' 'libtheora' 'libsamplerate' 'libbluray'
+ 'x264' 'desktop-file-utils' 'hicolor-icon-theme')
+ optdepends=('gst-plugins-good: for video previews'
+ 'gst-libav: for video previews')
+ install=$pkgname.install
+ provides=("${pkgname%-svn}-${_pkgver}")
+ conflicts=("${pkgname%-svn}")
+
+ cd "$srcdir/HandBrake-svn$pkgver/build"
+
+ make -j1 DESTDIR="$pkgdir" install
+ rm "$pkgdir/usr/bin/HandBrakeCLI"
+}
+
+package_handbrake-cli-svn() {
+ pkgdesc="Multithreaded video transcoder (CLI)"
+ depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi' 'libass' 'libxml2' 'libtheora'
+ 'libsamplerate' 'libbluray' 'x264')
+ provides=("${pkgname%-svn}-${_pkgver}")
+ conflicts=("${pkgname%-svn}")
+
+ cd "$srcdir/HandBrake-svn$pkgver/build"
+ install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/handbrake-svn/handbrake-svn.install b/libre/handbrake-svn/handbrake-svn.install
new file mode 100644
index 000000000..87c29e4db
--- /dev/null
+++ b/libre/handbrake-svn/handbrake-svn.install
@@ -0,0 +1,14 @@
+post_install() {
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 6a9a4a394..a7726f329 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 204300 2014-01-16 22:28:49Z eric $
+# $Id: PKGBUILD 206376 2014-02-25 09:02:19Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor (Parabola): bitlord
# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=liferea
pkgname=liferea-libre
-pkgver=1.10.5
-pkgrel=1.1
+pkgver=1.10.6
+pkgrel=1
pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
arch=('i686' 'x86_64')
url="http://liferea.sourceforge.net/"
@@ -24,9 +24,9 @@ optdepends=('gnome-keyring: for keyring plugin support'
'gst-plugins-bad: for media player plugin support')
options=('!emptydirs')
install=liferea.install
-source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2
+source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.gz
remove-non-free-suggestions.patch)
-sha1sums=('a2378f2ba117fcc6475f82d961515adc367ef535'
+sha1sums=('af339c6c214092bbfd583673c714ea64cf4d9866'
'855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
build() {
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 6d883edd9..15a664a15 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -4,6 +4,7 @@
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_prefix=/usr
@@ -11,8 +12,8 @@ _pkgname=xbmc
pkgname=xbmc-libre
pkgver=12.3
_codename=Frodo
-pkgrel=9
-pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation and without nonfree components"
+pkgrel=9.1
+pkgdesc="A software media player and entertainment hub for digital media, without unrar support"
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL' 'custom')
@@ -28,21 +29,29 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
'lirc: remote controller support'
'udisks: automount external drives'
'upower: used to trigger power management functionality'
- 'libarchive: access compressed files without unpacking them'
'xorg-xinit: autostart xbmc')
install="${_pkgname}.install"
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz")
+source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz"
"xbmc.service"
"polkit.rules"
"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
-md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
+mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb')
+md5sums=('7c71af50af55b097e4365a58b70754e8'
'4d3cc17703a9a477a32db486c257a305'
'02f7951824ee13103344f36009c0ef2a'
'7fd6399d2ffbdf06b724f0cc2efa0784')
+mksource() {
+ cd "${srcdir}/xbmc-$pkgver-$_codename"
+
+ # remove unrar files from the source
+ rm -rv lib/UnrarXLib
+}
+
prepare() {
cd "${srcdir}/xbmc-$pkgver-$_codename"
diff --git a/pcr/ruby-bundler/PKGBUILD b/pcr/ruby-bundler/PKGBUILD
index 44a1a883b..52e4d36e4 100644
--- a/pcr/ruby-bundler/PKGBUILD
+++ b/pcr/ruby-bundler/PKGBUILD
@@ -1,24 +1,25 @@
+# Generated by gem2arch (https://github.com/anatol/gem2arch)
+# Maintainer: Anatol Pomozov <anatol.pomozov@gmail.com>
# Contributor: Alexsandr Pavlov <kidoz at mail dot ru>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-_pkgname=bundler
-pkgname=ruby-$_pkgname
-pkgver=1.3.5
+_gemname=bundler
+pkgname=ruby-$_gemname
+pkgver=1.5.3
pkgrel=1
-pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably."
-arch=any
-url=http://gem$_pkgname.com
-license=MIT
-depends=ruby
-source=http://rubygems.org/downloads/$_pkgname-$pkgver.gem
-noextract=$_pkgname-$pkgver.gem
-sha256sums=08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4
+pkgdesc="Is manages an application's dependencies through its entire life, across many machines, systematically and repeatably"
+arch=(any)
+url='http://gembundler.com'
+license=(MIT)
+depends=(ruby)
+options=(!emptydirs)
+source=(https://rubygems.org/downloads/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+sha1sums=('d23650aeb366efd85d9c51a36b3dde477a868919')
package() {
- cd $srcdir
-
- local _gemdir=$(ruby -rubygems -e'puts Gem.default_dir')
- HOME=/tmp gem install --no-user-install --ignore-dependencies\
- -i $pkgdir$_gemdir -n $pkgdir/usr/bin\
- $_pkgname-$pkgver.gem
+ local _gemdir="$(ruby -e'puts Gem.default_dir')"
+ gem install --ignore-dependencies --no-user-install -i "$pkgdir/$_gemdir" -n "$pkgdir/usr/bin" $_gemname-$pkgver.gem
+ rm "$pkgdir/$_gemdir/cache/$_gemname-$pkgver.gem"
+ install -D -m644 "$pkgdir/$_gemdir/gems/$_gemname-$pkgver/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
}
diff --git a/pcr/tunnels-git/PKGBUILD b/pcr/tunnels-git/PKGBUILD
new file mode 100644
index 000000000..bf1f0e8bc
--- /dev/null
+++ b/pcr/tunnels-git/PKGBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Etienne Perot <etienne at perot dot me>
+pkgname=tunnels-git
+pkgver=20130503
+pkgrel=1
+pkgdesc='Transparent, system-wide, domain-name-specific proxying rules'
+arch=('any')
+url='https://github.com/EtiennePerot/tunnels'
+license=('LGPL')
+depends=('bash' 'python2' 'python2-paramiko' 'python2-yaml')
+makedepends=('git' 'svn')
+source=(
+ 'https://socksipy-branch.googlecode.com/svn-history/r19/trunk/socks.py'
+ 'https://pypi.python.org/packages/source/p/python-daemon/python-daemon-1.6.tar.gz'
+ 'https://pypi.python.org/packages/source/l/lockfile/lockfile-0.9.1.tar.gz'
+)
+sha512sums=(
+ '58e7393b365ad5bde308cb2290224c15dfce82c0dc8e3209b8c4fea9876d1afa5bebfd184ea5e9d577d1494037f78bf5013a64d7ad21b5ed4b7405fb4a3a86dd'
+ 'ff9480844d8f57a09f27067aaa78669c167f66b2cc05f9b3baa660bc0aa21228d4894eeaeb3440611c1e0f0d5633b1c60eac60893da4a86d1db4b94d99961299'
+ '46288cb4d15bcb546d6cece7e032b7b020c71fba695d16a3c7718eeb0bc15c97c29f09f3c1649b6061d117e6bbd708e243fdcee89b2fa5f13a262a0e74f62c3d'
+)
+
+_gitroot='git://perot.me/tunnels'
+_gitname='tunnels'
+
+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 "Starting build..."
+
+ rm -rf "$srcdir/$_gitname-build"
+ git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+ cd "$srcdir/$_gitname-build"
+ cp -ra "$srcdir/socks.py" "$srcdir"/python-daemon-*/daemon "$srcdir"/lockfile-*/lockfile src/
+ python util/mkportslist.py > conf.d.sample/autogenerated-ports.yml
+}
+
+package() {
+ cd "$srcdir/$_gitname-build"
+ install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -D -m644 pkg/resources/tunnels.service "$pkgdir/usr/lib/systemd/system/tunnels.service"
+ mkdir -p "$pkgdir/usr/lib/tunnels"
+ for target in conf.d.sample src tunnels tunnelsd; do
+ cp -ra "$target" "$pkgdir/usr/lib/tunnels/"
+ done
+ mkdir -p "$pkgdir/etc/tunnels.d"
+ cp -a conf.d.sample/* "$pkgdir/etc/tunnels.d/"
+ mkdir -p "${pkgdir}/usr/bin"
+ ln -sf /usr/lib/tunnels/tunnels "$pkgdir/usr/bin/tunnels"
+ ln -sf /usr/lib/tunnels/tunnelsd "$pkgdir/usr/bin/tunnelsd"
+}
diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD
index 74f21775e..14b8c8fbd 100644
--- a/pcr/xfce-theme-greybird/PKGBUILD
+++ b/pcr/xfce-theme-greybird/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Limao Luo <luolimao+AUR@gmail.com>
# Contributor: flan_suse
-
+#
# This suite contains the following:
# * xfwm4 theme
# * xfwm4 compact theme
@@ -15,14 +15,10 @@
# * lightdm theme
# * wallpaper (found in the shimmer-wallpapers package; optdepends)
-# There have been some drastic changes as of July 22nd, 2012!
-# Please read through the AUR page comments if you wish to learn more.
-# I have modified this PKGBUILD to compensate for the drastic changes.
-
pkgname=xfce-theme-greybird
_pkgname=Greybird
-pkgver=1.1.1
-_pkgverclassic=0.8.2
+pkgver=1.3.1
+_pkgverclassic=0.9
pkgrel=1
pkgdesc="A grey and blue Xfce theme, used by default in Xubuntu 12.04; includes the classic low saturation theme"
arch=(any)
@@ -39,10 +35,10 @@ optdepends=('elementary-xfce-icons: matching icon set; use the dark icon theme'
conflicts=($pkgname-git)
source=($pkgname-$pkgver.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$pkgver.tar.gz
$pkgname-$_pkgverclassic.tar.gz::https://github.com/shimmerproject/$_pkgname/archive/v$_pkgverclassic.tar.gz)
-sha256sums=('374bc55d6af98ca6052cc5dd6c55db3b1ce9002fe81d3fde3e9b72febe697878'
- 'b63da3527760c194bb7299c1cb45297268439740e52e2c5e1f39fc31dce6293a')
-sha512sums=('1e4f7dea5e0206972d7d4a5bf42b353abf21e40d215fc1b0e7b546a4c95c7ce0604a37e9f2ad6c272fedf4720d0a5eee732a6b89d83c635c24082c24711c9e5e'
- '09f19bbfe02a477de6635198736897d143a5eec8ed13e6d1863c80f5d78b341ecdf2b2cf48bffddead25082eeadde475d360fc7bee773307c5cc10fb3ff90034')
+sha256sums=('f25f402878a3f91740291934cbb1ec5d91cb9504e5ee94ddad5cfc66dd59ed44'
+ '661f81347fe227bc3dc7ae40ee0e9bf1c96b478fab7283416a8569379a0aec4f')
+sha512sums=('cf85da68a15dca0f9ce13af46407a3cc4a77d0388e0ef760a0c24eacb56f544f409134a72986d42aafdf1786b4a5d1645f2ce2f1d56c9fbdbb5d5f85fd015416'
+ '599fa02ea6eeb6f805c06f7e57ea86d6b620a28a24c5439b0a826439e04a7ac245a95c86c8ee5a4550c070308174564a427dd80fa8538c90e1439b9f697e17c4')
package() {
local _themedir="$pkgdir/usr/share/themes"