Add patch to fix building with curl 7.18, thanks to Łukasz Dudek.

Package-Manager: portage-2.1.5_rc5

4 files changed, 27 insertions, 8 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index 26741975bb3b..3d142f6b5680 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.1 2008/03/27 17:32:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.2 2008/04/21 16:21:50 flameeyes Exp $
+
+  21 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/mediatomb-0.11.0+curl-7.18.patch, mediatomb-0.11.0.ebuild:
+  Add patch to fix building with curl 7.18, thanks to Łukasz Dudek.
 
 *mediatomb-0.11.0 (27 Mar 2008)
 
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index b5241aeb4ab9..69e2d7dd415a 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX mediatomb-0.11.0+curl-7.18.patch 524 RMD160 beb5dd3f23437af630182ef1b4228622e0d3594c SHA1 c256310f7785b7f26298dba9284a1c72885fc0f5 SHA256 6015e2fac0409322e917a1b5426333581167cc2b30677883c221e4726f0553be
 AUX mediatomb-0.11.0-newffmpeg.patch 2410 RMD160 112b1683bc86325e5584b9e7089f46d4a218d8fc SHA1 4af90200a3cf0a07ce47ea42b6b398002f3d99c1 SHA256 7566cd01d9af848bdfd75949bb586b9a83bb6b9501fe9dba921e93960e2f2fdb
 AUX mediatomb-0.11.0.config 2739 RMD160 0f6d8108052d19940e7f5d2288c9027aa2976dc6 SHA1 2c8bfdf7d370ca7782a930d8ef70a242a2942d37 SHA256 0c02298dd2078fed683dad661d933c1f7e43086c77999bf651065ec40ea762c4
 AUX mediatomb.confd 857 RMD160 66c19ff63accb09048250daa94b7fdea208616fa SHA1 3ab51654efbb89aa9a8beb5ca47170ba86fd1320 SHA256 9d8b7e044f9ac684b33ea2ac97ddcfb2c038cb5038d4149e11441d5e24d7d92d
 AUX mediatomb.initd 576 RMD160 e92a6f915eb6d1a0fff1e82a74004ed8a430d503 SHA1 d2c7f0e7e86d8e7add10566d1928b45a953ce39b SHA256 f9f53683b6a6ad11ee1aab2cb8c604cd6639872c1abe36bf5d7006ffbbd7ca14
 DIST mediatomb-0.11.0.tar.gz 1059429 RMD160 11c53d5757da3a689c025107331526c0486befc4 SHA1 1d7c86924686f9999a359ba96092aa36d30832a6 SHA256 25e0b3d761e41fc6793c780eb7f638719867cdc6d3429ec24f72d1e9556ac1d2
-EBUILD mediatomb-0.11.0.ebuild 3400 RMD160 46f4b1d78240f2468b210f41bfa11ad6af9821bf SHA1 6d9a1fad70419230b4d48f2b499ee3075adb18ef SHA256 103aab9222b2a47b1fa05719d5e846f38e4312a08eebac1981ff4d49f8efe958
-MISC ChangeLog 601 RMD160 828d17031d90c825ef561a469fedde75125771dc SHA1 27cb1fe1810875202cf190e0b20fa7894caa290a SHA256 c1b177c44097c68bbfc3c51846cfd669693f0c9d57111470db8c54cf80df9fab
+EBUILD mediatomb-0.11.0.ebuild 3443 RMD160 86cfb15139b4c7e74fea71aaa3312846645b922d SHA1 09d8dbf634e5ab87700cea173f9469d6eca47484 SHA256 26fac9fddcbf70bfa140504420f56adfaa6938accb1501ca2db436ff24478631
+MISC ChangeLog 792 RMD160 54fc650092bfdd756776b6f95b662c3a9a3a1618 SHA1 dd7a5edb7fa298e83141ef7beeec7ee8a7bbab0b SHA256 34df4d09b8276a19ed6c9d6b87ca7c277e0911c7457b5a91afb40d03724c2120
 MISC metadata.xml 623 RMD160 6a46a6c1d59c37245d655795c94ad4379298f504 SHA1 feeea1de414c53e60e497a30799ea11c13515743 SHA256 14ff654aaebcc7efb5ea25c210a93c7b709fbd598b3de497fc804bf8ee99ba75
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH69pQAiZjviIA2XgRAiPlAJ0VulYBWISj/UPAXpGAYwW3dwnONwCgmzzh
-MHtgxiXSVBOdSVCAoG3GjaE=
-=gArS
+iEYEARECAAYFAkgMvyUACgkQAiZjviIA2XixAgCg6eRJ3+2z0+bZvx6J9AdC56Kk
+s7AAoJBp8tYf2HJorCV/TlprGXqRn/Hr
+=2SyN
 -----END PGP SIGNATURE-----
diff --git a/net-misc/mediatomb/files/mediatomb-0.11.0+curl-7.18.patch b/net-misc/mediatomb/files/mediatomb-0.11.0+curl-7.18.patch
new file mode 100644
index 000000000000..5d0d4b25bdcb
--- /dev/null
+++ b/net-misc/mediatomb/files/mediatomb-0.11.0+curl-7.18.patch
@@ -0,0 +1,13 @@
+Index: mediatomb-0.11.0/src/url.cc
+===================================================================
+--- mediatomb-0.11.0.orig/src/url.cc
++++ mediatomb-0.11.0/src/url.cc
+@@ -75,7 +75,7 @@
+ 
+     if (only_header)
+     {
+-        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
++        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, TRUE);
+         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
+         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
+                          (void *)buffer.getPtr());
diff --git a/net-misc/mediatomb/mediatomb-0.11.0.ebuild b/net-misc/mediatomb/mediatomb-0.11.0.ebuild
index d6beb7ac05f1..6cb5b38e0647 100644
--- a/net-misc/mediatomb/mediatomb-0.11.0.ebuild
+++ b/net-misc/mediatomb/mediatomb-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.11.0.ebuild,v 1.1 2008/03/27 17:32:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/mediatomb-0.11.0.ebuild,v 1.2 2008/04/21 16:21:50 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -47,6 +47,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}/${P}-newffmpeg.patch"
+	epatch "${FILESDIR}/${P}+curl-7.18.patch"
 	eautoreconf
 }