sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (4373e294029fc81d666ba3e432f19e99f881bcf6)

From: Vlad Glagolev <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (4373e294029fc81d666ba3e432f19e99f881bcf6)
Date: Tue, 25 Jun 2013 07:45:15 -0500

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

ChangeLog |
7
accounts |
1
antivirus/clamav/DETAILS |
6
antivirus/clamav/HISTORY |
14
antivirus/clamav/vendor_clamav.gpg
|binary
audio-players/ripperx/BUILD |
1
audio-players/ripperx/DETAILS |
2
audio-players/ripperx/HISTORY |
4
chat-im/gajim/DETAILS |
1
chat-im/gajim/HISTORY |
6
chat-im/gajim/PRE_BUILD |
4
chat-im/gajim/gtalk.patch |
11
crypto/keepassx/0001-add-missing-includes.patch |
26
crypto/keepassx/HISTORY |
3
crypto/keepassx/PRE_BUILD |
3
crypto/krb5/BUILD |
14
crypto/krb5/DETAILS |
9
crypto/krb5/HISTORY |
18
crypto/krb5/PRE_BUILD |
4
crypto/krb5/gcc-4.7.patch |
10
crypto/openssl/HISTORY |
6
crypto/openssl/INSTALL |
5
crypto/openssl/UP_TRIGGERS |
3
database/firebird25/DETAILS |
6
database/firebird25/HISTORY |
4
database/mongodb/DETAILS |
5
database/mongodb/HISTORY |
3
database/mysql/HISTORY |
4
database/mysql/PRE_BUILD |
6
database/postgresql/DETAILS |
6
database/postgresql/HISTORY |
3
dev/null
|binary
devel/python/DETAILS |
5
devel/python/HISTORY |
6
devel/python/TRIGGERS |
4
devel/python3/CONFIGURE |
1
devel/python3/CONFLICTS |
1
devel/python3/DETAILS |
5
devel/python3/HISTORY |
12
devel/python3/INSTALL |
4
devel/python3/TRIGGERS |
4
ftp/curl/BUILD |
5
ftp/curl/CONFIGURE |
2
ftp/curl/DEPENDS |
17
ftp/curl/DETAILS |
4
ftp/curl/HISTORY |
26
graphics-libs/mesalib/DEPENDS |
5
graphics-libs/mesalib/HISTORY |
3
graphics-libs/openjpeg/BUILD |
3
graphics-libs/openjpeg/DETAILS |
7
graphics-libs/openjpeg/HISTORY |
18
graphics-libs/openjpeg/INSTALL |
6
graphics-libs/openjpeg/UP_TRIGGERS |
19
groups |
1
http/firefox/BUILD |
4
http/firefox/DEPENDS |
87 +-
http/firefox/DETAILS |
1
http/firefox/HISTORY |
13
http/firefox/PRE_BUILD |
17
http/firefox/desktop/firefox.desktop |
2
http/firefox/mozconfig |
12
http/privoxy/DETAILS |
4
http/privoxy/HISTORY |
4
http/privoxy/privoxy.gpg
|binary
kernels/linux/DEPENDS |
3
kernels/linux/HISTORY |
91 ++
kernels/linux/info/kernels/3.9 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.67 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.68 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.69 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.70 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.71 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.72 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.73 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.74 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.75 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.76 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.77 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.78 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.79 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.80 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.81 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.82 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.40 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.41 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.42 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.43 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.44 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.45 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.46 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.47 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.34 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.35 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.36 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.37 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.38 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.39 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.40 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.41 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.42 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.43 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.44 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.45 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.46 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.47 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.48 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.49 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.10 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.6 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.7 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.8 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.7.9 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.8.13 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9.1 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9.2 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9.3 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9.4 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9.5 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9.6 |
5
kernels/linux/info/patches/maintenance_patches_3/patch-3.9.7 |
5
kernels/linux/info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch |
2
kernels/linux/latest.defaults |
4
libs/libxml2/DEPENDS |
2
libs/libxml2/DETAILS |
6
libs/libxml2/HISTORY |
8
libs/libxml2/PRE_BUILD |
4
libs/libxslt/DETAILS |
4
libs/libxslt/HISTORY |
9
libs/libxslt/TRIGGERS |
4
libs/libxslt/libxslt-1.1.28.tar.gz.sig
|binary
mail/thunderbird/DEPENDS |
45 +
mail/thunderbird/DETAILS |
5
mail/thunderbird/HISTORY |
9
mail/thunderbird/desktop/thunderbird.desktop |
2
net/dhcp/DETAILS |
4
net/dhcp/HISTORY |
8
net/dhcp/INSTALL |
6
net/isc.gpg
|binary
net/memcached/BUILD |
8
net/memcached/DEPENDS |
14
net/memcached/DETAILS |
5
net/memcached/HISTORY |
11
net/ppp/CONFIGURE |
7
net/ppp/DEPENDS |
6
net/ppp/DETAILS |
3
net/ppp/HISTORY |
10
net/ppp/INSTALL |
25
net/ppp/PRE_BUILD |
15
net/ppp/chap-secrets |
3
net/ppp/mppe-header.patch |
11
net/ppp/options |
6
net/ppp/pap-secrets |
2
net/socat/DETAILS |
6
net/socat/HISTORY |
3
net/tinc/DETAILS |
3
net/tinc/HISTORY |
6
python-pypi/py-bcrypt/DETAILS |
7
python-pypi/py-bcrypt/HISTORY |
4
python-pypi/roundup/DEPENDS |
3
python-pypi/roundup/HISTORY |
4
ruby-raa/ruby-1.9/DETAILS |
6
ruby-raa/ruby-1.9/HISTORY |
3
security/wireshark/CONFIGURE |
9
security/wireshark/DEPENDS |
4
security/wireshark/DETAILS |
6
security/wireshark/HISTORY |
10
smgl/smgl-mirrors/DETAILS |
10
smgl/smgl-mirrors/HISTORY |
5
utils/cpuburn/BUILD |
2
utils/cpuburn/HISTORY |
4
utils/cpuburn/PRE_BUILD |
3
utils/dbus/DETAILS |
6
utils/dbus/HISTORY |
3
utils/sudo/DETAILS |
10
utils/sudo/HISTORY |
30
utils/uptimed/DETAILS |
5
utils/uptimed/HISTORY |
4
utils/uptimed/PRE_BUILD |
3
utils/uptimed/configure-ac.patch |
12
utils/uptimed/uptimed-0.3.17.tar.bz2.sig
|binary
utils/xen/DETAILS |
4
utils/xen/HISTORY |
5
utils/xen/PRE_BUILD |
7
utils/xen/xsa-27-1.patch |
12
utils/xen/xsa-33.patch |
21
utils/xen/xsa-36.patch |
369 ----------
utils/xen/xsa-38.patch |
73 -
utils/xen/xsa-41-1.patch |
41 -
utils/xen/xsa-41.patch |
46 -
x11-toolkits/qt4/DETAILS |
1
x11-toolkits/qt4/HISTORY |
5
x11-toolkits/qt4/PRE_BUILD |
5
x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch |
15
199 files changed, 1093 insertions(+), 821 deletions(-)

New commits:
commit 4373e294029fc81d666ba3e432f19e99f881bcf6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

linux: => 3.0.83 (lts)

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

linux: => 3.4.50 (lts)

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

curl: => 7.31.0 (security)
(cherry picked from commit 77cae0a41d0f6ca52610d0f79a21f8eb94e92385)

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

dbus: => 1.4.26 (security)

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

xen: => 4.1.5 (security)
(cherry picked from commit cc08fe1d8ccc4282a8d425c11c0916446e475ac3)

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

krb5: => 1.11.3 (security)
(cherry picked from commit 889e98f9ea300fbf87149567949e48fd1d4bba1a)

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

krb5: => 1.11.2
(cherry picked from commit b7df4f0337c16006c6c22df278f6d82999aceac0)

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

kernels/linux: version 3.9.7
(cherry picked from commit 9bb7f0a59de1f1805e695ca8675cd036168e651d)

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

linux: => 3.4.49 (lts)
(cherry picked from commit 9f07a4a94d72bd3c72c65276d2c2d58403890539)

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

linux: => 3.2.47 (lts)
(cherry picked from commit 51176ae216deabac934419c83d1d644c083b81c5)

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

linux: => 3.8.13 (eol)
(cherry picked from commit 47d95864b316a0f424939a0b23565eac4d10c068)

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

linux: => 3.7.10 (eol)
(cherry picked from commit b960c100e2d3fbc3adac9d25fc28a56ccb7f6aa3)

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

linux: => 3.0.82 (lts)
(cherry picked from commit d03cb7ed945113e18ed7dc908aa960be8e87ce3f)

commit 8f6131bb39d057b48e6410a4bfc65fd7a45f2aa4
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libxslt: only trigger check_self if optional dep enabled
(cherry picked from commit 0a000c95d92d9e9c51a6927dd370bdbd68301fab)

commit 5df64253b743532f5f44727e315cf3554dbe8aad
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

http/firefox: changed mozconfig to prevent segfaults
(cherry picked from commit aec498ba036dd1b1bdbb1b83671b9f1730ee4493)

commit a2087877a229b0240e55ba373af0b4705f87bdae
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

openssl: workaround for bug #556

OpenSSL install fails because of syntax errors in pod files as
described in bug #556. Workaround is to not install the man pages.
(cherry picked from commit 353bd81a4ddba6a9d5767df4088d189e1ba0c852)

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

thunderbird: thunderbird.desktop mozicon50.xpm is no longer available,
PATCHLEVEL++
desktop icon to use
/usr/lib/thunderbird/chrome/icons/default/default256.png
(cherry picked from commit c95a10cd08dd42e909d4e4d41ea7d4dead183418)

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

firefox: firefox.desktop icon moved under icons/browser directory
PATCHLEVEL++
(cherry picked from commit 74a4415a49755e06df37fdd1e76b4557b87237f4)

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

kernels/linux: version 3.9.6
(cherry picked from commit 1ae3dac0be3c1907f157ba3a2b05c98a614f9d6c)

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

kernels/linux: version 3.9.5
(cherry picked from commit 816a27339a497dc0225ff25a415c76d9425737ee)

commit b091276ccf7da07181dcdd971f660eac6590001a
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

firefox: fix up dependencies
(cherry picked from commit 337601ab079565f1d997a19f8d0abe9c1422ae06)

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

firefox: fix HISTORY entry during merge

commit f7bfae0a0a5ecdbda9e84ff9351760fa64a9ab1d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

thunderbird: version 17.0.6, fix up dependencies
(cherry picked from commit 33facd2957a0563f78fc6320df53598467de687e)

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

smgl-mirrors: Updated to 0.7
Updated SOURCEFORGE to new mirrors
SOURCEFORGE default is now "Auto Select"
(cherry picked from commit 6459a2dd8ad45029bfe1f1bf4bc0e0fd28ba4a01)

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

crypto/keepassx: patch in missing includes
(cherry picked from commit c2c70fb0452e26d1f63c3a649407d489fae46053)

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

mesalib: GLUT functionality depends on libxmu and libxi (plus libx11)

checking for GLUT... no
configure: error: Package requirements (x11 xmu xi) were not met:

No package 'xmu' found
(cherry picked from commit b8a847505ad663684f94b1ae24cd79c484ed8732)

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

py-bcrypt: => 0.3 (security)
(cherry picked from commit 52ed8b07d87347df9ba79ad3fdf259a9408d10f0)

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

mongodb: => 2.0.9 (security)
(cherry picked from commit cfb320c43c1d4d294cd9961f961faf989b928a02)

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

libxml2: => 2.9.1 (security)
(cherry picked from commit 0a19f66be0775b8c437ee5f1aac70513523a8934)

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

libxml2: => 2.9.0
(cherry picked from commit 7841015f7f751b8bc919f51a6227abed2010ce7a)

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

libxslt: added security info for 1.1.28 release
(cherry picked from commit da211ed95365d0f106ba73e2cb9cd3a799e7a1f6)

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

libxslt 1.1.28
(cherry picked from commit 1f7d6891bb5196ca8820491da36d7bb99a62ec2c)

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

ruby-1.9: => 1.9.3-p429 (security)
(cherry picked from commit d0b2a8845b6be48afe9de249aec2b7f2dcbf9e3f)

Conflicts:

ruby-raa/ruby-1.9/HISTORY

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

memcached: added security update info for 1.4.15 release
(cherry picked from commit 9ca1eafa06bd3f99961075e85443da975f362f48)

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

memcached: => 1.4.15
(cherry picked from commit 97faee97b1550d622373705da676006531df07cf)

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

memcached: => 1.4.14
(cherry picked from commit fadf42d26d125f06289ea7dafc8aea9d625b9092)

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

openjpeg: fixed 1.5.0 -> 1.5.1 upgrade procedure
(cherry picked from commit 49b6df0e34229121d45373b62463949bcb95f071)

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

linux: smgl-logo-0.2-for-2.6.31.patch works for 3.1-3.9
(cherry picked from commit 7a0d047fa4c7eec7914beeeaafd4f89b08ba3908)

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

wireshark: removed obsolete options and dependencies
(cherry picked from commit 0cdb7db79922e859bef706cab8f14555b51f5198)

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

socat: => 1.7.2.2 (security)
(cherry picked from commit cccaf4333b5ff9be5347d911f4498ce381e87324)

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

kernels/linux: version 3.9.4
(cherry picked from commit ea44ca3fb8d150c7045f7527008613d0bfea9499)

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

ppp: added mppe.h header into build; added missing dependencies
(cherry picked from commit 15bdff717faf1a1364e286adde3b66b5b3f16206)

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

kernels/linux: version 3.9.3
(cherry picked from commit 11dbd1429dc5ac5f5cd3131eef5a0bc4ec235992)

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

gajim: fixed compat. with new GTalk API
(cherry picked from commit 72bce0ed863c0be1f6d71dc5fb06dafc84260bf8)

Conflicts:

chat-im/gajim/DETAILS
chat-im/gajim/HISTORY

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

wireshark 1.8.7, SECURITY_PATCH=43
(cherry picked from commit d85f9cb8bea16513cb50191d46291a0dbbc2534f)

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

linux: Linux 3.9.0+ depends on bc

CC kernel/itimer.o
HZFILE kernel/hz.bc
BC kernel/timeconst.h
/bin/sh: bc: command not found
(cherry picked from commit 3cfbbc96a5338b7806aaf158fc9d99c7d77ea07e)
(cherry picked from commit abbe8ae1d1f932fc6d17a60de62312c51b4c894a)

Conflicts:

kernels/linux/HISTORY

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

kernels/linux: version 3.9.2
(cherry picked from commit d4b305677f233dd797bdd24a6e51b65289ee038c)

commit 215f5dbc14e0bc31afa1b276eccf86aba5fa1a7c
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

curl: improve -DPIC in CFLAGS fix

Remove all occurrences of -DPIC
Prefer pure bash solution over spawning grep
Improves fix for #537
(cherry picked from commit 67dda5d493a924b54420ea49dbd80d3bfee13934)

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

kernels/linux: version 3.9.1
(cherry picked from commit 9b9b4d8d473e1756334b1cd0c19d4ec0104f6162)

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

linux 3.9
(cherry picked from commit c04c211a3ea9b1ec6858ef6c642b5395df5a1b65)

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

linux 3.8.10
(cherry picked from commit 5cbc1d1f7fc3c63922cc533be9ebe1ed774727d0)

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

kernels/linux: version 3.8.9
(cherry picked from commit b137e31398fa0c2a7282ceb5a920cd5d922e170a)

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

tinc: => 1.0.21 (security)
(cherry picked from commit f40664744586daa3193fddc5af1ec2797a9c3d72)

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

tinc: => 1.0.20
(cherry picked from commit 86fde813d33630384dbad66c09bb544c3de3e8dd)

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

audio-players/ripperx: fix SOURCE_URL[0], add -lm to LIBS
(cherry picked from commit 7d05d343f5c7f53d55485c96ce07eb92f3cbf891)

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

linux 3.8.8
(cherry picked from commit 81728a39263d2e15b57964b58b8b98a3706a9fd4)

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

openjpeg: PATCHLEVEL++ for Bug #540 (Javier Vasquez's fix)
Adding "default_install" and the removal of broken symlink and the
creation of the correct one.
(cherry picked from commit 3a271be4d15d99af290840402cb0f1a1c6759ab5)

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

openjpeg: => 1.5.1
(cherry picked from commit 6e01f411b98919188aee1f5d0bed0c1b5bd849ab)

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

curl: Fix -DPIC from CFLAGS -> CPPFLAGS (Bug #537)

configure: using CFLAGS: -march=native -mtune=native -m32 -pipe -DPIC
-fPIC -O2
configure: CFLAGS error: CFLAGS may only be used to specify C compiler
flags, not macro definitions. Use CPPFLAGS for: -DPIC
configure: error: Can not continue. Fix errors mentioned immediately
above this line.
(cherry picked from commit 57a9f1ccfd7602fb20bce0c2b2e4f36a9ca71369)

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

Python-3.3.1 - SECURITY fix
(cherry picked from commit 9dcd8b8e4d1f7e5e5edf8c6cd34c76d9ae931d2d)

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

devel/python3: add check_self on tk and tcl cast
(cherry picked from commit c5fad4f6740f6dd97f93b302b7f5a13c86ebb3d6)

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

python3: => 3.3.0
(cherry picked from commit 204dd070285c070830a8235d46296c068c60f65e)

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

curl-7.30.0 - SECURITY FIX
(cherry picked from commit 182aed0ff2c5573c7e3c83bd0345ad9f3d7424b8)

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

curl - add krb5 (GSSAPI) support
(cherry picked from commit c757d19fb3d75e492df6b1c1bf18b54b53d87cdf)

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

curl - add support for polarssl
(cherry picked from commit 4a617ac7b01d933ffc71072748abd877e897020b)

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

curl: => 7.28.1
(cherry picked from commit d531ae7577b30084b49de3bd04f98140aa793dcf)

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

curl: => 7.28.0
(cherry picked from commit febd10153b8ceb9129ab5832c9bf45b0b6753c92)

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

curl 7.27.0
(cherry picked from commit b67adc5c9f970c6162ee5cb62da616e4d368f363)

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

kernels/linux: version 3.8.7
(cherry picked from commit 2866ca981cf2235972c8009e96c5b3971f929d37)

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

krb5: => 1.11.1 SECURTIY PATCH - fix CVE-2013-1415
(cherry picked from commit 2ee2aa26894a9720ffa2cc070b20746e8aa106b0)

Conflicts:

crypto/krb5/HISTORY

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

krb5: => 1.11
(cherry picked from commit 5975672465feced47c325f7d688fa4a21a9c5cf9)

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

python: => 2.7.4 (security)
(cherry picked from commit 9cb12a9a91b0ba0314bf5b69dc2e60a677131f83)

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

devel/python: add check_self on tk and tcl cast
(cherry picked from commit 1440d573f8e1ea64a9c1b0f6a5edfe9cd631b829)

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

kernels/linux: version 3.8.6
(cherry picked from commit 023c0e1f50b3f6d647078a518d5c6e58d3a53c46)

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

postgresql: => 9.1.9 (security)

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

dhcp: => 4.2.5-P1 (security)
(cherry picked from commit 1bfe97e1ea35e4a58f6c9b1452b0509be756d1c8)

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

dhcp: => 4.2.5
(cherry picked from commit 752d6178c16b75a818d313bc23a0fdfc8d52dd43)

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

isc.gpg: added 189CDBC5 public key (Internet Systems Consortium, Inc.
(Signing key, 2013) <codesign AT isc.org>)
(cherry picked from commit 3392c131c8cdd15c1782f279daacb85708bdb4bb)

Conflicts:

ChangeLog

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

kernels/linux: version 3.8.5
(cherry picked from commit 4b16d217e6507358c17d27579695f9cf9b6d4aa4)

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

firebird25: => 2.5.2.26540-0 SECURITY FIX
(cherry picked from commit c0b567210c02f1eef95d9deb53d11da4103e56ec)

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

roundup: added suggest dependency on native SQLite extension for Python
(cherry picked from commit 48fcb9012c99e83aab83c31421ee93fccf55938c)

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

added missing 'ratbox' account for ircd-ratbox spell
(cherry picked from commit 5bc77d2904f18ad295c66ec316cb5e57c3914d8e)

Conflicts:

ChangeLog
accounts
groups

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

mysql: Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD)
Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD)
for extra/yassl/taocrypt/src/Makefile.in

