FreeBSD Bugzilla – Attachment 132692 Details for
Bug 177028
[PATCH] remove audio/icecast
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 13.78 KB, created by
Chris Petrik
on 2013-03-16 20:10:00 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Chris Petrik
Created:
2013-03-16 20:10:00 UTC
Size:
13.78 KB
patch
obsolete
>Index: icecast/Makefile >=================================================================== >--- icecast/Makefile (revision 314382) >+++ icecast/Makefile (working copy) >@@ -1,55 +0,0 @@ >-# Created by: Chip Marshall <chip@eboai.org> >-# $FreeBSD$ >- >-PORTNAME= icecast >-PORTVERSION= 1.3.12 >-PORTREVISION= 2 >-CATEGORIES= audio net >-MASTER_SITES= http://downloads.xiph.org/releases/icecast/ >- >-MAINTAINER= c.petrik.sosa@gmail.com >-COMMENT= Streaming mp3 audio server >- >-LICENSE= GPLv2 # (or later) >- >-OPTIONS_DEFINE= DOCS >- >-USE_READLINE= yes >-GNU_CONFIGURE= yes >-CONFIGURE_ARGS= --with-libwrap >-MAKE_JOBS_SAFE= yes >- >-CPPFLAGS+= ${PTHREAD_CFLAGS} >-LDFLAGS+= ${PTHREAD_LIBS} >- >-SUB_FILES= pkg-message >- >-.include <bsd.port.options.mk> >- >-pre-patch: >- @${REINPLACE_CMD} -e \ >- 's|<readline.h>|<readline/readline.h>| ; \ >- s|<history.h>|<readline/history.h>|' ${WRKSRC}/src/admin.c >- @${REINPLACE_CMD} -e \ >- 's|HAVE_HISTORY_H|HAVE_READLINE_HISTORY_H|g' ${WRKSRC}/config.h.in >- >-do-install: >- ${INSTALL_PROGRAM} ${WRKSRC}/src/icecast ${PREFIX}/sbin >- @${MKDIR} ${ETCDIR}/conf >-.for CONF in groups.aut.dist icecast.conf.dist mounts.aut.dist users.aut.dist >- ${INSTALL_DATA} ${WRKSRC}/conf/${CONF} ${ETCDIR}/conf >-.endfor >- @${MKDIR} ${ETCDIR}/templates >-.for TEMPL in 306.html 400.html 403.html 404.html 504.html bodytag.html \ >- info.html list_directory.html mountlist.html statistics.html \ >- admin_describe.html admin.html alias_add.html manual.html \ >- alias_del.html header.html footer.html admin_change.html >- ${INSTALL_DATA} ${WRKSRC}/templates/${TEMPL} ${ETCDIR}/templates >-.endfor >-.if ${PORT_OPTIONS:MDOCS} >- @${MKDIR} ${DOCSDIR} >- ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR} >-.endif >- @${CAT} ${PKGMESSAGE} >- >-.include <bsd.port.mk> >Index: icecast/distinfo >=================================================================== >--- icecast/distinfo (revision 314382) >+++ icecast/distinfo (working copy) >@@ -1,2 +0,0 @@ >-SHA256 (icecast-1.3.12.tar.gz) = 1fdbf39a8828e71c6a89e18e3472bd5f8d27b25de820e6fde1faf1d9b54285a7 >-SIZE (icecast-1.3.12.tar.gz) = 269822 >Index: icecast/files/patch-configure >=================================================================== >--- icecast/files/patch-configure (revision 314382) >+++ icecast/files/patch-configure (working copy) >@@ -1,29 +0,0 @@ >---- configure.orig Thu Apr 11 00:50:20 2002 >-+++ configure Sun Dec 17 13:14:47 2006 >-@@ -2113,7 +2113,7 @@ >- fi >- fi >- >--opt_readline="no" >-+opt_readline="unset" >- >- if test "$opt_readline" = "unset"; then >- if test -f "$withval/include/readline/readline.h"; then >-@@ -3118,7 +3118,7 @@ >- >- fi >- >--for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h history.h Python.h >-+for ac_hdr in fcntl.h sys/time.h unistd.h sys/soundcard.h machine/soundcard.h pthread.h assert.h sys/resource.h math.h signal.h sys/signal.h mcheck.h malloc.h readline/history.h Python.h >- do >- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` >- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 >-@@ -3473,7 +3473,7 @@ >- cat conftest.$ac_ext >&5 >- rm -rf conftest* >- echo "$ac_t""nah" 1>&6 >-- HAVE_SOCKLEN_T=no >-+ HAVE_SOCKLEN_T=yes >- fi >- rm -f conftest* >- >Index: icecast/files/patch-src::avl_functions.c >=================================================================== >--- icecast/files/patch-src::avl_functions.c (revision 314382) >+++ icecast/files/patch-src::avl_functions.c (working copy) >@@ -1,11 +0,0 @@ >---- src/avl_functions.c >-+++ src/avl_functions.c >-@@ -307,7 +307,7 @@ >- } >- >- snprintf(s1, BUFSIZE, "%s:%d", dir1->host, dir1->port); >-- snprintf(s2, "%s:%d", dir2->host, dir2->port); >-+ snprintf(s2, BUFSIZE, "%s:%d", dir2->host, dir2->port); >- >- return compare_strings (s1, s2, param); >- } >Index: icecast/files/patch-src::client.c >=================================================================== >--- icecast/files/patch-src::client.c (revision 314382) >+++ icecast/files/patch-src::client.c (working copy) >@@ -1,11 +0,0 @@ >---- src/client.c >-+++ src/client.c >-@@ -90,8 +90,6 @@ >- >- extern server_info_t info; >- >--static void client_send_fake_file (connection_t *con); >-- >- /* Brand new client. Check what he wants, and either add him to >- the correct tree of clients (inside a source), or kill him off */ >- void client_login(connection_t *con, char *expr) >Index: icecast/files/patch-src::commands.c >=================================================================== >--- icecast/files/patch-src::commands.c (revision 314382) >+++ icecast/files/patch-src::commands.c (working copy) >@@ -1,25 +0,0 @@ >---- src/commands.c >-+++ src/commands.c >-@@ -84,8 +84,8 @@ >- #include "interpreter.h" >- >- #include <time.h> >-+#include <errno.h> >- >--extern int errno; >- extern int running; >- extern server_info_t info; >- extern mutex_t library_mutex; >-@@ -2884,8 +2884,11 @@ >- time_t before = 0; >- >- if (!arg || !arg[0]) >-+ { >- admin_write_line (req, ADMIN_SHOW_PING_INVALID_SYNTAX, PING_SYNTAX); >-- >-+ return 0; >-+ } >-+ >- host[0] = '\0'; >- >- if (splitc (host, arg, ':') != NULL) >Index: icecast/files/patch-src::connection.c >=================================================================== >--- icecast/files/patch-src::connection.c (revision 314382) >+++ icecast/files/patch-src::connection.c (working copy) >@@ -1,18 +0,0 @@ >---- src/connection.c.orig Mon Aug 5 20:39:21 2002 >-+++ src/connection.c Mon Aug 5 20:40:08 2002 >-@@ -18,6 +18,7 @@ >- * >- */ >- >-+#include <sys/types.h> >- #ifdef HAVE_CONFIG_H >- #ifdef _WIN32 >- #include <win32config.h> >-@@ -42,7 +43,6 @@ >- #include <unistd.h> >- #endif >- >--#include <sys/types.h> >- #include <ctype.h> >- #include <errno.h> >- #include <time.h> >Index: icecast/files/patch-src::http.c >=================================================================== >--- icecast/files/patch-src::http.c (revision 314382) >+++ icecast/files/patch-src::http.c (working copy) >@@ -1,81 +0,0 @@ >---- src/http.c >-+++ src/http.c >-@@ -327,7 +327,60 @@ >- } >- >- char * >--url_encode (const char *str, char **result_p) >-+html_escape (const char *str) >-+{ >-+ const char *p; >-+ char *q; >-+ char *result; >-+ int toescape= 0; >-+ >-+ if (!str) { >-+ xa_debug (1, "WARNING: html_escape() called with NULL string"); >-+ return NULL; >-+ } >-+ >-+ for (p = str; *p; p++) { >-+ if ((unsigned char) (*p) == '&') toescape+=4; >-+ if ((unsigned char) (*p) == '"') toescape+=5; >-+ if ((unsigned char) (*p) == '<') toescape+=3; >-+ if ((unsigned char) (*p) == '>') toescape+=3; >-+ } >-+ >-+ result = (char *) nmalloc (p - str + toescape + 1); >-+ >-+ for (q = result, p = str; *p; p++) { >-+ unsigned char a = *p; >-+ if (a == '&') { >-+ *q++ = '&'; >-+ *q++ = 'a'; >-+ *q++ = 'm'; >-+ *q++ = 'p'; >-+ *q++ = ';'; >-+ } else if (a == '"') { >-+ *q++ = '&'; >-+ *q++ = 'q'; >-+ *q++ = 'u'; >-+ *q++ = 'o'; >-+ *q++ = 't'; >-+ *q++ = ';'; >-+ } else if (a == '<') { >-+ *q++ = '&'; >-+ *q++ = 'l'; >-+ *q++ = 't'; >-+ *q++ = ';'; >-+ } else if (a == '>') { >-+ *q++ = '&'; >-+ *q++ = 'g'; >-+ *q++ = 't'; >-+ *q++ = ';'; >-+ } else *q++ = *p; >-+ } >-+ *q++ = 0; >-+ return result; >-+} >-+ >-+char * >-+url_encode (const char *str, char** result_p) >- { >- const char *p; >- char *q; >-@@ -345,7 +398,6 @@ >- unacceptable++; >- >- result = (char *) nmalloc (p - str + unacceptable + unacceptable + 1); >-- >- *result_p = result; >- >- for (q = result, p = str; *p; p++) >-@@ -1336,7 +1388,7 @@ >- add_varpair2 (variables, nstrdup (ident), ice_itoa (i)); >- add_varpair2 (variables, ice_cat (ident, ".id"), ice_itoa (travclients->id)); >- add_varpair2 (variables, ice_cat (ident, ".host"), nstrdup (con_host (travclients))); >-- add_varpair2 (variables, ice_cat (ident, ".user_agent"), nstrdup (get_user_agent (travclients))); >-+ add_varpair2 (variables, ice_cat (ident, ".user_agent"), nstrdup (html_escape(get_user_agent (travclients)))); >- add_varpair2 (variables, ice_cat (ident, ".writebytes"), ice_utoa (travclients->food.client->write_bytes)); >- add_varpair2 (variables, ice_cat (ident, ".connecttime"), nstrdup (nice_time (get_time() - travclients->connect_time, buf))); >- endptr = parse_template_file (clicon, NULL, runptr, fd, variables); >Index: icecast/files/patch-src::http.h >=================================================================== >--- icecast/files/patch-src::http.h (revision 314382) >+++ icecast/files/patch-src::http.h (working copy) >@@ -1,10 +0,0 @@ >---- src/http.h >-+++ src/http.h >-@@ -44,6 +44,7 @@ >- int print_http_variable (vartree_t *request_vars, const char *name, connection_t *clicon, int fd); >- char *url_encode(const char *string, char **result_p); >- char *url_decode (const char *string); >-+char *html_escape(const char *string); >- const char *parse_template_file (connection_t *clicon, connection_t *sourcecon, const char *ptr, int fd, vartree_t *variables); >- int write_template_parsed_html_page (connection_t *clicon, connection_t *sourcecon, const char *template_file, int fd, vartree_t *variables); >- const char *http_loop_sources (char *ident, connection_t *clicon, const char *ptr, int fd, vartree_t *variables); >Index: icecast/files/patch-src::ice_string.c >=================================================================== >--- icecast/files/patch-src::ice_string.c (revision 314382) >+++ icecast/files/patch-src::ice_string.c (working copy) >@@ -1,11 +0,0 @@ >---- src/ice_string.c >-+++ src/ice_string.c >-@@ -334,8 +334,6 @@ >- >- char *safe_strcat(char *dest, const char *src, unsigned int maxsize) >- { >-- int size = 0; >-- >- if (!dest || !src) return dest; >- >- if (ice_strlen(dest) + ice_strlen(src) + 1 >= maxsize) { >Index: icecast/files/patch-src::main.c >=================================================================== >--- icecast/files/patch-src::main.c (revision 314382) >+++ icecast/files/patch-src::main.c (working copy) >@@ -1,11 +0,0 @@ >---- src/main.c >-+++ src/main.c >-@@ -544,7 +544,7 @@ >- directory_server_t *ds; >- int i; >- avl_traverser trav = {0}; >-- static main_shutting_down = 0; >-+ static int main_shutting_down = 0; >- >- thread_library_lock (); >- if (!main_shutting_down) >Index: icecast/files/patch-src::sock.c >=================================================================== >--- icecast/files/patch-src::sock.c (revision 314382) >+++ icecast/files/patch-src::sock.c (working copy) >@@ -1,18 +0,0 @@ >---- src/sock.c.orig Mon Aug 5 20:57:27 2002 >-+++ src/sock.c Mon Aug 5 20:57:48 2002 >-@@ -19,6 +19,7 @@ >- * >- */ >- >-+#include <sys/types.h> >- #ifdef HAVE_CONFIG_H >- #ifdef _WIN32 >- #include <win32config.h> >-@@ -35,7 +36,6 @@ >- >- #include "definitions.h" >- >--#include <sys/types.h> >- #include <ctype.h> >- >- #ifdef HAVE_UNISTD_H >Index: icecast/files/patch-src::static.c >=================================================================== >--- icecast/files/patch-src::static.c (revision 314382) >+++ icecast/files/patch-src::static.c (working copy) >@@ -1,12 +0,0 @@ >---- src/static.c >-+++ src/static.c >-@@ -232,9 +232,7 @@ >- void >- send_file_to_socket (connection_t *con, char *filename) >- { >-- struct stat buf; >- int mp3file; >-- char *suffix; >- long length; >- char buff[BUFSIZE]; >- >Index: icecast/files/patch-src::threads.c >=================================================================== >--- icecast/files/patch-src::threads.c (revision 314382) >+++ icecast/files/patch-src::threads.c (working copy) >@@ -1,13 +0,0 @@ >---- src/threads.c.old Mon Jul 31 14:52:19 2000 >-+++ src/threads.c Mon Nov 18 12:19:41 2002 >-@@ -39,7 +39,10 @@ >- #include <errno.h> >- #include <sys/types.h> >- #include <time.h> >-+ >-+#define __XSI_VISIBLE 1 >- #include <signal.h> >-+#undef __XSI_VISIBLE >- >- #ifdef HAVE_UNISTD_H >- #include <unistd.h> >Index: icecast/files/pkg-message.in >=================================================================== >--- icecast/files/pkg-message.in (revision 314382) >+++ icecast/files/pkg-message.in (working copy) >@@ -1,15 +0,0 @@ >------------------------------------------------------------------ >- >-Icecast's various components have been installed in the following >-directories: >- >- - The icecast server: >- %%PREFIX%%/sbin/icecast >- >- - Icecast configuration files have been installed in: >- %%PREFIX%%/etc/icecast/ >- >- - Icecast documentation is located in: >- %%PREFIX%%/share/doc/icecast/ >- >------------------------------------------------------------------ >Index: icecast/pkg-descr >=================================================================== >--- icecast/pkg-descr (revision 314382) >+++ icecast/pkg-descr (working copy) >@@ -1,8 +0,0 @@ >-Icecast is a streaming mp3 audio server. >- >-Icecast provides nearly all the functionality of the Shoutcast server. >-It will accept encoding streams from encoders like winamp, shout and ices. >-It can also add itself to a directory server such as our own >-icecast.linuxpower.org or Nullsoft's yp.shoutcast.com. >- >-WWW: http://www.icecast.org/ >Index: icecast/pkg-plist >=================================================================== >--- icecast/pkg-plist (revision 314382) >+++ icecast/pkg-plist (working copy) >@@ -1,28 +0,0 @@ >-%%ETCDIR%%/conf/groups.aut.dist >-%%ETCDIR%%/conf/icecast.conf.dist >-%%ETCDIR%%/conf/mounts.aut.dist >-%%ETCDIR%%/conf/users.aut.dist >-%%ETCDIR%%/templates/306.html >-%%ETCDIR%%/templates/400.html >-%%ETCDIR%%/templates/403.html >-%%ETCDIR%%/templates/404.html >-%%ETCDIR%%/templates/504.html >-%%ETCDIR%%/templates/admin.html >-%%ETCDIR%%/templates/admin_change.html >-%%ETCDIR%%/templates/admin_describe.html >-%%ETCDIR%%/templates/alias_add.html >-%%ETCDIR%%/templates/alias_del.html >-%%ETCDIR%%/templates/bodytag.html >-%%ETCDIR%%/templates/footer.html >-%%ETCDIR%%/templates/header.html >-%%ETCDIR%%/templates/info.html >-%%ETCDIR%%/templates/list_directory.html >-%%ETCDIR%%/templates/manual.html >-%%ETCDIR%%/templates/mountlist.html >-%%ETCDIR%%/templates/statistics.html >-sbin/icecast >-%%PORTDOCS%%%%DOCSDIR%%/manual.html >-%%PORTDOCS%%@dirrm %%DOCSDIR%% >-@dirrm %%ETCDIR%%/templates >-@dirrm %%ETCDIR%%/conf >-@dirrm %%ETCDIR%%
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 177028
: 132692