From bbad4e55f2f5cbe9222e1a741225b49baf31c2a5 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Mon, 12 Mar 2018 06:49:17 +0000 Subject: [PATCH] net/igmpproxy: Update to 0.2.1 Port changes: * Changed to DISTVERSION * Removed patches 0001-* and 0002-* * Updated WWW PR: 226513 Submitted by: Franco Fichtner (maintainer) --- net/igmpproxy/Makefile | 10 +-- net/igmpproxy/distinfo | 6 +- ...to-fix-problems-with-strict-aliasing.patch | 84 ------------------- ...iles-to-ma.patch => patch-src_igmpproxy.h} | 14 +--- net/igmpproxy/pkg-descr | 2 +- 5 files changed, 9 insertions(+), 107 deletions(-) delete mode 100644 net/igmpproxy/files/0001-Revert-Try-to-fix-problems-with-strict-aliasing.patch rename net/igmpproxy/files/{0002-Revert-Include-config.h-before-any-other-files-to-ma.patch => patch-src_igmpproxy.h} (54%) diff --git a/net/igmpproxy/Makefile b/net/igmpproxy/Makefile index a0890f18809e..623c01376b4c 100644 --- a/net/igmpproxy/Makefile +++ b/net/igmpproxy/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= igmpproxy -PORTVERSION= 0.2 +DISTVERSION= 0.2.1 PORTEPOCH= 1 CATEGORIES= net @@ -12,15 +12,11 @@ COMMENT= Multicast forwarding IGMP proxy LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +USES= autoreconf USE_GITHUB= yes GH_ACCOUNT= pali - -USE_RC_SUBR= igmpproxy -USES= autoreconf GNU_CONFIGURE= yes - -EXTRA_PATCHES+= ${FILESDIR}/0001-Revert-Try-to-fix-problems-with-strict-aliasing.patch:-p1 -EXTRA_PATCHES+= ${FILESDIR}/0002-Revert-Include-config.h-before-any-other-files-to-ma.patch:-p1 +USE_RC_SUBR= igmpproxy post-install: ${INSTALL_DATA} ${WRKSRC}/igmpproxy.conf \ diff --git a/net/igmpproxy/distinfo b/net/igmpproxy/distinfo index 3d96720471ed..acaa7ba21733 100644 --- a/net/igmpproxy/distinfo +++ b/net/igmpproxy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513975936 -SHA256 (pali-igmpproxy-0.2_GH0.tar.gz) = 48fdaaa698c2ebe1c674b9ba4f9cb1369453bc97295434b608c9d5dab18c9293 -SIZE (pali-igmpproxy-0.2_GH0.tar.gz) = 41732 +TIMESTAMP = 1520836770 +SHA256 (pali-igmpproxy-0.2.1_GH0.tar.gz) = 6faa1f42ba323f60a9eb4958550e25b2e7e9c645da32c52ba12db0c9bdfce1ba +SIZE (pali-igmpproxy-0.2.1_GH0.tar.gz) = 42201 diff --git a/net/igmpproxy/files/0001-Revert-Try-to-fix-problems-with-strict-aliasing.patch b/net/igmpproxy/files/0001-Revert-Try-to-fix-problems-with-strict-aliasing.patch deleted file mode 100644 index 9eb3932353e0..000000000000 --- a/net/igmpproxy/files/0001-Revert-Try-to-fix-problems-with-strict-aliasing.patch +++ /dev/null @@ -1,84 +0,0 @@ -This reverts commit c371602f5f499a29d1fb1c43a8d12f21ff56296b. ---- - src/ifvc.c | 23 ++++++++++------------- - 1 file changed, 10 insertions(+), 13 deletions(-) - -diff --git a/src/ifvc.c b/src/ifvc.c -index 3a7476d..2d487ed 100644 ---- a/src/ifvc.c -+++ b/src/ifvc.c -@@ -34,13 +34,6 @@ - - #include "igmpproxy.h" - --/* We need a temporary copy to not break strict aliasing rules */ --static inline uint32_t s_addr_from_sockaddr(const struct sockaddr *addr) { -- struct sockaddr_in addr_in; -- memcpy(&addr_in, addr, sizeof(addr_in)); -- return addr_in.sin_addr.s_addr; --} -- - struct IfDesc IfDescVc[ MAX_IF ], *IfDescEp = IfDescVc; - - /* aimwang: add for detect interface and rebuild IfVc record */ -@@ -112,15 +105,17 @@ void rebuildIfVc () { - } - - // Get the interface adress... -- Dp->InAdr.s_addr = s_addr_from_sockaddr(&IfPt->ifr_addr); -+ Dp->InAdr = ((struct sockaddr_in *)&IfPt->ifr_addr)->sin_addr; - addr = Dp->InAdr.s_addr; - - memcpy( IfReq.ifr_name, Dp->Name, sizeof( IfReq.ifr_name ) ); -+ IfReq.ifr_addr.sa_family = AF_INET; -+ ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr = addr; - - // Get the subnet mask... - if (ioctl(Sock, SIOCGIFNETMASK, &IfReq ) < 0) - my_log(LOG_ERR, errno, "ioctl SIOCGIFNETMASK for %s", IfReq.ifr_name); -- mask = s_addr_from_sockaddr(&IfReq.ifr_netmask); -+ mask = ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr; - subnet = addr & mask; - - if ( ioctl( Sock, SIOCGIFFLAGS, &IfReq ) < 0 ) -@@ -131,7 +126,7 @@ void rebuildIfVc () { - { - if ( ioctl( Sock, SIOCGIFDSTADDR, &IfReq ) < 0 ) - my_log(LOG_ERR, errno, "ioctl SIOCGIFDSTADDR for %s", IfReq.ifr_name); -- addr = s_addr_from_sockaddr(&IfReq.ifr_dstaddr); -+ addr = ((struct sockaddr_in *)&IfReq.ifr_dstaddr)->sin_addr.s_addr; - subnet = addr & mask; - } - -@@ -263,15 +258,17 @@ void buildIfVc(void) { - } - - // Get the interface adress... -- IfDescEp->InAdr.s_addr = s_addr_from_sockaddr(&IfPt->ifr_addr); -+ IfDescEp->InAdr = ((struct sockaddr_in *)&IfPt->ifr_addr)->sin_addr; - addr = IfDescEp->InAdr.s_addr; - - memcpy( IfReq.ifr_name, IfDescEp->Name, sizeof( IfReq.ifr_name ) ); -+ IfReq.ifr_addr.sa_family = AF_INET; -+ ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr = addr; - - // Get the subnet mask... - if (ioctl(Sock, SIOCGIFNETMASK, &IfReq ) < 0) - my_log(LOG_ERR, errno, "ioctl SIOCGIFNETMASK for %s", IfReq.ifr_name); -- mask = s_addr_from_sockaddr(&IfReq.ifr_netmask); -+ mask = ((struct sockaddr_in *)&IfReq.ifr_addr)->sin_addr.s_addr; - subnet = addr & mask; - - /* get if flags -@@ -293,7 +290,7 @@ void buildIfVc(void) { - { - if ( ioctl( Sock, SIOCGIFDSTADDR, &IfReq ) < 0 ) - my_log(LOG_ERR, errno, "ioctl SIOCGIFDSTADDR for %s", IfReq.ifr_name); -- addr = s_addr_from_sockaddr(&IfReq.ifr_dstaddr); -+ addr = ((struct sockaddr_in *)&IfReq.ifr_dstaddr)->sin_addr.s_addr; - subnet = addr & mask; - } - --- -2.15.1 - diff --git a/net/igmpproxy/files/0002-Revert-Include-config.h-before-any-other-files-to-ma.patch b/net/igmpproxy/files/patch-src_igmpproxy.h similarity index 54% rename from net/igmpproxy/files/0002-Revert-Include-config.h-before-any-other-files-to-ma.patch rename to net/igmpproxy/files/patch-src_igmpproxy.h index 13ad55d4f71b..96ddfa06764c 100644 --- a/net/igmpproxy/files/0002-Revert-Include-config.h-before-any-other-files-to-ma.patch +++ b/net/igmpproxy/files/patch-src_igmpproxy.h @@ -1,12 +1,5 @@ -This reverts commit 7fcb7900b757b64cf58e6b2d1d473de289945e8d. ---- - src/igmpproxy.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/igmpproxy.h b/src/igmpproxy.h -index ad1063b..6980e35 100644 ---- a/src/igmpproxy.h -+++ b/src/igmpproxy.h +--- src/igmpproxy.h.orig 2018-02-13 19:17:30 UTC ++++ src/igmpproxy.h @@ -35,9 +35,6 @@ * igmpproxy.h - Header file for common includes. */ @@ -27,6 +20,3 @@ index ad1063b..6980e35 100644 /* * Limit on length of route data */ --- -2.15.1 - diff --git a/net/igmpproxy/pkg-descr b/net/igmpproxy/pkg-descr index 9294532a60f9..0b5e1ab21026 100644 --- a/net/igmpproxy/pkg-descr +++ b/net/igmpproxy/pkg-descr @@ -2,4 +2,4 @@ igmpproxy is a simple multicast routing daemon based on mrouted. It uses IGMP forwarding to dynamically route multicast traffic. Reqiures multicast forwarding enabled -WWW: http://igmpproxy.sourceforge.net/ +WWW: https://sourceforge.net/projects/igmpproxy/