Fixed cdr_tds module compilation with >=freetds-0.6.3

Package-Manager: portage-2.0.51.22-r2

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 0b2140a7a30ccc719dc1a536090619b145f74f9d..6010fce21da9a75a9b29d1783ac2c759c59c94ce 100644 (file)
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.85 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.86 2005/10/28 23:06:23 stkn Exp $
+
+  29 Oct 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.9-freetds.diff, asterisk-1.0.9-r1.ebuild:
+  Fixed cdr_tds module compilation with >=freetds-0.6.3, reported by
+  Widyachacra Rajapaksha.
 
   15 Sep 2005; Stefan Knoblich <stkn@gentoo.org> asterisk-1.0.5-r2.ebuild,
   asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild,

diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 223cfe21dc19f4996fb2d7a9d0f5123e8547f23d..c11c8ba6c9199791b66bbcb2a9cceae05ed40fd3 100644 (file)
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -3,10 +3,10 @@ MD5 ec8483391ba7074dddc1c1d672210547 asterisk-1.0.5-r2.ebuild 12208
 MD5 55918f28237f56f35f1e93fa52343229 asterisk-1.0.8.ebuild 13713
 MD5 5f61c8dea95f42658467d6eb55f07424 asterisk-1.0.9.ebuild 13604
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 447c3a3186232dac9d2b9adc22b23e60 ChangeLog 16942
+MD5 0a505bf9a280a4940569a2831cc0c4e2 ChangeLog 17157
 MD5 20ec1478dbd5296efcd57d09438a4b66 asterisk-1.0.7-r1.ebuild 13593
 MD5 9dcb9995fca71c36e4a06b5ee05592d0 asterisk-1.2.0_beta1.ebuild 7987
-MD5 ea9e1c14e7b4bfc735e764cd09cbcf23 asterisk-1.0.9-r1.ebuild 13607
+MD5 4879fda93d76f4505aec84e0ea65d02f asterisk-1.0.9-r1.ebuild 13734
 MD5 5d8a088b5a0b3ea1681f4f085ff36299 files/digest-asterisk-1.2.0_beta1 156
 MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r2 139
 MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8 210
@@ -26,6 +26,7 @@ MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv
 MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
 MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
 MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
+MD5 939ceffe990ff10a1fab2ed73f7ee9ad files/1.0.0/asterisk-1.0.9-freetds.diff 326
 MD5 517587756c674978b1b24891c34564fc files/1.0.0/asterisk-1.0.8-ptr64fix.diff 485
 MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
 MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474

diff --git a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild b/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
index aad1e0f12c977434632e46906703a4f11f3a7d55..e93fbb9ee4207f05700c28c74461a7a90a3bec9e 100644 (file)
--- a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r1.ebuild,v 1.5 2005/09/15 02:40:34 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r1.ebuild,v 1.6 2005/10/28 23:06:23 stkn Exp $
 
 inherit eutils perl-module
 
@@ -276,6 +276,11 @@ src_unpack() {
 
        # fix segfault on amd64 and possibly other 64bit systems (#105762)
        epatch ${FILESDIR}/1.0.0/${PN}-1.0.8-ptr64fix.diff
+
+       # needed for >=freetds-0.6.3
+       if has_version ">=dev-db/freetds-0.6.3"; then
+               epatch ${FILESDIR}/1.0.0/${P}-freetds.diff
+       fi
 }
 
 src_compile() {

diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-freetds.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-freetds.diff
new file mode 100644 (file)
index 0000000..c8e9b13
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.9-freetds.diff
@@ -0,0 +1,11 @@
+--- asterisk-1.0.9/cdr/cdr_tds.c.orig  2005-10-29 00:50:28.000000000 +0000
++++ asterisk-1.0.9/cdr/cdr_tds.c       2005-10-29 00:50:57.000000000 +0000
+@@ -412,7 +412,7 @@
+ 
+ static int mssql_connect(void)
+ {
+-      TDSCONNECTINFO *connection = NULL;
++      TDSCONNECTION *connection = NULL;
+       char query[128];
+ 
+       /* Connect to M$SQL Server */

diff --git a/net-misc/jwhois/Manifest b/net-misc/jwhois/Manifest
index a7a8be3b864ce08ca177912be6211ee6dc3101c8..26dbc6e8d0256cc0b7a7955863e3ef85e35431a8 100644 (file)
--- a/net-misc/jwhois/Manifest
+++ b/net-misc/jwhois/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1340e640f52c2106618adcf5200fc519 jwhois-3.2.2.ebuild 789
-MD5 232dc7d34a05a7c82704d6f92853d1b0 jwhois-3.2.1.ebuild 784
-MD5 d99678f16c4fcc4e0bc71763e07dbb22 metadata.xml 221
-MD5 645528ab8cda9b2e23310fcc326cf866 jwhois-3.2.3.ebuild 710
 MD5 992581cf5af62258ff037cee4a3d0c6c ChangeLog 2645
-MD5 8650b911e7bd5abb5571edbc236a1c83 jwhois-3.2.0.ebuild 767
-MD5 bdae1dc474252cf39261057151097484 files/digest-jwhois-3.2.3 64
 MD5 a3be5e722f33856d6bf281f4251e8b03 files/digest-jwhois-3.2.0 64
 MD5 8cbb8abe6a191a786d5b46109cda625d files/digest-jwhois-3.2.1 64
 MD5 7411f47db9ecd1d63caf18c87ef5c9db files/digest-jwhois-3.2.2 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDFOGpgIKl8Uu19MoRAub3AJ94q0GayrTYJAHWioXBrb2L3w76KgCaA9Ut
-chrHsyUhU5CVc9yb62KQK0g=
-=bMV7
------END PGP SIGNATURE-----
+MD5 bdae1dc474252cf39261057151097484 files/digest-jwhois-3.2.3 64
+MD5 8650b911e7bd5abb5571edbc236a1c83 jwhois-3.2.0.ebuild 767
+MD5 232dc7d34a05a7c82704d6f92853d1b0 jwhois-3.2.1.ebuild 784
+MD5 1340e640f52c2106618adcf5200fc519 jwhois-3.2.2.ebuild 789
+MD5 99dfeb084c75b44024817d7a2876c128 jwhois-3.2.3.ebuild 744
+MD5 d99678f16c4fcc4e0bc71763e07dbb22 metadata.xml 221