$ cast mysql
...
Making all in src
make[5]: Entering directory
`/usr/src/mysql-5.1.67/extra/yassl/taocrypt/src' /bin/sh
../../../../libtool --preserve-dup-deps --tag=CXX --mode=compile g++
-DHAVE_CONFIG_H -I. -I../../../../include -I./../include -I./../mySTL
-D_GNU_SOURCE -DYASSL_PURE_C -DYASSL_THREAD_SAFE -march=native -mtune=native
-m32 -pipe -DPIC -fPIC -O2 -fno-implicit-templates -fno-exceptions
-fno-rtti -MT libtaocrypt_la-integer.lo -MD -MP -MF
.deps/libtaocrypt_la-integer.Tpo -c -o libtaocrypt_la-integer.lo `test -f
'integer.cpp' || echo './'`integer.cpp libtool: compile: g++ -DHAVE_CONFIG_H
-I. -I../../../../include -I./../include -I./../mySTL -D_GNU_SOURCE
-DYASSL_PURE_C -DYASSL_THREAD_SAFE -march=native -mtune=native -m32 -pipe
-DPIC -fPIC -O2 -fno-implicit-templates -fno-exceptions -fno-rtti -MT
libtaocrypt_la-integer.lo -MD -MP -MF .deps/libtaocrypt_la-integer.Tpo -c
integer.cpp -fPIC -DPIC -o .libs/libtaocrypt_la-integer.o
integer.cpp: In member function 'TaoCrypt::AlignedAllocator<T>::pointer
TaoCrypt::AlignedAllocator<T>::allocate(TaoCrypt::AlignedAllocator<T>::size_type,
const void*)':
integer.cpp:76:22: error: there are no arguments to 'max_size' that
depend on a template parameter, so a declaration of 'max_size' must be
available [-fpermissive]
integer.cpp:76:22: note: (if you use '-fpermissive', G++ will accept your
code, but allowing the use of an undeclared name is deprecated)
make[5]: *** [libtaocrypt_la-integer.lo] Error 1
make[5]: Leaving directory
`/usr/src/mysql-5.1.67/extra/yassl/taocrypt/src'
(cherry picked from commit 8d0713e6ef5dee3f070d62d8d18f74124b0fc4e0)

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

http/firefox: disable avx for all gcc versions >= 4.6
(cherry picked from commit 1170c465bcb4a264d1d2639d9f7440dcdee788e8)

Conflicts:

http/firefox/HISTORY

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

linux 3.8.4
(cherry picked from commit 287ae2e5079d858b8eaf4d7ff2541076b660eabe)

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

clamav: => 0.97.8 SECURITY FIX
(cherry picked from commit 1ead94a2cd28a5c458cae97238418bd8dcc9b1f0)

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

clamav: => 0.97.7
(cherry picked from commit 0cab1f19e1c4260e3729440adaea8517a7e1c9e0)

commit 75fef703ec6c19d0556692544bbeb1e3e12b75d1
Author: Robin Cook <rcook AT wyrms.net>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

clamav: fix sourceforge url
(cherry picked from commit bdace96357ffb207986080bf2a4825e3f65faa0a)

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

clamav: => 0.97.6
(cherry picked from commit a6ea1efd94c5158742a8eab8fddadd172dcbff24)

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

linux 3.8.3
(cherry picked from commit e06d89a136bcfdd97b47f499ba1ea36aed1699e2)

commit 606e9987d25a29484ba2f99ad3f4e090b1df0a36
Author: Robin Cook <rcook AT wyrms.net>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

uptimed: update to 0.3.17 and added patch for current autotools
(cherry picked from commit ae65b703697347feba8ab8af184cf145246d051b)

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

privoxy: => 3.0.21 (security)
(cherry picked from commit f8092e46788c3bacf3dd31f0c4ae996ad45084ba)

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

sudo: => 1.8.6p7 (security)
(cherry picked from commit a21c642e36b35d8216b1559953b9c20c219edb1b)

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

sudo: => 1.8.6p5
(cherry picked from commit c257c883d6e754132f148f0cacf8d8110a7ec1b6)

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

sudo: => 1.8.6p4
(cherry picked from commit bfdc1ffbbcd7dde10ce90d53f422dd959f061dba)

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

sudo: => 1.8.6p3
(cherry picked from commit a30fa4065d99223b958838e4cf9b5f37d6b9b6f9)

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

sudo: => 1.8.6p2
(cherry picked from commit ca2beb559c02d723ecc41e42347587582cdf1740)

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

sudo: => 1.8.6p1
(cherry picked from commit 518477d09db28773683c14a639dc2e75776a7383)

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

utils/sudo: re-add source urls
(cherry picked from commit 784971a23a8e5be7941ed21ae7975025e3be09cc)

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

utils/sudo: fixed SOURCE_URL
(cherry picked from commit b1a672abf77fe866cb29370938684785a87e48ea)

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

sudo 1.8.5p3
(cherry picked from commit b7fa9530aa4789cbf5abf0c4d6205a251a6fe0f2)

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

sudo: => 1.8.5p2
(cherry picked from commit d7561ae1818d388c12ff7801bda244be7ee9891d)

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

wireshark 1.8.6, SECURITY_PATCH=42
(cherry picked from commit 9961accba8dce6deaf3b2e2ca655831b6d6378f3)

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

update latest.defaults, fixup for f1c9d131914f15bdd193de12df57ce81dfbaa371
(cherry picked from commit 548f66792573be100709f663ccc988bde50fe2c7)

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

kernels/linux: version 3.8.2
(cherry picked from commit f1c9d131914f15bdd193de12df57ce81dfbaa371)

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

openssl: added recast on x.y -> x.z upgrades
(cherry picked from commit a5014b7b3f05779335eef16725773a32675ec17c)

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

utils/cpuburn: fix compile error on x86_64
(cherry picked from commit 4eaff3ecb64ee88017d68cc67e7b53c8ab1dbd9d)

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

linux 3.8.1
(cherry picked from commit 0a2ece7ac24655ba175848790791647879e5bea8)

commit 3050264aa274159eb9a46e5638870a2bdcbe853c
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

qt4: PATCHLEVEL++
* PRE_BUILD, qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch: patch
to fix moc for builds that depend on BOOST 1.53
(cherry picked from commit 30f0a2e1dcd8d6941c1bdedbcd2a5498ade14f19)

Conflicts:

x11-toolkits/qt4/DETAILS
x11-toolkits/qt4/HISTORY

diff --git a/ChangeLog b/ChangeLog
index 0c2a55a..e11c218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * net/isc.gpg: added 189CDBC5 public key (Internet Systems Consortium,
+ Inc. (Signing key, 2013) <codesign AT isc.org>)
+
+2013-03-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * accounts, groups: added missing 'ratbox' account for ircd-ratbox
spell
+
2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* utils/linuxconsoletools: new spell, replacement for utils/joystick
* utils/joystick: spell deprecated [project has been renamed]
diff --git a/accounts b/accounts
index 7cc238f..3102e2e 100755
--- a/accounts
+++ b/accounts
@@ -97,4 +97,5 @@ nslcd:188:189
redis:189:190
lightdm:191:191
masqmail:192:192
+ratbox:194:195
nobody:65534:65534
diff --git a/antivirus/clamav/DETAILS b/antivirus/clamav/DETAILS
index cc2a95d..b75e91f 100755
--- a/antivirus/clamav/DETAILS
+++ b/antivirus/clamav/DETAILS
@@ -1,15 +1,15 @@
SPELL=clamav
- VERSION=0.97.5
+ VERSION=0.97.8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-${VERSION//-/}"
- SOURCE_URL=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_URL=http://downloads.sourceforge.net/project/$SPELL/$SPELL/$VERSION/$SOURCE
SOURCE2_URL=$SOURCE_URL.sig
SOURCE2_IGNORE=signature
SOURCE_GPG=vendor_clamav.gpg:$SOURCE2:UPSTREAM_KEY
WEB_SITE=http://www.clamav.net
LICENSE[0]=GPL
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
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 143dbec..0005e50 100644
--- a/antivirus/clamav/HISTORY
+++ b/antivirus/clamav/HISTORY
@@ -1,3 +1,17 @@
+2013-04-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.97.8
+ SECURITY_PATCH++
+ * vendor_clamav.gpg: updated, add 64221D53 Sourcefire VRT
+
+2013-03-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.97.7
+
+2013-02-17 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: correct sourceforge url
+
+2012-09-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.97.6
+
2012-06-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.97.5
SECURITY_PATCH++
diff --git a/antivirus/clamav/vendor_clamav.gpg
b/antivirus/clamav/vendor_clamav.gpg
index 8579cff..1797f4e 100644
Binary files a/antivirus/clamav/vendor_clamav.gpg and
b/antivirus/clamav/vendor_clamav.gpg differ
diff --git a/audio-players/ripperx/BUILD b/audio-players/ripperx/BUILD
new file mode 100755
index 0000000..a908acd
--- /dev/null
+++ b/audio-players/ripperx/BUILD
@@ -0,0 +1 @@
+LIBS+=" -lm" default_build
diff --git a/audio-players/ripperx/DETAILS b/audio-players/ripperx/DETAILS
index 7b202cf..42b962a 100755
--- a/audio-players/ripperx/DETAILS
+++ b/audio-players/ripperx/DETAILS
@@ -2,7 +2,7 @@
VERSION=2.7.3
SOURCE=ripperX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/ripperX-$VERSION
- SOURCE_URL[0]=$SOURCEFORGE_URL/ripperx/$SOURCE
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SPELL/$VERSION/$SOURCE

SOURCE_HASH=sha512:fad4d8ee5e7ea37608b827230446f213c871d425920d0ffae5b0151e2270b36ca67156a78a530a3267141f8c5d0577a17647e4342468662472ea0f88bda69cea
WEB_SITE=http://sourceforge.net/projects/ripperx/
ENTERED=20020116
diff --git a/audio-players/ripperx/HISTORY b/audio-players/ripperx/HISTORY
index 4ff6ea9..4968b0e 100644
--- a/audio-players/ripperx/HISTORY
+++ b/audio-players/ripperx/HISTORY
@@ -1,3 +1,7 @@
+2013-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix SOURCE_URL[0]
+ * BUILD: add -lm to LIBS
+
2012-04-20 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.7.3

diff --git a/chat-im/gajim/DETAILS b/chat-im/gajim/DETAILS
index 7295715..e93681b 100755
--- a/chat-im/gajim/DETAILS
+++ b/chat-im/gajim/DETAILS
@@ -1,5 +1,6 @@
SPELL=gajim
VERSION=0.15
+ PATCHLEVEL=1
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://www.gajim.org/downloads/$BRANCH/$SOURCE
diff --git a/chat-im/gajim/HISTORY b/chat-im/gajim/HISTORY
index 8e74197..9f2b228 100644
--- a/chat-im/gajim/HISTORY
+++ b/chat-im/gajim/HISTORY
@@ -1,3 +1,9 @@
+2013-05-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: added, to apply patch
+ * gtalk.patch: added, to fix compat. with Google Talk API (was changed
+ by Google on 2013-04-17 switching to TLS 1.1/1.2)
+
2012-03-25 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 0.15
* DEPENDS: added upower suggest dep
diff --git a/chat-im/gajim/PRE_BUILD b/chat-im/gajim/PRE_BUILD
new file mode 100755
index 0000000..4a08197
--- /dev/null
+++ b/chat-im/gajim/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/gtalk.patch"
diff --git a/chat-im/gajim/gtalk.patch b/chat-im/gajim/gtalk.patch
new file mode 100644
index 0000000..580cd01
--- /dev/null
+++ b/chat-im/gajim/gtalk.patch
@@ -0,0 +1,11 @@
+--- src/common/xmpp/tls_nb.py.orig Wed Apr 24 20:00:14 2013 +0200
++++ src/common/xmpp/tls_nb.py Wed May 15 14:46:31 2013 +0200
+@@ -406,6 +406,8 @@
+ self._load_cert_file(os.path.join('/etc/ssl/certs', f),
store,
+ logg=False)
+
++ tcpsock._sslContext.set_cipher_list('RC4-MD5')
++
+ tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext,
+ tcpsock._sock)
+ tcpsock._sslObj.set_connect_state() # set to client mode
diff --git a/crypto/keepassx/0001-add-missing-includes.patch
b/crypto/keepassx/0001-add-missing-includes.patch
new file mode 100644
index 0000000..53e7ce0
--- /dev/null
+++ b/crypto/keepassx/0001-add-missing-includes.patch
@@ -0,0 +1,26 @@
+From d811f2e3d119c0b9cde3aff6604097b968969a41 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Sun, 2 Jun 2013 13:40:58 +0200
+Subject: [PATCH] add missing includes
+
+---
+ src/lib/random.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/lib/random.cpp b/src/lib/random.cpp
+index 1007172..5b06658 100644
+--- a/src/lib/random.cpp
++++ b/src/lib/random.cpp
+@@ -34,6 +34,9 @@
+ #include <QDataStream>
+ #include <QTime>
+
++#include <sys/types.h>
++#include <unistd.h>
++
+ void initStdRand();
+ bool getNativeEntropy(quint8* buffer, int length);
+
+--
+1.8.3
+
diff --git a/crypto/keepassx/HISTORY b/crypto/keepassx/HISTORY
index f7eaad5..a66c53b 100644
--- a/crypto/keepassx/HISTORY
+++ b/crypto/keepassx/HISTORY
@@ -1,3 +1,6 @@
+2013-02-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-add-missing-includes.patch: fix missing includes
+
2010-07-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS, DEPENDS, BUILD: spell created, version 0.4.3

diff --git a/crypto/keepassx/PRE_BUILD b/crypto/keepassx/PRE_BUILD
new file mode 100755
index 0000000..9a5b1f4
--- /dev/null
+++ b/crypto/keepassx/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/0001-add-missing-includes.patch
diff --git a/crypto/krb5/BUILD b/crypto/krb5/BUILD
index 5555064..65421ee 100755
--- a/crypto/krb5/BUILD
+++ b/crypto/krb5/BUILD
@@ -1,11 +1,3 @@
-cd $SPELL-$VERSION/src &&
-
-./configure --enable-dns-for-realm \
- --infodir=/usr/share/info \
- --mandir=/usr/share/man \
- --enable-shared \
- --prefix=/usr \
- --localstatedir=/var \
- $OPTS &&
-make_single &&
-make
+cd $SPELL-$VERSION/src &&
+OPTS+=" --enable-dns-for-realm"
+default_build
diff --git a/crypto/krb5/DETAILS b/crypto/krb5/DETAILS
index a088843..c8964bd 100755
--- a/crypto/krb5/DETAILS
+++ b/crypto/krb5/DETAILS
@@ -1,14 +1,15 @@
SPELL=krb5
- VERSION=1.10.3
+ VERSION=1.11.3
+
SOURCE_HASH=sha512:4d4c5d5c3a495da141bca40fe73378db190ace8ed397b7bb8e38c53757e6df3ec55fa0eb5628f7c6204d1265f8451535e65c4ebd844821c64cdfd0c6e32468a5
+ VX=${VERSION%.?}
SOURCE=$SPELL-$VERSION-signed.tar
SOURCE_RAW=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://web.mit.edu/kerberos/dist/krb5/${VERSION%.*}/$SOURCE
-
SOURCE_HASH=sha512:1f2e3bff5b7485fb5b95a247216d952c4fd0b64ed4eaea14693b687a0268f4f88cf018b4c920329f806ecf7f2cde32ff033fc8f2136a7007fdb88c4b1759dfbb
+ SOURCE_URL[0]=http://web.mit.edu/kerberos/dist/krb5/${VX}/$SOURCE
WEB_SITE=http://web.mit.edu/kerberos/www/
ENTERED=20020215

LICENSE[0]=http://web.mit.edu/kerberos/www/krb5-1.7/krb5-1.7/doc/krb5-install.html#Copyright
- SECURITY_PATCH=10
+ SECURITY_PATCH=12
KEYWORDS="security crypto"
SHORT="Kerberos 5 network security protocol"
cat << EOF
diff --git a/crypto/krb5/HISTORY b/crypto/krb5/HISTORY
index 4a538f1..6f6f131 100644
--- a/crypto/krb5/HISTORY
+++ b/crypto/krb5/HISTORY
@@ -1,3 +1,21 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.11.3; SECURITY_PATCH++ (CVE-2002-2443)
+
+2013-06-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.11.2
+
+2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.11.1
+ SECURITY_PATCH=++ fixes CVE-2013-1415
+
+2012-12-24 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.11
+ * PRE_BUILD: do not apply patch
+ disable an error warning
+ * gcc-4.7.patch: deleted
+ * DEPENDS: add db,readline, flex, python
+ * BUILD: cleanup
+
2012-08-11 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.10.3, SECURITY_PATCH=10, CVE-2012-1014, CVE-2012-1015
* DEPENDS: optional_depends libverto added
diff --git a/crypto/krb5/PRE_BUILD b/crypto/krb5/PRE_BUILD
index 965a071..87ed2a0 100755
--- a/crypto/krb5/PRE_BUILD
+++ b/crypto/krb5/PRE_BUILD
@@ -3,5 +3,5 @@ cd $SOURCE_DIRECTORY &&

