From 67ad10d47bb02270f6daed939593a655625ad6ca Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Tue, 17 Apr 2007 14:11:40 +0000 Subject: [PATCH] Fix compilation against curl-7.16, thanks to Daniel Black , bug #157756 Package-Manager: portage-2.1.2.4 --- net-misc/icecast/ChangeLog | 7 ++++- net-misc/icecast/Manifest | 30 ++++++++++++++----- .../files/icecast-2.3.1-nocurlpassword.patch | 25 ++++++++++++++++ net-misc/icecast/icecast-2.3.1-r1.ebuild | 8 ++++- 4 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 net-misc/icecast/files/icecast-2.3.1-nocurlpassword.patch diff --git a/net-misc/icecast/ChangeLog b/net-misc/icecast/ChangeLog index b629fde6c642..1238e96d84fb 100644 --- a/net-misc/icecast/ChangeLog +++ b/net-misc/icecast/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/icecast # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.63 2007/03/09 04:11:44 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/ChangeLog,v 1.64 2007/04/17 14:11:40 aballier Exp $ + + 17 Apr 2007; Alexis Ballier + +files/icecast-2.3.1-nocurlpassword.patch, icecast-2.3.1-r1.ebuild: + Fix compilation against curl-7.16, thanks to Daniel Black + , bug #157756 09 Mar 2007; Steve Dibb icecast-2.3.1-r1.ebuild: fix permissions, bug 144709 diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest index 3ff88f442b22..bfde353d0322 100644 --- a/net-misc/icecast/Manifest +++ b/net-misc/icecast/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 1.3.12-errno.patch 1732 RMD160 a7597217ced94b814dd7f8e5fe60fddfd68375ce SHA1 60ee2eb18633e243a6b3e691bdee99f660b2f9eb SHA256 d8d9391a79d8a256e5aee184098a43c3a9ac8e06dd98861d75fa5ae55633e27f MD5 a5f4b4836da859fb3b50704c437e2ba9 files/1.3.12-errno.patch 1732 RMD160 a7597217ced94b814dd7f8e5fe60fddfd68375ce files/1.3.12-errno.patch 1732 @@ -6,6 +9,10 @@ AUX 2.2.0-gentoo.patch 15011 RMD160 d46545edd4613d6443e0d816e77d7e0ecda1b996 SHA MD5 7fea29ea3b0c1cd4cda72553db01dfa9 files/2.2.0-gentoo.patch 15011 RMD160 d46545edd4613d6443e0d816e77d7e0ecda1b996 files/2.2.0-gentoo.patch 15011 SHA256 1c8c6757451f2cdca1308396472dfdc327f013244613c9b93285b36d389642b5 files/2.2.0-gentoo.patch 15011 +AUX icecast-2.3.1-nocurlpassword.patch 908 RMD160 bddfa70d24ebab868537aeab0eb0df2b0e1ab34a SHA1 bcc2d06059ae7894de80cf2bea5095f37ac933c9 SHA256 0a36be49b7914e97cfac647310680a1c921dfb85083fa5a215159f2444a87671 +MD5 bb715704cf868017a10ec0c03fc18e17 files/icecast-2.3.1-nocurlpassword.patch 908 +RMD160 bddfa70d24ebab868537aeab0eb0df2b0e1ab34a files/icecast-2.3.1-nocurlpassword.patch 908 +SHA256 0a36be49b7914e97cfac647310680a1c921dfb85083fa5a215159f2444a87671 files/icecast-2.3.1-nocurlpassword.patch 908 AUX icecast.xml 6810 RMD160 8f1864d8d4af6092b3901f04d670b0ab5c4d7019 SHA1 70d7247cd2359593ba08b988acd2915789dbd0a4 SHA256 8c9c209797d79153e0995665d08007bc2d59ff564f5e415df77212767b78f3cb MD5 43e606b53e25fe5f50467daaac229ecc files/icecast.xml 6810 RMD160 8f1864d8d4af6092b3901f04d670b0ab5c4d7019 files/icecast.xml 6810 @@ -35,18 +42,18 @@ EBUILD icecast-2.2.0.ebuild 1148 RMD160 4577c2aa625fd83582fc9f6ca78c66a8b8d40625 MD5 6d74f811ab46b31c074c8a3160fd2eba icecast-2.2.0.ebuild 1148 RMD160 4577c2aa625fd83582fc9f6ca78c66a8b8d40625 icecast-2.2.0.ebuild 1148 SHA256 79c0176c03780d20b2c9ac1d123745d063981f952518ae6367af26b4ce063adb icecast-2.2.0.ebuild 1148 -EBUILD icecast-2.3.1-r1.ebuild 1343 RMD160 3464d3c12c3ba686cf65aed9065024a23288a33b SHA1 dff290f67efe7b33b30fb227401cba1c5306e3c9 SHA256 dab6efa241758240b5753fdc20a0d73c63de12224cc1b36684f83e67595bb4d0 -MD5 0f8ed2d8b7ed5c5482998864ff5f255b icecast-2.3.1-r1.ebuild 1343 -RMD160 3464d3c12c3ba686cf65aed9065024a23288a33b icecast-2.3.1-r1.ebuild 1343 -SHA256 dab6efa241758240b5753fdc20a0d73c63de12224cc1b36684f83e67595bb4d0 icecast-2.3.1-r1.ebuild 1343 +EBUILD icecast-2.3.1-r1.ebuild 1434 RMD160 0d8e115b001e35175c61c26ef9f0b407b772b11a SHA1 5e97e920e8f7ccb675344ff1e2776588607b9a52 SHA256 31787e46af33efb4188ae9ebf509770bc30ea0ea56d12680c804d18ce84b0f56 +MD5 da437b9c971ff969ce20856037863f5a icecast-2.3.1-r1.ebuild 1434 +RMD160 0d8e115b001e35175c61c26ef9f0b407b772b11a icecast-2.3.1-r1.ebuild 1434 +SHA256 31787e46af33efb4188ae9ebf509770bc30ea0ea56d12680c804d18ce84b0f56 icecast-2.3.1-r1.ebuild 1434 EBUILD icecast-2.3.1.ebuild 1108 RMD160 03a8e79bf7faa7bead5f11004d735b5bb65bcb63 SHA1 713df4a8447ac0040cb0c82a4f14d6a25a5b2959 SHA256 d791c3c88d6432bfa04df67949697889b7bf3649fbb3f52bace2cd808484a902 MD5 ce7087d4df80d089969608a5e68a8acb icecast-2.3.1.ebuild 1108 RMD160 03a8e79bf7faa7bead5f11004d735b5bb65bcb63 icecast-2.3.1.ebuild 1108 SHA256 d791c3c88d6432bfa04df67949697889b7bf3649fbb3f52bace2cd808484a902 icecast-2.3.1.ebuild 1108 -MISC ChangeLog 8717 RMD160 9695f0ad4b43e293102cfe736c08f9aef02090c0 SHA1 5145ec1c581942ec2dde485c6652774879bace9e SHA256 0228513e486c2283927c8e057c7a4442de0b42686a501d7d36d8750736e1f6b3 -MD5 62889fe30815b32bcf5144feb81b0cc0 ChangeLog 8717 -RMD160 9695f0ad4b43e293102cfe736c08f9aef02090c0 ChangeLog 8717 -SHA256 0228513e486c2283927c8e057c7a4442de0b42686a501d7d36d8750736e1f6b3 ChangeLog 8717 +MISC ChangeLog 8941 RMD160 ea44133705d036162a89cdaaf6c4590c13fe1ad5 SHA1 43d7588f6f26cb38da4c29957d2bb4f4499f7a25 SHA256 ce82a2bcb925067de4e6fb253e4d0f58bb789b3d33559112ab93ae38d0d91f89 +MD5 474c003a86ac8c74b79a6b050baca8db ChangeLog 8941 +RMD160 ea44133705d036162a89cdaaf6c4590c13fe1ad5 ChangeLog 8941 +SHA256 ce82a2bcb925067de4e6fb253e4d0f58bb789b3d33559112ab93ae38d0d91f89 ChangeLog 8941 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 metadata.xml 221 @@ -69,3 +76,10 @@ SHA256 d273cd77e123cb2b8514a39410b40d2c008c12fe7867099efc2b59f7b3a5053a files/di MD5 f33f8da2aeb1ada3b139e312b46da35c files/digest-icecast-2.3.1-r1 244 RMD160 6eaa14f31d03ac8f28037b7ea9556f4a32c79bb0 files/digest-icecast-2.3.1-r1 244 SHA256 d273cd77e123cb2b8514a39410b40d2c008c12fe7867099efc2b59f7b3a5053a files/digest-icecast-2.3.1-r1 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGJNWUvFcC4BYPU0oRAlBmAJ9HNzpHDSS+Ch5fJqVi7Cj1AOumOwCfbqcB +YSGbQy2RyzR+HlYZlQ2TgYI= +=m/Te +-----END PGP SIGNATURE----- diff --git a/net-misc/icecast/files/icecast-2.3.1-nocurlpassword.patch b/net-misc/icecast/files/icecast-2.3.1-nocurlpassword.patch new file mode 100644 index 000000000000..1aee0cdba227 --- /dev/null +++ b/net-misc/icecast/files/icecast-2.3.1-nocurlpassword.patch @@ -0,0 +1,25 @@ +--- ./src/auth_url.c.orig 2007-04-17 22:48:11.000000000 +1000 ++++ ./src/auth_url.c 2007-04-17 22:48:59.000000000 +1000 +@@ -112,14 +112,6 @@ + } + + +-/* make sure that prompting at the console does not occur */ +-static int my_getpass(void *client, char *prompt, char *buffer, int buflen) +-{ +- buffer[0] = '\0'; +- return 0; +-} +- +- + static int handle_returned_header (void *ptr, size_t size, size_t nmemb, void *stream) + { + auth_client *auth_user = stream; +@@ -518,7 +510,6 @@ + curl_easy_setopt (url_info->handle, CURLOPT_WRITEDATA, url_info->handle); + curl_easy_setopt (url_info->handle, CURLOPT_NOSIGNAL, 1L); + curl_easy_setopt (url_info->handle, CURLOPT_TIMEOUT, 15L); +- curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass); + curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]); + + if (url_info->username && url_info->password) diff --git a/net-misc/icecast/icecast-2.3.1-r1.ebuild b/net-misc/icecast/icecast-2.3.1-r1.ebuild index 382dc2401841..20c48decf9e8 100644 --- a/net-misc/icecast/icecast-2.3.1-r1.ebuild +++ b/net-misc/icecast/icecast-2.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.1-r1.ebuild,v 1.6 2007/03/09 04:11:44 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/icecast/icecast-2.3.1-r1.ebuild,v 1.7 2007/04/17 14:11:40 aballier Exp $ inherit eutils @@ -19,6 +19,12 @@ DEPEND="dev-libs/libxslt theora? ( media-libs/libtheora ) yp? ( >=net-misc/curl-7.10.0 )" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-nocurlpassword.patch" +} + src_compile() { econf \ --sysconfdir=/etc/icecast2 \ -- 2.26.2