Attachment #186654 for bug #222545

View | Details | Raw Unified | Return to bug 222545
Collapse All | Expand All

Lines 12-18 Link Here

(-)Makefile (-1 / +9 lines)
12	MAINTAINER= eugen@FreeBSD.org	12	MAINTAINER= eugen@FreeBSD.org
13	COMMENT= Multi-link PPP daemon based on netgraph(4)	13	COMMENT= Multi-link PPP daemon based on netgraph(4)
14		14
15	LICENSE= BSD	15	LICENSE= BSD3CLAUSE IIJ WHISTLE
		16	LICENSE_COMB= multi
		17	LICENSE_NAME_IIJ= License of software from Internet Initiative Japan, Inc.
		18	LICENSE_NAME_WHISTLE= License of software from Whistle Communications, Inc.
		19	LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/src/COPYRIGHT.mpd
		20	LICENSE_FILE_IIJ= ${WRKSRC}/src/COPYRIGHT.iij
		21	LICENSE_FILE_WHISTLE= ${WRKSRC}/src/COPYRIGHT.whistle
		22	LICENSE_PERMS_IIJ= ${_LICENSE_PERMS_DEFAULT}
		23	LICENSE_PERMS_WHISTLE= ${_LICENSE_PERMS_DEFAULT}
16		24
17	OPTIONS_DEFINE= NG_IPACCT	25	OPTIONS_DEFINE= NG_IPACCT
18	NG_IPACCT_DESC= Use ng_ipacct kernel module from port	26	NG_IPACCT_DESC= Use ng_ipacct kernel module from port




--- src/console.c.orig	2016-01-06 15:42:06 UTC
+++ src/console.c
@@ -119,6 +119,7 @@
   extern int	ConsoleStat(Context ctx, int ac, char *av[], void *arg);
   extern Context	StdConsoleConnect(Console c);
   extern void	ConsoleShutdown(Console c);
+  extern void	ConsoleCancelCleanup(void *rwlock);
 
   extern int	UserCommand(Context ctx, int ac, char *av[], void *arg);
   extern int	UserStat(Context ctx, int ac, char *av[], void *arg);
--- src/console.c.orig	2016-01-06 22:42:06.000000000 +0700
+++ src/console.c	2017-06-16 21:54:48.919442000 +0700
@@ -175,6 +175,14 @@ ConsoleClose(Console c)
   return 0;
 }

 
     return 0;
 }
--- src/console.h.orig	2016-01-06 15:42:06 UTC
+++ src/console.h
@@ -119,6 +119,7 @@
   extern int	ConsoleStat(Context ctx, int ac, char *av[], void *arg);
   extern Context	StdConsoleConnect(Console c);
   extern void	ConsoleShutdown(Console c);
+  extern void	ConsoleCancelCleanup(void *rwlock);
 
   extern int	UserCommand(Context ctx, int ac, char *av[], void *arg);
   extern int	UserStat(Context ctx, int ac, char *av[], void *arg);