unpack_file &&
tar xzf ${SOURCE_RAW} &&
-cd $SOURCE_DIRECTORY/$SPELL-$VERSION &&
-patch -p0 < $SPELL_DIRECTORY/gcc-4.7.patch
+cd $SOURCE_DIRECTORY/$SPELL-$VERSION/src &&
+sed -i 's/error=uninitialized//' configure
diff --git a/crypto/krb5/gcc-4.7.patch b/crypto/krb5/gcc-4.7.patch
deleted file mode 100644
index dbbcac9..0000000
--- a/crypto/krb5/gcc-4.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lib/krb5/krb/deltat.c 2011-09-06 14:34:32.000000000 +0300
-+++ src/lib/krb5/krb/deltat.c 2012-04-17 23:15:11.405005256 +0300
-@@ -77,6 +77,7 @@
- #ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
-
- #include <ctype.h>
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index dc4115c..bbc506c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,9 @@
+2013-06-17 Remko van der Vossen <wich AT sourcemage.org>
+ * INSTALL: workaround for bug #556
+
+2013-03-03 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: added recast on x.y -> x.z upgrades
+
2013-02-11 Eric Sandall <sandalle AT sourcemage.org>
* CONFIGURE: Remove TLSEXT option (See Bug #511)

diff --git a/crypto/openssl/INSTALL b/crypto/openssl/INSTALL
index d6210c3..0f424f6 100755
--- a/crypto/openssl/INSTALL
+++ b/crypto/openssl/INSTALL
@@ -1,5 +1,8 @@
make_single &&

-make MANDIR="$INSTALL_ROOT/usr/share/man" install &&
+# workaround for bug #556
+# we don't install man pages as the pod2man calls fail
+# make MANDIR="$INSTALL_ROOT/usr/share/man" install &&
+make MANDIR="$INSTALL_ROOT/usr/share/man" install_sw &&

make_normal
diff --git a/crypto/openssl/UP_TRIGGERS b/crypto/openssl/UP_TRIGGERS
index 3edee70..db2fa68 100755
--- a/crypto/openssl/UP_TRIGGERS
+++ b/crypto/openssl/UP_TRIGGERS
@@ -2,7 +2,8 @@

spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" ||
return 0

-if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ]; then
+if [ "${VERSION/[a-z]*/}" != "${OLD_SPELL_VERSION/[a-z]*/}" ] || \
+ [ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]; then
for each in $(show_up_depends $SPELL 1); do
up_trigger $each cast_self
done
diff --git a/database/firebird25/DETAILS b/database/firebird25/DETAILS
index 614a8f0..1b1ac7d 100755
--- a/database/firebird25/DETAILS
+++ b/database/firebird25/DETAILS
@@ -1,8 +1,8 @@
SPELL=firebird25
SPELLX=Firebird
- VERSION=2.5.2.26539-0
-
SOURCE_HASH=sha512:f3b3a8ec35202620bd6b35d5b1004a0d668b8d1a0a7c0864b40b9a7fb682e8b0d0f7b68fbbdc1ee8ace4602f1756103798a1ed8f4b8b14dfa921e06b81c10e8b
- SECURITY_PATCH=1
+ VERSION=2.5.2.26540-0
+
SOURCE_HASH=sha512:a057f78825bcfe992f9e079704621a1c659588a906e200ed56e269d0a3d78f968553146f21bde1b680795c760b896af1ec689f33dd293dbbc2242ba77b491b3c
+ SECURITY_PATCH=2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELLX}-${VERSION/-0\.RC?/}
SOURCE=${SPELLX}-$VERSION.tar.bz2
SOURCE_URL[0]=http://firebirdsql.org/download/prerelease/source/$SOURCE
diff --git a/database/firebird25/HISTORY b/database/firebird25/HISTORY
index 6842538..a01d82e 100644
--- a/database/firebird25/HISTORY
+++ b/database/firebird25/HISTORY
@@ -1,3 +1,7 @@
+2013-03-27 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.5.2.26540-0
+ SECURITY_PATCH++ - fixes CVE-2013-2492
+
2012-11-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: SECURITY_PATCH=1
fixes CVE-2012-5529
diff --git a/database/mongodb/DETAILS b/database/mongodb/DETAILS
index f3b59b0..f6f1fec 100755
--- a/database/mongodb/DETAILS
+++ b/database/mongodb/DETAILS
@@ -1,8 +1,9 @@
SPELL=mongodb
- VERSION=2.0.2
+ VERSION=2.0.9
+ SECURITY_PATCH=1
SOURCE=$SPELL-src-r$VERSION.tar.gz
SOURCE_URL[0]=http://downloads.mongodb.org/src/$SOURCE
-
SOURCE_HASH=sha512:493fd5d1cb89a92ca850cfc4d07e93b96154da3b994964c810abc276bcf9910fee0c87cef8e7263509e4fb881d7522c39c0bafc27cbf4428271d6452e1a255f7
+
SOURCE_HASH=sha512:5c7504bcc0f58999424c8bed5e43b7649b812bc2009fa251118442cd072e5cef08eaec4d3a45ad387eceaa79d0b336c58939a1b8f6e5b4566b0f745254844030
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-src-r$VERSION"
LICENSE[0]=AGPL
LICENSE[1]=APACHE
diff --git a/database/mongodb/HISTORY b/database/mongodb/HISTORY
index acaf942..8766a41 100644
--- a/database/mongodb/HISTORY
+++ b/database/mongodb/HISTORY
@@ -1,3 +1,6 @@
+2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.9; SECURITY_PATCH=1 (CVE-2013-1892)
+
2011-12-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.0.2

diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 7e461c3..21e33a1 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,7 @@
+2013-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Add -fpermissive in CXXFLAGS with 5.1.67 (!$OLD) for
+ extra/yassl/taocrypt/src/Makefile.in
+
2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.1.67, 5.0.96 (old); SECURITY_PATCH++

diff --git a/database/mysql/PRE_BUILD b/database/mysql/PRE_BUILD
index a28c410..f5ac745 100755
--- a/database/mysql/PRE_BUILD
+++ b/database/mysql/PRE_BUILD
@@ -4,4 +4,8 @@ cd $SOURCE_DIRECTORY &&
patch -p1 < "$SPELL_DIRECTORY/big_tables.patch" &&

sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in
+sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&
+
+if [[ "x$OLD" == "xn" ]]; then
+ sedit 's:^CXXFLAGS.*:& -fpermissive :' extra/yassl/taocrypt/src/Makefile.in
+fi
diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index 9e4b3c7..b38a8a4 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=9.1.8
-
SOURCE_HASH=sha512:7e4dc17fda40dcc8117d750866aa52e950e52c5d50f7b10c2f01fb4a5fd6f09ec5000d0977a0636e047185cf0de3f6f5e41eb61ac6e20a6ac39bdeae452de4af
+ VERSION=9.1.9
+
SOURCE_HASH=sha512:f35c11afba347ebc818f058986af9dfd9af573937bb2c3160f71c7ef84ae3471eab2aa998975fb44a63a09e5a487f11624375e08c3c380bf1e0ba463b82d81bf
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.postgresql.org/pub/source/v$VERSION/$SOURCE
@@ -16,7 +16,7 @@ fi

WEB_SITE=http://www.postgresql.org/
GATHER_DOCS=off
- SECURITY_PATCH=13
+ SECURITY_PATCH=14
ENTERED=20011113
LICENSE[0]=BSD
KEYWORDS="database"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index 63cd601..e83938f 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2013-06-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.1.9; SECURITY_PATCH++
+
2013-02-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.1.8; SECURITY_PATCH++

diff --git a/devel/python/DETAILS b/devel/python/DETAILS
index c4c2d22..33516f2 100755
--- a/devel/python/DETAILS
+++ b/devel/python/DETAILS
@@ -1,5 +1,5 @@
SPELL=python
- VERSION=2.7.3
+ VERSION=2.7.4
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
@@ -11,8 +11,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
WEB_SITE=http://www.python.org/
ENTERED=20010922
LICENSE[0]=PYTHON
- SECURITY_PATCH=2
- PATCHLEVEL=0
+ SECURITY_PATCH=3
KEYWORDS="devel"
SHORT="interpreted, interactive, object-oriented language"
cat << EOF
diff --git a/devel/python/HISTORY b/devel/python/HISTORY
index d2154f3..fb19d5e 100644
--- a/devel/python/HISTORY
+++ b/devel/python/HISTORY
@@ -1,3 +1,9 @@
+2013-04-07 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.7.4; SECURITY_PATCH++ (CVE-2011-4944)
+
+2013-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * TRIGGERS: added check_self on tk and tcl cast
+
2012-04-22 Treeve Jelbert <treeve AT sourcemage.org>
* CONFIGURE, BUILD: choose whether this primary pyhon

diff --git a/devel/python/TRIGGERS b/devel/python/TRIGGERS
index 27dd92e..ea242dd 100755
--- a/devel/python/TRIGGERS
+++ b/devel/python/TRIGGERS
@@ -2,3 +2,7 @@ on_cast gettext check_self
on_cast glibc check_self
on_dispel pygtk2 check_self
on_dispel pygobject check_self
+if is_depends_enabled $SPELL tk; then
+ on_cast tk check_self
+ on_cast tcl check_self
+fi
diff --git a/devel/python3/CONFIGURE b/devel/python3/CONFIGURE
index 81a0a33..dfbe08c 100755
--- a/devel/python3/CONFIGURE
+++ b/devel/python3/CONFIGURE
@@ -1,4 +1,5 @@
config_query PY3K "Use Python 3 as primary version on the system?" n &&
+config_query SYMLINK "create symlinks for python -> python3" n &&

config_query_option PYTHON3_OPTS \
"Enable IPv6?" y \
diff --git a/devel/python3/CONFLICTS b/devel/python3/CONFLICTS
index ef99b71..4a8ea12 100755
--- a/devel/python3/CONFLICTS
+++ b/devel/python3/CONFLICTS
@@ -1 +1,2 @@
conflicts python3000 y
+conflicts faulthandler y
diff --git a/devel/python3/DETAILS b/devel/python3/DETAILS
index be02097..f6eb5e7 100755
--- a/devel/python3/DETAILS
+++ b/devel/python3/DETAILS
@@ -1,7 +1,6 @@
SPELL=python3
- VERSION=3.2.3
- SECURITY_PATCH=1
- PATCHLEVEL=1
+ VERSION=3.3.1
+ SECURITY_PATCH=2
SOURCE=Python-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/Python-$VERSION"
diff --git a/devel/python3/HISTORY b/devel/python3/HISTORY
index 775ed53..6d77a5a 100644
--- a/devel/python3/HISTORY
+++ b/devel/python3/HISTORY
@@ -1,3 +1,15 @@
+2013-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.3.1
+ SECURITY_PATCH++, fixes CVE-2011-4944
+
+2013-01-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * TRIGGERS: added check_self on tk and tcl cast
+
+2012-10-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 3.3.0
+ * CONFIGURE, INSTALL: make symlinks optional
+ * CONFLICTS: add faulthandler ( now included in python3)
+
2012-04-24 Treeve Jelbert <treeve AT sourcemage.org>
* INSTALL: add some symlinks
* DETAILS: PATCHLEVEL=1
diff --git a/devel/python3/INSTALL b/devel/python3/INSTALL
index 4d52c1e..3d49732 100755
--- a/devel/python3/INSTALL
+++ b/devel/python3/INSTALL
@@ -1,4 +1,4 @@
-cp -Rv "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&
+cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" &&

# gettext
install -vm 755 "$SOURCE_DIRECTORY/Tools/i18n/"{pygettext.py,msgfmt.py} \
@@ -18,7 +18,9 @@ local PV=`echo ${VERSION}|cut -c-3` &&
ln -sf ${TRACK_ROOT}/usr/include/python${PV}m
${INSTALL_ROOT}/usr/include/python${PV} &&
# this is the primary/only version of python
if [[ $PY3K == y ]]; then
+ if [[ $SYMLINK == y ]];then
ln -sf ${TRACK_ROOT}/usr/bin/python3 ${INSTALL_ROOT}/usr/bin/python &&
ln -sf ${TRACK_ROOT}/usr/bin/python3-config
${INSTALL_ROOT}/usr/bin/python-config &&
ln -sf ${TRACK_ROOT}/usr/lib/pkgconfig/python-${PV}.pc
${INSTALL_ROOT}/usr/lib/pkgconfig/python.pc
+ fi
fi
diff --git a/devel/python3/TRIGGERS b/devel/python3/TRIGGERS
index 27dd92e..ea242dd 100755
--- a/devel/python3/TRIGGERS
+++ b/devel/python3/TRIGGERS
@@ -2,3 +2,7 @@ on_cast gettext check_self
on_cast glibc check_self
on_dispel pygtk2 check_self
on_dispel pygobject check_self
+if is_depends_enabled $SPELL tk; then
+ on_cast tk check_self
+ on_cast tcl check_self
+fi
diff --git a/ftp/curl/BUILD b/ftp/curl/BUILD
index 22c63c9..5c046dd 100755
--- a/ftp/curl/BUILD
+++ b/ftp/curl/BUILD
@@ -2,4 +2,9 @@ if [[ "$CURL_SSL" == "none" ]]; then
OPTS="--without-gnutls --without-nss --without-ssl $OPTS"
fi &&

+if [[ "$CFLAGS" != "${CFLAGS//-DPIC/}" ]]; then
+ CFLAGS="${CFLAGS//-DPIC/}" &&
+ CPPFLAGS="$CPPFLAGS -DPIC "
+fi &&
+
default_build
diff --git a/ftp/curl/CONFIGURE b/ftp/curl/CONFIGURE
index 933f9c0..b865856 100755
--- a/ftp/curl/CONFIGURE
+++ b/ftp/curl/CONFIGURE
@@ -1 +1 @@
-config_query_list CURL_SSL "Which SSL lib do you want?" none openssl gnutls
nss
+config_query_list CURL_SSL "Which SSL lib do you want?" none openssl gnutls
nss polarssl
diff --git a/ftp/curl/DEPENDS b/ftp/curl/DEPENDS
index ab74bbb..c7be810 100755
--- a/ftp/curl/DEPENDS
+++ b/ftp/curl/DEPENDS
@@ -4,23 +4,34 @@ if [[ "$CURL_SSL" == "gnutls" ]]; then
depends gnutls \
"--with-gnutls \
--with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
- --without-ssl --without-nss" &&
+ --without-ssl --without-nss --without-polarssl" &&
depends ca-certificates
elif [[ "$CURL_SSL" == "openssl" ]]; then
depends openssl \
"--with-ssl \
--without-ca-bundle \
--with-ca-path=$INSTALL_ROOT/etc/ssl/certs \
- --without-gnutls --without-nss" &&
+ --without-gnutls --without-nss --without-polarssl" &&
depends ca-certificates
elif [[ "$CURL_SSL" == "nss" ]]; then
depends -sub PEM nss \
"--with-nss \
--with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
- --without-gnutls --without-ssl" &&
+ --without-gnutls --without-ssl --without-polarssl" &&
+ depends ca-certificates
+elif [[ "$CURL_SSL" == "polarssl" ]]; then
+ depends polarssl \
+ "--with-polarssl \
+ --with-ca-bundle=$INSTALL_ROOT/etc/ssl/certs/ca-certificates.crt \
+ --without-ssl --without-nss --without-gnutls" &&
depends ca-certificates
fi &&

