Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (5c29b1f9e6532bae709d3bb7d973a6fcb40aabfb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (5c29b1f9e6532bae709d3bb7d973a6fcb40aabfb)
  • Date: Sun, 17 May 2015 05:25:14 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog
| 12 +
antivirus/clamav/DEPENDS
| 2
antivirus/clamav/DETAILS
| 4
antivirus/clamav/HISTORY
| 10 +
antivirus/clamav/vendor_clamav.gpg
|binary
archive/gzip/DEPENDS
| 2
archive/gzip/HISTORY
| 3
archive/lzma-utils/BUILD
| 1
archive/lzma-utils/DETAILS
| 7
archive/lzma-utils/HISTORY
| 4
archive/lzma-utils/INSTALL
| 1
archive/lzma-utils/PRE_BUILD
| 1
archive/lzma-utils/UP_TRIGGERS
| 2
archive/rpm2targz/DEPENDS
| 2
archive/rpm2targz/HISTORY
| 3
archive/tar/DEPENDS
| 2
archive/tar/HISTORY
| 3
audio-players/mpd/DEPENDS
| 13 +
audio-players/mpd/HISTORY
| 3
chat-irc/bitlbee/CONFIGURE
| 1
chat-irc/bitlbee/DEPENDS
| 13 +
chat-irc/bitlbee/DETAILS
| 4
chat-irc/bitlbee/HISTORY
| 4
crypto/gnupg/DETAILS
| 3
crypto/gnupg/HISTORY
| 6
crypto/gnupg/PRE_BUILD
| 2
crypto/gnupg/debug.patch
| 24 ++
crypto/gnutls/DEPENDS
| 3
crypto/gnutls/HISTORY
| 3
crypto/krb5/DETAILS
| 6
crypto/krb5/HISTORY
| 4
crypto/nss/DETAILS
| 4
crypto/nss/HISTORY
| 6
crypto/nss/PREPARE
| 4
crypto/nss/PRE_BUILD
| 4
crypto/nss/PRE_SUB_DEPENDS
| 1
crypto/nss/SUB_DEPENDS
| 3
database/mariadb/DETAILS
| 6
database/mariadb/HISTORY
| 6
devel/automake/DEPENDS
| 2
devel/automake/HISTORY
| 3
ftp/curl/DETAILS
| 6
ftp/curl/HISTORY
| 8
gnome2-libs/gdk-pixbuf2/DEPENDS
| 2
gnome2-libs/gdk-pixbuf2/HISTORY
| 3
http/firefox/DEPENDS
| 2
http/firefox/DETAILS
| 7
http/firefox/HISTORY
| 7
kernels/linux/DEPENDS
| 2
kernels/linux/HISTORY
| 30 +++
kernels/linux/info/patches/maintenance_patches_3/patch-3.10.77
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.10.78
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.12.42
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.41
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.14.42
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.18.13
| 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.19.7
| 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.2
| 5
kernels/linux/info/patches/maintenance_patches_4/patch-4.0.3
| 5
kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
| 2
kernels/linux/latest.defaults
| 2
libs/libmpc/DETAILS
| 8
libs/libmpc/HISTORY
| 5
libs/libmpc/INSTALL
| 5
libs/pcre/HISTORY
| 3
libs/pcre/PRE_SUB_DEPENDS
| 2
libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
| 2
libs/pcre/SUB_DEPENDS
| 2

net/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
| 42 +++++
net/wpa_supplicant/DETAILS
| 9 -
net/wpa_supplicant/HISTORY
| 10 +
net/wpa_supplicant/PRE_BUILD
| 6
net/xinetd/DETAILS
| 8
net/xinetd/HISTORY
| 6
net/xinetd/PRE_BUILD
| 4
net/xinetd/tcpmux.patch
| 11 +
perl-cpan/email-mime-modifier/BUILD
| 2
perl-cpan/email-mime-modifier/CONFLICTS
| 1
perl-cpan/email-mime-modifier/DEPENDS
| 8
perl-cpan/email-mime-modifier/DETAILS
| 6
perl-cpan/email-mime-modifier/HISTORY
| 5
perl-cpan/email-mime-modifier/INSTALL
| 1
perl-cpan/email-mime-modifier/PRE_BUILD
| 1
perl-cpan/email-mime-modifier/UP_TRIGGERS
| 2
perl-cpan/mail-internet/BUILD
| 1
perl-cpan/mail-internet/CONFLICTS
| 1
perl-cpan/mail-internet/DEPENDS
| 1
perl-cpan/mail-internet/DETAILS
| 7
perl-cpan/mail-internet/HISTORY
| 5
perl-cpan/mail-internet/INSTALL
| 1
perl-cpan/mail-internet/PRE_BUILD
| 1
perl-cpan/mail-internet/UP_TRIGGERS
| 2
perl-cpan/mailtools/DETAILS
| 16 -
perl-cpan/mailtools/HISTORY
| 4
perl-cpan/weakref/BUILD
| 1
perl-cpan/weakref/CONFLICTS
| 1
perl-cpan/weakref/DEPENDS
| 1
perl-cpan/weakref/DETAILS
| 6
perl-cpan/weakref/HISTORY
| 4
perl-cpan/weakref/INSTALL
| 1
perl-cpan/weakref/PRE_BUILD
| 1
perl-cpan/weakref/UP_TRIGGERS
| 2
perl-cpan/xml-parser-expat/DETAILS
| 36 ++--
perl-cpan/xml-parser-expat/HISTORY
| 5
ruby-raa/ruby-2.2/DETAILS
| 6
ruby-raa/ruby-2.2/HISTORY
| 4
security/wireshark/DETAILS
| 6
security/wireshark/HISTORY
| 3
utils/mdp/DETAILS
| 2
utils/mdp/HISTORY
| 5
utils/util-linux/HISTORY
| 5
utils/util-linux/PREPARE
| 38 ++--
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 ++++++++++
120 files changed, 769 insertions(+), 133 deletions(-)

New commits:
commit 5c29b1f9e6532bae709d3bb7d973a6fcb40aabfb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gnupg: fixed debug info output via official patch

(cherry picked from commit be83fbe865eaa2c80da95072acc58c74d821487e)

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

mpd: updated dependencies

(cherry picked from commit 32c0ebfbde5ef17427141639a7578bd82b625f35)

commit f929ccb52ff53987bfdc17c473b20a1d7caaeb54
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

http/firefox: version 38.0.1

(cherry picked from commit 6e458830582bb8d099677ba4e93045430802a240)

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

linux: => 3.2.69 (lts)

(cherry picked from commit 37132667b975ab71734fbbe8f1a4c34b8c395fdb)

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

linux: => 3.10.78 (lts)

(cherry picked from commit c146afc0adcbb7b3ba7bbd0a7f251ed2b2761f0a)

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

linux: => 3.14.42 (lts)

(cherry picked from commit 36273b299d8ae5675c852fd531d5d4e2b7ed9b44)

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

linux: => 3.19.8 (eol)

(cherry picked from commit a5fec9bccbce6b561af3241030d7cee1892a2b9b)

commit 5cf484a5a9922dfdcc30a268360fd4bce20cd349
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 4.0.3

(cherry picked from commit cc96ff53601255ff00473f5cd48269f50bc32a0f)

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

xen: => 4.4.2 [security]

(cherry picked from commit e321b1381031bdd83d8a322cf2e24364fef8a734)

commit f722dde928c1be92eb6cb75adf0a5af58a56778c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wireshark 1.12.5, SECURITY_PATCH=53

(cherry picked from commit c8b00ae6ead3f5374db9e8626d811096effc6bf6)

commit 15b8354a92e0ae3235f91584ef75be9e38c0fdcc
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

http/firefox: version 38.0, SECURITY_PATCH++

(cherry picked from commit 0d8f738789bf17d3fa99ec1017122a5b3985eb1e)

commit 8028715abb81628d06c2974de54e3701a2d85a7a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

nss 3.18.1

(cherry picked from commit c52c2fc28a37e535156af2ab54d4b207f053c739)

commit c8a7c178f9bc8d464806cc1241498abc81e28721
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

crypto/nss: version 3.18

(cherry picked from commit b09a757460a08b10869bac9bd34ddc43c862398e)

commit 79a3725bc0a7637bb9c25231d0d0826c78b539d2
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wpa_supplicant: add patch for that buffer overflow

(cherry picked from commit 2136a6ed3e7ddfc22e904433a44371d8e6caf2c3)

commit ae25d3d2f3b0fbcae57ba09bdb80b72715bb9ddd
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

wpa_supplicant: bump tp 2.4

(cherry picked from commit 959dfbc27438a444d190847eeb56ac5fbb6f0b28)

commit 2695fe66fce55087281fce8d0b241971575cc34f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ruby-2.2-2.2.2 SECURITY FIX

(cherry picked from commit 1ea9ca28066b518654b2f15b6753a0c03e421a0a)

commit ac61275c6e937335fb788d1b7128785cfae4615d
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ftp/curl: version 7.42.1, SECURITY_PATCH++

(cherry picked from commit 3552c789d941ef60c706282892b615457f54d408)

commit dcd7f3213ea71ed5e6eee099f74d9b282be7b6e5
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

ftp/curl: version 7.41.0

(cherry picked from commit 4d7709325df86cbf87c35526ce5179ff0a442f2e)

commit ff278f661a334bdbff00be104647d81aafc763d2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

krb5-1.13.2 SECURITY FIX

(cherry picked from commit 67f1805749f38168ed71a19c82212c99a97e6d0e)

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

gdk-pixbuf2: LZMA -> xz-utils

(cherry picked from commit 2057baf7c6fd361e8feac0eb85bebe1437bcc385)

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

gnutls: LZMA -> xz-utils

(cherry picked from commit 4b3f7330a4b614da2ac7c1bdc4f432607c8dc90e)

Conflicts:
crypto/gnutls/HISTORY

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

rpm2targz: LZMA -> xz-utils

(cherry picked from commit 90a076098a6880150ff627baf3d1db6027ecc597)

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

xinetd: updated source urls

(cherry picked from commit 8638df36901011fda9106955c670297d256d5fde)

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

xinetd: security update

(cherry picked from commit 3800b83396060bf603bee846a0a8e958e4c459fc)

commit 1227ff7106c3bded1a5bf567e0db25f73b9c6099
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

smgl-logo-0.2-for-2.6.31.patch: Add support for Linux 4.0.x

(cherry picked from commit 9a3fe3f22911b224d54dc416ae0e6cdf0ee17c9c)

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

linux: LZMA -> xz-utils

(cherry picked from commit 86f30b7ffa1e8f1a4b875d32afac5f944ed07207)

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

automake: LZMA -> xz-utils

(cherry picked from commit d1cb13054da57ef0d4be93be1ad7dd1b9c7803f1)

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

gzip: LZMA -> xz-utils

(cherry picked from commit 889e989991fa092faf42eef8048d6c5cac2b484e)

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

tar: LZMA -> xz-utils

(cherry picked from commit 49de8c7ab5086281dc0735e714d68abbff5b9b6d)

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

lzma-utils: spell deprecated, in favour of xz-utils, ok flux@

(cherry picked from commit 3a4ca261173ccf3a85ed08dabcea75ce54bf74c0)

Conflicts:
ChangeLog

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

bitlbee: => 3.4

(cherry picked from commit 5b0a97808224c3620137ebbd2d26efa6a0681394)

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

mariadb: => 5.5.43 [security]

(cherry picked from commit 7cad3c7550294158a0913a11b4a77a410945fa16)

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

mariadb: => 5.5.42

(cherry picked from commit 38d9aa7df8cb50e0b4ebe7bb2e00b073567ebd46)

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

linux: => 3.19.7 (stable)

(cherry picked from commit b4019a97be18a94c0a73ff3f5b35abf130b83d85)

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

linux: => 3.18.13 (lts)

(cherry picked from commit 43289969504eb8cf43198b72e91ec21abe77ba4a)

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

linux: => 3.14.41 (lts)

(cherry picked from commit 214dc5d70bc14b29d2f06b2b6730eb89a6899cff)

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

linux: => 3.10.77 (lts)

(cherry picked from commit 45032004bcda86bf3a40665bea3672c7c6136db6)

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

libmpc: fixed install phase in dispel-less cases, ok flux@

(cherry picked from commit 075165b3592613d0efa4d398caab48ed639d031f)

Conflicts:
libs/libmpc/DETAILS
libs/libmpc/HISTORY

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

util-linux: fixed a failure in PREPARE for the boxes without util-linux
installed on them, ok flux@

(cherry picked from commit cb776f63ef5588eeb0cfc86172e780db30e88954)

commit 6fd4abbf36ae20b95d9b705f912a2d796604edcb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux 4.0.2

(cherry picked from commit 3d4cf46f8296f4b862b7ed1886357b12a312a617)

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

mail-internet: added missing CONFLICTS

(cherry picked from commit 700a03778e4d0b7b41d299796946c3c2f67dddd2)

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

weakref: added missing CONFLICTS

(cherry picked from commit fa5989c720fee86c292ad3f48d8c909c431125dc)

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

mailtools: => 2.14

(cherry picked from commit 0bfdf53e90023ce3574fb00903ab23b35d7a0c18)
(cherry picked from commit 2a107d430640e07630196ed1641f0d8b508904f5)

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

mail-internet: spell deprecated, it's a part of mailtools now

(cherry picked from commit b26cc86acb66dddec42090865cf8e14022819204)

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

weakref: spell deprecated, it's a part of perl now

(cherry picked from commit d98374b2f64c1f6aa91775f4ca64500027cd4e98)

Conflicts:
ChangeLog

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

xml-parser-expat: => 2.44

(cherry picked from commit 82e046d690915dfe563d811ba8c11971486d5897)

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

Revert "xml-parser-expat: => 2.42_01"

This reverts commit 14e34f6f0f4a3138aaaab516b268abbcf0c21959.

Reason: we do not force development versions/branches.
(cherry picked from commit b62600937f924d0c2cc9cacc39432a0289037086)

commit e3f316d78b84abb498c157050f7b5d055a46a26c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

clamav 0.98.7 SECURITY FIXES

(cherry picked from commit cdbf2836f00916462a490f6d4d4e03ea48521356)

commit 5be8b62481fc9f486f914a89de59573cf76a430b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

clamav - extra depends

(cherry picked from commit 11f0ba25c7f173f0c665efdc66df2ea2904bb150)

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

linux: => 3.12.42 (lts)

(cherry picked from commit 815a966e09373c9b5bb19dd06146c252014a05e5)

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

email-mime-modifier: spell deprecated, it's a part of email-mime now

(cherry picked from commit fe5e317daa5b34b14b37d5d0cf24c7074b45bb45)

commit c7fb40603c42fdb8667bb5f2114672c7ea401e7e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libs/pcre: switched to gcc with CXX in *SUB_DEPENDS

(cherry picked from commit 7acd0608c607a9e11a978511fd02cf1c1a52f377)

Conflicts:
libs/pcre/HISTORY

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

mdp: => 0.7.4

(cherry picked from commit 7d2bfc48dea8ad2fc9982579bb50711d98be70b8)

diff --git a/ChangeLog b/ChangeLog
index 32b78ad..112aaad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * archive/lzma-utils: spell deprecated, in favour of xz-utils
+
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * perl-cpan/weakref: spell deprecated, it's a part of perl now
+ * perl-cpan/mail-internet: spell deprecated, it's a part of mailtools
+ now
+
+2015-05-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * perl-cpan/email-mime-modifier: spell deprecated, it's a part of
+ email-mime now
+
2015-05-02 Vlad Glagolev <stealth AT sourcemage.org>
* perl-cpan/archive-tar: spell deprecated, it's a part of perl now
* perl-cpan/test-harness: spell deprecated, it's a part of perl now
diff --git a/antivirus/clamav/DEPENDS b/antivirus/clamav/DEPENDS
index d12b079..b188464 100755
--- a/antivirus/clamav/DEPENDS
+++ b/antivirus/clamav/DEPENDS
@@ -1,5 +1,7 @@
depends -sub CXX gcc &&
depends zlib &&
+depends curl &&
+depends libxml2 &&
depends libtommath "--with-system-tommath" &&
optional_depends bzip2 "--enable-bzip2" \
"--disable-bzip2" \
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index 29915ad..d6a06c3 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,5 +1,5 @@
SPELL=clamav
- VERSION=0.98.6
+ VERSION=0.98.7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//-/}"
@@ -9,7 +9,7 @@
SOURCE_GPG=vendor_clamav.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://www.clamav.net
LICENSE[0]=GPL
- SECURITY_PATCH=9
+ SECURITY_PATCH=10
ENTERED=20030909
KEYWORDS="antivirus"
SHORT="Clam AntiVirus is an anti-virus toolkit for Unix"
diff --git a/antivirus/clamav/HISTORY b/antivirus/clamav/HISTORY
index 530c4f7..e7002ac 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,13 @@
+2015-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.98.7
+ SECURITY_PATCH++
+ fixes CVE-2015-2221 CVE-2015-2222, CVE-2015-2668, CVE-2015-2305,
+ CVE-2015-2170
+ * vendor_clamav.gpg: add 260429A0 "Talos <research AT sourcefire.com"
+
+2015-04-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add libxml2, curl
+
2015-02-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.98.6

diff --git a/antivirus/clamav/vendor_clamav.gpg
b/antivirus/clamav/vendor_clamav.gpg
index 1797f4e..24743d6 100644
Binary files a/antivirus/clamav/vendor_clamav.gpg and
b/antivirus/clamav/vendor_clamav.gpg differ
diff --git a/archive/gzip/DEPENDS b/archive/gzip/DEPENDS
index 24de7f9..09af7aa 100755
--- a/archive/gzip/DEPENDS
+++ b/archive/gzip/DEPENDS
@@ -1,3 +1,3 @@
depends gnupg &&
-depends LZMA &&
+depends xz-utils &&
depends smgl-fhs
diff --git a/archive/gzip/HISTORY b/archive/gzip/HISTORY
index b95f956..17ae2a3 100644
--- a/archive/gzip/HISTORY
+++ b/archive/gzip/HISTORY
@@ -1,3 +1,6 @@
+2015-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: LZMA -> xz-utils
+
2014-12-30 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Don't use own compression for a compression utility
Switch to .xz, otherwise seems to fail with castfs
diff --git a/archive/lzma-utils/BUILD b/archive/lzma-utils/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/archive/lzma-utils/BUILD
@@ -0,0 +1 @@
+true
diff --git a/archive/lzma-utils/DETAILS b/archive/lzma-utils/DETAILS
index 1311d84..b4b1de5 100755
--- a/archive/lzma-utils/DETAILS
+++ b/archive/lzma-utils/DETAILS
@@ -1,10 +1,9 @@
SPELL=lzma-utils
VERSION=4.32.7
- SOURCE="lzma-$VERSION.tar.gz"
+ PATCHLEVEL=1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/lzma-$VERSION"
- SOURCE_URL[0]=http://tukaani.org/lzma/$SOURCE
-
SOURCE_HASH=sha512:aa270110e19f6fcac0f3ab8c31a38b09bae7f0d14e4888d7ff35bacb959914615cadbe4ec53013bd9a322bfec562eb96e45fabea92868f6dd3cce5cb1f4d0374
-# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
+ GATHER_DOCS=off
+ ARCHIVE=off
LICENSE[0]=GPL
WEB_SITE=http://tukaani.org/lzma/
ENTERED=20061010
diff --git a/archive/lzma-utils/HISTORY b/archive/lzma-utils/HISTORY
index 190de89..e636aad 100644
--- a/archive/lzma-utils/HISTORY
+++ b/archive/lzma-utils/HISTORY
@@ -1,3 +1,7 @@
+2015-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: deprecated in favour of xz-utils
+ * {PRE_,}BUILD, INSTALL, UP_TRIGGERS: added
+
2009-12-17 Eric Sandall <sandalle AT sourcemage.org>
* PROVIDES: Provides LZMA tools

diff --git a/archive/lzma-utils/INSTALL b/archive/lzma-utils/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/archive/lzma-utils/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/archive/lzma-utils/PRE_BUILD b/archive/lzma-utils/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/archive/lzma-utils/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/archive/lzma-utils/UP_TRIGGERS b/archive/lzma-utils/UP_TRIGGERS
new file mode 100755
index 0000000..e9ff064
--- /dev/null
+++ b/archive/lzma-utils/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger lzma-utils dispel_self &&
+up_trigger xz-utils cast_self
diff --git a/archive/rpm2targz/DEPENDS b/archive/rpm2targz/DEPENDS
index 1091ce6..941ae22 100755
--- a/archive/rpm2targz/DEPENDS
+++ b/archive/rpm2targz/DEPENDS
@@ -1 +1 @@
-depends LZMA
+depends xz-utils
diff --git a/archive/rpm2targz/HISTORY b/archive/rpm2targz/HISTORY
index a1afc4a..e2812b8 100644
--- a/archive/rpm2targz/HISTORY
+++ b/archive/rpm2targz/HISTORY
@@ -1,3 +1,6 @@
+2015-05-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: LZMA -> xz-utils
+
2014-01-15 Ladislav Hagara<hgr AT vabo.cz>
* DETAILS: 9.0.0.5g
* PRE_BUILD: removed
diff --git a/archive/tar/DEPENDS b/archive/tar/DEPENDS
index c0f2367..7c39acc 100755
--- a/archive/tar/DEPENDS
+++ b/archive/tar/DEPENDS
@@ -16,4 +16,4 @@ optional_depends gettext \
"--disable-nls" \
"for Native Language Support" &&

-optional_depends LZMA "" "" "for LZMA support"
+optional_depends xz-utils "" "" "for LZMA support"
diff --git a/archive/tar/HISTORY b/archive/tar/HISTORY
index c7a3f18..5d0eeed 100644
--- a/archive/tar/HISTORY
+++ b/archive/tar/HISTORY
@@ -1,3 +1,6 @@
+2015-05-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: LZMA -> xz-utils
+
2014-12-14 Pol Vinogradov <vin.public AT gmail.com>
* DEPENDS: added acl and attr optionally

diff --git a/audio-players/mpd/DEPENDS b/audio-players/mpd/DEPENDS
index a541cd5..823808e 100755
--- a/audio-players/mpd/DEPENDS
+++ b/audio-players/mpd/DEPENDS
@@ -1,6 +1,5 @@
-depends zlib &&
-depends glib2 &&
depends -sub CXX gcc &&
+depends boost &&

# TODO: missing libraries in grimoire:
# - libroar (--enable-roar) for RoarAudio support
@@ -10,6 +9,11 @@ depends -sub CXX gcc &&
# - libiso9660 (--enable-iso9660) for iso9660 archive support
# - despotify (--enable-despotify) for despotify (spotify.com) support

+optional_depends glib2 \
+ "--enable-glib" \
+ "--disable-glib" \
+ "to enable GLib usage" &&
+
optional_depends icu \
"--enable-icu" \
"--disable-icu" \
@@ -25,6 +29,11 @@ optional_depends yajl \
"--disable-soundcloud" \
"for soundcloud.com support" &&

+optional_depends zlib \
+ "--enable-zlib" \
+ "--disable-zlib" \
+ "for zlib support" &&
+
optional_depends bzip2 \
"--enable-bzip2" \
"--disable-bzip2" \
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index 36c3872..f49b349 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,3 +1,6 @@
+2015-05-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing boost dependency; glib2, zlib become optional
+
2015-02-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.19.9
* DEPENDS: added missing icu optional dependency
diff --git a/chat-irc/bitlbee/CONFIGURE b/chat-irc/bitlbee/CONFIGURE
index 6b1f739..993189e 100755
--- a/chat-irc/bitlbee/CONFIGURE
+++ b/chat-irc/bitlbee/CONFIGURE
@@ -26,6 +26,7 @@ config_query_option BITLBEE_OPTS "Enable debugging?" n \
config_query_list BITLBEE_SSL "Which SSL library would you like to use?" \
gnutls \
openssl \
+ libressl \
nss &&

config_query_list BITLBEE_EVENT "Which event handler library would you like
to use?" \
diff --git a/chat-irc/bitlbee/DEPENDS b/chat-irc/bitlbee/DEPENDS
index fb21fba..bb8d168 100755
--- a/chat-irc/bitlbee/DEPENDS
+++ b/chat-irc/bitlbee/DEPENDS
@@ -1,6 +1,17 @@
depends glib2 &&

-depends "$BITLBEE_SSL" "--ssl=$BITLBEE_SSL" &&
+case "$BITLBEE_SSL" in
+ openssl)
+ depends openssl "--ssl=openssl"
+ ;;
+ libressl)
+ depends libressl "--ssl=openssl"
+ ;;
+ *)
+ depends "$BITLBEE_SSL" "--ssl=$BITLBEE_SSL"
+ ;;
+esac &&
+
depends "$BITLBEE_EVENT" "--events=${BITLBEE_EVENT/glib2/glib}" &&

