idella4     14/06/24 09:49:27

  Modified:             ChangeLog
  Added:                swift-1.13.1-r1.ebuild swift-1.13.0-r1.ebuild
  Log:
  revbump; add sec. patch wrt Bug #513864
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
0xB8072B0D)

Revision  Changes    Path
1.29                 sys-cluster/swift/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?rev=1.29&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?rev=1.29&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?r1=1.28&r2=1.29

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog   6 Jun 2014 12:40:45 -0000       1.28
+++ ChangeLog   24 Jun 2014 09:49:27 -0000      1.29
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.28 
2014/06/06 12:40:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.29 
2014/06/24 09:49:27 idella4 Exp $
+
+*swift-1.13.0-r1 (24 Jun 2014)
+*swift-1.13.1-r1 (24 Jun 2014)
+
+  24 Jun 2014; Ian Delaney <idel...@gentoo.org> 
+files/CVE-2014-3497-1.13.patch,
+  +swift-1.13.0-r1.ebuild, +swift-1.13.1-r1.ebuild:
+  revbump; add sec. patch wrt Bug #513864
 
   06 Jun 2014; Jeroen Roovers <j...@gentoo.org> metadata.xml:
   Spelling (bug #512552).



1.1                  sys-cluster/swift/swift-1.13.1-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-1.13.1-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-1.13.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: swift-1.13.1-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.1-r1.ebuild,v 
1.1 2014/06/24 09:49:27 idella4 Exp $

EAPI=5
PYTHON_COMPAT=( python2_7 )

inherit distutils-r1 eutils linux-info user

DESCRIPTION="A highly available, distributed, eventually consistent object/blob 
store"
HOMEPAGE="https://launchpad.net/swift";
SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz";

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="proxy account container object test +memcache"
REQUIRED_USE="|| ( proxy account container object )"

DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
                >=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
                <dev-python/pbr-1.0[${PYTHON_USEDEP}]
                test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
                                <dev-python/hacking-0.9[${PYTHON_USEDEP}]
                                dev-python/coverage[${PYTHON_USEDEP}]
                                dev-python/nose[${PYTHON_USEDEP}]
                                dev-python/nosexcover[${PYTHON_USEDEP}]
                                
dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
                                dev-python/nosehtmloutput[${PYTHON_USEDEP}]
                                >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
                                <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
                                >=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
                                dev-python/python-swiftclient[${PYTHON_USEDEP}] 
)"

RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
                >=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
                >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
                >=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
                >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
                >=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
                dev-python/pyxattr[${PYTHON_USEDEP}]
                memcache? ( net-misc/memcached )
                net-misc/rsync[xattr]"

CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
~ZFS"

PATCHES=( "${FILESDIR}/"CVE-2014-3497-1.13.patch )

pkg_setup() {
        enewuser swift
        enewgroup swift
}

src_prepare() {
        sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
        sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
        distutils-r1_python_prepare_all
}

src_test () {
        # https://bugs.launchpad.net/swift/+bug/1249727
        find . \( -name test_wsgi.py -o -name test_locale.py -o -name 
test_utils.py \) -delete || die
        SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
}

python_install() {
        distutils-r1_python_install
        keepdir /etc/swift
        insinto /etc/swift

        newins "etc/swift.conf-sample" "swift.conf"
#       newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
        newins "etc/rsyncd.conf-sample" "rsyncd.conf"
        newins "etc/mime.types-sample" "mime.types-sample"
        newins "etc/memcache.conf-sample" "memcache.conf-sample"
        newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
        newins "etc/dispersion.conf-sample" "dispersion.conf-sample"

        if use proxy; then
                newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
                newins "etc/proxy-server.conf-sample" "proxy-server.conf"
                if use memcache; then
                        sed -i '/depend/a\
    need memcached' "${D}/etc/init.d/swift-proxy"
                fi
        fi
        if use account; then
                newinitd "${FILESDIR}/swift-account.initd" "swift-account"
                newins "etc/account-server.conf-sample" "account-server.conf"
        fi
        if use container; then
                newinitd "${FILESDIR}/swift-container.initd" "swift-container"
                newins "etc/container-server.conf-sample" 
"container-server.conf"
        fi
        if use object; then
                newinitd "${FILESDIR}/swift-object.initd" "swift-object"
                newins "etc/object-server.conf-sample" "object-server.conf"
                newins "etc/object-expirer.conf-sample" "object-expirer.conf"
        fi

        fowners swift:swift "/etc/swift" || die "fowners failed"
}