+optional_depends krb5 \
+ "--with-gssapi " \
+ "--without-gssapi " \
+ "GSSAPI support" &&
+
optional_depends libssh2 \
"--with-libssh2=$INSTALL_ROOT/usr" \
'--without-libssh2' \
diff --git a/ftp/curl/DETAILS b/ftp/curl/DETAILS
index 3fc7697..ac32339 100755
--- a/ftp/curl/DETAILS
+++ b/ftp/curl/DETAILS
@@ -1,6 +1,6 @@
SPELL=curl
- VERSION=7.26.0
- SECURITY_PATCH=8
+ VERSION=7.31.0
+ SECURITY_PATCH=10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/ftp/curl/HISTORY b/ftp/curl/HISTORY
index 6e73ae5..df11b5a 100644
--- a/ftp/curl/HISTORY
+++ b/ftp/curl/HISTORY
@@ -1,3 +1,29 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 7.31.0; SECURITY_PATCH++ (CVE-2013-2174)
+
+2013-05-10 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: Remove all occurrences of -DPIC
+ Prefer pure bash solution over spawning grep
+
+2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD: Fix -DPIC from CFLAGS -> CPPFLAGS (Bug #537)
+
+2013-04-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.30.0
+ SECURITY_PATCH++
+ fixes CVE-2013-024, CVE-2013-1944
+
+2013-01-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.28.1
+ * CONFIGURE, DEPENDS: add support for polarssl
+ * DEPENDS: add krb5 (GSSAPI) support
+
+2012-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 7.28.0
+
+2012-07-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 7.27.0
+
2012-05-25 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 7.26.0

diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index f63f9d7..0ece5f9 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -28,6 +28,11 @@ if list_find "$MESALIB_OPTS" "--enable-glu"; then
"--enable-glut" \
"--disable-glut" \
"to enable GLUT library"
+
+ if is_depends_enabled $SPELL $(get_spell_provider $SPELL GLUT) ; then
+ depends libxi &&
+ depends libxmu
+ fi
fi &&

optional_depends libxcb \
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 37e5ac4..31cc51c 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,6 @@
+2013-05-31 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: GLUT functionality depends on libxmu and libxi (plus
libx11)
+
2012-06-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* CONFIGURE: removed commented flags (moved to DEPENDS)
diff --git a/graphics-libs/openjpeg/BUILD b/graphics-libs/openjpeg/BUILD
index 1741c07..e013b8d 100755
--- a/graphics-libs/openjpeg/BUILD
+++ b/graphics-libs/openjpeg/BUILD
@@ -1,2 +1 @@
-LDFLAGS="-lm $LDFLAGS" &&
-default_build
+cmake_build
diff --git a/graphics-libs/openjpeg/DETAILS b/graphics-libs/openjpeg/DETAILS
index b5460bc..c3fb931 100755
--- a/graphics-libs/openjpeg/DETAILS
+++ b/graphics-libs/openjpeg/DETAILS
@@ -1,6 +1,7 @@
SPELL=openjpeg
- VERSION=1.5.0
-
SOURCE_HASH=sha512:59501fde86a7f0ab5a1b7e369feb9c4dcb8ea67ead8ffd706592cbba1e0ee7b2a2a9aaa32778632febe0c3dc4171c7af738c5899c732eb420358df3b16d7cf47
+ VERSION=1.5.1
+
SOURCE_HASH=sha512:7b6c6889eb478008bd659cf2f2dcc0551ebb0c15f6765d1df04bc75208acb300929e399d0ea9b5c69a6d43b39cd1e58ab94bc71c3b6efdfba35903f46b54dd2d
+ SECURITY_PATCH=1
# SOURCE_GPG="gurus.gpg:$SOURCE.sig"
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
@@ -9,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
WEB_SITE=http://code.google.com/p/openjpeg/
KEYWORDS="images graphics libs"
ENTERED=20070627
- PATCHLEVEL=1
+ PATCHLEVEL=2
SHORT='Open-source JPEG 2000 codec'
cat << EOF
The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
diff --git a/graphics-libs/openjpeg/HISTORY b/graphics-libs/openjpeg/HISTORY
index 14d71a5..2405e2b 100644
--- a/graphics-libs/openjpeg/HISTORY
+++ b/graphics-libs/openjpeg/HISTORY
@@ -1,3 +1,21 @@
+2013-05-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGERS: added, for correct 1.5.0 -> 1.5.1 upgrade procedure
+
+2013-04-16 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++ for Bug #540 (Javier Vasquez's fix)
+
+2013-04-14 Javier Vasquez <j.e.vasquez.v AT gmail.com>
+ * INSTALL: New file. Adding besides "default_install"
+ the removal of broken symlink and the creation of the
+ correct one.
+
+2013-04-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.5.1
+ SECURITY_PATCH=1
+ fixes CVE-2012-3535, CVE-2012-3358
+ * BUILD: use cmake_build
+ * INSTALL: deleted
+
2012-04-17 Sukneet Basuta <sukneet AT sourcemage.org>
* BUILD: lets use default_build since cmake doesn't
symlink /usr/include/openjpeg.h ->
/usr/include/openjpeg-1.5/openjpeg.h
diff --git a/graphics-libs/openjpeg/INSTALL b/graphics-libs/openjpeg/INSTALL
index d6420d4..4a50fc6 100755
--- a/graphics-libs/openjpeg/INSTALL
+++ b/graphics-libs/openjpeg/INSTALL
@@ -1 +1,5 @@
-make install PREFIX=$INSTALL_ROOT/usr
+default_install &&
+
+rm $INSTALL_ROOT/usr/share/pkgconfig/libopenjpeg.pc &&
+cd $INSTALL_ROOT/usr/share/pkgconfig &&
+ln -s $INSTALL_ROOT/usr/lib/pkgconfig/libopenjpeg1.pc libopenjpeg.pc
diff --git a/graphics-libs/openjpeg/UP_TRIGGERS
b/graphics-libs/openjpeg/UP_TRIGGERS
new file mode 100755
index 0000000..fb874ce
--- /dev/null
+++ b/graphics-libs/openjpeg/UP_TRIGGERS
@@ -0,0 +1,19 @@
+# up_trigger everything on updated to 1.5.1 as soname changed from
libopenjpeg.so.1 to libopenjpeg.so.5
+
+. "$GRIMOIRE/FUNCTIONS" &&
+
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if is_version_less "${OLD_SPELL_VERSION}" "1.5.1"; then
+
+ message "This is a possibly incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a
while."
+ for each in $(show_up_depends $SPELL); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libopenjpeg\.so\.1"; then
+ up_trigger $each cast_self
+ fi
+ done
+ fi
+fi
diff --git a/groups b/groups
index 2546446..7b5197e 100755
--- a/groups
+++ b/groups
@@ -117,5 +117,6 @@ nslcd:189:
redis:190:
lightdm:191:
masqmail:192:
+ratbox:195:
users:1000:
nogroup:65534:
diff --git a/http/firefox/BUILD b/http/firefox/BUILD
index 6e7d374..e2ce3dd 100755
--- a/http/firefox/BUILD
+++ b/http/firefox/BUILD
@@ -30,7 +30,9 @@ if [[ $gccmajor == "4" ]] && [[ $gccminor -ge "6" ]]; then
CXXFLAGS="${CXXFLAGS//-mavx} -mno-avx"
fi

-echo ac_add_options --enable-optimize=-O2 >> .mozconfig &&
+for option in $OPTS; do
+ echo "ac_add_options $option" >> .mozconfig
+done &&

make_single &&
make -f client.mk build &&
diff --git a/http/firefox/DEPENDS b/http/firefox/DEPENDS
index 7c8d6d7..a17e3d2 100755
--- a/http/firefox/DEPENDS
+++ b/http/firefox/DEPENDS
@@ -1,26 +1,69 @@
-depends castfs &&
-depends atk &&
-depends curl &&
-depends -sub CXX gcc &&
-depends glib2 &&
-depends libjpeg-turbo &&
-depends pango &&
-depends perl &&
-depends zip &&
-depends zlib &&
-depends cairo &&
-depends python &&
-depends libnotify &&
-depends nspr &&
-depends -sub "3.14.x" nss &&
-depends autoconf-2.13 &&
-depends gtk+2 &&
-depends libidl &&
-
-optional_depends yasm "" "" "Support for WebM media (VP8 video and Vorbis
Audio)" &&
-optional_depends wireless_tools "" "" "for geolocation via WiFi access
points" &&
-optional_depends alsa-lib "" "" "for audio support" &&
+depends -sub CXX gcc &&
+depends nspr '--with-system-nspr' &&
+depends -sub "3.14.x" nss '--with-system-nss' &&
+depends zlib '--with-system-zlib' &&
+depends libjpeg-turbo '--with-system-jpeg' &&
+depends libidl &&
+depends perl &&
+depends python &&
+depends zip &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
+depends pysqlite &&

+depends atk &&
+depends glib2 &&
+depends pango &&
+depends cairo &&
+
+optional_depends gnome-vfs2 \
+ "--enable-gnomevfs" \
+ "--disable-gnomevfs" \
+ "for GnomeVFS support" &&
+
+optional_depends startup-notification \
+ '--enable-startup-notification' \
+ '--disable-startup-notification' \
+ 'for startup notifications' &&
+
+optional_depends gconf2 \
+ '--enable-gconf' \
+ '--disable-gconf' \
+ 'for gconf support' &&
+
+optional_depends 'wireless_tools' \
+ '--enable-necko-wifi' \
+ '--disable-necko-wifi' \
+ 'for Necko WiFi scanning' &&
+
+# Firefox is currently borked and does not compile without alsa-lib, this
+# should be fixed after Firefox starts using Mozilla core 23
+depends alsa-lib &&
+#optional_depends alsa-lib \
+# '--enable-wave' \
+# '--disable-wave --disable-ogg --disable-webm
--disable-dash' \
+# 'for audio/video support' &&
+
+if is_depends_enabled $SPELL alsa-lib; then
+ # Firefox tries to use ogg/ogg.h even with --disable-ogg given
+ #optional_depends libogg \
+ # '--enable-ogg' \
+ # '--disable-ogg' \
+ # 'for sound support' &&
+ depends libogg &&
+
+ # configure script checks for yasm even when --disable-webm and
--disable-dash are given
+ #optional_depends yasm \
+ # '--enable-webm --enable-dash' \
+ # '--disable-webm --disable-dash' \
+ # 'for WebM video support'
+ depends yasm
+fi &&
+
+optional_depends dbus-glib \
+ '--enable-dbus' \
+ '--disable-dbus' \
+ 'for dbus support' &&

suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index 8180b53..6e2dbc2 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,4 +1,5 @@
SPELL=firefox
+ PATCHLEVEL=1
if [[ $FIREFOX_CVS == y ]]; then
VERSION=21.0
SOURCE=$SPELL-$VERSION.source.tar.bz2
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 39d8663..4a4c9f1 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,16 @@
+2013-06-17 Pol Vinogradov <vin.public AT gmail.com>
+ * mozconfig: added -fno-fast-math to prevent segfaults
+
+2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * desktop/firefox.desktop: Icon moved under icons/browser directory
+ * DETAILS: PATCHLEVEL++
+
+2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: Fix up dependencies
+ * BUILD, mozconfig: use proper way to add flags to .mozconfig
+ * PRE_BUILD: removed unnecessary options constructs in lieu of OPTS
+ handling in BUILD
+
2013-04-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 21.0, SECURITY_PATCH++

diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 1ed86c5..e3142bb 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -19,23 +19,6 @@ else
sed -i '27iac_add_options --disable-safe-browsing' .mozconfig
fi &&

-if is_depends_enabled $SPELL wireless_tools; then
- sed -i '27iac_add_options --enable-necko-wifi' .mozconfig
-else
- sed -i '27iac_add_options --disable-necko-wifi' .mozconfig
-fi &&
-
-if is_depends_enabled $SPELL yasm; then
- sed -i '27iac_add_options --enable-webm' .mozconfig
-else
- sed -i '27iac_add_options --disable-webm' .mozconfig
-fi &&
-
-if ! is_depends_enabled $SPELL alsa-lib; then
- sed -i '27iac_add_options --disable-ogg' .mozconfig &&
- sed -i '27iac_add_options --disable-wave' .mozconfig
-fi &&
-
if [[ "$FIREFOX_STRIP" == "y" ]]; then
sed -i '27iac_add_options --enable-strip' .mozconfig
fi &&
diff --git a/http/firefox/desktop/firefox.desktop
b/http/firefox/desktop/firefox.desktop
index da3dc2a..e5ef237 100644
--- a/http/firefox/desktop/firefox.desktop
+++ b/http/firefox/desktop/firefox.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Firefox
Exec=firefox
-Icon=/usr/lib/firefox/icons/mozicon128.png
+Icon=/usr/lib/firefox/browser/icons/mozicon128.png
Terminal=false
Type=Application
Categories=Application;Network;Browsers
diff --git a/http/firefox/mozconfig b/http/firefox/mozconfig
index 609fcbb..498246c 100644
--- a/http/firefox/mozconfig
+++ b/http/firefox/mozconfig
@@ -5,27 +5,21 @@
# Options for client.mk.
mk_add_options MOZ_CO_PROJECT=browser
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-build
-mk_add_options AUTOCONF=autoconf2.13
+#mk_add_options AUTOCONF=autoconf2.13

# Options for 'configure' (same as command-line options).
+ac_add_options --enable-application=browser
ac_add_options --with-pthreads
-ac_add_options --with-system-jpeg=/usr/lib
-ac_add_options --with-system-zlib=/usr/lib
ac_add_options --disable-system-png
-ac_add_options --enable-application=browser
ac_add_options --disable-system-cairo
ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-freetype2
ac_add_options --enable-pango
ac_add_options --enable-svg
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --disable-dbus
ac_add_options --disable-installer
ac_add_options --disable-updater
ac_add_options --disable-crashreporter
ac_add_options --disable-tests
ac_add_options --prefix=$INSTALL_ROOT/usr
ac_add_options --mandir=$INSTALL_ROOT/usr
-ac_add_options --enable-optimize="$CFLAGS"
+ac_add_options --enable-optimize="$CFLAGS -fno-fast-math"
ac_add_options --with-default-mozilla-five-home=/usr/lib/firefox
diff --git a/http/privoxy/DETAILS b/http/privoxy/DETAILS
index a63a630..7fb72ca 100755
--- a/http/privoxy/DETAILS
+++ b/http/privoxy/DETAILS
@@ -1,7 +1,7 @@
SPELL=privoxy
SF_PROJECT=ijbswa
- VERSION=3.0.19
- SECURITY_PATCH=2
+ VERSION=3.0.21
+ SECURITY_PATCH=3
VX=$VERSION-stable
SOURCE=$SPELL-$VX-src.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/http/privoxy/HISTORY b/http/privoxy/HISTORY
index 6624e1b..165c91b 100644
--- a/http/privoxy/HISTORY
+++ b/http/privoxy/HISTORY
@@ -1,3 +1,7 @@
+2013-03-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.0.21; SECURITY_PATCH++ (CVE-2013-2503)
+ * privoxy.gpg: added 8BA2371C public key: Fabian Keil
<fk AT fabiankeil.de>
+
2011-12-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.19 (SECURITY_PATCH++)

