Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

icedove and iceweasel hardened

8 files changed, 89 insertions, 58 deletions

diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 0c12f9ab2..01376c8b9 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor (Arch): John Sowiak <john@archlinux.org>
 # Contributor (Arch): tobias <tobias@archlinux.org>
-# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Maintainer  (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer        : Márcio Silva <coadde@parabola.nu>
 
 # Sometimes blender.org takes some time to release patch releases and because the blender package
 # is broke, we sometimes need to build from git directly.
@@ -11,57 +11,88 @@
 # or simply roll with a new version. I usually choose the latter when the former seems
 # unreasonable.
 
-_git='yes'
-_gitrev='agit1'
+# git:
+_git='no'
+_gitrev='git1'
 _gittagver='2.78'
 _gittagrev='a'
-_gitaddtagver=$_gittagver$_gittagrev
-_gittratagver=$_gittagver$_gittagrev
-_gitdevtagver=$_gittagver$_gittagrev
-# blender:
-_gitcommit='e8299c81006aba1e4b926c24276ce09d70435371'
-# blender-addons:
-_gitaddonscommit='c0f720c85ee12cd32cd837d6d0006f80b1da36c6'
-# blender-addons-contrib:
-_gitaddonscontribcommit='a52733b58d95ce60ecde95a9eca242e7319c285a'
-# blender-translations:
-_gittranslationscommit='0171e7ca48c845fce040d12a26d314d3c573f9af'
-# blender-dev-tools:
-_gitdevtoolscommit='896c5f78952adb2d091d28c65086d46992dabdac'
+_gitaddtagver="$_gittagver$_gittagrev"
+_gittratagver="$_gittagver"
+_gitdevtagver="$_gittagver"
+_gitcommit='e8299c81006aba1e4b926c24276ce09d70435371' # Blender
+_gitaddonscommit='7431449db6bd37edb3458f4afbec9034fb1a324c' # Blender Addons
+_gitaddonscontribcommit='f91d5e88b5b6fe7d2d7e75f95fe0bab2a99169d6' # Blender Addons Contrib
+_gittranslationscommit='0171e7ca48c845fce040d12a26d314d3c573f9af' # Blender Translation
+_gitdevtoolscommit='896c5f78952adb2d091d28c65086d46992dabdac' # Blender Dev Tools
 
-pkgbase='blender'
-pkgname=("${pkgbase}" "${pkgbase}-addon-gimp" "${pkgbase}-addon-povray")
-[[ "${_git}" = 'yes' ]] &&					pkgver="${_gittagver}.${_gitrev}.${_gitcommit::7}"	# git commit
-[[ "${_git}" = 'no'  ]] && [[ -z "${_gittagrev}"   ]] &&	pkgver="${_gittagver}"					# official release
-[[ "${_git}" = 'no'  ]] && [[ "${#_gittagrev}" > 1 ]] &&	pkgver="${_gittagver}${_gittagrev/-/}"			# release candidate
-[[ "${_git}" = 'no'  ]] && [[ "${#_gittagrev}" = 1 ]] &&	pkgver="${_gittagver}.${_gittagrev}"			# revision
-pkgrel='2.parabola2'
-epoch='17'
+# JPEG/LLVM/PovRay/Python version:
 _jpgver='1.5'
 _llvmver='3.5'
 _povver='3.7'
 _pyver='3.5'
+
+pkgbase='blender'
+pkgname=("${pkgbase}" "${pkgbase}-addon-gimp" "${pkgbase}-addon-povray")
+
+# pkgver:
+if [[ "${_git}" = 'yes' ]]; then
+  pkgver="${_gittagver}.${_gitrev}.${_gitcommit::7}"	# Git Commit
+elif [[ "${_git}" = 'no'  ]]; then
+  [[ -z "${_gittagrev}"   ]] && \
+    pkgver="${_gittagver}"				# Official Release
+  [[ "${#_gittagrev}" > 1 ]] && \
+    pkgver="${_gittagver}${_gittagrev/-/}"		# Release Candidate
+  [[ "${#_gittagrev}" = 1 ]] && \
+    pkgver="${_gittagver}.${_gittagrev}"		# Revision
+fi
+
+pkgrel='3.parabola1'
+epoch='17'
 pkgdesc='A fully integrated 3D graphics creation suite, without nonfree CUDA support'
 arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
 url="http://www.${pkgbase}.org"
 depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freeglut' 'freetype2'
