Update to 0.2.3
From Arnaud Bergeron <abergeron@gmail.com>
and James Wright <jamesw@bsdhosting.co.za>
This commit is contained in:
alek
parent
5fdaad481d
commit
3983a19a3f
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2005/09/21 15:15:49 alek Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2005/10/07 20:15:13 alek Exp $
|
||||
|
||||
COMMENT= "multi-threaded DAAP server"
|
||||
|
||||
DISTNAME= mt-daapd-0.2.1.1
|
||||
DISTNAME= mt-daapd-0.2.3
|
||||
CATEGORIES= audio net
|
||||
|
||||
HOMEPAGE= http://www.mt-daapd.org/
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (mt-daapd-0.2.1.1.tar.gz) = 87356d2750ad82388a58d901aa566465
|
||||
RMD160 (mt-daapd-0.2.1.1.tar.gz) = d4770e154f78ced2beec389493b4ff21c4802218
|
||||
SHA1 (mt-daapd-0.2.1.1.tar.gz) = 6b2a120b3b8d5d90c54b2d6f020be50e6cbb223f
|
||||
SIZE (mt-daapd-0.2.1.1.tar.gz) = 386055
|
||||
MD5 (mt-daapd-0.2.3.tar.gz) = 17aa3fa0601cbe172d18f53489141e5a
|
||||
RMD160 (mt-daapd-0.2.3.tar.gz) = 8e91abb881ccbb96c7ea21acd01c167f58d97176
|
||||
SHA1 (mt-daapd-0.2.3.tar.gz) = 787fa1ca589f0c793bb341232684a885e2c933b0
|
||||
SIZE (mt-daapd-0.2.3.tar.gz) = 406035
|
||||
|
||||
@ -1,38 +1,37 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2005/09/21 15:15:49 alek Exp $
|
||||
--- configure Sat Aug 6 15:41:11 2005
|
||||
+++ configure Sat Aug 6 15:44:13 2005
|
||||
@@ -1358,7 +1358,6 @@ fi
|
||||
$OpenBSD: patch-configure,v 1.2 2005/10/07 20:15:13 alek Exp $
|
||||
--- configure.orig Wed Sep 14 08:34:42 2005
|
||||
+++ configure Fri Oct 7 21:52:45 2005
|
||||
@@ -2959,7 +2959,6 @@ fi
|
||||
rend_posix=true
|
||||
|
||||
STATIC_LIBS=no
|
||||
-CPPFLAGS="${CPPFLAGS} -g"
|
||||
|
||||
echo $ac_n "checking for pthread_creat in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:1365: checking for pthread_creat in -lc_r" >&5
|
||||
@@ -1399,14 +1398,14 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
|
||||
echo "$as_me:$LINENO: checking for pthread_creat in -lc_r" >&5
|
||||
echo $ECHO_N "checking for pthread_creat in -lc_r... $ECHO_C" >&6
|
||||
@@ -3028,13 +3027,13 @@ if test $ac_cv_lib_c_r_pthread_creat = y
|
||||
LDFLAGS="${LDFLAGS} -lc_r"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
- echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
-echo "configure:1404: checking for pthread_create in -lpthread" >&5
|
||||
+ echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
|
||||
+echo "configure:1404: checking for pthread_create in -pthread" >&5
|
||||
ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
||||
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
|
||||
+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
|
||||
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
|
||||
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_save_LIBS="$LIBS"
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 1412 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -1434,7 +1433,7 @@ LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
||||
echo "$ac_t""yes" 1>&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -3092,7 +3091,7 @@ fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
|
||||
if test $ac_cv_lib_pthread_pthread_create = yes; then
|
||||
- LDFLAGS="${LDFLAGS} -lpthread"
|
||||
+ LDFLAGS="${LDFLAGS} -pthread"
|
||||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
62
audio/mt-daapd/patches/patch-src_configfile_c
Normal file
62
audio/mt-daapd/patches/patch-src_configfile_c
Normal file
@ -0,0 +1,62 @@
|
||||
$OpenBSD: patch-src_configfile_c,v 1.1 2005/10/07 20:15:13 alek Exp $
|
||||
--- src/configfile.c.orig Sun Jan 30 05:32:35 2005
|
||||
+++ src/configfile.c Fri Oct 7 21:50:05 2005
|
||||
@@ -377,7 +377,7 @@ int config_read(char *file) {
|
||||
|
||||
|
||||
/* sanity check the paths */
|
||||
- sprintf(path_buffer,"%s/index.html",config.web_root);
|
||||
+ snprintf(path_buffer,sizeof(path_buffer),"%s/index.html",config.web_root);
|
||||
if((fin=fopen(path_buffer,"r")) == NULL) {
|
||||
err=-1;
|
||||
DPRINTF(E_LOG,L_CONF,"Invalid web_root\n");
|
||||
@@ -737,6 +737,7 @@ void config_emit_service_status(WS_CONNI
|
||||
int mdns_running;
|
||||
char *html;
|
||||
char buf[256];
|
||||
+ char tmpbuf[32];
|
||||
int r_days, r_hours, r_mins, r_secs;
|
||||
int scanning;
|
||||
|
||||
@@ -795,21 +796,28 @@ void config_emit_service_status(WS_CONNI
|
||||
r_mins=r_secs/60;
|
||||
r_secs -= 60 * r_mins;
|
||||
|
||||
- memset(buf,0x0,sizeof(buf));
|
||||
- if(r_days)
|
||||
- sprintf((char*)&buf[strlen(buf)],"%d day%s, ", r_days,
|
||||
- r_days == 1 ? "" : "s");
|
||||
+ memset(buf,0x0,sizeof(buf));
|
||||
+ if(r_days) {
|
||||
+ snprintf(tmpbuf,sizeof(tmpbuf),"%d day%s, ", r_days,
|
||||
+ r_days == 1 ? "" : "s");
|
||||
+ strlcat(buf,tmpbuf,sizeof(buf));
|
||||
+ }
|
||||
+
|
||||
+ if(r_days || r_hours) {
|
||||
+ snprintf(tmpbuf,sizeof(tmpbuf),"%d hour%s, ", r_hours,
|
||||
+ r_hours == 1 ? "" : "s");
|
||||
+ strlcat(buf,tmpbuf,sizeof(buf));
|
||||
+ }
|
||||
|
||||
- if(r_days || r_hours)
|
||||
- sprintf((char*)&buf[strlen(buf)],"%d hour%s, ", r_hours,
|
||||
- r_hours == 1 ? "" : "s");
|
||||
+ if(r_days || r_hours || r_mins) {
|
||||
+ snprintf(tmpbuf,sizeof(tmpbuf),"%d minute%s, ", r_mins,
|
||||
+ r_mins == 1 ? "" : "s");
|
||||
+ strlcat(buf,tmpbuf,sizeof(buf));
|
||||
+ }
|
||||
|
||||
- if(r_days || r_hours || r_mins)
|
||||
- sprintf((char*)&buf[strlen(buf)],"%d minute%s, ", r_mins,
|
||||
- r_mins == 1 ? "" : "s");
|
||||
-
|
||||
- sprintf((char*)&buf[strlen(buf)],"%d second%s ", r_secs,
|
||||
- r_secs == 1 ? "" : "s");
|
||||
+ snprintf(tmpbuf,sizeof(tmpbuf),"%d second%s ", r_secs,
|
||||
+ r_secs == 1 ? "" : "s");
|
||||
+ strlcat(buf,tmpbuf,sizeof(buf));
|
||||
|
||||
ws_writefd(pwsc," <TD>%s</TD>\n",buf);
|
||||
ws_writefd(pwsc,"</TR>\n");
|
||||
12
audio/mt-daapd/patches/patch-src_mp3-scanner_c
Normal file
12
audio/mt-daapd/patches/patch-src_mp3-scanner_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-src_mp3-scanner_c,v 1.1 2005/10/07 20:15:13 alek Exp $
|
||||
--- src/mp3-scanner.c.orig Sat Feb 5 22:22:47 2005
|
||||
+++ src/mp3-scanner.c Fri Oct 7 21:50:05 2005
|
||||
@@ -1748,7 +1748,7 @@ void make_composite_tags(MP3FILE *song)
|
||||
}
|
||||
}
|
||||
|
||||
- sprintf(fdescr,"%s audio file",song->type);
|
||||
+ snprintf(fdescr,sizeof(fdescr),"%s audio file",song->type);
|
||||
song->description = strdup(fdescr);
|
||||
|
||||
if(song->url) {
|
||||
@ -5,7 +5,8 @@ Some random features:
|
||||
|
||||
o Can advertise shoutcast streams.
|
||||
o Is web-configurable and managable.
|
||||
o Supports dynamic playlists, like iTunes "Smart" playlists
|
||||
o Supports dynamic playlists, like iTunes "Smart" playlists.
|
||||
o Now supports iTunes 5!
|
||||
|
||||
Things to watch out for:
|
||||
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/09/21 15:15:49 alek Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2005/10/07 20:15:13 alek Exp $
|
||||
sbin/mt-daapd
|
||||
share/examples/mt-daapd/
|
||||
share/examples/mt-daapd/mt-daapd.conf
|
||||
@sample ${SYSCONFDIR}/mt-daapd.conf
|
||||
share/examples/mt-daapd/mt-daapd.playlist
|
||||
@sample ${SYSCONFDIR}/mt-daapd.playlist
|
||||
share/examples/mt-daapd/mt-daapd.spec
|
||||
share/mt-daapd/
|
||||
share/mt-daapd/admin-root/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user