Update to new nightlie, might not work correctly with sqlite3.

(Portage version: 2.1_pre5-r4)

7 files changed, 51 insertions, 57 deletions

diff --git a/media-sound/mt-daapd/ChangeLog b/media-sound/mt-daapd/ChangeLog
index d12e11d2eb10..b62a34d7cf6f 100644
--- a/media-sound/mt-daapd/ChangeLog
+++ b/media-sound/mt-daapd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/mt-daapd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.20 2006/03/05 20:02:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/ChangeLog,v 1.21 2006/03/07 11:11:07 flameeyes Exp $
+
+*mt-daapd-0.3.0_pre20060307 (07 Mar 2006)
+
+  07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+  -files/mt-daapd-cvs-20060301-doublefree.patch,
+  +files/mt-daapd-cvs-20060307-segfault.patch,
+  -mt-daapd-0.3.0_pre20060301.ebuild, +mt-daapd-0.3.0_pre20060307.ebuild:
+  Update to new nightlie, might not work correctly with sqlite3.
 
   05 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/mt-daapd-cvs-20060301-doublefree.patch, -mt-daapd-0.2.3-r2.ebuild,
diff --git a/media-sound/mt-daapd/Manifest b/media-sound/mt-daapd/Manifest
index 820fabe05489..e15891a3b909 100644
--- a/media-sound/mt-daapd/Manifest
+++ b/media-sound/mt-daapd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 49d775e0f2f80ebc1d679b3b2d8ac1af ChangeLog 4231
 RMD160 fe3126e2a6a1561773fb4b3ce4bee7122f769f38 ChangeLog 4231
 SHA256 fb944f58a5208744f6b2de6364eafeb0c0ff6198422bb28b1faf8941b4d37996 ChangeLog 4231
@@ -10,9 +7,9 @@ SHA256 857f910fe65da798f7ee7f3eb3264aaf5202a6d73a2f79fed699977e21f301ba files/di
 MD5 a5b2b709b9dc7706dfc6bea74d5c8cd8 files/digest-mt-daapd-0.2.4 244
 RMD160 df99fe6a1b4856a6ac473887207da3a4ec6becf0 files/digest-mt-daapd-0.2.4 244
 SHA256 25ac081e15ba74c03bdf1a071eb2f713e7861eafcd9deb0d863db8b238e4421c files/digest-mt-daapd-0.2.4 244
-MD5 fb8d5be3517dc6e6fc81df06b5510571 files/digest-mt-daapd-0.3.0_pre20060301 265
-RMD160 11bab3f4a3cebb4ea030c35dc0776ea11fed5203 files/digest-mt-daapd-0.3.0_pre20060301 265
-SHA256 bb53864161e1ef12df7554fb62eef36c81adb25c7cf3663b9fdc50b7cb407e61 files/digest-mt-daapd-0.3.0_pre20060301 265
+MD5 dd0619ccbb049c984becfcf48a4c9924 files/digest-mt-daapd-0.3.0_pre20060307 265
+RMD160 4b0a52d92cd7ca806747f4fac5f48e1bc2cd3141 files/digest-mt-daapd-0.3.0_pre20060307 265
+SHA256 d5e7bfa4bce0241df9f085d07df14780a59c584081d12c6bc00a520b09271cc9 files/digest-mt-daapd-0.3.0_pre20060307 265
 MD5 55238544e58e1a12aa7a405779d03fb1 files/mt-daapd-0.2.3-libsorder.patch 5162
 RMD160 10e8197fee61223e96942a9d130dd616d1bd3b46 files/mt-daapd-0.2.3-libsorder.patch 5162
 SHA256 ed726102ea4c180901c0adfcdaaf277185e9cf95e5579351384f2aa77ca60afd files/mt-daapd-0.2.3-libsorder.patch 5162
@@ -25,9 +22,6 @@ SHA256 265088c7773653d2b2ee02da665f985d99535ab8f0d8b221d19b33e54e3f5c7b files/mt
 MD5 227a3d186fe7904440caec11492341db files/mt-daapd-0.2.3-sparc.patch 927
 RMD160 029a51e22054655fac678e254f427748b941ab48 files/mt-daapd-0.2.3-sparc.patch 927
 SHA256 fda7219e9cca646520debb1a1f853ea8144e6c3db7c04004cddeeb173df9645b files/mt-daapd-0.2.3-sparc.patch 927