diff --git a/http/privoxy/privoxy.gpg b/http/privoxy/privoxy.gpg
index 8c0104c..a435e89 100644
Binary files a/http/privoxy/privoxy.gpg and b/http/privoxy/privoxy.gpg differ
diff --git a/kernels/linux/DEPENDS b/kernels/linux/DEPENDS
index ada6e0e..23a2d1c 100755
--- a/kernels/linux/DEPENDS
+++ b/kernels/linux/DEPENDS
@@ -1,3 +1,6 @@
+if (( "${VERSION//./}" >= "390" )) ; then
+ depends bc
+fi &&
depends perl &&
optional_depends linux-initramfs '' '' 'for making initramfs images' &&
optional_depends mtools '' '' 'for make bzdisk' &&
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index 9b620fd..4db41e5 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,94 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.4.50: added
+ * info/patches/maintenance_patches_3/patch-3.0.83: added
+
+2013-06-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.9.7
+ * info/patches/maintenance_patches_3/patch-3.9.7: added
+
+2013-06-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.{67-82}: added
+ * info/patches/maintenance_patches_3/patch-3.2.{40-47}: added
+ * info/patches/maintenance_patches_3/patch-3.4.{34-49}: added
+ * info/patches/maintenance_patches_3/patch-3.7.10: added
+ * info/patches/maintenance_patches_3/patch-3.7.{1,4-9}: dropped
+ * info/patches/maintenance_patches_3/patch-3.8.13: added
+ * info/patches/maintenance_patches_3/patch-3.8.{1-10}: dropped
+
+2013-06-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.9.6
+ * info/patches/maintenance_patches_3/patch-3.9.6: added
+
+2013-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.9.5
+ * info/patches/maintenance_patches_3/patch-3.9.5: added
+
+2013-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.9.4
+ * info/patches/maintenance_patches_3/patch-3.9.4: added
+
+2013-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.9.3
+ * info/patches/maintenance_patches_3/patch-3.9.3: added
+
+2013-05-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.9.2
+ * info/patches/maintenance_patches_3/patch-3.9.2: added
+
+2013-05-10 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Linux 3.9.0+ depends on bc
+ * info/patches/smgl_patches/smgl-logo-0.2-for-2.6.31.patch: Works
+ for Linux 3.1-3.9
+
+2013-05-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.9.1
+ * info/patches/maintenance_patches_3/patch-3.9.1: added
+
+2013-04-29 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=3.9, LATEST_3=3.9
+ * info/kernels/3.9: added
+ * info/patches/maintenance_patches_3/patch-3.9: added
+
+2013-04-27 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.10
+ * info/patches/maintenance_patches_3/patch-3.8.10: added
+
+2013-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.9
+ * info/patches/maintenance_patches_3/patch-3.8.9: added
+
+2013-04-17 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.8
+ * info/patches/maintenance_patches_3/patch-3.8.8: added
+
+2013-04-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.7
+ * info/patches/maintenance_patches_3/patch-3.8.7: added
+
+2013-04-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.6
+ * info/patches/maintenance_patches_3/patch-3.8.6: added
+
+2013-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.5
+ * info/patches/maintenance_patches_3/patch-3.8.5: added
+
+2013-03-21 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.4
+ * info/patches/maintenance_patches_3/patch-3.8.4: added
+
+2013-03-15 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.3
+ * info/patches/maintenance_patches_3/patch-3.8.3: added
+
+2013-03-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.2
+ * info/patches/maintenance_patches_3/patch-3.8.2: added
+
+2013-03-01 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.8.1
+ * info/patches/maintenance_patches_3/patch-3.8.1: added
+
2013-02-22 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.66: added
* info/patches/maintenance_patches_3/patch-3.2.39: added
diff --git a/kernels/linux/info/kernels/3.9 b/kernels/linux/info/kernels/3.9
new file mode 100755
index 0000000..fa67978
--- /dev/null
+++ b/kernels/linux/info/kernels/3.9
@@ -0,0 +1,5 @@
+version="3.9"
+source="linux-${version}.tar.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+source2="linux-${version}.tar.sign"
+source2_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source2}"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.67
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.67
new file mode 100755
index 0000000..dbed165
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.67
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.67"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="c5ba2a5530fedacb9cb9bce23b860c615c6d94f9"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.68
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.68
new file mode 100755
index 0000000..1d373f3
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.68
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.68"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="055531eac9ed60449b4294f3f993f7dc38bfb757"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.69
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.69
new file mode 100755
index 0000000..c86b646
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.69
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.69"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="dadf45ff3f0156305b5213c45af686ad53134e07"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.70
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.70
new file mode 100755
index 0000000..8ec9939
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.70
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.70"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="ba5830c10ff0cdbeac8f67092c95423153c26f24"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.71
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.71
new file mode 100755
index 0000000..00fd249
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.71
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.71"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="da0d6d0734dd00cbde5502d76f4de6529f9fb8dd"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.72
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.72
new file mode 100755
index 0000000..c4f24c4
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.72
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.72"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="e1d6be0e0fb68ce9dd3f3abdbb953ec8ac9d57dd"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.73
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.73
new file mode 100755
index 0000000..fa0bf06
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.73
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.73"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="8911ac518a93d6f15e08d33e4d1ea405396baade"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.74
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.74
new file mode 100755
index 0000000..81c87f9
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.74
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.74"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="48ec1eb4b78e606518781c99af6e7af09bc1f4d4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.75
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.75
new file mode 100755
index 0000000..175f53f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.75
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.75"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="0194cb0c2605df933159ca198eb28944472e0786"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.76
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.76
new file mode 100755
index 0000000..c35d858
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.76
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.76"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="6379d9ba275e742e0ee7889ef05fa56bb4c67bd5"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.77
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.77
new file mode 100755
index 0000000..1a3b948
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.77
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.77"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="e60929c49da4746c6a251c7a8b7f432f5283f24d"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.78
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.78
new file mode 100755
index 0000000..10ffd7d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.78
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.78"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="c42530b5407d967253c32afd8023232c9cbb19cf"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.79
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.79
new file mode 100755
index 0000000..64b4bb6
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.79
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.79"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="1109077dbffe6428aee19c0ed33733dc4a58f31b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.80
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.80
new file mode 100755
index 0000000..b312b0a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.80
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.80"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="b5880379ffd507c44ab88f598e4a17ed21ccfc7c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.81
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.81
new file mode 100755
index 0000000..48645e3
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.81
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.81"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="fbc8e00ea1b3a6d7b05528347fa0aafbaaaeb485"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.82
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.82
new file mode 100755
index 0000000..df17f25
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.82
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.82"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="20dcf30c2250569aa9421fb511e2cfb4b0940bc9"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83
new file mode 100755
index 0000000..062901c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.83
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.83"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="f4d75387a697f9a6ca611eda06379cb4eaa45fe2"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.40
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.40
new file mode 100755
index 0000000..66a87d2
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.40
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.40"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="94792e7bbfa3f70c3731500b7fabf63b69c6a934"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.41
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.41
new file mode 100755
index 0000000..8df4323
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.41
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.41"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f8aebeb9297269590d17d692adedbb78640aea8a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.42
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.42
new file mode 100755
index 0000000..cc2f69f
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.42
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.42"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="a9d334949f9eecdb89620cbc52ea42bd5c86ea1e"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.43
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.43
new file mode 100755
index 0000000..cd17ce2
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.43
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.43"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="611ee4e82bf802215537aef4e7980b6f50960521"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.44
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.44
new file mode 100755
index 0000000..d818c2a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.44
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.44"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f3ed5e66efae659ba184439f171c9cbf5ea68959"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.45
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.45
new file mode 100755
index 0000000..1747e7a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.45
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.45"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f7f24cc9902e56b1086401980145b39230adbdfb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.46
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.46
new file mode 100755
index 0000000..612b1c3
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.46
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.46"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="4bc1ea610d9edc7421040f7ebcba9d7c6a5c5590"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.47
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.47
new file mode 100755
index 0000000..19f8f94
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.47
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.47"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="3b2f21e87acd64876061f0a547c9f9e1deb225b4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.34
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.34
new file mode 100755
index 0000000..5a31086
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.34
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.34"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="e25e28586f80aba724202bc195ddc14113aed7c5"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.35
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.35
new file mode 100755
index 0000000..832bcbb
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.35
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.35"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="6997a36623a754dbbeec0b99cc89f047f51a6c03"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.36
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.36
new file mode 100755
index 0000000..5b81e1b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.36
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.36"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2122744c1477f1392e99c5a0ae022f8c32e6e81a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.37
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.37
new file mode 100755
index 0000000..7d15239
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.37
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.37"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="d2dceaeedbf11d893a954b307c85a5b17ef3493b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.38
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.38
new file mode 100755
index 0000000..49f63ba
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.38
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.38"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="1c6087b872f78a2613431553ef2de70b41ff35af"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.39
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.39
new file mode 100755
index 0000000..be00504
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.39
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.39"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="a197d5cdcae199164f14c92c1d99d88cc934d783"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.40
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.40
new file mode 100755
index 0000000..b044f31
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.40
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.40"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8e0d974a7c874d72ce702a0e9d5a0dc90356b4ec"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.41
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.41
new file mode 100755
index 0000000..285f882
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.41
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.41"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="b3052d425ab63dade3ac8d6cc9c6c0bc9553b709"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.42
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.42
new file mode 100755
index 0000000..6ac732b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.42
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.42"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="e736ec96df8ee0c16b197cd3ed21341a79a82548"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.43
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.43
new file mode 100755
index 0000000..cc8addf
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.43
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.43"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c40ad1c705eaf49bf40d2476b912be3d835fc7be"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.44
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.44
new file mode 100755
index 0000000..774e415
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.44
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.44"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="f9ff1be83f09c8f6ba97ca9d4cb1f27aa38be0a4"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.45
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.45
new file mode 100755
index 0000000..f22bc2c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.45
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.45"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c0edc75e20f82494a61b5ecc12a2aaa1b6790bb2"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.46
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.46
new file mode 100755
index 0000000..a8bfc2d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.46
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.46"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="adaf41f456f0336657bdaebb4d677028e7c41537"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.47
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.47
new file mode 100755
index 0000000..21cf7c5
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.47
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.47"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="631e53df918f7daccb98e082ca2fdce154958d27"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.48
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.48
new file mode 100755
index 0000000..f52df10
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.48
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.48"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c64e7e935a1e9c0b45882eb78c07559bbee56a4f"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.49
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.49
new file mode 100755
index 0000000..96fc386
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.49
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.49"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="6d4be766e7529b3f1d587e42634f4af069c8c88e"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50
new file mode 100755
index 0000000..f241dbe
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.50
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.50"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2ac7bfac8ca49e9e05c5ab80f1a41ae70f9728de"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1
deleted file mode 100755
index 8612281..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.1
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.7"
-patchversion="${appliedkernels}.1"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="05816e9e9434234fd3808837635338cf498bc95d"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.10
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.10
new file mode 100755
index 0000000..5235e58
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.10
@@ -0,0 +1,5 @@
+appliedkernels="3.7"
+patchversion="${appliedkernels}.10"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="34c518857894cb317b41e9c915539349b7f65e2e"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4
deleted file mode 100755
index 80b0f8d..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.4
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.7"
-patchversion="${appliedkernels}.4"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="7d7ca6af7523289da5a3018c1f3a68961030eb35"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5
deleted file mode 100755
index 29e1719..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.5
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.7"
-patchversion="${appliedkernels}.5"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="6aaabd95c29db97a203cd7e34e58e4ca25687e18"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.6
deleted file mode 100755
index bbb26f0..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.6
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.7"
-patchversion="${appliedkernels}.6"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="7f26ffdddf4db90e801ab91146f6b6832cc9886c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.7
deleted file mode 100755
index 93d080d..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.7
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.7"
-patchversion="${appliedkernels}.7"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="bfea1d5e649e7a20a3d594e01ea6d51a3521e058"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.8
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.8
deleted file mode 100755
index ca136b0..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.8
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.7"
-patchversion="${appliedkernels}.8"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="8d88b06f617d50824e14ce5ac5f8593cbcb1f466"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.9
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.9
deleted file mode 100755
index b9cac28..0000000
--- a/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.9
+++ /dev/null
@@ -1,5 +0,0 @@
-appliedkernels="3.7"
-patchversion="${appliedkernels}.9"
-source="patch-${patchversion}.bz2"
-source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
-sha1sum="445299c6702dc9e4ed1e8a5db5804f006d78609d"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.13
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.13
new file mode 100755
index 0000000..4fecf49
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.8.13
@@ -0,0 +1,5 @@
+appliedkernels="3.8"
+patchversion="${appliedkernels}.13"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="b59a502a10275ccd5876cb4c8bd6cc89eea856d5"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9
new file mode 100755
index 0000000..03adc30
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9
@@ -0,0 +1,5 @@
+patchversion="3.9.0"
+source=""
+source_url=""
+appliedkernels="3.9"
+md5sum=""
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.1
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.1
new file mode 100755
index 0000000..6de82a8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.1
@@ -0,0 +1,5 @@
+appliedkernels="3.9"
+patchversion="${appliedkernels}.1"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="93e58ebab639dc18edfdd147c2599e2d970a65fb"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.2
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.2
new file mode 100755
index 0000000..25723cd
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.2
@@ -0,0 +1,5 @@
+appliedkernels="3.9"
+patchversion="${appliedkernels}.2"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="0a531032bdb5e0cdc734107f7603aa7830f72dab"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.3
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.3
new file mode 100755
index 0000000..8116fb8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.3
@@ -0,0 +1,5 @@
+appliedkernels="3.9"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="10fea3e06e7d8e4eacc518c7208bbd8d0898cb95"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.4
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.4
new file mode 100755
index 0000000..9849efa
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.4
@@ -0,0 +1,5 @@
+appliedkernels="3.9"
+patchversion="${appliedkernels}.4"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c196b7f59c2eca22444f61afaae02803d7d91323"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.5
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.5
new file mode 100755
index 0000000..274dd6b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.5
@@ -0,0 +1,5 @@
+appliedkernels="3.9"
+patchversion="${appliedkernels}.5"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="ba10bedc22941d09b4375e707b05cd8d1822749c"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.6
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.6
new file mode 100755
index 0000000..79f196b
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.6
@@ -0,0 +1,5 @@
+appliedkernels="3.9"
+patchversion="${appliedkernels}.6"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="c8e553da3095cf1171cac126b2e91161ee16ef0b"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.7
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.7
new file mode 100755
index 0000000..771d37d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.9.7
@@ -0,0 +1,5 @@
+appliedkernels="3.9"
+patchversion="${appliedkernels}.7"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="b1c0c425651a164fb8959a631f36c8561b6bf30c"
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 4145c6f..3c1aef5 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"
+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"
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 a329eca..37d9683 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -1,8 +1,8 @@
-LATEST_3=3.8
+LATEST_3=3.9
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.8
+LATEST_maintenance_patches_3=patch-3.9.7
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/libxml2/DEPENDS b/libs/libxml2/DEPENDS
index 65e7151..232d89b 100755
--- a/libs/libxml2/DEPENDS
+++ b/libs/libxml2/DEPENDS
@@ -13,7 +13,7 @@ optional_depends xz-utils \
"--without-lzma" \
"to build with LZMA support" &&

-optional_depends python \
+optional_depends PYTHON \
"--with-python" \
"--without-python" \
"to build python bindings"
diff --git a/libs/libxml2/DETAILS b/libs/libxml2/DETAILS
index d056161..3ece318 100755
--- a/libs/libxml2/DETAILS
+++ b/libs/libxml2/DETAILS
@@ -1,7 +1,7 @@
SPELL=libxml2
- VERSION=2.8.0
- SECURITY_PATCH=8
-
SOURCE_HASH=sha512:e36ca96e5ba18f767346f1310c43d3c8c9a35c53252de18ad63ebce7f1f8df7ae40dd0719b2c6d78f5a64e61be154eec63a36ae738d29e93a9139c524a289ad4
+ VERSION=2.9.1
+
SOURCE_HASH=sha512:7b10de749485bc2eb2108063e97d89e70d6fbb78b1bf195ab5528c8c64e79483d55223a49d95934f4e00b00e906c18bdd34344703ffe158dcf08096905a44c1b
+ SECURITY_PATCH=9
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxml2/HISTORY b/libs/libxml2/HISTORY
index 37bb42e..4be3e77 100644
--- a/libs/libxml2/HISTORY
+++ b/libs/libxml2/HISTORY
@@ -1,3 +1,11 @@
+2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.1; SECURITY_PATCH++ (CVE-2013-1969)
+ * DEPENDS: switched to PYTHON (python3 is supported now)
+
+2012-10-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 2.9.0
+ * PRE_BUILD, bufsize.patch.gz: deleted - applied upstream
+
2012-08-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++ (CVE-2012-2807)
* PRE_BUILD: added, to apply the patch
diff --git a/libs/libxml2/PRE_BUILD b/libs/libxml2/PRE_BUILD
deleted file mode 100755
index c7262aa..0000000
--- a/libs/libxml2/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-zcat "$SPELL_DIRECTORY/bufsize.patch.gz" | patch -p1
diff --git a/libs/libxml2/bufsize.patch.gz b/libs/libxml2/bufsize.patch.gz
deleted file mode 100644
index 5106ed6..0000000
Binary files a/libs/libxml2/bufsize.patch.gz and /dev/null differ
diff --git a/libs/libxslt/DETAILS b/libs/libxslt/DETAILS
index 8a0dfff..5bcdc06 100755
--- a/libs/libxslt/DETAILS
+++ b/libs/libxslt/DETAILS
@@ -1,6 +1,6 @@
SPELL=libxslt
- VERSION=1.1.27
- SECURITY_PATCH=3
+ VERSION=1.1.28
+ SECURITY_PATCH=4
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
diff --git a/libs/libxslt/HISTORY b/libs/libxslt/HISTORY
index 088ce67..dbf25ec 100644
--- a/libs/libxslt/HISTORY
+++ b/libs/libxslt/HISTORY
@@ -1,3 +1,12 @@
+2013-06-17 Remko van der Vossen <wich AT sourcemage.org>
+ * TRIGGERS: only trigger check_self if optional dep enabled
+
+2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: this was a security update (CVE-2012-6139);
SECURITY_PATCH++
+
+2013-05-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.1.28
+
2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.1.27; SECURITY_PATCH++ (several CVEs)
* PRE_BUILD, pattern.patch: dropped
diff --git a/libs/libxslt/TRIGGERS b/libs/libxslt/TRIGGERS
index 3abbc5a..351de1d 100755
--- a/libs/libxslt/TRIGGERS
+++ b/libs/libxslt/TRIGGERS
@@ -1 +1,3 @@
-on_cast python check_self
+if is_depends_enabled $SPELL python; then
+ on_cast python check_self
+fi
diff --git a/libs/libxslt/libxslt-1.1.27.tar.gz.sig
b/libs/libxslt/libxslt-1.1.27.tar.gz.sig
deleted file mode 100644
index 95f11dc..0000000
Binary files a/libs/libxslt/libxslt-1.1.27.tar.gz.sig and /dev/null differ
diff --git a/libs/libxslt/libxslt-1.1.28.tar.gz.sig
b/libs/libxslt/libxslt-1.1.28.tar.gz.sig
new file mode 100644
index 0000000..8332a90
Binary files /dev/null and b/libs/libxslt/libxslt-1.1.28.tar.gz.sig differ
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index 8864d7b..5e397cd 100755
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,13 +1,15 @@
depends -sub CXX gcc &&
-depends nspr '--with-system-nspr' &&
-depends nss '--with-system-nss' &&
-depends zlib '--with-system-zlib' &&
-depends JPEG '--with-system-jpeg' &&
+depends nspr '--with-system-nspr' &&
+depends -sub "3.14.x" nss '--with-system-nss' &&
+depends zlib '--with-system-zlib' &&
+depends JPEG '--with-system-jpeg' &&
depends libidl &&
-depends libmng '--with-system-mng' &&
depends perl &&
+depends python &&
depends zip &&
-depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends gtk+2 '--enable-xft --disable-freetype2' &&
+depends -sub "TSAFE SECURE_DELETE ENABLE_UNLOCK_NOTIFY" sqlite
'--enable-system-sqlite' &&
+depends pysqlite &&
#depends -sub 'TEE' cairo "--enable-system-cairo \
# --enable-default-toolkit=cairo-gtk2" &&
#
@@ -36,4 +38,33 @@ optional_depends gconf2 \
optional_depends 'wireless_tools' \
'--enable-necko-wifi' \
'--disable-necko-wifi' \
- 'for Necko WiFi scanning'
+ 'for Necko WiFi scanning' &&
+
+# Thunderbird is currently borked and does not compile without alsa-lib, this
+# should be fixed after Thunderbird starts using Mozilla core 23
+depends alsa-lib &&
+#optional_depends alsa-lib \
+# '--enable-wave' \
+# '--disable-wave --disable-ogg --disable-webm' \
+# 'for audio/video support'
+
+if is_depends_enabled $SPELL alsa-lib; then
+ # Thunderbird tries to use ogg/ogg.h even with --disable-ogg given
+ #optional_depends libogg \
+ # '--enable-ogg' \
+ # '--disable-ogg' \
+ # 'for sound support'
+ depends libogg &&
+
+ # configure script checks for yasm even when using the system JPEG
+ #optional_depends yasm \
+ # '--enable-webm' \
+ # '--disable-webm' \
+ # 'for WebM video support'
+ depends yasm
+fi &&
+
+optional_depends dbus-glib \
+ '--enable-dbus' \
+ '--disable-dbus' \
+ 'for dbus support'
diff --git a/mail/thunderbird/DETAILS b/mail/thunderbird/DETAILS
index a1d6e35..e0de56b 100755
--- a/mail/thunderbird/DETAILS
+++ b/mail/thunderbird/DETAILS
@@ -1,5 +1,6 @@
SPELL=thunderbird
- VERSION=17.0.5
+ VERSION=17.0.6
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG="thunderbird.gpg:$SOURCE2:UPSTREAM_KEY"
@@ -8,7 +9,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE

SOURCE2_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$VERSION/source/$SOURCE2
SOURCE2_IGNORE=signature
- SECURITY_PATCH=36
+ SECURITY_PATCH=37
WEB_SITE=http://www.mozilla.org/products/thunderbird/
ENTERED=20041028
LICENSE[0]=MOZILLA
diff --git a/mail/thunderbird/HISTORY b/mail/thunderbird/HISTORY
index acebc2a..a0990ec 100644
--- a/mail/thunderbird/HISTORY
+++ b/mail/thunderbird/HISTORY
@@ -1,3 +1,12 @@
+2013-06-13 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * desktop/thunderbird.desktop: mozicon50.xpm is no longer available,
use
+ /usr/lib/thunderbird/chrome/icons/default/default256.png
+
+2013-06-06 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS; version 17.0.6, SECURITY_PATCH++
+ * DEPENDS: Fix up dependencies
+
2013-04-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 17.0.5, SECURITY_PATCH++
* BUILD: disable avx which causes a segfault
diff --git a/mail/thunderbird/desktop/thunderbird.desktop
b/mail/thunderbird/desktop/thunderbird.desktop
index e83779c..7f23269 100644
--- a/mail/thunderbird/desktop/thunderbird.desktop
+++ b/mail/thunderbird/desktop/thunderbird.desktop
@@ -2,7 +2,7 @@
Encoding=UTF-8
Name=Thunderbird
Exec=thunderbird
-Icon=/usr/lib/thunderbird/icons/mozicon50.xpm
+Icon=/usr/lib/thunderbird/chrome/icons/default/default256.png
Terminal=false
Type=Application
Categories=Application;Network;Mail;
diff --git a/net/dhcp/DETAILS b/net/dhcp/DETAILS
index 32919c9..f800647 100755
--- a/net/dhcp/DETAILS
+++ b/net/dhcp/DETAILS
@@ -1,6 +1,6 @@
SPELL=dhcp
- VERSION=4.2.4-P2
- SECURITY_PATCH=3
+ VERSION=4.2.5-P1
+ SECURITY_PATCH=5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.asc
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/net/dhcp/HISTORY b/net/dhcp/HISTORY
index 4b3762a..df61b7e 100644
--- a/net/dhcp/HISTORY
+++ b/net/dhcp/HISTORY
@@ -1,3 +1,11 @@
+2013-04-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.5-P1; SECURITY_PATCH++ (CVE-2013-2266)
+
+2013-01-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.2.5; SECURITY_PATCH++ (CVE-2012-3571,
+ CVE-2012-3570, CVE-2012-3954, CVE-2012-3955)
+ * INSTALL: renewed example config filenames
+
2012-09-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.2.4-P2; SECURITY_PATCH++ (CVE-2012-3955)
* INSTALL: verbosity++
diff --git a/net/dhcp/INSTALL b/net/dhcp/INSTALL
index 0586826..9d7bdad 100755
--- a/net/dhcp/INSTALL
+++ b/net/dhcp/INSTALL
@@ -1,4 +1,6 @@
make LIBDIR="$INSTALL_ROOT/usr/lib" \
INCDIR="$INSTALL_ROOT/usr/include" install &&
-install -vm 644 client/dhclient.conf
$INSTALL_ROOT/etc/dhclient.conf.example &&
-install -vm 644 server/dhcpd.conf $INSTALL_ROOT/etc/dhcpd.conf.example
+install -vm 644 client/dhclient.conf.example \
+ $INSTALL_ROOT/etc/dhclient.conf.example &&
+install -vm 644 server/dhcpd.conf.example \
+ $INSTALL_ROOT/etc/dhcpd.conf.example
diff --git a/net/isc.gpg b/net/isc.gpg
index e37ece8..30b8304 100644
Binary files a/net/isc.gpg and b/net/isc.gpg differ
diff --git a/net/memcached/BUILD b/net/memcached/BUILD
index 22bf541..0d95377 100755
--- a/net/memcached/BUILD
+++ b/net/memcached/BUILD
@@ -1,3 +1,11 @@
create_account memcached &&

