From owner-svn-ports-head@FreeBSD.ORG Mon Jul 28 15:26:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D4D6E38A; Mon, 28 Jul 2014 15:26:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C1E4F2822; Mon, 28 Jul 2014 15:26:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6SFQXi0021401; Mon, 28 Jul 2014 15:26:33 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6SFQWxU021396; Mon, 28 Jul 2014 15:26:32 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201407281526.s6SFQWxU021396@svn.freebsd.org> From: Adam Weinberger Date: Mon, 28 Jul 2014 15:26:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363178 - in head: . net/GeoIP net/GeoIP/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jul 2014 15:26:33 -0000 Author: adamw Date: Mon Jul 28 15:26:32 2014 New Revision: 363178 URL: http://svnweb.freebsd.org/changeset/ports/363178 QAT: https://qat.redports.org/buildarchive/r363178/ Log: Update GeoIP to 1.6.0. With this update, GeoIP no longer ships with the GeoIP data files, so you MUST fetch them yourself, by running the geoipupdate.sh script. Deleted: head/net/GeoIP/files/patch-man__Makefile.am Modified: head/UPDATING head/net/GeoIP/Makefile head/net/GeoIP/distinfo head/net/GeoIP/files/pkg-message.in head/net/GeoIP/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Jul 28 15:18:02 2014 (r363177) +++ head/UPDATING Mon Jul 28 15:26:32 2014 (r363178) @@ -6,6 +6,13 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20140728: + AFFECTS: users of net/GeoIP + AUTHOR: adamw@FreeBSD.org + + GeoIP no longer ships with the GeoIP database. To continue using GeoIP, + you MUST fetch it first by running geoipupdate.sh. + +20140728: AFFECTS: users of security/libtasn1 and any port that depends on it AUTHOR: novel@FreeBSD.org Modified: head/net/GeoIP/Makefile ============================================================================== --- head/net/GeoIP/Makefile Mon Jul 28 15:18:02 2014 (r363177) +++ head/net/GeoIP/Makefile Mon Jul 28 15:26:32 2014 (r363178) @@ -2,28 +2,26 @@ # $FreeBSD$ PORTNAME= GeoIP -PORTVERSION= 1.4.8 -PORTREVISION= 7 +PORTVERSION= 1.6.0 CATEGORIES= net geography MASTER_SITES= http://geolite.maxmind.com/download/geoip/api/c/ MAINTAINER= adamw@FreeBSD.org COMMENT= Find the country that any IP address or hostname originates from -GNU_CONFIGURE= yes -USES= libtool:oldver -USE_LDCONFIG= yes +USES= libtool:oldver pathfix USE_AUTOTOOLS= aclocal automake libtoolize autoconf AUTOMAKE_ARGS= --add-missing +PATHFIX_MAKEFILEIN= Makefile.am + +USE_LDCONFIG= yes +GNU_CONFIGURE= yes SUB_FILES= geoipupdate.sh pkg-message post-install: ${INSTALL_SCRIPT} ${WRKDIR}/geoipupdate.sh ${STAGEDIR}${PREFIX}/bin - ${MV} ${STAGEDIR}${DATADIR}/GeoIP.dat \ - ${STAGEDIR}${DATADIR}/GeoIP.dat.sample - ${MV} ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.default \ - ${STAGEDIR}${PREFIX}/etc/GeoIP.conf.sample - ${RM} ${STAGEDIR}${PREFIX}/etc/GeoIP.conf + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libGeoIP.so.* + @${MKDIR} ${STAGEDIR}${DATADIR} .include Modified: head/net/GeoIP/distinfo ============================================================================== --- head/net/GeoIP/distinfo Mon Jul 28 15:18:02 2014 (r363177) +++ head/net/GeoIP/distinfo Mon Jul 28 15:26:32 2014 (r363178) @@ -1,2 +1,2 @@ -SHA256 (GeoIP-1.4.8.tar.gz) = cf0f6b2bac1153e34d6ef55ee3851479b347d2b5c191fda8ff6a51fab5291ff4 -SIZE (GeoIP-1.4.8.tar.gz) = 1074829 +SHA256 (GeoIP-1.6.0.tar.gz) = 075a0c2815cd099e9ec35c9569db716a3fefcdbb6a10dbfa1ce7c6cd48d4a635 +SIZE (GeoIP-1.6.0.tar.gz) = 722173 Modified: head/net/GeoIP/files/pkg-message.in ============================================================================== --- head/net/GeoIP/files/pkg-message.in Mon Jul 28 15:18:02 2014 (r363177) +++ head/net/GeoIP/files/pkg-message.in Mon Jul 28 15:26:32 2014 (r363178) @@ -1,4 +1,3 @@ -GeoIP does not ship with the latest data file, and it does -not ship with any IPv6 data! To obtain the latest v4 and v6 -data, run: +GeoIP does not ship with the actual data files. You must download +them yourself! Please run: # %%PREFIX%%/bin/geoipupdate.sh Modified: head/net/GeoIP/pkg-plist ============================================================================== --- head/net/GeoIP/pkg-plist Mon Jul 28 15:18:02 2014 (r363177) +++ head/net/GeoIP/pkg-plist Mon Jul 28 15:26:32 2014 (r363178) @@ -1,21 +1,13 @@ bin/geoiplookup bin/geoiplookup6 -bin/geoipupdate bin/geoipupdate.sh -@sample etc/GeoIP.conf.sample include/GeoIP.h include/GeoIPCity.h -include/GeoIPUpdate.h lib/libGeoIP.a lib/libGeoIP.la lib/libGeoIP.so -lib/libGeoIP.so.5 -lib/libGeoIPUpdate.a -lib/libGeoIPUpdate.la -lib/libGeoIPUpdate.so -lib/libGeoIPUpdate.so.0 -@sample %%DATADIR%%/GeoIP.dat.sample +lib/libGeoIP.so.7 +libdata/pkgconfig/geoip.pc man/man1/geoiplookup.1.gz man/man1/geoiplookup6.1.gz -man/man1/geoipupdate.1.gz @dirrmtry %%DATADIR%%