optional_depends libotr \
diff --git a/chat-irc/bitlbee/DETAILS b/chat-irc/bitlbee/DETAILS
index ad8bae7..1472dbc 100755
--- a/chat-irc/bitlbee/DETAILS
+++ b/chat-irc/bitlbee/DETAILS
@@ -1,10 +1,10 @@
SPELL=bitlbee
- VERSION=3.2.2
+ VERSION=3.4
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://get.bitlbee.org/src/$SOURCE
-
SOURCE_HASH=sha512:5826a9d64e2de42c5560d85c3e7c96a72930afae005143323b6a301b588328b156b50cde571c7f396ca00952d950d22db1ea11cc42256935d3d72ec90215e7d2
+
SOURCE_HASH=sha512:6e1f9fdd09402d63859960aa3f6bc1fc8701a10f5e3cd09210bbba69d2246bc471c68371e98c2879602e55bdc4e6f6e45fd8515ae81fd65d89e25dfd3b70041e
DOCS="doc/AUTHORS doc/CHANGES doc/CREDITS doc/FAQ doc/HACKING
doc/INSTALL doc/README doc/user-guide/user-guide.* $DOCS"
DOC_DIRS=""
WEB_SITE=http://www.bitlbee.org
diff --git a/chat-irc/bitlbee/HISTORY b/chat-irc/bitlbee/HISTORY
index a6aee76..d5294ba 100644
--- a/chat-irc/bitlbee/HISTORY
+++ b/chat-irc/bitlbee/HISTORY
@@ -1,3 +1,7 @@
+2015-05-08 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.4
+ * DEPENDS, CONFIGURE: added libressl support
+
2014-07-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.2.2

