diff options
| -rw-r--r-- | dns/dnsmasq-devel/Makefile | 10 | ||||
| -rw-r--r-- | dns/dnsmasq-devel/distinfo | 6 | ||||
| -rw-r--r-- | dns/dnsmasq-devel/files/patch-bpf.c | 19 |
3 files changed, 26 insertions, 9 deletions
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index a853e2e25652..fae20417cefa 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnsmasq -DISTVERSION= 2.90test4 # remember to bump PORTEPOCH when going from test to rc! +DISTVERSION= 2.91test1 # remember to bump PORTEPOCH when going from test to rc! # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 1 +PORTREVISION= 0 PORTEPOCH= 5 CATEGORIES= dns #MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/release-candidates/ \ @@ -16,8 +16,7 @@ WWW= https://www.thekelleys.org.uk/dnsmasq/doc.html LICENSE= GPLv2 -DEPRECATED= Short-lived test branch, to be removed after v2.90 release -IGNORE= please use dns/dnsmasq, which is newer +DEPRECATED= Short-lived test branch, to be removed after v2.91 release USES= cpe shebangfix tar:xz CPE_VENDOR= thekelleys @@ -36,7 +35,6 @@ CFLAGS+= -Wall -Wno-unused-function -Wno-unused-parameter \ CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS_INSTALL= dnsmasq-2* -PATCH_STRIP= -p1 SUB_FILES= pkg-message PORTDOCS= CHANGELOG CHANGELOG.archive FAQ doc.html setup.html @@ -106,7 +104,7 @@ USE_RC_SUBR= dnsmasq LDFLAGS+= -L${LOCALBASE}/lib ${_intllibs} ${ICONV_LIB} post-patch: - ${REINPLACE_CMD} -e '/^lua_/s/lua/lua-${LUA_VER}/' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e '/^LUA /s/lua/lua-${LUA_VER}/' ${WRKSRC}/Makefile pre-configure: pretty-print-config .if ${PORT_OPTIONS:MIDN} diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index 0eac2535b367..d83bf3e06fb4 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707806733 -SHA256 (dnsmasq-2.90test4.tar.xz) = 935177bede763c2a433b1a5700055a93f88913a6efadd461c4905c474d7cd69d -SIZE (dnsmasq-2.90test4.tar.xz) = 593728 +TIMESTAMP = 1734696522 +SHA256 (dnsmasq-2.91test1.tar.xz) = 8687368b8e8632ffdc2e19a83197ac4aca703cb002e55fc8ac4017dbdc9d87ec +SIZE (dnsmasq-2.91test1.tar.xz) = 570964 diff --git a/dns/dnsmasq-devel/files/patch-bpf.c b/dns/dnsmasq-devel/files/patch-bpf.c new file mode 100644 index 000000000000..9f2082b5b0ac --- /dev/null +++ b/dns/dnsmasq-devel/files/patch-bpf.c @@ -0,0 +1,19 @@ +--- src/bpf.c.orig 2024-12-19 00:36:42 UTC ++++ src/bpf.c +@@ -100,14 +100,14 @@ int arp_enumerate(void *parm, callback_t callback) + #endif /* defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) */ + + +-int iface_enumerate(int family, void *parm, int (*callback)()) ++int iface_enumerate(int family, void *parm, callback_t callback) + { + struct ifaddrs *head, *addrs; + int errsave, fd = -1, ret = 0; + + if (family == AF_UNSPEC) + #if defined(HAVE_BSD_NETWORK) && !defined(__APPLE__) +- return arp_enumerate(parm, callback.af_unspec); ++ return arp_enumerate(parm, callback); + #else + return 0; /* need code for Solaris and MacOS*/ + #endif |