From owner-svn-ports-all@freebsd.org Wed Jul 18 22:41:25 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D53E1039AA2; Wed, 18 Jul 2018 22:41:25 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 09E83705A4; Wed, 18 Jul 2018 22:41:25 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF226208AF; Wed, 18 Jul 2018 22:41:24 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6IMfOsF075599; Wed, 18 Jul 2018 22:41:24 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6IMfOJA075597; Wed, 18 Jul 2018 22:41:24 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201807182241.w6IMfOJA075597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Wed, 18 Jul 2018 22:41:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474908 - in head/net/ucarp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/net/ucarp: . files X-SVN-Commit-Revision: 474908 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Jul 2018 22:41:25 -0000 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 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 - +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 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)) ||