diff --git a/crypto/gnupg/DETAILS b/crypto/gnupg/DETAILS
index d7b94bf..6edf3ca 100755
--- a/crypto/gnupg/DETAILS
+++ b/crypto/gnupg/DETAILS
@@ -1,5 +1,7 @@
SPELL=gnupg
VERSION=1.4.19
+ SECURITY_PATCH=12
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=ftp://ftp.gnupg.org/gcrypt/$SPELL/$SOURCE

SOURCE_URL[1]=ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/$SPELL/$SOURCE
@@ -13,7 +15,6 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://www.gnupg.org/
ENTERED=20010922
- SECURITY_PATCH=12
LICENSE[0]=GPL
KEYWORDS="crypto"
SHORT="Tool for secure secure communication and data storage"
diff --git a/crypto/gnupg/HISTORY b/crypto/gnupg/HISTORY
index 5953087..0ee1571 100644
--- a/crypto/gnupg/HISTORY
+++ b/crypto/gnupg/HISTORY
@@ -1,3 +1,9 @@
+2015-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply patch
+ * debug.patch: backported official patch to fix debug info output
+ introduced in 1.4.19
+
2015-02-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.19; SECURITY_PATCH++ (CVE-2014-3591,
CVE-2015-0837); dropped broken mirrors; quoting paths
diff --git a/crypto/gnupg/PRE_BUILD b/crypto/gnupg/PRE_BUILD
index 8d04715..ac6d55a 100755
--- a/crypto/gnupg/PRE_BUILD
+++ b/crypto/gnupg/PRE_BUILD
@@ -1,4 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