+if [[ ${SMGL_COMPAT_ARCHS[1]} == "x86_64" ]]; then
+ OPTS="--enable-64bit $OPTS"
+else
+ OPTS="--disable-64bit $OPTS"
+fi &&
+
+OPTS="$MEMCACHED_OPTS $OPTS" &&
+
default_build
diff --git a/net/memcached/DEPENDS b/net/memcached/DEPENDS
index 01841a7..aa30a78 100755
--- a/net/memcached/DEPENDS
+++ b/net/memcached/DEPENDS
@@ -1,6 +1,18 @@
depends libevent &&

+# requires xml2rfc (http://xml.resource.org/) non-existent spell
+#optional_depends xml2rfc \
+# "--enable-docs" \
+# "--disable-docs" \
+# "for documentation generation"
+
optional_depends LIBSASL \
"--enable-sasl" \
"--disable-sasl" \
- "for SASL authentication support"
+ "for SASL authentication support" &&
+
+if is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL); then
+ config_query_option MEMCACHED_OPTS "Enable plaintext password db for
SASL?" n \
+ "--enable-sasl-pwdb" \
+ "--disable-sasl-pwdb"
+fi
diff --git a/net/memcached/DETAILS b/net/memcached/DETAILS
index b7f51ac..073440b 100755
--- a/net/memcached/DETAILS
+++ b/net/memcached/DETAILS
@@ -1,8 +1,9 @@
SPELL=memcached
- VERSION=1.4.13
+ VERSION=1.4.15
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://memcached.googlecode.com/files/$SOURCE
-
SOURCE_HASH=sha512:31bc8e1437303abdb8a8c5a90d1fc4c27b38b0edaa1e41f6bae54136b1d0894208af182fcb30635947bf66ce2aedcf2b51ca63e211157b1596e0f269d310feae
+
SOURCE_HASH=sha512:53a9d7c109db01c6d345c79bddcbffae4b5b113244782e869d16f2b704c07bee1d8d9270c54065c06ed878e641a68c666c02ba6d4e81f83d771ae27a2b91e511
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=http://memcached.org/
LICENSE[0]=BSD
diff --git a/net/memcached/HISTORY b/net/memcached/HISTORY
index 6954b32b..60802e2 100644
--- a/net/memcached/HISTORY
+++ b/net/memcached/HISTORY
@@ -1,3 +1,14 @@
+2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: this was a security update (CVE-2011-4971)
+
+2012-09-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.15
+
+2012-08-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.14
+ * DEPENDS: added one more configure option
+ * BUILD: use MEMCACHED_OPTS; apply 64bit configure option
+
2012-02-07 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 1.4.13

diff --git a/net/ppp/CONFIGURE b/net/ppp/CONFIGURE
index deb43f7..8d92584 100755
--- a/net/ppp/CONFIGURE
+++ b/net/ppp/CONFIGURE
@@ -1,4 +1,5 @@
-config_query USE_PEER_DNS "Use peer DNS" y &&
+config_query USE_PEER_DNS "Use peer DNS?" y &&

-config_query HAVE_CBCP \
- "Would you like CBCP support (for callback possibility) ?" n
+config_query HAVE_CBCP "Would you like CBCP support (for callback
possibility)?" n &&
+
+config_query HAVE_INET6 "Enable IPv6 support?" n
diff --git a/net/ppp/DEPENDS b/net/ppp/DEPENDS
index 02ab40a..6c9cc72 100755
--- a/net/ppp/DEPENDS
+++ b/net/ppp/DEPENDS
@@ -1 +1,5 @@
-depends libpcap
+depends openssl &&
+depends libpcap &&
+
+optional_depends shadow "" "" "for shadow password support" &&
+optional_depends linux-pam "" "" "for PAM password support"
diff --git a/net/ppp/DETAILS b/net/ppp/DETAILS
index 4e8c149..f9008a2 100755
--- a/net/ppp/DETAILS
+++ b/net/ppp/DETAILS
@@ -1,11 +1,12 @@
SPELL=ppp
VERSION=2.4.5
+ SECURITY_PATCH=1
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.samba.org/pub/ppp/$SOURCE

SOURCE_HASH=sha512:3688720a0f9ee47802e72dc6aa3d47c7312c195007f37a6ceb087fdb6f1f77ad75e922a568cffed6d1a857f06d79460d6d38b56e179310e493a0380a0c5a4f6e
LICENSE[0]=http://va.samba.org/ppp/README.html
- SECURITY_PATCH=1
WEB_SITE=http://www.samba.org/ppp/
ENTERED=20010922
KEYWORDS="net"
diff --git a/net/ppp/HISTORY b/net/ppp/HISTORY
index e88366b..c6cb7e1 100644
--- a/net/ppp/HISTORY
+++ b/net/ppp/HISTORY
@@ -1,3 +1,13 @@
+2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * CONFIGURE: added selector for IPv6 option
+ * DEPENDS: added missing dependencies
+ * INSTALL: cleaned up
+ * PRE_BUILD: apply mppe-header patch; handle options and dependencies
+ * options, pap-secrets, chap-secrets: replaced by versions in tarball
+ * mppe-header.patch: added, to fix building of modules which might
+ require MPPE support
+
2011-01-05 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: leave group-creation only here; moved all source
modifications
to PRE_BUILD; use CFLAGS
diff --git a/net/ppp/INSTALL b/net/ppp/INSTALL
index e6f50f7..16279ec 100755
--- a/net/ppp/INSTALL
+++ b/net/ppp/INSTALL
@@ -1,6 +1,12 @@
default_install &&

-install -d -m 0755 -o root -g ppp $INSTALL_ROOT/etc/ppp &&
+make install-etcppp &&
+
+for conf in options pap-secrets chap-secrets; do
+ chown root:ppp "$INSTALL_ROOT/etc/ppp/$conf" &&
+ chmod 0600 "$INSTALL_ROOT/etc/ppp/$conf"
+done &&
+
install -d -m 0755 -o root -g ppp $INSTALL_ROOT/etc/ppp/peers &&
install -d -m 0755 -o root -g ppp $INSTALL_ROOT/etc/ppp/chat &&

@@ -17,11 +23,6 @@ if install_config_file $SCRIPT_DIRECTORY/resolv.conf
\
chown root:ppp $INSTALL_ROOT/etc/ppp/resolv.conf
fi &&

-if install_config_file $SCRIPT_DIRECTORY/options \
- $INSTALL_ROOT/etc/ppp/options; then
- chown root:ppp $INSTALL_ROOT/etc/ppp/options
-fi &&
-
if install_config_file $SCRIPT_DIRECTORY/peers \
$INSTALL_ROOT/etc/ppp/peers/isp; then
chown root:ppp $INSTALL_ROOT/etc/ppp/peers/isp
@@ -32,17 +33,5 @@ if install_config_file $SCRIPT_DIRECTORY/isp \
chown root:ppp $INSTALL_ROOT/etc/ppp/chat/isp
fi &&

-if install_config_file $SCRIPT_DIRECTORY/pap-secrets \
- $INSTALL_ROOT/etc/ppp/pap-secrets; then
- chown root:ppp $INSTALL_ROOT/etc/ppp/pap-secrets &&
- chmod 0600 $INSTALL_ROOT/etc/ppp/pap-secrets
-fi &&
-
-if install_config_file $SCRIPT_DIRECTORY/chap-secrets \
- $INSTALL_ROOT/etc/ppp/chap-secrets; then
- chown root:ppp $INSTALL_ROOT/etc/ppp/chap-secrets &&
- chmod 0600 $INSTALL_ROOT/etc/ppp/chap-secrets
-fi &&
-
chown root:ppp ${INSTALL_ROOT}/usr/sbin/pppd &&
chmod 4750 ${INSTALL_ROOT}/usr/sbin/pppd
diff --git a/net/ppp/PRE_BUILD b/net/ppp/PRE_BUILD
index 56fd526..fcd5997 100755
--- a/net/ppp/PRE_BUILD
+++ b/net/ppp/PRE_BUILD
@@ -1,6 +1,9 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+# include mppe.h into build
+patch -p0 < "$SPELL_DIRECTORY/mppe-header.patch" &&
+
# fixes use of 2.6.35 headers
patch -p0 < "$SPELL_DIRECTORY/l2tp.patch" &&

@@ -8,6 +11,18 @@ sedit 's:net/bpf.h:pcap-bpf.h:' pppd/demand.c &&
sedit 's:net/bpf.h:pcap-bpf.h:' pppd/sys-linux.c &&
sedit 's:/usr/man:/usr/share/man:' linux/Makefile.top &&

+if is_depends_enabled $SPELL linux-pam; then
+ sedit 's:#USE_PAM=y:USE_PAM=y:' pppd/Makefile.linux
+fi &&
+
+if ! is_depends_enabled $SPELL shadow; then
+ sedit 's:HAS_SHADOW=y:#HAS_SHADOW=y:' pppd/Makefile.linux
+fi &&
+
+if [ "$HAVE_INET6" == "y" ]; then
+ sedit 's:#HAVE_INET6=y:HAVE_INET6=y:' pppd/Makefile.linux
+fi &&
+
if [ "$HAVE_CBCP" == "y" ]; then
sedit 's:#CBCP=y:CBCP=y:' pppd/Makefile.linux
fi
diff --git a/net/ppp/chap-secrets b/net/ppp/chap-secrets
deleted file mode 100644
index d5d6455..0000000
--- a/net/ppp/chap-secrets
+++ /dev/null
@@ -1,3 +0,0 @@
-# Secrets for authentication using CHAP
-# client server secret IP addresses
-
diff --git a/net/ppp/mppe-header.patch b/net/ppp/mppe-header.patch
new file mode 100644
index 0000000..4124e3a
--- /dev/null
+++ b/net/ppp/mppe-header.patch
@@ -0,0 +1,11 @@
+--- pppd/Makefile.linux.orig 2009-11-17 01:26:07.000000000 +0300
++++ pppd/Makefile.linux 2013-05-21 01:50:23.063838264 +0400
+@@ -16,7 +16,7 @@
+ demand.c utils.c tty.c eap.c chap-md5.c session.c
+
+ HEADERS = ccp.h session.h chap-new.h ecp.h fsm.h ipcp.h \
+- ipxcp.h lcp.h magic.h md5.h patchlevel.h pathnames.h pppd.h \
++ ipxcp.h lcp.h magic.h md5.h mppe.h patchlevel.h pathnames.h pppd.h \
+ upap.h eap.h
+
+ MANPAGES = pppd.8
diff --git a/net/ppp/options b/net/ppp/options
deleted file mode 100755
index 819078b..0000000
--- a/net/ppp/options
+++ /dev/null
@@ -1,6 +0,0 @@
-lock
-mru 1280
-mtu 1280
-nobsdcomp
-deflate 15,15
-persist
diff --git a/net/ppp/pap-secrets b/net/ppp/pap-secrets
deleted file mode 100644
index c7df7ef..0000000
--- a/net/ppp/pap-secrets
+++ /dev/null
@@ -1,2 +0,0 @@
-# Secrets for authentication using PAP
-
diff --git a/net/socat/DETAILS b/net/socat/DETAILS
index 8046827..5864ecb 100755
--- a/net/socat/DETAILS
+++ b/net/socat/DETAILS
@@ -1,7 +1,7 @@
SPELL=socat
- VERSION=1.7.2.1
- SECURITY_PATCH=2
-
SOURCE_HASH=sha512:ce3d8097b58cbe71b58b9bc9961c55e0da2831fb3b680685577d6926d1d29181c72b7ab6121241c8d6d6368104a8c2887b3dd63af211056c08cf4592245f39af
+ VERSION=1.7.2.2
+ SECURITY_PATCH=3
+
SOURCE_HASH=sha512:712a9e061139ffc38552db9321bac143f22da85852dc8b30148c5fb3b4209d4a963a62948aaf9eb35f63b23b4b6459627effb5a2b6757b70ddecffe31860b73b
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=http://www.dest-unreach.org/$SPELL/download/$SOURCE
diff --git a/net/socat/HISTORY b/net/socat/HISTORY
index c8b7b81..56c2b15 100644
--- a/net/socat/HISTORY
+++ b/net/socat/HISTORY
@@ -1,3 +1,6 @@
+2013-05-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.7.2.2; SECURITY_PATCH++ (CVE-2013-3571)
+
2012-05-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.2.1; SECURITY_PATCH++

diff --git a/net/tinc/DETAILS b/net/tinc/DETAILS
index dea04dc..e0c8cb3 100755
--- a/net/tinc/DETAILS
+++ b/net/tinc/DETAILS
@@ -1,5 +1,6 @@
SPELL=tinc
- VERSION=1.0.19
+ VERSION=1.0.21
+ SECURITY_PATCH=1
SOURCE="$SPELL-$VERSION.tar.gz"
SOURCE2=$SOURCE.sig
SOURCE_URL[0]=http://www.$SPELL-vpn.org/packages/$SOURCE
diff --git a/net/tinc/HISTORY b/net/tinc/HISTORY
index b588c70..f9b58b7 100644
--- a/net/tinc/HISTORY
+++ b/net/tinc/HISTORY
@@ -1,3 +1,9 @@
+2013-04-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.21; SECURITY_PATCH++ (CVE-2013-1428)
+
+2013-03-04 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.0.20
+
2012-07-31 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.0.19; corrected descriptions
* DEPENDS: zlib and lzo are optional
diff --git a/python-pypi/py-bcrypt/DETAILS b/python-pypi/py-bcrypt/DETAILS
index 032dfce..01565f4 100755
--- a/python-pypi/py-bcrypt/DETAILS
+++ b/python-pypi/py-bcrypt/DETAILS
@@ -1,9 +1,12 @@
SPELL=py-bcrypt
- VERSION=0.2
+ VERSION=0.3
+ SECURITY_PATCH=1
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.asc
- SOURCE_URL[0]=http://www.mindrot.org/files/${SPELL}/${SOURCE}
+ SOURCE_URL[0]=http://pypi.python.org/packages/source/p/${SPELL}/${SOURCE}
+ SOURCE_URL[1]=http://py-bcrypt.googlecode.com/files/${SOURCE}
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
SOURCE_GPG=djm.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/python-pypi/py-bcrypt/HISTORY b/python-pypi/py-bcrypt/HISTORY
index b016137..e1911d1 100644
--- a/python-pypi/py-bcrypt/HISTORY
+++ b/python-pypi/py-bcrypt/HISTORY
@@ -1,2 +1,6 @@
+2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 0.3; renewed source urls; SECURITY_PATCH++
+ (CVE-2013-1895)
+
2010-07-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS, DETAILS: spell created
diff --git a/python-pypi/roundup/DEPENDS b/python-pypi/roundup/DEPENDS
index 057f00f..87de9ab 100755
--- a/python-pypi/roundup/DEPENDS
+++ b/python-pypi/roundup/DEPENDS
@@ -2,7 +2,8 @@ depends python &&

suggest_depends pytz "" "" "for the full timezone support (recommended)" &&
suggest_depends pyopenssl "" "" "for SSL support in built-in server" &&
-suggest_depends pysqlite "" "" "for SQLite database support" &&
+suggest_depends pysqlite "" "" "for SQLite database support via pysqlite" &&
+suggest_depends -sub SQLITE python "" "" "for SQLite database support via
native Python module" &&
suggest_depends psycopg2 "" "" "for PostgreSQL database support" &&
suggest_depends mysql-python "" "" "for MySQL database support" &&
suggest_depends pyme "" "" "for OpenPGP MIME messages'
verification/decryption"
diff --git a/python-pypi/roundup/HISTORY b/python-pypi/roundup/HISTORY
index ac65baf..d35c918 100644
--- a/python-pypi/roundup/HISTORY
+++ b/python-pypi/roundup/HISTORY
@@ -1,3 +1,7 @@
+2013-03-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added suggest dependency on native SQLite extension for
+ Python
+
2012-11-17 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.20; SECURITY_PATCH++

diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index 7683552..793489f 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,10 +1,10 @@
SPELL=ruby-1.9
PACKAGE=ruby
- VERSION=1.9.3-p392
+ VERSION=1.9.3-p429
BRANCH=`echo $VERSION|cut -d . -f 1,2`
-
SOURCE_HASH=sha512:f005ab05979bd5bd2ce7eba382245f507b736c6630984da2eea7b9ec446fc1c86723f35c3b1c2653c90c509a9489baa60c1555fba004d3bbc9c422877b0b986a
+
SOURCE_HASH=sha512:c62725a694f559348f17e155ae1a7cfcbb62abe8eb31c9b9827d080827333e04377eb969ab39b3585b4cfb86621e94a694711faff1fe88946cd97c95f4d31803
SOURCE=$PACKAGE-$VERSION.tar.gz
- SECURITY_PATCH=9
+ SECURITY_PATCH=10
SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/$PACKAGE/$BRANCH/$SOURCE
SOURCE_URL[1]=http://mirrors.ibiblio.org/$PACKAGE/$BRANCH/$SOURCE
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$PACKAGE-$VERSION"
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index 1d24d27..c8ffa5b 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,6 @@
+2013-05-30 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.3-p429; SECURITY_PATCH++
(CVE-2013-2065)
+
2013-02-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.9.3-p392; SECURITY_PATCH++
(CVE-2013-0269)

diff --git a/security/wireshark/CONFIGURE b/security/wireshark/CONFIGURE
index 5d4e1cc..39fe54f 100755
--- a/security/wireshark/CONFIGURE
+++ b/security/wireshark/CONFIGURE
@@ -1,13 +1,12 @@
+# remove obsolete options from WIRESHARK_OPTS
+list_remove WIRESHARK_OPTS '--enable-threads' &&
+list_remove WIRESHARK_OPTS '--disable-threads' &&
+
config_query_option WIRESHARK_OPTS \
"Enable IPv6?" y \
"--enable-ipv6" \
"--disable-ipv6" &&

config_query_option WIRESHARK_OPTS \
- "Enable threads support?" n \
- "--enable-threads" \
- "--disable-threads" &&
-
-config_query_option WIRESHARK_OPTS \
"Install dumpcap as setuid?" n \
"--enable-setuid-install" ""
diff --git a/security/wireshark/DEPENDS b/security/wireshark/DEPENDS
index 22b916d..2ef7b10 100755
--- a/security/wireshark/DEPENDS
+++ b/security/wireshark/DEPENDS
@@ -10,10 +10,6 @@ optional_depends zlib \
"--with-zlib" "--without-zlib" \
"to read compressed data" &&

