summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/0ad/PKGBUILD4
-rw-r--r--community/0ad/boost-1.50.patch39
-rw-r--r--community/dnscrypt-proxy/PKGBUILD20
-rw-r--r--community/enet/PKGBUILD6
-rw-r--r--community/fio/PKGBUILD6
-rw-r--r--community/gource/PKGBUILD8
-rw-r--r--community/kcm-touchpad/PKGBUILD6
-rw-r--r--community/kdeconnect/PKGBUILD6
-rw-r--r--community/libsodium/PKGBUILD12
-rw-r--r--community/mfs/PKGBUILD29
-rw-r--r--community/mfs/mfscgiserv.service2
-rw-r--r--community/mfs/mfschunkserver.service3
-rw-r--r--community/mfs/mfsmaster.service2
-rw-r--r--community/mfs/mfsmetalogger.service2
-rw-r--r--community/monit/PKGBUILD6
-rw-r--r--community/monit/monit.changelog3
-rw-r--r--community/speed-dreams/PKGBUILD4
-rw-r--r--community/stuntrally/PKGBUILD6
-rwxr-xr-xcommunity/xnoise/PKGBUILD4
-rw-r--r--community/xnoise/xnoise.install2
-rw-r--r--community/zeromq/PKGBUILD4
-rw-r--r--core/sudo/PKGBUILD6
-rw-r--r--extra/ardour/PKGBUILD6
-rw-r--r--extra/enlightenment/PKGBUILD8
-rw-r--r--extra/gnome-desktop/PKGBUILD6
-rw-r--r--extra/libcryptui/PKGBUILD10
-rw-r--r--extra/llvm/PKGBUILD38
-rw-r--r--extra/llvm/clang-3.4-fstack-protector-strong.patch165
28 files changed, 280 insertions, 133 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index 406461c25..fa0c32833 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 105901 2014-02-18 12:42:08Z bpiotrowski $
+# $Id: PKGBUILD 111146 2014-05-14 18:11:18Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
pkgname=0ad
pkgver=a15
_pkgver=0.0.15-alpha
-pkgrel=4
+pkgrel=5
pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
arch=('i686' 'x86_64')
url="http://play0ad.com/"
diff --git a/community/0ad/boost-1.50.patch b/community/0ad/boost-1.50.patch
deleted file mode 100644
index 26ebd3e96..000000000
--- a/community/0ad/boost-1.50.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp
---- 0ad-r11863-alpha/source/graphics/TextureManager.cpp 2012-02-19 04:30:59.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp 2012-07-10 21:00:52.753251312 +0200
-@@ -425,9 +425,9 @@
- CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath);
- if (f)
- files.push_back(f);
-- p = p / *it;
-+ p = p / it->wstring();
- }
-- return m_TextureConverter.ComputeSettings(srcPath.leaf(), files);
-+ return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files);
- }
-
- /**
-diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h
---- 0ad-r11863-alpha/source/lib/pch/pch_boost.h 2012-02-16 19:01:10.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h 2012-07-10 19:51:38.413009623 +0200
-@@ -25,7 +25,7 @@
-
- // the following boost libraries have been included in TR1 and are
- // thus deemed usable:
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem.hpp>
- namespace fs = boost::filesystem;
- #include <boost/shared_ptr.hpp>
-diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp
---- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 2011-05-25 12:39:13.000000000 +0200
-+++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp 2012-07-10 20:55:52.523233843 +0200
-@@ -53,7 +53,7 @@
- fs::wpath components = pathname.string();
- fs::wpath::iterator it = components.begin();
- std::advance(it, 2);
-- std::wstring dirname = *it;
-+ std::wstring dirname = it->wstring();
-
- CScriptValRooted ai;
- self->m_ScriptInterface.Eval("({})", ai);
diff --git a/community/dnscrypt-proxy/PKGBUILD b/community/dnscrypt-proxy/PKGBUILD
index be3e273d3..e15035051 100644
--- a/community/dnscrypt-proxy/PKGBUILD
+++ b/community/dnscrypt-proxy/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 101137 2013-11-18 07:26:01Z fyan $
+# $Id: PKGBUILD 111112 2014-05-14 03:44:59Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Techlive Zheng <techlivezheng at gmail dot com>
# Contributor: peace4all <markspost at rocketmail dot com>
pkgname=dnscrypt-proxy
-pkgver=1.3.3
-pkgrel=3
+pkgver=1.4.0
+pkgrel=1
pkgdesc="A tool for securing communications between a client and a DNS resolver"
arch=('i686' 'x86_64')
url="http://dnscrypt.org/"
license=('custom:ISC')
-depends=(libsodium)
-source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2
- conf.d.file
+depends=('libsodium')
+makedepends=('clang')
+source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2
+ conf.d.file
dnscrypt-proxy.service)
backup=(etc/conf.d/dnscrypt-proxy)
build() {
cd $pkgname-$pkgver
- CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr --sbindir=/usr/bin
+ export CC=clang
+ CFLAGS="${CFLAGS/-fstack-protector-strong/} -fPIC"
+
+ ./configure --prefix=/usr --sbindir=/usr/bin
make -j2
}
@@ -33,6 +37,6 @@ package() {
install -m 644 "$srcdir"/dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system
}
-sha512sums=('c8e9484485f060aa90a36ef097506b1042348c85b74d0e5bfdeefa8bf8f80e42ae79d4568f524bb6de0754b125ed4f4b39a177f6fdee9e4616e7d0c3641aec0b'
+sha512sums=('cf21231d60a12dc413d7ce7d577b3698a2a347caca00c65f18b0fbcb715d872b6839f20863fb6bd69f3dee3b2836d6db8d446de5c0ec4925e3b4c75d5d5c4d47'
'26e5ce3198c25ff25542dc399f2bb5467ac349dbc11c2ebd6d3ba978ffaef09607088d9401e62ba33c6f50b8b29a59f56fe97d964f55e63ee9d8ca23862c3e00'
'9a1072f83e83e55dcdd7b80d1943f60963fa240da8a50d7491cc219797c6b85b8d79d087c0f7bb9766a4d467dec58eaae2bef31b759652545ace65a6a8afb608')
diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD
index b404f25b8..d4499c298 100644
--- a/community/enet/PKGBUILD
+++ b/community/enet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103880 2014-01-13 09:10:15Z svenstaro $
+# $Id: PKGBUILD 111129 2014-05-14 14:59:53Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Bj?indeijer <bjorn@lindeijer.nl>
pkgname=enet
-pkgver=1.3.11
+pkgver=1.3.12
pkgrel=1
pkgdesc='A relatively thin, simple and robust network communication layer on top of UDP.'
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url='http://enet.bespin.org/'
license=('custom')
depends=('glibc')
source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('f1b2e49aa2bbdd7d75e889f3f6d3b0c1a56b6080')
+sha1sums=('5fd9ef590dc7bcff652e99fef3e7241b3a743f25')
build() {
cd "${pkgname}-${pkgver}"
diff --git a/community/fio/PKGBUILD b/community/fio/PKGBUILD
index 7f65d28fe..5a9b03ee3 100644
--- a/community/fio/PKGBUILD
+++ b/community/fio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109224 2014-04-11 20:13:21Z anatolik $
+# $Id: PKGBUILD 111144 2014-05-14 17:42:15Z anatolik $
# Maintainer: Anatol Pomozov <anatol dot pomozov at gmail>
# Contributor: Mariusz Libera <mariusz.libera@gmail.com>
# Contributor: John Williams <jwilliams4200 liamg reverse&remove moc>
pkgname=fio
-pkgver=2.1.8
+pkgver=2.1.9
pkgrel=1
pkgdesc='Scriptable I/O tool for storage benchmarks and drive testing'
arch=(i686 x86_64)
@@ -17,7 +17,7 @@ optdepends=(
'gnuplot: generating plots using fio_generate_plots'
)
source=(http://brick.kernel.dk/snaps/fio-$pkgver.tar.bz2)
-sha256sums=('b35eb8309c22ecc4148e4ac608f22b9140638e36cf98c238cb7d5776cd16db16')
+sha256sums=('4ae877939a1a1460ad4d93f7891a15bad8ca7295f441204b12c723758a0d4493')
prepare() {
cd fio-$pkgver
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index 661d4325e..d5f3c4b5c 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 109602 2014-04-16 16:51:36Z svenstaro $
+# $Id: PKGBUILD 111125 2014-05-14 14:19:59Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
pkgname=gource
-pkgver=0.41
-pkgrel=2
+pkgver=0.42
+pkgrel=1
pkgdesc="software version control visualization"
license=(GPL3)
arch=(i686 x86_64)
@@ -12,7 +12,7 @@ url=http://code.google.com/p/gource/
depends=('ftgl' 'sdl2' 'sdl2_image' 'pcre' 'glew' 'boost-libs')
makedepends=('boost' 'glm' 'mesa')
source=(https://github.com/acaudwell/Gource/releases/download/gource-${pkgver}/gource-${pkgver}.tar.gz)
-md5sums=('3d8e0b6588878554e11bc03d19d517c9')
+md5sums=('6ec113bcf6e5524ca175351c0530e08b')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/kcm-touchpad/PKGBUILD b/community/kcm-touchpad/PKGBUILD
index 87e340937..0e0bb2d91 100644
--- a/community/kcm-touchpad/PKGBUILD
+++ b/community/kcm-touchpad/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 107996 2014-03-20 16:39:09Z andrea $
+# $Id: PKGBUILD 111114 2014-05-14 08:57:23Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: A Rojas < nqn1976 @ gmail.com >
# Contributor: Alexander Mezin <mezin.alexander@gmail.com>
pkgname=kcm-touchpad
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc='KCM, daemon and applet for touchpad'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('kdebase-workspace' 'xf86-input-synaptics')
makedepends=('cmake' 'automoc4' 'xorg-server-devel')
install="${pkgname}.install"
source=("https://github.com/sanya-m/kde-touchpad-config/archive/v${pkgver}.tar.gz")
-md5sums=('bed551868cdadf510582e32ea608243a')
+md5sums=('e8905e7888f3a6f002338fdf1417a5b5')
prepare() {
mkdir build
diff --git a/community/kdeconnect/PKGBUILD b/community/kdeconnect/PKGBUILD
index 805f6816b..0f5bbce41 100644
--- a/community/kdeconnect/PKGBUILD
+++ b/community/kdeconnect/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106826 2014-03-08 18:24:15Z andrea $
+# $Id: PKGBUILD 111116 2014-05-14 09:00:22Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
pkgname=kdeconnect
-pkgver=0.5.1
+pkgver=0.5.2
pkgrel=1
pkgdesc='Adds communication between KDE and your smartphone'
url='https://projects.kde.org/projects/playground/base/kdeconnect-kde'
@@ -14,7 +14,7 @@ makedepends=('automoc4' 'cmake')
#optdepends=('sshfs: remote filesystem browser')
install="${pkgname}.install"
source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-kde-${pkgver}.tar.xz")
-md5sums=('0b85af9a0cd7e3feacffa2c0210dc1ec')
+md5sums=('f381cb426098a0032544c0c7a9509e96')
prepare() {
mkdir build
diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD
index da1b341a7..5cc15961a 100644
--- a/community/libsodium/PKGBUILD
+++ b/community/libsodium/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 100860 2013-11-12 10:28:49Z fyan $
+# $Id: PKGBUILD 111111 2014-05-14 03:38:53Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: namelessjon <jonathan.stott@gmail.com>
# Contributor: Alessio Sergi <asergi at archlinux dot us>
pkgname=libsodium
-pkgver=0.4.5
-pkgrel=2
+pkgver=0.5.0
+pkgrel=1
pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
arch=('i686' 'x86_64')
url="https://github.com/jedisct1/libsodium"
license=('custom:ISC')
depends=('glibc')
+makedepends=('clang')
source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz)
build() {
cd "$pkgname-$pkgver"
+ export CC=clang
+ CFLAGS=${CFLAGS/-fstack-protector-strong/}
+
./configure --prefix=/usr
make
}
@@ -34,4 +38,4 @@ package() {
}
# vim:set ts=2 sw=2 et:
-sha512sums=('6105bb91982e040420312f042bb71547f0208ed9b2928b1740a68134b82dd4566f18c0761b8959a85d13b6770edbd977d989bc74eabc9bfa5e0000f5ab5c7b32')
+sha512sums=('6a483a4699daaa9f047fd362b405b21eb058c44e240f0f910fbd2167239f51bc092e807f875fc971a1e70decc6fa861b6904bef86156b27790960aba88ce253a')
diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index 6963d5078..e5011ddb5 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 99912 2013-10-31 02:26:00Z allan $
+# $Id: PKGBUILD 111118 2014-05-14 12:21:40Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Thomas S Hatch <thatch45@gmail.com>
+# Contributor: Martin "mortbauer" <mortbauer@gmail.com>
pkgbase=mfs
pkgname=('mfs-master' 'mfs-chunkserver' 'mfs-client')
-pkgver=1.6.27_1
+pkgver=1.6.27_5
pkgrel=1
pkgdesc='MooseFS, fault tolerant, network distributed file system'
url='http://www.moosefs.com/'
@@ -17,17 +18,15 @@ source=("http://www.moosefs.org/tl_files/${pkgbase}code/$pkgbase-${pkgver/_/-}.t
'mfschunkserver.service'
'mfsmetalogger.service'
'mfscgiserv.service')
-sha256sums=('dfe682f0b184ed13e602274825148cd9a7ddfe4f0894e1ab9c1823f66208cb28'
- 'b24fc4f699e7d11fcda00d83a1feb45aa0e6f4f448e675a1857edcf315427fe0'
- '19262bde4dbefb1d3eba09ba7d507595aed9647328a0a7822bbc1915ae3201a7'
- 'bf92e93be68308d53f649de84dc5bbb0fb433e33306b8d0c303be6c6c3e59a55'
- '6725a732c6294ee8817be6c24e3811481bf05e97a0a64108908e2312d7687f1a')
+sha256sums=('5e6d7dd5dfe181ffb6beee44fd2be51b3faf56a71b90b460b2dc717462ff1eeb'
+ '9f67ace1b598b642d0bee53a759dc9618062612491818bc163d852dd6232c225'
+ 'a7b9139cf4d41ce7730e280da34f43c1a5671c1e3b1ae40b871b4814e2076d85'
+ '2d664a28e0822df4c733681863584dee0836ba2b2e3a94733da66bca97b0b55a'
+ 'a3a8a3091b262e091901a1ca031608f42869e1d892466611e709a7fc23099707')
build() {
- cd "$srcdir"
-
msg2 'Building client...'
- cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-client"
+ cp -r "$pkgbase-${pkgver%_*}" "$pkgbase-client"
cd "$pkgbase-client"
./configure \
--prefix=/usr \
@@ -41,7 +40,7 @@ build() {
cd ..
msg2 'Building chunkserver...'
- cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-chunk"
+ cp -r "$pkgbase-${pkgver%_*}" "$pkgbase-chunk"
cd "$pkgbase-chunk"
./configure \
--prefix=/usr \
@@ -55,7 +54,7 @@ build() {
cd ..
msg2 'Building master...'
- cp -r "$pkgbase-${pkgver%_1}" "$pkgbase-master"
+ cp -r "$pkgbase-${pkgver%_*}" "$pkgbase-master"
cd "$pkgbase-master"
./configure \
--prefix=/usr \
@@ -68,7 +67,7 @@ build() {
package_mfs-client() {
depends=('zlib' 'fuse' 'bash')
- cd "$srcdir/$pkgbase-client"
+ cd "$pkgbase-client"
msg2 'Packaging client...'
make DESTDIR="$pkgdir" install
@@ -80,7 +79,7 @@ package_mfs-client() {
package_mfs-chunkserver() {
depends=('zlib' 'bash')
- cd "$srcdir/$pkgbase-chunk"
+ cd "$pkgbase-chunk"
msg2 'Packaging chunkserver...'
make DESTDIR="$pkgdir" install
@@ -97,7 +96,7 @@ package_mfs-chunkserver() {
package_mfs-master() {
depends=('zlib' 'python2')
- cd "$srcdir/$pkgbase-master"
+ cd "$pkgbase-master"
msg2 'Packaging master, metalogger and web interface...'
make DESTDIR="$pkgdir" install
diff --git a/community/mfs/mfscgiserv.service b/community/mfs/mfscgiserv.service
index 09daf41b7..eb10eae59 100644
--- a/community/mfs/mfscgiserv.service
+++ b/community/mfs/mfscgiserv.service
@@ -6,8 +6,6 @@ After=network.target
Type=forking
ExecStart=/usr/bin/mfscgiserv
ExecStop=/bin/kill -15 $MAINPID
-PIDFile=/run/mfs/mfscgiserv.pid
-Restart=always
[Install]
WantedBy=multi-user.target
diff --git a/community/mfs/mfschunkserver.service b/community/mfs/mfschunkserver.service
index 83ef11adc..c0cb98563 100644
--- a/community/mfs/mfschunkserver.service
+++ b/community/mfs/mfschunkserver.service
@@ -6,9 +6,6 @@ After=network.target
Type=forking
ExecStart=/usr/bin/mfschunkserver start
ExecStop=/usr/bin/mfschunkserver stop
-ExecReload=/usr/bin/mfschunkserver reload
-PIDFile=/run/mfs/mfschunkserver.pid
-Restart=always
[Install]
WantedBy=multi-user.target
diff --git a/community/mfs/mfsmaster.service b/community/mfs/mfsmaster.service
index 410774f9a..1a68409e4 100644
--- a/community/mfs/mfsmaster.service
+++ b/community/mfs/mfsmaster.service
@@ -6,8 +6,6 @@ After=network.target
Type=forking
ExecStart=/usr/bin/mfsmaster start
ExecStop=/usr/bin/mfsmaster stop
-PIDFile=/run/mfs/mfsmaster.pid
-Restart=always
[Install]
WantedBy=multi-user.target
diff --git a/community/mfs/mfsmetalogger.service b/community/mfs/mfsmetalogger.service
index 611afc532..26a86f46e 100644
--- a/community/mfs/mfsmetalogger.service
+++ b/community/mfs/mfsmetalogger.service
@@ -6,8 +6,6 @@ After=network.target
Type=forking
ExecStart=/usr/bin/mfsmetalogger start
ExecStop=/usr/bin/mfsmetalogger stop
-PIDFile=/run/mfs/mfsmetalogger.pid
-Restart=always
[Install]
WantedBy=multi-user.target
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index 7f0b7b95e..dce9e36a0 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 108752 2014-04-02 19:28:29Z jlichtblau $
+# $Id: PKGBUILD 111150 2014-05-14 19:38:47Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
# Contributor: Marco Bartholomew <marco@marcobartholomew.com>
pkgname=monit
-pkgver=5.8
+pkgver=5.8.1
pkgrel=1
pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ backup=('etc/monitrc')
changelog=$pkgname.changelog
source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \
monit.service)
-sha256sums=('0c00573ebc0156c534a5952f392c2a7bedde194f8261c05497322055938847f5'
+sha256sums=('a25e4b79257ac29ebaf46605dccb7ed693c8e001669c0ccc8feb22e7d4c870e5'
'cf607209e9e5d39e708152dc181525570371fab750f828e890e2b6a00b81ebc4')
build() {
diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog
index b4e7e7ed6..111587f44 100644
--- a/community/monit/monit.changelog
+++ b/community/monit/monit.changelog
@@ -1,3 +1,6 @@
+2014-05-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * monit 5.8.1-1
+
2014-04-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* monit 5.8-1
diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD
index 897000c29..341e200f1 100644
--- a/community/speed-dreams/PKGBUILD
+++ b/community/speed-dreams/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90093 2013-05-06 19:39:40Z foutrelis $
+# $Id: PKGBUILD 111148 2014-05-14 18:33:17Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com>
# Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD)
pkgname=speed-dreams
pkgver=2.0.0
_pkgver=2.0.0-r4687
-pkgrel=3
+pkgrel=4
pkgdesc="A racing simulator with rich graphics and physics"
arch=('i686' 'x86_64')
url="http://speed-dreams.sourceforge.net/"
diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD
index 45992a3ec..e4301e7f7 100644
--- a/community/stuntrally/PKGBUILD
+++ b/community/stuntrally/PKGBUILD
@@ -4,8 +4,8 @@
# Contributor: Jason Melton <jason.melton@gmail.com>
pkgname=stuntrally
-pkgver=2.2.1
-pkgrel=3
+pkgver=2.3
+pkgrel=2
pkgdesc='Stunt Rally game with track editor, based on VDrift'
arch=('x86_64' 'i686')
license=('GPL3')
@@ -14,7 +14,7 @@ depends=('libvorbis' 'mygui' 'sdl2' 'enet' 'gtk-update-icon-cache' 'stuntrally-d
makedepends=('cmake' 'boost' 'git')
install=stuntrally.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz")
-sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51')
+sha256sums=('828ea8e4a8ea73005e88ef015cb9808cc75d0cb50693a0f4a7d8b09edd0765fd')
build() {
cd "$srcdir/stuntrally-$pkgver/"
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index 2e7eef423..3193ca865 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106330 2014-02-28 07:09:33Z fyan $
+# $Id: PKGBUILD 111139 2014-05-14 16:45:50Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: archtux <antonio dot arias99999 at gmail dot com>
pkgname=xnoise
pkgver=0.2.21
-pkgrel=1
+pkgrel=2
pkgdesc="Media player with a slick GUI, great speed and lots of features."
arch=('i686' 'x86_64')
url="http://www.xnoise-media-player.com/"
diff --git a/community/xnoise/xnoise.install b/community/xnoise/xnoise.install
index 8f2bcd263..d8ce93f97 100644
--- a/community/xnoise/xnoise.install
+++ b/community/xnoise/xnoise.install
@@ -2,6 +2,8 @@
post_install() {
gtk-update-icon-cache -t -f /usr/share/icons/hicolor
update-desktop-database -q
+
+ echo 'You will need to install a gst decoder, either gst-plugins-base (with good/bad/ugly as needed) or gst-libav.'
}
post_upgrade() {
diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD
index 55d36eccc..91d003142 100644
--- a/community/zeromq/PKGBUILD
+++ b/community/zeromq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 108315 2014-03-26 15:56:05Z kkeen $
+# $Id: PKGBUILD 111120 2014-05-14 13:07:12Z fyan $
# Maintainer: Kyle Keen <keenerd@gmail.com>
pkgname=zeromq
pkgver=4.0.4
-pkgrel=2
+pkgrel=3
pkgdesc="Fast messaging system built on sockets. C and C++ bindings. aka 0MQ, ZMQ."
arch=('i686' 'x86_64')
url="http://www.zeromq.org"
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 24fd68940..90d21c0b6 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 208214 2014-03-19 11:02:09Z foutrelis $
+# $Id: PKGBUILD 212365 2014-05-14 06:58:48Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
-_sudover=1.8.10p2
+_sudover=1.8.10p3
pkgver=${_sudover/p/.p}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
@@ -18,7 +18,7 @@ install=$pkgname.install
source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
sudo.tmpfiles.conf
sudo.pam)
-sha256sums=('ba6cb8db6dccdb92a96e8ae63ca65c410f8b61270b603ab9af4b1154fef379f1'
+sha256sums=('6eda135fa68163108f1c24de6975de5ddb09d75730bb62d6390bda7b04345400'
'SKIP'
'080dd97111b3149f8d140ffac68c88acd63da9eacc81fbcc7c43591be13b42fe'
'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 7d8e12c98..f5f6b9ded 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 206373 2014-02-25 08:09:13Z schiv $
+# $Id: PKGBUILD 212421 2014-05-14 18:44:54Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Contributor: see .contrib
pkgname=ardour
_pkgname=Ardour3
-pkgver=3.5.357
+pkgver=3.5.380
pkgrel=1
pkgdesc="Professional-grade digital audio workstation"
arch=('i686' 'x86_64')
@@ -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=('c59265d859263903b60298d47182d785'
+md5sums=('eeed6ed0a22ecf3f1179318ac9594616'
'316bd21ece5e2208a104fd09cac521af')
prepare() {
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index 69ac53edc..9ce21380d 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>>
pkgname=enlightenment
-pkgver=0.18.7
+pkgver=0.18.8
pkgrel=1
pkgdesc="Enlightenment window manager"
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ backup=('etc/enlightenment/sysactions.conf'
'etc/xdg/menus/enlightenment.menu')
source=(http://download.enlightenment.org/rel/apps/${pkgname}/$pkgname-$pkgver.tar.gz)
install=enlightenment.install
-sha1sums=('eb981cf0c4d6716c7e6ee35c9c7f7dbd6c8940b9')
+sha1sums=('71d6212fc55ba65a47d656b0bc4891684445e3ff')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,8 +27,8 @@ build() {
export CFLAGS="$CFLAGS -fvisibility=hidden"
./configure --prefix=/usr --sysconfdir=/etc \
- --enable-wayland-egl
-# --enable-wayland-clients # compilation fails with this flag
+ --enable-wayland-egl \
+ --enable-wayland-clients
make
}
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index d7f8cdf88..0acc5d206 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 211245 2014-04-18 11:30:42Z heftig $
+# $Id: PKGBUILD 212360 2014-05-13 22:10:54Z jgc $
# Maintainer: Jan de Groot <jan@archlinux.org>
pkgname=gnome-desktop
-pkgver=3.12.1
+pkgver=3.12.2
pkgrel=1
epoch=1
pkgdesc="Library with common API for various GNOME modules"
@@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection itstool)
url="http://www.gnome.org"
groups=(gnome)
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('853604f55158343d7220a557f4705aa3270770fa47f5c0453d7fdde61f8c0691')
+sha256sums=('b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD
index 38b6ca79f..39b419171 100644
--- a/extra/libcryptui/PKGBUILD
+++ b/extra/libcryptui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 207740 2014-03-14 04:21:04Z heftig $
+# $Id: PKGBUILD 212358 2014-05-13 22:05:08Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Balló György <ballogyor+arch at gmail dot com>
pkgname=libcryptui
-pkgver=3.10.1
-pkgrel=2
+pkgver=3.12.2
+pkgrel=1
pkgdesc="Library for OpenPGP prompts"
arch=('i686' 'x86_64')
url="http://git.gnome.org/browse/libcryptui/"
@@ -12,8 +12,8 @@ license=('GPL')
depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf' 'libsm')
makedepends=('intltool' 'gobject-introspection')
install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e3e82e647ac4fb74ed46b4fffbf89e80198f856e1509f5edcd47dd2751a4be0')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index 4f4f057a1..bd2649240 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212082 2014-05-06 14:39:43Z foutrelis $
+# $Id: PKGBUILD 212366 2014-05-14 06:58:53Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,42 +11,54 @@
pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
'clang-tools-extra')
-pkgver=3.4
+pkgver=3.4.1
+_base_ver=3.4
pkgrel=2
arch=('i686' 'x86_64')
url="http://llvm.org/"
license=('custom:University of Illinois/NCSA Open Source License')
makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
options=('staticlibs')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
- http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz
- http://llvm.org/releases/$pkgver/clang-tools-extra-$pkgver.src.tar.gz
- http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
+source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz{,.sig}
+ http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz{,.sig}
+ http://llvm.org/releases/$_base_ver/clang-tools-extra-$_base_ver.src.tar.gz{,.sig}
+ http://llvm.org/releases/$_base_ver/compiler-rt-$_base_ver.src.tar.gz{,.sig}
clang-3.3-use-gold-linker.patch
clang-3.4-max_align_t.patch
+ clang-3.4-fstack-protector-strong.patch
llvm-3.4-provide-cmake-modules.patch
llvm-Config-config.h
llvm-Config-llvm-config.h)
-sha256sums=('25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628'
- '22a9780db3b85a7f2eb9ea1f7f6e00da0249e3d12851e8dea0f62f1783242b1b'
+sha256sums=('7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a'
+ 'SKIP'
+ 'ab83f30951b34d75729026e0e73c180a728a140f2a02cbb8915805051a9d6bb7'
+ 'SKIP'
'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4'
+ 'SKIP'
'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c'
+ 'SKIP'
'8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
'0f0cbff69af54e83383385abbdeb1fee23e6e69427f8530060c492c0b07c2bbe'
+ '7a2a1ddc94f67e643c1ab74601ec07deb6d5d344d4b19ed17c900afb2f6f2863'
'b6bb154d5ec998328e818bb09acfc6229e41367ba45cea7cc5b2dd2a7c835cf5'
'312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
'597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48')
prepare() {
+ # Change directory names to release names so we don't need to change the
+ # whole PKGBUILD
+ mv llvm-$pkgver{.src,}
+ mv cfe-$pkgver.src clang-$pkgver
+
cd "$srcdir/llvm-$pkgver"
# At the present, clang must reside inside the LLVM source code tree to build
# See http://llvm.org/bugs/show_bug.cgi?id=4840
mv "$srcdir/clang-$pkgver" tools/clang
- mv "$srcdir/clang-tools-extra-$pkgver" tools/clang/tools/extra
+ mv "$srcdir/clang-tools-extra-$_base_ver" tools/clang/tools/extra
- mv "$srcdir/compiler-rt-$pkgver" projects/compiler-rt
+ mv "$srcdir/compiler-rt-$_base_ver" projects/compiler-rt
# Fix docs installation directory
sed -i 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
@@ -59,6 +71,10 @@ prepare() {
# http://reviews.llvm.org/rL201729
patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-max_align_t.patch"
+ # Add command line option -fstack-protector-strong
+ # http://reviews.llvm.org/rL201120
+ patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-fstack-protector-strong.patch"
+
# Provide CMake modules (FS#38705)
# http://reviews.llvm.org/rL201047
# http://reviews.llvm.org/rL201048
@@ -113,6 +129,7 @@ package_llvm() {
# The runtime library goes into llvm-libs
mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
+ rm "$pkgdir/usr/lib/libLLVM-$_base_ver.so"
# OCaml bindings go to a separate package
rm -rf "$srcdir"/{ocaml,ocamldoc}
@@ -158,6 +175,7 @@ package_llvm-libs() {
depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so"
+ ln -s libLLVM-$pkgver.so "$pkgdir/usr/lib/libLLVM-$_base_ver.so"
install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/extra/llvm/clang-3.4-fstack-protector-strong.patch b/extra/llvm/clang-3.4-fstack-protector-strong.patch
new file mode 100644
index 000000000..bda41fe1b
--- /dev/null
+++ b/extra/llvm/clang-3.4-fstack-protector-strong.patch
@@ -0,0 +1,165 @@
+Index: test/Driver/stack-protector.c
+===================================================================
+--- test/Driver/stack-protector.c (revision 201119)
++++ test/Driver/stack-protector.c (revision 201120)
+@@ -15,3 +15,11 @@
+
+ // RUN: %clang -target i386-pc-openbsd -fno-stack-protector -### %s 2>&1 | FileCheck %s -check-prefix=OPENBSD_OFF
+ // OPENBSD_OFF-NOT: "-stack-protector"
++
++// RUN: %clang -fstack-protector-strong -### %s 2>&1 | FileCheck %s -check-prefix=SSP-STRONG
++// SSP-STRONG: "-stack-protector" "2"
++// SSP-STRONG-NOT: "-stack-protector-buffer-size"
++
++// RUN: %clang -fstack-protector-all -### %s 2>&1 | FileCheck %s -check-prefix=SSP-ALL
++// SSP-ALL: "-stack-protector" "3"
++// SSP-ALL-NOT: "-stack-protector-buffer-size"
+Index: test/CodeGen/stack-protector.c
+===================================================================
+--- test/CodeGen/stack-protector.c (revision 201119)
++++ test/CodeGen/stack-protector.c (revision 201120)
+@@ -2,7 +2,9 @@
+ // NOSSP: define void @test1(i8* %msg) #0 {
+ // RUN: %clang_cc1 -emit-llvm -o - %s -stack-protector 1 | FileCheck -check-prefix=WITHSSP %s
+ // WITHSSP: define void @test1(i8* %msg) #0 {
+-// RUN: %clang_cc1 -emit-llvm -o - %s -stack-protector 2 | FileCheck -check-prefix=SSPREQ %s
++// RUN: %clang_cc1 -emit-llvm -o - %s -stack-protector 2 | FileCheck -check-prefix=SSPSTRONG %s
++// SSPSTRONG: define void @test1(i8* %msg) #0 {
++// RUN: %clang_cc1 -emit-llvm -o - %s -stack-protector 3 | FileCheck -check-prefix=SSPREQ %s
+ // SSPREQ: define void @test1(i8* %msg) #0 {
+
+ typedef __SIZE_TYPE__ size_t;
+@@ -21,4 +23,6 @@
+
+ // WITHSSP: attributes #{{.*}} = { nounwind ssp{{.*}} }
+
++// SSPSTRONG: attributes #{{.*}} = { nounwind sspstrong{{.*}} }
++
+ // SSPREQ: attributes #{{.*}} = { nounwind sspreq{{.*}} }
+Index: include/clang/Basic/LangOptions.h
+===================================================================
+--- include/clang/Basic/LangOptions.h (revision 201119)
++++ include/clang/Basic/LangOptions.h (revision 201120)
+@@ -58,7 +58,7 @@
+ typedef clang::Visibility Visibility;
+
+ enum GCMode { NonGC, GCOnly, HybridGC };
+- enum StackProtectorMode { SSPOff, SSPOn, SSPReq };
++ enum StackProtectorMode { SSPOff, SSPOn, SSPStrong, SSPReq };
+
+ enum SignedOverflowBehaviorTy {
+ SOB_Undefined, // Default C standard behavior.
+Index: include/clang/Driver/ToolChain.h
+===================================================================
+--- include/clang/Driver/ToolChain.h (revision 201119)
++++ include/clang/Driver/ToolChain.h (revision 201120)
+@@ -196,7 +196,7 @@
+ virtual bool UseObjCMixedDispatch() const { return false; }
+
+ /// GetDefaultStackProtectorLevel - Get the default stack protector level for
+- /// this tool chain (0=off, 1=on, 2=all).
++ /// this tool chain (0=off, 1=on, 2=strong, 3=all).
+ virtual unsigned GetDefaultStackProtectorLevel(bool KernelOrKext) const {
+ return 0;
+ }
+Index: include/clang/Driver/Options.td
+===================================================================
+--- include/clang/Driver/Options.td (revision 201119)
++++ include/clang/Driver/Options.td (revision 201120)
+@@ -675,7 +675,8 @@
+ Flags<[CC1Option]>, HelpText<"Do not include source location information with diagnostics">;
+ def fno_spell_checking : Flag<["-"], "fno-spell-checking">, Group<f_Group>,
+ Flags<[CC1Option]>, HelpText<"Disable spell-checking">;
+-def fno_stack_protector : Flag<["-"], "fno-stack-protector">, Group<f_Group>;
++def fno_stack_protector : Flag<["-"], "fno-stack-protector">, Group<f_Group>,
++ HelpText<"Disable the use of stack protectors">;
+ def fno_strict_aliasing : Flag<["-"], "fno-strict-aliasing">, Group<f_Group>;
+ def fstruct_path_tbaa : Flag<["-"], "fstruct-path-tbaa">, Group<f_Group>;
+ def fno_struct_path_tbaa : Flag<["-"], "fno-struct-path-tbaa">, Group<f_Group>;
+@@ -773,8 +774,12 @@
+ def fno_signed_char : Flag<["-"], "fno-signed-char">, Flags<[CC1Option]>,
+ Group<clang_ignored_f_Group>, HelpText<"Char is unsigned">;
+ def fsplit_stack : Flag<["-"], "fsplit-stack">, Group<f_Group>;
+-def fstack_protector_all : Flag<["-"], "fstack-protector-all">, Group<f_Group>;
+-def fstack_protector : Flag<["-"], "fstack-protector">, Group<f_Group>;
++def fstack_protector_all : Flag<["-"], "fstack-protector-all">, Group<f_Group>,
++ HelpText<"Force the usage of stack protectors for all functions">;
++def fstack_protector_strong : Flag<["-"], "fstack-protector-strong">, Group<f_Group>,
++ HelpText<"Use a strong heuristic to apply stack protectors to functions">;
++def fstack_protector : Flag<["-"], "fstack-protector">, Group<f_Group>,
++ HelpText<"Enable stack protectors for functions potentially vulnerable to stack smashing">;
+ def fstrict_aliasing : Flag<["-"], "fstrict-aliasing">, Group<f_Group>;
+ def fstrict_enums : Flag<["-"], "fstrict-enums">, Group<f_Group>, Flags<[CC1Option]>,
+ HelpText<"Enable optimizations based on the strict definition of an enum's "
+Index: lib/Frontend/CompilerInvocation.cpp
+===================================================================
+--- lib/Frontend/CompilerInvocation.cpp (revision 201119)
++++ lib/Frontend/CompilerInvocation.cpp (revision 201120)
+@@ -1435,7 +1435,8 @@
+ break;
+ case 0: Opts.setStackProtector(LangOptions::SSPOff); break;
+ case 1: Opts.setStackProtector(LangOptions::SSPOn); break;
+- case 2: Opts.setStackProtector(LangOptions::SSPReq); break;
++ case 2: Opts.setStackProtector(LangOptions::SSPStrong); break;
++ case 3: Opts.setStackProtector(LangOptions::SSPReq); break;
+ }
+
+ // Parse -fsanitize= arguments.
+Index: lib/Frontend/InitPreprocessor.cpp
+===================================================================
+--- lib/Frontend/InitPreprocessor.cpp (revision 201119)
++++ lib/Frontend/InitPreprocessor.cpp (revision 201120)
+@@ -695,8 +695,10 @@
+
+ if (LangOpts.getStackProtector() == LangOptions::SSPOn)
+ Builder.defineMacro("__SSP__");
++ else if (LangOpts.getStackProtector() == LangOptions::SSPStrong)
++ Builder.defineMacro("__SSP_STRONG__", "2");
+ else if (LangOpts.getStackProtector() == LangOptions::SSPReq)
+- Builder.defineMacro("__SSP_ALL__", "2");
++ Builder.defineMacro("__SSP_ALL__", "3");
+
+ if (FEOpts.ProgramAction == frontend::RewriteObjC)
+ Builder.defineMacro("__weak", "__attribute__((objc_gc(weak)))");
+Index: lib/Driver/Tools.cpp
+===================================================================
+--- lib/Driver/Tools.cpp (revision 201119)
++++ lib/Driver/Tools.cpp (revision 201120)
+@@ -10,6 +10,7 @@
+ #include "Tools.h"
+ #include "InputInfo.h"
+ #include "ToolChains.h"
++#include "clang/Basic/LangOptions.h"
+ #include "clang/Basic/ObjCRuntime.h"
+ #include "clang/Basic/Version.h"
+ #include "clang/Driver/Action.h"
+@@ -3114,11 +3115,14 @@
+ unsigned StackProtectorLevel = 0;
+ if (Arg *A = Args.getLastArg(options::OPT_fno_stack_protector,
+ options::OPT_fstack_protector_all,
++ options::OPT_fstack_protector_strong,
+ options::OPT_fstack_protector)) {
+ if (A->getOption().matches(options::OPT_fstack_protector))
+- StackProtectorLevel = 1;
++ StackProtectorLevel = LangOptions::SSPOn;
++ else if (A->getOption().matches(options::OPT_fstack_protector_strong))
++ StackProtectorLevel = LangOptions::SSPStrong;
+ else if (A->getOption().matches(options::OPT_fstack_protector_all))
+- StackProtectorLevel = 2;
++ StackProtectorLevel = LangOptions::SSPReq;
+ } else {
+ StackProtectorLevel =
+ getToolChain().GetDefaultStackProtectorLevel(KernelOrKext);
+Index: lib/CodeGen/CodeGenModule.cpp
+===================================================================
+--- lib/CodeGen/CodeGenModule.cpp (revision 201119)
++++ lib/CodeGen/CodeGenModule.cpp (revision 201120)
+@@ -651,6 +651,8 @@
+
+ if (LangOpts.getStackProtector() == LangOptions::SSPOn)
+ B.addAttribute(llvm::Attribute::StackProtect);
++ else if (LangOpts.getStackProtector() == LangOptions::SSPStrong)
++ B.addAttribute(llvm::Attribute::StackProtectStrong);
+ else if (LangOpts.getStackProtector() == LangOptions::SSPReq)
+ B.addAttribute(llvm::Attribute::StackProtectReq);
+