From a3afce45dc7988a35810dee7e41050c3a459e731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Thu, 19 Jun 2014 03:25:30 +0000 Subject: Thu Jun 19 03:22:20 UTC 2014 --- community/mongodb/PKGBUILD | 17 +++--- community/mongodb/removeWerror.patch | 11 ---- community/re2/PKGBUILD | 33 ++++++++++++ community/rethinkdb/PKGBUILD | 16 +++--- community/syncthing/PKGBUILD | 6 +-- community/syncthing/syncthing.install | 14 ++--- community/virtualbox-modules/PKGBUILD | 14 ++--- .../virtualbox-guest-modules.install | 2 +- .../virtualbox-host-modules.install | 2 +- core/pam/PKGBUILD | 7 ++- extra/alsa-lib/PKGBUILD | 6 +-- extra/alsa-oss/PKGBUILD | 8 +-- extra/alsa-plugins/PKGBUILD | 8 +-- extra/alsa-utils/PKGBUILD | 6 +-- extra/libreoffice-fresh/PKGBUILD | 35 ++++++------ extra/libva-intel-driver/PKGBUILD | 6 +-- extra/netpbm/PKGBUILD | 33 ++++++------ extra/netpbm/netpbm-security-code.patch | 62 +++++++--------------- extra/netpbm/netpbm-security-scripts.patch | 16 +++--- 19 files changed, 146 insertions(+), 156 deletions(-) delete mode 100644 community/mongodb/removeWerror.patch create mode 100644 community/re2/PKGBUILD diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index 2db2e554d..ed59221a1 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 111336 2014-05-17 03:05:51Z fyan $ +# $Id: PKGBUILD 113316 2014-06-18 00:42:08Z fyan $ # Maintainer: Felix Yan # Contributor: Sven-Hendrik Haase # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,8 +6,8 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.6.1 -pkgrel=2 +pkgver=2.6.2 +pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') url='http://www.mongodb.org' @@ -19,17 +19,13 @@ optdepends=('libpcap: needed for mongosniff') backup=('etc/mongodb.conf') install=mongodb.install source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz" - 'mongodb.conf' 'mongodb.service' 'removeWerror.patch') + 'mongodb.conf' 'mongodb.service') build() { - # fucking mongo aint no fun to package export SCONSFLAGS="$MAKEFLAGS" cd mongodb-src-r${pkgver} - # failed to build with -Werror since 2.4.0 - patch -Np1 -i "$srcdir/removeWerror.patch" - scons all \ --use-system-pcre \ --use-system-snappy \ @@ -79,7 +75,6 @@ package() { install -dm755 "$pkgdir/var/log/mongodb" } -sha512sums=('a07168a8fa609d2a22b04db6b761e486e58fb63c66ea4974e5cc53a1255d514cd065a84b4dc62efbb27c39a6e3881d98a3f7025c2391a78d91d5cd515b8a2e56' +sha512sums=('b1e0fd64d6c93a3ea9b81d48fabf25f4b9d4eabd7fae19b2e97c2676b711515fbd6bc928c0e6f8a146fa83c7a43d3c40d68c377f1ebd1937cf379caff29e5e55' '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c' - '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9' - '868e5f93ba3c087f80982ffbe01411644d01329a51e4a1811cf8dd6de5e155f604a924be933623b70903fb4dabb27eed100a7eb6f6edcf4bb7a0fdfddd485270') + '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9') diff --git a/community/mongodb/removeWerror.patch b/community/mongodb/removeWerror.patch deleted file mode 100644 index e25f121bb..000000000 --- a/community/mongodb/removeWerror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/SConstruct 2014-04-08 22:55:57.206075327 +0800 -+++ b/SConstruct 2014-04-08 22:57:58.692240224 +0800 -@@ -819,7 +819,7 @@ - "-Winvalid-pch"] ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux or darwin: -- env.Append( CCFLAGS=["-Werror", "-pipe"] ) -+ env.Append( CCFLAGS=["-pipe"] ) - - env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] ) - env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] ) diff --git a/community/re2/PKGBUILD b/community/re2/PKGBUILD new file mode 100644 index 000000000..0acee5728 --- /dev/null +++ b/community/re2/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 113335 2014-06-18 14:57:49Z anatolik $ +# Maintainer: Anatol Pomozov +# Contributor: Gustavo Alvarez +# Contributor: Alexandre Bique + +pkgname=re2 +pkgver=20140304 +pkgrel=1 +pkgdesc='C++ library for fast, safe, thread-friendly alternative to backtracking regular expression engines like those used in PCRE, Perl, and Python' +url='http://code.google.com/p/re2/' +depends=(gcc-libs) +arch=(i686 x86_64) +license=(BSD) +source=(https://re2.googlecode.com/files/re2-$pkgver.tgz) +sha1sums=('f30dda8e530921b623c32aa58a5dabbe9157f6ca') + +build() { + cd re2 + LDFLAGS+=" -pthread" + make prefix=/usr +} + +check() { + cd re2 + LDFLAGS+=" -pthread" + make prefix=/usr test +} + +package() { + cd re2 + make prefix=/usr DESTDIR="$pkgdir" install + install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community/rethinkdb/PKGBUILD b/community/rethinkdb/PKGBUILD index 069351f0a..8bee55c48 100644 --- a/community/rethinkdb/PKGBUILD +++ b/community/rethinkdb/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 111743 2014-05-23 03:25:01Z anatolik $ +# $Id: PKGBUILD 113337 2014-06-18 16:05:10Z anatolik $ # Maintainer: Anatol Pomozov # Contributor: Massimiliano Torromeo # Contributor: Sigmund Lahn pkgname=rethinkdb -pkgver=1.12.5 +pkgver=1.13.0 pkgrel=1 pkgdesc='An open-source distributed database built with love.' arch=(i686 x86_64) url='http://www.rethinkdb.com/' license=(AGPL) -depends=(protobuf ncurses gperftools) -makedepends=(boost python python2) +depends=(protobuf ncurses gperftools curl) +makedepends=(boost python2 wget) backup=(etc/rethinkdb/instances.d/default.conf) install=rethinkdb.install options=(!emptydirs) @@ -20,20 +20,22 @@ source=( rethinkdb-tmpfile.conf rethinkdb.service ) -sha256sums=('f86c70e680a863be106fb03d8245bd3d42df57a5635378bd70ba0eb86ff98bea' +sha256sums=('83b5d67a8063336074b9037d0a27ab80ff77250a83a49be570d753535b8d2337' '656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4' 'e56bffa2b9ebc3a00ef566ab2be0719a633c89d961a2461dfa2d9ffdb258c1a2') build() { cd rethinkdb-$pkgver - ./configure --fetch v8 --disable-drivers --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc + export PYTHON=/usr/bin/python2 + ./configure --fetch v8 --dynamic all --enable-precompiled-web --prefix=/usr --sysconfdir=/etc make } check() { cd rethinkdb-$pkgver make build/release/rethinkdb-unittest - ./build/release/rethinkdb-unittest + # SindexEraseRange failure https://github.com/rethinkdb/rethinkdb/issues/2042 + ./build/release/rethinkdb-unittest --gtest_filter=-RDBBtree.SindexEraseRange # some tests might be flaky on btrfs filesystem! } diff --git a/community/syncthing/PKGBUILD b/community/syncthing/PKGBUILD index 94e201be5..432d22e1c 100644 --- a/community/syncthing/PKGBUILD +++ b/community/syncthing/PKGBUILD @@ -6,8 +6,8 @@ _pkgstamp=$(date +%s) pkgname=syncthing -pkgver=0.8.14 -pkgrel=1 +pkgver=0.8.15 +pkgrel=2 pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing" url="http://syncthing.net/" license=('MIT') @@ -17,7 +17,7 @@ makedepends=('go' 'godep' 'inetutils' 'sed') source=("https://github.com/calmh/${pkgname}/archive/v${pkgver}.tar.gz" "syncthing@.service" "syncthing.1") -sha1sums=('271d000777039687627ada6e632292b96cf7f89a' +sha1sums=('2fa7f943e545a753619ec7a1fa6de3e8555619d3' '204cad3823306c793a14a17a23220e26199160d4' '17be8b3f99c577e325765abc251f597e204d7711') install=${pkgname}.install diff --git a/community/syncthing/syncthing.install b/community/syncthing/syncthing.install index e400b9ba7..3718a4722 100644 --- a/community/syncthing/syncthing.install +++ b/community/syncthing/syncthing.install @@ -2,24 +2,16 @@ post_install() { cat << EOF WebGUI can be accessed at http://localhost:8080 - Execute + Execute the following to reload systemd modules. systemctl daemon-reload - to reload systemd modules. - - To start syncthing, execute: + To start and/or enable syncthing execute the the following, + replacing 'user' with your username. systemctl start syncthing@user - - where 'user' is your username. - - To autostart syncthing on system start, execute - systemctl enable syncthing@user - where 'user' is your username. - EOF } diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index d1ffa3a75..3dc5d0ce0 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 112853 2014-06-08 21:54:55Z foutrelis $ +# $Id: PKGBUILD 113333 2014-06-18 14:08:30Z tpowa $ # Maintainer: Ionut Biru # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.3.12 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux>=3.14' 'linux<3.15' - 'linux-headers>=3.14' 'linux-headers<3.15' +makedepends=('linux>=3.15' 'linux<3.16' + 'linux-headers>=3.15' 'linux-headers<3.16' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver") # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.14-ARCH +_extramodules=extramodules-3.15-ARCH build() { _kernver="$(cat /usr/lib/modules/$_extramodules/version)" @@ -33,7 +33,7 @@ build() { package_virtualbox-host-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.14' 'linux<3.15') + depends=('linux>=3.15' 'linux<3.16') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install @@ -48,7 +48,7 @@ package_virtualbox-guest-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.14' 'linux<3.15') + depends=('linux>=3.15' 'linux<3.16') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index dc34249da..1817cb63a 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES=extramodules-3.14-ARCH + EXTRAMODULES=extramodules-3.15-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index c450e28e6..faebcdaf7 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES=extramodules-3.14-ARCH + EXTRAMODULES=extramodules-3.15-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index 426f91d3f..ee05bf8f8 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 213313 2014-05-19 17:03:12Z tpowa $ +# $Id: PKGBUILD 215284 2014-06-18 14:08:51Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=pam pkgver=1.1.8 -pkgrel=4 +pkgrel=5 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -79,4 +79,7 @@ _EOT # set unix_chkpwd uid chmod +s $pkgdir/usr/bin/unix_chkpwd + # remove doc which is not used anymore + # FS #40749 + rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html } diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index 072433d39..96f168e07 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 197852 2013-10-30 11:15:49Z allan $ +# $Id: PKGBUILD 215268 2014-06-18 06:00:49Z tpowa $ # Maintainer: judd pkgname=alsa-lib -pkgver=1.0.27.2 +pkgver=1.0.28 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -23,4 +23,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('69129a7c37697f81ac092335e9fa452b') +md5sums=('c9e21b88a2b3e6e12ea7ba0f3b271fc3') diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD index 53a99528b..accae24e0 100644 --- a/extra/alsa-oss/PKGBUILD +++ b/extra/alsa-oss/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197853 2013-10-30 11:16:13Z allan $ +# $Id: PKGBUILD 215272 2014-06-18 06:04:23Z tpowa $ # Contributor: judd pkgname=alsa-oss -pkgver=1.0.25 -pkgrel=2 +pkgver=1.0.28 +pkgrel=1 pkgdesc="OSS compatibility library" arch=('i686' 'x86_64') license=('GPL') @@ -21,4 +21,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('922ea177db15c72f1b5037181c73f934') +md5sums=('91f57e8cee1ad4cc956caa8b62ac5d43') diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD index 36947c877..ad2ef205e 100644 --- a/extra/alsa-plugins/PKGBUILD +++ b/extra/alsa-plugins/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 197855 2013-10-30 11:17:00Z allan $ +# $Id: PKGBUILD 215274 2014-06-18 06:07:56Z tpowa $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Sergej Pupykin # Contributor: Daniel Ehlers pkgname=alsa-plugins -pkgver=1.0.27 -pkgrel=2 +pkgver=1.0.28 +pkgrel=1 pkgdesc="Extra alsa plugins" arch=(i686 x86_64) url="http://www.alsa-project.org" @@ -18,7 +18,6 @@ optdepends=('libpulse: PulseAudio plugin' 'libsamplerate: libsamplerate resampling plugin' 'speex: libspeexdsp resampling plugin') source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2") -md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8') prepare() { cd $pkgname-$pkgver @@ -38,3 +37,4 @@ package() { install -d "$pkgdir/usr/share/doc/$pkgname" install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/" } +md5sums=('6fcbbb31e96f8ebc5fb926184a717aa4') diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD index 0ee6995a3..48e36cc1d 100644 --- a/extra/alsa-utils/PKGBUILD +++ b/extra/alsa-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191710 2013-07-29 10:16:55Z tpowa $ +# $Id: PKGBUILD 215276 2014-06-18 06:09:14Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=alsa-utils -pkgver=1.0.27.2 +pkgver=1.0.28 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -38,5 +38,5 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('b65e9a04181bd7c9db7667a4566f8dc3' +md5sums=('361552d5b1cacd0a1e7ba09e69990211' '529216f6a46e61a546640e08ea7a0879') diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index bf25df390..49bc8a696 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 215151 2014-06-14 19:16:58Z andyrtr $ +# $Id: PKGBUILD 215297 2014-06-18 17:56:43Z bpiotrowski $ # Maintainer: AndyRTR # Maintainer: Bartłomiej Piotrowski pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') -_LOver=4.3.0.0.beta2-buildfix1 +_LOver=4.3.0.1 pkgver=4.3.0 -pkgrel=0.8 +pkgrel=0.9 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -61,13 +61,12 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url}/libe-book-0.1.1.tar.bz2 ${_additional_source_url}/libabw-0.1.0.tar.bz2 ${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2 - ${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz + ${_additional_source_url}/3c62598ccbecb65998bf7602bb09a791-libgltf.tar.bz2 ${_additional_source_url}/CoinMP-1.7.6.tgz # do not use system glm, LibO patches it! ${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip - ${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2 + ${_additional_source_url}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 ${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2 - ${_additional_source_url}/510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-fresh.sh libreoffice-fresh.csh) noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 @@ -104,17 +103,16 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2 libe-book-0.1.1.tar.bz2 libabw-0.1.0.tar.bz2 language-subtag-registry-2014-04-10.tar.bz2 - 8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz CoinMP-1.7.6.tgz bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip - collada2gltf-master-6258611a6a.tar.bz2 + 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 OpenCOLLADA-master-6509aa13af.tar.bz2 - 510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2) -md5sums=('d4dc0ed333569336519dfbddcbb1b329' + 3c62598ccbecb65998bf7602bb09a791-libgltf.tar.bz2) +md5sums=('cc2c8af3cf8ae265173086f353bc7532' 'SKIP' - 'b009798fa57feea21924cdc6a4a6212a' + '5cf628cd4c201f291f72d2d66fadae62' 'SKIP' - '4c502724049b9dd50eaee81ec7b1896b' + 'b556de6bb78ae2673819c191a777053d' 'SKIP' 'd6eef4b4cacb2183f2bf265a5a03a354' '1f24ab1d39f4a51faf22244c94a6203f' @@ -149,12 +147,11 @@ md5sums=('d4dc0ed333569336519dfbddcbb1b329' 'c25a881d21abc5b4da19205db513cc22' '9317e967c8fa8ff50e049744c4b33c87' '49c94710f7858b1969d74ff72e6aac84' - '8ac8ae9829c4fefd1ae9f715f95d4e0b' + '3c62598ccbecb65998bf7602bb09a791' '1cce53bf4b40ae29790d2c5c9f8b1129' 'bae83fa5dc7f081768daace6e199adc3' - 'c8a8be5829ceffacfe1d68d078f5c442' + '4b87018f7fff1d054939d19920b751a0' '4ca8a6ef0afeefc864e9ef21b9f14bd6' - '510c3f8504bfb8cc8c8fc5d0fac74055' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') @@ -280,7 +277,7 @@ build() { --enable-hardlink-deliver #--help touch src.downloaded - make + make build # use this if i686 fails #make || make CppunitTest_sw_ooxmlsdrexport VALGRIND=memcheck @@ -393,7 +390,11 @@ package_libreoffice-fresh() { ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py # cleanup - rm -rf ${pkgdir}/usr/share/appdata ${pkgdir}/usr/share/libreoffice/sdk + rm -rf ${pkgdir}/usr/share/libreoffice/sdk + + # add application descriptions + install -v -m644 ${srcdir}/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \ + ${pkgdir}/usr/share/appdata # fix insecure rpath chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCbc.so.3 diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD index 4e41921cc..e647e6fbe 100644 --- a/extra/libva-intel-driver/PKGBUILD +++ b/extra/libva-intel-driver/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 212236 2014-05-11 10:16:31Z bpiotrowski $ +# $Id: PKGBUILD 215293 2014-06-18 16:19:11Z bpiotrowski $ # Maintainer: Ionut Biru # Maintainer: Bartłomiej Piotrowski pkgname=libva-intel-driver -pkgver=1.3.1 +pkgver=1.3.2 pkgrel=1 pkgdesc='VA-API implementation for Intel G45 and HD Graphics family' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('MIT') depends=('libva') replaces=('libva-driver-intel') source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('0d6f1ca655130bac8edf3fc8a8dada48') +md5sums=('3f4f08f1d42ee451b2fb9c239ee0b8d7') build() { cd $pkgname-$pkgver diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD index 39675625b..41e3160d9 100644 --- a/extra/netpbm/PKGBUILD +++ b/extra/netpbm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 197557 2013-10-26 21:24:07Z eric $ -# Maintainer: Kevin Piche +# $Id: PKGBUILD 215266 2014-06-18 05:01:53Z eric $ +# Maintainer: pkgname=netpbm -pkgver=10.61.02 -pkgrel=3 +pkgver=10.66.03 +pkgrel=1 pkgdesc="A toolkit for manipulation of graphic images" arch=('i686' 'x86_64') license=('custom' 'BSD' 'GPL' 'LGPL') @@ -11,25 +11,24 @@ url="http://netpbm.sourceforge.net/" depends=('perl' 'libpng' 'libtiff' 'libxml2') makedepends=('python2') options=('!makeflags') -source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.gz{,.sig} \ - ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-22Feb2009.tar.xz{,.sig} \ +source=(ftp://ftp.archlinux.org/other/packages/netpbm/${pkgname}-${pkgver}.tar.xz{,.sig} \ + ftp://ftp.archlinux.org/other/packages/netpbm/netpbm-doc-31Jan2014.tar.xz{,.sig} \ netpbm-CAN-2005-2471.patch netpbm-security-code.patch netpbm-security-scripts.patch) -sha1sums=('dc2354716996c8fe4c4836386e6c403ec2f15589' - '253df0e79f9344e68ee907a43347d630ff6b1b95' - 'dfeba9f9a5fe987d64db0aadb5ca8c1b20fcead2' - 'e9513608a661beb05a63270931f6191029e935f8' +sha1sums=('b396dfde402b6979a8b551cf60ba1030278a233d' + 'SKIP' + '25a58975bd8cd383238b4ae31f4405c60914faac' + 'SKIP' 'b79cf9d42488fea065ba16262ed97694c47af08d' - 'cde27f75fa5ca8010a3b1f08d8e247d42243d0f5' - '300a2386d3207005f4cb4120bbb2f3788a9b7716') + '4213468c44a63c0575896f6781987a09cfcc2d30' + 'c67a63c010353de3ecac3ad72ba76bbb85e4ed4c') # source PKGBUILD && mksource mksource() { # Get docs with: wget --recursive --relative -nH http://netpbm.sourceforge.net/doc/ - curl -o advanced.tar.gz 'http://netpbm.svn.sourceforge.net/viewvc/netpbm/advanced.tar.gz?view=tar' - tar -xf advanced.tar.gz advanced/version.mk + svn checkout svn://svn.code.sf.net/p/netpbm/code/advanced advanced _pkgver=$(grep MAJOR advanced/version.mk |cut -d ' ' -f 3).$(grep MINOR advanced/version.mk |cut -d ' ' -f 3).0$(grep POINT advanced/version.mk |cut -d ' ' -f 3) - mv advanced.tar.gz ${pkgname}-${_pkgver}.tar.gz - gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.gz + tar -cf ${pkgname}-${_pkgver}.tar.xz advanced + gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${_pkgver}.tar.xz rm -r advanced } @@ -52,7 +51,7 @@ prepare() { sed -i 's|misc|share/netpbm|' common.mk sed -i 's|/link|/lib|' lib/Makefile - sed -i 's|install.manweb install.man|install.man|' GNUmakefile + sed -i 's|install.manwebmain install.manweb install.man|install.man|' GNUmakefile } build() { diff --git a/extra/netpbm/netpbm-security-code.patch b/extra/netpbm/netpbm-security-code.patch index 27b49fbae..5c2e0de35 100644 --- a/extra/netpbm/netpbm-security-code.patch +++ b/extra/netpbm/netpbm-security-code.patch @@ -748,14 +748,6 @@ diff -up netpbm-10.58.01/converter/ppm/ppmtoilbm.c.security-code netpbm-10.58.01 MALLOCARRAY_NOFAIL(compr_row, cols * 2); if( maxval != 15 ) { -@@ -1785,6 +1787,7 @@ make_val_table(oldmaxval, newmaxval) - unsigned int i; - int * table; - -+ overflow_add(oldmaxval, 1); - MALLOCARRAY_NOFAIL(table, oldmaxval + 1); - for (i = 0; i <= oldmaxval; ++i) - table[i] = ROUNDDIV(i * newmaxval, oldmaxval); @@ -2293,8 +2296,11 @@ main(int argc, char ** argv) { MALLOCARRAY_NOFAIL(coded_rowbuf, RowBytes(cols)); for (i = 0; i < RowBytes(cols); ++i) @@ -988,17 +980,6 @@ diff -up netpbm-10.58.01/converter/ppm/ximtoppm.c.security-code netpbm-10.58.01/ header->colors = (Color *)calloc((unsigned int)header->ncolors, sizeof(Color)); if (header->colors == NULL) { -diff -up netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code netpbm-10.58.01/converter/ppm/yuvtoppm.c ---- netpbm-10.58.01/converter/ppm/yuvtoppm.c.security-code 2012-04-09 15:31:44.000000000 +0200 -+++ netpbm-10.58.01/converter/ppm/yuvtoppm.c 2012-04-09 15:40:03.218619602 +0200 -@@ -72,6 +72,7 @@ main(argc, argv) - - ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0); - pixrow = ppm_allocrow(cols); -+ overflow_add(cols, 1); - MALLOCARRAY(yuvbuf, (cols+1)/2); - if (yuvbuf == NULL) - pm_error("Unable to allocate YUV buffer for %d columns.", cols); diff -up netpbm-10.58.01/editor/pamcut.c.security-code netpbm-10.58.01/editor/pamcut.c --- netpbm-10.58.01/editor/pamcut.c.security-code 2012-04-09 15:31:33.000000000 +0200 +++ netpbm-10.58.01/editor/pamcut.c 2012-04-09 15:40:03.218619602 +0200 @@ -1215,18 +1196,6 @@ diff -up netpbm-10.58.01/generator/pgmcrater.c.security-code netpbm-10.58.01/gen if (aux == NULL) pm_error("out of memory allocating elevation array"); -diff -up netpbm-10.58.01/generator/pgmkernel.c.security-code netpbm-10.58.01/generator/pgmkernel.c ---- netpbm-10.58.01/generator/pgmkernel.c.security-code 2012-04-09 15:31:34.000000000 +0200 -+++ netpbm-10.58.01/generator/pgmkernel.c 2012-04-09 15:40:03.226619502 +0200 -@@ -68,7 +68,7 @@ main ( argc, argv ) - kycenter = (fysize - 1) / 2.0; - ixsize = fxsize + 0.999; - iysize = fysize + 0.999; -- MALLOCARRAY(fkernel, ixsize * iysize); -+ fkernel = (double *) malloc3 (ixsize, iysize, sizeof(double)); - for (i = 0; i < iysize; i++) - for (j = 0; j < ixsize; j++) { - fkernel[i*ixsize+j] = 1.0 / (1.0 + w * sqrt((double) diff -up netpbm-10.58.01/lib/libpam.c.security-code netpbm-10.58.01/lib/libpam.c --- netpbm-10.58.01/lib/libpam.c.security-code 2012-04-09 15:31:38.000000000 +0200 +++ netpbm-10.58.01/lib/libpam.c 2012-04-09 15:40:03.227619490 +0200 @@ -1252,17 +1221,6 @@ diff -up netpbm-10.58.01/lib/libpammap.c.security-code netpbm-10.58.01/lib/libpa unsigned int const size = sizeof(*retval) - sizeof(retval->tupleint.tuple) + pamP->depth * sizeof(sample); -diff -up netpbm-10.58.01/lib/libpbm1.c.security-code netpbm-10.58.01/lib/libpbm1.c ---- netpbm-10.58.01/lib/libpbm1.c.security-code 2012-04-09 15:31:38.000000000 +0200 -+++ netpbm-10.58.01/lib/libpbm1.c 2012-04-09 15:40:03.228619477 +0200 -@@ -77,6 +77,7 @@ pbm_check(FILE * file, const enum pm_che - pm_message("pm_filepos passed to pm_check() is %u bytes", - sizeof(pm_filepos)); - #endif -+ overflow2(bytes_per_row, rows); - pm_check(file, check_type, need_raster_size, retval_p); - } - } diff -up netpbm-10.58.01/lib/libpm.c.security-code netpbm-10.58.01/lib/libpm.c --- netpbm-10.58.01/lib/libpm.c.security-code 2012-04-09 15:31:38.000000000 +0200 +++ netpbm-10.58.01/lib/libpm.c 2012-04-09 15:40:03.229619464 +0200 @@ -1680,3 +1638,23 @@ diff -up netpbm-10.58.01/urt/scanargs.c.security-code netpbm-10.58.01/urt/scanar static CONST_DECL char * prformat( CONST_DECL char *, int ); static int isnum( CONST_DECL char *, int, int ); +--- netpbm-10.58.01/lib/libpbm1.c.orig 2014-06-16 21:12:28.499230631 -0400 ++++ netpbm-10.58.01/lib/libpbm1.c 2014-06-16 21:12:55.932519324 -0400 +@@ -78,6 +78,7 @@ + } else { + pm_filepos const bytesPerRow = (cols+7)/8; + pm_filepos const needRasterSize = rows * bytesPerRow; ++ overflow2(bytesPerRow, rows); + pm_check(fileP, checkType, needRasterSize, retvalP); + } + } +--- netpbm-10.58.01/converter/ppm/ppmtoilbm.c.orig 2014-06-16 21:23:40.061473868 -0400 ++++ netpbm-10.58.01/converter/ppm/ppmtoilbm.c 2014-06-16 21:23:44.701466379 -0400 +@@ -185,6 +185,7 @@ + unsigned int i; + int * table; + ++ overflow_add(oldmaxval, 1); + MALLOCARRAY_NOFAIL(table, oldmaxval + 1); + for (i = 0; i <= oldmaxval; ++i) + table[i] = ROUNDDIV(i * newmaxval, oldmaxval); diff --git a/extra/netpbm/netpbm-security-scripts.patch b/extra/netpbm/netpbm-security-scripts.patch index 831be8295..db056db99 100644 --- a/extra/netpbm/netpbm-security-scripts.patch +++ b/extra/netpbm/netpbm-security-scripts.patch @@ -81,15 +81,6 @@ diff -up netpbm-10.47.05/editor/pnmmargin.security-scripts netpbm-10.47.05/edito exit ;; * ) -@@ -102,7 +99,4 @@ else - pnmcat -lr $tmp2 $tmp1 $tmp2 > $tmp4 - pnmcat -tb $plainopt $tmp3 $tmp4 $tmp3 - fi -- -- -- -- -+rm -rf "$tmpdir" diff -up netpbm-10.47.05/editor/ppmfade.security-scripts netpbm-10.47.05/editor/ppmfade --- netpbm-10.47.05/editor/ppmfade.security-scripts 2009-12-10 08:34:32.000000000 +0100 +++ netpbm-10.47.05/editor/ppmfade 2010-03-16 21:28:09.000000000 +0100 @@ -373,3 +364,10 @@ diff -up netpbm-10.47.05/editor/ppmshadow.security-scripts netpbm-10.47.05/edito # Process command line options +--- snetpbm-10.47.05/editor/pnmmargin.orig 2014-06-16 21:30:27.480812666 -0400 ++++ netpbm-10.47.05/editor/pnmmargin 2014-06-16 21:30:41.500789921 -0400 +@@ -101,3 +101,4 @@ + fi + + ++rm -rf "$tmpdir" -- cgit v1.2.3