+patch -p1 < "$SPELL_DIRECTORY/debug.patch" &&
+
sed -i "s:sparc9:sparcv9:;s:sparc8:sparcv8:" mpi/config.links
diff --git a/crypto/gnupg/debug.patch b/crypto/gnupg/debug.patch
new file mode 100644
index 0000000..5317d77
--- /dev/null
+++ b/crypto/gnupg/debug.patch
@@ -0,0 +1,24 @@
+From f34d88364a984947bcd7c344f9532f683b856353 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk AT gnupg.org>
+Date: Thu, 26 Feb 2015 09:38:58 +0100
+Subject: [PATCH] gpg: Remove left-over debug message.
+
+* g10/armor.c (check_input): Remove log_debug.
+---
+ g10/armor.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/g10/armor.c b/g10/armor.c
+index 4332d70..be03692 100644
+--- a/g10/armor.c
++++ b/g10/armor.c
+@@ -538,9 +538,6 @@ check_input( armor_filter_context_t *afx, IOBUF a )
+ /* This is probably input from a keyserver helper and we
+ have not yet seen an error line. */
+ afx->key_failed_code = parse_key_failed_line (line+4, len-4);
+- log_debug ("armor-keys-failed (%.*s) ->%d\n",
+- (int)len, line,
+- afx->key_failed_code);
+ }
+ if( i >= 0 && !(afx->only_keyblocks && i != 1 && i != 5 && i != 6 )) {
+ hdr_line = i;
diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index 826779f..9058c25 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -1,6 +1,5 @@
depends libgcrypt "--with-libgcrypt" &&
-
-depends LZMA &&
+depends xz-utils &&
depends nettle &&
depends gmp &&

diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index d13e6d5..0afea47 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,6 @@
+2015-05-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: LZMA -> xz-utils
+
2015-04-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, PREPARE: resurrected migration procedure which was killed
more than a year ago by commit (e743363)
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index eef3561..56de142 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,7 +1,7 @@
SPELL=krb5
- VERSION=1.13.1
- SECURITY_PATCH=15
-
SOURCE_HASH=sha512:f26dce8f682bd3fbf38a15df5f91722b573d4df4cc193f7ba8dc369cbbee8f4bc2a72f56513d2cf27697ce8baaf954afe04e3eefc15c2883fa1d5260145aef6e
+ VERSION=1.13.2
+ SECURITY_PATCH=16
+
SOURCE_HASH=sha512:d3f8dde220876bd24703c488122ba8e54ffaa7f8f2c7d325e5d198a4e171248673fc1d5d3c997c6d2e66c314e2b7f4609eb980a789c3556a79458ab4411e61b5
VX=${VERSION%.?}
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index 3dd12bb..04f0e27 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,7 @@
+2015-05-05-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.13.2
+ SECURITY_PATCH++, fixes CVE-2015-2694
+
2015-03-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.13.1
SECURITY_PATCH++, fixes [CVE-2014-5354, CVE-2014-5353 CVE-2014-5352
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index d92cfa6..b4fcea7 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -19,6 +19,10 @@ case $NSS_BRANCH in

SOURCE_HASH=sha512:dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89
SECURITY_PATCH=2
;;
+ 3.18)
+ VERSION=3.18.1
+
SOURCE_HASH=sha512:00c2893b5aa74038661f7353ebc8200746de1757cec61072717a89ec10292040a1dd954aaf688fbcf68261031ec30e85e6fe9ab46283e202e8b62b06e05fa616
+ ;;
esac
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index c38af97..23cdb20 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,9 @@
+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
+
2015-02-24 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 3.17.4

diff --git a/crypto/nss/PREPARE b/crypto/nss/PREPARE
index 2c11df7..d2de368 100755
--- a/crypto/nss/PREPARE
+++ b/crypto/nss/PREPARE
@@ -1,5 +1,5 @@
-config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 &&
+config_query_list NSS_BRANCH "Which branch of $SPELL do you want to build?"
DEFAULT 3.14 3.15 3.16 3.17 3.18 &&

if [[ -z "$NSS_BRANCH" ]] || [[ "$NSS_BRANCH" == "DEFAULT" ]]; then
- NSS_BRANCH=3.17
+ NSS_BRANCH=3.18
fi
diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index 3c7394d..088795d 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -1,7 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-if [[ $NSS_BRANCH == "3.17" ]]; then
+if [[ $NSS_BRANCH == "3.18" ]]; then
+ patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
+elif [[ $NSS_BRANCH == "3.17" ]]; then
patch -p1 < "$SPELL_DIRECTORY/nss-3.17.2-standalone-2.patch"
elif [[ $NSS_BRANCH == "3.15" ]] || [[ $NSS_BRANCH == "3.16" ]]; then
patch -p1 < $SCRIPT_DIRECTORY/nss-3.15.1-standalone-2.patch
diff --git a/crypto/nss/PRE_SUB_DEPENDS b/crypto/nss/PRE_SUB_DEPENDS
index 1354df844..322b8f6 100755
--- a/crypto/nss/PRE_SUB_DEPENDS
+++ b/crypto/nss/PRE_SUB_DEPENDS
@@ -3,6 +3,7 @@ case $THIS_SUB_DEPENDS in
3.15.x) if [ $NSS_BRANCH == "3.15" ]; then return 0; fi;;
3.16.x) if [ $NSS_BRANCH == "3.16" ]; then return 0; fi;;
3.17.x) if [ $NSS_BRANCH == "3.17" ]; then return 0; fi;;
+ 3.18.x) if [ $NSS_BRANCH == "3.18" ]; then return 0; fi;;
PEM) if [ $NSS_PEM == "y" ]; then return 0; fi;;
esac
return 1
diff --git a/crypto/nss/SUB_DEPENDS b/crypto/nss/SUB_DEPENDS
index e72e2ba..c68dd33 100755
--- a/crypto/nss/SUB_DEPENDS
+++ b/crypto/nss/SUB_DEPENDS
@@ -11,6 +11,9 @@ case $THIS_SUB_DEPENDS in
3.17.x) message "${MESSAGE_COLOR}3.17.x release needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_BRANCH="3.17"
;;
+ 3.18.x) message "${MESSAGE_COLOR}3.18.x release needed, forcing
it.${DEFAULT_COLOR}" &&
+ NSS_BRANCH="3.18"
+ ;;
PEM) message "${MESSAGE_COLOR}nss with PEM support needed, forcing
it.${DEFAULT_COLOR}" &&
NSS_PEM="y"
;;
diff --git a/database/mariadb/DETAILS b/database/mariadb/DETAILS
index fa057f7..47ce9f8 100755
--- a/database/mariadb/DETAILS
+++ b/database/mariadb/DETAILS
@@ -3,9 +3,9 @@ if [[ $MARIADB_BRANCH == 5.3 ]]; then
VERSION=5.3.12