-MD5 27aaa711fc485cc24fcb6269e94697a0 files/mt-daapd-cvs-20060301-doublefree.patch 769
-RMD160 faba94837060ef0614adff354eb1995f88066015 files/mt-daapd-cvs-20060301-doublefree.patch 769
-SHA256 c491438b48c3152f6e6f037956ee397cba92e6a1eadcbb83f55a49455935cafe files/mt-daapd-cvs-20060301-doublefree.patch 769
 MD5 d14aca83cf21b8c519b42962ba276e42 files/mt-daapd.init 540
 RMD160 2989476cfd7ed00cc6941c20acccc24d1412a4fb files/mt-daapd.init 540
 SHA256 c4a0f6af9711b7ada20e47826991706e8f466c5d9d6b04975bc71ada598442ab files/mt-daapd.init 540
@@ -43,13 +37,6 @@ SHA256 4287301a256053216fe2991cf8a98154a566a5202e45d53e2ac713061bda7b9b mt-daapd
 MD5 968d9cce3ac940d07e1f331e71927441 mt-daapd-0.2.4.ebuild 3525
 RMD160 a053e3bb72c79afb981eac62a987ccb06109404f mt-daapd-0.2.4.ebuild 3525
 SHA256 79dc354c7c71b4a1075adfde2030b8ddac50a0f3ddf9ffb1a088309941fb1068 mt-daapd-0.2.4.ebuild 3525