--- src/log.c.orig	2016-01-06 15:42:06 UTC
+++ src/log.c
@@ -256,12 +256,13 @@ vLogPrintf(const char *fmt, va_list args
 #ifdef SYSLOG_FACILITY
         syslog(LOG_INFO, "%s", buf);




RCS file: /cvsroot/mpd/mpd/src/iface.c,v
retrieving revision 1.228
retrieving revision 1.230
--- src/iface.c.orig	2016-01-06 15:42:06 UTC
+++ src/iface.c
+++ src/iface.c	1 Jul 2017 21:32:07 -0000	1.230
@@ -141,6 +141,7 @@
   static int	IfaceAllocACL (struct acl_pool ***ap, int start, char * ifname, int number);
   static int	IfaceFindACL (struct acl_pool *ap, char * ifname, int number);

 #endif /* USE_IPFW */
 
 /*
--- src/mbuf.c.orig	2016-01-06 15:42:06 UTC
+++ src/mbuf.c
RCS file: /cvsroot/mpd/mpd/src/mbuf.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- src/mbuf.c	14 Jun 2011 10:40:19 -0000	1.30
+++ src/mbuf.c	29 Jun 2017 08:21:35 -0000	1.31
@@ -55,6 +55,20 @@ Mdup(const char *type, const void *src, 
 }
 

 Mstrdup(const char *type, const void *src)
 {
     return (Mdup(type, src, strlen(src) + 1));
--- src/mbuf.h.orig	2016-01-06 15:42:06 UTC
+++ src/mbuf.h
RCS file: /cvsroot/mpd/mpd/src/mbuf.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- src/mbuf.h	7 Oct 2013 11:52:35 -0000	1.25
+++ src/mbuf.h	29 Jun 2017 08:21:35 -0000	1.26
@@ -73,6 +73,7 @@
 
   extern void	*Malloc(const char *type, size_t size) __malloc_like;




--- src/Makefile.orig	2016-01-06 15:42:06 UTC
+++ src/Makefile
@@ -11,8 +11,17 @@ PROG?=			mpd5
 PREFIX?=		/usr/local
 BINDIR?=		${PREFIX}/sbin
 VERSION=		5.8

+.if ${OSVERSION} > 1100100
+MK_MAN=			no
+.else
 NO_MAN=
+.endif
+.else
+MK_MAN=			no
+NO_MAN=
+.endif
 
 BINOWN!=		/usr/bin/id -n -u
 BINGRP!=		/usr/bin/id -n -g
@@ -72,7 +81,7 @@ SYSLOG_FACILITY=	LOG_DAEMON
 
 # Print wide protocol names instead of short names.
 # Comment this line, to save about 10 KB space

 
 # Reduce some internal structures size to save more memory
 # This is to limit amount of active sessions
@@ -84,27 +93,27 @@ COPTS+=			-DPROTO_NAME_LIST
 ## filter TCP accept connections
 LDADD+=		-lwrap
 DPADD+=		${LIBWRAP}

 .endif
 
 LDADD+=		-lnetgraph -lutil
@@ -122,10 +131,10 @@ LDADD+=		-lexpat
 
 MPD_VERSION!=	echo -n "${VERSION} (`id -un`@`uname -n` `LC_TIME=C date +'%R %v'`)"
 

 		-Wcast-align \
 		-Wchar-subscripts \
 		-Wformat \
@@ -139,11 +148,11 @@ COPTS+=		-Wall \
 		-I${PREFIX}/include
 
 .if defined ( MPD_VENDOR )

 .endif
 
 # Standard sources
@@ -155,14 +164,14 @@ STDSRCS=        assert.c auth.c bund.c r
 		util.c vars.c eap.c msoft.c ippool.c
 
 .if defined ( NOWEB )

 PDPATH1=	contrib/libpdel/util:contrib/libpdel/structs
 PDPATH2=	contrib/libpdel/structs/type
 .if defined ( NOWEB )
@@ -206,54 +215,54 @@ PDELSRCS+=	http_connection.c \
 
 .if defined ( PHYSTYPE_MODEM )
 SRCS+=		modem.c chat.c

 .endif
 .endif
 
@@ -262,46 +271,46 @@ COPTS+=         -DUSE_NG_PRED1
 .if defined ( ECP_DES )
 SRCS+=		ecp_dese.c
 SRCS+=		ecp_dese_bis.c

 .endif
 
 # Add in required support files and libraries
@@ -310,7 +319,7 @@ DPADD+=		${LIBCRYPTO}
 
 .if exists ( /usr/lib/libexecinfo.so )
 LDADD+=		-lexecinfo

Return to bug 222545

Lines 1-15 Link Here

(-)files/patch-console.c (-14 / +14 lines)
1	--- src/console.h.orig 2016-01-06 22:42:06.000000000 +0700	1	--- src/console.c.orig 2016-01-06 15:42:06 UTC
2	+++ src/console.h 2017-06-16 21:12:59.268715000 +0700	2	+++ src/console.c
3	@@ -119,6 +119,7 @@
4	extern int ConsoleStat(Context ctx, int ac, char av[], void arg);
5	extern Context StdConsoleConnect(Console c);
6	extern void ConsoleShutdown(Console c);
7	+ extern void ConsoleCancelCleanup(void *rwlock);
8
9	extern int UserCommand(Context ctx, int ac, char av[], void arg);
10	extern int UserStat(Context ctx, int ac, char av[], void arg);
11	--- src/console.c.orig 2016-01-06 22:42:06.000000000 +0700
12	+++ src/console.c 2017-06-16 21:54:48.919442000 +0700
13	@@ -175,6 +175,14 @@ ConsoleClose(Console c)	3	@@ -175,6 +175,14 @@ ConsoleClose(Console c)
14	return 0;	4	return 0;
15	}	5	}
Lines 57-64 Link Here
57		47
58	return 0;	48	return 0;
59	}	49	}
60	--- src/log.c.orig 2016-01-06 22:42:06.000000000 +0700	50	--- src/console.h.orig 2016-01-06 15:42:06 UTC
61	+++ src/log.c 2017-06-16 21:16:19.643625000 +0700	51	+++ src/console.h
		52	@@ -119,6 +119,7 @@
		53	extern int ConsoleStat(Context ctx, int ac, char av[], void arg);
		54	extern Context StdConsoleConnect(Console c);
		55	extern void ConsoleShutdown(Console c);
		56	+ extern void ConsoleCancelCleanup(void *rwlock);
		57
		58	extern int UserCommand(Context ctx, int ac, char av[], void arg);
		59	extern int UserStat(Context ctx, int ac, char av[], void arg);
		60	--- src/log.c.orig 2016-01-06 15:42:06 UTC
		61	+++ src/log.c
62	@@ -256,12 +256,13 @@ vLogPrintf(const char *fmt, va_list args	62	@@ -256,12 +256,13 @@ vLogPrintf(const char *fmt, va_list args
63	#ifdef SYSLOG_FACILITY	63	#ifdef SYSLOG_FACILITY
64	syslog(LOG_INFO, "%s", buf);	64	syslog(LOG_INFO, "%s", buf);

Lines 3-11 Link Here

(-)files/patch-fixbuffer (-19 / +6 lines)
3	RCS file: /cvsroot/mpd/mpd/src/iface.c,v	3	RCS file: /cvsroot/mpd/mpd/src/iface.c,v
4	retrieving revision 1.228	4	retrieving revision 1.228
5	retrieving revision 1.230	5	retrieving revision 1.230
6	diff -u -p -r1.228 -r1.230	6	--- src/iface.c.orig 2016-01-06 15:42:06 UTC
7	--- src/iface.c 17 May 2017 08:47:53 -0000 1.228	7	+++ src/iface.c
8	+++ src/iface.c 1 Jul 2017 21:32:07 -0000 1.230
9	@@ -141,6 +141,7 @@	8	@@ -141,6 +141,7 @@
10	static int IfaceAllocACL (struct acl_pool **ap, int start, char ifname, int number);	9	static int IfaceAllocACL (struct acl_pool **ap, int start, char ifname, int number);
11	static int IfaceFindACL (struct acl_pool ap, char ifname, int number);	10	static int IfaceFindACL (struct acl_pool ap, char ifname, int number);
Lines 111-124 Link Here
111	#endif /* USE_IPFW */	110	#endif /* USE_IPFW */
112		111
113	/*	112	/*
114	Index: src/mbuf.c	113	--- src/mbuf.c.orig 2016-01-06 15:42:06 UTC
115	===================================================================	114	+++ src/mbuf.c
116	RCS file: /cvsroot/mpd/mpd/src/mbuf.c,v
117	retrieving revision 1.30
118	retrieving revision 1.31
119	diff -u -p -r1.30 -r1.31
120	--- src/mbuf.c 14 Jun 2011 10:40:19 -0000 1.30
121	+++ src/mbuf.c 29 Jun 2017 08:21:35 -0000 1.31
122	@@ -55,6 +55,20 @@ Mdup(const char type, const void src,	115	@@ -55,6 +55,20 @@ Mdup(const char type, const void src,
123	}	116	}
124		117
Lines 140-153 Link Here
140	Mstrdup(const char type, const void src)	133	Mstrdup(const char type, const void src)
141	{	134	{
142	return (Mdup(type, src, strlen(src) + 1));	135	return (Mdup(type, src, strlen(src) + 1));
143	Index: src/mbuf.h	136	--- src/mbuf.h.orig 2016-01-06 15:42:06 UTC
144	===================================================================	137	+++ src/mbuf.h
145	RCS file: /cvsroot/mpd/mpd/src/mbuf.h,v
146	retrieving revision 1.25
147	retrieving revision 1.26
148	diff -u -p -r1.25 -r1.26
149	--- src/mbuf.h 7 Oct 2013 11:52:35 -0000 1.25
150	+++ src/mbuf.h 29 Jun 2017 08:21:35 -0000 1.26
151	@@ -73,6 +73,7 @@	138	@@ -73,6 +73,7 @@
152		139
153	extern void Malloc(const char type, size_t size) __malloc_like;	140	extern void Malloc(const char type, size_t size) __malloc_like;

Lines 1-6 Link Here

(-)files/patch-src-Makefile (-13 / +13 lines)
1	--- src/Makefile 2016-01-06 22:42:06.000000000 +0700	1	--- src/Makefile.orig 2016-01-06 15:42:06 UTC
2	+++ src/Makefile 2017-07-02 17:48:59.910230000 +0700	2	+++ src/Makefile
3	@@ -11,8 +11,17 @@	3	@@ -11,8 +11,17 @@ PROG?= mpd5
4	PREFIX?= /usr/local	4	PREFIX?= /usr/local
5	BINDIR?= ${PREFIX}/sbin	5	BINDIR?= ${PREFIX}/sbin
6	VERSION= 5.8	6	VERSION= 5.8
Lines 10-25 Link Here
10	+.if ${OSVERSION} > 1100100	10	+.if ${OSVERSION} > 1100100
11	+MK_MAN= no	11	+MK_MAN= no
12	+.else	12	+.else
13	+NO_MAN=	13	NO_MAN=
14	+.endif	14	+.endif
15	+.else	15	+.else
16	+MK_MAN= no	16	+MK_MAN= no
17	NO_MAN=	17	+NO_MAN=
18	+.endif	18	+.endif
19		19
20	BINOWN!= /usr/bin/id -n -u	20	BINOWN!= /usr/bin/id -n -u
21	BINGRP!= /usr/bin/id -n -g	21	BINGRP!= /usr/bin/id -n -g
22	@@ -72,7 +81,7 @@	22	@@ -72,7 +81,7 @@ SYSLOG_FACILITY= LOG_DAEMON
23		23
24	# Print wide protocol names instead of short names.	24	# Print wide protocol names instead of short names.
25	# Comment this line, to save about 10 KB space	25	# Comment this line, to save about 10 KB space
Lines 28-34 Link Here
28		28
29	# Reduce some internal structures size to save more memory	29	# Reduce some internal structures size to save more memory
30	# This is to limit amount of active sessions	30	# This is to limit amount of active sessions
31	@@ -84,27 +93,27 @@	31	@@ -84,27 +93,27 @@ COPTS+= -DPROTO_NAME_LIST
32	## filter TCP accept connections	32	## filter TCP accept connections
33	LDADD+= -lwrap	33	LDADD+= -lwrap
34	DPADD+= ${LIBWRAP}	34	DPADD+= ${LIBWRAP}
Lines 60-66 Link Here
60	.endif	60	.endif
61		61
62	LDADD+= -lnetgraph -lutil	62	LDADD+= -lnetgraph -lutil
63	@@ -122,10 +131,10 @@	63	@@ -122,10 +131,10 @@ LDADD+= -lexpat
64		64
65	MPD_VERSION!= echo -n "${VERSION} (`id -un`@`uname -n` `LC_TIME=C date +'%R %v'`)"	65	MPD_VERSION!= echo -n "${VERSION} (`id -un`@`uname -n` `LC_TIME=C date +'%R %v'`)"
66		66
Lines 75-81 Link Here
75	-Wcast-align \	75	-Wcast-align \
76	-Wchar-subscripts \	76	-Wchar-subscripts \
77	-Wformat \	77	-Wformat \
78	@@ -139,11 +148,11 @@	78	@@ -139,11 +148,11 @@ COPTS+= -Wall \
79	-I${PREFIX}/include	79	-I${PREFIX}/include
80		80
81	.if defined ( MPD_VENDOR )	81	.if defined ( MPD_VENDOR )
Lines 89-95 Link Here
89	.endif	89	.endif
90		90
91	# Standard sources	91	# Standard sources
92	@@ -155,14 +164,14 @@	92	@@ -155,14 +164,14 @@ STDSRCS= assert.c auth.c bund.c r
93	util.c vars.c eap.c msoft.c ippool.c	93	util.c vars.c eap.c msoft.c ippool.c
94		94
95	.if defined ( NOWEB )	95	.if defined ( NOWEB )
Lines 106-112 Link Here
106	PDPATH1= contrib/libpdel/util:contrib/libpdel/structs	106	PDPATH1= contrib/libpdel/util:contrib/libpdel/structs
107	PDPATH2= contrib/libpdel/structs/type	107	PDPATH2= contrib/libpdel/structs/type
108	.if defined ( NOWEB )	108	.if defined ( NOWEB )
109	@@ -206,54 +215,54 @@	109	@@ -206,54 +215,54 @@ PDELSRCS+= http_connection.c \
110		110
111	.if defined ( PHYSTYPE_MODEM )	111	.if defined ( PHYSTYPE_MODEM )
112	SRCS+= modem.c chat.c	112	SRCS+= modem.c chat.c
Lines 176-182 Link Here
176	.endif	176	.endif
177	.endif	177	.endif
178		178
179	@@ -262,46 +271,46 @@	179	@@ -262,46 +271,46 @@ COPTS+= -DUSE_NG_PRED1
180	.if defined ( ECP_DES )	180	.if defined ( ECP_DES )
181	SRCS+= ecp_dese.c	181	SRCS+= ecp_dese.c
182	SRCS+= ecp_dese_bis.c	182	SRCS+= ecp_dese_bis.c
Lines 234-240 Link Here
234	.endif	234	.endif
235		235
236	# Add in required support files and libraries	236	# Add in required support files and libraries
237	@@ -310,7 +319,7 @@	237	@@ -310,7 +319,7 @@ DPADD+= ${LIBCRYPTO}
238		238
239	.if exists ( /usr/lib/libexecinfo.so )	239	.if exists ( /usr/lib/libexecinfo.so )
240	LDADD+= -lexecinfo	240	LDADD+= -lexecinfo