SOURCE_HASH=sha512:d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
elif [[ $MARIADB_BRANCH == 5.5 ]]; then
- VERSION=5.5.41
- SECURITY_PATCH=2
-
SOURCE_HASH=sha512:727ce6994966a42602ea8f735f34b1b3c342d08b9dae2667e465805bff36e68bf69b582ec0b844b25fb7024f9b25a39280160c2935f639491a1c3654d3166953
+ VERSION=5.5.43
+ SECURITY_PATCH=3
+
SOURCE_HASH=sha512:fa9b463843ebf70e3a462ee5fdfa34aedd35194f3593f7ec1fc5f17663e798610ade46925b31f9f96e06503508ae840bfed54ae7b6661affa4d5b630d475f1db
else
VERSION=5.2.14
SECURITY_PATCH=3
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index c47d164..f5a8eae3 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,9 @@
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.5.43 (5.5 branch); SECURITY_PATCH++
+
+2015-03-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 5.5.42 (5.5 branch)
+
2015-01-28 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.5.41 (5.5 branch); SECURITY_PATCH++
(CVE-2015-0411, CVE-2015-0382, CVE-2015-0381, CVE-2015-0432,
diff --git a/devel/automake/DEPENDS b/devel/automake/DEPENDS
index cfbc40b..dbeeee2 100755
--- a/devel/automake/DEPENDS
+++ b/devel/automake/DEPENDS
@@ -1,5 +1,5 @@
depends autoconf &&
depends gnupg &&
-depends LZMA &&
+depends xz-utils &&
depends perl &&
depends smgl-fhs
diff --git a/devel/automake/HISTORY b/devel/automake/HISTORY
index 864b89a..a5989f3 100644
--- a/devel/automake/HISTORY
+++ b/devel/automake/HISTORY
@@ -1,3 +1,6 @@
+2015-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: LZMA -> xz-utils
+
2014-10-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.14.1

diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 57bec96..95d96d0 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,12 +1,12 @@
SPELL=curl
- VERSION=7.40.0
- SECURITY_PATCH=12
+ VERSION=7.42.1
+ SECURITY_PATCH=13
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://curl.haxx.se/download/$SOURCE
SOURCE_URL[1]=ftp://ftp.sunet.se/pub/www/utilities/$SPELL/$SOURCE
- SOURCE_URL[2]=ftp://ftp.rge.com/pub/networking/$SPELL/$SOURCE
+ SOURCE_URL[2]=http://${SPELL}.askapache.com/download/${SOURCE}
SOURCE2_URL[0]=$SOURCE_URL.asc
SOURCE_GPG=curl.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 0f1725c..db1d4af 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,11 @@
+2015-05-11 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[2],updated spell to 7.42.1,
+ SECURITY_PATCH++, (CVE-2015-3153, CVE-2015-3144, CVE-2015-3145,
+ CVE-2015-3148, CVE-2015-3143)
+
+2015-02-25 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 7.41.0
+
2015-01-08 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: version 7.40.0

diff --git a/gnome2-libs/gdk-pixbuf2/DEPENDS b/gnome2-libs/gdk-pixbuf2/DEPENDS
index 5cefe8e..696ccf2 100755
--- a/gnome2-libs/gdk-pixbuf2/DEPENDS
+++ b/gnome2-libs/gdk-pixbuf2/DEPENDS
@@ -2,7 +2,7 @@ depends glib2 &&
depends JPEG &&
depends libpng &&
depends libpthread-stubs &&
-depends LZMA &&
+depends xz-utils &&
depends pcre &&
depends tiff &&
depends zlib &&
diff --git a/gnome2-libs/gdk-pixbuf2/HISTORY b/gnome2-libs/gdk-pixbuf2/HISTORY
index f2ec64b..0db7cdc 100644
--- a/gnome2-libs/gdk-pixbuf2/HISTORY
+++ b/gnome2-libs/gdk-pixbuf2/HISTORY
@@ -1,3 +1,6 @@
+2015-05-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: LZMA -> xz-utils
+
2015-03-16 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: removed libffi -- it's not a direct dependency

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..797f63d 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,11 +1,10 @@
SPELL=firefox
- VERSION=37.0.2
+ VERSION=38.0.1
SOURCE=$SPELL-$VERSION.source.tar.bz2
-
SOURCE_HASH=sha512:98f4fab8116f99e108cc450fef8e4b364d07cff33d558012950cb23b64db9a363fe27fbd5734fbb723bc9efe1d0467bd9c94e2304bdd3984c43ff4cfb9207a70
+
SOURCE_HASH=sha512:e016093c008f118cf5f586d2bd6248b1b9d647d8faf2fbc3edaa827b665b4653cb0a92f5ba079e80d8ea4d65c819e3f76345561f5581081606d23f18623b3b61

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..f5681c3 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2015-05-15 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 38.0.1, removed obsolete mirror
+
+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/DEPENDS b/kernels/linux/DEPENDS
index 23a2d1c..19cfafb 100755
--- a/kernels/linux/DEPENDS
+++ b/kernels/linux/DEPENDS
@@ -4,5 +4,5 @@ fi &&
depends perl &&
optional_depends linux-initramfs '' '' 'for making initramfs images' &&
optional_depends mtools '' '' 'for make bzdisk' &&
-optional_depends LZMA '' '' 'for zen patches' &&
+optional_depends xz-utils '' '' 'for zen patches' &&
optional_depends lzop '' '' 'for LZO kernel image'
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index fde4d16..7e02a1f 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,33 @@
+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
+
+2015-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: LZMA -> xz-utils
+
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.10.77: added
+ * info/patches/maintenance_patches_3/patch-3.14.41: added
+ * info/patches/maintenance_patches_3/patch-3.18.13: added
+ * info/patches/maintenance_patches_3/patch-3.19.7: added
+
+2015-05-07 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_4=4.0.2
+ * info/patches/maintenance_patches_4/patch-4.0.2: added
+
+2015-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.12.42: added
+
2015-05-02 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.12.41: added

diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.10.77
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.10.77
new file mode 100755
index 0000000..dd815a9
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.10.77
@@ -0,0 +1,5 @@
+appliedkernels="3.10"
+patchversion="${appliedkernels}.77"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8a0279804cc7d7e3987921f5d438a6d6e8ffbe1b"
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.12.42
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.42
new file mode 100755
index 0000000..0fa843c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.12.42
@@ -0,0 +1,5 @@
+appliedkernels="3.12"
+patchversion="${appliedkernels}.42"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="32a1ece6749862436ca61f3dfb438429c81abc43"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.41
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.41
new file mode 100755
index 0000000..e7e1178
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.41
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.41"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="05ee354ba8c9213276d6dc32d1e5245432fe662b"
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.18.13
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.18.13
new file mode 100755
index 0000000..ed7134c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.18.13
@@ -0,0 +1,5 @@
+appliedkernels="3.18"
+patchversion="${appliedkernels}.13"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="1a243dd6e27c225d54b40343c10a42ad637436c4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.19.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.19.7
new file mode 100755
index 0000000..52c936a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.19.7
@@ -0,0 +1,5 @@
+appliedkernels="3.19"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3bbf4a6edbe43edaa6909068d78ce26c6f0e6745"
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.2
b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.2
new file mode 100755
index 0000000..027c51b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_4/patch-4.0.2
@@ -0,0 +1,5 @@
+appliedkernels="4.0"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v4.x/${source}"
+sha1sum="a0306edfa9ecb87d1701eb1b29230c99bcfb1bbc"
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/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
index 8d8de32..4e12d88 100755
--- a/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
+++ b/kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch
@@ -1,4 +1,4 @@
-appliedkernels="2.6.31 2.6.32 2.6.33 2.6.34 2.6.35 2.6.36 2.6.37 2.6.38
2.6.39 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12"
+appliedkernels="2.6.31 2.6.32 2.6.33 2.6.34 2.6.35 2.6.36 2.6.37 2.6.38
2.6.39 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8 3.9 3.10 3.11 3.12 4.0"
source="smgl-logo-0.2-for-2.6.31.patch.bz2"
source_url="http://download.sourcemage.org/distro/kernel/${source}";
source_gpg="gurus.gpg:${source}.sig"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 45e3a75..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.1
+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/libmpc/DETAILS b/libs/libmpc/DETAILS
index 1fdbc1e..92eb0fc 100755
--- a/libs/libmpc/DETAILS
+++ b/libs/libmpc/DETAILS
@@ -1,10 +1,12 @@
SPELL=libmpc
VERSION=1.0.2

SOURCE_HASH=sha512:0e94ba9a20c7374839d2a53a9ed8cce647cc74142b464634fdb9cbaf96e91e43ea13f0b4dab5c06c247e6719de0c0ae03fdcba0c7c4518ee504c545c96da70d0
+ SPELLX=mpc
SECURITY_PATCH=1
- SOURCE="mpc-$VERSION.tar.gz"
- SOURCE_URL[0]=http://www.multiprecision.org/mpc/download/$SOURCE
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/mpc-$VERSION"
+ SOURCE="$SPELLX-$VERSION.tar.gz"
+ SOURCE_URL[0]=http://www.multiprecision.org/${SPELLX}/download/${SOURCE}
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ GATHER_DOCS=off
WEB_SITE="http://www.multiprecision.org/index.php?prog=mpc";
LICENSE[0]="LGPL"
ENTERED=20100410
diff --git a/libs/libmpc/HISTORY b/libs/libmpc/HISTORY
index 55673c9..7619fd2 100644
--- a/libs/libmpc/HISTORY
+++ b/libs/libmpc/HISTORY
@@ -1,3 +1,8 @@
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: use SPELLX; added GATHER_DOCS to drop dirty hack in INSTALL
+ * INSTALL: corrected install phase by adding a test case & '-f' flag
for
+ ln (thanks to Justin and his super-fresh rebuild)
+
2014-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.2

diff --git a/libs/libmpc/INSTALL b/libs/libmpc/INSTALL
index 7443a11..0efe3f0 100755
--- a/libs/libmpc/INSTALL
+++ b/libs/libmpc/INSTALL
@@ -1,4 +1,5 @@
default_install &&
# gcc needs previous libmpc
-ln -s $TRACK_ROOT/usr/lib/libmpc.so $INSTALL_ROOT/usr/lib/libmpc.so.2 &&
-rm -r doc # remove the remaining build system cruft
+if [[ ! -h "$INSTALL_ROOT/usr/lib/libmpc.so.2" ]]; then
+ ln -sf $TRACK_ROOT/usr/lib/libmpc.so $INSTALL_ROOT/usr/lib/libmpc.so.2
+fi
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 9ab5a89..722ba6c 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,6 @@
+2015-05-04 Pavel Vinogradov <public AT sourcemage.org>
+ * *SUB_DEPENDS: g++ -> gcc with CXX
+
2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: re-enabled build of static libraries
* cve-2014-8964: renamed to cve-2014-8964.patch
diff --git a/libs/pcre/PRE_SUB_DEPENDS b/libs/pcre/PRE_SUB_DEPENDS
index 7236d16..1763f0e 100755
--- a/libs/pcre/PRE_SUB_DEPENDS
+++ b/libs/pcre/PRE_SUB_DEPENDS
@@ -3,6 +3,6 @@ case "$THIS_SUB_DEPENDS" in
then return 0; else return 1; fi ;;
UTFPROP) if [[ $BUILDUTF == y ]] &&
[[ $UTFPROPERTIES == y ]]; then return 0; else return 1; fi ;;
- CPP) is_depends_enabled $SPELL g++ ;;
+ CPP) is_depends_enabled $SPELL gcc ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
esac
diff --git
a/libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
b/libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
index 3e15cf5..ca784db 100755
--- a/libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
+++ b/libs/pcre/REPAIR^f759b166c7ff34012ab85e9c6742315f^PRE_SUB_DEPENDS
@@ -1,6 +1,6 @@
case "$THIS_SUB_DEPENDS" in
UTFPROP) if [[ $BUILDUTF8 == y ]] &&
[[ $UTFPROPERTIES == y ]]; then return 0; else return 1; fi ;;
- CPP) is_depends_enabled $SPELL g++ ;;
+ CPP) is_depends_enabled $SPELL gcc ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
esac
diff --git a/libs/pcre/SUB_DEPENDS b/libs/pcre/SUB_DEPENDS
index 0d72a16..70419a1 100755
--- a/libs/pcre/SUB_DEPENDS
+++ b/libs/pcre/SUB_DEPENDS
@@ -5,6 +5,6 @@ case "$THIS_SUB_DEPENDS" in
BUILDUTF=y &&
UTFPROPERTIES=y &&
persistent_add UTFPROPERTIES ;;
- CPP) depends g++ "--enable-cpp" ;;
+ CPP) depends -sub CXX gcc "--enable-cpp" ;;
*) echo "bogus sub_depends: pcre $THIS_SUB_DEPENDS"; return 1;;
esac
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 62009d0..164f285 100755
--- a/net/wpa_supplicant/DETAILS
+++ b/net/wpa_supplicant/DETAILS
@@ -8,14 +8,15 @@ elif [[ $WPA_RELEASE == devel ]]; then
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
else
- VERSION=1.1
+ VERSION=2.4
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_HASH=sha512:61afeff24d6175feb4c73a6c53f0e88acb32746739febeafc9b834652af6607c339b9fe8ef1e05bc61f6b078f85aa0a35261fc8d02f05a844cfded12c8709901
+
SOURCE_HASH=sha512:03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b
fi
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=http://hostap.epitest.fi/releases/$SOURCE
+ SOURCE_URL[0]=http://w1.fi/releases/$SOURCE
LICENSE[0]=GPL
- WEB_SITE=http://hostap.epitest.fi/wpa_supplicant/
+ WEB_SITE=http://w1.fi/wpa_supplicant/
ENTERED=20050130
SHORT="WPA/WPA2 supplicant"
cat << EOF
diff --git a/net/wpa_supplicant/HISTORY b/net/wpa_supplicant/HISTORY
index 431042c..ff323e9 100644
--- a/net/wpa_supplicant/HISTORY
+++ b/net/wpa_supplicant/HISTORY
@@ -1,3 +1,13 @@
+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
+
+2014-08-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.2
+
2014-08-23 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Allow the use of libressl
* BUILD, DEPENDS: nl80211 support requires libnl
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/net/xinetd/DETAILS b/net/xinetd/DETAILS
index 0519861..8e24bec 100755
--- a/net/xinetd/DETAILS
+++ b/net/xinetd/DETAILS
@@ -1,9 +1,11 @@
SPELL=xinetd
VERSION=2.3.15
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www.xinetd.org/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://download.x.inetd.net/$SOURCE
+ SOURCE_URL[1]=http://download.sourcemage.org/distro/$SOURCE
+ SOURCE_URL[2]=http://sourcemage.ru/mirror/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=http://www.xinetd.org/license
WEB_SITE=http://www.xinetd.org/
diff --git a/net/xinetd/HISTORY b/net/xinetd/HISTORY
index d4cab25..b2a776a 100644
--- a/net/xinetd/HISTORY
+++ b/net/xinetd/HISTORY
@@ -1,3 +1,9 @@
+2015-05-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (CVE-2013-4342); updated source urls;
+ quoting paths
+ * PRE_BUILD: apply patch
+ * tcpmux.patch: added, to fix a security issue
+
2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: howl -> -sub COMPAT_HOWL avahi

