- Update to 1.0.25.

- Pass maintainership to submitter.

PR:             ports/176327
Submitted by:   William Grzybowski <william88@gmail.com>
Approved by:    Mikhail T. <mi@aldan.algebra.com>

net/minidlna/Makefile

@@ -2,14 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	minidlna
-PORTVERSION=	1.0.24
-PORTREVISION=	3
+PORTVERSION=	1.0.25
 PORTEPOCH=	1
 CATEGORIES=	net multimedia www
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}_${PORTVERSION}_src.tar.gz
 
-MAINTAINER=	mi@aldan.algebra.com
+MAINTAINER=	william88@gmail.com
 COMMENT=	Media-server compatible with "Digital Life Network Alliance"
 
 LIB_DEPENDS=	sqlite3:${PORTSDIR}/databases/sqlite3	\

net/minidlna/distinfo

@@ -1,2 +1,2 @@
-SHA256 (minidlna_1.0.24_src.tar.gz) = 840ac2303c23d63066912750391d1ebef7761b5b23493e590624a17670ceb942
-SIZE (minidlna_1.0.24_src.tar.gz) = 210775
+SHA256 (minidlna_1.0.25_src.tar.gz) = 170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851
+SIZE (minidlna_1.0.25_src.tar.gz) = 211756

net/minidlna/files/BSDmakefile

@@ -4,7 +4,7 @@ NO_MAN=	Ha-ha...
 OS!=	uname
 VERS!=	uname -r
 
-CFLAGS+=-I${FILESDIR} -I${.CURDIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
+CFLAGS=-I${FILESDIR} -I${.CURDIR} -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
 CFLAGS+=-I${LOCALBASE}/include/libavutil
 CFLAGS+=-DPREFIX='"${PREFIX}"' -DOS='"${OS}"' -DOSVERSION='"${VERS}"'
 CFLAGS+=-Wformat -Wunused -Wall

net/minidlna/files/getifaddr.c

@@ -6,6 +6,7 @@
  * All rights reserved.
  * 
  * Adapted to BSD by jayp and Mikhail T. -- 2010
+ *                   William Grzybowski -- 2013
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -55,6 +56,7 @@
 #include <sys/param.h>
 #include <net/if_dl.h>
 
+#include "upnpglobalvars.h"
 #include "getifaddr.h"
 #include "log.h"
 
@@ -91,40 +93,6 @@ getifaddr(const char * ifname, char * buf, int len)
 	return 0;
 }
 
-int
-getsysaddr(char * buf, int len)
-{
-	int rv=-1;
-	struct ifaddrs *ifap = NULL;
-	struct ifaddrs *ifnr;
-
-	if (getifaddrs(&ifap) != 0)
-		err(1, "getifaddrs");
-
-	for (ifnr = ifap; ifnr != NULL; ifnr = ifnr->ifa_next) {
-		if (ifnr->ifa_addr->sa_family == AF_INET) {
-			struct sockaddr_in *addr_in =
-			    (struct sockaddr_in *)ifnr->ifa_addr;
-
-			unsigned a =
-			    (htonl(addr_in->sin_addr.s_addr) >> 0x18) & 0xFF;
-
-			if (a==127)
-				continue;
-
-			if(!inet_ntop(AF_INET, &addr_in->sin_addr, buf, len)) {
-				warn("inet_ntop()");
-				break;
-			}
-			rv=0;
-			break;
-		}
-		rv=0;
-	}
-	freeifaddrs(ifap);
-	return rv;
-}
-
 static int
 getsysifname(char * buf, size_t len)
 {
@@ -242,3 +210,37 @@ get_remote_mac(struct in_addr ip_addr, unsigned char *mac)
         free(buf);
         return !found_entry;
 }