pkg_postinst() {
        elog "Openstack swift will default to using insecure http unless a"
        elog "certificate is created in /etc/swift/cert.crt and the associated 
key"
        elog "in /etc/swift/cert.key.  These can be created with the following:"
        elog "  * cd /etc/swift"
        elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
}



1.1                  sys-cluster/swift/swift-1.13.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-1.13.0-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-1.13.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: swift-1.13.0-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.0-r1.ebuild,v 
1.1 2014/06/24 09:49:27 idella4 Exp $

EAPI=5
PYTHON_COMPAT=( python2_7 )

inherit distutils-r1 eutils linux-info user

DESCRIPTION="A highly available, distributed, eventually consistent object/blob 
store"
HOMEPAGE="https://launchpad.net/swift";
SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz";

LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="proxy account container object test +memcache"
REQUIRED_USE="|| ( proxy account container object )"

DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
                >=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
                <dev-python/pbr-1.0[${PYTHON_USEDEP}]
                test? ( ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
                                ~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
                                ~dev-python/flake8-2.0[${PYTHON_USEDEP}]
                                >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
                                <dev-python/hacking-0.6[${PYTHON_USEDEP}]
                                dev-python/nose[${PYTHON_USEDEP}]
                                dev-python/coverage[${PYTHON_USEDEP}]
                                dev-python/nosexcover[${PYTHON_USEDEP}]
                                
dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
                                dev-python/nosehtmloutput[${PYTHON_USEDEP}]
                                >=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
                                >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
                                <dev-python/sphinx-1.2[${PYTHON_USEDEP}] )"

RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
                >=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
                >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
                >=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
                >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
                >=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
                dev-python/pyxattr[${PYTHON_USEDEP}]
                dev-python/python-swiftclient[${PYTHON_USEDEP}]
                memcache? ( net-misc/memcached )
                net-misc/rsync[xattr]"

CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
~ZFS"

PATCHES=( "${FILESDIR}/"CVE-2014-3497-1.13.patch )

pkg_setup() {
        enewuser swift
        enewgroup swift
}

src_prepare() {
        sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
        sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
        distutils-r1_python_prepare_all
}

src_test () {
        # https://bugs.launchpad.net/swift/+bug/1249727
        find . \( -name test_wsgi.py -o -name test_locale.py \) -delete || die
        SKIP_PIP_INSTALL=1 PBR_VERSION=0.5.23 sh .unittests || die
}

python_install() {
        distutils-r1_python_install
        keepdir /etc/swift
        insinto /etc/swift

        newins "etc/swift.conf-sample" "swift.conf"
#       newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
        newins "etc/rsyncd.conf-sample" "rsyncd.conf"
        newins "etc/mime.types-sample" "mime.types-sample"
        newins "etc/memcache.conf-sample" "memcache.conf-sample"
        newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
        newins "etc/dispersion.conf-sample" "dispersion.conf-sample"

        if use proxy; then
                newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
                newins "etc/proxy-server.conf-sample" "proxy-server.conf"
                if use memcache; then
                        sed -i '/depend/a\
    need memcached' "${D}/etc/init.d/swift-proxy"
                fi
        fi
        if use account; then
                newinitd "${FILESDIR}/swift-account.initd" "swift-account"
                newins "etc/account-server.conf-sample" "account-server.conf"
        fi
        if use container; then
                newinitd "${FILESDIR}/swift-container.initd" "swift-container"
                newins "etc/container-server.conf-sample" 
"container-server.conf"
        fi
        if use object; then
                newinitd "${FILESDIR}/swift-object.initd" "swift-object"
                newins "etc/object-server.conf-sample" "object-server.conf"
                newins "etc/object-expirer.conf-sample" "object-expirer.conf"
        fi

        fowners swift:swift "/etc/swift" || die "fowners failed"
}

pkg_postinst() {
        elog "Openstack swift will default to using insecure http unless a"
        elog "certificate is created in /etc/swift/cert.crt and the associated 
key"
        elog "in /etc/swift/cert.key.  These can be created with the following:"
        elog "  * cd /etc/swift"
        elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
}




Reply via email to