Update to 5.8.

12 files changed, 3 insertions, 218 deletions

diff --git a/net/mpd5/Makefile b/net/mpd5/Makefile
index 8d0bccc3b822..e83d717a2c07 100644
--- a/net/mpd5/Makefile
+++ b/net/mpd5/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpd
-DISTVERSION=	5.7
-PORTREVISION=	3
+DISTVERSION=	5.8
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
 PKGNAMESUFFIX=	5
diff --git a/net/mpd5/distinfo b/net/mpd5/distinfo
index 498e51d010e6..04ac9c4fffa9 100644
--- a/net/mpd5/distinfo
+++ b/net/mpd5/distinfo
@@ -1,2 +1,2 @@
-SIZE (mpd5/mpd-5.7.tar.gz) = 588616
-SHA256 (mpd5/mpd-5.7.tar.gz) = da08fc9fa9d66c8b148faf62d980791660e5582b0ded857bcccfdd0897c30b79
+SIZE (mpd5/mpd-5.8.tar.gz) = 597043
+SHA256 (mpd5/mpd-5.8.tar.gz) = 8c59e01c79c5d35ecfd0d540ddf37dd1eed8da9c980fa4c5b01ed50bb53e7665
diff --git a/net/mpd5/files/patch-conf__Makefile b/net/mpd5/files/patch-conf__Makefile
deleted file mode 100644
index 788555f228b8..000000000000
--- a/net/mpd5/files/patch-conf__Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- conf/Makefile.orig	2014-03-26 03:33:58.000000000 -0300
-+++ conf/Makefile	2014-03-26 03:34:12.000000000 -0300
-@@ -3,6 +3,9 @@
- PREFIX?=	/usr/local
- BINDIR?=	/etc/mpd5
- 
-+BINOWN!=	/usr/bin/id -n -u
-+BINGRP!=	/usr/bin/id -n -g
-+
- MPD_SAMPLES+=	mpd.conf.sample
- MPD_SAMPLES+=	mpd.secret.sample
- MPD_SAMPLES+=	mpd.script.sample
diff --git a/net/mpd5/files/patch-doc__Makefile b/net/mpd5/files/patch-doc__Makefile
deleted file mode 100644
index 31b31e0ab5b5..000000000000
--- a/net/mpd5/files/patch-doc__Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- doc/Makefile.orig	2013-06-11 06:00:00.000000000 -0300
-+++ doc/Makefile	2014-03-26 03:39:06.000000000 -0300
-@@ -3,6 +3,11 @@
- PREFIX?=	/usr/local
- DOCDIR?=	${PREFIX}/share/doc/mpd5
- 
-+DOCOWN!=	/usr/bin/id -n -u
-+DOCGRP!=	/usr/bin/id -n -g
-+MANOWN=		${DOCOWN}
-+MANGRP=		${DOCGRP}
-+
- MPD_DOC_FILES+=	../README
- MPD_DOC_FILES+=	mpd*.html
- MPD_DOC_FILES+=	mpd.ps
-@@ -22,9 +27,9 @@
- 
- .if !defined(NOPORTDOCS)
- afterinstall:
--	[ -d ${DOCDIR} ] || mkdir ${DOCDIR}
-+	[ -d ${DESTDIR}${DOCDIR} ] || mkdir ${DESTDIR}${DOCDIR}
- 	${INSTALL} -c -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
--	    ${MPD_DOC_FILES} ${DOCDIR}
-+	    ${MPD_DOC_FILES} ${DESTDIR}${DOCDIR}
- .endif
- 
- .include <bsd.prog.mk>
diff --git a/net/mpd5/files/patch-src__Makefile b/net/mpd5/files/patch-src__Makefile
deleted file mode 100644
index b97c651db403..000000000000
--- a/net/mpd5/files/patch-src__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.orig	2014-03-26 03:33:24.000000000 -0300
-+++ src/Makefile	2014-03-26 03:33:44.000000000 -0300
-@@ -14,6 +14,8 @@
- NOMAN=
- NO_MAN=
- 
-+BINOWN!=		/usr/bin/id -n -u
-+BINGRP!=		/usr/bin/id -n -g
- 
- # Default configuration directory
- 
diff --git a/net/mpd5/files/patch-src__contrib__libpdel__http__http_server.c b/net/mpd5/files/patch-src__contrib__libpdel__http__http_server.c
deleted file mode 100644
index c6470fa7c69c..000000000000
--- a/net/mpd5/files/patch-src__contrib__libpdel__http__http_server.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/contrib/libpdel/http/http_server.c.orig	2013-06-11 11:00:00.000000000 +0200
-+++ src/contrib/libpdel/http/http_server.c	2015-03-23 21:01:49.295512000 +0100
-@@ -197,7 +197,7 @@ http_server_start(struct pevent_ctx *ctx
- 		_http_ssl_init();
- 
- 		/* Initialize SSL context for this server */
--		if ((serv->ssl = SSL_CTX_new(SSLv2_server_method())) == NULL) {
-+		if ((serv->ssl = SSL_CTX_new(SSLv23_server_method())) == NULL) {
- 			ssl_log(http_server_ssl_logger, serv);
- 			goto fail;
- 		}
diff --git a/net/mpd5/files/patch-src_ecp__dese.c b/net/mpd5/files/patch-src_ecp__dese.c
deleted file mode 100644
index 1057c93a2468..000000000000
--- a/net/mpd5/files/patch-src_ecp__dese.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/ecp_dese.c.orig	2013-06-11 09:00:00 UTC
-+++ src/ecp_dese.c
-@@ -89,11 +89,10 @@ DesConfigure(Bund b)
- {
-   EcpState	const ecp = &b->ecp;
-   DesInfo	const des = &ecp->des;
--  des_cblock	key;
-+  DES_cblock	key;
- 
--  des_check_key = FALSE;
--  des_string_to_key(ecp->key, &key);
--  des_set_key(&key, des->ks);
-+  DES_string_to_key(ecp->key, &key);
-+  DES_set_key(&key, &des->ks);
-   des->xmit_seq = 0;
-   des->recv_seq = 0;
- }
-@@ -191,7 +190,7 @@ DesEncrypt(Bund b, Mbuf plain)
-   {
-     u_char	*const block = MBDATA(cypher) + DES_OVERHEAD + k;
- 
--    des_cbc_encrypt(block, block, 8, des->ks, &des->xmit_ivec, TRUE);
-+    DES_cbc_encrypt(block, block, 8, &des->ks, &des->xmit_ivec, TRUE);
-     memcpy(des->xmit_ivec, block, 8);
-   }
- 
-@@ -258,10 +257,10 @@ DesDecrypt(Bund b, Mbuf cypher)
-   for (k = 0; k < clen; k += 8)
-   {
-     u_char	*const block = MBDATA(plain) + k;
--    des_cblock	next_ivec;
-+    DES_cblock	next_ivec;
- 
-     memcpy(next_ivec, block, 8);
--    des_cbc_encrypt(block, block, 8, des->ks, &des->recv_ivec, FALSE);
-+    DES_cbc_encrypt(block, block, 8, &des->ks, &des->recv_ivec, FALSE);
-     memcpy(des->recv_ivec, next_ivec, 8);
-   }
- 
diff --git a/net/mpd5/files/patch-src_ecp__dese.h b/net/mpd5/files/patch-src_ecp__dese.h
deleted file mode 100644
index df8a19bd33f6..000000000000
--- a/net/mpd5/files/patch-src_ecp__dese.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/ecp_dese.h.orig	2013-06-11 09:00:00 UTC
-+++ src/ecp_dese.h
-@@ -30,11 +30,11 @@
-   
-   struct desinfo
-   {
--    des_cblock		xmit_ivec;	/* Xmit initialization vector */
--    des_cblock		recv_ivec;	/* Recv initialization vector */
-+    DES_cblock		xmit_ivec;	/* Xmit initialization vector */
-+    DES_cblock		recv_ivec;	/* Recv initialization vector */
-     u_int16_t		xmit_seq;	/* Transmit sequence number */
-     u_int16_t		recv_seq;	/* Receive sequence number */
--    des_key_schedule	ks;		/* Key schedule */
-+    DES_key_schedule	ks;		/* Key schedule */
-     struct dese_stats	recv_stats;	
-     struct dese_stats	xmit_stats;	
-   };
diff --git a/net/mpd5/files/patch-src_ecp__dese__bis.c b/net/mpd5/files/patch-src_ecp__dese__bis.c
deleted file mode 100644
index 574c1e263bda..000000000000
--- a/net/mpd5/files/patch-src_ecp__dese__bis.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/ecp_dese_bis.c.orig	2013-06-11 09:00:00 UTC
-+++ src/ecp_dese_bis.c
-@@ -89,11 +89,10 @@ DeseBisConfigure(Bund b)
- {
-   EcpState	const ecp = &b->ecp;
-   DeseBisInfo	const des = &ecp->desebis;
--  des_cblock	key;
-+  DES_cblock	key;
- 
--  des_check_key = FALSE;
--  des_string_to_key(ecp->key, &key);
--  des_set_key(&key, des->ks);
-+  DES_string_to_key(ecp->key, &key);
-+  DES_set_key(&key, &des->ks);
-   des->xmit_seq = 0;
-   des->recv_seq = 0;
- }
-@@ -204,7 +203,7 @@ DeseBisEncrypt(Bund b, Mbuf plain)
-   {
-     u_char	*const block = MBDATA(cypher) + DES_OVERHEAD + k;
- 
--    des_cbc_encrypt(block, block, 8, des->ks, &des->xmit_ivec, TRUE);
-+    DES_cbc_encrypt(block, block, 8, &des->ks, &des->xmit_ivec, TRUE);
-     memcpy(des->xmit_ivec, block, 8);
-   }
- 
-@@ -271,10 +270,10 @@ DeseBisDecrypt(Bund b, Mbuf cypher)
-   for (k = 0; k < clen; k += 8)
-   {
-     u_char	*const block = MBDATA(plain) + k;
--    des_cblock	next_ivec;
-+    DES_cblock	next_ivec;
- 
-     memcpy(next_ivec, block, 8);
--    des_cbc_encrypt(block, block, 8, des->ks, &des->recv_ivec, FALSE);
-+    DES_cbc_encrypt(block, block, 8, &des->ks, &des->recv_ivec, FALSE);
-     memcpy(des->recv_ivec, next_ivec, 8);
-   }
- 
diff --git a/net/mpd5/files/patch-src_ecp__dese__bis.h b/net/mpd5/files/patch-src_ecp__dese__bis.h
deleted file mode 100644
index 9c14d0cad1b4..000000000000
--- a/net/mpd5/files/patch-src_ecp__dese__bis.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/ecp_dese_bis.h.orig	2013-06-11 09:00:00 UTC
-+++ src/ecp_dese_bis.h
-@@ -30,11 +30,11 @@
-   
-   struct desebisinfo
-   {
--    des_cblock		xmit_ivec;	/* Xmit initialization vector */
--    des_cblock		recv_ivec;	/* Recv initialization vector */
-+    DES_cblock		xmit_ivec;	/* Xmit initialization vector */
-+    DES_cblock		recv_ivec;	/* Recv initialization vector */
-     u_int16_t		xmit_seq;	/* Transmit sequence number */
-     u_int16_t		recv_seq;	/* Receive sequence number */
--    des_key_schedule	ks;		/* Key schedule */
-+    DES_key_schedule	ks;		/* Key schedule */
-     struct desebis_stats recv_stats;	
-     struct desebis_stats xmit_stats;	
-   };
diff --git a/net/mpd5/files/patch-src_file.c b/net/mpd5/files/patch-src_file.c
deleted file mode 100644
index 7f83a1c47861..000000000000
--- a/net/mpd5/files/patch-src_file.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/iface.c	2015/05/13 12:31:43	1.223
-+++ src/iface.c	2015/06/02 08:57:13	1.224
-@@ -3654,9 +3654,11 @@
- 	b->name, iface->ifname, ifname));
- 
-     if (ioctl(s, SIOCSIFNAME, (caddr_t)&ifr) < 0) {
--	Perror("[%s] IFACE: ioctl(%s, SIOCSIFNAME)", b->name, iface->ifname);
--	close(s);
--	return(-1);
-+	if (errno != EEXIST) {
-+	    Perror("[%s] IFACE: ioctl(%s, SIOCSIFNAME)", b->name, iface->ifname);
-+	    close(s);
-+	    return(-1);
-+	}
-     }
- 
-     close(s);
diff --git a/net/mpd5/files/patch-src_msoft.c b/net/mpd5/files/patch-src_msoft.c
deleted file mode 100644
index cc6160c0d4d2..000000000000
--- a/net/mpd5/files/patch-src_msoft.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/msoft.c.orig	2013-06-11 09:00:00 UTC
-+++ src/msoft.c
-@@ -164,7 +164,7 @@ ChallengeResponse(const u_char *chal, co
- static void
- DesEncrypt(const u_char *clear, u_char *key0, u_char *cypher)
- {
--  des_key_schedule	ks;
-+  DES_key_schedule	ks;
-   u_char		key[8];
- 
- /* Create DES key */
-@@ -177,11 +177,11 @@ DesEncrypt(const u_char *clear, u_char *
-   key[5] = (key0[4] << 3) | (key0[5] >> 5);
-   key[6] = (key0[5] << 2) | (key0[6] >> 6);
-   key[7] = key0[6] << 1;
--  des_set_key((des_cblock *) key, ks);
-+  DES_set_key((DES_cblock *) key, &ks);
- 
- /* Encrypt using key */
- 
--  des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cypher, ks, 1);
-+  DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cypher, &ks, 1);
- }
- 
- /*