Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (ee316f4dd37ed0d8c6f689d06a68ffdd902c6a1b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (ee316f4dd37ed0d8c6f689d06a68ffdd902c6a1b)
  • Date: Fri, 15 May 2015 03:52:53 -0500

GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert
<treeve AT sourcemage.org>:

ChangeLog
| 3
archive/burp/DETAILS
| 6
archive/burp/HISTORY
| 3
crypto/nss/DETAILS
| 4
crypto/nss/HISTORY
| 3
devel/florist/DETAILS
| 9 -
devel/florist/HISTORY
| 3
devel/ncc/DETAILS
| 4
devel/ncc/HISTORY
| 3
http/firefox/DEPENDS
| 2
http/firefox/DETAILS
| 6
http/firefox/HISTORY
| 4
kernels/linux/HISTORY
| 10 +
kernels/linux/info/patches/maintenance_patches_3/patch-3.10.78
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.42
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.19.8
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.69
| 5
kernels/linux/info/patches/maintenance_patches_4/patch-4.0.3
| 5
kernels/linux/latest.defaults
| 2
libs/assimp/BUILD
| 1
libs/assimp/DEPENDS
| 6
libs/assimp/DETAILS
| 20 ++
libs/assimp/HISTORY
| 3

net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
| 42 +++++
net/wpa_supplicant/DETAILS
| 1
net/wpa_supplicant/HISTORY
| 4
net/wpa_supplicant/PRE_BUILD
| 6
plasma/polkit-kde/CONFIGURE
| 1
plasma/polkit-kde/DEPENDS
| 10 -
plasma/polkit-kde/DETAILS
| 14 -
plasma/polkit-kde/HISTORY
| 15 -
plasma/polkit-kde5/CONFIGURE
| 1
plasma/polkit-kde5/DEPENDS
| 10 +
plasma/polkit-kde5/DETAILS
| 15 +
plasma/polkit-kde5/HISTORY
| 18 ++
security/wireshark/DETAILS
| 6
security/wireshark/HISTORY
| 3
utils/xen/DETAILS
| 6
utils/xen/HISTORY
| 7
utils/xen/PRE_BUILD
| 13 +
utils/xen/xsa133-qemut.patch
| 80 +++++++++
utils/xen/xsa133-qemuu-4.3-4.2.patch
| 84 ++++++++++
utils/xen/xsa133-qemuu.patch
| 84 ++++++++++
video-libs/libbluray/DEPENDS
| 9 -
video-libs/libbluray/DETAILS
| 4
video-libs/libbluray/HISTORY
| 4
46 files changed, 487 insertions(+), 67 deletions(-)

New commits:
commit 041fde245d52494eb2302732ba8275ec340a5896
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

polkit-kde5: => 5.3.0

commit 5e37b38c4308a89571b5506eea1b12314bdd5009
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libbluray 0.8.0

commit 421ef6c97baad9ab99198d21d39f9c8a259aab74
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/florist: version 2014

commit 3d25544cfd052e8c2e7e314dbd54394db89ea915
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

libs/assimp: new spell, an import library for 3D models

commit 37132667b975ab71734fbbe8f1a4c34b8c395fdb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.2.69 (lts)

commit c146afc0adcbb7b3ba7bbd0a7f251ed2b2761f0a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.10.78 (lts)

commit 36273b299d8ae5675c852fd531d5d4e2b7ed9b44
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.14.42 (lts)

commit a5fec9bccbce6b561af3241030d7cee1892a2b9b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.19.8 (eol)

commit cc96ff53601255ff00473f5cd48269f50bc32a0f
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

linux 4.0.3

commit e321b1381031bdd83d8a322cf2e24364fef8a734
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xen: => 4.4.2 [security]

commit b8885dc8b2a8383ba5b02cd229b8412ed8226378
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ncc 2.8

commit c8b00ae6ead3f5374db9e8626d811096effc6bf6
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

wireshark 1.12.5, SECURITY_PATCH=53

commit 05765cd51588ca59aa0c9bcc74a8a50afe2af244
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

burp: => 1.4.36 (devel)

commit 2136a6ed3e7ddfc22e904433a44371d8e6caf2c3
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

wpa_supplicant: add patch for that buffer overflow

commit 0d8f738789bf17d3fa99ec1017122a5b3985eb1e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

http/firefox: version 38.0, SECURITY_PATCH++

commit c52c2fc28a37e535156af2ab54d4b207f053c739
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

nss 3.18.1

diff --git a/ChangeLog b/ChangeLog
index af3c22f..9e2acb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * libs/assimp: new spell, an importer library for 3D models
+
2015-05-09 Vlad Glagolev <stealth AT sourcemage.org>
* archive/lzma-utils: spell deprecated, in favour of xz-utils

diff --git a/archive/burp/DETAILS b/archive/burp/DETAILS
index a72c99d..0783c13 100755
--- a/archive/burp/DETAILS
+++ b/archive/burp/DETAILS
@@ -11,11 +11,11 @@ case "$BURP_BRANCH" in
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
;;
devel)
- VERSION=1.4.32
+ VERSION=1.4.36
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:020947ab4f957a3dc99d65dc9197c6a65f205756b55ff2dfc4c3340e28c88f1b6ddaf579373c969c6b1af1050be8af0bc3756281a0b3a1ea9ff5b775aaed29ae
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
+
SOURCE_HASH=sha512:a01096cdd0c71cc9352b8d7d5ab93c53ecfbfcc1fec4545d5442d4fc80d918a6c9332031a0165214bdc5d69bfdd79811c413b86d99b0597184333734e2037ce5
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
;;
stable)
VERSION=1.3.48
diff --git a/archive/burp/HISTORY b/archive/burp/HISTORY
index e0270d6..bf6434a 100644
--- a/archive/burp/HISTORY
+++ b/archive/burp/HISTORY
@@ -1,3 +1,6 @@
+2015-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.36 (devel)
+
2015-02-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.32 (devel)

diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index 42cc23e..b4fcea7 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -20,8 +20,8 @@ case $NSS_BRANCH in
SECURITY_PATCH=2
;;
3.18)
- VERSION=3.18
-
SOURCE_HASH=sha512:b9ba1feed47ea6e650a3b746691134907cd7682748aed0d65ab5d15cbf07ab00010caabc0375f5d2d88d47277d002cddc299a57053e954e191205070b3a8297b
+ VERSION=3.18.1
+
SOURCE_HASH=sha512:00c2893b5aa74038661f7353ebc8200746de1757cec61072717a89ec10292040a1dd954aaf688fbcf68261031ec30e85e6fe9ab46283e202e8b62b06e05fa616
;;
esac
SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 530ab08..23cdb20 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,6 @@
+2015-05-12 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.18.1
+
2015-03-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS, SUB_DEPENDS: version
3.18

diff --git a/devel/florist/DETAILS b/devel/florist/DETAILS
index a711bb6..9007028 100755
--- a/devel/florist/DETAILS
+++ b/devel/florist/DETAILS
@@ -1,10 +1,9 @@
SPELL=florist
- VERSION=2012
- PATCHLEVEL=1
+ VERSION=2014
SOURCE="${SPELL}-gpl-${VERSION}-src.tgz"
-
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/47d2e0f943f4c34f5812df70c5a6c0379b7cf4fa'
-
SOURCE_HASH=sha512:1742756736460f3ca2829c7465a568c177c74ea9417a7bb3e609903672f2fb7b0cbf3f0598bd381c1fd49755b83837583df753e53a03da86ae797028b72c97c5
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-gpl-${VERSION}-src"
+
SOURCE_URL[0]='http://mirrors.cdn.adacore.com/art/224f73e1cd4afd1f0f6ca3bd1ad0191aa7f81e05'
+
SOURCE_HASH=sha512:3dedeadfddb60ba41a41d04eaa5ba045090501b7690bdfdd7859b988d0fdeb54059893450c5c31f82d0825d03465e800e6e5ccdbae2c7a4b8254037b2eeb31b5
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-src"
WEB_SITE="http://libre.adacore.com";
LICENSE[0]=GPL
ENTERED=20100830
diff --git a/devel/florist/HISTORY b/devel/florist/HISTORY
index 07eae67..00d525c 100644
--- a/devel/florist/HISTORY
+++ b/devel/florist/HISTORY
@@ -1,3 +1,6 @@
+2015-05-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2014
+
2013-03-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2012

diff --git a/devel/ncc/DETAILS b/devel/ncc/DETAILS
index f964389..e4a19cf 100755
--- a/devel/ncc/DETAILS
+++ b/devel/ncc/DETAILS
@@ -1,9 +1,9 @@
SPELL=ncc
- VERSION=2.6
+ VERSION=2.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://students.ceid.upatras.gr/~sxanth/ncc/$SOURCE
-
SOURCE_HASH=sha512:28810308268fc8c177e0adffe13206dc1909e374328bf8abc6bd5eb9d2381c728610be0edf47753c7475bc79f2654f72a3c090e86c68bfe146d1c3317415488e
+
SOURCE_HASH=sha512:9fd41e37d5316848127ed4d3d8a5a4e88aa7a4545b62194e74bed9169e22c925ef8dbb612482cc29c16b3ceb0a7bcaa44ba04370aa8c898abfee136e96bbc429
WEB_SITE=http://students.ceid.upatras.gr/~sxanth/ncc/
ENTERED=20041127
LICENSE[0]=ART
diff --git a/devel/ncc/HISTORY b/devel/ncc/HISTORY
index 8becb6c..648fbfb 100644
--- a/devel/ncc/HISTORY
+++ b/devel/ncc/HISTORY
@@ -1,3 +1,6 @@
+2015-05-12 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.8
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 236c12c..f532998 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -23,7 +23,7 @@ depends -sub APNG libpng '--enable-system-png'
&&
depends librsvg2 '--enable-svg' &&