diff --git a/net/xinetd/PRE_BUILD b/net/xinetd/PRE_BUILD
new file mode 100755
index 0000000..b462536
--- /dev/null
+++ b/net/xinetd/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/tcpmux.patch"
diff --git a/net/xinetd/tcpmux.patch b/net/xinetd/tcpmux.patch
new file mode 100644
index 0000000..17e70b0
--- /dev/null
+++ b/net/xinetd/tcpmux.patch
@@ -0,0 +1,11 @@
+--- a/xinetd/builtins.c
++++ b/xinetd/builtins.c
+@@ -617,7 +617,7 @@ static void tcpmux_handler( const struct server *serp )
+ if( SC_IS_INTERNAL( scp ) ) {
+ SC_INTERNAL(scp, nserp);
+ } else {
+- exec_server(nserp);
++ child_process(nserp);
+ }
+ }
+
diff --git a/perl-cpan/email-mime-modifier/BUILD
b/perl-cpan/email-mime-modifier/BUILD
index 2de29cd..27ba77d 100755
--- a/perl-cpan/email-mime-modifier/BUILD
+++ b/perl-cpan/email-mime-modifier/BUILD
@@ -1 +1 @@
-default_build_perl
+true
diff --git a/perl-cpan/email-mime-modifier/CONFLICTS
b/perl-cpan/email-mime-modifier/CONFLICTS
new file mode 100755
index 0000000..d78fdfe
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/CONFLICTS
@@ -0,0 +1 @@
+conflicts email-mime y
diff --git a/perl-cpan/email-mime-modifier/DEPENDS
b/perl-cpan/email-mime-modifier/DEPENDS
deleted file mode 100755
index e71ea80..0000000
--- a/perl-cpan/email-mime-modifier/DEPENDS
+++ /dev/null
@@ -1,8 +0,0 @@
-depends perl &&
-depends mime-types &&
-depends email-mime &&
-depends email-mime-encodings &&
-depends email-mime-contenttype &&
-depends email-simple &&
-depends email-messageid &&
-depends email-address
diff --git a/perl-cpan/email-mime-modifier/DETAILS
b/perl-cpan/email-mime-modifier/DETAILS
index 865c510..e22de76 100755
--- a/perl-cpan/email-mime-modifier/DETAILS
+++ b/perl-cpan/email-mime-modifier/DETAILS
@@ -1,9 +1,9 @@
SPELL=email-mime-modifier
VERSION=1.444
- SOURCE="Email-MIME-Modifier-${VERSION}.tar.gz"
- SOURCE_URL[0]=http://www.cpan.org/authors/id/R/RJ/RJBS/${SOURCE}
-
SOURCE_HASH=sha512:5cbb0dbdc7423e41b6a49caad99d31cea5b8a9a87a51abb15b5de45f94b17a7fb1c7662d24a4e9399d84b8afd2af798fdd29ef01a72e084b365fa8b4268d8807
+ PATCHLEVEL=1
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Email-MIME-Modifier-${VERSION}"
+ GATHER_DOCS=off
+ ARCHIVE=off