+
+
+int
+getsysaddrs(void)
+{
+        struct sockaddr_in *addr;
+        struct ifaddrs *ifap, *ifa;
+
+	getifaddrs(&ifap);
+        for(ifa=ifap;ifa;ifa=ifa->ifa_next) {
+		if(ifa->ifa_addr == NULL || ifa->ifa_netmask == NULL)
+                        continue;
+
+		addr = (struct sockaddr_in *) ifa->ifa_addr;
+		if(addr->sin_family != AF_INET)
+			continue;
+
+                memcpy(&lan_addr[n_lan_addr].addr, (void *) &addr->sin_addr, sizeof(lan_addr[n_lan_addr].addr));
+                if( !inet_ntop(AF_INET, (void *) &addr->sin_addr, lan_addr[n_lan_addr].str, sizeof(lan_addr[0].str)) )
+                {
+                        DPRINTF(E_ERROR, L_GENERAL, "inet_ntop(): %s\n", strerror(errno));
+                        continue;
+                }
+
+		addr = (struct sockaddr_in *) ifa->ifa_netmask;
+                memcpy(&lan_addr[n_lan_addr].mask, (void *) &addr->sin_addr, sizeof(lan_addr[n_lan_addr].mask));
+                n_lan_addr++;
+                if (n_lan_addr >= MAX_LAN_ADDR)
+                        break;
+        }
+	freeifaddrs(ifap);
+
+        return(n_lan_addr);
+}

net/minidlna/files/patch-type-mismatch

@@ -0,0 +1,52 @@
+diff --git log.c log.c
+index 91aa564..3f3b503 100644
+--- log.c
++++ log.c
+@@ -63,14 +63,14 @@ log_init(const char *fname, const char *debug)
+ 	if (debug)
+ 	{
+ 		const char *rhs, *lhs, *nlhs, *p;
+-		int n;
++		size_t n;
+ 		int level, facility;
+ 		memset(&log_level_set, 0, sizeof(log_level_set));
+ 		rhs = nlhs = debug;
+ 		while (rhs && (rhs = strchr(rhs, '='))) {
+ 			rhs++;
+ 			p = strchr(rhs, ',');
+-			n = p ? p - rhs : strlen(rhs);
++			n = p ? (size_t) (p - rhs) : strlen(rhs);
+ 			for (level=0; level_name[level]; level++) {
+ 				if (!(strncasecmp(level_name[level], rhs, n)))
+ 					break;
+@@ -84,7 +84,7 @@ log_init(const char *fname, const char *debug)
+ 			do {
+ 				if (*lhs==',') lhs++;
+ 				p = strpbrk(lhs, ",=");
+-				n = p ? p - lhs : strlen(lhs);
++				n = p ? (size_t) (p - lhs) : strlen(lhs);
+ 				for (facility=0; facility_name[facility]; facility++) {
+ 					if (!(strncasecmp(facility_name[facility], lhs, n)))
+ 						break;
+diff --git tagutils/tagutils-wav.c tagutils/tagutils-wav.c
+index 956eef7..f2e397e 100644
+--- tagutils/tagutils-wav.c
++++ tagutils/tagutils-wav.c
+@@ -33,7 +33,7 @@ static int
+ _get_wavtags(char *filename, struct song_metadata *psong)
+ {
+ 	int fd;
+-	uint32_t len;
++	ssize_t len;
+ 	unsigned char hdr[12];
+ 	unsigned char fmt[16];
+ 	//uint32_t chunk_data_length;
+@@ -47,7 +47,7 @@ _get_wavtags(char *filename, struct song_metadata *psong)
+ 	uint32_t sec, ms;
+ 
+ 	uint32_t current_offset;
+-	uint32_t block_len;
++	int32_t block_len;
+ 
+ 	//DEBUG DPRINTF(E_DEBUG,L_SCANNER,"Getting WAV file info\n");
+ 

net/minidlna/files/patch-utils-mpo

@@ -1,15 +1,16 @@
 Submitted by Vladimir B. Grebenschikov this patch recognizes Samsung's
 images as JPEGs.
 
---- utils.c	2012-01-04 14:16:46.000000000 +0000
-+++ utils.c	2012-01-09 00:29:31.000000000 +0000
-@@ -261,7 +261,8 @@
+diff --git utils.c utils.c
+index 36ff168..5a7ff87 100644
+--- utils.c
++++ utils.c
+@@ -324,7 +324,7 @@ is_audio(const char * file)
  int
  is_image(const char * file)
  {
 -	return (ends_with(file, ".jpg") || ends_with(file, ".jpeg"));
-+	return (ends_with(file, ".jpg") || ends_with(file, ".jpeg") || 
-+	        ends_with(file, ".mpo"));
++	return (ends_with(file, ".jpg") || ends_with(file, ".jpeg") || ends_with(file, ".mpo"));
  }
  
  int