depends nspr '--with-system-nspr' &&
-depends -sub "3.17.x" nss '--with-system-nss' &&
+depends -sub "3.18.x" nss '--with-system-nss' &&

depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 53866d0..2c8830c 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,11 +1,11 @@
SPELL=firefox
- VERSION=37.0.2
+ VERSION=38.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:98f4fab8116f99e108cc450fef8e4b364d07cff33d558012950cb23b64db9a363fe27fbd5734fbb723bc9efe1d0467bd9c94e2304bdd3984c43ff4cfb9207a70
+
SOURCE_HASH=sha512:39e2ac45580a58e6b3c9c44afc75314c7017fafa85a1f96629e63451fe31a9ab7f448263933a760cc8127f4fee4e362b927af025137642c819639c96d60a93bc

SOURCE_URL[0]=http://releases.mozilla.org/pub/mozilla.org/${SPELL}/releases/${VERSION}/source/${SOURCE}

SOURCE_URL[1]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.in2p3.fr/pub/mozilla/$SPELL/releases/$VERSION/source/$SOURCE
- SECURITY_PATCH=84
+ SECURITY_PATCH=85
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://www.mozilla.org/en-US/firefox/fx/
GATHER_DOCS=off
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 736694c..54522c6 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,7 @@
+2015-05-12 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: updated spell to 38.0, SECURITY_PATCH++,
(MFSA-2015-[46-58])
+ * DEPENDS: subdepends on nss 3.18 now
+
2015-04-21 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 37.0.2, SECURITY_PATCH=84

diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 2f079da..7e02a1f 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,13 @@
+2015-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.19.8: added
+ * info/patches/maintenance_patches_3/patch-3.14.42: added
+ * info/patches/maintenance_patches_3/patch-3.10.78: added
+ * info/patches/maintenance_patches_3/patch-3.2.69: added
+
+2015-05-13 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_4=4.0.3
+ * info/patches/maintenance_patches_4/patch-4.0.3: added
+
2015-05-09 Eric Sandall <sandalle AT sourcemage.org>
* info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch: Add
support
for Linux 4.0.x
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.10.78
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.10.78
new file mode 100755
index 0000000..4640b11
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.10.78
@@ -0,0 +1,5 @@
+appliedkernels="3.10"
+patchversion="${appliedkernels}.78"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="073e6744c23015ecb5f409bf834c0f62e59a5ceb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.42
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.42
new file mode 100755
index 0000000..18156c8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.42
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.42"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="b7bd7fa83552b93aa5e5fe055ffcb07148944b34"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.19.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.19.8
new file mode 100755
index 0000000..c338c3f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.19.8
@@ -0,0 +1,5 @@
+appliedkernels="3.19"
+patchversion="${appliedkernels}.8"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="46dd30b8b645e39cd530adcc9e49abe06e86e826"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.69
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.69
new file mode 100755
index 0000000..97ac15b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.69
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.69"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="1b37ecb6349d962bdb88fee67b7ea9c0e5b47bdd"
diff --git a/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.3
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.3
new file mode 100755
index 0000000..d39bbf3
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.3
@@ -0,0 +1,5 @@
+appliedkernels="4.0"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+sha1sum="663106b605da01b1bc8fb7c5cdf5901f93f40b96"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index bd04723..c4673ee 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -4,7 +4,7 @@ LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
LATEST_maintenance_patches_3=patch-3.19.3
-LATEST_maintenance_patches_4=patch-4.0.2
+LATEST_maintenance_patches_4=patch-4.0.3
LATEST_git_patches=patch-2.6.25-rc6-git7
LATEST_2_4=2.4.37.9
LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/assimp/BUILD b/libs/assimp/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/libs/assimp/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/libs/assimp/DEPENDS b/libs/assimp/DEPENDS
new file mode 100755
index 0000000..ad14e3d
--- /dev/null
+++ b/libs/assimp/DEPENDS
@@ -0,0 +1,6 @@
+depends -sub CXX gcc &&
+depends cmake &&
+
+optional_depends boost "-DASSIMP_ENABLE_BOOST_WORKAROUND=ON" \
+ "-DASSIMP_ENABLE_BOOST_WORKAROUND=OFF" \
+ "use functionality from boost"
diff --git a/libs/assimp/DETAILS b/libs/assimp/DETAILS
new file mode 100755
index 0000000..e3ec265
--- /dev/null
+++ b/libs/assimp/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=assimp
+ VERSION=3.1.1
+ SOURCE="${SPELL}-${VERSION}.zip"
+ SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}-3.1/${SOURCE}
+
SOURCE_HASH=sha512:c466d312c0db53fa31b5d1e9b0f65e547a82fb28b1df0a6a96f0dcd876b636a6883d9d705d325193acc58910272b5f158ba37d824ecad29eccf7cf5731697527
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://assimp.sourceforge.net/index.html";
+ LICENSE[0]=BSD
+ ENTERED=20150510
+ SHORT="a portable Open Source library to import various
well-known 3D model formats"
+cat << EOF
+Open Asset Import Library (short name: Assimp) is a portable Open Source
+library to import various well-known 3D model formats in a uniform manner.
The
+most recent version also knows how to export 3d files and is therefore
+suitable as a general-purpose 3D model converter.
+
+Assimp aims to provide a full asset conversion pipeline for use in game
+engines / realtime rendering systems of any kind, but it is not limited to
+this purpose. In the past, it has been used in a wide range of applications.
+EOF
diff --git a/libs/assimp/HISTORY b/libs/assimp/HISTORY
new file mode 100644
index 0000000..dc34235
--- /dev/null
+++ b/libs/assimp/HISTORY
@@ -0,0 +1,3 @@
+2015-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS: spell created
+
diff --git
a/net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch

b/net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
new file mode 100644
index 0000000..de1964c
--- /dev/null
+++
b/net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
@@ -0,0 +1,42 @@
+From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni AT qca.qualcomm.com>
+Date: Tue, 7 Apr 2015 11:32:11 +0300
+Subject: [PATCH] P2P: Validate SSID element length before copying it
+ (CVE-2015-1863)
+
+This fixes a possible memcpy overflow for P2P dev->oper_ssid in
+p2p_add_device(). The length provided by the peer device (0..255 bytes)
+was used without proper bounds checking and that could have resulted in
+arbitrary data of up to 223 bytes being written beyond the end of the
+dev->oper_ssid[] array (of which about 150 bytes would be beyond the
+heap allocation) when processing a corrupted management frame for P2P
+peer discovery purposes.
+
+This could result in corrupted state in heap, unexpected program
+behavior due to corrupted P2P peer device information, denial of service
+due to process crash, exposure of memory contents during GO Negotiation,
+and potentially arbitrary code execution.
+
+Thanks to Google security team for reporting this issue and smart
+hardware research group of Alibaba security team for discovering it.
+
+Signed-off-by: Jouni Malinen <jouni AT qca.qualcomm.com>
+---
+ src/p2p/p2p.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
+index f584fae..a45fe73 100644
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr,
int freq,
+ if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
+ os_memcpy(dev->interface_addr, addr, ETH_ALEN);
+ if (msg.ssid &&
++ msg.ssid[1] <= sizeof(dev->oper_ssid) &&
+ (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
+ os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
+ != 0)) {
+--
+1.9.1
+
diff --git a/net/wpa_supplicant/DETAILS b/net/wpa_supplicant/DETAILS
index 555e082..164f285 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -9,6 +9,7 @@ elif [[ $WPA_RELEASE == devel ]]; then
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
else
VERSION=2.4
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_HASH=sha512:03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b
fi
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 80f95b3..ff323e9 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,7 @@
+2015-05-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, 0001-P2P...copying-it-C.patch: add patch for buffer
overflow issue
+ * DETAILS: SECURITY_PATCH++
+
2015-03-22 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: version 2.4, updated URLs

diff --git a/net/wpa_supplicant/PRE_BUILD b/net/wpa_supplicant/PRE_BUILD
index 7349fc1..aa6f574 100755
--- a/net/wpa_supplicant/PRE_BUILD
+++ b/net/wpa_supplicant/PRE_BUILD
@@ -12,6 +12,12 @@ if is_depends_enabled $SPELL dbus; then
fi
fi &&

+cd "$SOURCE_DIRECTORY" &&
+if [[ $WPA_RELEASE == stable ]]; then
+ # Should be included in version 2.5.
+ patch -p1 <
"$SCRIPT_DIRECTORY/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch"
+fi &&
+
if [[ -z $QTDIR ]] && is_depends_enabled $SPELL qt-x11; then
. "$INSTALL_ROOT/etc/profile.d/qt.sh"
fi
diff --git a/plasma/polkit-kde/CONFIGURE b/plasma/polkit-kde/CONFIGURE
deleted file mode 100644
index b2f02c3..0000000
--- a/plasma/polkit-kde/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/plasma/polkit-kde/DEPENDS b/plasma/polkit-kde/DEPENDS
deleted file mode 100755
index a9f69ff..0000000
--- a/plasma/polkit-kde/DEPENDS
+++ /dev/null
@@ -1,10 +0,0 @@
-source $GRIMOIRE/KDE5_DEPENDS &&
-depends kconfig &&
-depends kcoreaddons &&
-depends kcrash &&
-depends kdbusaddons &&
-depends ki18n &&
-depends kiconthemes &&
-depends knotifications &&
-depends kwidgetsaddons &&
-depends polkit-qt5
diff --git a/plasma/polkit-kde/DETAILS b/plasma/polkit-kde/DETAILS
deleted file mode 100755
index 1a11a97..0000000
--- a/plasma/polkit-kde/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
- SPELL=polkit-kde
- VERSION=5.3.0
-
SOURCE_HASH=sha512:083b2b215cf31c106ee4e9f0871d5c62bcea8960b990b539ab2c9330bfd93723e084537bbddba63c1c00051f3f82e91834f33cbe3f1304633b8bdd77fae90159
- SOURCE="${SPELL}-agent-1-${VERSION}.tar.xz"
- SOURCE_URL[0]=$KDE_URL/stable/plasma/$VERSION/${SOURCE}
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-agent-1-${VERSION}"
- WEB_SITE="http://www.kde.org";
- LICENSE[0]="GPL"
- ENTERED=20150115
- KEYWORDS=""
- SHORT="Daemon providing a polkit authentication UI for KDE"
-cat << EOF
-Daemon providing a polkit authentication UI for KDE
-EOF
diff --git a/plasma/polkit-kde/HISTORY b/plasma/polkit-kde/HISTORY
deleted file mode 100644
index 322fc3d..0000000
--- a/plasma/polkit-kde/HISTORY
+++ /dev/null
@@ -1,15 +0,0 @@
-2015-04-28 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.3.0
-
-2015-03-25 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.2.2
-
-2015-02-24 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.2.1
-
-2015-01-27 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 5.2.0
-
-2015-01-15 Treeve Jelbert <treeve AT sourcemage.org>
- * DEPENDS, DETAILS: spell created
- version 5.1.95
diff --git a/plasma/polkit-kde5/CONFIGURE b/plasma/polkit-kde5/CONFIGURE
new file mode 100644
index 0000000..b2f02c3
--- /dev/null
+++ b/plasma/polkit-kde5/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/plasma/polkit-kde5/DEPENDS b/plasma/polkit-kde5/DEPENDS
new file mode 100755
index 0000000..a9f69ff
--- /dev/null
+++ b/plasma/polkit-kde5/DEPENDS
@@ -0,0 +1,10 @@
+source $GRIMOIRE/KDE5_DEPENDS &&
+depends kconfig &&
+depends kcoreaddons &&
+depends kcrash &&
+depends kdbusaddons &&
+depends ki18n &&
+depends kiconthemes &&
+depends knotifications &&
+depends kwidgetsaddons &&
+depends polkit-qt5
diff --git a/plasma/polkit-kde5/DETAILS b/plasma/polkit-kde5/DETAILS
new file mode 100755
index 0000000..ed2107c
--- /dev/null
+++ b/plasma/polkit-kde5/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=polkit-kde5
+ SPELLX=polkit-kde-agent-1
+ VERSION=5.3.0
+
SOURCE_HASH=sha512:083b2b215cf31c106ee4e9f0871d5c62bcea8960b990b539ab2c9330bfd93723e084537bbddba63c1c00051f3f82e91834f33cbe3f1304633b8bdd77fae90159
+ SOURCE="${SPELLX}-${VERSION}.tar.xz"
+ SOURCE_URL[0]=$KDE_URL/stable/plasma/$VERSION/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE="http://www.kde.org";
+ LICENSE[0]="GPL"
+ ENTERED=20150115
+ KEYWORDS=""
+ SHORT="Daemon providing a polkit authentication UI for KDE"
+cat << EOF
+Daemon providing a polkit authentication UI for KDE
+EOF
diff --git a/plasma/polkit-kde5/HISTORY b/plasma/polkit-kde5/HISTORY
new file mode 100644
index 0000000..0e32d5c
--- /dev/null
+++ b/plasma/polkit-kde5/HISTORY
@@ -0,0 +1,18 @@
+2015-05-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: rename spell to avoid conflicts
+
+2015-04-28 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.3.0
+
+2015-03-25 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2.2
+
+2015-02-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2.1
+
+2015-01-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 5.2.0
+
+2015-01-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS, DETAILS: spell created
+ version 5.1.95
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 229304d..87592dd 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.12.4
- SECURITY_PATCH=52
+ VERSION=1.12.5
+ SECURITY_PATCH=53
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_URL[1]=http://www.wireshark.org/download/src/$SOURCE
-
SOURCE_HASH=sha512:ceeb6cb4489ce150a6065e586f83cfbcd0fd79cd05cf8ab5b0346baa03eaa5188503b18a1f228458447235d79f765c410e6b52b9aae77547f80b206429c77b24
+
SOURCE_HASH=sha512:857f0299290d5ca1a34ec4296bf6ef1da82fb59af1aae2c095599e16c4a95a653987d60611d58874dd8cb3271838b0a4ec476a17c52e781cb56607ac39197136
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index c8bf5ca..d7b9e0a 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,6 @@
+2015-05-13 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.12.5, SECURITY_PATCH=53
+
2015-03-09 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.4, SECURITY_PATCH=52

diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index 7b7f28c..007ccc9 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,10 +1,10 @@
SPELL=xen
if [[ $XEN_BRANCH == "4.2" ]]; then
VERSION=4.2.5
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
else
- VERSION=4.4.0
- SECURITY_PATCH=9
+ VERSION=4.4.2
+ SECURITY_PATCH=10
fi
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index bab5e0e..98740d2 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,10 @@
+2015-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.4.2 (4.4); SECURITY_PATCH++ for both
+ fixing VENOM (CVE-2015-3456); quoting paths
+ * PRE_BUILD: apply patches
+ * xsa133-qemut.patch, xsa133-qemuu-4.3-4.2.patch, xsa133-qemuu.patch:
+ added official patches, to fix VENOM vulnerability
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER

diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index 766d895..a2fc006 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,5 +1,16 @@
default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
+cd "${SOURCE_DIRECTORY}/tools/qemu-xen-traditional" &&
+patch -p1 < "$SPELL_DIRECTORY/xsa133-qemut.patch" &&
+
+cd "${SOURCE_DIRECTORY}/tools/qemu-xen" &&
+
+if [[ $XEN_BRANCH == "4.2" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/xsa133-qemuu-4.3-4.2.patch"
+else
+ patch -p1 < "$SPELL_DIRECTORY/xsa133-qemuu.patch"
+fi &&
+
+cd "${SOURCE_DIRECTORY}" &&

patch -p0 < "$SPELL_DIRECTORY/prefix.patch" &&

diff --git a/utils/xen/xsa133-qemut.patch b/utils/xen/xsa133-qemut.patch
new file mode 100644
index 0000000..e1b7711
--- /dev/null
+++ b/utils/xen/xsa133-qemut.patch
@@ -0,0 +1,80 @@
+From ac7ddbe342d7aa2303c39ca731cc6229dbbd739b Mon Sep 17 00:00:00 2001
+From: Petr Matousek <pmatouse AT redhat.com>
+Date: Wed, 6 May 2015 09:48:59 +0200
+Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated
buffer
+
+During processing of certain commands such as FD_CMD_READ_ID and
+FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could
+get out of bounds leading to memory corruption with values coming
+from the guest.
+
+Fix this by making sure that the index is always bounded by the
+allocated memory.
+
+This is CVE-2015-3456.
+
+Signed-off-by: Petr Matousek <pmatouse AT redhat.com>
+Reviewed-by: John Snow <jsnow AT redhat.com>
+---
+ hw/fdc.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/hw/fdc.c b/hw/fdc.c
+index b00a4ec..aba02e4 100644
+--- a/hw/fdc.c
++++ b/hw/fdc.c
+@@ -1318,7 +1318,7 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl)
+ {
+ fdrive_t *cur_drv;
+ uint32_t retval = 0;
+- int pos;
++ uint32_t pos;
+
+ cur_drv = get_cur_drv(fdctrl);
+ fdctrl->dsr &= ~FD_DSR_PWRDOWN;
+@@ -1327,8 +1327,8 @@ static uint32_t fdctrl_read_data (fdctrl_t *fdctrl)
+ return 0;
+ }
+ pos = fdctrl->data_pos;
++ pos %= FD_SECTOR_LEN;
+ if (fdctrl->msr & FD_MSR_NONDMA) {
+- pos %= FD_SECTOR_LEN;
+ if (pos == 0) {
+ if (fdctrl->data_pos != 0)
+ if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
+@@ -1673,10 +1673,13 @@ static void fdctrl_handle_option (fdctrl_t *fdctrl,
int direction)
+ static void fdctrl_handle_drive_specification_command (fdctrl_t *fdctrl,
int direction)
+ {
+ fdrive_t *cur_drv = get_cur_drv(fdctrl);
++ uint32_t pos;
+
+- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
++ pos = fdctrl->data_pos - 1;
++ pos %= FD_SECTOR_LEN;
++ if (fdctrl->fifo[pos] & 0x80) {
+ /* Command parameters done */
+- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
++ if (fdctrl->fifo[pos] & 0x40) {
+ fdctrl->fifo[0] = fdctrl->fifo[1];
+ fdctrl->fifo[2] = 0;
+ fdctrl->fifo[3] = 0;
+@@ -1771,7 +1774,7 @@ static uint8_t command_to_handler[256];
+ static void fdctrl_write_data (fdctrl_t *fdctrl, uint32_t value)
+ {
+ fdrive_t *cur_drv;
+- int pos;
++ uint32_t pos;
+
+ /* Reset mode */
+ if (!(fdctrl->dor & FD_DOR_nRESET)) {
+@@ -1817,7 +1820,9 @@ static void fdctrl_write_data (fdctrl_t *fdctrl,
uint32_t value)
+ }
+
+ FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
+- fdctrl->fifo[fdctrl->data_pos++] = value;
++ pos = fdctrl->data_pos++;
++ pos %= FD_SECTOR_LEN;
++ fdctrl->fifo[pos] = value;
+ if (fdctrl->data_pos == fdctrl->data_len) {
+ /* We now have all parameters
+ * and will be able to treat the command
diff --git a/utils/xen/xsa133-qemuu-4.3-4.2.patch
b/utils/xen/xsa133-qemuu-4.3-4.2.patch
new file mode 100644
index 0000000..688c7df
--- /dev/null
+++ b/utils/xen/xsa133-qemuu-4.3-4.2.patch
@@ -0,0 +1,84 @@
+From ac7ddbe342d7aa2303c39ca731cc6229dbbd739b Mon Sep 17 00:00:00 2001
+From: Petr Matousek <pmatouse AT redhat.com>
+Date: Wed, 6 May 2015 09:48:59 +0200
+Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated
buffer
+
+During processing of certain commands such as FD_CMD_READ_ID and
+FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could
+get out of bounds leading to memory corruption with values coming
+from the guest.
+
+Fix this by making sure that the index is always bounded by the
+allocated memory.
+
+This is CVE-2015-3456.
+
+Signed-off-by: Petr Matousek <pmatouse AT redhat.com>
+Reviewed-by: John Snow <jsnow AT redhat.com>
+---
+ hw/fdc.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/hw/fdc.c b/hw/fdc.c
+index f72a392..d8a8edd 100644
+--- a/hw/fdc.c
++++ b/hw/fdc.c
+@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
+ {
+ FDrive *cur_drv;
+ uint32_t retval = 0;
+- int pos;
++ uint32_t pos;
+
+ cur_drv = get_cur_drv(fdctrl);
+ fdctrl->dsr &= ~FD_DSR_PWRDOWN;
+@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
+ return 0;
+ }
+ pos = fdctrl->data_pos;
++ pos %= FD_SECTOR_LEN;
+ if (fdctrl->msr & FD_MSR_NONDMA) {
+- pos %= FD_SECTOR_LEN;
+ if (pos == 0) {
+ if (fdctrl->data_pos != 0)
+ if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
+@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int
direction)
+ static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int
direction)
+ {
+ FDrive *cur_drv = get_cur_drv(fdctrl);
++ uint32_t pos;
+
+- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
++ pos = fdctrl->data_pos - 1;
++ pos %= FD_SECTOR_LEN;
++ if (fdctrl->fifo[pos] & 0x80) {
+ /* Command parameters done */
+- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
++ if (fdctrl->fifo[pos] & 0x40) {
+ fdctrl->fifo[0] = fdctrl->fifo[1];
+ fdctrl->fifo[2] = 0;
+ fdctrl->fifo[3] = 0;
+@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256];
+ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
+ {
+ FDrive *cur_drv;
+- int pos;
++ uint32_t pos;
+
+ /* Reset mode */
+ if (!(fdctrl->dor & FD_DOR_nRESET)) {
+@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t
value)
+ }
+
+ FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
+- fdctrl->fifo[fdctrl->data_pos++] = value;
++ pos = fdctrl->data_pos++;
++ pos %= FD_SECTOR_LEN;
++ fdctrl->fifo[pos] = value;
+ if (fdctrl->data_pos == fdctrl->data_len) {
+ /* We now have all parameters
+ * and will be able to treat the command
+--
+2.1.0
+
+
diff --git a/utils/xen/xsa133-qemuu.patch b/utils/xen/xsa133-qemuu.patch
new file mode 100644
index 0000000..95f3dcc
--- /dev/null
+++ b/utils/xen/xsa133-qemuu.patch
@@ -0,0 +1,84 @@
+From ac7ddbe342d7aa2303c39ca731cc6229dbbd739b Mon Sep 17 00:00:00 2001
+From: Petr Matousek <pmatouse AT redhat.com>
+Date: Wed, 6 May 2015 09:48:59 +0200
+Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated
buffer
+
+During processing of certain commands such as FD_CMD_READ_ID and
+FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could
+get out of bounds leading to memory corruption with values coming
+from the guest.
+
+Fix this by making sure that the index is always bounded by the
+allocated memory.
+
+This is CVE-2015-3456.
+
+Signed-off-by: Petr Matousek <pmatouse AT redhat.com>
+Reviewed-by: John Snow <jsnow AT redhat.com>
+---
+ hw/block/fdc.c | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/hw/block/fdc.c b/hw/block/fdc.c
+index f72a392..d8a8edd 100644
+--- a/hw/block/fdc.c
++++ b/hw/block/fdc.c
+@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
+ {
+ FDrive *cur_drv;
+ uint32_t retval = 0;
+- int pos;
++ uint32_t pos;
+
+ cur_drv = get_cur_drv(fdctrl);
+ fdctrl->dsr &= ~FD_DSR_PWRDOWN;
+@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
+ return 0;
+ }
+ pos = fdctrl->data_pos;
++ pos %= FD_SECTOR_LEN;
+ if (fdctrl->msr & FD_MSR_NONDMA) {
+- pos %= FD_SECTOR_LEN;
+ if (pos == 0) {
+ if (fdctrl->data_pos != 0)
+ if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
+@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int
direction)
+ static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int
direction)
+ {
+ FDrive *cur_drv = get_cur_drv(fdctrl);
++ uint32_t pos;
+
+- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
++ pos = fdctrl->data_pos - 1;
++ pos %= FD_SECTOR_LEN;
++ if (fdctrl->fifo[pos] & 0x80) {
+ /* Command parameters done */
+- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
++ if (fdctrl->fifo[pos] & 0x40) {
+ fdctrl->fifo[0] = fdctrl->fifo[1];
+ fdctrl->fifo[2] = 0;
+ fdctrl->fifo[3] = 0;
+@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256];
+ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
+ {
+ FDrive *cur_drv;
+- int pos;
++ uint32_t pos;
+
+ /* Reset mode */
+ if (!(fdctrl->dor & FD_DOR_nRESET)) {
+@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t
value)
+ }
+
+ FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
+- fdctrl->fifo[fdctrl->data_pos++] = value;
++ pos = fdctrl->data_pos++;
++ pos %= FD_SECTOR_LEN;
++ fdctrl->fifo[pos] = value;
+ if (fdctrl->data_pos == fdctrl->data_len) {
+ /* We now have all parameters
+ * and will be able to treat the command
+--
+2.1.0
+
+
diff --git a/video-libs/libbluray/DEPENDS b/video-libs/libbluray/DEPENDS
index f04bdd3..7dbc5d5 100755
--- a/video-libs/libbluray/DEPENDS
+++ b/video-libs/libbluray/DEPENDS
@@ -1,4 +1,11 @@
optional_depends libxml2 \
"" \
"--disable-libxml2" \
- "for xml support"
+ "for xml support" &&
+optional_depends JAVA \
+ "" \
+ "--disable-bdjava" \
+ "for building without Java" &&
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL JAVA); then
+ depends ant
+fi
diff --git a/video-libs/libbluray/DETAILS b/video-libs/libbluray/DETAILS
index 143a0f3..728e8b1 100755
--- a/video-libs/libbluray/DETAILS
+++ b/video-libs/libbluray/DETAILS
@@ -1,8 +1,8 @@
SPELL=libbluray
- VERSION=0.2.1
+ VERSION=0.8.0
SOURCE="${SPELL}-${VERSION}.tar.bz2"

SOURCE_URL[0]=http://download.videolan.org/pub/videolan/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:b938ca838d6e4ceaac74ca8850efb9d8c312638b70a9b42ebffd63bf703341eab3ce98b6edeea9b3284ba1d0f8b46fe803db1f668e72752e1e23e96435ac77dc
+
SOURCE_HASH=sha512:1928ed86a39f3846014f3c5083e78aaf87366fb4589a48a1a87ad053fc32edafe6e89d382c44cffc5f27610d4d3ccf17bf2ef79982e3e39a0ada6895defe5bfe
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.videolan.org/developers/libbluray.html";
LICENSE[0]=GPL
diff --git a/video-libs/libbluray/HISTORY b/video-libs/libbluray/HISTORY
index 4f20aef..2a928b7 100644
--- a/video-libs/libbluray/HISTORY
+++ b/video-libs/libbluray/HISTORY
@@ -1,3 +1,7 @@
+2015-05-14 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.0
+ * DEPENDS: Added optional Java dependency
+
2012-02-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created




  • [SM-Commit] GIT changes to devel-merge-kde4+plasma5+kde5 grimoire by Treeve Jelbert (ee316f4dd37ed0d8c6f689d06a68ffdd902c6a1b), Treeve Jelbert, 05/15/2015

Archive powered by MHonArc 2.6.24.

Top of Page