Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Aug 2014 19:35:52 +0000 (UTC)
From:      Mikolaj Golub <trociny@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r365588 - in head/databases/py-swift: . files
Message-ID:  <201408211935.s7LJZqvl044669@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trociny
Date: Thu Aug 21 19:35:52 2014
New Revision: 365588
URL: http://svnweb.freebsd.org/changeset/ports/365588
QAT: https://qat.redports.org/buildarchive/r365588/

Log:
  - take over maintainership;
  - update to 2.0.0;
  - add @exec/@unexec for copying sample files to configuration.

Modified:
  head/databases/py-swift/Makefile
  head/databases/py-swift/distinfo
  head/databases/py-swift/files/patch-utils.py
  head/databases/py-swift/pkg-plist

Modified: head/databases/py-swift/Makefile
==============================================================================
--- head/databases/py-swift/Makefile	Thu Aug 21 19:28:40 2014	(r365587)
+++ head/databases/py-swift/Makefile	Thu Aug 21 19:35:52 2014	(r365588)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	swift
-PORTVERSION=	1.13.1
+PORTVERSION=	2.0.0
 CATEGORIES=	databases python
-MASTER_SITES=	http://launchpadlibrarian.net/173001998/
+MASTER_SITES=	http://launchpadlibrarian.net/179481023/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Highly available, distributed, eventually consistent object/blob store
 
 LICENSE=	APACHE20
