svn commit: r490211 - in head: . devel/pear-Horde_Nls dns/bind9-devel dns/bind911 dns/bind912 dns/bind913 dns/gdnsd dns/gdnsd2 dns/powerdns games/xqf irc/inspircd irc/iroffer-dinoex mail/greylite m...
Adam Weinberger
adamw at FreeBSD.org
Sun Jan 13 20:58:45 UTC 2019
Author: adamw
Date: Sun Jan 13 20:58:36 2019
New Revision: 490211
URL: https://svnweb.freebsd.org/changeset/ports/490211
Log:
Remove GeoIP-related options. Where possible, replace GeoIP 1 defaults
with GeoIP 2.
Also, as suggested by zi, add an UPDATING note about this.
Modified:
head/UPDATING
head/devel/pear-Horde_Nls/Makefile
head/dns/bind9-devel/Makefile
head/dns/bind911/Makefile
head/dns/bind912/Makefile
head/dns/bind913/Makefile
head/dns/gdnsd/Makefile
head/dns/gdnsd2/Makefile
head/dns/powerdns/Makefile
head/dns/powerdns/pkg-plist
head/games/xqf/Makefile
head/irc/inspircd/Makefile
head/irc/inspircd/pkg-plist
head/irc/iroffer-dinoex/Makefile
head/mail/greylite/Makefile
head/mail/mailfromd/Makefile
head/mail/milter-greylist/Makefile
head/mail/py-ppolicy/Makefile
head/net-mgmt/argus3-clients/Makefile
head/net-mgmt/gnu-ipcalc/Makefile
head/net-mgmt/pmacct/Makefile
head/net-p2p/amule-devel/Makefile
head/net-p2p/amule/Makefile
head/net-p2p/ncdc/Makefile
head/net/ntopng/Makefile
head/net/ntopng/pkg-plist
head/net/opensips/Makefile
head/net/opensips/pkg-plist
head/net/wireshark-qt5/Makefile
head/net/wireshark/Makefile
head/security/ossec-hids-local/Makefile
head/security/suricata/Makefile
head/sysutils/goaccess/Makefile
head/sysutils/syslog-ng310/Makefile
head/sysutils/syslog-ng311/Makefile
head/sysutils/syslog-ng312/Makefile
head/sysutils/syslog-ng313/Makefile
head/sysutils/syslog-ng314/Makefile
head/sysutils/syslog-ng315/Makefile
head/sysutils/syslog-ng317/Makefile
head/sysutils/syslog-ng318/Makefile
head/sysutils/syslog-ng319/Makefile
head/sysutils/syslog-ng39/Makefile
head/www/awffull/Makefile
head/www/awstats/Makefile
head/www/cherokee/Makefile
head/www/cherokee/pkg-plist
head/www/geolizer/Makefile
head/www/lighttpd/Makefile
head/www/lighttpd/pkg-plist
head/www/linkchecker/Makefile
head/www/nginx-devel/Makefile
head/www/nginx-devel/Makefile.options.desc
head/www/nginx-devel/pkg-plist
head/www/nginx-full/Makefile
head/www/nginx/Makefile
head/www/nginx/Makefile.options.desc
head/www/nginx/pkg-plist
head/www/webalizer/Makefile
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Sun Jan 13 20:25:41 2019 (r490210)
+++ head/UPDATING Sun Jan 13 20:58:36 2019 (r490211)
@@ -5,6 +5,22 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20190113:
+ AFFECTS: users of net/GeoIP
+ AUTHOR: adamw at FreeBSD.org
+
+ Maxmind no longer provides geolocation data in the legacy format used
+ by net/GeoIP. All GEOIP-related OPTIONS have been removed, and all
+ GeoIP-dependent ports will be removed soon.
+
+ Where possible, you must switch to net/libmaxminddb, which uses the
+ newer (and fully supported) GeoIP 2 format. Unfortunately, this is
+ not a drop-in replacement.
+
+ The legacy database is no longer available, and we cannot distribute
+ it by the Maxmind license, so the legacy GeoIP format is essentially
+ dead.
+
20190108:
AFFECTS: users of databases/mysql-connector-java
AUTHOR: matthew at FreeBSD.org
Modified: head/devel/pear-Horde_Nls/Makefile
==============================================================================
--- head/devel/pear-Horde_Nls/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/devel/pear-Horde_Nls/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,6 +3,7 @@
PORTNAME= Horde_Nls
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= devel www pear
MASTER_SITES= http://pear.horde.org/get/
@@ -12,11 +13,5 @@ COMMENT= Horde Native Language Support
USES= horde
USE_HORDE_RUN= Horde_Translation \
Horde_Util
-
-OPTIONS_DEFINE= GEOIP
-GEOIP_DESC= Depend on geoip PHP extension
-
-GEOIP_USES= php
-GEOIP_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:net/pecl-geoip@${PHP_FLAVOR}
.include <bsd.port.mk>
Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/bind9-devel/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -9,7 +9,7 @@ PORTREVISION= 0
.else
# XXX: correct version
# dns/bind9xx here
-PORTREVISION= 0
+PORTREVISION= 1
.endif
CATEGORIES= dns net ipv6
# XXX: put the ISC master_site
@@ -87,7 +87,7 @@ OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11
.if !defined(BIND_TOOLS_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
-OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS \
OVERRIDECACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
START_LATE TUNING_LARGE TCP_FASTOPEN
OPTIONS_GROUP= DLZ
@@ -109,7 +109,6 @@ DLZ_POSTGRESQL_DESC= DLZ Postgres driver
DLZ_STUB_DESC= DLZ stub driver
DNSTAP_DESC= Provides fast passive logging of DNS messages
FIXED_RRSET_DESC= Enable fixed rrset ordering
-GEOIP_DESC= Allow geographically based ACL.
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
@@ -149,9 +148,6 @@ DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
libprotobuf-c.so:devel/protobuf-c
FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset
-
-GEOIP_CONFIGURE_WITH= geoip
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
GSSAPI_BASE_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
Modified: head/dns/bind911/Makefile
==============================================================================
--- head/dns/bind911/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/bind911/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 911
@@ -52,7 +52,7 @@ OPTIONS_DEFAULT= SSL THREADS SIGCHASE IDN GSSAPI_NONE
FILTER_AAAA
OPTIONS_DEFINE= IDN LARGE_FILE PYTHON JSON \
FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \
- RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+ RPZ_NSIP RPZ_NSDNAME DOCS \
MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
START_LATE TUNING_LARGE TCP_FASTOPEN
@@ -78,7 +78,6 @@ DLZ_STUB_DESC= DLZ stub driver
DNSTAP_DESC= Provides fast passive logging of DNS messages
FILTER_AAAA_DESC= Enable filtering of AAAA records
FIXED_RRSET_DESC= Enable fixed rrset ordering
-GEOIP_DESC= Allow geographically based ACL.
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
@@ -123,9 +122,6 @@ DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
FILTER_AAAA_CONFIGURE_ENABLE= filter-aaaa
FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset
-
-GEOIP_CONFIGURE_WITH= geoip
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
GSSAPI_BASE_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
Modified: head/dns/bind912/Makefile
==============================================================================
--- head/dns/bind912/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/bind912/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -7,7 +7,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc
# dns/bind-tools here
PORTREVISION= 0
.else
-PORTREVISION= 1
+PORTREVISION= 2
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
@@ -74,7 +74,7 @@ OPTIONS_RADIO_CRYPTO= SSL NATIVE_PKCS11
.if !defined(BIND_TOOLS_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
-OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS \
MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
START_LATE TUNING_LARGE TCP_FASTOPEN
OPTIONS_GROUP= DLZ
@@ -96,7 +96,6 @@ DLZ_POSTGRESQL_DESC= DLZ Postgres driver
DLZ_STUB_DESC= DLZ stub driver
DNSTAP_DESC= Provides fast passive logging of DNS messages
FIXED_RRSET_DESC= Enable fixed rrset ordering
-GEOIP_DESC= Allow geographically based ACL.
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
@@ -139,9 +138,6 @@ DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
libprotobuf-c.so:devel/protobuf-c
FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset
-
-GEOIP_CONFIGURE_WITH= geoip
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
GSSAPI_BASE_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
Modified: head/dns/bind913/Makefile
==============================================================================
--- head/dns/bind913/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/bind913/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc
PORTREVISION= 0
.else
# dns/bind913 here
-PORTREVISION= 1
+PORTREVISION= 2
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
@@ -74,7 +74,7 @@ OPTIONS_RADIO_CRYPTO= NATIVE_PKCS11
.if !defined(BIND_TOOLS_SLAVE)
OPTIONS_DEFAULT+= DLZ_FILESYSTEM LMDB RPZ_NSDNAME RPZ_NSIP TCP_FASTOPEN
-OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+OPTIONS_DEFINE+= RPZ_NSIP RPZ_NSDNAME DOCS \
MINCACHE PORTREVISION QUERYTRACE LMDB DNSTAP \
START_LATE TUNING_LARGE TCP_FASTOPEN
OPTIONS_GROUP= DLZ
@@ -96,7 +96,6 @@ DLZ_POSTGRESQL_DESC= DLZ Postgres driver
DLZ_STUB_DESC= DLZ stub driver
DNSTAP_DESC= Provides fast passive logging of DNS messages
FIXED_RRSET_DESC= Enable fixed rrset ordering
-GEOIP_DESC= Allow geographically based ACL.
GSSAPI_BASE_DESC= Using Heimdal in base
GSSAPI_HEIMDAL_DESC= Using security/heimdal
GSSAPI_MIT_DESC= Using security/krb5
@@ -136,9 +135,6 @@ DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
libprotobuf-c.so:devel/protobuf-c
FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset
-
-GEOIP_CONFIGURE_WITH= geoip
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
GSSAPI_BASE_CONFIGURE_ON=\
--with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}"
Modified: head/dns/gdnsd/Makefile
==============================================================================
--- head/dns/gdnsd/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/gdnsd/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= gdnsd
PORTVERSION= 1.11.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns
MASTER_SITES= https://github.com/blblack/gdnsd/releases/download/v${PORTVERSION}/ \
http://gdnsd.scaleengine.net/gdnsd/
@@ -30,11 +30,7 @@ USE_RC_SUBR= gdnsd
USERS?= gdnsd
GROUPS?= gdnsd
-OPTIONS_DEFINE= DOCS GEOIP URCU
-OPTIONS_DEFAULT= GEOIP
-
-GEOIP_DESC= Enable GeoIP Support
-GEOIP_RUN_DEPENDS= GeoIP>=0:net/GeoIP
+OPTIONS_DEFINE= DOCS URCU
URCU_DESC= Read-Copy-Update Support (Faster Zone Parsing)
URCU_CONFIGURE_WITH= urcu
Modified: head/dns/gdnsd2/Makefile
==============================================================================
--- head/dns/gdnsd2/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/gdnsd2/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,6 +3,7 @@
PORTNAME= gdnsd
PORTVERSION= 2.4.0
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= https://github.com/gdnsd/gdnsd/releases/download/v${PORTVERSION}/ \
ZI \
@@ -33,15 +34,7 @@ USE_RC_SUBR= gdnsd
USERS?= gdnsd
GROUPS?= gdnsd
-OPTIONS_DEFINE= DOCS URCU
-OPTIONS_DEFAULT=MAXMINDDB
-
-OPTIONS_RADIO= GEOLIB
-OPTIONS_RADIO_GEOLIB= GEOIP MAXMINDDB
-GEOLIB_DESC= GeoIP backend
-
-GEOIP_DESC= Enable GeoIP1 Support
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
+OPTIONS_DEFINE= DOCS MAXMINDDB URCU
MAXMINDDB_DESC= Enable GeoIP1 + GeoIP2 Support
MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
Modified: head/dns/powerdns/Makefile
==============================================================================
--- head/dns/powerdns/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/powerdns/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -2,7 +2,7 @@
PORTNAME= powerdns
DISTVERSION= 4.1.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${DISTVERSION}
@@ -40,7 +40,7 @@ SUB_FILES= pkg-message
USE_RC_SUBR= pdns
-OPTIONS_DEFINE= DOCS EXAMPLES GEOIP LUAJIT MYDNS MYSQL OPENDBX OPENLDAP OPTALGO PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC
+OPTIONS_DEFINE= DOCS EXAMPLES LUAJIT MYDNS MYSQL OPENDBX OPENLDAP OPTALGO PGSQL PROTOBUF REMOTE SQLITE3 TINYDNS TOOLS UNIXODBC
OPTIONS_GROUP= EXPERIMENTAL REMOTEOPT
OPTIONS_GROUP_EXPERIMENTAL= LUABACKEND
OPTIONS_GROUP_REMOTEOPT= ZEROMQ
@@ -49,10 +49,6 @@ ZEROMQ_IMPLIES= REMOTE
OPTIONS_DEFAULT= MYSQL PGSQL SQLITE3
OPTIONS_SUB= yes
-GEOIP_LIB_DEPENDS= libyaml-cpp.so:devel/yaml-cpp \
- libGeoIP.so:net/GeoIP
-GEOIP_VARS= MODULES+=geoip
-
LUABACKEND_VARS= MODULES+=lua
LUAJIT_CONFIGURE_WITH= luajit
@@ -106,7 +102,6 @@ UNIXODBC_VARS= MODULES+=godbc
ZEROMQ_CONFIGURE_ARGS= --enable-remotebackend-zeromq
ZEROMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
-GEOIP_DESC= GeoIP backend
LUABACKEND_DESC= Lua backend
LUAJIT_DESC= Use LuaJIT instead of Lua
MYDNS_DESC= MyDNS backend
Modified: head/dns/powerdns/pkg-plist
==============================================================================
--- head/dns/powerdns/pkg-plist Sun Jan 13 20:25:41 2019 (r490210)
+++ head/dns/powerdns/pkg-plist Sun Jan 13 20:58:36 2019 (r490211)
@@ -21,7 +21,6 @@ sbin/pdns_server
%%TOOLS%%bin/stubquery
lib/pdns/libbindbackend.so
lib/pdns/libpipebackend.so
-%%GEOIP%%lib/pdns/libgeoipbackend.so
%%LUABACKEND%%lib/pdns/libluabackend.so
%%MYDNS%%lib/pdns/libmydnsbackend.so
%%MYSQL%%lib/pdns/libgmysqlbackend.so
Modified: head/games/xqf/Makefile
==============================================================================
--- head/games/xqf/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/games/xqf/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= xqf
PORTVERSION= 1.0.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}
@@ -23,15 +23,12 @@ LIBS+= -L${LOCALBASE}/lib -lX11
PORTDATA= *
PORTDOCS= *
-OPTIONS_DEFINE= GTK2 GEOIP BZIP2 DOCS
-OPTIONS_DEFAULT=GTK2 GEOIP BZIP2
+OPTIONS_DEFINE= GTK2 BZIP2 DOCS
+OPTIONS_DEFAULT=GTK2 BZIP2
GTK2_USE= GNOME=gtk20
GTK2_USE_OFF= GNOME=gdkpixbuf
GTK2_CONFIGURE_ENABLE= gtk2
-
-GEOIP_CONFIGURE_ENABLE= geoip
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
BZIP2_CONFIGURE_ENABLE= bzip2
Modified: head/irc/inspircd/Makefile
==============================================================================
--- head/irc/inspircd/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/irc/inspircd/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,6 +3,7 @@
PORTNAME= inspircd
PORTVERSION= 2.0.26
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= irc
@@ -57,11 +58,10 @@ PLIST_SUB= INSPIRCD_DBDIR=${INSPIRCD_DBDIR} \
CONFLICTS= inspircd-1.*
-OPTIONS_DEFINE= GEOIP GNUTLS IPV6 LDAPAUTH LDAPOPER MYSQL OPENSSL PCRE PGSQL POSIX SQLITE
+OPTIONS_DEFINE= GNUTLS IPV6 LDAPAUTH LDAPOPER MYSQL OPENSSL PCRE PGSQL POSIX SQLITE
OPTIONS_DEFAULT=OPENSSL POSIX
OPTIONS_SUB= yes
-GEOIP_DESC= Build m_geoip module
GNUTLS_DESC= Build m_ssl_gnutls module
LDAPAUTH_DESC= Build m_ldapauth module
LDAPOPER_DESC= Build m_ldapoper module
@@ -71,9 +71,6 @@ PCRE_DESC= Build m_regex_pcre module
PGSQL_DESC= Build m_pgsql module
POSIX_DESC= Build m_regex_posix module
SQLITE_DESC= Build m_sqlite3 module
-
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-GEOIP_VARS= extras+=m_geoip.cpp
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls
GNUTLS_USES= pkgconfig
Modified: head/irc/inspircd/pkg-plist
==============================================================================
--- head/irc/inspircd/pkg-plist Sun Jan 13 20:25:41 2019 (r490210)
+++ head/irc/inspircd/pkg-plist Sun Jan 13 20:58:36 2019 (r490211)
@@ -199,7 +199,6 @@ libexec/inspircd/modules/m_silence.so
libexec/inspircd/modules/m_spanningtree.so
libexec/inspircd/modules/m_sqlauth.so
libexec/inspircd/modules/m_sqloper.so
-%%GEOIP%%libexec/inspircd/modules/m_geoip.so
%%GNUTLS%%libexec/inspircd/modules/m_ssl_gnutls.so
%%LDAPAUTH%%libexec/inspircd/modules/m_ldapauth.so
%%LDAPOPER%%libexec/inspircd/modules/m_ldapoper.so
Modified: head/irc/iroffer-dinoex/Makefile
==============================================================================
--- head/irc/iroffer-dinoex/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/irc/iroffer-dinoex/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -2,6 +2,7 @@
PORTNAME= iroffer
PORTVERSION= 3.31
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= https://iroffer.net/
PKGNAMESUFFIX= -dinoex${PKGNAMESUFFIX2}
@@ -39,8 +40,8 @@ IROFFER_EXAMPLES= iroffer.cron \
IROFFER_HTDOCS= iroffer-state.css robots.txt \
info.txt.rb json.txt.rb md5.txt.rb sfv.txt.rb
-OPTIONS_DEFINE= CURL RUBY UPNP GEOIP DOCS EXAMPLES
-OPTIONS_DEFAULT=CURL RUBY UPNP GEOIP
+OPTIONS_DEFINE= CURL RUBY UPNP DOCS EXAMPLES
+OPTIONS_DEFAULT=CURL RUBY UPNP
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
CURL_CONFIGURE_ON= -curl
@@ -50,8 +51,6 @@ RUBY_LIB_DEPENDS= lib${RUBY_NAME}.so:${RUBY_PORT} \
RUBY_CONFIGURE_ON= -ruby
UPNP_LIB_DEPENDS= libminiupnpc.so:net/miniupnpc
UPNP_CONFIGURE_ON= -upnp
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-GEOIP_CONFIGURE_ON= -geoip
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/iroffer ${STAGEDIR}${PREFIX}/bin/
Modified: head/mail/greylite/Makefile
==============================================================================
--- head/mail/greylite/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/mail/greylite/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= greylite
PORTVERSION= 2.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= LOCAL/oliver
@@ -22,18 +22,12 @@ PLIST_FILES= bin/greylite \
SUB_FILES= pkg-message
-OPTIONS_DEFINE= GEOIP DNSBLENV UCSPI2SOCKET
-OPTIONS_DEFAULT= GEOIP DNSBLENV UCSPI2SOCKET
-GEOIP_DESC= Support for GeoIP in suspicion rules
+OPTIONS_DEFINE= DNSBLENV UCSPI2SOCKET
+OPTIONS_DEFAULT= DNSBLENV UCSPI2SOCKET
DNSBLENV_DESC= Module for interfacing with DNS blacklists
UCSPI2SOCKET_DESC= Module for using greylite as SMTP proxy
.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+= libGeoIP.so:net/GeoIP
-MAKE_ARGS+= WITH_GEOIP=yep
-.endif
.if ${PORT_OPTIONS:MDNSBLENV}
LIB_DEPENDS+= libcares.so:dns/c-ares
Modified: head/mail/mailfromd/Makefile
==============================================================================
--- head/mail/mailfromd/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/mail/mailfromd/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= mailfromd
PORTVERSION= 8.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://download.gnu.org.ua/pub/release/${PORTNAME}/ \
http://download.gnu.org.ua/pub/alpha/${PORTNAME}/
@@ -34,7 +34,7 @@ SUB_LIST+= MFD_RUN_DIR=${MFD_RUN_DIR}
INFO= ${PORTNAME}
PORTDOCS= AUTHORS ChangeLog NEWS README THANKS TODO
-OPTIONS_DEFINE= DEBUG DOCS DSPAM GEOIP NLS
+OPTIONS_DEFINE= DEBUG DOCS DSPAM NLS
OPTIONS_DEFAULT= GDBM
OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= BDB GDBM
@@ -49,9 +49,6 @@ DSPAM_DESC= DSPAM spam filter library support
DSPAM_LIB_DEPENDS= libdspam.so:mail/dspam
DSPAM_USES= pkgconfig
DSPAM_CONFIGURE_WITH= dspam
-
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-GEOIP_CONFIGURE_WITH= geoip
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
Modified: head/mail/milter-greylist/Makefile
==============================================================================
--- head/mail/milter-greylist/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/mail/milter-greylist/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= milter-greylist
PORTVERSION= 4.6.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
http://fossies.org/unix/privat/
@@ -28,8 +28,8 @@ USES= tar:tgz
# installed port preference over it.
##
-OPTIONS_DEFINE= DKIM SPF GEOIP CURL LDAP P0F POSTFIX DOCS EXAMPLES
-OPTIONS_DEFAULT= DKIM SPF GEOIP CURL
+OPTIONS_DEFINE= DKIM SPF CURL LDAP P0F POSTFIX DOCS EXAMPLES
+OPTIONS_DEFAULT= DKIM SPF CURL
DKIM_DESC= DKIM support
SPF_DESC= SPF support
CURL_DESC= curl support
@@ -40,7 +40,6 @@ DKIM_LIB_DEPENDS= libopendkim.so:mail/opendkim
P0F_RUN_DEPENDS= p0f:net-mgmt/p0f
SPF_LIB_DEPENDS= libspf2.so:mail/libspf2
CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
POSTFIX_CONFIGURE_ENABLE= postfix
POSTFIX_LDFLAGS_OFF= ${SENDMAIL_LDFLAGS}
@@ -51,7 +50,6 @@ P0F_CONFIGURE_ENABLE= p0f306
DKIM_CONFIGURE_ON= --with-libopendkim=${LOCALBASE}
DKIM_USES= ssl
SPF_CONFIGURE_ON= --with-libspf2=${LOCALBASE}
-GEOIP_CONFIGURE_ON= --with-libGeoIP=${LOCALBASE}
CURL_CONFIGURE_ON= --with-libcurl=${LOCALBASE}
LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE}
LDAP_LDFLAGS= -L${LOCALBASE}/lib
Modified: head/mail/py-ppolicy/Makefile
==============================================================================
--- head/mail/py-ppolicy/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/mail/py-ppolicy/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= ppolicy
PORTVERSION= 2.6.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail python
MASTER_SITES= http://kmlinux.fjfi.cvut.cz/~vokac/activities/ppolicy/download/%SUBDIR%/ \
http://www.chifeng.name/dist/ppolicy/%SUBDIR%/
@@ -24,10 +24,9 @@ DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME}
SUB_FILES= pkg-message
-OPTIONS_DEFINE= GEOIP LDAP MYSQL DOCS
-OPTIONS_DEFAULT= GEOIP LDAP
+OPTIONS_DEFINE= LDAP MYSQL DOCS
+OPTIONS_DEFAULT= LDAP
-GEOIP_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP@${PY_FLAVOR}
MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${PY_FLAVOR}
LDAP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${PY_FLAVOR}
Modified: head/net-mgmt/argus3-clients/Makefile
==============================================================================
--- head/net-mgmt/argus3-clients/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net-mgmt/argus3-clients/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= argus-clients
PORTVERSION= 3.0.8.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt security
MASTER_SITES= http://qosient.com/argus/src/ \
ftp://qosient.com/pub/argus/src/
@@ -15,14 +15,12 @@ LICENSE= GPLv3
CONFLICTS= argus-clients-2* argus-clients-sasl-2*
-OPTIONS_DEFINE= GEOIP MYSQL SASL DOCS EXAMPLES
+OPTIONS_DEFINE= MYSQL SASL DOCS EXAMPLES
OPTIONS_DEFAULT=MYSQL SASL
OPTIONS_SUB= yes
SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2
SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE}
MYSQL_USES= mysql
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-GEOIP_CONFIGURE_ON= --with-GeoIP=${LOCALBASE}
USES= bison ncurses perl5 readline
USE_CSTD= gnu89
Modified: head/net-mgmt/gnu-ipcalc/Makefile
==============================================================================
--- head/net-mgmt/gnu-ipcalc/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net-mgmt/gnu-ipcalc/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,6 +3,7 @@
PORTNAME= ipcalc
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= net-mgmt
PKGNAMEPREFIX= gnu-
@@ -18,12 +19,7 @@ USES= gmake localbase
USE_GITHUB= yes
GH_ACCOUNT= nmav
-OPTIONS_DEFINE= GEOIP
-OPTIONS_DEFAULT=GEOIP
-
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-GEOIP_MAKE_ENV= LIBPATH=${LOCALBASE}/lib
-GEOIP_MAKE_ENV_OFF= USE_GEOIP=no USE_DYN_GEOIP=no
+MAKE_ENV+= USE_GEOIP=no USE_DYN_GEOIP=no
PLIST_FILES= bin/ipcalc man/man1/ipcalc.1.gz
Modified: head/net-mgmt/pmacct/Makefile
==============================================================================
--- head/net-mgmt/pmacct/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net-mgmt/pmacct/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= pmacct
DISTVERSION= 1.7.0
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= http://www.pmacct.net/
@@ -20,11 +20,12 @@ GNU_CONFIGURE= yes
CPPFLAGS+= "-I${LOCALBASE}/include"
LDFLAGS+= "-L${LOCALBASE}/lib"
-OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 THREADS LAYER2 IPV6 DEBUG \
+OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 THREADS LAYER2 IPV6 DEBUG GEOIP2 \
DOCS PLABEL RABBITMQ KAFKA JANSSON AVRO EXAMPLES
OPTIONS_DEFAULT=MMAP LAYER2 THREADS SHARED
AVRO_DESC= Enable avro support
+GEOIP2_DESC= Enable GeoIPv2 (libmaxminddb) support
JANSSON_DESC= Enable Jansson support
KAFKA_DESC= Enable Kafka support
LAYER2_DESC= Enable Layer-2 support: MAC addresses and VLANs
@@ -36,12 +37,6 @@ PLABEL_DESC= Enable IP prefix labels
RABBITMQ_DESC= Enable RabbitMQ/AMQP support
SQLITE3_DESC= Enable SQLite3 support
-OPTIONS_RADIO= GEOLOC
-OPTIONS_RADIO_GEOLOC=GEOIP GEOIP2
-GEOLOC_DESC= Geolocation support
-GEOIP_DESC= Enable legacy GeoIP support
-GEOIP2_DESC= Enable GeoIPv2 (libmaxminddb) support
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
@@ -143,12 +138,6 @@ CONFIGURE_ARGS+=--enable-avro
.else
CONFIGURE_ARGS+=--disable-nflog
PLIST_SUB+=WITH_NFLOG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGEOIP}
-USES+= pkgconfig
-LIB_DEPENDS+= libGeoIP.so:net/GeoIP
-CONFIGURE_ARGS+=--enable-geoip
.endif
.if ${PORT_OPTIONS:MGEOIP2}
Modified: head/net-p2p/amule-devel/Makefile
==============================================================================
--- head/net-p2p/amule-devel/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net-p2p/amule-devel/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= amule
PORTVERSION= 10998
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-p2p
MASTER_SITES= http://amule.sourceforge.net/tarballs/
PKGNAMESUFFIX= -devel
@@ -36,7 +36,7 @@ CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp`
LDFLAGS+= -lpthread -L${LOCALBASE}/lib
OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \
- FILEVIEW GEOIP MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS UPNP \
+ FILEVIEW MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS UPNP \
WEBSERVER WXCAS XAS
ALC_DESC= Compile aMule Link Creator for GUI
ALCC_DESC= Compile aMule Link Creator for console
@@ -81,9 +81,6 @@ CAS_LIB_DEPENDS= libgd.so:graphics/gd
ED2K_CONFIGURE_OFF= --disable-ed2k
FILEVIEW_CONFIGURE_ON= --enable-fileview
-
-GEOIP_CONFIGURE_ON= --enable-geoip
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
MMAP_CONFIGURE_ON= --enable-mmap
Modified: head/net-p2p/amule/Makefile
==============================================================================
--- head/net-p2p/amule/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net-p2p/amule/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= amule
PORTVERSION= 2.3.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net-p2p
MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION}
DISTNAME= aMule-${PORTVERSION}
@@ -33,7 +33,7 @@ CXXFLAGS+= `pkgconf --cflags-only-other libcryptopp`
LDFLAGS+= -lpthread -L${LOCALBASE}/lib
OPTIONS_DEFINE= ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS DEBUG DOCS ED2K \
- FILEVIEW GEOIP MMAP MONOLITHIC NLS UPNP \
+ FILEVIEW MMAP MONOLITHIC NLS UPNP \
WEBSERVER WXCAS XAS
ALC_DESC= Compile aMule Link Creator for GUI
ALCC_DESC= Compile aMule Link Creator for console
@@ -78,9 +78,6 @@ CAS_LIB_DEPENDS= libgd.so:graphics/gd
ED2K_CONFIGURE_OFF= --disable-ed2k
FILEVIEW_CONFIGURE_ON= --enable-fileview
-
-GEOIP_CONFIGURE_ON= --enable-geoip
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
MMAP_CONFIGURE_ON= --enable-mmap
Modified: head/net-p2p/ncdc/Makefile
==============================================================================
--- head/net-p2p/ncdc/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net-p2p/ncdc/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,6 +3,7 @@
PORTNAME= ncdc
PORTVERSION= 1.20
+PORTREVISION= 1
CATEGORIES= net-p2p
MASTER_SITES= http://dev.yorhel.nl/download/
@@ -27,12 +28,5 @@ PLIST_FILES= bin/ncdc \
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-
-OPTIONS_DEFINE= GEOIP
-
-GEOIP_CONFIGURE_WITH= geoip
-GEOIP_CONFIGURE_ENV= GEOIP_CFLAGS="-I${LOCALBASE}/include" \
- GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
.include <bsd.port.mk>
Modified: head/net/ntopng/Makefile
==============================================================================
--- head/net/ntopng/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net/ntopng/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= ntopng
PORTVERSION= 3.8.d20181221
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net
@@ -25,7 +25,7 @@ BUILD_DEPENDS= bash:shells/bash
USES= autoreconf compiler:c++11-lang cpe gmake libtool localbase \
mysql pathfix pkgconfig shebangfix sqlite ssl
-SUB_FILES= ntopng-geoipupdate.sh pkg-deinstall
+SUB_FILES= pkg-deinstall
SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh \
httpdocs/misc/ntopng-utils-manage-config.in
GNU_CONFIGURE= yes
@@ -41,13 +41,10 @@ GH_TAGNAME= e7503c7
CPE_VENDOR= ntop
-OPTIONS_DEFINE= GEOIP NLS
-OPTIONS_DEFAULT= GEOIP
+OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-
NLS_USES= gettext
USE_RC_SUBR= ntopng
@@ -60,8 +57,5 @@ post-patch:
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng
${MKDIR} ${STAGEDIR}/var/db/ntopng
-
-post-install-GEOIP-on:
- ${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
Modified: head/net/ntopng/pkg-plist
==============================================================================
--- head/net/ntopng/pkg-plist Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net/ntopng/pkg-plist Sun Jan 13 20:58:36 2019 (r490211)
@@ -1,5 +1,4 @@
bin/ntopng
-%%GEOIP%%bin/ntopng-geoipupdate.sh
man/man8/ntopng.8.gz
%%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css
%%DATADIR%%/httpdocs/bootstrap/css/bootstrap-theme.css.map
Modified: head/net/opensips/Makefile
==============================================================================
--- head/net/opensips/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net/opensips/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= opensips
DISTVERSION= 2.2.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net
MASTER_SITES= http://opensips.org/pub/opensips/${PORTVERSION}/
@@ -43,12 +43,11 @@ USE_GCC= yes
NOPRECIOUSMAKEVARS= yes
-OPTIONS_DEFINE= DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL \
+OPTIONS_DEFINE= DEBUG DOCS EXAMPLES HTTP LDAP MEMCACHED MYSQL \
PGSQL RADIUS TESTS TLS UNIXODBC SQLITE
-OPTIONS_DEFAULT= GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS
+OPTIONS_DEFAULT= HTTP LDAP MEMCACHED PGSQL RADIUS TLS
OPTIONS_SUB= yes
-GEOIP_DESC= Build with GeoIP support
HTTP_DESC= Enable HTTP transport via libmicrohttpd
MEMCACHED_DESC= Build with memcached support
TESTS_DESC= Install smoke tests
@@ -60,7 +59,6 @@ PGSQL_USES= pgsql
PGSQL_BUILD_DEPENDS= p5-DBD-Pg>=3.4:databases/p5-DBD-Pg
RADIUS_LIB_DEPENDS= libradiusclient-ng.so:net/radiusclient
HTTP_LIB_DEPENDS= libmicrohttpd.so:www/libmicrohttpd
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
MEMCACHED_LIB_DEPENDS= libmemcached.so:databases/libmemcached
UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC
SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
@@ -146,10 +144,6 @@ SHEBANG_FILES= ccopts.sh \
python_CMD= ${LOCALBASE}/bin/python2.7
.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGEOIP}
-EXTRA_MODULES+= mmgeoip
-.endif
.if ${PORT_OPTIONS:MHTTP}
EXTRA_MODULES+= httpd
Modified: head/net/opensips/pkg-plist
==============================================================================
--- head/net/opensips/pkg-plist Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net/opensips/pkg-plist Sun Jan 13 20:58:36 2019 (r490211)
@@ -76,7 +76,6 @@ lib/opensips/modules/mi_fifo.so
lib/opensips/modules/mi_http.so
lib/opensips/modules/mi_json.so
lib/opensips/modules/mi_xmlrpc_ng.so
-%%GEOIP%%lib/opensips/modules/mmgeoip.so
lib/opensips/modules/msilo.so
lib/opensips/modules/nat_traversal.so
lib/opensips/modules/nathelper.so
@@ -256,7 +255,6 @@ sbin/osipsconsole
%%PORTDOCS%%%%DOCSDIR%%/README.mi_http
%%PORTDOCS%%%%DOCSDIR%%/README.mi_json
%%PORTDOCS%%%%DOCSDIR%%/README.mi_xmlrpc_ng
-%%GEOIP%%%%PORTDOCS%%%%DOCSDIR%%/README.mmgeoip
%%PORTDOCS%%%%DOCSDIR%%/README.msilo
%%PORTDOCS%%%%DOCSDIR%%/README.nat_traversal
%%PORTDOCS%%%%DOCSDIR%%/README.nathelper
Modified: head/net/wireshark-qt5/Makefile
==============================================================================
--- head/net/wireshark-qt5/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net/wireshark-qt5/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -6,6 +6,6 @@ COMMENT= Powerful network analyzer/capture tool (QT pa
CONFLICTS= wireshark-[0-9]*
OPTIONS_EXCLUDE= GTK2 GTK3
-OPTIONS_DEFAULT= SNMP ADNS GEOIP KRB_BASE QT5
+OPTIONS_DEFAULT= SNMP ADNS KRB_BASE QT5
.include "${MASTERDIR}/Makefile"
Modified: head/net/wireshark/Makefile
==============================================================================
--- head/net/wireshark/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/net/wireshark/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME?= wireshark
PORTVERSION= 2.6.5
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= net ipv6
MASTER_SITES= http://www.wireshark.org/download/src/ \
http://ftp.uni-kl.de/pub/wireshark/src/ \
@@ -57,7 +57,7 @@ PLIST_SUB+= ${x:tu}="@comment $x not installed" \
${x:tu}_LIB="@comment $x not installed " \
${x:tu}_MAN="@comment $x not installed "
CONFIGURE_ARGS+= --enable-$x=no
-OPTIONS_EXCLUDE+= RTP SNMP GEOIP LUA CARES ANDROIDDUMP SSHDUMP
+OPTIONS_EXCLUDE+= RTP SNMP LUA CARES ANDROIDDUMP SSHDUMP
.else
PLIST_SUB+= ${x:tu}=bin/$x \
${x:tu}_MAN="" \
@@ -65,7 +65,7 @@ PLIST_SUB+= ${x:tu}=bin/$x \
.endif
.endfor
-OPTIONS_DEFINE= RTP SNMP GEOIP LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP
+OPTIONS_DEFINE= RTP SNMP LUA DECRYPT ANDROIDDUMP CARES SSHDUMP CISCODUMP
OPTIONS_RADIO= GUI
OPTIONS_SINGLE= KERBEROS
@@ -73,7 +73,7 @@ OPTIONS_SINGLE= KERBEROS
OPTIONS_RADIO_GUI= GTK2 GTK3 QT5
OPTIONS_SINGLE_KERBEROS=KRB_BASE KRB_HEIMDAL KRB_MIT KRB_NONE
-OPTIONS_DEFAULT?= SNMP GEOIP KRB_BASE GTK3 DECRYPT
+OPTIONS_DEFAULT?= SNMP KRB_BASE GTK3 DECRYPT
RTP_DESC= Enable support for playing back RTP streams
DECRYPT_DESC= Decryption support for SSL and IPSec
@@ -102,7 +102,6 @@ RTP_LIB_DEPENDS= libportaudio.so:audio/portaudio \
RTP_CPPFLAGS= -I${LOCALBASE}/include
SNMP_LIB_DEPENDS= libsmi.so:net-mgmt/libsmi
CARES_LIB_DEPENDS= libcares.so:dns/c-ares
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
DECRYPT_LIB_DEPENDS= libgnutls.so:security/gnutls \
libgcrypt.so:security/libgcrypt
SSHDUMP_LIB_DEPENDS= libssh.so:security/libssh
@@ -119,7 +118,6 @@ LUA_CONFIGURE_WITH= lua
RTP_CONFIGURE_WITH= portaudio spandsp
SNMP_CONFIGURE_WITH= libsmi
CARES_CONFIGURE_WITH= c-ares
-GEOIP_CONFIGURE_WITH= geoip
DECRYPT_CONFIGURE_WITH= gnutls
ANDROIDDUMP_CONFIGURE_ON=--enable-androiddump=yes
ANDROIDDUMP_CONFIGURE_OFF=--enable-androiddump=no
Modified: head/security/ossec-hids-local/Makefile
==============================================================================
--- head/security/ossec-hids-local/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/security/ossec-hids-local/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -2,7 +2,7 @@
PORTNAME= ossec-hids
PORTVERSION= 3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
PKGNAMESUFFIX= -${OSSEC_TYPE}
@@ -34,7 +34,6 @@ CONFLICTS_INSTALL= ossec-hids-client-* \
RUN_DEPENDS= expect:lang/expect
.endif
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify
PRELUDE_LIB_DEPENDS= libprelude.so:security/libprelude
ZEROMQ_LIB_DEPENDS= libczmq.so:net/czmq
@@ -68,7 +67,7 @@ OPTIONS_SUB= yes
OPTIONS_DEFINE= DOCS INOTIFY
.if ${OSSEC_TYPE} != agent
-OPTIONS_DEFINE+= GEOIP PRELUDE ZEROMQ
+OPTIONS_DEFINE+= PRELUDE ZEROMQ
OPTIONS_RADIO= DATABASE
OPTIONS_RADIO_DATABASE= MYSQL PGSQL
@@ -81,7 +80,6 @@ PRELUDE_DESC= Sensor support from Prelude SIEM
ZEROMQ_DESC= ZeroMQ support (experimental)
DATABASE_DESC= Database output
-GEOIP_VARS= OSSEC_ARGS+=USE_GEOIP=yes
INOTIFY_VARS= OSSEC_ARGS+=USE_INOTIFY=yes
PRELUDE_VARS= OSSEC_ARGS+=USE_PRELUDE=yes
ZEROMQ_VARS= OSSEC_ARGS+=USE_ZEROMQ=yes
Modified: head/security/suricata/Makefile
==============================================================================
--- head/security/suricata/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/security/suricata/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,6 +3,7 @@
PORTNAME= suricata
DISTVERSION= 4.1.2
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= https://www.openinfosecfoundation.org/download/
@@ -31,7 +32,7 @@ CPE_VENDOR= openinfosecfoundation
INSTALL_TARGET= install-strip
TEST_TARGET= check
-OPTIONS_DEFINE= GEOIP IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE \
+OPTIONS_DEFINE= IPFW JSON NETMAP NSS PORTS_PCAP PRELUDE \
PYTHON REDIS RUST TESTS
OPTIONS_DEFINE_amd64= HYPERSCAN
OPTIONS_DEFAULT= IPFW JSON NETMAP PYTHON RUST
@@ -42,7 +43,6 @@ OPTIONS_RADIO_SCRIPTS= LUA LUAJIT
SCRIPTS_DESC= Scripting
-GEOIP_DESC= GeoIP support
HYPERSCAN_DESC= Hyperscan support
IPFW_DESC= IPFW and IP Divert support for inline IDP
JSON_DESC= JSON output support
@@ -56,9 +56,6 @@ PYTHON_DESC= Python-based update and control utilitie
REDIS_DESC= Redis output support
RUST_DESC= Rust parser support
TESTS_DESC= Unit tests in suricata binary
-
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
-GEOIP_CONFIGURE_ON= --enable-geoip
HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan
HYPERSCAN_CONFIGURE_ON= --with-libhs-includes=${LOCALBASE}/include \
Modified: head/sysutils/goaccess/Makefile
==============================================================================
--- head/sysutils/goaccess/Makefile Sun Jan 13 20:25:41 2019 (r490210)
+++ head/sysutils/goaccess/Makefile Sun Jan 13 20:58:36 2019 (r490211)
@@ -3,7 +3,7 @@
PORTNAME= goaccess
PORTVERSION= 1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= http://tar.goaccess.io/
@@ -23,24 +23,19 @@ LDFLAGS+= -L${NCURSESLIB} -L${LOCALBASE}/lib
PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO
-OPTIONS_DEFINE= DOCS DEBUG NLS UTF8
-OPTIONS_DEFAULT= GEOIP UTF8
-OPTIONS_RADIO= GEOIPDB TOKYOCABINET
-OPTIONS_RADIO_GEOIPDB= GEOIP GEOIP2
+OPTIONS_DEFINE= DOCS DEBUG GEOIP2 NLS UTF8
+OPTIONS_DEFAULT= GEOIP2 UTF8
+OPTIONS_RADIO= TOKYOCABINET
OPTIONS_RADIO_TOKYOCABINET= TOKYOCABINET_BTREE TOKYOCABINET_MHASH
OPTIONS_SUB= yes
-GEOIPDB_DESC= GeoIP IP location support
-GEOIP_DESC= Legacy/free database format
-GEOIP2_DESC= New/paid database format
DEBUG_CONFIGURE_ON= --enable-debug
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext-runtime
UTF8_CONFIGURE_ON= --enable-utf8
-GEOIP_CONFIGURE_ON= --enable-geoip=legacy
-GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP
+GEOIP2_DESC= IP location support
GEOIP2_CONFIGURE_ON= --enable-geoip=mmdb
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-head
mailing list