WEB_SITE="http://search.cpan.org/search?query=Email%3A%3AMIME%3A%3AModifier&mode=all";
LICENSE[0]=ART
ENTERED=20080630
diff --git a/perl-cpan/email-mime-modifier/HISTORY
b/perl-cpan/email-mime-modifier/HISTORY
index 28ebb77..6515c11 100644
--- a/perl-cpan/email-mime-modifier/HISTORY
+++ b/perl-cpan/email-mime-modifier/HISTORY
@@ -1,3 +1,8 @@
+2015-05-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, BUILD: deprecated in favour of email-mime
+ * DEPENDS: removed
+ * PRE_BUILD, INSTALL, UP_TRIGGERS, CONFLICTS: added
+
2009-09-14 David Kowis <dkowis AT shlrm.org>
* DETAILS: to latest version

diff --git a/perl-cpan/email-mime-modifier/INSTALL
b/perl-cpan/email-mime-modifier/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/email-mime-modifier/PRE_BUILD
b/perl-cpan/email-mime-modifier/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/email-mime-modifier/UP_TRIGGERS
b/perl-cpan/email-mime-modifier/UP_TRIGGERS
new file mode 100755
index 0000000..3c39fde
--- /dev/null
+++ b/perl-cpan/email-mime-modifier/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger email-mime-modifier dispel_self &&
+up_trigger email-mime cast_self
diff --git a/perl-cpan/mail-internet/BUILD b/perl-cpan/mail-internet/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/mail-internet/BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/mail-internet/CONFLICTS
b/perl-cpan/mail-internet/CONFLICTS
new file mode 100755
index 0000000..4e15779
--- /dev/null
+++ b/perl-cpan/mail-internet/CONFLICTS
@@ -0,0 +1 @@
+conflicts mailtools y
diff --git a/perl-cpan/mail-internet/DEPENDS b/perl-cpan/mail-internet/DEPENDS
deleted file mode 100755
index 6826bc7..0000000
--- a/perl-cpan/mail-internet/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends perl
diff --git a/perl-cpan/mail-internet/DETAILS b/perl-cpan/mail-internet/DETAILS
index c487e7a..a066ff5 100755
--- a/perl-cpan/mail-internet/DETAILS
+++ b/perl-cpan/mail-internet/DETAILS
@@ -1,12 +1,11 @@
SPELL=mail-internet
VERSION=2.08
- SOURCE=MailTools-$VERSION.tar.gz
+ PATCHLEVEL=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/MailTools-$VERSION
- SOURCE_URL[0]=http://www.cpan.org/authors/id/M/MA/MARKOV/$SOURCE
-
SOURCE_HASH=sha512:8899b560a60e69b22795cd564fc23c3f88faafa63beb56e04799d9d52fbc439ee6b5d317f5ad0a9c0943be12ff8bdfa75ab8b15f9a2366c17bb393d3b908fe90
+ GATHER_DOCS=off
+ ARCHIVE=off
WEB_SITE="http://search.cpan.org/search?module=Mail::Internet";
ENTERED=20020312
- UPDATED=20050420
LICENSE[0]=ART
KEYWORDS="perl"
SHORT="Functions for RFC822 address manipulations"
diff --git a/perl-cpan/mail-internet/HISTORY b/perl-cpan/mail-internet/HISTORY
index 95ab44f..2144155 100644
--- a/perl-cpan/mail-internet/HISTORY
+++ b/perl-cpan/mail-internet/HISTORY
@@ -1,3 +1,8 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: deprecated in favour of mailtools
+ * {PRE_,}BUILD, INSTALL, UP_TRIGGERS: added
+ * DEPENDS: removed
+
2011-08-29 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: removed unneeded dependencies

diff --git a/perl-cpan/mail-internet/INSTALL b/perl-cpan/mail-internet/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/mail-internet/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/mail-internet/PRE_BUILD
b/perl-cpan/mail-internet/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/mail-internet/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/mail-internet/UP_TRIGGERS
b/perl-cpan/mail-internet/UP_TRIGGERS
new file mode 100755
index 0000000..4e66a4c
--- /dev/null
+++ b/perl-cpan/mail-internet/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger mail-internet dispel_self &&
+up_trigger mailtools cast_self
diff --git a/perl-cpan/mailtools/DETAILS b/perl-cpan/mailtools/DETAILS
index e451278..807a742 100755
--- a/perl-cpan/mailtools/DETAILS
+++ b/perl-cpan/mailtools/DETAILS
@@ -1,12 +1,12 @@
SPELL=mailtools
- NAME=MailTools
- VERSION=2.03
- SOURCE=$NAME-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$NAME-$VERSION
- SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/$SOURCE
-
SOURCE_HASH=sha512:82314be0fa863fed8fbb600325eff462cf3cb3ea468616b2f9089c919c575f2a9ba0a4c07c73ddb2826d1e11770cfa8c1dbbb218579c0eb22065f03cb4f6069a
- LICENSE=UNKNOWN
- WEB_SITE="http://search.cpan.org/search?dist=$NAME";
+ SPELLX=MailTools
+ VERSION=2.14
+ SOURCE=${SPELLX}-${VERSION}.tar.gz
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MA/MARKOV/${SOURCE}
+
SOURCE_HASH=sha512:1df9da8394fe2a5b3243069a867b5eb4b5d4cbe3528bdbc4fe8118a3488c652c1ffc6eb8d5ba01802d74384a42d87ef67f8f3397640aab69471ae90ad0a79092
+ LICENSE=ART
+ WEB_SITE=http://search.cpan.org/dist/MailTools/
ENTERED=20050114
KEYWORDS="mail perl"
SHORT="A collection of mail tools"
diff --git a/perl-cpan/mailtools/HISTORY b/perl-cpan/mailtools/HISTORY
index 76c7f91..b8e9341 100644
--- a/perl-cpan/mailtools/HISTORY
+++ b/perl-cpan/mailtools/HISTORY
@@ -1,3 +1,7 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.14; NAME -> SPELLX; updated website,
+ source url, license (UNKNOWN -> ART); quoting paths
+
2009-10-09 David Kowis <dkowis AT shlrm.org>
* DEPENDS: fixed timedate dependency