-         'glew' 'hicolor-icon-theme' 'jack' 'jemalloc' 'libpng' 'libsndfile' 'libspnav'
-         'libtiff' 'log4cplus' 'openal' 'opencolorio' 'opencollada' 'openexr'
-         'openimageio' 'openjpeg' 'openshadinglanguage' 'opensubdiv' 'openvdb'
-         'python' 'python-requests' 'sdl2' 'shared-mime-info' 'xdg-utils') # 'ptex' has been disabled since building fails
-makedepends=('boost' 'cmake' 'git' 'llvm35' 'mesa') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n)
+	 'glew' 'hicolor-icon-theme' 'jack' 'jemalloc' 'libpng' 'libsndfile' 'libspnav'
+	 'libtiff' 'log4cplus' 'openal' 'opencolorio' 'opencollada' 'openexr'
+	 'openimageio' 'openjpeg' 'openshadinglanguage' 'opensubdiv' 'openvdb'
+	 'python' 'python-requests' 'sdl2' 'shared-mime-info' 'xdg-utils')
+       # 'ptex' has been disabled since building fails
+makedepends=('boost' 'cmake' 'git' 'llvm35' 'mesa')
+	   # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n)
 options=('!strip')
-[[ "${_git}" = 'no'  ]] && source=("${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#tag=v${_gittagver}${_gittagrev}"				# blender
-                                   "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#tag=v${_gitaddtagver}"				# addons for blender
-                                   "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#tag=v${_gittratagver}"		# translations for blender
-                                   "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#tag=v${_gitdevtagver}")			# devel tools for blender
-[[ "${_git}" = 'yes' ]] && source=("${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#commit=${_gitcommit}"						# blender
-                                   "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#commit=${_gitaddonscommit}"			# addons for blender
-                                   "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#commit=${_gittranslationscommit}"	# translations for blender
-                                   "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#commit=${_gitdevtoolscommit}")		# devel tools for blender
-source+=("git://git.${pkgbase}.org/${pkgbase}-addons-contrib.git#commit=${_gitaddonscontribcommit}"								# addons contrib for blender
-         "git://git.${pkgbase}.org/scons.git")															# scons
+
+# source:
+if [[ "${_git}" = 'no'  ]]; then
+  source=(
+    # Blender
+    "${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#tag=v${_gittagver}${_gittagrev}"
+    # Blender addons
+    "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#tag=v${_gitaddtagver}"
+    # Blender translations
+    "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#tag=v${_gittratagver}"
+    # Blender Devel Tools
+    "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#tag=v${_gitdevtagver}"
+  )
+elif [[ "${_git}" = 'yes' ]]; then
+  source=(
+    # Blender
+    "${pkgbase}-${pkgver}::git://git.${pkgbase}.org/${pkgbase}.git#commit=${_gitcommit}"
+    # Blender addons
+    "${pkgbase}-addons-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-addons.git#commit=${_gitaddonscommit}"
+    # Blender translations
+    "${pkgbase}-translations-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-translations.git#commit=${_gittranslationscommit}"
+    # Blender Devel Tools
+    "${pkgbase}-dev-tools-${pkgver}::git://git.${pkgbase}.org/${pkgbase}-dev-tools.git#commit=${_gitdevtoolscommit}"
+  )
+fi
+source+=(
+  # Blender Addons Contrib
+  "git://git.${pkgbase}.org/${pkgbase}-addons-contrib.git#commit=${_gitaddonscontribcommit}"
+  # Scons
+  "git://git.${pkgbase}.org/scons.git"
+)
+
 md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
 
 prepare() {
diff --git a/libre/epiphany/PKGBUILD b/libre/epiphany/PKGBUILD
index 002e83c5d..d6bff552b 100644
--- a/libre/epiphany/PKGBUILD
+++ b/libre/epiphany/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 280134 2016-11-07 20:45:42Z heftig $
+# $Id: PKGBUILD 281818 2016-11-22 09:29:17Z heftig $
 # Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@parabola.nu>
 
 pkgname=epiphany
-pkgver=3.22.2
+pkgver=3.22.3
 pkgrel=1.parabola1
 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
 url="https://wiki.gnome.org/Apps/Web"
@@ -16,7 +16,7 @@ makedepends=(intltool itstool docbook-xml startup-notification
 groups=(gnome)
 replaces=(${pkgname}-libre)
 conflicts=(${pkgname}-libre)
-_commit=061956662d43c8f2e966228f2379e04004e86dd9  # tags/3.22.2^0
+_commit=08cb0932f1172fb9fc9f544006db4b6c2bb9d9b8  # tags/3.22.3^0
 source=("git://git.gnome.org/epiphany#commit=$_commit"
         "git://git.gnome.org/libgd"
         pluginsdir.diff)
diff --git a/libre/gnome-boxes/PKGBUILD b/libre/gnome-boxes/PKGBUILD
index b6e9b1636..6c06c3bd4 100644
--- a/libre/gnome-boxes/PKGBUILD
+++ b/libre/gnome-boxes/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=gnome-boxes
 pkgver=3.22.1
-pkgrel=1.parabola1
-pkgdesc="Simple GNOME application to access remote or virtual systems, without nonfree system logos"
+pkgrel=1.parabola2
+pkgdesc="Simple GNOME application to access remote or virtual systems, without artwork for non-FSDG compliant distros and operating systems"
 arch=('i686' 'x86_64')
 url="https://wiki.gnome.org/Apps/Boxes"
 license=('LGPL')
diff --git a/libre/khotkeys/PKGBUILD b/libre/khotkeys/PKGBUILD
index 360fb58f7..c531f18e0 100644
--- a/libre/khotkeys/PKGBUILD
+++ b/libre/khotkeys/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 279579 2016-11-01 15:26:40Z arojas $
+# $Id: PKGBUILD 281836 2016-11-22 13:29:03Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Antonio Rojas
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=khotkeys
-pkgver=5.8.3
+pkgver=5.8.4
 pkgrel=1.parabola1
 pkgdesc='KHotKeys, with DuckDuckGo HTML support'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('extra-cmake-modules' 'kdoctools' 'python' 'kdesignerplugin')
 conflicts=('kdebase-workspace')
 groups=(plasma)
 source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('c97f533f64d500ed3eb3b0a2bd88f6c681d3f9a8e3b5a7d3f910a39157d31c53'
+sha256sums=('83da5352ba44a4f06d370c27c69645518554ef4c86d32ef783d1d0809532e6e0'
             'SKIP')
 validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E'  # Jonathan Riddell
               '348C8651206633FD983A8FC4DEACEA00075E1D76'  # KDE Neon
diff --git a/libre/kinfocenter/PKGBUILD b/libre/kinfocenter/PKGBUILD
index 7108fb161..639245823 100644
--- a/libre/kinfocenter/PKGBUILD
+++ b/libre/kinfocenter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 279579 2016-11-01 15:26:40Z arojas $
+# $Id: PKGBUILD 281836 2016-11-22 13:29:03Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
 # Contributor (Arch): Antonio Rojas
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=kinfocenter
-pkgver=5.8.3
+pkgver=5.8.4
 pkgrel=1.parabola1
 pkgdesc='A utility that provides information about a computer system (Parabola rebranded)'
 arch=('i686' 'x86_64' 'armv7h')
@@ -17,7 +17,7 @@ conflicts=('kdebase-workspace')
 groups=('plasma')
 source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"{,.sig}
 'parabola-logo.svg::https://wiki.parabola.nu/images/a/af/Parabolagnu%2Blinuxlibre-dark-scalable.svg' 'kcm-about-distrorc')
-sha256sums=('fb06f1eb28aab68a4659b999a6b991ea28165cc25c1ca2321515c25cc2f349c3'
+sha256sums=('6dafaf7fc5d74f959aa358b6247045fce4093a73863c25b1c3b76e3817b9dbd6'
             'SKIP'
             '75136b90185242891cbeb993285f400bcc9c6c70fdccb0f5e50790acaf875b92'
             '9c874f9ee68dc1c46fab1255f28bdca892e664b35208220db77ab59e04617a96')
diff --git a/libre/libosinfo/PKGBUILD b/libre/libosinfo/PKGBUILD
index e7728929c..ca273f032 100644
--- a/libre/libosinfo/PKGBUILD
+++ b/libre/libosinfo/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=libosinfo
 pkgver=1.0.0
-pkgrel=1.parabola1
-pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems"
+pkgrel=1.parabola2
+pkgdesc="GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without non-FSDG compliant distros and operating systems support"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://libosinfo.org/"
 license=('GPL' 'LGPL')
diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD
index 81eb3387b..61c865d05 100644
--- a/libre/ruby/PKGBUILD
+++ b/libre/ruby/PKGBUILD
@@ -6,9 +6,9 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=(ruby ruby-docs)
-pkgver=2.3.2
+pkgver=2.3.3
 _jsonver=1.8.1
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 arch=(i686 x86_64 armv7h)
 url='http://www.ruby-lang.org/en/'
 license=(BSD custom)
@@ -21,9 +21,9 @@ source=(https://repo.parabola.nu/other/ruby-libre/ruby-libre-${pkgver}.tar.xz
         remove-nonfree-json-references.patch
         remove-nonfree-ruby-references.patch
         gemrc)
-mksha1sums=('b7c780dbfc34b5baea116504ae700f68c92379a0'
+mksha1sums=('f2318460606d410e80dd5c82862a93e5736534de'
             '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560')
-sha1sums=('c6f3ab170b6a772057d4e338ff2c728e3f42a41b'
+sha1sums=('0759618f0dbfbd9b8beaa6add6c76bd98932e215'
           '2cd288d00c5211e4c9d9338080b30af65cbb143a'
           '0ba1010a271e6fcc1734f7382b99963f46133ea5'
           'da8bdd298104be19221d5ba5353b992d07943840'
diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD
index d518fa99b..32ed45cab 100644
--- a/libre/virt-manager/PKGBUILD
+++ b/libre/virt-manager/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=virt-manager
 pkgname=virt-install
 pkgver=1.4.0
 pkgrel=2.parabola3
-pkgdesc="Console user interface for managing virtual machines, without support for nonfree systems"
+pkgdesc="Console user interface for managing virtual machines, without non-FSDG compliant distros and operating systems support"
 arch=('any')
 url="http://virt-manager.org/"
 license=('GPL')