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)
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
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 &&