Date: Wed, 18 Jul 2018 22:41:24 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474908 - in head/net/ucarp: . files Message-ID: <201807182241.w6IMfOJA075597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Jul 18 22:41:24 2018 New Revision: 474908 URL: https://svnweb.freebsd.org/changeset/ports/474908 Log: net/ucarp: Switch to Github source tree Port changes: * Add license * Group USEx section * Remove CONFIGURE_ARGS * Use option helpers instead of .if/.else PR: 226885 Submitted by: Artyom Davidov <ard_1@mail.ru> Modified: head/net/ucarp/Makefile head/net/ucarp/distinfo head/net/ucarp/files/patch-l2vlan Modified: head/net/ucarp/Makefile ============================================================================== --- head/net/ucarp/Makefile Wed Jul 18 22:20:23 2018 (r474907) +++ head/net/ucarp/Makefile Wed Jul 18 22:41:24 2018 (r474908) @@ -2,37 +2,39 @@ # $FreeBSD$ PORTNAME= ucarp -PORTVERSION= 1.5.2 -PORTREVISION= 2 +PORTVERSION= 1.5.2.20171201 CATEGORIES= net -MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/ucarp/ \ - http://download.pureftpd.org/pub/ucarp/ MAINTAINER= ports@FreeBSD.org COMMENT= Userlevel Common Address Redundancy Protocol -USES= tar:bzip2 +LICENSE= ISC +LICENSE_NAME= ISC License +LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -OPTIONS_DEFINE= SCRIPTS -OPTIONS_DEFAULT=SCRIPTS - -SCRIPTS_DESC= Install scripts to manage virtual IP - -.include <bsd.port.options.mk> - +USES= autoreconf libtool +USE_GITHUB= yes +GH_ACCOUNT= jedisct1 +GH_PROJECT= UCarp +GH_TAGNAME= 4f339d4 GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-nls USE_RC_SUBR= ucarp PLIST_FILES= sbin/ucarp -.if ${PORT_OPTIONS:MSCRIPTS} -PLIST_FILES+= sbin/ucarp-up \ - sbin/ucarp-down -post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-up.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-up - ${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-down.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-down -.endif +OPTIONS_DEFINE= SCRIPTS +OPTIONS_DEFAULT= SCRIPTS + +SCRIPTS_DESC= Install scripts to manage virtual IP +SCRIPTS_PLIST_FILES= sbin/ucarp-up sbin/ucarp-down + +pre-configure: + @${TOUCH} ${WRKSRC}/config.rpath ${WRKSRC}/ABOUT-NLS + +post-install-SCRIPTS-on: + ${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-up.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-up + ${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/vip-down.sh ${STAGEDIR}${PREFIX}/sbin/ucarp-down .include <bsd.port.mk> Modified: head/net/ucarp/distinfo ============================================================================== --- head/net/ucarp/distinfo Wed Jul 18 22:20:23 2018 (r474907) +++ head/net/ucarp/distinfo Wed Jul 18 22:41:24 2018 (r474908) @@ -1,2 +1,3 @@ -SHA256 (ucarp-1.5.2.tar.bz2) = f2e013653484cabd616d812648c83a490ae7b2968b4d446da5dd969275f92d62 -SIZE (ucarp-1.5.2.tar.bz2) = 315414 +TIMESTAMP = 1531953060 +SHA256 (jedisct1-UCarp-1.5.2.20171201-4f339d4_GH0.tar.gz) = 37ef77add1eea4a6b1b71d1c30ec4edc7f4a51d5ec8f5641ccb643439abb1e60 +SIZE (jedisct1-UCarp-1.5.2.20171201-4f339d4_GH0.tar.gz) = 79950 Modified: head/net/ucarp/files/patch-l2vlan ============================================================================== --- head/net/ucarp/files/patch-l2vlan Wed Jul 18 22:20:23 2018 (r474907) +++ head/net/ucarp/files/patch-l2vlan Wed Jul 18 22:41:24 2018 (r474908) @@ -5,7 +5,7 @@ @@ -86,7 +86,8 @@ if (strcmp(ifa->ifa_name, interface) == 0 && ifa->ifa_addr->sa_family == AF_LINK) { - sadl = (struct sockaddr_dl *) ifa->ifa_addr; + sadl = (struct sockaddr_dl *) (void *) ifa->ifa_addr; - if (sadl == NULL || sadl->sdl_type != IFT_ETHER || + if (sadl == NULL || ((sadl->sdl_type != IFT_ETHER) && + (sadl->sdl_type != IFT_L2VLAN)) ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807182241.w6IMfOJA075597>