diff --git a/perl-cpan/weakref/BUILD b/perl-cpan/weakref/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/weakref/BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/weakref/CONFLICTS b/perl-cpan/weakref/CONFLICTS
new file mode 100755
index 0000000..9ae5303
--- /dev/null
+++ b/perl-cpan/weakref/CONFLICTS
@@ -0,0 +1 @@
+conflicts perl y
diff --git a/perl-cpan/weakref/DEPENDS b/perl-cpan/weakref/DEPENDS
deleted file mode 100755
index 6826bc7..0000000
--- a/perl-cpan/weakref/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends perl
diff --git a/perl-cpan/weakref/DETAILS b/perl-cpan/weakref/DETAILS
index 701afc4..71b2adc 100755
--- a/perl-cpan/weakref/DETAILS
+++ b/perl-cpan/weakref/DETAILS
@@ -1,9 +1,9 @@
SPELL=weakref
VERSION=0.01
- SOURCE=WeakRef-$VERSION.tar.gz
+ PATCHLEVEL=1
SOURCE_DIRECTORY=$BUILD_DIRECTORY/WeakRef-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/LUKKA/$SOURCE
-
SOURCE_HASH=sha512:5167cc624a41ec0a92219be0d2788ad404a61c192f980df67afe3e6259004e7f97e1c0e4d756582b7e1ec6f82346fb85be4806ecd093825442946841b8922599
+ GATHER_DOCS=off
+ ARCHIVE=off
LICENSE=ART
WEB_SITE=http://search.cpan.org/~lukka/WeakRef/
ENTERED=20020405
diff --git a/perl-cpan/weakref/HISTORY b/perl-cpan/weakref/HISTORY
index 452adb4..17a75bd 100644
--- a/perl-cpan/weakref/HISTORY
+++ b/perl-cpan/weakref/HISTORY
@@ -1,3 +1,7 @@
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: deprecated in favour of perl
+ * {PRE_,}BUILD, INSTALL, UP_TRIGGERS: added
+
2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: cleaned up
* BUILD: useless
diff --git a/perl-cpan/weakref/INSTALL b/perl-cpan/weakref/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/weakref/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/weakref/PRE_BUILD b/perl-cpan/weakref/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/weakref/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/weakref/UP_TRIGGERS b/perl-cpan/weakref/UP_TRIGGERS
new file mode 100755
index 0000000..ef7ae47
--- /dev/null
+++ b/perl-cpan/weakref/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger weakref dispel_self &&
+up_trigger perl cast_self
diff --git a/perl-cpan/xml-parser-expat/DETAILS
b/perl-cpan/xml-parser-expat/DETAILS
index 83a5b5c..d46c9a7 100755
--- a/perl-cpan/xml-parser-expat/DETAILS
+++ b/perl-cpan/xml-parser-expat/DETAILS
@@ -1,24 +1,22 @@
SPELL=xml-parser-expat
- VERSION=2.42_01
-
SOURCE_HASH=sha512:cd351a9c3e857fc1e8e742924d10b83917da5ce5e3f1c7168a6447c0bd27b2a878f301e3bfa927eb4a977b71e93c7d7bd4536e7837000f7b45ce6a31ae7d9390
- SOURCE=XML-Parser-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/XML-Parser-$VERSION"
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TO/TODDR/$SOURCE
+ SPELLX=XML-Parser
+ VERSION=2.44
+ SOURCE=${SPELLX}-${VERSION}.tar.gz
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TO/TODDR/${SOURCE}
+
SOURCE_HASH=sha512:4790d20d89478880b18255679727e5b2fb2860bb4de67d5032c805fd44c9f90697a240a612aba51255325192253aa578b346d658b29f631a4e92ad96e7d65b61
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
LICENSE=ART
- WEB_SITE=http://search.cpan.org/~toddr/XML-Parser/
+ WEB_SITE=http://search.cpan.org/~dist/XML-Parser/
ENTERED=20020314
- KEYWORDS="parser perl"
- SHORT="Flexible fast parser with plug-in styles"
+ KEYWORDS="parser perl xml"
+ SHORT="flexible fast parser with plug-in styles"
cat << EOF
-This module provides ways to parse XML documents. It is
-built on top of the XML::Parser::Expat manpage, which is a
-lower level interface to James Clark's expat library. Each
-call to one of the parsing methods creates a new instance
-of XML::Parser::Expat which is then used to parse the doc�
-ument. Expat options may be provided when the XML::Parser
-object is created. These options are then passed on to
-the Expat object on each parse call. They can also be
-given as extra arguments to the parse methods, in which
-case they override options given at XML::Parser creation
-time.
+This module provides ways to parse XML documents. It is built on top of the
+XML::Parser::Expat manpage, which is a lower level interface to James Clark's
+expat library. Each call to one of the parsing methods creates a new
instance of
+XML::Parser::Expat which is then used to parse the document. Expat options
may
+be provided when the XML::Parser object is created. These options are then
+passed on to the Expat object on each parse call. They can also be given as
+extra arguments to the parse methods, in which case they override options
given
+at XML::Parser creation time.
EOF
diff --git a/perl-cpan/xml-parser-expat/HISTORY
b/perl-cpan/xml-parser-expat/HISTORY
index 698d3e2..7bb7723 100644
--- a/perl-cpan/xml-parser-expat/HISTORY
+++ b/perl-cpan/xml-parser-expat/HISTORY
@@ -1,5 +1,6 @@
-2013-12-20 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 2.42_01
+2015-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.44; use SPELLX; updated website,
+ descriptions, keywords

2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.41; renewed source url
diff --git a/ruby-raa/ruby-2.2/DETAILS b/ruby-raa/ruby-2.2/DETAILS
index 60e0916..17ec19d 100755
--- a/ruby-raa/ruby-2.2/DETAILS
+++ b/ruby-raa/ruby-2.2/DETAILS
@@ -1,8 +1,8 @@
SPELL=ruby-2.2
PACKAGE=ruby
- VERSION=2.2.0
-
SOURCE_HASH=sha512:cd7e52faa464df8aca7ccfa23a5f06248e1ad82bc8c9f1829aa1b51ff37b15973b8caaa68e914d837325b8d59427fda4f3cad82c50925e1c84e688324a2a155d
- SECURITY_PATCH=0
+ VERSION=2.2.2
+
SOURCE_HASH=sha512:bd72d0a4c017e2527659f64ef2781bbe8bd540a2302eaa60234a12282fd53c359e04205c56385402c67e81bb9dab3b88de53de82e12bb13e3386c26301043b64
+ SECURITY_PATCH=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$PACKAGE-$VERSION.tar.xz
SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$PACKAGE/$BRANCH/$SOURCE
diff --git a/ruby-raa/ruby-2.2/HISTORY b/ruby-raa/ruby-2.2/HISTORY
index 2e50379..83aa342 100644
--- a/ruby-raa/ruby-2.2/HISTORY
+++ b/ruby-raa/ruby-2.2/HISTORY
@@ -1,3 +1,7 @@
+2015-05-12 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.2.2
+ SECURITY_PATCH=1 fixes CVE-2015-1855
+
2015-01-03 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.2.0
spell created, copied from ruby-2.1
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/mdp/DETAILS b/utils/mdp/DETAILS
index c8962c0..6cff28e 100755
--- a/utils/mdp/DETAILS
+++ b/utils/mdp/DETAILS
@@ -1,5 +1,5 @@
SPELL=mdp
- VERSION=0.7.3
+ VERSION=0.7.4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://tamentis.com/projects/$SPELL/files/$SOURCE
diff --git a/utils/mdp/HISTORY b/utils/mdp/HISTORY
index c7b0cb5..f2775ac 100644
--- a/utils/mdp/HISTORY
+++ b/utils/mdp/HISTORY
@@ -1,4 +1,7 @@
-204-11-08 Treeve Jelbert <treeve AT sourcemage.org>
+2015-05-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.7.4
+
+2014-11-08 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: gnupg-exp => GNUPG

2014-02-23 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/utils/util-linux/HISTORY b/utils/util-linux/HISTORY
index 44855f8..bfcb082 100644
--- a/utils/util-linux/HISTORY
+++ b/utils/util-linux/HISTORY
@@ -1,3 +1,8 @@
+2015-05-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * PREPARE: added forgotten spell_ok check (thanks to Justin and his
+ super-fresh rebuild); added a warning message for those who haven't
+ had util-linux installed yet
+
2015-01-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version to 2.25.2

diff --git a/utils/util-linux/PREPARE b/utils/util-linux/PREPARE
index f8acac4..5f29fbf 100755
--- a/utils/util-linux/PREPARE
+++ b/utils/util-linux/PREPARE
@@ -6,29 +6,33 @@ config_query_list UL_VERSION "What version do you want to
use?" \
latest \
aes &&

-local OLD_SPELL_VERSION="" &&
-spell_ok $SPELL && OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
-
# util-linux 2.20 needs ttyX in /etc/inittab without /dev
# http://www.sourcemage.org/issues/110
message "${MESSAGE_COLOR}Checking sanity of
$INSTALL_ROOT/etc/inittab...${DEFAULT_COLOR}" &&

if grep -iq "/dev/tty" "$INSTALL_ROOT/etc/inittab"; then
- if is_version_less ${OLD_SPELL_VERSION} 2.20; then
- message "${PROBLEM_COLOR}" &&
- message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
- message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
- message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1 9600"
&&
- message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
- message "Press 'n' to abort cast and do that manually by editing" &&
- message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
- message "${DEFAULT_COLOR}" &&
+ if spell_ok $SPELL; then
+ local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+ if is_version_less ${OLD_SPELL_VERSION} 2.20; then
+ message "${PROBLEM_COLOR}" &&
+ message "WARNING: $INSTALL_ROOT/etc/inittab needs syntax update. You
need to" &&
+ message "replace all '/dev/tty*' lines to 'tty*' equivalents, e.g.:" &&
+ message "${MESSAGE_COLOR}Before: tty1:linux:/sbin/agetty /dev/tty1
9600" &&
+ message "After: tty1:linux:/sbin/agetty tty1 9600${PROBLEM_COLOR}" &&
+ message "Press 'n' to abort cast and do that manually by editing" &&
+ message "$INSTALL_ROOT/etc/inittab file under superuser, then recast
$SPELL." &&
+ message "${DEFAULT_COLOR}" &&

- if ! query "Attempt to replace the lines automatically?" n; then
- return 1
- else
- persistent_add UL_DEV_AUTOREPLACE &&
- local UL_DEV_AUTOREPLACE="y"
+ if ! query "Attempt to replace the lines automatically?" n; then
+ return 1
+ else
+ persistent_add UL_DEV_AUTOREPLACE &&
+ UL_DEV_AUTOREPLACE="y"
+ fi
fi
+ else
+ message "${PROBLEM_COLOR}Your /etc/inittab was not managed by
${SPELL_COLOR}$SPELL${PROBLEM_COLOR} previously."
+ message "You should probably fix your '/dev/tty*' entries by removing
'/dev/' from them.${DEFAULT_COLOR}"
fi
fi
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
+
+



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (5c29b1f9e6532bae709d3bb7d973a6fcb40aabfb), Vlad Glagolev, 05/17/2015

Archive powered by MHonArc 2.6.24.

Top of Page