-MD5 2a7ca643cc651d33213a20a19465171e mt-daapd-0.3.0_pre20060301.ebuild 3988
-RMD160 ecac4507ac70d6f8898a8cf262268a6b56d57e6f mt-daapd-0.3.0_pre20060301.ebuild 3988
-SHA256 e95ff6c4ee9649e589726b2ebea9a6bf8f1601edb609d94d55fc7c17e8c890b8 mt-daapd-0.3.0_pre20060301.ebuild 3988
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFEC0PNAiZjviIA2XgRAt57AKCNVkvFG+rvy1xM+X6XL0k/nhztFwCfUvWs
-Yh4X50Ehk0oHi85moeTPyf0=
-=Twjr
------END PGP SIGNATURE-----
+MD5 d0bb9530baa530fdd2f7caeff03859dc mt-daapd-0.3.0_pre20060307.ebuild 3720
+RMD160 d8735581d6cd522d4d25bce4b721310380ab185f mt-daapd-0.3.0_pre20060307.ebuild 3720
+SHA256 1ba746fdeed3f76cd07a7038a528f9df35ff63b59eaa4cba8f30db7c732b24d3 mt-daapd-0.3.0_pre20060307.ebuild 3720
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060301 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060301
deleted file mode 100644
index 0d0518e4fa38..000000000000
--- a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060301
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 80c5bf3aaeb413846beb63619398c598 mt-daapd-cvs-20060301.tar.gz 801417
-RMD160 0df82f45bb23adb655e91082ba3a8fd3aae8883d mt-daapd-cvs-20060301.tar.gz 801417
-SHA256 281ad1f2590251d24b2f20743b1482e8c55144239fbe3e169f52d521d0e41698 mt-daapd-cvs-20060301.tar.gz 801417
diff --git a/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060307 b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060307
new file mode 100644
index 000000000000..929c63a8b37d
--- /dev/null
+++ b/media-sound/mt-daapd/files/digest-mt-daapd-0.3.0_pre20060307
@@ -0,0 +1,3 @@
+MD5 faccca4d71141b1016b50b0f861f8490 mt-daapd-cvs-20060307.tar.gz 804641
+RMD160 afa8cac957a589982910ac738f239f93dbed0516 mt-daapd-cvs-20060307.tar.gz 804641
+SHA256 76e2a42850427531a183d99dfee2b84ec8c5fdb132446d28874c5ac58003fd02 mt-daapd-cvs-20060307.tar.gz 804641
diff --git a/media-sound/mt-daapd/files/mt-daapd-cvs-20060301-doublefree.patch b/media-sound/mt-daapd/files/mt-daapd-cvs-20060301-doublefree.patch
deleted file mode 100644
index 89c4f6806308..000000000000
--- a/media-sound/mt-daapd/files/mt-daapd-cvs-20060301-doublefree.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: mt-daapd-cvs-20060301/src/db-sql-sqlite3.c
-===================================================================
---- mt-daapd-cvs-20060301.orig/src/db-sql-sqlite3.c
-+++ mt-daapd-cvs-20060301/src/db-sql-sqlite3.c
-@@ -236,6 +236,7 @@ int db_sqlite3_enum_begin_helper(char **
-         db_get_error(pe,DB_E_SQL_ERROR,sqlite3_errmsg(db_sqlite3_songs));
-         db_sqlite3_unlock();
-         sqlite3_free(db_sqlite3_enum_query);
-+	db_sqlite3_enum_query = NULL;
-         return DB_E_SQL_ERROR;
-     }
- 
-@@ -315,6 +316,7 @@ int db_sqlite3_enum_end(char **pe) {
-         free(db_sqlite3_row);
-     db_sqlite3_row = NULL;
-     sqlite3_free(db_sqlite3_enum_query);
-+    db_sqlite3_enum_query=NULL;
- 
-     err = sqlite3_finalize(db_sqlite3_stmt);
-     if(err != SQLITE_OK) {
diff --git a/media-sound/mt-daapd/files/mt-daapd-cvs-20060307-segfault.patch b/media-sound/mt-daapd/files/mt-daapd-cvs-20060307-segfault.patch
new file mode 100644
index 000000000000..78424bc55844
--- /dev/null
+++ b/media-sound/mt-daapd/files/mt-daapd-cvs-20060307-segfault.patch
@@ -0,0 +1,29 @@
+Index: mt-daapd-cvs-20060307/src/db-sql.c
+===================================================================
+--- mt-daapd-cvs-20060307.orig/src/db-sql.c
++++ mt-daapd-cvs-20060307/src/db-sql.c
+@@ -150,7 +150,10 @@ int db_sql_fetch_row(char **pe, SQL_ROW 
+ 
+     err=db_sql_enum_fetch_fn(pe, row);
+     if(err != DB_E_SUCCESS) {
+-        DPRINTF(E_SPAM,L_DB,"Error: enum_fetch failed: %s\n",*pe);
++        if ( ! pe )
++            DPRINTF(E_SPAM,L_DB,"Error: enum_fetch failed, and pe missing\n");
++        else
++            DPRINTF(E_SPAM,L_DB,"Error: enum_fetch failed: %s\n",*pe);
+         db_sql_enum_end_fn(NULL);
+         return err;
+     }
+Index: mt-daapd-cvs-20060307/src/main.c
+===================================================================
+--- mt-daapd-cvs-20060307.orig/src/main.c
++++ mt-daapd-cvs-20060307/src/main.c
+@@ -394,7 +394,7 @@ int main(int argc, char *argv[]) {
+     end_time=(int) time(NULL);
+ 
+     err=db_get_song_count(&perr,&song_count);
+-    if(err != DB_E_SUCCESS) {
++    if(err != DB_E_SUCCESS && perr && *perr) {
+         DPRINTF(E_FATAL,L_MISC,"Error getting song count: %s\n",perr);
+     }
+ 
diff --git a/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060301.ebuild b/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060307.ebuild
index 5f81ac6970a2..68690a86bbbf 100644
--- a/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060301.ebuild
+++ b/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060307.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060301.ebuild,v 1.2 2006/03/05 20:02:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mt-daapd/mt-daapd-0.3.0_pre20060307.ebuild,v 1.1 2006/03/07 11:11:07 flameeyes Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic base
 
 CVS="${PV#*pre}"
 
@@ -33,6 +33,8 @@ DEPEND="sys-libs/zlib
 	vorbis? ( media-libs/libvorbis )
 	flac? ( media-libs/flac )"
 
+PATCHES="${FILESDIR}/${MY_P}-segfault.patch"
+
 pkg_setup() {
 	if use howl && use avahi && ! built_with_use net-dns/avahi howl-compat; then
 		eerror "You requested avahi support, but this package requires"
@@ -42,18 +44,6 @@ pkg_setup() {
 		eerror "Please recompile net-dns/avahi with +howl-compat."
 		die "Missing howl-compat support in avahi."
 	fi
-
-	if use sqlite && use sqlite3; then
-		eerror "You can't enable both sqlite 2.x and sqlite 3.x suppor at the"
-		eerror "same time. Please drop one of the useflag."
-		die "Invalid use of sqlite flags"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${MY_P}-doublefree.patch"
 }
 
 src_compile() {