@@ -36,54 +36,61 @@ GROUPS=		swift
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/swift|${PREFIX}/etc/${PORTNAME}|" \
-	    ${WRKSRC}/bin/swift-account-audit \
-	    ${WRKSRC}/bin/swift-dispersion-populate \
-	    ${WRKSRC}/bin/swift-dispersion-report \
-	    ${WRKSRC}/bin/swift-get-nodes \
-	    ${WRKSRC}/bin/swift-object-info \
-	    ${WRKSRC}/bin/swift-recon \
-	    ${WRKSRC}/bin/swift-recon-cron \
-	    ${WRKSRC}/doc/manpages/account-server.conf.5 \
-	    ${WRKSRC}/doc/manpages/container-server.conf.5 \
-	    ${WRKSRC}/doc/manpages/dispersion.conf.5 \
-	    ${WRKSRC}/doc/manpages/object-expirer.conf.5 \
-	    ${WRKSRC}/doc/manpages/object-server.conf.5 \
-	    ${WRKSRC}/doc/manpages/proxy-server.conf.5 \
-	    ${WRKSRC}/doc/manpages/swift-dispersion-populate.1 \
-	    ${WRKSRC}/doc/manpages/swift-dispersion-report.1 \
-	    ${WRKSRC}/doc/manpages/swift-get-nodes.1 \
-	    ${WRKSRC}/doc/manpages/swift-recon.1 \
-	    ${WRKSRC}/etc/account-server.conf-sample \
-	    ${WRKSRC}/etc/container-server.conf-sample \
-	    ${WRKSRC}/etc/dispersion.conf-sample \
-	    ${WRKSRC}/etc/object-expirer.conf-sample \
-	    ${WRKSRC}/etc/object-server.conf-sample \
-	    ${WRKSRC}/etc/proxy-server.conf-sample \
-	    ${WRKSRC}/swift/account/reaper.py \
-	    ${WRKSRC}/swift/common/constraints.py \
-	    ${WRKSRC}/swift/common/db_replicator.py \
-	    ${WRKSRC}/swift/common/manager.py \
-	    ${WRKSRC}/swift/common/middleware/account_quotas.py \
-	    ${WRKSRC}/swift/common/middleware/container_sync.py \
-	    ${WRKSRC}/swift/common/middleware/gatekeeper.py \
-	    ${WRKSRC}/swift/common/middleware/list_endpoints.py \
-	    ${WRKSRC}/swift/common/middleware/memcache.py \
-	    ${WRKSRC}/swift/common/middleware/recon.py \
-	    ${WRKSRC}/swift/common/middleware/staticweb.py \
-	    ${WRKSRC}/swift/common/utils.py \
-	    ${WRKSRC}/swift/container/server.py \
-	    ${WRKSRC}/swift/container/sync.py \
-	    ${WRKSRC}/swift/container/updater.py \
-	    ${WRKSRC}/swift/obj/expirer.py \
-	    ${WRKSRC}/swift/obj/replicator.py \
-	    ${WRKSRC}/swift/obj/server.py \
-	    ${WRKSRC}/swift/obj/updater.py \
-	    ${WRKSRC}/swift/proxy/server.py \
-	    ${WRKSRC}/test/__init__.py \
-	    ${WRKSRC}/test/functional/tests.py \
-	    ${WRKSRC}/test/probe/common.py \
-	    ${WRKSRC}/test/sample.conf \
-	    ${WRKSRC}/test/unit/common/middleware/test_memcache.py
+		${WRKSRC}/bin/swift-account-audit \
+		${WRKSRC}/bin/swift-account-info \
+		${WRKSRC}/bin/swift-container-info \
+		${WRKSRC}/bin/swift-dispersion-populate \
+		${WRKSRC}/bin/swift-dispersion-report \
+		${WRKSRC}/bin/swift-get-nodes \
+		${WRKSRC}/bin/swift-object-info \
+		${WRKSRC}/bin/swift-recon \
+		${WRKSRC}/bin/swift-recon-cron \
+		${WRKSRC}/bin/swift-reconciler-enqueue \
+		${WRKSRC}/doc/manpages/account-server.conf.5 \
+		${WRKSRC}/doc/manpages/container-server.conf.5 \
+		${WRKSRC}/doc/manpages/dispersion.conf.5 \
+		${WRKSRC}/doc/manpages/object-expirer.conf.5 \
+		${WRKSRC}/doc/manpages/object-server.conf.5 \
+		${WRKSRC}/doc/manpages/proxy-server.conf.5 \
+		${WRKSRC}/doc/manpages/swift-dispersion-populate.1 \
+		${WRKSRC}/doc/manpages/swift-dispersion-report.1 \
+		${WRKSRC}/doc/manpages/swift-get-nodes.1 \
+		${WRKSRC}/doc/manpages/swift-recon.1 \
+		${WRKSRC}/etc/account-server.conf-sample \
+		${WRKSRC}/etc/container-reconciler.conf-sample \
+		${WRKSRC}/etc/container-server.conf-sample \
+		${WRKSRC}/etc/dispersion.conf-sample \
+		${WRKSRC}/etc/object-expirer.conf-sample \
+		${WRKSRC}/etc/object-server.conf-sample \
+		${WRKSRC}/etc/proxy-server.conf-sample \
+		${WRKSRC}/swift/account/reaper.py \
+		${WRKSRC}/swift/cli/info.py \
+		${WRKSRC}/swift/cli/recon.py \
+		${WRKSRC}/swift/common/constraints.py \
+		${WRKSRC}/swift/common/db_replicator.py \
+		${WRKSRC}/swift/common/manager.py \
+		${WRKSRC}/swift/common/middleware/account_quotas.py \
+		${WRKSRC}/swift/common/middleware/container_sync.py \
+		${WRKSRC}/swift/common/middleware/gatekeeper.py \
+		${WRKSRC}/swift/common/middleware/list_endpoints.py \
+		${WRKSRC}/swift/common/middleware/memcache.py \
+		${WRKSRC}/swift/common/middleware/recon.py \
+		${WRKSRC}/swift/common/middleware/staticweb.py \
+		${WRKSRC}/swift/common/utils.py \
+		${WRKSRC}/swift/container/reconciler.py \
+		${WRKSRC}/swift/container/server.py \
+		${WRKSRC}/swift/container/sync.py \
+		${WRKSRC}/swift/container/updater.py \
+		${WRKSRC}/swift/obj/expirer.py \
+		${WRKSRC}/swift/obj/replicator.py \
+		${WRKSRC}/swift/obj/server.py \
+		${WRKSRC}/swift/obj/updater.py \
+		${WRKSRC}/swift/proxy/server.py \
+		${WRKSRC}/test/__init__.py \
+		${WRKSRC}/test/functional/tests.py \
+		${WRKSRC}/test/probe/common.py \
+		${WRKSRC}/test/sample.conf \
+		${WRKSRC}/test/unit/common/middleware/test_memcache.py
 	@${FIND} ${WRKSRC} -type f -name "*.bak" -delete
 
 post-install:

Modified: head/databases/py-swift/distinfo
==============================================================================
--- head/databases/py-swift/distinfo	Thu Aug 21 19:28:40 2014	(r365587)
+++ head/databases/py-swift/distinfo	Thu Aug 21 19:35:52 2014	(r365588)
@@ -1,2 +1,2 @@
-SHA256 (swift-1.13.1.tar.gz) = cbe6e807c0c0115570fc3da4dd7e3f3c2477fb48f865f29d648fb5714734eabd
-SIZE (swift-1.13.1.tar.gz) = 802273
+SHA256 (swift-2.0.0.tar.gz) = 2dbe98186d6c78ab3e57708dfd46416f3a33001d94322b33e8f7a0c722a976b4
+SIZE (swift-2.0.0.tar.gz) = 947369

Modified: head/databases/py-swift/files/patch-utils.py
==============================================================================
--- head/databases/py-swift/files/patch-utils.py	Thu Aug 21 19:28:40 2014	(r365587)
+++ head/databases/py-swift/files/patch-utils.py	Thu Aug 21 19:35:52 2014	(r365588)
@@ -1,6 +1,6 @@
---- swift/common/utils.py.orig	2013-05-18 14:10:21.000000000 +0300
-+++ swift/common/utils.py	2013-05-18 14:09:06.000000000 +0300
-@@ -274,12 +274,12 @@ def drop_buffer_cache(fd, offset, length
+--- swift/common/utils.py.orig	2014-07-07 19:08:31.000000000 +0300
++++ swift/common/utils.py	2014-08-20 21:56:29.000000000 +0300
+@@ -552,12 +552,12 @@
      """
      global _posix_fadvise
      if _posix_fadvise is None:
@@ -10,8 +10,8 @@
      ret = _posix_fadvise(fd, ctypes.c_uint64(offset),
                           ctypes.c_uint64(length), 4)
      if ret != 0:
--        logging.warn("posix_fadvise64(%s, %s, %s, 4) -> %s"
-+        logging.warn("posix_fadvise(%s, %s, %s, 4) -> %s"
-                      % (fd, offset, length, ret))
- 
+-        logging.warn("posix_fadvise64(%(fd)s, %(offset)s, %(length)s, 4) "
++        logging.warn("posix_fadvise(%(fd)s, %(offset)s, %(length)s, 4) "
+                      "-> %(ret)s", {'fd': fd, 'offset': offset,
+                                     'length': length, 'ret': ret})
  

Modified: head/databases/py-swift/pkg-plist
==============================================================================
--- head/databases/py-swift/pkg-plist	Thu Aug 21 19:28:40 2014	(r365587)
+++ head/databases/py-swift/pkg-plist	Thu Aug 21 19:35:52 2014	(r365588)
@@ -1,16 +1,45 @@
-etc/swift/account-server.conf-sample
-etc/swift/container-server.conf-sample
-etc/swift/container-sync-realms.conf-sample
-etc/swift/dispersion.conf-sample
-etc/swift/drive-audit.conf-sample
-etc/swift/memcache.conf-sample
-etc/swift/mime.types-sample
-etc/swift/object-expirer.conf-sample
-etc/swift/object-server.conf-sample
-etc/swift/proxy-server.conf-sample
-etc/swift/rsyncd.conf-sample
-etc/swift/swift-rsyslog.conf-sample
-etc/swift/swift.conf-sample
+@unexec if cmp -s %D/%%ETCDIR%%/account-server.conf-sample %D/%%ETCDIR%%/account-server.conf; then rm -f %D/%%ETCDIR%%/account-server.conf; fi
+%%ETCDIR%%/account-server.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/account-server.conf ] ; then cp -p %D/%F %B/account-server.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/container-reconciler.conf-sample %D/%%ETCDIR%%/container-reconciler.conf; then rm -f %D/%%ETCDIR%%/container-reconciler.conf; fi
+%%ETCDIR%%/container-reconciler.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/container-reconciler.conf ] ; then cp -p %D/%F %B/container-reconciler.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/container-server.conf-sample %D/%%ETCDIR%%/container-server.conf; then rm -f %D/%%ETCDIR%%/container-server.conf; fi
+%%ETCDIR%%/container-server.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/container-server.conf ] ; then cp -p %D/%F %B/container-server.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/container-sync-realms.conf-sample %D/%%ETCDIR%%/container-sync-realms.conf; then rm -f %D/%%ETCDIR%%/container-sync-realms.conf; fi
+%%ETCDIR%%/container-sync-realms.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/container-sync-realms.conf ] ; then cp -p %D/%F %B/container-sync-realms.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/dispersion.conf-sample %D/%%ETCDIR%%/dispersion.conf; then rm -f %D/%%ETCDIR%%/dispersion.conf; fi
+%%ETCDIR%%/dispersion.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/dispersion.conf ] ; then cp -p %D/%F %B/dispersion.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/drive-audit.conf-sample %D/%%ETCDIR%%/drive-audit.conf; then rm -f %D/%%ETCDIR%%/drive-audit.conf; fi
+%%ETCDIR%%/drive-audit.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/drive-audit.conf ] ; then cp -p %D/%F %B/drive-audit.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/memcache.conf-sample %D/%%ETCDIR%%/memcache.conf; then rm -f %D/%%ETCDIR%%/memcache.conf; fi
+%%ETCDIR%%/memcache.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/memcache.conf ] ; then cp -p %D/%F %B/memcache.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/mime.types-sample %D/%%ETCDIR%%/mime.types; then rm -f %D/%%ETCDIR%%/mime.types; fi
+%%ETCDIR%%/mime.types-sample
+@exec if [ ! -f %D/%%ETCDIR%%/mime.types ] ; then cp -p %D/%F %B/mime.types; fi
+@unexec if cmp -s %D/%%ETCDIR%%/object-expirer.conf-sample %D/%%ETCDIR%%/object-expirer.conf; then rm -f %D/%%ETCDIR%%/object-expirer.conf; fi
+%%ETCDIR%%/object-expirer.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/object-expirer.conf ] ; then cp -p %D/%F %B/object-expirer.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/object-server.conf-sample %D/%%ETCDIR%%/object-server.conf; then rm -f %D/%%ETCDIR%%/object-server.conf; fi
+%%ETCDIR%%/object-server.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/object-server.conf ] ; then cp -p %D/%F %B/object-server.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/proxy-server.conf-sample %D/%%ETCDIR%%/proxy-server.conf; then rm -f %D/%%ETCDIR%%/proxy-server.conf; fi
+%%ETCDIR%%/proxy-server.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/proxy-server.conf ] ; then cp -p %D/%F %B/proxy-server.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/rsyncd.conf-sample %D/%%ETCDIR%%/rsyncd.conf; then rm -f %D/%%ETCDIR%%/rsyncd.conf; fi
+%%ETCDIR%%/rsyncd.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/rsyncd.conf ] ; then cp -p %D/%F %B/rsyncd.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/swift-rsyslog.conf-sample %D/%%ETCDIR%%/swift-rsyslog.conf; then rm -f %D/%%ETCDIR%%/swift-rsyslog.conf; fi
+%%ETCDIR%%/swift-rsyslog.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/swift-rsyslog.conf ] ; then cp -p %D/%F %B/swift-rsyslog.conf; fi
+@unexec if cmp -s %D/%%ETCDIR%%/swift.conf-sample %D/%%ETCDIR%%/swift.conf; then rm -f %D/%%ETCDIR%%/swift.conf; fi
+%%ETCDIR%%/swift.conf-sample
+@exec if [ ! -f %D/%%ETCDIR%%/swift.conf ] ; then cp -p %D/%F %B/swift.conf; fi
 man/man1/swift-account-auditor.1.gz
 man/man1/swift-account-info.1.gz
 man/man1/swift-account-reaper.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408211935.s7LJZqvl044669>