Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (ccd4101288b3491b91e2c17d2dfd8c37cdf5b262)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (ccd4101288b3491b91e2c17d2dfd8c37cdf5b262)
  • Date: Mon, 18 Feb 2013 09:03:28 -0600

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

VERSION | 2
chat-im/pidgin/DETAILS | 4
chat-im/pidgin/HISTORY | 6
crypto/gnutls/DEPENDS | 2
crypto/gnutls/DETAILS | 14
crypto/gnutls/HISTORY | 28
crypto/gnutls/PREPARE | 2
crypto/libssh/BUILD | 3
crypto/libssh/CONFIGURE | 1
crypto/libssh/DEPENDS | 3
crypto/libssh/DETAILS | 9
crypto/libssh/HISTORY | 7
crypto/nss/DETAILS | 9
crypto/nss/HISTORY | 9
crypto/nss/INSTALL | 6
crypto/nss/UP_TRIGGERS | 4
crypto/openssl/CONFIGURE | 5
crypto/openssl/DETAILS | 8
crypto/openssl/HISTORY | 7
database/mariadb/BUILD | 1
database/mariadb/HISTORY | 4
database/postgresql/DETAILS | 6
database/postgresql/HISTORY | 3
database/tdb/BUILD | 8
database/tdb/CONFIGURE | 6
database/tdb/CONFLICTS | 3
database/tdb/DETAILS | 5
database/tdb/HISTORY | 15
graphics-libs/gtkglext/DEPENDS | 12
graphics-libs/gtkglext/HISTORY | 6
graphics-libs/gtkglext/PRE_BUILD | 4
http/apache22/DEPENDS | 2
http/apache22/HISTORY | 3
kernels/linux/HISTORY | 21
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.62 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.63 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.64 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.0.65 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.2.38 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.29 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.30 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.31 | 5
kernels/linux/info/patches/maintenance_patches_3/patch-3.4.32 | 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/latest.defaults | 2
libs/apr/DETAILS | 4
libs/apr/HISTORY | 6
libs/boost/DETAILS | 5
libs/boost/HISTORY | 21
libs/boost/PRE_BUILD | 1
libs/boost/PRE_SUB_DEPENDS | 3
libs/boost/REPAIR^all^PRE_SUB_DEPENDS | 3
libs/boost/converter_policies_hpp.patch | 24
libs/talloc/CONFLICTS | 3
libs/talloc/DETAILS | 4
libs/talloc/HISTORY | 6
net/samba/CONFIGURE | 9
net/samba/CONFLICTS | 7
net/samba/DEPENDS | 30
net/samba/DETAILS | 7
net/samba/HISTORY | 28
net/samba/PRE_BUILD | 1
ruby-raa/ruby-1.9/DETAILS | 13
ruby-raa/ruby-1.9/HISTORY | 10
utils/dbus-glib/DETAILS | 5
utils/dbus-glib/HISTORY | 8
utils/xen/DETAILS | 2
utils/xen/HISTORY | 6
utils/xen/PRE_BUILD | 2
utils/xen/xsa-36.patch | 369
++++++++++
utils/xen/xsa-38.patch | 73 +
74 files changed, 851 insertions(+), 94 deletions(-)

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

VERSION: 0.61-18

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

boost: => 1_53_0 (SECURITY fix)
(cherry picked from commit b4dc4ee737c4acf6a46ec12c7aa256a349b1ba57)

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

boost: => 1_52_0
(cherry picked from commit 6e11b6e9fcbe75477b3169007e76a94eeed49c3c)

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

boost: => 1_51_0
(cherry picked from commit bf957f72bfaf054aa60f57992bca64822e8b39a1)

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

boost - fix SUB_DEPENDS python usage
(cherry picked from commit e99d3dec59be909e91bbc61265b1dfa904310a0b)

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

boost: => 1_50_0
(cherry picked from commit d582d2a2d823787036007a837a0d203ff19d06a5)

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

dbus-glib: => 0.100.1 SECURITY fix CVE-2013-0292
(cherry picked from commit f2750e125480a213e3e08193c6a1a4ce86e2e883)

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

dbus-glib 0.100
(cherry picked from commit 118e70ed55c64f8f5e6e0dc35aea71351fc693be)

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

xen: security update
(cherry picked from commit e9e817af9033fb56723e46a50778a4536448f64a)

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

linux: => 3.0.65 (lts)
(cherry picked from commit e3d64e96ee820fab46fc12ab586a43a840a95ac6)

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

linux: => 3.4.32 (lts)
(cherry picked from commit bd5eaf4f787a460e880afbcef4c00ab048f24aea)

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

linux: => 3.2.38 (lts)
(cherry picked from commit 1488b72859ca9f8ae97814740ea7a33cf38f98e0)

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

linux 3.7.9
(cherry picked from commit 3cce397666835598e32696b50f5c4a02086a3583)

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

linux 3.7.8
(cherry picked from commit a870afc363d68249bfef751902d2174002e128eb)

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

nss: don't overwrite OpenSSL's libssl.a static library
(cherry picked from commit 6485ee3691f08a431db3b8cfe50daa2f20cb1c77)

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

nss 3.14.2
(cherry picked from commit 553633a75b3f9166fcb40333d28763553e3d6c30)

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

pidgin 2.10.7, SECURITY_PATCH=16
(cherry picked from commit 822cc8dc55da8b1294b8a5afe4bae567c4fc4785)

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

pidgin 2.10.6
(cherry picked from commit 71df0dd368144c3059396d74da60e2b706b33221)

Conflicts:
chat-im/pidgin/HISTORY

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

linux 3.7.7
(cherry picked from commit 0ae8d4d60b15e6cd8f7e253ebd9bb07bf61fc223)

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

