in case anyone's interested, here's an update to minidlna from their
devel branch, use patch -E, lots of patches to rm.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/minidlna/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 15 Mar 2013 17:15:24 -0000 1.5
+++ Makefile 15 Mar 2013 17:47:27 -0000
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2013/03/15 17:15:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2013/03/11 11:35:44 espie Exp $
COMMENT= lightweight DLNA/UPnP-AV media server
-V= 1.0.25
-REVISION= 2
-DISTNAME= minidlna_$V_src
-WRKDIST= ${WRKDIR}/minidlna-$V
+V= 1.1.0pre20130315
+#DISTNAME= minidlna_$V_src
+DISTNAME= minidlna-$V
+WRKDIST= ${WRKDIR}/minidlna
PKGNAME= minidlna-$V
CATEGORIES= multimedia
@@ -17,10 +17,23 @@ HOMEPAGE= http://sourceforge.net/project
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += FLAC avcodec avformat avutil c exif id3tag jpeg ogg
+WANTLIB += FLAC avformat avutil c exif id3tag jpeg ogg
WANTLIB += pthread sqlite3 vorbis
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=minidlna/}
+MASTER_SITES= http://spacehopper.org/mirrors/
+
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= \
+ --with-log-path=/var/log/minidlna \
+ --with-db-path=/var/db/minidlna
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \
+ ${MODGNU_AUTOMAKE_DEPENDS}
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.11
MODULES= devel/gettext
LIB_DEPENDS= audio/flac \
@@ -29,17 +42,15 @@ LIB_DEPENDS= audio/flac \
graphics/jpeg \
graphics/libexif
-MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+xyMAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
INSTALLPREFIX="${WRKINST}${TRUEPREFIX}"
-CFLAGS+= -Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
- -I${LOCALBASE}/include
-LDFLAGS= -L${LOCALBASE}/lib
+CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}"
NO_TEST= Yes
E= ${PREFIX}/share/examples/minidlna
-do-configure:
- @cd ${WRKSRC} && perl -pi -e 's,/usr/local,${LOCALBASE},g' genconfig.sh
+post-patch:
+ cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION}
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
post-install:
${INSTALL_DATA_DIR} $E
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/minidlna/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ distinfo 15 Mar 2013 17:47:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (minidlna_1.0.25_src.tar.gz) =
FwVg++BCwrvLp4xfFbVPT6wyH/dwSQsjtVeJvkY/KFE=
-SIZE (minidlna_1.0.25_src.tar.gz) = 211756
+SHA256 (minidlna-1.1.0pre20130315.tar.gz) =
fiNiQxtXZ1sVzzSbGMGd/+WdNLZKw8/C52wHGr7b8es=
+SIZE (minidlna-1.1.0pre20130315.tar.gz) = 213327
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 15 Mar 2013 17:15:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,40 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.2 2013/03/15 17:15:24 sthen Exp $
---- Makefile.orig Tue Jan 17 22:49:01 2012
-+++ Makefile Fri Mar 15 17:08:35 2013
-@@ -30,7 +30,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdescgen.o upnpsoa
- upnpreplyparse.o minixml.o \
- getifaddr.o daemonize.o upnpglobalvars.o \
- options.o minissdp.o uuid.o upnpevents.o \
-- sql.o utils.o metadata.o scanner.o inotify.o \
-+ sql.o utils.o metadata.o scanner.o \
- tivo_utils.o tivo_beacon.o tivo_commands.o \
- tagutils/textutils.o tagutils/misc.o tagutils/tagutils.o \
- playlist.o image_utils.o albumart.o log.o
-@@ -64,14 +64,14 @@ install-conf:
- $(INSTALL) -d $(ETCINSTALLDIR)
- $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
-
--minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+minidlna: $(BASEOBJS) $(LNXOBJS)
- @echo Linking $@
-- @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS)
-
-
- testupnpdescgen: $(TESTUPNPDESCGENOBJS)
- @echo Linking $@
-- @$(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS)
-+ $(CC) $(CFLAGS) -o $@ $(TESTUPNPDESCGENOBJS)
-
- config.h: genconfig.sh
- ./genconfig.sh
-@@ -128,8 +128,4 @@ log.o: log.h
- .SUFFIXES: .c .o
-
- .c.o:
-- @echo Compiling $*.c
-- @$(CC) $(CFLAGS) -o $@ -c $< && exit 0;\
-- echo "The following command failed:" 1>&2;\
-- echo "$(CC) $(CFLAGS) -o $@ -c $<";\
-- $(CC) $(CFLAGS) -o $@ -c $< &>/dev/null
-+ $(CC) $(CFLAGS) -o $@ -c $<
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure_ac 15 Mar 2013 17:47:27 -0000
@@ -0,0 +1,29 @@
+$OpenBSD$
+--- configure.ac.orig Wed Mar 13 07:44:54 2013
++++ configure.ac Fri Mar 15 17:21:28 2013
+@@ -412,14 +412,14 @@ AC_CHECK_LIB(vorbisfile, ov_open_callbacks,
+ AM_CONDITIONAL(HAVE_VORBISFILE, false)
+ AC_DEFINE(HAVE_VORBISFILE,0,[lacking vorbisfile]))],
+ AM_CONDITIONAL(HAVE_VORBISFILE, false),
+- -lvorbis -logg)
++ -lvorbis -logg -lm)
+ AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init_stream,
+ [AC_CHECK_HEADERS([FLAC/all.h],
+ AM_CONDITIONAL(HAVE_FLAC, true)
+ AC_DEFINE(HAVE_FLAC,1,[Have flac]),
+ AM_CONDITIONAL(HAVE_FLAC, false))],
+ AM_CONDITIONAL(HAVE_FLAC, false),
+- -logg)
++ -logg -lm)
+ # test without -logg to see whether we really need it (libflac can be without)
+ AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init_ogg_stream,
+ AM_CONDITIONAL(HAVE_FLAC, true)
+@@ -429,7 +429,7 @@ AC_CHECK_LIB(FLAC, FLAC__stream_decoder_init_ogg_strea
+ AC_CHECK_LIB(vorbisfile, vorbis_comment_query,
+ AM_CONDITIONAL(NEED_VORBIS, false),
+ AM_CONDITIONAL(NEED_VORBIS, true),
+- -logg)
++ -logg -lm)
+
+
################################################################################################################
+ ### Header checks
Index: patches/patch-genconfig_sh
===================================================================
RCS file: patches/patch-genconfig_sh
diff -N patches/patch-genconfig_sh
--- patches/patch-genconfig_sh 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-$OpenBSD: patch-genconfig_sh,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- genconfig.sh.orig Sat Jan 21 00:34:13 2012
-+++ genconfig.sh Sat Sep 22 02:17:59 2012
-@@ -38,31 +38,6 @@ PNPX="#define PNPX 0"
-
- ${RM} ${CONFIGFILE}
-
--# Detect if there are missing headers
--# NOTE: This check only works with a normal distro
--[ ! -e "/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING"
--[ ! -e "/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING"
--[ ! -e "/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING"
--[ ! -e "/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING"
--[ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING"
--[ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING"
--[ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING"
--[ ! -e "/usr/include/ffmpeg/avutil.h" -a \
-- ! -e "/usr/include/libavutil/avutil.h" -a \
-- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil
$MISSING"
--[ ! -e "/usr/include/ffmpeg/avformat.h" -a \
-- ! -e "/usr/include/libavformat/avformat.h" -a \
-- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat
$MISSING"
--[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \
-- ! -e "/usr/include/libavcodec/avcodec.h" -a \
-- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec
$MISSING"
--if [ -n "$MISSING" ]; then
-- echo -e "\nERROR! Cannot continue."
-- echo -e "The following required libraries are either missing, or are
missing development headers:\n"
-- echo -e "$MISSING\n"
-- exit 1
--fi
--
- echo "/* MiniDLNA Project" >> ${CONFIGFILE}
- echo " * http://sourceforge.net/projects/minidlna/"; >> ${CONFIGFILE}
- echo " * (c) 2008-2009 Justin Maggard" >> ${CONFIGFILE}
-@@ -86,6 +61,8 @@ case $OS_NAME in
- echo "#define PFRULE_INOUT_COUNTS" >> ${CONFIGFILE}
- fi
- OS_URL=http://www.openbsd.org/
-+ LOG_PATH="/var/log/minidlna"
-+ DB_PATH="/var/db/minidlna"
- ;;
- FreeBSD)
- VER=`grep '#define __FreeBSD_version' /usr/include/sys/param.h
| awk '{print $3}'`
-@@ -183,7 +160,7 @@ fi
- echo "" >> ${CONFIGFILE}
-
- echo "/* Enable if the system iconv.h exists. ID3 tag reading in various
character sets will not work properly otherwise. */" >> ${CONFIGFILE}
--if [ -f /usr/include/iconv.h ]; then
-+if [ -f /usr/include/iconv.h -o -f /usr/local/include/iconv.h ]; then
- echo "#define HAVE_ICONV_H" >> ${CONFIGFILE}
- else
- echo -e "\nWARNING!! Iconv support not found. ID3 tag reading may not work."
-@@ -192,7 +169,7 @@ fi
- echo "" >> ${CONFIGFILE}
-
- echo "/* Enable if the system libintl.h exists for NLS support. */" >>
${CONFIGFILE}
--if [ -f /usr/include/libintl.h ]; then
-+if [ -f /usr/include/libintl.h -o -f /usr/local/include/libintl.h ]; then
- echo "#define ENABLE_NLS" >> ${CONFIGFILE}
- else
- echo "/*#define ENABLE_NLS*/" >> ${CONFIGFILE}
Index: patches/patch-getifaddr_c
===================================================================
RCS file: patches/patch-getifaddr_c
diff -N patches/patch-getifaddr_c
--- patches/patch-getifaddr_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@
-$OpenBSD: patch-getifaddr_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- getifaddr.c.orig Sat Jul 14 00:31:17 2012
-+++ getifaddr.c Tue Oct 9 19:55:34 2012
-@@ -34,8 +34,10 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <net/if.h>
-+#include <net/if_dl.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
-+#include <ifaddrs.h>
- #include <netdb.h>
- #include <errno.h>
- #if defined(sun)
-@@ -80,7 +82,7 @@ getifaddr(const char * ifname, char * buf, int len)
- }
- if(ioctl(s, SIOCGIFNETMASK, &ifr, &ifrlen) == 0)
- {
-- addr = (struct sockaddr_in *)&ifr.ifr_netmask;
-+ addr = (struct sockaddr_in *)&ifr.ifr_addr;
- mask = ntohl(addr->sin_addr.s_addr);
- for (i = 0; i < 32; i++)
- {
-@@ -154,53 +156,42 @@ getsysaddrs(void)
- int
- getsyshwaddr(char * buf, int len)
- {
-- struct if_nameindex *ifaces, *if_idx;
- unsigned char mac[6];
-- struct ifreq ifr;
-- int fd;
-+ struct ifaddrs *ifa, *ifap;
- int ret = -1;
-
- memset(&mac, '\0', sizeof(mac));
-- /* Get the spatially unique node identifier */
-- fd = socket(AF_INET, SOCK_DGRAM, 0);
-- if( fd < 0 )
-- return(ret);
-
-- ifaces = if_nameindex();
-- if(!ifaces)
-+ if (getifaddrs(&ifa) == -1)
- return(ret);
-
-- for(if_idx = ifaces; if_idx->if_index; if_idx++)
-- {
-- strncpy(ifr.ifr_name, if_idx->if_name, IFNAMSIZ);
-- if(ioctl(fd, SIOCGIFFLAGS, &ifr) < 0)
-+ for (ifap = ifa; ifap != NULL; ifap = ifap->ifa_next){
-+
-+ if (ifap->ifa_flags & IFF_LOOPBACK)
- continue;
-- if(ifr.ifr_ifru.ifru_flags & IFF_LOOPBACK)
-+
-+#define IFA_LL_ADDR LLADDR((struct sockaddr_dl *)ifap->ifa_addr)
-+ if( MACADDR_IS_ZERO(IFA_LL_ADDR) )
- continue;
-- if( ioctl(fd, SIOCGIFHWADDR, &ifr) < 0 )
-- continue;
-- if( MACADDR_IS_ZERO(ifr.ifr_hwaddr.sa_data) )
-- continue;
- ret = 0;
- break;
- }
-- if_freenameindex(ifaces);
-- close(fd);
-
- if(ret == 0)
- {
- if(len > 12)
- {
-- memmove(mac, ifr.ifr_hwaddr.sa_data, 6);
-+ memmove(mac, IFA_LL_ADDR, 6);
- sprintf(buf, "%02x%02x%02x%02x%02x%02x",
- mac[0]&0xFF, mac[1]&0xFF, mac[2]&0xFF,
- mac[3]&0xFF, mac[4]&0xFF, mac[5]&0xFF);
- }
- else if(len == 6)
- {
-- memmove(buf, ifr.ifr_hwaddr.sa_data, 6);
-+ memmove(buf, IFA_LL_ADDR, 6);
- }
- }
-+ freeifaddrs(ifa);
- return ret;
- }
-
Index: patches/patch-image_utils_c
===================================================================
RCS file: patches/patch-image_utils_c
diff -N patches/patch-image_utils_c
--- patches/patch-image_utils_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-image_utils_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- image_utils.c.orig Sat Sep 22 01:17:44 2012
-+++ image_utils.c Sat Sep 22 01:17:59 2012
-@@ -32,7 +32,7 @@
- #include <unistd.h>
- #include <setjmp.h>
- #include <jpeglib.h>
--#include <endian.h>
-+#include <sys/endian.h>
-
- #include "upnpreplyparse.h"
- #include "image_utils.h"
Index: patches/patch-libav_h
===================================================================
RCS file: patches/patch-libav_h
diff -N patches/patch-libav_h
--- patches/patch-libav_h 15 Mar 2013 17:15:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-$OpenBSD: patch-libav_h,v 1.1 2013/03/15 17:15:24 sthen Exp $
---- libav.h.orig Fri Mar 15 16:50:53 2013
-+++ libav.h Fri Mar 15 16:50:47 2013
-@@ -0,0 +1,3 @@
-+#include <libavutil/avutil.h>
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
Index: patches/patch-metadata_c
===================================================================
RCS file: patches/patch-metadata_c
diff -N patches/patch-metadata_c
--- patches/patch-metadata_c 15 Mar 2013 17:15:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-$OpenBSD: patch-metadata_c,v 1.2 2013/03/15 17:15:24 sthen Exp $
---- metadata.c.orig Fri Jun 29 22:11:29 2012
-+++ metadata.c Fri Mar 15 16:53:09 2013
-@@ -19,6 +19,7 @@
- #include <ctype.h>
- #include <string.h>
- #include <stdlib.h>
-+#include <libgen.h>
- #include <sys/stat.h>
-
- #include <unistd.h>
-@@ -30,9 +31,7 @@
- #include "image_utils.h"
- #include <jpeglib.h>
- #include <setjmp.h>
--#include <avutil.h>
--#include <avcodec.h>
--#include <avformat.h>
-+#include "libav.h"
- #include "tagutils/tagutils.h"
-
- #include "upnpglobalvars.h"
-@@ -117,14 +116,6 @@ lav_close(AVFormatContext *ctx)
- #endif
- }
-
--#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(31<<8)+0)
--# if LIBAVUTIL_VERSION_INT < ((51<<16)+(5<<8)+0)
--#define AV_DICT_IGNORE_SUFFIX AV_METADATA_IGNORE_SUFFIX
--#define av_dict_get av_metadata_get
--typedef AVMetadataTag AVDictionaryEntry;
--# endif
--#endif
--
- /* This function shamelessly copied from libdlna */
- #define MPEG_TS_SYNC_CODE 0x47
- #define MPEG_TS_PACKET_LENGTH 188
-@@ -1024,8 +1015,11 @@ GetVideoMetadata(const char * path, char * name)
- vc->height *
vc->sample_aspect_ratio.den,
- 1024*1024);
- }
-- fps =
ctx->streams[video_stream]->r_frame_rate.num /
ctx->streams[video_stream]->r_frame_rate.den;
-- interlaced =
(ctx->streams[video_stream]->r_frame_rate.num / vc->time_base.den);
-+ if
(ctx->streams[video_stream]->r_frame_rate.den)
-+ fps =
ctx->streams[video_stream]->r_frame_rate.num /
ctx->streams[video_stream]->r_frame_rate.den;
-+ else
-+ fps = 0;
-+ interlaced = vc->time_base.den ?
(ctx->streams[video_stream]->r_frame_rate.num / vc->time_base.den) : 0;
- if( ((((vc->width == 1920 || vc->width
== 1440) && vc->height == 1080) ||
- (vc->width == 720 && vc->height
== 480)) && fps == 59 && interlaced) ||
- ((vc->width == 1280 && vc->height
== 720) && fps == 59 && !interlaced) )
Index: patches/patch-minidlna_c
===================================================================
RCS file: patches/patch-minidlna_c
diff -N patches/patch-minidlna_c
--- patches/patch-minidlna_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-minidlna_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- minidlna.c.orig Tue May 8 01:10:42 2012
-+++ minidlna.c Sat Sep 22 01:29:04 2012
-@@ -46,6 +46,7 @@
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-+#include <sys/stat.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-@@ -85,7 +86,9 @@
- #include "daemonize.h"
- #include "upnpevents.h"
- #include "scanner.h"
-+#ifdef __linux__
- #include "inotify.h"
-+#endif
- #include "log.h"
- #ifdef TIVO_SUPPORT
- #include "tivo_beacon.h"
-@@ -960,11 +963,13 @@ main(int argc, char * * argv)
- #endif
- }
- signal(SIGCHLD, SIG_IGN);
-+#if defined(__linux__)
- if( sqlite3_threadsafe() && sqlite3_libversion_number() >= 3005001 &&
- GETFLAG(INOTIFY_MASK) && pthread_create(&inotify_thread, NULL,
start_inotify, NULL) )
- {
- DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for
start_inotify.\n");
- }
-+#endif
-
- for( i = 0; i < n_lan_addr; i++ )
- {
-@@ -972,6 +977,7 @@ main(int argc, char * * argv)
- lan_addr[i].str, inet_ntoa(lan_addr[i].mask));
- }
-
-+// freebsd does this:- sudp = OpenAndConfSSDPReceiveSocket();
- sudp = OpenAndConfSSDPReceiveSocket(n_lan_addr, lan_addr);
- if(sudp < 0)
- {
Index: patches/patch-minidlna_conf
===================================================================
RCS file: /cvs/ports/multimedia/minidlna/patches/patch-minidlna_conf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-minidlna_conf
--- patches/patch-minidlna_conf 11 Oct 2012 17:59:05 -0000 1.2
+++ patches/patch-minidlna_conf 15 Mar 2013 17:47:27 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-minidlna_conf,v 1.2 2012
default directories, plus we don't use inotify
---- minidlna.conf.orig Tue Feb 14 19:26:53 2012
-+++ minidlna.conf Thu Oct 11 19:57:58 2012
-@@ -1,8 +1,9 @@
+--- minidlna.conf.orig Wed Oct 3 08:26:00 2012
++++ minidlna.conf Mon Feb 18 21:13:03 2013
+@@ -1,11 +1,12 @@
# port for HTTP (descriptions, SOAP, media transfer) traffic
+# if firewalling, this TCP port, as well as UDP port 1900, must be open.
port=8200
@@ -13,9 +13,20 @@ default directories, plus we don't use i
-#network_interface=eth0
+#network_interface=em0
+ # specify the user account name or uid to run as
+-#user=jmaggard
++#user=_minidlna
+
# set this to the directory you want scanned.
- # * if have multiple directories, you can have multiple media_dir= lines
-@@ -17,22 +18,18 @@ media_dir=/opt
+ # * if you want multiple directories, you can have multiple media_dir= lines
+@@ -15,28 +16,24 @@ port=8200
+ # + "V" for video (eg. media_dir=V,/home/jmaggard/Videos)
+ # + "P" for images (eg. media_dir=P,/home/jmaggard/Pictures)
+ # + "PV" for pictures and video (eg.
media_dir=AV,/home/jmaggard/digital_camera)
+-media_dir=/opt
++media_dir=/share
+
+ # set this if you want to customize the name that shows up on your clients
#friendly_name=My DLNA Server
# set this if you would like to specify the directory where you want MiniDLNA
to store its database and album art cache
Index: patches/patch-scanner_c
===================================================================
RCS file: patches/patch-scanner_c
diff -N patches/patch-scanner_c
--- patches/patch-scanner_c 15 Mar 2013 17:15:24 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-scanner_c,v 1.2 2013/03/15 17:15:24 sthen Exp $
---- scanner.c.orig Fri Jun 29 22:11:29 2012
-+++ scanner.c Fri Mar 15 16:53:37 2013
-@@ -26,6 +26,7 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-+#include <sys/syslimits.h>
-
- #include "config.h"
-
-@@ -138,7 +139,7 @@ insert_containers(const char * name, const char *path,
- if( strstr(class, "imageItem") )
- {
- char *date = NULL, *cam = NULL;
-- char date_taken[13], camera[64];
-+ char date_taken[24], camera[64];
- static struct virtual_item last_date;
- static struct virtual_item last_cam;
- static struct virtual_item last_camdate;
-@@ -159,7 +160,7 @@ insert_containers(const char * name, const char *path,
- }
- else
- {
-- strcpy(date_taken, _("Unknown Date"));
-+ snprintf(date_taken, sizeof(date_taken), "%s",
_("Unknown Date"));
- }
- if( valid_cache && strcmp(last_date.name, date_taken) == 0 )
- {
Index: patches/patch-tagutils_misc_c
===================================================================
RCS file: patches/patch-tagutils_misc_c
diff -N patches/patch-tagutils_misc_c
--- patches/patch-tagutils_misc_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tagutils_misc_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- tagutils/misc.c.orig Sat Sep 22 01:18:18 2012
-+++ tagutils/misc.c Sat Sep 22 01:18:21 2012
-@@ -21,7 +21,7 @@
-
- #include <stdio.h>
- #include <string.h>
--#include <endian.h>
-+#include <sys/endian.h>
-
- #include "misc.h"
-
Index: patches/patch-tagutils_tagutils-asf_h
===================================================================
RCS file: patches/patch-tagutils_tagutils-asf_h
diff -N patches/patch-tagutils_tagutils-asf_h
--- patches/patch-tagutils_tagutils-asf_h 10 Oct 2012 10:45:05 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tagutils_tagutils-asf_h,v 1.1.1.1 2012/10/10 10:45:05 sthen
Exp $
---- tagutils/tagutils-asf.h.orig Sat Sep 22 01:19:12 2012
-+++ tagutils/tagutils-asf.h Sat Sep 22 01:19:19 2012
-@@ -23,7 +23,7 @@
-
- #define __PACKED__ __attribute__((packed))
-
--#include <endian.h>
-+#include <sys/endian.h>
-
- typedef struct _GUID {
- __u32 l;
Index: patches/patch-tagutils_tagutils-plist_c
===================================================================
RCS file: patches/patch-tagutils_tagutils-plist_c
diff -N patches/patch-tagutils_tagutils-plist_c
--- patches/patch-tagutils_tagutils-plist_c 15 Mar 2013 17:15:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tagutils_tagutils-plist_c,v 1.1 2013/03/15 17:15:24 sthen Exp $
---- tagutils/tagutils-plist.c.orig Fri Mar 15 16:53:54 2013
-+++ tagutils/tagutils-plist.c Fri Mar 15 16:54:06 2013
-@@ -27,7 +27,7 @@
- #include "misc.h"
- #include "tagutils.h"
- #include "textutils.h"
--#include "log.h"
-+#include "../log.h"
-
-
- #define MAX_BUF 4096
Index: patches/patch-tagutils_tagutils_c
===================================================================
RCS file: patches/patch-tagutils_tagutils_c
diff -N patches/patch-tagutils_tagutils_c
--- patches/patch-tagutils_tagutils_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-tagutils_tagutils_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- tagutils/tagutils.c.orig Sat Sep 22 01:48:11 2012
-+++ tagutils/tagutils.c Sat Sep 22 01:48:19 2012
-@@ -27,6 +27,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-+#include <libgen.h>
- #include <fcntl.h>
- #include <unistd.h>
- #include <time.h>
Index: patches/patch-upnpglobalvars_c
===================================================================
RCS file: patches/patch-upnpglobalvars_c
diff -N patches/patch-upnpglobalvars_c
--- patches/patch-upnpglobalvars_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-upnpglobalvars_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- upnpglobalvars.c.orig Tue Feb 14 18:44:56 2012
-+++ upnpglobalvars.c Sat Sep 22 02:08:06 2012
-@@ -47,8 +47,8 @@
- * POSSIBILITY OF SUCH DAMAGE.
- */
- #include <sys/types.h>
-+#include <sys/syslimits.h>
- #include <netinet/in.h>
--#include <linux/limits.h>
-
- #include "config.h"
- #include "upnpglobalvars.h"
-@@ -63,7 +63,7 @@ time_t startup_time = 0;
- struct runtime_vars_s runtime_vars;
- uint32_t runtime_flags = INOTIFY_MASK;
-
--const char * pidfilename = "/var/run/minidlna.pid";
-+const char * pidfilename = "/var/run/minidlna/minidlna.pid";
-
- char uuidvalue[] = "uuid:00000000-0000-0000-0000-000000000000";
- char modelname[MODELNAME_MAX_LEN] = ROOTDEV_MODELNAME;
Index: patches/patch-upnphttp_c
===================================================================
RCS file: /cvs/ports/multimedia/minidlna/patches/patch-upnphttp_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-upnphttp_c
--- patches/patch-upnphttp_c 15 Mar 2013 17:15:24 -0000 1.2
+++ patches/patch-upnphttp_c 15 Mar 2013 17:47:27 -0000
@@ -1,33 +1,7 @@
-$OpenBSD: patch-upnphttp_c,v 1.2 2013/03/15 17:15:24 sthen Exp $
---- upnphttp.c.orig Sat Jun 30 01:31:43 2012
-+++ upnphttp.c Fri Mar 15 16:57:19 2013
-@@ -58,7 +58,9 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-+#if defined(__linux__)
- #include <sys/sendfile.h>
-+#endif
- #include <arpa/inet.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -1316,6 +1318,7 @@ send_file(struct upnphttp * h, int sendfd, off_t offse
-
- while( offset < end_offset )
- {
-+#if defined(__linux__)
- if( try_sendfile )
- {
- send_size = ( ((end_offset - offset) < MAX_BUFFER_SIZE)
? (end_offset - offset + 1) : MAX_BUFFER_SIZE);
-@@ -1335,6 +1338,7 @@ send_file(struct upnphttp * h, int sendfd, off_t offse
- continue;
- }
- }
-+#endif
- /* Fall back to regular I/O */
- if( !buf )
- buf = malloc(MIN_BUFFER_SIZE);
-@@ -1411,6 +1415,10 @@ SendResp_icon(struct upnphttp * h, char * icon)
+$OpenBSD: patch-upnphttp_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
+--- upnphttp.c.orig Sat Jul 28 02:16:43 2012
++++ upnphttp.c Mon Feb 18 14:33:15 2013
+@@ -1415,6 +1415,10 @@ SendResp_icon(struct upnphttp * h, char * icon)
"Server: "
MINIDLNA_SERVER_STRING "\r\n\r\n",
mime, size, date);
@@ -38,90 +12,3 @@ $OpenBSD: patch-upnphttp_c,v 1.2 2013/03
if( send_data(h, header, ret, MSG_MORE) == 0 )
{
if( h->req_command != EHead )
-@@ -1424,12 +1432,11 @@ SendResp_albumArt(struct upnphttp * h, char * object)
- {
- char header[512];
- char *path;
-- char *dash;
- char date[30];
- time_t curtime = time(NULL);
- off_t size;
-- int fd;
-- int ret;
-+ long long id;
-+ int fd, ret;
-
- if( h->reqflags & (FLAG_XFERSTREAMING|FLAG_RANGE) )
- {
-@@ -1438,18 +1445,16 @@ SendResp_albumArt(struct upnphttp * h, char * object)
- return;
- }
-
-- dash = strchr(object, '-');
-- if( dash )
-- *dash = '\0';
-+ id = strtoll(object, NULL, 10);
-
-- path = sql_get_text_field(db, "SELECT PATH from ALBUM_ART where ID =
'%s'", object);
-+ path = sql_get_text_field(db, "SELECT PATH from ALBUM_ART where ID =
'%lld'", id);
- if( !path )
- {
- DPRINTF(E_WARN, L_HTTP, "ALBUM_ART ID %s not found, responding
ERROR 404\n", object);
- Send404(h);
- return;
- }
-- DPRINTF(E_INFO, L_HTTP, "Serving album art ID: %s [%s]\n", object,
path);
-+ DPRINTF(E_INFO, L_HTTP, "Serving album art ID: %lld [%s]\n", id, path);
-
- fd = open(path, O_RDONLY);
- if( fd < 0 ) {
-@@ -1492,17 +1497,19 @@ SendResp_caption(struct upnphttp * h, char * object)
- char date[30];
- time_t curtime = time(NULL);
- off_t size;
-+ long long id;
- int fd, ret;
-
-- strip_ext(object);
-- path = sql_get_text_field(db, "SELECT PATH from CAPTIONS where ID =
%s", object);
-+ id = strtoll(object, NULL, 10);
-+
-+ path = sql_get_text_field(db, "SELECT PATH from CAPTIONS where ID =
%lld", id);
- if( !path )
- {
- DPRINTF(E_WARN, L_HTTP, "CAPTION ID %s not found, responding
ERROR 404\n", object);
- Send404(h);
- return;
- }
-- DPRINTF(E_INFO, L_HTTP, "Serving caption ID: %s [%s]\n", object, path);
-+ DPRINTF(E_INFO, L_HTTP, "Serving caption ID: %lld [%s]\n", id, path);
-
- fd = open(path, O_RDONLY);
- if( fd < 0 ) {
-@@ -1541,6 +1548,7 @@ SendResp_thumbnail(struct upnphttp * h, char * object)
- char *path;
- char date[30];
- time_t curtime = time(NULL);
-+ long long id;
- int ret;
- ExifData *ed;
- ExifLoader *l;
-@@ -1552,15 +1560,15 @@ SendResp_thumbnail(struct upnphttp * h, char * object)
- return;
- }
-
-- strip_ext(object);
-- path = sql_get_text_field(db, "SELECT PATH from DETAILS where ID =
'%s'", object);
-+ id = strtoll(object, NULL, 10);
-+ path = sql_get_text_field(db, "SELECT PATH from DETAILS where ID =
'%lld'", id);
- if( !path )
- {
- DPRINTF(E_WARN, L_HTTP, "DETAIL ID %s not found, responding
ERROR 404\n", object);
- Send404(h);
- return;
- }
-- DPRINTF(E_INFO, L_HTTP, "Serving thumbnail for ObjectId: %s [%s]\n",
object, path);
-+ DPRINTF(E_INFO, L_HTTP, "Serving thumbnail for ObjectId: %lld [%s]\n",
id, path);
-
- if( access(path, F_OK) != 0 )
- {
Index: patches/patch-upnpsoap_c
===================================================================
RCS file: patches/patch-upnpsoap_c
diff -N patches/patch-upnpsoap_c
--- patches/patch-upnpsoap_c 15 Mar 2013 17:15:24 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,108 +0,0 @@
-$OpenBSD: patch-upnpsoap_c,v 1.1 2013/03/15 17:15:24 sthen Exp $
---- upnpsoap.c.orig Fri Mar 15 16:57:24 2013
-+++ upnpsoap.c Fri Mar 15 17:01:30 2013
-@@ -1199,7 +1199,7 @@ BrowseContentDirectory(struct upnphttp * h, const char
- {
- ptr = sql_get_text_field(db, "SELECT OBJECT_ID from
OBJECTS"
- " where OBJECT_ID in "
-- "('"MUSIC_ID"$%s',
'"VIDEO_ID"$%s', '"IMAGE_ID"$%s')",
-+ "('"MUSIC_ID"$%q',
'"VIDEO_ID"$%q', '"IMAGE_ID"$%q')",
- ObjectID, ObjectID,
ObjectID);
- if( ptr )
- {
-@@ -1240,7 +1240,7 @@ BrowseContentDirectory(struct upnphttp * h, const char
- args.requested = 1;
- sql = sqlite3_mprintf("SELECT %s, " COLUMNS
- "from OBJECTS o left join DETAILS d on
(d.ID = o.DETAIL_ID)"
-- " where OBJECT_ID = '%s';",
-+ " where OBJECT_ID = '%q';",
- (args.flags & FLAG_ROOT_CONTAINER) ? "0,
-1" : "o.OBJECT_ID, o.PARENT_ID",
- ObjectID);
- ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg);
-@@ -1248,7 +1248,7 @@ BrowseContentDirectory(struct upnphttp * h, const char
- }
- else
- {
-- ret = sql_get_int_field(db, "SELECT count(*) from OBJECTS where
PARENT_ID = '%s'", ObjectID);
-+ ret = sql_get_int_field(db, "SELECT count(*) from OBJECTS where
PARENT_ID = '%q'", ObjectID);
- totalMatches = (ret > 0) ? ret : 0;
- ret = 0;
- if( SortCriteria )
-@@ -1289,7 +1289,7 @@ BrowseContentDirectory(struct upnphttp * h, const char
-
- sql = sqlite3_mprintf( SELECT_COLUMNS
- "from OBJECTS o left join DETAILS d on
(d.ID = o.DETAIL_ID)"
-- " where PARENT_ID = '%s' %s limit %d,
%d;",
-+ " where PARENT_ID = '%q' %s limit %d,
%d;",
- ObjectID, orderBy, StartingIndex,
RequestedCount);
- DPRINTF(E_DEBUG, L_HTTP, "Browse SQL: %s\n", sql);
- ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg);
-@@ -1305,7 +1305,7 @@ BrowseContentDirectory(struct upnphttp * h, const char
- /* Does the object even exist? */
- if( !totalMatches )
- {
-- ret = sql_get_int_field(db, "SELECT count(*) from OBJECTS where
OBJECT_ID = '%s'", ObjectID);
-+ ret = sql_get_int_field(db, "SELECT count(*) from OBJECTS where
OBJECT_ID = '%q'", ObjectID);
- if( ret <= 0 )
- {
- SoapError(h, 701, "No such object error");
-@@ -1397,7 +1397,7 @@ SearchContentDirectory(struct upnphttp * h, const char
- {
- ptr = sql_get_text_field(db, "SELECT OBJECT_ID from
OBJECTS"
- " where OBJECT_ID in "
-- "('"MUSIC_ID"$%s',
'"VIDEO_ID"$%s', '"IMAGE_ID"$%s')",
-+ "('"MUSIC_ID"$%q',
'"VIDEO_ID"$%q', '"IMAGE_ID"$%q')",
- ContainerID, ContainerID,
ContainerID);
- if( ptr )
- {
-@@ -1407,7 +1407,7 @@ SearchContentDirectory(struct upnphttp * h, const char
- }
- }
- DPRINTF(E_DEBUG, L_HTTP, "Searching ContentDirectory:\n"
-- " * ObjectID: %s\n"
-+ " * ObjectID: %q\n"
- " * Count: %d\n"
- " * StartingIndex: %d\n"
- " * SearchCriteria: %s\n"
-@@ -1467,10 +1467,10 @@ SearchContentDirectory(struct upnphttp * h, const char
-
- totalMatches = sql_get_int_field(db, "SELECT (select count(distinct
DETAIL_ID)"
- " from OBJECTS o left join DETAILS
d on (o.DETAIL_ID = d.ID)"
-- " where (OBJECT_ID glob '%s$*')
and (%s))"
-+ " where (OBJECT_ID glob '%q$*')
and (%s))"
- " + "
- "(select count(*) from OBJECTS o
left join DETAILS d on (o.DETAIL_ID = d.ID)"
-- " where (OBJECT_ID = '%s') and
(%s))",
-+ " where (OBJECT_ID = '%q') and
(%s))",
- ContainerID, SearchCriteria,
ContainerID, SearchCriteria);
- if( totalMatches < 0 )
- {
-@@ -1503,14 +1503,14 @@ SearchContentDirectory(struct upnphttp * h, const char
-
- sql = sqlite3_mprintf( SELECT_COLUMNS
- "from OBJECTS o left join DETAILS d on (d.ID =
o.DETAIL_ID)"
-- " where OBJECT_ID glob '%s$*' and (%s) %s "
-+ " where OBJECT_ID glob '%q$*' and (%s) %s "
- "%z %s"
- " limit %d, %d",
- ContainerID, SearchCriteria, groupBy,
- (*ContainerID == '*') ? NULL :
- sqlite3_mprintf("UNION ALL " SELECT_COLUMNS
- "from OBJECTS o left join DETAILS
d on (d.ID = o.DETAIL_ID)"
-- " where OBJECT_ID = '%s' and (%s)
", ContainerID, SearchCriteria),
-+ " where OBJECT_ID = '%q' and (%s)
", ContainerID, SearchCriteria),
- orderBy, StartingIndex, RequestedCount);
- DPRINTF(E_DEBUG, L_HTTP, "Search SQL: %s\n", sql);
- ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg);
-@@ -1624,9 +1624,9 @@ SamsungSetBookmark(struct upnphttp * h, const char * a
- {
- ret = sql_exec(db, "INSERT OR REPLACE into BOOKMARKS"
- " VALUES "
-- "((select DETAIL_ID from OBJECTS where
OBJECT_ID = '%s'), %s)", ObjectID, PosSecond);
-+ "((select DETAIL_ID from OBJECTS where
OBJECT_ID = '%q'), %s)", ObjectID, PosSecond);
- if( ret != SQLITE_OK )
-- DPRINTF(E_WARN, L_METADATA, "Error setting bookmark %s
on ObjectID='%s'\n", PosSecond, ObjectID);
-+ DPRINTF(E_WARN, L_METADATA, "Error setting bookmark %s
on ObjectID='%q'\n", PosSecond, ObjectID);
- BuildSendAndCloseSoapResp(h, resp, sizeof(resp)-1);
- }
- else
Index: patches/patch-utils_c
===================================================================
RCS file: /cvs/ports/multimedia/minidlna/patches/patch-utils_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-utils_c
--- patches/patch-utils_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ patches/patch-utils_c 15 Mar 2013 17:47:27 -0000
@@ -2,18 +2,9 @@ $OpenBSD: patch-utils_c,v 1.1.1.1 2012/1
avoid mkdir /, from freebsd ports
---- utils.c.orig Tue Feb 14 18:26:53 2012
-+++ utils.c Sat Sep 22 02:48:43 2012
-@@ -19,7 +19,7 @@
- #include <ctype.h>
- #include <string.h>
- #include <stdlib.h>
--#include <linux/limits.h>
-+#include <sys/syslimits.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -253,13 +253,17 @@ make_dir(char * path, mode_t mode)
+--- utils.c.orig Sat Nov 3 09:45:45 2012
++++ utils.c Mon Feb 18 14:33:15 2013
+@@ -259,7 +259,9 @@ make_dir(char * path, mode_t mode)
++s;
}
@@ -24,12 +15,3 @@ avoid mkdir /, from freebsd ports
/* If we failed for any other reason than the directory
* already exists, output a diagnostic and return -1.*/
if (errno != EEXIST || (stat(path, &st) < 0 ||
!S_ISDIR(st.st_mode))) {
-- DPRINTF(E_WARN, L_GENERAL, "make_dir: cannot
create directory '%s'\n", path);
- if (c)
- *s = c;
-+ DPRINTF(E_WARN, L_GENERAL, "make_dir: cannot "
-+ "create directory '%.*s' (to create %s): "
-+ "%s\n", s - path, path, path, strerror(e));
- return -1;
- }
- }
Index: patches/patch-uuid_c
===================================================================
RCS file: patches/patch-uuid_c
diff -N patches/patch-uuid_c
--- patches/patch-uuid_c 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-$OpenBSD: patch-uuid_c,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
---- uuid.c.orig Thu Nov 11 23:48:13 2010
-+++ uuid.c Sat Sep 22 01:21:26 2012
-@@ -28,6 +28,7 @@
- #include <time.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/socket.h>
- #include <sys/syscall.h>
- #include <string.h>
- #include <net/if.h>
-@@ -46,15 +47,6 @@ static u_int32_t clock_seq;
- static const u_int32_t clock_seq_max = 0x3fff; /* 14 bits */
- static int clock_seq_initialized;
-
--unsigned long long
--monotonic_us(void)
--{
-- struct timespec ts;
--
-- syscall(__NR_clock_gettime, CLOCK_MONOTONIC, &ts);
-- return ts.tv_sec * 1000000ULL + ts.tv_nsec / 1000;
--}
--
- int
- read_bootid_node(unsigned char *buf, size_t size)
- {
-@@ -82,7 +74,6 @@ static void
- read_random_bytes(unsigned char *buf, size_t size)
- {
- int i;
-- pid_t pid;
-
- i = open("/dev/urandom", O_RDONLY);
- if(i >= 0)
-@@ -90,20 +81,6 @@ read_random_bytes(unsigned char *buf, size_t size)
- read(i, buf, size);
- close(i);
- }
-- /* Paranoia. /dev/urandom may be missing.
-- * rand() is guaranteed to generate at least [0, 2^15) range,
-- * but lowest bits in some libc are not so "random". */
-- srand(monotonic_us());
-- pid = getpid();
-- while(1)
-- {
-- for(i = 0; i < size; i++)
-- buf[i] ^= rand() >> 5;
-- if(pid == 0)
-- break;
-- srand(pid);
-- pid = 0;
-- }
- }
-
- void
-@@ -162,7 +139,7 @@ generate_uuid(unsigned char uuid_out[16])
- * nanosecond intervals since 00:00:00.00, 15 October 1582 (the date of
- * Gregorian reform to the Christian calendar).
- */
-- syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
-+ clock_gettime(CLOCK_REALTIME, &ts);
- time_all = ((u_int64_t)ts.tv_sec) * (NSEC_PER_SEC / 100);
- time_all += ts.tv_nsec / 100;
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/minidlna/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ pkg/PLIST 15 Mar 2013 17:47:27 -0000
@@ -3,7 +3,7 @@
@newuser _minidlna:705:_minidlna:daemon:minidlna
user:/nonexistent:/sbin/nologin
@extraunexec rm -rf /var/db/minidlna/*
@extraunexec rm -rf /var/log/minidlna/*
-@bin sbin/minidlna
+@bin sbin/minidlnad
share/examples/minidlna/
share/examples/minidlna/minidlna.conf
@sample ${SYSCONFDIR}/minidlna.conf
@@ -11,4 +11,16 @@ share/examples/minidlna/minidlna.conf
@sample /var/db/minidlna/
@sample /var/log/minidlna/
@owner
+share/locale/da/LC_MESSAGES/minidlna.mo
+share/locale/de/LC_MESSAGES/minidlna.mo
+share/locale/es/LC_MESSAGES/minidlna.mo
+share/locale/fr/LC_MESSAGES/minidlna.mo
+share/locale/it/LC_MESSAGES/minidlna.mo
+share/locale/ja/LC_MESSAGES/minidlna.mo
+share/locale/nb/LC_MESSAGES/minidlna.mo
+share/locale/nl/LC_MESSAGES/minidlna.mo
+share/locale/pl/LC_MESSAGES/minidlna.mo
+share/locale/ru/LC_MESSAGES/minidlna.mo
+share/locale/sl/LC_MESSAGES/minidlna.mo
+share/locale/sv/LC_MESSAGES/minidlna.mo
@rcscript ${RCDIR}/minidlna
Index: pkg/minidlna.rc
===================================================================
RCS file: /cvs/ports/multimedia/minidlna/pkg/minidlna.rc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 minidlna.rc
--- pkg/minidlna.rc 10 Oct 2012 10:45:05 -0000 1.1.1.1
+++ pkg/minidlna.rc 15 Mar 2013 17:47:27 -0000
@@ -2,7 +2,7 @@
#
# $OpenBSD: minidlna.rc,v 1.1.1.1 2012/10/10 10:45:05 sthen Exp $
-daemon="${TRUEPREFIX}/sbin/minidlna"
+daemon="${TRUEPREFIX}/sbin/minidlnad"
daemon_user="_minidlna"
. /etc/rc.d/rc.subr