-optional_depends pcre \
- "--with-pcre" "--without-pcre" \
- "for dfilter regular expressions support" &&
-
optional_depends libcap \
"--with-libcap" "--without-libcap" \
"for POSIX.1e capabilities management" &&
diff --git a/security/wireshark/DETAILS b/security/wireshark/DETAILS
index 5eb7bd7..35f411a 100755
--- a/security/wireshark/DETAILS
+++ b/security/wireshark/DETAILS
@@ -1,11 +1,11 @@
SPELL=wireshark
- VERSION=1.8.5
- SECURITY_PATCH=41
+ VERSION=1.8.7
+ SECURITY_PATCH=43
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:3378310870e2e11cd4caf91e0571e2a52bd81bc76f1715997338d867a4d98ad7bb34e0f4443220386b498aeebce15c02d9825e50cf587587f573a5a0c578b039
+
SOURCE_HASH=sha512:4a0606257d541c6045cdab19f2280d409e737af6ca39f7633b7df13f5d128f16bbe2c53d84f8d79feaf0cd790bc94114495b99d2bbb938e6d5ebe0d398fea66a
WEB_SITE=http://www.wireshark.org/
ENTERED=20020116
LICENSE[0]=GPL
diff --git a/security/wireshark/HISTORY b/security/wireshark/HISTORY
index db68521..008d7af 100644
--- a/security/wireshark/HISTORY
+++ b/security/wireshark/HISTORY
@@ -1,3 +1,13 @@
+2013-05-29 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE: dropped obsolete flags
+ * DEPENDS: pcre support has been switched to glib2 implementation
+
+2013-05-18 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.7, SECURITY_PATCH=43
+
+2013-03-07 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.6, SECURITY_PATCH=42
+
2013-01-30 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.8.5, SECURITY_PATCH=41

diff --git a/smgl/smgl-mirrors/DETAILS b/smgl/smgl-mirrors/DETAILS
index c3b318c..5c128cb 100755
--- a/smgl/smgl-mirrors/DETAILS
+++ b/smgl/smgl-mirrors/DETAILS
@@ -1,9 +1,13 @@
SPELL=smgl-mirrors
- VERSION=0.6
- SOURCE=$SPELL-$VERSION.tar.bz2
+ VERSION=0.7
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
SOURCE_URL[0]="http://download.sourcemage.org/distro/$SOURCE";
-
SOURCE_HASH=sha512:761959b666dc549fb2c33e1f6a54432463aea73dbf831e5e0a9b3d36aecd6edc99495abca7285bf19b8bfaefb93ef448411960092901fea8d6d0f146f9b182c7
+ SOURCE2_URL[0]="http://download.sourcemage.org/distro/$SOURCE2";
+ SOURCE_GPG="gurus.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
+ SOURCE2_IGNORE=signature
+#
SOURCE_HASH=sha512:761959b666dc549fb2c33e1f6a54432463aea73dbf831e5e0a9b3d36aecd6edc99495abca7285bf19b8bfaefb93ef448411960092901fea8d6d0f146f9b182c7
WEB_SITE=http://www.sourcemage.org
ENTERED=20081217
LICENSE[0]=GPL
diff --git a/smgl/smgl-mirrors/HISTORY b/smgl/smgl-mirrors/HISTORY
index e5f5c33..fb6e229 100644
--- a/smgl/smgl-mirrors/HISTORY
+++ b/smgl/smgl-mirrors/HISTORY
@@ -1,3 +1,8 @@
+2013-06-11 Eric Sandall <sandalle AT sourcemage.org>
+ * DETAILS: Updated to 0.7
+ Updated SOURCEFORGE to new mirrors
+ SOURCEFORGE default is now "Auto Select"
+
2008-12-19 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* DETAILS: fixed source url

diff --git a/utils/cpuburn/BUILD b/utils/cpuburn/BUILD
index 8f58e6d..6dfecc1 100755
--- a/utils/cpuburn/BUILD
+++ b/utils/cpuburn/BUILD
@@ -1 +1 @@
-make
+default_build_make
diff --git a/utils/cpuburn/HISTORY b/utils/cpuburn/HISTORY
index a5d5aca..699c5f5 100644
--- a/utils/cpuburn/HISTORY
+++ b/utils/cpuburn/HISTORY
@@ -1,3 +1,7 @@
+2013-03-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: use default_build_make instead of make
+ * PRE_BUILD: fix compile error on x86_64
+
2008-04-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS, BUILD, INSTALL, HISTORY: spell created

diff --git a/utils/cpuburn/PRE_BUILD b/utils/cpuburn/PRE_BUILD
new file mode 100755
index 0000000..2d8dbcf
--- /dev/null
+++ b/utils/cpuburn/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+sedit 's:gcc :gcc -m32 :' Makefile
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 888757d..2db63ea 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,7 +1,7 @@
SPELL=dbus
- VERSION=1.4.20
-
SOURCE_HASH=sha512:d6bad9df110a7b93f278577b9e45c0a9c07fbc2d6bb89fbf0c4af09d9dc8bab91b4e62aee0db32536b1c6194fc638e7a1c99f48a74e0cf55fcb1cc121bbe57f7
- SECURITY_PATCH=7
+ VERSION=1.4.26
+
SOURCE_HASH=sha512:284c06b2bed3d04da07bc2bbea0a5564e564b7d3fd2145cc740c5300775e4b023548b1b4af7412773d5582e8aea8087ab174b17afef3ffe493f39d2f8230fc51
+ SECURITY_PATCH=8
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/dbus/$SOURCE
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 8a95d0a..0997b01 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.26; SECURITY_PATCH++ (CVE-2013-2168)
+
2012-04-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.4.20

diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index 192ae56..bcbdc3a 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,14 +1,16 @@
SPELL=sudo
- VERSION=1.8.5p1
+ VERSION=1.8.6p7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
- SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
- SOURCE_URL[1]=ftp://ftp.courtesan.com/pub/$SPELL/$SOURCE
+ SOURCE_URL[0]=http://www.gratisoft.us/sudo/dist/${SOURCE}
+ SOURCE_URL[1]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
+ SOURCE_URL[2]=ftp://ftp.courtesan.com/pub/$SPELL/$SOURCE
SOURCE2=$SOURCE.sig
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
+ SOURCE2_URL[2]=${SOURCE_URL[2]}.sig
SOURCE2_IGNORE=signature
- SECURITY_PATCH=8
+ SECURITY_PATCH=9
SOURCE_GPG=sudo.gpg:$SOURCE.sig:UPSTREAM_KEY
WEB_SITE=http://www.courtesan.com/sudo
KEYWORDS="utils"
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index fd3ae96..2592f1b 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,33 @@
+2013-03-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6p7; SECURITY_PATCH++
+
+2013-01-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6p5
+
+2013-01-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6p4
+
+2012-09-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6p3
+
+2012-09-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6p2
+
+2012-09-14 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6p1
+
+2012-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: re-add source urls
+
+2012-08-20 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fixed SOURCE_URL
+
+2012-08-19 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.8.5p3
+
+2012-06-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.5p2
+
2012-05-24 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.5p1; SECURITY_PATCH++ (CVE 2012-2337)

diff --git a/utils/uptimed/DETAILS b/utils/uptimed/DETAILS
index 9dd55ff..91b5d0e 100755
--- a/utils/uptimed/DETAILS
+++ b/utils/uptimed/DETAILS
@@ -1,11 +1,10 @@
SPELL=uptimed
- VERSION=0.3.16
+ VERSION=0.3.17
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://podgorny.cz/uptimed/releases/${SOURCE}
SOURCE_URL[1]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:b6a51c0b30059767bd260b25cc43647c24f32bb9bcd5a3ff895ece800dbeb03d7de64cbdcec4f5571ea42ee72d38ea665733f59f74aecdc5e20a4e1c7b3a5123
- PATCHLEVEL=1
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
LICENSE[0]=GPL
KEYWORDS="utils"
WEB_SITE=http://podgorny.cz/moin/Uptimed
diff --git a/utils/uptimed/HISTORY b/utils/uptimed/HISTORY
index cc8667c..5622135 100644
--- a/utils/uptimed/HISTORY
+++ b/utils/uptimed/HISTORY
@@ -1,3 +1,7 @@
+2013-03-13 Robin Cook <rcook AT wyrms.net>
+ * DETAILS: updated VERSION to 0.3.17
+ * PRE_BUILD: added patch to all building with current autotools
+
2010-02-17 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Depends on autoconf and libtoolize
* PRE_BUILD: Run libtoolize and autoreconf
diff --git a/utils/uptimed/PRE_BUILD b/utils/uptimed/PRE_BUILD
index c4dfd99..7acdf06 100755
--- a/utils/uptimed/PRE_BUILD
+++ b/utils/uptimed/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/configure-ac.patch &&
+
libtoolize &&
autoreconf &&
./bootstrap.sh
diff --git a/utils/uptimed/configure-ac.patch
b/utils/uptimed/configure-ac.patch
new file mode 100644
index 0000000..8585dd7
--- /dev/null
+++ b/utils/uptimed/configure-ac.patch
@@ -0,0 +1,12 @@
+diff -ur uptimed-0.3.17/configure.ac uptimed-mod/configure.ac
+--- uptimed-0.3.17/configure.ac 2012-05-21 16:30:59.000000000 -0500
++++ uptimed-mod/configure.ac 2013-03-13 16:50:23.422039740 -0500
+@@ -1,7 +1,7 @@
+ dnl configure.in for uptimed
+
+ AC_INIT([uptimed], 0.3.17)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADER(config.h)
+ AC_PROG_CC
+ AM_PROG_LIBTOOL
+ AM_INIT_AUTOMAKE
diff --git a/utils/uptimed/uptimed-0.3.17.tar.bz2.sig
b/utils/uptimed/uptimed-0.3.17.tar.bz2.sig
new file mode 100644
index 0000000..33e002a
Binary files /dev/null and b/utils/uptimed/uptimed-0.3.17.tar.bz2.sig differ
diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index d6c6fb1..a86a167 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen
- VERSION=4.1.4
- SECURITY_PATCH=7
+ VERSION=4.1.5
+ SECURITY_PATCH=8
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 06aa996..b4429d6 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,8 @@
+2013-06-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 4.1.5; SECURITY_PATCH++
+ * PRE_BUILD: removed patches
+ * xsa-*.patch: removed, fixed by upstream
+
2013-02-18 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: SECURITY_PATCH++
* PRE_BUILD: apply patches
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index ba38b55..c7f9a4a 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -1,13 +1,6 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&

