mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

net/mpd5: install dictionary.mpd and add fix r2441 from upstream

Browse Source 
* Add dictionary.mpd to default package build and install it
to /usr/local/share/mpd/dictionary.mpd.

Thanks Dmitry Luhtionov who noted this omission.

* If parent interface of PPPoE link (vlan, detachable USB ethernet etc.)
got destroyed and re-added, detect that and continue automatically;
manual interference was required before this import of upstream r2441.
This commit is contained in:
Eugene Grosbein 2022-04-27 18:19:11 +07:00
parent 423a796502
commit 2c6ad754f6
No known key found for this signature in database
GPG Key ID: B0CD1AF226988B28
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/mpd5/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= mpd
DISTVERSION= 5.9
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION}
PKGNAMESUFFIX= 5
@ -41,7 +41,13 @@ CONFIGURE_ENV+= USE_NG_IPACCT=no
MAKE_ARGS+= USE_NG_IPACCT=no
.endif
.if ! ${PORT_OPTIONS:MRADIUS}
.if ${PORT_OPTIONS:MRADIUS}
PLIST_FILES= ${DATADIR}/dictionary.mpd
post-install:
${MKDIR} ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/conf/dictionary.mpd ${STAGEDIR}${DATADIR}
.else
CONFIGURE_ENV+= USE_RADIUS=no
MAKE_ARGS+= USE_RADIUS=no
.endif
@ -50,7 +56,7 @@ USE_RC_SUBR= mpd5
CONFSUF= conf secret script
DOCSDIR= ${PREFIX}/share/doc/mpd5
PORTDOCS= README mpd*
PLIST_FILES= ${CONFSUF:C|(.*)|"@sample etc/mpd5/mpd.\1.sample"|} \
PLIST_FILES+= ${CONFSUF:C|(.*)|"@sample etc/mpd5/mpd.\1.sample"|} \
sbin/mpd5
.if !defined(WITHOUT_MAN)

15
net/mpd5/files/patch-fixparent Normal file
View File

@ -0,0 +1,15 @@
Index: pppoe.c
===================================================================
--- src/pppoe.c (revision 2430)
+++ src/pppoe.c (working copy)
@@ -408,6 +408,10 @@ PppoeOpen(Link l)
&cn, sizeof(cn)) < 0) {
Perror("[%s] PPPoE: can't connect \"%s\"->\"%s\" and \"%s\"->\"%s\"",
l->name, path, cn.ourhook, cn.path, cn.peerhook);
+ if (errno == ENOENT) {
+ PppoeReleaseNode(l);
+ goto fail;
+ }
goto fail2;
}