Index: head/dns/gdnsd2/Makefile =================================================================== --- head/dns/gdnsd2/Makefile (revision 490321) +++ head/dns/gdnsd2/Makefile (revision 490322) @@ -1,57 +1,57 @@ # Created by: Allan Jude # $FreeBSD$ PORTNAME= gdnsd PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns MASTER_SITES= https://github.com/gdnsd/gdnsd/releases/download/v${PORTVERSION}/ \ ZI \ http://gdnsd.scaleengine.net/gdnsd/ PKGNAMESUFFIX= 2 MAINTAINER= zi@FreeBSD.org COMMENT= Authoritative-only GeoIP-aware DNS server LICENSE= GPLv3 LIB_DEPENDS= libev.so:devel/libev BUILD_DEPENDS= ragel>0:devel/ragel FETCH_ARGS= -Fpr GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var USE_LDCONFIG= yes USES= pkgconfig libtool tar:xz perl5 gmake USE_PERL5= build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFLICTS_INSTALL= gdnsd-1.[0-9]* USE_RC_SUBR= gdnsd USERS?= gdnsd GROUPS?= gdnsd OPTIONS_DEFINE= DOCS MAXMINDDB URCU MAXMINDDB_DESC= Enable GeoIP1 + GeoIP2 Support MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb URCU_DESC= Read-Copy-Update Support (Faster Zone Parsing) URCU_CONFIGURE_WITH= urcu URCU_LIB_DEPENDS= liburcu.so:sysutils/liburcu post-patch: @${REINPLACE_CMD} -e 's|$${localstatedir}/lib/$${PACKAGE_NAME}|/var/db/${PORTNAME}|g' \ ${WRKSRC}/configure post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libgdnsd.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugin_*.so @${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdnsd/geoip \ ${STAGEDIR}${PREFIX}/etc/gdnsd/zones \ ${STAGEDIR}/var/run/gdnsd .include Index: head/dns/gdnsd2/files/patch-libgdmaps_gdgeoip2.c =================================================================== --- head/dns/gdnsd2/files/patch-libgdmaps_gdgeoip2.c (nonexistent) +++ head/dns/gdnsd2/files/patch-libgdmaps_gdgeoip2.c (revision 490322) @@ -0,0 +1,16 @@ +--- libgdmaps/gdgeoip2.c.orig 2019-01-15 00:17:32 UTC ++++ libgdmaps/gdgeoip2.c +@@ -172,12 +172,7 @@ static geoip2_t* geoip2_new(const char* + db->is_city = !!strstr(meta->database_type, "City"); + + if(db->is_city) { +- // 1546300799 == 2018-12-31T23:59:59 +- if(city_auto_mode && strstr(meta->database_type, "GeoLite2") && meta->build_epoch > (uint64_t)1546300799LLU) { +- dmn_log_err("plugin_geoip: map '%s': GeoIP2 DB '%s' appears to be a post-2018 GeoLite2-City database, which will not work with auto_dc_coords as configured because these databases lack the latitude and longitude data present in the commercial version. See the auto_dc_coords section of the gdnsd-plugin-geoip documentation for more details.", map_name, pathname); +- geoip2_destroy(db); +- return NULL; +- } ++ // noop + } else { + if(city_auto_mode) { + dmn_log_err("plugin_geoip: map '%s': GeoIP2 DB '%s' is not a City-level" Property changes on: head/dns/gdnsd2/files/patch-libgdmaps_gdgeoip2.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property