-patch -p1 < "$SPELL_DIRECTORY/xsa-27-1.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-33.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-36.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-38.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-41.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/xsa-41-1.patch" &&
-
if [[ $XEN_UPINIT != y ]]; then
sedit "s:all install-initd:all:" tools/hotplug/Linux/Makefile
fi &&
diff --git a/utils/xen/xsa-27-1.patch b/utils/xen/xsa-27-1.patch
deleted file mode 100644
index 4260b20..0000000
--- a/utils/xen/xsa-27-1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/xen/arch/x86/mm/paging.c Wed Jan 16 14:15:12 2013 +0000
-+++ b/xen/arch/x86/mm/paging.c Thu Jan 17 11:17:32 2013 +0000
-@@ -534,7 +534,8 @@ int paging_log_dirty_range(struct domain
-
- size = ((nr + BITS_PER_LONG - 1) / BITS_PER_LONG) * sizeof (long);
- rv = 0;
-- for ( off = 0; !rv && off < size; off += sizeof zeroes )
-+ off = 0;
-+ while ( !rv && off < size )
- {
- int todo = min(size - off, (int) PAGE_SIZE);
- if ( copy_to_guest_offset(dirty_bitmap, off, zeroes, todo) )
diff --git a/utils/xen/xsa-33.patch b/utils/xen/xsa-33.patch
deleted file mode 100644
index d0bdeb4..0000000
--- a/utils/xen/xsa-33.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-VT-d: fix interrupt remapping source validation for devices behind
-legacy bridges
-
-Using SVT_VERIFY_BUS here doesn't make sense; native Linux also
-uses SVT_VERIFY_SID_SQ here instead.
-
-This is XSA-33 / CVE-2012-5634.
-
-Signed-off-by: Jan Beulich <jbeulich AT suse.com>
-
---- a/xen/drivers/passthrough/vtd/intremap.c
-+++ b/xen/drivers/passthrough/vtd/intremap.c
-@@ -499,7 +499,7 @@ static void set_msi_source_id(struct pci_dev *pdev,
struct iremap_entry *ire)
- set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
- (bus << 8) | pdev->bus);
- else if ( pdev_type(bus, devfn) == DEV_TYPE_LEGACY_PCI_BRIDGE )
-- set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
-+ set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_ALL_16,
- PCI_BDF2(bus, devfn));
- }
- break;
diff --git a/utils/xen/xsa-36.patch b/utils/xen/xsa-36.patch
deleted file mode 100644
index f4b15e2..0000000
--- a/utils/xen/xsa-36.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-ACPI: acpi_table_parse() should return handler's error code
-
-Currently, the error code returned by acpi_table_parse()'s handler
-is ignored. This patch will propagate handler's return value to
-acpi_table_parse()'s caller.
-
-AMD,IOMMU: Clean up old entries in remapping tables when creating new
-interrupt mapping.
-
-When changing the affinity of an IRQ associated with a passed
-through PCI device, clear previous mapping.
-
-In addition, because some BIOSes may incorrectly program IVRS
-entries for IOAPIC try to check for entry's consistency. Specifically,
-if conflicting entries are found disable IOMMU if per-device
-remapping table is used. If entries refer to bogus IOAPIC IDs
-disable IOMMU unconditionally
-
-AMD,IOMMU: Disable IOMMU if SATA Combined mode is on
-
-AMD's SP5100 chipset can be placed into SATA Combined mode
-that may cause prevent dom0 from booting when IOMMU is
-enabled and per-device interrupt remapping table is used.
-While SP5100 erratum 28 requires BIOSes to disable this mode,
-some may still use it.
-
-This patch checks whether this mode is on and, if per-device
-table is in use, disables IOMMU.
-
-AMD,IOMMU: Make per-device interrupt remapping table default
-
-Using global interrupt remapping table may be insecure, as
-described by XSA-36. This patch makes per-device mode default.
-
-This is XSA-36 / CVE-2013-0153.
-
-Signed-off-by: Jan Beulich <jbeulich AT suse.com>
-Signed-off-by: Boris Ostrovsky <boris.ostrovsky AT amd.com>
-
---- a/xen/arch/x86/irq.c
-+++ b/xen/arch/x86/irq.c
-@@ -1677,9 +1677,6 @@ int map_domain_pirq(
- d->arch.pirq_irq[pirq] = irq;
- d->arch.irq_pirq[irq] = pirq;
- spin_unlock_irqrestore(&desc->lock, flags);
--
-- if ( opt_irq_vector_map == OPT_IRQ_VECTOR_MAP_PERDEV )
-- printk(XENLOG_INFO "Per-device vector maps for GSIs not
implemented yet.\n");
- }
-
- done:
---- a/xen/drivers/acpi/tables.c
-+++ b/xen/drivers/acpi/tables.c
-@@ -267,7 +267,7 @@ acpi_table_parse_madt(enum acpi_madt_typ
- * @handler: handler to run
- *
- * Scan the ACPI System Descriptor Table (STD) for a table matching @id,
-- * run @handler on it. Return 0 if table found, return on if not.
-+ * run @handler on it.
- */
- int acpi_table_parse(char *id, acpi_table_handler handler)
- {
-@@ -282,8 +282,7 @@ int acpi_table_parse(char *id, acpi_tabl
- acpi_get_table(id, 0, &table);
-
- if (table) {
-- handler(table);
-- return 0;
-+ return handler(table);
- } else
- return 1;
- }
---- a/xen/drivers/passthrough/amd/iommu_acpi.c
-+++ b/xen/drivers/passthrough/amd/iommu_acpi.c
-@@ -21,6 +21,7 @@
- #include <xen/config.h>
- #include <xen/errno.h>
- #include <asm/apicdef.h>
-+#include <asm/io_apic.h>
- #include <asm/amd-iommu.h>
- #include <asm/hvm/svm/amd-iommu-proto.h>
- #include <asm/hvm/svm/amd-iommu-acpi.h>
-@@ -29,7 +30,6 @@ extern unsigned long amd_iommu_page_entr
- extern unsigned short ivrs_bdf_entries;
- extern struct ivrs_mappings *ivrs_mappings;
- extern unsigned short last_bdf;
--extern int ioapic_bdf[MAX_IO_APICS];
- extern void *shared_intremap_table;
-
- static void add_ivrs_mapping_entry(
-@@ -636,6 +636,7 @@ static u16 __init parse_ivhd_device_spec
- u16 header_length, u16 block_length, struct amd_iommu *iommu)
- {
- u16 dev_length, bdf;
-+ int apic;
-
- dev_length = sizeof(struct acpi_ivhd_device_special);
- if ( header_length < (block_length + dev_length) )
-@@ -652,9 +653,58 @@ static u16 __init parse_ivhd_device_spec
- }
-
- add_ivrs_mapping_entry(bdf, bdf, ivhd_device->header.flags, iommu);
-- /* set device id of ioapic */
-- ioapic_bdf[ivhd_device->special.handle] = bdf;
-- return dev_length;
-+
-+ if ( ivhd_device->special.variety != 1 /* ACPI_IVHD_IOAPIC */ )
-+ {
-+ if ( ivhd_device->special.variety != 2 /* ACPI_IVHD_HPET */ )
-+ printk(XENLOG_ERR "Unrecognized IVHD special variety %#x\n",
-+ ivhd_device->special.variety);
-+ return dev_length;
-+ }
-+
-+ /*
-+ * Some BIOSes have IOAPIC broken entries so we check for IVRS
-+ * consistency here --- whether entry's IOAPIC ID is valid and
-+ * whether there are conflicting/duplicated entries.
-+ */
-+ for ( apic = 0; apic < nr_ioapics; apic++ )
-+ {
-+ if ( IO_APIC_ID(apic) != ivhd_device->special.handle )
-+ continue;
-+
-+ if ( ioapic_bdf[ivhd_device->special.handle].pin_setup )
-+ {
-+ if ( ioapic_bdf[ivhd_device->special.handle].bdf == bdf )
-+ AMD_IOMMU_DEBUG("IVHD Warning: Duplicate IO-APIC %#x
entries\n",
-+ ivhd_device->special.handle);
-+ else
-+ {
-+ printk(XENLOG_ERR "IVHD Error: Conflicting IO-APIC %#x
entries\n",
-+ ivhd_device->special.handle);
-+ if ( amd_iommu_perdev_intremap )
-+ return 0;
-+ }
-+ }
-+ else
-+ {
-+ /* set device id of ioapic */
-+ ioapic_bdf[ivhd_device->special.handle].bdf = bdf;
-+
-+ ioapic_bdf[ivhd_device->special.handle].pin_setup =
xzalloc_array(
-+ unsigned long, BITS_TO_LONGS(nr_ioapic_registers[apic]));
-+ if ( nr_ioapic_registers[apic] &&
-+ !ioapic_bdf[IO_APIC_ID(apic)].pin_setup )
-+ {
-+ printk(XENLOG_ERR "IVHD Error: Out of memory\n");
-+ return 0;
-+ }
-+ }
-+ return dev_length;
-+ }
-+
-+ printk(XENLOG_ERR "IVHD Error: Invalid IO-APIC %#x\n",
-+ ivhd_device->special.handle);
-+ return 0;
- }
-
- static int __init parse_ivhd_block(struct acpi_ivhd_block_header
*ivhd_block)
---- a/xen/drivers/passthrough/amd/iommu_init.c
-+++ b/xen/drivers/passthrough/amd/iommu_init.c
-@@ -897,12 +897,45 @@ static int __init amd_iommu_setup_device
- return 0;
- }
-
-+/* Check whether SP5100 SATA Combined mode is on */
-+static bool_t __init amd_sp5100_erratum28(void)
-+{
-+ u32 bus, id;
-+ u16 vendor_id, dev_id;
-+ u8 byte;
-+
-+ for (bus = 0; bus < 256; bus++)
-+ {
-+ id = pci_conf_read32(bus, 0x14, 0, PCI_VENDOR_ID);
-+
-+ vendor_id = id & 0xffff;
-+ dev_id = (id >> 16) & 0xffff;
-+
-+ /* SP5100 SMBus module sets Combined mode on */
-+ if (vendor_id != 0x1002 || dev_id != 0x4385)
-+ continue;
-+
-+ byte = pci_conf_read8(bus, 0x14, 0, 0xad);
-+ if ( (byte >> 3) & 1 )
-+ {
-+ printk(XENLOG_WARNING "AMD-Vi: SP5100 erratum 28 detected,
disabling IOMMU.\n"
-+ "If possible, disable SATA Combined mode in BIOS or
contact your vendor for BIOS update.\n");
-+ return 1;
-+ }
-+ }
-+
-+ return 0;
-+}
-+
- int __init amd_iommu_init(void)
- {
- struct amd_iommu *iommu;
-
- BUG_ON( !iommu_found() );
-
-+ if ( amd_iommu_perdev_intremap && amd_sp5100_erratum28() )
-+ goto error_out;
-+
- irq_to_iommu = xmalloc_array(struct amd_iommu *, nr_irqs);
- if ( irq_to_iommu == NULL )
- goto error_out;
---- a/xen/drivers/passthrough/amd/iommu_intr.c
-+++ b/xen/drivers/passthrough/amd/iommu_intr.c
-@@ -27,7 +27,7 @@
- #define INTREMAP_LENGTH 0xB
- #define INTREMAP_ENTRIES (1 << INTREMAP_LENGTH)
-
--int ioapic_bdf[MAX_IO_APICS];
-+struct ioapic_bdf ioapic_bdf[MAX_IO_APICS];
- extern struct ivrs_mappings *ivrs_mappings;
- extern unsigned short ivrs_bdf_entries;
- void *shared_intremap_table;
-@@ -117,12 +117,12 @@ void invalidate_interrupt_table(struct a
- static void update_intremap_entry_from_ioapic(
- int bdf,
- struct amd_iommu *iommu,
-- struct IO_APIC_route_entry *ioapic_rte)
-+ const struct IO_APIC_route_entry *rte,
-+ const struct IO_APIC_route_entry *old_rte)
- {
- unsigned long flags;
- u32* entry;
- u8 delivery_mode, dest, vector, dest_mode;
-- struct IO_APIC_route_entry *rte = ioapic_rte;
- int req_id;
- spinlock_t *lock;
- int offset;
-@@ -138,6 +138,14 @@ static void update_intremap_entry_from_i
- spin_lock_irqsave(lock, flags);
-
- offset = get_intremap_offset(vector, delivery_mode);
-+ if ( old_rte )
-+ {
-+ int old_offset = get_intremap_offset(old_rte->vector,
-+ old_rte->delivery_mode);
-+
-+ if ( offset != old_offset )
-+ free_intremap_entry(bdf, old_offset);
-+ }
- entry = (u32*)get_intremap_entry(req_id, offset);
- update_intremap_entry(entry, vector, delivery_mode, dest_mode, dest);
-
-@@ -176,7 +184,7 @@ int __init amd_iommu_setup_ioapic_remapp
- continue;
-
- /* get device id of ioapic devices */
-- bdf = ioapic_bdf[IO_APIC_ID(apic)];
-+ bdf = ioapic_bdf[IO_APIC_ID(apic)].bdf;
- iommu = find_iommu_for_device(bdf);
- if ( !iommu )
- {
-@@ -207,6 +215,7 @@ int __init amd_iommu_setup_ioapic_remapp
- flush_command_buffer(iommu);
- spin_unlock_irqrestore(&iommu->lock, flags);
- }
-+ set_bit(pin, ioapic_bdf[IO_APIC_ID(apic)].pin_setup);
- }
- }
- return 0;
-@@ -218,6 +227,7 @@ void amd_iommu_ioapic_update_ire(
- struct IO_APIC_route_entry old_rte = { 0 };
- struct IO_APIC_route_entry new_rte = { 0 };
- unsigned int rte_lo = (reg & 1) ? reg - 1 : reg;
-+ unsigned int pin = (reg - 0x10) / 2;
- int saved_mask, bdf;
- struct amd_iommu *iommu;
-
-@@ -228,7 +238,7 @@ void amd_iommu_ioapic_update_ire(
- }
-
- /* get device id of ioapic devices */
-- bdf = ioapic_bdf[IO_APIC_ID(apic)];
-+ bdf = ioapic_bdf[IO_APIC_ID(apic)].bdf;
- iommu = find_iommu_for_device(bdf);
- if ( !iommu )
- {
-@@ -254,6 +264,14 @@ void amd_iommu_ioapic_update_ire(
- *(((u32 *)&new_rte) + 1) = value;
- }
-
-+ if ( new_rte.mask &&
-+ !test_bit(pin, ioapic_bdf[IO_APIC_ID(apic)].pin_setup) )
-+ {
-+ ASSERT(saved_mask);
-+ __io_apic_write(apic, reg, value);
-+ return;
-+ }
-+
- /* mask the interrupt while we change the intremap table */
- if ( !saved_mask )
- {
-@@ -262,7 +280,11 @@ void amd_iommu_ioapic_update_ire(
- }
-
- /* Update interrupt remapping entry */
-- update_intremap_entry_from_ioapic(bdf, iommu, &new_rte);
-+ update_intremap_entry_from_ioapic(
-+ bdf, iommu, &new_rte,
-+ test_and_set_bit(pin,
-+ ioapic_bdf[IO_APIC_ID(apic)].pin_setup) ? &old_rte
-+ : NULL);
-
- /* Forward write access to IO-APIC RTE */
- __io_apic_write(apic, reg, value);
-@@ -373,6 +395,12 @@ void amd_iommu_msi_msg_update_ire(
- return;
- }
-
-+ if ( msi_desc->remap_index >= 0 )
-+ update_intremap_entry_from_msi_msg(iommu, pdev, msi_desc, NULL);
-+
-+ if ( !msg )
-+ return;
-+
- update_intremap_entry_from_msi_msg(iommu, pdev, msi_desc, msg);
- }
-
---- a/xen/drivers/passthrough/amd/pci_amd_iommu.c
-+++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c
-@@ -195,6 +195,8 @@ int __init amd_iov_detect(void)
- {
- printk("AMD-Vi: Not overriding irq_vector_map setting\n");
- }
-+ if ( !amd_iommu_perdev_intremap )
-+ printk(XENLOG_WARNING "AMD-Vi: Using global interrupt remap table
is not recommended (see XSA-36)!\n");
- return scan_pci_devices();
- }
-
---- a/xen/drivers/passthrough/iommu.c
-+++ b/xen/drivers/passthrough/iommu.c
-@@ -49,7 +49,7 @@ bool_t __read_mostly iommu_qinval = 1;
- bool_t __read_mostly iommu_intremap = 1;
- bool_t __read_mostly iommu_hap_pt_share;
- bool_t __read_mostly amd_iommu_debug;
--bool_t __read_mostly amd_iommu_perdev_intremap;
-+bool_t __read_mostly amd_iommu_perdev_intremap = 1;
-
- static void __init parse_iommu_param(char *s)
- {
-@@ -78,6 +78,8 @@ static void __init parse_iommu_param(cha
- amd_iommu_debug = 1;
- else if ( !strcmp(s, "amd-iommu-perdev-intremap") )
- amd_iommu_perdev_intremap = 1;
-+ else if ( !strcmp(s, "amd-iommu-global-intremap") )
-+ amd_iommu_perdev_intremap = 0;
- else if ( !strcmp(s, "dom0-passthrough") )
- iommu_passthrough = 1;
- else if ( !strcmp(s, "dom0-strict") )
---- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
-+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
-@@ -88,6 +88,11 @@ void amd_iommu_read_msi_from_ire(
- unsigned int amd_iommu_read_ioapic_from_ire(
- unsigned int apic, unsigned int reg);
-
-+extern struct ioapic_bdf {
-+ u16 bdf;
-+ unsigned long *pin_setup;
-+} ioapic_bdf[];
-+
- /* power management support */
- void amd_iommu_resume(void);
- void amd_iommu_suspend(void);
diff --git a/utils/xen/xsa-38.patch b/utils/xen/xsa-38.patch
deleted file mode 100644
index f4a5dc0..0000000
--- a/utils/xen/xsa-38.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff --git a/tools/ocaml/libs/xb/partial.ml b/tools/ocaml/libs/xb/partial.ml
-index 3558889..d4d1c7b 100644
---- a/tools/ocaml/libs/xb/partial.ml
-+++ b/tools/ocaml/libs/xb/partial.ml
-@@ -27,8 +27,15 @@ external header_size: unit -> int = "stub_header_size"
- external header_of_string_internal: string -> int * int * int * int
- = "stub_header_of_string"
-
-+let xenstore_payload_max = 4096 (* xen/include/public/io/xs_wire.h *)
-+
- let of_string s =
- let tid, rid, opint, dlen = header_of_string_internal s in
-+ (* A packet which is bigger than xenstore_payload_max is illegal.
-+ This will leave the guest connection is a bad state and will
-+ be hard to recover from without restarting the connection
-+ (ie rebooting the guest) *)
-+ let dlen = min xenstore_payload_max dlen in
- {
- tid = tid;
- rid = rid;
-@@ -38,6 +45,7 @@ let of_string s =
- }
-
- let append pkt s sz =
-+ if pkt.len > 4096 then failwith "Buffer.add: cannot grow buffer";
- Buffer.add_string pkt.buf (String.sub s 0 sz)
-
- let to_complete pkt =
-diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c
b/tools/ocaml/libs/xb/xs_ring_stubs.c
-index 00414c5..4888ac5 100644
---- a/tools/ocaml/libs/xb/xs_ring_stubs.c
-+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
-@@ -39,21 +39,23 @@ static int xs_ring_read(struct mmap_interface *interface,
- char *buffer, int len)
- {
- struct xenstore_domain_interface *intf = interface->addr;
-- XENSTORE_RING_IDX cons, prod;
-+ XENSTORE_RING_IDX cons, prod; /* offsets only */
- int to_read;
-
-- cons = intf->req_cons;
-- prod = intf->req_prod;
-+ cons = *(volatile uint32*)&intf->req_cons;
-+ prod = *(volatile uint32*)&intf->req_prod;
- xen_mb();
-+ cons = MASK_XENSTORE_IDX(cons);
-+ prod = MASK_XENSTORE_IDX(prod);
- if (prod == cons)
- return 0;
-- if (MASK_XENSTORE_IDX(prod) > MASK_XENSTORE_IDX(cons))
-+ if (prod > cons)
- to_read = prod - cons;
- else
-- to_read = XENSTORE_RING_SIZE - MASK_XENSTORE_IDX(cons);
-+ to_read = XENSTORE_RING_SIZE - cons;
- if (to_read < len)
- len = to_read;
-- memcpy(buffer, intf->req + MASK_XENSTORE_IDX(cons), len);
-+ memcpy(buffer, intf->req + cons, len);
- xen_mb();
- intf->req_cons += len;
- return len;
-@@ -66,8 +68,8 @@ static int xs_ring_write(struct mmap_interface *interface,
- XENSTORE_RING_IDX cons, prod;
- int can_write;
-
-- cons = intf->rsp_cons;
-- prod = intf->rsp_prod;
-+ cons = *(volatile uint32*)&intf->rsp_cons;
-+ prod = *(volatile uint32*)&intf->rsp_prod;
- xen_mb();
- if ( (prod - cons) >= XENSTORE_RING_SIZE )
- return 0;
diff --git a/utils/xen/xsa-41-1.patch b/utils/xen/xsa-41-1.patch
deleted file mode 100644
index 4ca750b..0000000
--- a/utils/xen/xsa-41-1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2c0331f4f7d241995452b99afaf0aab00493334a Mon Sep 17 00:00:00 2001
-From: Michael Contreras <michael AT inetric.com>
-Date: Wed, 5 Dec 2012 13:31:30 -0500
-Subject: [PATCH] e1000: Discard oversized packets based on SBP|LPE
-
-Discard packets longer than 16384 when !SBP to match the hardware behavior.
-
-Signed-off-by: Michael Contreras <michael AT inetric.com>
-Signed-off-by: Stefan Hajnoczi <stefanha AT redhat.com>
----
- hw/e1000.c | 7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index 92fb00a..8fd1654 100644
---- a/tools/ioemu-qemu-xen/hw/e1000.c
-+++ b/tools/ioemu-qemu-xen/hw/e1000.c
-@@ -61,6 +61,8 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
-
- /* this is the size past which hardware will drop packets when setting
LPE=0 */
- #define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-+/* this is the size past which hardware will drop packets when setting
LPE=1 */
-+#define MAXIMUM_ETHERNET_LPE_SIZE 16384
-
- /*
- * HW models:
-@@ -809,8 +811,9 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
- }
-
- /* Discard oversized packets if !LPE and !SBP. */
-- if (size > MAXIMUM_ETHERNET_VLAN_SIZE
-- && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
-+ if ((size > MAXIMUM_ETHERNET_LPE_SIZE ||
-+ (size > MAXIMUM_ETHERNET_VLAN_SIZE
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)))
- && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
- return size;
- }
---
-1.7.0.4
-
diff --git a/utils/xen/xsa-41.patch b/utils/xen/xsa-41.patch
deleted file mode 100644
index 64f60c5..0000000
--- a/utils/xen/xsa-41.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b0d9ffcd0251161c7c92f94804dcf599dfa3edeb Mon Sep 17 00:00:00 2001
-From: Michael Contreras <michael AT inetric.com>
-Date: Sun, 2 Dec 2012 20:11:22 -0800
-Subject: [PATCH] e1000: Discard packets that are too long if !SBP and !LPE
-
-The e1000_receive function for the e1000 needs to discard packets longer than
-1522 bytes if the SBP and LPE flags are disabled. The linux driver assumes
-this behavior and allocates memory based on this assumption.
-
-Signed-off-by: Michael Contreras <michael AT inetric.com>
-Signed-off-by: Anthony Liguori <aliguori AT us.ibm.com>
----
- hw/e1000.c | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git a/hw/e1000.c b/hw/e1000.c
-index cb7e7e8..5537ad2 100644
---- a/tools/ioemu-qemu-xen/hw/e1000.c
-+++ b/tools/ioemu-qemu-xen/hw/e1000.c
-@@ -59,6 +59,9 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
- #define PNPMMIO_SIZE 0x20000
- #define MIN_BUF_SIZE 60 /* Min. octets in an ethernet frame sans FCS */
-
-+/* this is the size past which hardware will drop packets when setting
LPE=0 */
-+#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
-+
- /*
- * HW models:
- * E1000_DEV_ID_82540EM works with Windows and Linux
-@@ -805,6 +808,13 @@ e1000_receive(NetClientState *nc, const uint8_t *buf,
size_t size)
- size = sizeof(min_buf);
- }
-
-+ /* Discard oversized packets if !LPE and !SBP. */
-+ if (size > MAXIMUM_ETHERNET_VLAN_SIZE
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
-+ && !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
-+ return size;
-+ }
-+
- if (!receive_filter(s, buf, size))
- return size;
-
---
-1.7.0.4
-
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index cca3b81..65210a5 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -4,6 +4,7 @@ persistent_remove QT_VER
SPELLX=qt-everywhere-opensource-src
VERSION=4.8.2

SOURCE_HASH=sha512:42c07c8c56c42e85241efa90fa7d1a757343a5cfcc1627bfd4a629f96885b83628a04ed911aa2250bc827f51207e61a2b52904102a6d249f10f5e708fad78b62
+ PATCHLEVEL=1
SOURCE=$SPELLX-$VERSION.tar.gz
SECURITY_PATCH=4
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 713ad6b..3acd495 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,8 @@
+2013-02-27 Sukneet Basuta <sukneet AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD, qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch:
+ patch to fix moc for builds that depend on BOOST 1.53
+
2012-06-02 Sukneet Basuta <sukneet AT sourcemage.org>
* CONFIGURE: add config_query to build webkit with or without
HTML5 video support
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index b62fd90..bbe2a7e 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -42,4 +42,7 @@ sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/
s:^#\s*::' \

if [[ $QT_WEBKIT_VIDEO == n ]]; then
sed -i '1iDEFINES += ENABLE_VIDEO=0'
src/3rdparty/webkit/Source/WebCore/WebCore.pro
-fi
+fi &&
+
+# fix moc for spells that depend on BOOST 1.53
+patch -p1 <
$SPELL_DIRECTORY/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
diff --git
a/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
new file mode 100644
index 0000000..fa82334
--- /dev/null
+++ b/x11-toolkits/qt4/qt-everywhere-opensource-src-4.8.4-QTBUG-22829.patch
@@ -0,0 +1,15 @@
+diff -up
qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148
qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp
+--- qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp.moc-boost148
2012-11-23 04:09:53.000000000 -0600
++++ qt-everywhere-opensource-src-4.8.4/src/tools/moc/main.cpp 2013-02-11
07:07:18.942748176 -0600
+@@ -187,6 +187,11 @@ int runMoc(int _argc, char **_argv)
+ Moc moc;
+ pp.macros["Q_MOC_RUN"];
+ pp.macros["__cplusplus"];
++
++ // Workaround a bugs while parsing some boost headers. See QTBUG-22829
++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"];
++ pp.macros["BOOST_LEXICAL_CAST_INCLUDED"];
++
+ QByteArray filename;
+ QByteArray output;
+ FILE *in = 0;

[SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (4373e294029fc81d666ba3e432f19e99f881bcf6), Vlad Glagolev, 06/25/2013