openssl: Remove TLSEXT option (See Bug #511)
(cherry picked from commit e4f8e99cb69862d1b4ec11da773b083ab55e298f)

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

libssh: => 0.5.4 SECURITY fix
(cherry picked from commit 70fe8d1cab12fd0191016c78c5e292bdd1ed1d30)

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

libssh - add libgcrypt support
(cherry picked from commit 6f6aadba343a08d62f1a2b36a8656c456fdd2cfc)

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

apache22: fixed requirement of LDAP subdependency in apr-util
(cherry picked from commit db3c839d8f3622373a02134abf4e3040ed0ea068)

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

apr: marked previous update a security one
(cherry picked from commit 301360b0af1b05476dd679e026efc07023dbe9a1)

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

libs/apr: version 1.4.6
(cherry picked from commit 0a0d30822dd8a7badcf2bf9fd7943d80808589ab)

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

gtkglext: added missing dependencies
(cherry picked from commit 4efbdd831a82b0847a1c5d124042338d85769f8e)

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

postgresql: => 9.1.8 (security)

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

ruby-1.9: => 1.9.3-p385 (security)
(cherry picked from commit 38bf6f8063a6436acf49d38602fef31d1f711ef3)

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

ruby-1.9: => 1.9.3-p374
(cherry picked from commit dbb7af1fca9bc15d1ceaf2341a5411c25b7682b6)

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

Revert "ruby-raa/ruby-1.9: add dependencies on libffi, libx11, tcl"

This reverts commit 345a734fe8d4f9b6a3ffd1eccc74da43f41110e4.

Ruby CAN'T DEPEND ON Xorg server/library
(cherry picked from commit eb3adbecb4902b004c6c718c0acd3f902944db6b)

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

ruby-raa/ruby-1.9: add dependencies on libffi, libx11, tcl
(cherry picked from commit 345a734fe8d4f9b6a3ffd1eccc74da43f41110e4)

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

ruby-1.9: => 1.9.3-p362
(cherry picked from commit 838bea2c10e6451923f8c3213959f8ecafe848df)

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

gnutls: Removed patches, no longer needed for 2.12.23 (Bug #509)

PRE_BUILD, gets.patch, x509.patch: Removed, not needed in 2.12.23
(Bug #509)
(cherry picked from commit e85ccf70a1e6ec193813ef7e62b2da900cbc2f04)

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

gnutls: Fix typo for "2.12" -> "x2.12" (part of Bug #509)
(cherry picked from commit 929ae06a5175c9a243ec6bcd66dac16de133ff4d)

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

gnutls 3.1.7, 3.0.28 and 2.12.23, SECURITY_PATCH=8
(cherry picked from commit da7cf43c26c7baf332a2ef7b322cb5343bce2a5c)

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

gnutls: Apply gets.patch/x509.patch for DEFAULT/2.12 branch (Bug #493)
* gets.patch: Fix gets() removal from glibc 2.16 (Bug #493)
* x509.patch: Fix x509 compilation (found after Bug #493 fixed)
(cherry picked from commit e264a23ccfecb32f487f9a55474e686cf8c4e703)

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

gnutls: => 3.1.5
(cherry picked from commit 38e0e068695be3bc0c08fa570b9c99c21f1752b4)

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

crypto/gnutls update WEB_SITE
(cherry picked from commit 638b0424faf16714b87b95b83a05cd9291cf8af0)

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

gnutls 2.12.20 & 3.0.21
(cherry picked from commit 5b868862df35a2b4b4178efdc0cfa35dfe5d97d1)

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

gnutls 3.0.20
(cherry picked from commit 21a6991e5f839e7ab655ff5973afe2bb4e7163ac)

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

openssl 0.9.8y, 1.0.0k, SECURITY_PATCH=20
(cherry picked from commit 34e5ddfe02ec4c2a00be7488ded9c3be2fd548c4)

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

linux 3.7.6
(cherry picked from commit 956778c626813bb11971abeb3dd40a4b6492110b)

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

talloc: fixed conflict with samba's internal lib
(cherry picked from commit dbd88ddf56223ffbc87d63b2c92f429cb723c60f)

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

talloc: => 2.0.8
(cherry picked from commit 6df6a27ed475ae18b3612b5e23f5d469903b0c03)

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

tdb: fixed conflict with samba's internal lib
(cherry picked from commit 4de64596b35689c1e0ff7f976d98ab3ad3d1eaa2)

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

tdb: added FTP mirror
(cherry picked from commit 7670ca8163d001463a7cb9d1304718fe8eb57edd)

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

tdb: => 1.2.11
(cherry picked from commit 568970869a4d9f6a50f623127490538dc56b9f61)

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

tdb: added special options for compiling
(cherry picked from commit fa86bcaa5072f9cb50b903f1bea87481fbae8932)

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

tdb: => 1.2.10
(cherry picked from commit 0b35d44047ba3227c83c818f7188c63854bda38f)

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

samba: => 3.6.12 (security)
(cherry picked from commit 3e01ebe09a36d4d6fb2b45b40a35c2b58d680c88)

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

samba: handle conflicts more precisely
(cherry picked from commit 1b8ea892f36b7f74ac3b46a5684cf330d67b9d20)

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

samba: fixed conflicts with tdb and talloc
(cherry picked from commit df614947e72ee50539e06fb4fd1ecd4f6d57b647)

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

samba: => 3.6.11
(cherry picked from commit 9b0e8b55eec1cd1785e18d2dc3193856a10751c4)

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

samba 3.6.10
(cherry picked from commit 140f49870e6053932528da409fd7958f0d6d35ed)

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

samba: => 3.6.9
(cherry picked from commit 41763278eac7a1d0f384317d5ad70deb86f01ec0)

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

samba 3.6.8
(cherry picked from commit aea8c7e42f4b0a44d0f84411191cbff8a0a5b0f6)

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

samba 3.6.7
(cherry picked from commit b3e958ee49d97d3199e8a8ac10a5cc453a24b965)

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

samba: fixed build with cups 1.6
(cherry picked from commit 882d3feb5323ca0243512b9b51d9a108febf5378)

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

samba 3.6.6
(cherry picked from commit cff4500ee974367a87e38916012d37079013a080)

Conflicts:
net/samba/DETAILS
net/samba/HISTORY

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

mariadb: build with -with-readline
until system readline support fixed.

On my box, it kept trying to build with system readline until
-with-readline was specified.
(cherry picked from commit 2ff788f127b83685c8c5608ad3c07c33278fe054)

diff --git a/VERSION b/VERSION
index 87f86a4..1a06790 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.61-17
+0.61-18
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index 24cc5ca..fc19a7b 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
SPELL=pidgin
- VERSION=2.10.5
- SECURITY_PATCH=15
+ VERSION=2.10.7
+ SECURITY_PATCH=16
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index 7e5c07a..9292f8b 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2013-02-14 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.7, SECURITY_PATCH=16
+
2012-10-16 Eric Sandall <sandalle AT sourcemage.org>
* BUILD: endif -> fi

@@ -7,6 +10,9 @@
2012-07-15 Sukneet Basuta <sukneet AT sourcemage.org>
* DEPENDS: removed optional-depends howl

+2012-07-08 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.10.6
+
2012-07-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.10.5, SECURITY_PATCH=15

diff --git a/crypto/gnutls/DEPENDS b/crypto/gnutls/DEPENDS
index 41d38c6..83c5712 100755
--- a/crypto/gnutls/DEPENDS
+++ b/crypto/gnutls/DEPENDS
@@ -1,6 +1,6 @@
depends libgcrypt "--with-libgcrypt" &&

-if [[ $GNUTLS_BRANCH == "3.0" ]];then
+if [[ $GNUTLS_BRANCH == "3.0" ]] || [[ $GNUTLS_BRANCH == "3.1" ]];then
depends LZMA &&
depends nettle
fi &&
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 46806d8..e9c2c17 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -43,23 +43,27 @@ case $GNUTLS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.bz2
;;
2.12)
- VERSION=2.12.14
+ VERSION=2.12.23
SOURCE=$SPELL-$VERSION.tar.bz2
;;
3.0)
- VERSION=3.0.19
+ VERSION=3.0.28
+ SOURCE=$SPELL-$VERSION.tar.xz
+ ;;
+ 3.1)
+ VERSION=3.1.7
SOURCE=$SPELL-$VERSION.tar.xz
;;
esac

SOURCE2=$SOURCE.sig
- SECURITY_PATCH=7
+ SECURITY_PATCH=8
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
+ SOURCE_URL[0]=ftp://ftp.gnutls.org/gcrypt/gnutls/v$GNUTLS_BRANCH/$SOURCE
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE_GPG=gnu.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
- WEB_SITE=http://www.gnu.org/software/gnutls/
+ WEB_SITE=http://www.gnutls.org/
LICENSE[0]=LGPL
LICENSE[1]=GPL
ENTERED=20030829
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index 095aec8..8f9658d 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,31 @@
+2013-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Fix typo for "2.12" -> "x2.12" (part of Bug #509)
+ * PRE_BUILD, gets.patch, x509.patch: Removed, not needed in 2.12.23
+ (Bug #509)
+
+2013-02-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.1.7, 3.0.28 and 2.12.23, SECURITY_PATCH=8
+ SOURCE_URL[0] updated, no more GNU project
+
+2013-01-04 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gets.patch and x509.patch for DEFAULT and 2.12
branch
+ * gets.patch: Fix gets() removal from glibc 2.16 (Bug #493)
+ * x509.patch: Fix x509 compilation (found after Bug #493 fixed)
+
+2012-12-29 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: 3.1,5
+ * PREPARE: add new branch 3.1
+ * DEPENDS: test for 3.1 branch
+
+2012-12-23 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: updated WEB_SITE
+
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.12.20 & 3.0.21
+
+2012-06-06 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.0.20
+
2012-04-22 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.0.19

diff --git a/crypto/gnutls/PREPARE b/crypto/gnutls/PREPARE
index 02d7781..afbc189 100755
--- a/crypto/gnutls/PREPARE
+++ b/crypto/gnutls/PREPARE
@@ -13,4 +13,4 @@ if [ "$GNUTLS_OLD" == "n" ]; then
persistent_remove GNUTLS_OLD
fi

-config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to
build?" DEFAULT 2.2 2.4 2.6 2.8 2.10 2.12 3.0
+config_query_list GNUTLS_BRANCH "Which branch of GnuTLS do you want to
build?" DEFAULT 2.2 2.4 2.6 2.8 2.10 2.12 3.0 3.1
diff --git a/crypto/libssh/BUILD b/crypto/libssh/BUILD
index e013b8d..a1c4818 100755
--- a/crypto/libssh/BUILD
+++ b/crypto/libssh/BUILD
@@ -1 +1,4 @@
+if [[ "$SSH_CRYPTO" == libgcrypt ]];then
+ OPTS+=" -DWITH_GCRYPT=1"
+fi &&
cmake_build
diff --git a/crypto/libssh/CONFIGURE b/crypto/libssh/CONFIGURE
new file mode 100755
index 0000000..ed632b2
--- /dev/null
+++ b/crypto/libssh/CONFIGURE
@@ -0,0 +1 @@
+config_query_list SSH_CRYPTO "which crypto library" libgcrypt openssl
diff --git a/crypto/libssh/DEPENDS b/crypto/libssh/DEPENDS
index d371237..323d272 100755
--- a/crypto/libssh/DEPENDS
+++ b/crypto/libssh/DEPENDS
@@ -1,2 +1,3 @@
depends cmake &&
-depends openssl
+depends zlib &&
+depends $SSH_CRYPTO
diff --git a/crypto/libssh/DETAILS b/crypto/libssh/DETAILS
index 54f57f6..c5b58ab 100755
--- a/crypto/libssh/DETAILS
+++ b/crypto/libssh/DETAILS
@@ -1,12 +1,11 @@
SPELL=libssh
- VERSION=0.5.3
-
SOURCE_HASH=sha512:67cc023a9c5f7da02af378e9be14b720a81074dfff3a9115a061925ba2244a7f508e122c10b229dc831fc8015e3d58616284f3c46d7060721d61d49a3ca94d7e
- SECURITY_PATCH=2
+ VERSION=0.5.4
+
SOURCE_HASH=sha512:1d854ee05e62e9e04ac704bc99a60b6f88237078b728e50e3e0f1142fbc5d1a4b4d04d675f257491c82c8b222b97db7a7f8e243f4a0f723e82788ecef3a7a71d
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=https://red.libssh.org/attachments/download/38/$SOURCE
-# SOURCE2_URL[0]=https://red.libssh.org/attachments/download/37/$SOURCE2
+ SOURCE_URL[0]=https://red.libssh.org/attachments/download/41/$SOURCE
SOURCE_HINTS[0]="no-check-certificate"
#SOURCE2_HINTS[0]="no-check-certificate"
WEB_SITE=http://www.libssh.org/
diff --git a/crypto/libssh/HISTORY b/crypto/libssh/HISTORY
index d9575e6..4d17e2b 100644
--- a/crypto/libssh/HISTORY
+++ b/crypto/libssh/HISTORY
@@ -1,3 +1,10 @@
+2013-02-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.5.4
+ SECURITY_PATCH++, fixes CVE-2013-0176
+
+2013-01-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * CONFIGURE, BUILD, DEPENDS: add libgcrypt support
+
2012-11-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.5.3
SECURITY_PATCH++
diff --git a/crypto/nss/DETAILS b/crypto/nss/DETAILS
index d5a4d41..927790b 100755
--- a/crypto/nss/DETAILS
+++ b/crypto/nss/DETAILS
@@ -10,11 +10,12 @@ case $NSS_BRANCH in
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_HASH=sha512:2fe9eafe99c64c57503739cabcd58f8aac29c1f353379c4072c183c0bf0dee3fc7147120ad0fc8fef4dc6fdae542e5068ffca0a7e7d0bcf99d23500d49e9dc35
- PATCHLEVEL=1
+ PATCHLEVEL=2
;;
3.12)
VERSION=3.12.11
SECURITY_PATCH=3
+ PATCHLEVEL=1
# FFVERSION=3.6.2
# SOURCE=$SPELL-$VERSION.tar.gz
SOURCE=nss-3.12.11.with.ckbi.1.88.tar.gz
@@ -30,15 +31,17 @@ case $NSS_BRANCH in
;;
3.13)
VERSION=3.13.6
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE

SOURCE_HASH=sha512:45bc254eb238ea23fdd8d2c9128a22cebe15fda9ed5c9c1d112b5756d4d2b76e7f3a99d3600254bdcd6eeb18bda224d52e676e169207193798200f0d41baa29d
;;
3.14)
- VERSION=3.14.1
+ VERSION=3.14.2
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${VERSION//./_}_RTM/src/$SOURCE
-
SOURCE_HASH=sha512:f62a7ebcdade8815379f80929c63de1284c3ca3f5c87214cb5b327f6689635118d301969d4ef0e1940c7a426253b13ce54acd68a91abc23ab32626341217580e
+
SOURCE_HASH=sha512:65303f09ef09900512da8d19f7f35f50ef07926256bc5b548a665b5f2ea82bf02548bc8464e0f3723014f3f0f3d2e908faf9ef82b564be21adb7da7f5295e137
;;
esac

diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 744dff2..12f3f16 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,12 @@
+2013-02-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * INSTALL: don't overwrite OpenSSL's libssl.a static library; renamed
+ libssl.a -> libssl3.a (according to installed libssl3.so shared lib)
+ * UP_TRIGGERS: added, for correct repairing sequence
+
+2013-02-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.14.2
+
2013-01-15 Vlad Glagolev <stealth AT sourcemage.org>
* SUB_DEPENDS: corrected message about 3.14 branch

diff --git a/crypto/nss/INSTALL b/crypto/nss/INSTALL
index e1721e0..5b816d2 100755
--- a/crypto/nss/INSTALL
+++ b/crypto/nss/INSTALL
@@ -1,4 +1,10 @@
cd $SOURCE_DIRECTORY/mozilla/dist &&
+
+# don't overwrite OpenSSL's libssl.a static library
+cd */lib &&
+mv -v libssl.a libssl3.a &&
+cd $SOURCE_DIRECTORY/mozilla/dist &&
+
install -v -d -m755 $INSTALL_ROOT/usr/lib/nss &&
install -v -d -m755 $INSTALL_ROOT/usr/include/nss &&
install -v -m755 */lib/*.so $INSTALL_ROOT/usr/lib &&
diff --git a/crypto/nss/UP_TRIGGERS b/crypto/nss/UP_TRIGGERS
new file mode 100755
index 0000000..9492e49
--- /dev/null
+++ b/crypto/nss/UP_TRIGGERS
@@ -0,0 +1,4 @@
+if spell_ok openssl && [[ ! -f $INSTALL_ROOT/usr/lib/libssl.a ]] || \
+ spell_ok $SPELL && [[ ! -f $INSTALL_ROOT/usr/lib/libssl3.a ]]; then
+ up_trigger openssl cast_self
+fi
diff --git a/crypto/openssl/CONFIGURE b/crypto/openssl/CONFIGURE
index 9f28015..9ff1556 100755
--- a/crypto/openssl/CONFIGURE
+++ b/crypto/openssl/CONFIGURE
@@ -5,6 +5,5 @@ message "broken installation. You are advised to disable it."
&&
config_query OPENSSL_SSE "Are you sure you want to enable SSE support?" n
fi &&

-config_query_option OPENSSL_TLSEXT "Enable TLS extensions ?" y \
- "enable-tlsext" \
- "disable-tlsext"
+# Broken in 0.9.8y, remove option (Bug #511)
+persistent_remove OPENSSL_TLSEXT
diff --git a/crypto/openssl/DETAILS b/crypto/openssl/DETAILS
index 9c5aa04..bffbc7d 100755
--- a/crypto/openssl/DETAILS
+++ b/crypto/openssl/DETAILS
@@ -6,12 +6,12 @@ fi

case $OPENSSL_BRANCH in
0.9)
- VERSION=0.9.8x
- SECURITY_PATCH=19
+ VERSION=0.9.8y
+ SECURITY_PATCH=20
;;
1.0)
- VERSION=1.0.0j
- SECURITY_PATCH=19
+ VERSION=1.0.0k
+ SECURITY_PATCH=20
PATCHLEVEL=0
;;
esac
diff --git a/crypto/openssl/HISTORY b/crypto/openssl/HISTORY
index 7fcc22c..dc4115c 100644
--- a/crypto/openssl/HISTORY
+++ b/crypto/openssl/HISTORY
@@ -1,3 +1,10 @@
+2013-02-11 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFIGURE: Remove TLSEXT option (See Bug #511)
+
+2013-02-05 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.8y, 1.0.0k, SECURITY_PATCH=20
+ http://www.openssl.org/news/secadv_20130205.txt
+
2012-06-09 Vlad Glagolev <stealth AT sourcemage.org>
* UP_TRIGGERS: don't go below spell_ok if it fails check

diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index 072a7d9..b0c48e8 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -18,6 +18,7 @@ OPTS="--with-mysqld-user=mariadb \
--localstatedir=${INSTALL_ROOT}/var/lib/mariadb \
--enable-assembler \
--enable-thread-safe-client \
+ --with-readline \
$OPTS" &&

default_build &&
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index a383711..c7a801d 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,7 @@
+2013-02-01 Sukneet Basuta <sukneet AT sourcemage.org>
+ * BUILD: build with -with-readline until system readline support
+ fixed
+
2013-02-01 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.2.14; SECURITY_PATCH++

diff --git a/database/postgresql/DETAILS b/database/postgresql/DETAILS
index c0dfdec..9e4b3c7 100755
--- a/database/postgresql/DETAILS
+++ b/database/postgresql/DETAILS
@@ -1,6 +1,6 @@
SPELL=postgresql
- VERSION=9.1.6
-
SOURCE_HASH=sha512:80fbb62734ac20a500ef9f0a307543011a376c3162304cd8996cba3ea4aba32681dfa556ba06450bdc400971efb65cc9ce2635844950e4f6f31badaa93fe25a4
+ VERSION=9.1.8
+
SOURCE_HASH=sha512:7e4dc17fda40dcc8117d750866aa52e950e52c5d50f7b10c2f01fb4a5fd6f09ec5000d0977a0636e047185cf0de3f6f5e41eb61ac6e20a6ac39bdeae452de4af
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=12
+ SECURITY_PATCH=13
ENTERED=20011113
LICENSE[0]=BSD
KEYWORDS="database"
diff --git a/database/postgresql/HISTORY b/database/postgresql/HISTORY
index f8e437b..63cd601 100644
--- a/database/postgresql/HISTORY
+++ b/database/postgresql/HISTORY
@@ -1,3 +1,6 @@
+2013-02-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 9.1.8; SECURITY_PATCH++
+
2012-10-03 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 9.1.6

diff --git a/database/tdb/BUILD b/database/tdb/BUILD
index d716b62..205b08d 100755
--- a/database/tdb/BUILD
+++ b/database/tdb/BUILD
@@ -1,3 +1,11 @@
OPTS="$TDB_OPTS $OPTS" &&

+if [[ $TDB_MMAP == y ]]; then
+ CFLAGS="-DHAVE_MMAP=1 $CFLAGS"
+fi &&
+
+if [[ $TDB_NOLOCK == y ]]; then
+ CFLAGS="-DNOLOCK=1 $CFLAGS"
+fi &&
+
default_build
diff --git a/database/tdb/CONFIGURE b/database/tdb/CONFIGURE
index 28acc73..7cb0d5c 100755
--- a/database/tdb/CONFIGURE
+++ b/database/tdb/CONFIGURE
@@ -1,2 +1,6 @@
config_query_option TDB_OPTS "Build pytdb module?" y \
- "" "--disable-python"
+ "" "--disable-python" &&
+
+config_query TDB_MMAP "Use mmap instead of read/write?" n &&
+
+config_query TDB_NOLOCK "Disable locking code?" n
diff --git a/database/tdb/CONFLICTS b/database/tdb/CONFLICTS
new file mode 100755
index 0000000..125f2d3
--- /dev/null
+++ b/database/tdb/CONFLICTS
@@ -0,0 +1,3 @@
+if ! is_depends_enabled samba tdb; then
+ conflicts samba
+fi
diff --git a/database/tdb/DETAILS b/database/tdb/DETAILS
index afcd94a..ed67f15 100755
--- a/database/tdb/DETAILS
+++ b/database/tdb/DETAILS
@@ -1,11 +1,12 @@
SPELL=tdb
- VERSION=1.2.9
+ VERSION=1.2.11
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.asc
SOURCE_URL[0]=http://samba.org/ftp/$SPELL/$SOURCE
+ SOURCE_URL[1]=ftp://ftp.samba.org/pub/$SPELL/$SOURCE
# SOURCE2_URL[0]=$SOURCE_URL.asc
# SOURCE_GPG=jelmer.gpg:$SOURCE2:UPSTREAM_KEY
-
SOURCE_HASH=sha512:f267d8bb7a3db2dbacfe854cad7cd37c0045ccd97acfe5ed374ea4baa35968f93bf3ae7f64311610d891607c6810e622e61a590bdaffcea7697f4ee93540ec9a
+
SOURCE_HASH=sha512:fba47db71d0a28eb38cac44a7aa5796d9ee54ab7a9fff3b5a88f9c305cbfb6580173a2cbe3a3ea3484ff0d366b7bc79be78512183216c484246688de5843d3bc
# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
LICENSE[0]=GPL
diff --git a/database/tdb/HISTORY b/database/tdb/HISTORY
index 7c9833d..89709a1 100644
--- a/database/tdb/HISTORY
+++ b/database/tdb/HISTORY
@@ -1,3 +1,18 @@
+2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: conflicts with samba's internal lib
+
+2012-12-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: added FTP mirror
+
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.11
+
+2012-08-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFIGURE, BUILD: added special options for compiling
+
+2012-05-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.2.10
+
2011-01-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.2.9
* DEPENDS: python is required to build now (used by WAF); added
missing
diff --git a/graphics-libs/gtkglext/DEPENDS b/graphics-libs/gtkglext/DEPENDS
index a0e80ef..e44fc7b 100755
--- a/graphics-libs/gtkglext/DEPENDS
+++ b/graphics-libs/gtkglext/DEPENDS
@@ -1 +1,11 @@
-depends gtk+2
+depends gtk+2 &&
+depends -sub X pango &&
+depends pangox-compat &&
+depends libx11 &&
+depends libxext &&
+depends OPENGL &&
+
+optional_depends gtk-doc \
+ "--enable-gtk-doc" \
+ "--disable-gtk-doc" \
+ "to build documentation"
diff --git a/graphics-libs/gtkglext/HISTORY b/graphics-libs/gtkglext/HISTORY
index d7e3b5f..6ddff5a 100644
--- a/graphics-libs/gtkglext/HISTORY
+++ b/graphics-libs/gtkglext/HISTORY
@@ -1,3 +1,9 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing pangox-compat dependency (reported by wich@);
+ added other missing required and optional dependencies
+ * PRE_BUILD: apply a patch only if nvidia-like OpenGL implementation
was
+ selected
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)

diff --git a/graphics-libs/gtkglext/PRE_BUILD
b/graphics-libs/gtkglext/PRE_BUILD
index 33df339..4f81fda 100755
--- a/graphics-libs/gtkglext/PRE_BUILD
+++ b/graphics-libs/gtkglext/PRE_BUILD
@@ -1,7 +1,9 @@
mk_source_dir $SOURCE_DIRECTORY &&
unpack_file &&
cd $SOURCE_DIRECTORY &&
-if spell_ok nvidia_driver; then
+
+if echo $(get_spell_provider $SPELL OPENGL) | grep -Eq "^nvidia_"; then
patch -p0 < $SCRIPT_DIRECTORY/glext.h.diff
fi &&
+
sedit "s/-DGTK_DISABLE_DEPRECATED//" gtk/Makefile.in
diff --git a/http/apache22/DEPENDS b/http/apache22/DEPENDS
index 46d5d82..4bcae3c 100755
--- a/http/apache22/DEPENDS
+++ b/http/apache22/DEPENDS
@@ -1,7 +1,7 @@
depends apr &&
depends apr-util &&

-if list_find "$OPTS" "ldap"; then
+if echo "$OPTS" | grep -Eq "enable-(authnz-)?ldap"; then
depends -sub LDAP apr-util
fi &&

diff --git a/http/apache22/HISTORY b/http/apache22/HISTORY
index 20c3e79..7e4396d 100644
--- a/http/apache22/HISTORY
+++ b/http/apache22/HISTORY
@@ -1,3 +1,6 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: fixed requirement of LDAP subdependency in apr-util
+
2012-09-20 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.23; SECURITY_PATCH++
* PRE_BUILD, pcre830.patch: dropped, fixed by upstream
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index bcd6adc..8ea2a25 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,24 @@
+2013-02-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * info/patches/maintenance_patches_3/patch-3.0.{62-65}: added
+ * info/patches/maintenance_patches_3/patch-3.2.38: added
+ * info/patches/maintenance_patches_3/patch-3.4.{29-32}: added
+
+2013-02-17 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.7.9
+ * info/patches/maintenance_patches_3/patch-3.7.9: added
+
+2013-02-16 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.7.8
+ * info/patches/maintenance_patches_3/patch-3.7.8: added
+
+2013-02-12 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.7.7
+ * info/patches/maintenance_patches_3/patch-3.7.7: added
+
+2013-02-04 Ladislav Hagara <hgr AT vabo.cz>
+ * latest.defaults: LATEST_maintenance_patches_3=patch-3.7.6
+ * info/patches/maintenance_patches_3/patch-3.7.6: added
+
2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
* info/patches/maintenance_patches_3/patch-3.0.{59-61}: added
* info/patches/maintenance_patches_3/patch-3.4.{26-28}: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.62
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.62
new file mode 100755
index 0000000..f40670a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.62
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.62"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="0604a0fe234091cc8fe092abb6dcd3f2c507d676"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.63
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.63
new file mode 100755
index 0000000..1997d6a
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.63
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.63"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="c5c9b52157ffed9770dda8cbf6245dfef7a0d1c2"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.64
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.64
new file mode 100755
index 0000000..49c069d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.64
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.64"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="37ff6cb8e15285b4eb6bf35208a298750203bb82"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.65
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.65
new file mode 100755
index 0000000..e38e6c8
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.65
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.65"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="7402af2b99445b89c4edf6c3db85d213f695d684"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.38
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.38
new file mode 100755
index 0000000..0614615
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.2.38
@@ -0,0 +1,5 @@
+appliedkernels="3.2"
+patchversion="${appliedkernels}.38"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="2f8d9ec5d2e7e7c637e7826ce2171eb0577e7580"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.29
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.29
new file mode 100755
index 0000000..8f35d2c
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.29
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.29"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="0723bcb3700f5b94bb2a5ccbff314857ad6a7f6a"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.30
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.30
new file mode 100755
index 0000000..64470e9
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.30
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.30"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="8ee54746192c4e404da1a4f42fc4c9f77370ad48"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.31
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.31
new file mode 100755
index 0000000..a1b35d6
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.31
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.31"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="4830b2b8a68b19db3adf3f2f856d18e39b31c442"
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.32
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.32
new file mode 100755
index 0000000..cc47a71
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.4.32
@@ -0,0 +1,5 @@
+appliedkernels="3.4"
+patchversion="${appliedkernels}.32"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="53adc3d8c146a26b428974ed0ed0767445f93df1"
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
new file mode 100755
index 0000000..bbb26f0
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.6
@@ -0,0 +1,5 @@
+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
new file mode 100755
index 0000000..93d080d
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.7
@@ -0,0 +1,5 @@
+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
new file mode 100755
index 0000000..ca136b0
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.8
@@ -0,0 +1,5 @@
+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
new file mode 100755
index 0000000..b9cac28
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.7.9
@@ -0,0 +1,5 @@
+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/latest.defaults b/kernels/linux/latest.defaults
index 7e6a7cc..4e90fae 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.7
LATEST_2_6=2.6.39
LATEST_PRE_2_6=patch-2.6.39
LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.7.5
+LATEST_maintenance_patches_3=patch-3.7.9
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/apr/DETAILS b/libs/apr/DETAILS
index c4e60c0..ba7cbb1 100755
--- a/libs/apr/DETAILS
+++ b/libs/apr/DETAILS
@@ -1,6 +1,6 @@
SPELL=apr
- VERSION=1.4.5
- SECURITY_PATCH=1
+ VERSION=1.4.6
+ SECURITY_PATCH=2
REPOS_URI="branches/${VERSION%.*}.x"
# APR_LATEST replaces APR_CVS; remove APR_CVS in May, 2005
if [[ "${APR_LATEST:-APR_CVS}" == y ]]; then
diff --git a/libs/apr/HISTORY b/libs/apr/HISTORY
index 9449ae5..001a7c1 100644
--- a/libs/apr/HISTORY
+++ b/libs/apr/HISTORY
@@ -1,3 +1,9 @@
+2013-02-10 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: this was a security update (oCERT-2011-003),
SECURITY_PATCH++
+
+2012-12-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.4.6
+
2011-05-22 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.4.5; SECURITY_PATCH++

diff --git a/libs/boost/DETAILS b/libs/boost/DETAILS
index a0523c1..61dcd9b 100755
--- a/libs/boost/DETAILS
+++ b/libs/boost/DETAILS
@@ -1,6 +1,7 @@
SPELL=boost
- VERSION=1_49_0
-
SOURCE_HASH=sha512:9f6198270659df112a57731afe31cbf1012d103ba36ed82f6c3f1bdc0185ddb89dcc42c5dfb9ee3f95973d52999aad6c7509dc61125420d45146e39ebf20219d
+ VERSION=1_53_0
+
SOURCE_HASH=sha512:8cd7806653cb6ea4a1c6862796ef698de5ae0bdbda96954fedbe090c59e3e6cb8f8d385df35183e9063ac4e2c2fccf10744516c47a994cde5f1d1cba1b07e522
+ SECURITY_PATCH=1
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE=${SPELL}_${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}_${VERSION}
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 5d0a681..112ceca 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,24 @@
+2013-02-07 Treeeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1_53_0
+ SECURITY_PATCH=1
+ boost::locale::utf::utf_traits accepted some invalid UTF-8 sequences
+
+2012-11-27 Treeeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1_52_0
+ NB: important change to boost::result_of
+
<http://www.boost.org/users/news/a_special_note_for_boost_1_52_0_and_higher.html>
+
+2012-08-03 Treeeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1_51_0
+
+2012-09-02 Treeeve Jelbert <treeve AT sourcemage.org>
+ * *PRE_SUB_DEPENDS: fix python||python3 usage
+
+2012-07-10 Treeeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1_50_0
+ * converter_policies_hpp.patch: deleted
+ * PRE_BUILD: do not apply patch
+
2012-04-23 Treeeve Jelbert <treeve AT sourcemage.org>
* DEPENDS, *SUB_DEPENDS: python => PYTHON
* PRE_BUILD: fix detection of python3
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index 5bdb55c..c70df8d 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -2,7 +2,6 @@ default_pre_build &&
message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
$SCRIPT_DIRECTORY/boost-use-cxxflags.patch &&
-patch -p1 -d $SOURCE_DIRECTORY <
$SCRIPT_DIRECTORY/converter_policies_hpp.patch &&

if is_depends_enabled $SPELL python3;then
cd $SOURCE_DIRECTORY &&
diff --git a/libs/boost/PRE_SUB_DEPENDS b/libs/boost/PRE_SUB_DEPENDS
index a363c9a..81d619c 100755
--- a/libs/boost/PRE_SUB_DEPENDS
+++ b/libs/boost/PRE_SUB_DEPENDS
@@ -12,7 +12,8 @@ case $THIS_SUB_DEPENDS in
IOSTREAMS) list_find "$BOOST_LIBS_AL" iostreams ;;
RANDOM) list_find "$BOOST_LIBS_MZ" random ;;
SIGNALS) list_find "$BOOST_LIBS_MZ" signals ;;
- PYTHON) is_depends_enabled $SPELL PYTHON ;;
+ PYTHON) is_depends_enabled $SPELL python ||
+ is_depends_enabled $SPELL python3 ;;
SYSTEM) list_find "$BOOST_LIBS_MZ" system ;;
THREAD) list_find "$BOOST_LIBS_MZ" thread ;;
CHRONO) list_find "$BOOST_LIBS_AL" chrono ;;
diff --git a/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
b/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
index a363c9a..81d619c 100755
--- a/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
+++ b/libs/boost/REPAIR^all^PRE_SUB_DEPENDS
@@ -12,7 +12,8 @@ case $THIS_SUB_DEPENDS in
IOSTREAMS) list_find "$BOOST_LIBS_AL" iostreams ;;
RANDOM) list_find "$BOOST_LIBS_MZ" random ;;
SIGNALS) list_find "$BOOST_LIBS_MZ" signals ;;
- PYTHON) is_depends_enabled $SPELL PYTHON ;;
+ PYTHON) is_depends_enabled $SPELL python ||
+ is_depends_enabled $SPELL python3 ;;
SYSTEM) list_find "$BOOST_LIBS_MZ" system ;;
THREAD) list_find "$BOOST_LIBS_MZ" thread ;;
CHRONO) list_find "$BOOST_LIBS_AL" chrono ;;
diff --git a/libs/boost/converter_policies_hpp.patch
b/libs/boost/converter_policies_hpp.patch
deleted file mode 100644
index 4065b21..0000000
--- a/libs/boost/converter_policies_hpp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 1.1/boost/numeric/conversion/converter_policies.hpp 2009-07-13
14:41:34 +01:00
-+++ edited/boost/numeric/conversion/converter_policies.hpp 2011-01-14
12:06:18 +00:00
-@@ -21,6 +21,8 @@
- #include "boost/mpl/if.hpp"
- #include "boost/mpl/integral_c.hpp"
-
-+#include "boost/throw_exception.hpp"
-+
- namespace boost { namespace numeric
- {
-
-@@ -159,9 +161,9 @@
- void operator() ( range_check_result r ) //
throw(negative_overflow,positive_overflow)
- {
- if ( r == cNegOverflow )
-- throw negative_overflow() ;
-+ boost::throw_exception(negative_overflow()) ;
- else if ( r == cPosOverflow )
-- throw positive_overflow() ;
-+ boost::throw_exception(positive_overflow()) ;
- }
- } ;
-
-
diff --git a/libs/talloc/CONFLICTS b/libs/talloc/CONFLICTS
new file mode 100755
index 0000000..1f6fb26
--- /dev/null
+++ b/libs/talloc/CONFLICTS
@@ -0,0 +1,3 @@
+if ! is_depends_enabled samba talloc; then
+ conflicts samba
+fi
diff --git a/libs/talloc/DETAILS b/libs/talloc/DETAILS
index 2532cbf..f2f8a91 100755
--- a/libs/talloc/DETAILS
+++ b/libs/talloc/DETAILS
@@ -11,8 +11,8 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/samba4-git
SOURCE_URL[0]=git://git.samba.org/samba.git:samba4
SOURCE_IGNORE=volatile
else
- VERSION=2.0.7
-
SOURCE_HASH=sha512:b4384653f570b349d13352b3a2304bc3bc58d4d3e6369b049163c43d3125bbe29a8d3679691be04ef26a51a2820345fddf3c882d23ce629f8044b2aa043e2768

+ VERSION=2.0.8
+
SOURCE_HASH=sha512:8e8e71d05443b7ea5d8ac432c1043840000b7b6ebeff6a2f621274f29a298e6c64ad5fb75b59c6138179c5602d6164695b85b57b5b310809150320b6eecd487f
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.asc
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/libs/talloc/HISTORY b/libs/talloc/HISTORY
index 9cf3a1e..36bcf3d 100644
--- a/libs/talloc/HISTORY
+++ b/libs/talloc/HISTORY
@@ -1,3 +1,9 @@
+2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * CONFLICTS: conflicts with samba's internal lib
+
+2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.8
+
2011-10-25 Tommy Boatman <tboatman AT sourcemage.org>
* DETAILS: stable version 2.0.7

diff --git a/net/samba/CONFIGURE b/net/samba/CONFIGURE
index 9397bb1..22f87ac 100755
--- a/net/samba/CONFIGURE
+++ b/net/samba/CONFIGURE
@@ -15,4 +15,11 @@ config_query_option SAMBA_QUOTA "Enable disk-quota
support?" n \

message "Samba can use samba-vfs with a virus scanner," &&
message "You will still have to select which scanner to use." &&
-config_query SAMBA_VSCAN "Do you want to add support for on-acces virus
scannning?" n
+config_query SAMBA_VSCAN "Do you want to add support for on-acces virus
scannning?" n &&
+
+# must be the last query
+if spell_ok tdb || spell_ok talloc; then
+ message "${MESSAGE_COLOR}Installed versions of tdb and/or talloc spells
detected." &&
+ message "You won't be able to use internal copies of them from
$SPELL.${DEFAULT_COLOR}" &&
+ config_query SAMBA_CROSSLIB "Do you want to avoid that and run conflicts
procedure?" n
+fi
diff --git a/net/samba/CONFLICTS b/net/samba/CONFLICTS
index dc88904..2d8d6f0 100755
--- a/net/samba/CONFLICTS
+++ b/net/samba/CONFLICTS
@@ -1 +1,6 @@
-conflicts samba4
+conflicts samba4 &&
+
+if [[ $SAMBA_CROSSLIB == y ]]; then
+ conflicts tdb y
+ conflicts talloc y
+fi
diff --git a/net/samba/DEPENDS b/net/samba/DEPENDS
index 2d7e83e..48e457e 100755
--- a/net/samba/DEPENDS
+++ b/net/samba/DEPENDS
@@ -11,15 +11,27 @@ else
"for LDAP support"
fi &&

-optional_depends talloc \
- "--enable-external-libtalloc" \
- "--disable-external-libtalloc" \
- "to use system talloc library" &&
-
-optional_depends tdb \
- "--enable-external-libtdb" \
- "--disable-external-libtdb" \
- "to use system tdb library" &&
+if ! spell_ok talloc; then
+ optional_depends talloc \
+ "--enable-external-libtalloc" \
+ "--disable-external-libtalloc" \
+ "to use system talloc library"
+else
+ if [[ $SAMBA_CROSSLIB == n ]]; then
+ depends talloc '--enable-external-libtalloc'
+ fi
+fi &&
+
+if ! spell_ok tdb; then
+ optional_depends tdb \
+ "--enable-external-libtdb" \
+ "--disable-external-libtdb" \
+ "to use system tdb library"
+else
+ if [[ $SAMBA_CROSSLIB == n ]]; then
+ depends tdb '--enable-external-libtdb'
+ fi
+fi &&

optional_depends libcap "" "" "for POSIX capability support" &&

diff --git a/net/samba/DETAILS b/net/samba/DETAILS
index 6300db9..84c5952 100755
--- a/net/samba/DETAILS
+++ b/net/samba/DETAILS
@@ -1,13 +1,12 @@
SPELL=samba
- VERSION=3.6.5
- SECURITY_PATCH=18
- PATCHLEVEL=1
+ VERSION=3.6.12
+ SECURITY_PATCH=19
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.samba.org/samba/ftp/$SOURCE
SOURCE_URL[1]=ftp://de3.samba.org/pub/$SPELL/$SOURCE
SOURCE_URL[2]=http://us1.samba.org/samba/ftp/old-versions/$SOURCE
-
SOURCE_HASH=sha512:5ee25308e5cf89265618cb94ac6aa69e206a166fb06142c88fff1ae46f6217fda1bf93740b84e327daa9636f87849302a7298abb8bcccfe10607e537761b89d2
+
SOURCE_HASH=sha512:06a7b8883a18b802de5aeced2e7dcf97147351b621736ab2383c6e4f22d5fb14e2b1ce88c8137a2fa9571b25357c766b0fb2b31352009b8a7137b20e2e9c3416
if [[ "$SAMBA_VSCAN" == "y" ]] ; then
VSCAN_VERSION=0.3.6c-beta4
SOURCE2=$SPELL-vscan-$VSCAN_VERSION.tar.gz
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 8734fe8..ad2ae87 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,28 @@
+2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.12; SECURITY_PATCH++
+ * CONFLICTS, CONFIGURE, DEPENDS: both samba and tdb/talloc install
+ libtdb.so / libtalloc.so when ext. lib usage is disabled
+
+2013-01-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.11
+
+2012-12-10 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.10
+
+2012-12-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.9
+
+2012-09-17 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.8
+
+2012-08-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.7
+ * PRE_BUILD, cups16.patch.gz: patch removed, fixed upstream
+
+2012-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+ * cups16.patch.gz: added, to fix build with cups 1.6
+ * PRE_BUILD: apply the patch
+
2012-07-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* init.d/samba: fixed bug about start/stop for a long time when
running
@@ -6,6 +31,9 @@
2012-07-15 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: libcap becomes optional; added missing optional deps

+2012-06-28 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.6.6
+
2012-05-01 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.6.5, SECURITY_PATCH=18, CVE-2012-2111

diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index 633d405..585cc74 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -1,7 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&

-
#sedit 's!libsmbclient.*\$(LIBDIR)!&/..!' source/Makefile.in &&

if [[ "$SAMBA_VSCAN" == "y" ]] ; then
diff --git a/ruby-raa/ruby-1.9/DETAILS b/ruby-raa/ruby-1.9/DETAILS
index e485efb..34e33b7 100755
--- a/ruby-raa/ruby-1.9/DETAILS
+++ b/ruby-raa/ruby-1.9/DETAILS
@@ -1,12 +1,13 @@
SPELL=ruby-1.9
PACKAGE=ruby
- VERSION=1.9.3-p327
-
SOURCE_HASH=sha512:0233c457fb4e0456c0d7d009b5415e986f64cf9163a6d3594c36e88809653a75951e14c36075dc3be9f88c5be99f114a6878e4095bc179357daf99a9f9d85687
+ VERSION=1.9.3-p385
+ BRANCH=`echo $VERSION|cut -d . -f 1,2`
+
SOURCE_HASH=sha512:c577749f98ecb7a5fafb0c251871aa5a6465a97316d6472b7eed0ef420974a0ffd0c85eaa0cc1fe54c703449eea93b8214202c50771cf062396011961c5b1750
SOURCE=$PACKAGE-$VERSION.tar.gz
- SECURITY_PATCH=7
- SOURCE_URL[0]=ftp://ftp.ruby-lang.org/pub/ruby/1.9/$SOURCE
- SOURCE_URL[1]=ftp://www.ibiblio.org/pub/languages/ruby/$SOURCE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$PACKAGE-$VERSION
+ SECURITY_PATCH=8
+ 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"
LICENSE[0]=GPL
KEYWORDS="devel"
WEB_SITE=http://www.ruby-lang.org/
diff --git a/ruby-raa/ruby-1.9/HISTORY b/ruby-raa/ruby-1.9/HISTORY
index d6fecbf..d29f3be 100644
--- a/ruby-raa/ruby-1.9/HISTORY
+++ b/ruby-raa/ruby-1.9/HISTORY
@@ -1,3 +1,13 @@
+2013-02-06 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.3-p385; SECURITY_PATCH++
(CVE-2013-0256)
+
+2013-01-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.3-p374; use BRANCH; updated mirror;
+ quoting paths
+
+2012-12-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.9.3-p362
+
2012-11-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.9.3-p327; SECURITY_PATCH++
(CVE-2012-5371)
diff --git a/utils/dbus-glib/DETAILS b/utils/dbus-glib/DETAILS
index e329db7..e26abbd 100755
--- a/utils/dbus-glib/DETAILS
+++ b/utils/dbus-glib/DETAILS
@@ -1,6 +1,7 @@
SPELL=dbus-glib
- VERSION=0.98
-
SOURCE_HASH=sha512:aaa63b46f09340b68655378b2890c20a359336ba43e6113bea801a1b219e459df909d518cfacae2ebd10a6a1470f362f915c372e2d905baa1510eddd2aced544
+ VERSION=0.100.1
+
SOURCE_HASH=sha512:6ab716335910083f5b0f74c309ea1d6cb650686d5e13b045a50ad3b3e3cd04a019d60b7079ae265f01b049c660c93cd30ba0f15b1db038cf225dc48858ad6b40
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://dbus.freedesktop.org/releases/$SPELL/$SOURCE
diff --git a/utils/dbus-glib/HISTORY b/utils/dbus-glib/HISTORY
index 06ee377..69a6eda 100644
--- a/utils/dbus-glib/HISTORY
+++ b/utils/dbus-glib/HISTORY
@@ -1,3 +1,11 @@
+2013-02-15 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.100.1
+ SECURITY_PATCH=1
+ fixes CVE-2013-0292
+
+2012-07-09 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.100
+
2011-10-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.98

diff --git a/utils/xen/DETAILS b/utils/xen/DETAILS
index 2cef0ce..d6c6fb1 100755
--- a/utils/xen/DETAILS
+++ b/utils/xen/DETAILS
@@ -1,6 +1,6 @@
SPELL=xen
VERSION=4.1.4
- SECURITY_PATCH=6
+ SECURITY_PATCH=7
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=$SOURCE.sig
SOURCE2_IGNORE=signature
diff --git a/utils/xen/HISTORY b/utils/xen/HISTORY
index 97c01d6..06aa996 100644
--- a/utils/xen/HISTORY
+++ b/utils/xen/HISTORY
@@ -1,3 +1,9 @@
+2013-02-18 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD: apply patches
+ * xsa-36.patch: added, to fix CVE-2013-0153
+ * xsa-38.patch: added, to fix CVE-2013-0215
+
2013-01-29 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: security update
* INSTALL: corrected multijob build
diff --git a/utils/xen/PRE_BUILD b/utils/xen/PRE_BUILD
index f45d57a..ba38b55 100755
--- a/utils/xen/PRE_BUILD
+++ b/utils/xen/PRE_BUILD
@@ -3,6 +3,8 @@ 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" &&

diff --git a/utils/xen/xsa-36.patch b/utils/xen/xsa-36.patch
new file mode 100644
index 0000000..f4b15e2
--- /dev/null
+++ b/utils/xen/xsa-36.patch
@@ -0,0 +1,369 @@
+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
new file mode 100644
index 0000000..f4a5dc0
--- /dev/null
+++ b/utils/xen/xsa-38.patch
@@ -0,0 +1,73 @@
+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;



  • [SM-Commit] GIT changes to stable-0.61 grimoire by Vlad Glagolev (ccd4101288b3491b91e2c17d2dfd8c37cdf5b262), Vlad Glagolev, 02/18/2013

Archive powered by MHonArc 2.6.24.

Top of Page