Hello community, here is the log from the commit of package icecast checked in at Fri Feb 2 16:12:55 CET 2007. -------- --- icecast/icecast.changes 2006-12-19 15:35:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/icecast/icecast.changes 2007-02-02 13:18:39.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 2 12:49:43 CET 2007 - mmarek@suse.cz + +- fix build with curl-7.16 +- fixed more comparison with string literals by using static char* + variables instead of #defines to string constans to detect + whether a default or malloced value is used + +------------------------------------------------------------------- New: ---- icecast-2.3.1-curl-7.16.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecast.spec ++++++ --- /var/tmp/diff_new_pack.Cz7787/_old 2007-02-02 16:11:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Cz7787/_new 2007-02-02 16:11:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package icecast (Version 2.3.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -15,7 +15,7 @@ Prereq: /usr/sbin/useradd /usr/sbin/groupadd %insserv_prereq %fillup_prereq Summary: Audio Streaming Server Version: 2.3.1 -Release: 44 +Release: 51 Group: Productivity/Networking/Web/Servers Autoreqprov: on License: GNU General Public License (GPL) @@ -24,6 +24,7 @@ Source1: icecast.init Patch: icecast-2.3.1_runas_icecast_user.patch Patch1: icecast-cfgfile-fix.diff +Patch2: icecast-2.3.1-curl-7.16.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,6 +43,7 @@ %setup %patch %patch1 +%patch2 %build %configure @@ -91,6 +93,11 @@ %attr(755,%{name},%{name}) %{_var}/log/%{name} %changelog -n icecast +* Fri Feb 02 2007 - mmarek@suse.cz +- fix build with curl-7.16 +- fixed more comparison with string literals by using static char* + variables instead of #defines to string constans to detect + whether a default or malloced value is used * Tue Dec 19 2006 - tiwai@suse.de - fix comparison of string literal in cfgfile.c (#226380). * Wed Oct 11 2006 - tiwai@suse.de ++++++ icecast-2.3.1-curl-7.16.patch ++++++ --- src/auth_url.c +++ src/auth_url.c @@ -111,13 +111,15 @@ static void auth_url_clear(auth_t *self) free (url); } - -/* make sure that prompting at the console does not occur */ +#if LIBCURL_VERSION_NUM < 0x070a08 +/* make sure that prompting at the console does not occur (not needed since + * curl-7.10.8 and doesn't compile with curl-7.16.x) */ static int my_getpass(void *client, char *prompt, char *buffer, int buflen) { buffer[0] = '\0'; return 0; } +#endif static int handle_returned_header (void *ptr, size_t size, size_t nmemb, void *stream) @@ -518,7 +520,9 @@ int auth_get_url_auth (auth_t *authentic 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); +#if LIBCURL_VERSION_NUM < 0x070a08 curl_easy_setopt (url_info->handle, CURLOPT_PASSWDFUNCTION, my_getpass); +#endif curl_easy_setopt (url_info->handle, CURLOPT_ERRORBUFFER, &url_info->errormsg[0]); if (url_info->username && url_info->password) ++++++ icecast-cfgfile-fix.diff ++++++ --- /var/tmp/diff_new_pack.Cz7787/_old 2007-02-02 16:11:44.000000000 +0100 +++ /var/tmp/diff_new_pack.Cz7787/_new 2007-02-02 16:11:44.000000000 +0100 @@ -1,11 +1,60 @@ ---- src/cfgfile.c-dist 2006-12-19 15:34:30.000000000 +0100 -+++ src/cfgfile.c 2006-12-19 15:34:41.000000000 +0100 -@@ -159,7 +159,7 @@ void config_clear(ice_config_t *c) - if (c->config_filename) - free(c->config_filename); +--- src/cfgfile.c ++++ src/cfgfile.c +@@ -27,8 +27,8 @@ + #include "logging.h" -- if (c->location && c->location != CONFIG_DEFAULT_LOCATION) -+ if (c->location && strcmp(c->location, CONFIG_DEFAULT_LOCATION)) - xmlFree(c->location); - if (c->admin && c->admin != CONFIG_DEFAULT_ADMIN) - xmlFree(c->admin); + #define CATMODULE "CONFIG" +-#define CONFIG_DEFAULT_LOCATION "Earth" +-#define CONFIG_DEFAULT_ADMIN "icemaster@localhost" ++static const char * CONFIG_DEFAULT_LOCATION = "Earth"; ++static const char * CONFIG_DEFAULT_ADMIN = "icemaster@localhost"; + #define CONFIG_DEFAULT_CLIENT_LIMIT 256 + #define CONFIG_DEFAULT_SOURCE_LIMIT 16 + #define CONFIG_DEFAULT_QUEUE_SIZE_LIMIT (500*1024) +@@ -37,17 +37,17 @@ + #define CONFIG_DEFAULT_CLIENT_TIMEOUT 30 + #define CONFIG_DEFAULT_HEADER_TIMEOUT 15 + #define CONFIG_DEFAULT_SOURCE_TIMEOUT 10 +-#define CONFIG_DEFAULT_SOURCE_PASSWORD "changeme" ++static const char * CONFIG_DEFAULT_SOURCE_PASSWORD = "changeme"; + #define CONFIG_DEFAULT_RELAY_PASSWORD "changeme" + #define CONFIG_DEFAULT_MASTER_USERNAME "relay" +-#define CONFIG_DEFAULT_SHOUTCAST_MOUNT "/stream" ++static const char * CONFIG_DEFAULT_SHOUTCAST_MOUNT = "/stream"; + #define CONFIG_DEFAULT_ICE_LOGIN 0 + #define CONFIG_DEFAULT_FILESERVE 1 + #define CONFIG_DEFAULT_TOUCH_FREQ 5 +-#define CONFIG_DEFAULT_HOSTNAME "localhost" ++static const char * CONFIG_DEFAULT_HOSTNAME = "localhost"; + #define CONFIG_DEFAULT_PLAYLIST_LOG NULL +-#define CONFIG_DEFAULT_ACCESS_LOG "access.log" +-#define CONFIG_DEFAULT_ERROR_LOG "error.log" ++static const char * CONFIG_DEFAULT_ACCESS_LOG = "access.log"; ++static const char * CONFIG_DEFAULT_ERROR_LOG = "error.log"; + #define CONFIG_DEFAULT_LOG_LEVEL 4 + #define CONFIG_DEFAULT_CHROOT 0 + #define CONFIG_DEFAULT_CHUID 0 +@@ -57,15 +57,15 @@ + #define CONFIG_YP_URL_TIMEOUT 10 + + #ifndef _WIN32 +-#define CONFIG_DEFAULT_BASE_DIR "/usr/local/icecast" +-#define CONFIG_DEFAULT_LOG_DIR "/usr/local/icecast/logs" +-#define CONFIG_DEFAULT_WEBROOT_DIR "/usr/local/icecast/webroot" +-#define CONFIG_DEFAULT_ADMINROOT_DIR "/usr/local/icecast/admin" ++static const char * CONFIG_DEFAULT_BASE_DIR = "/usr/local/icecast"; ++static const char * CONFIG_DEFAULT_LOG_DIR = "/usr/local/icecast/logs"; ++static const char * CONFIG_DEFAULT_WEBROOT_DIR = "/usr/local/icecast/webroot"; ++static const char * CONFIG_DEFAULT_ADMINROOT_DIR = "/usr/local/icecast/admin"; + #else +-#define CONFIG_DEFAULT_BASE_DIR ".\\" +-#define CONFIG_DEFAULT_LOG_DIR ".\\logs" +-#define CONFIG_DEFAULT_WEBROOT_DIR ".\\webroot" +-#define CONFIG_DEFAULT_ADMINROOT_DIR ".\\admin" ++static const char * CONFIG_DEFAULT_BASE_DIR = ".\\"; ++static const char * CONFIG_DEFAULT_LOG_DIR = ".\\logs"; ++static const char * CONFIG_DEFAULT_WEBROOT_DIR = ".\\webroot"; ++static const char * CONFIG_DEFAULT_ADMINROOT_DIR = ".\\admin"; + #endif + + static ice_config_t _current_configuration; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org