From e8f81810baa21f490d6910e8e2d424546b72a333 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Sep 2019 09:01:56 +0100 Subject: gentoo resync : 15.09.2019 --- www-apps/Manifest.gz | Bin 15133 -> 15130 bytes www-apps/roundup/Manifest | 9 +- .../roundup/files/roundup-1.6.0-configparser.patch | 40 ------ .../roundup/files/roundup-1.6.0-csrf-headers.patch | 150 --------------------- www-apps/roundup/files/roundup-1.6.0-xss.patch | 35 ----- www-apps/roundup/metadata.xml | 5 + www-apps/roundup/roundup-1.6.0-r1.ebuild | 36 ----- www-apps/roundup/roundup-1.6.1.ebuild | 38 ++++++ 8 files changed, 46 insertions(+), 267 deletions(-) delete mode 100644 www-apps/roundup/files/roundup-1.6.0-configparser.patch delete mode 100644 www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch delete mode 100644 www-apps/roundup/files/roundup-1.6.0-xss.patch delete mode 100644 www-apps/roundup/roundup-1.6.0-r1.ebuild create mode 100644 www-apps/roundup/roundup-1.6.1.ebuild (limited to 'www-apps') diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz index 1ba740bb9b47..ffe2d6a4f454 100644 Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest index 5976cfbdcdbf..d7e77e2ef7a3 100644 --- a/www-apps/roundup/Manifest +++ b/www-apps/roundup/Manifest @@ -1,8 +1,5 @@ -AUX roundup-1.6.0-configparser.patch 1159 BLAKE2B 555aac3215c1e706a89de6d85e7ee7add2284daf608bbbbcd818132f58c84a26c01e4ea6b561d3733d8b32c6524f5c4191a2522737417e88a1bdaf51f2c11f41 SHA512 961bd05fc36c00780ec7ac94d14534ccca9b492dfa524bbc62a21b15fa507f9aebc5816e28f9707e93e7bedd060506742720b2c9b1dd157ec71be8caeb48b580 -AUX roundup-1.6.0-csrf-headers.patch 7402 BLAKE2B b5c78e31a0de357f5074907271a81f66090ee4fc8d1ea49c94c511f29a8d639149e3483fd5335710bf3deca0bffb1c8ceb8f8fcf3dabd5de9efefe61b06f906c SHA512 a6cdb78a8725c8f7fc2004dd12679ac5beff34ecc5d31025344fa914827bd3c8f989731d830a38dbc98a2c9651ad0483bbb29743b29d1ed4f4f9ba5326f05341 -AUX roundup-1.6.0-xss.patch 1421 BLAKE2B 94938ffda8e83bf13e81c5b8d07579dcb6a97caae549c1f172ef081f5848648804c3f64797550f3b93e1eb24bc48b05dd78574ef02031c014d0a21c961331907 SHA512 bd265f305850bb6931f4c25fb18fd1fc06508b3e6c834814f52b25fc47a87f681600d0484ba8014915d4374ba0f32c522e1bf5b01c84fb1bd1e3166b394c704b DIST roundup-1.5.1.tar.gz 2618886 BLAKE2B 5ccca10ce7f30b35b0875340c4cae87aa19e5384e6e5973576ea8e2de79eb83d32447580944f472d73e7cdb5f43a4ed7f805d51242e22cc2f756b3deae4004b2 SHA512 d7cdeaafb682ce7f202cacddeb1a42312f22778a2c83b52b4e838c27b1e7141a94b2ac2b670b0edee0efcfe27d74e31e6f267ae1380e90359def27385ca68d58 -DIST roundup-1.6.0.tar.gz 2893499 BLAKE2B 5fe75b0953d16cebe52a25379d5a13f7745eb87e4a6a46f17945c3655394c1d1d2aff9e74783ee3e4757fc407ca2b46a7c3ef6d20eedbfb695783302fb64bf1f SHA512 1a8e9c0c7a6e607953ee91ce750f72bf53b5c6dc4bbd6d001570dd77abf396d4de2c832ef45495b87890a3c11b158be9e7a8eed635f63b5586b7bb9399856dcc +DIST roundup-1.6.1.tar.gz 3128618 BLAKE2B 7fa87006582feac74f0fc455bc201f2485326b8f6ed616164f667992da114d45e8d8cef370a825450b5a4cb757ba0453d5fe3ace47164bd83e78a8c6f28b9d05 SHA512 b7666c5515c76baa4fa3ac3d0efea82feace6270af55bbc70e603b2ce0c617b4a303a15133310c1e00d3b6442baa58060d5387f568014652b1b781d9248f0052 EBUILD roundup-1.5.1.ebuild 1223 BLAKE2B 7ed134153096b574ae8efd88613d28555055ba10ecde2bbcc47ffb78dc68de813b8fd6e2c8ade791b34fd69ca8ef88a4e7522cf24f26c282c463f87c3e4571af SHA512 226588bc17c7fa2726b1734d6a233c354f684d39b705f47ce3ce2b9792c6ecbe7979075861a677a6434e78caa0f5abede020a329c145ed59e112769591575a62 -EBUILD roundup-1.6.0-r1.ebuild 857 BLAKE2B 5381a9e6d13e526ec7591c9d0765c2d17bdb9eb2c387696c7f23d1f54a2ff4baad3a23bff9288f347ff34a982ea5d8fc05243af39ec34c7c406e1b2f0cafbd93 SHA512 cfe90f9195f634cef21a1465332d6368a2d30d7490f004376a2aeeb02ad804afccde6c907106b067fbce43c2fcd6e760024986c9488aaa75143363999d31ee0e -MISC metadata.xml 477 BLAKE2B 558f76b13892756e818b9931e72c1e9f2262bd214c1a8d08cd48775a474e6dd95b3a4099e5bd8ce7582560f40804fbbe93006932ac245b72f90aa54a78c9e909 SHA512 2a8912d94be88771ed0044ae823fb2027fb3f403256f8d3045b01a46f9595866a9129e85cdbc05e601a18d264b92c88648e8acc78a50ce52a4810ee7d5532999 +EBUILD roundup-1.6.1.ebuild 1149 BLAKE2B 45f05861dec435e55b74d9ff39d02d832a02b555c77318682fa6f1b79236fbb4453550a37e62f4deff9618d432de1e6fb8498cc74d4a9d8b804bfe77ba32e158 SHA512 76082840f77b8a568657796d132c4c69f2fbcd01ff0ea1e039c8d750d62fff94b2dbd5ee2bfa72235220dc9885241eec1ea91273113b32ccb4902b7f4e891e7c +MISC metadata.xml 671 BLAKE2B a0a50000b9e4b5858b672a682111ec2b958aee5067e491eb842437ff14a85fa0ab2c8550b12ac4a028d583f43808223e279f04a24d56747c338e7c3c81d454b0 SHA512 2930519c380cf108ade7731b1ee9587fbaf3861957e6d5375afea0f221363137d959e582ce85e44acad39184b850600d2ca3bd5c809826edb8c53948a3b30741 diff --git a/www-apps/roundup/files/roundup-1.6.0-configparser.patch b/www-apps/roundup/files/roundup-1.6.0-configparser.patch deleted file mode 100644 index 6bdfc8dfaaad..000000000000 --- a/www-apps/roundup/files/roundup-1.6.0-configparser.patch +++ /dev/null @@ -1,40 +0,0 @@ -changeset: 5625:99175953520e -branch: maint-1.6 -parent: 5537:d698d3d843a9 -user: Joseph Myers -date: Mon Aug 20 00:50:16 2018 +0000 -files: CHANGES.txt roundup/configuration.py -description: -Fix issue2550994: breakage caused by configparser backports. - - -diff -r d698d3d843a9 -r 99175953520e roundup/configuration.py ---- a/roundup/configuration.py Thu Sep 06 17:04:49 2018 -0400 -+++ b/roundup/configuration.py Mon Aug 20 00:50:16 2018 +0000 -@@ -2,9 +2,15 @@ - # - __docformat__ = "restructuredtext" - --try: -+# Some systems have a backport of the Python 3 configparser module to -+# Python 2: . That breaks -+# Roundup if used with Python 2 because it generates unicode objects -+# where not expected by the Python code. Thus, a version check is -+# used here instead of try/except. -+import sys -+if sys.version_info[0] > 2: - import configparser # Python 3 --except ImportError: -+else: - import ConfigParser as configparser # Python 2 - - import getopt -@@ -12,7 +18,6 @@ - import logging, logging.config - import os - import re --import sys - import time - import smtplib - - diff --git a/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch b/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch deleted file mode 100644 index 8be484d5f807..000000000000 --- a/www-apps/roundup/files/roundup-1.6.0-csrf-headers.patch +++ /dev/null @@ -1,150 +0,0 @@ -changeset: 5629:8e3df461d316 -branch: maint-1.6 -user: John Rouillard -date: Wed Feb 27 21:47:39 2019 -0500 -files: CHANGES.txt roundup/cgi/client.py roundup/scripts/roundup_server.py test/test_cgi.py -description: -issue2551023: Fix CSRF headers for use with wsgi and cgi. The -env variable array used - separators rather than _. Compare: -HTTP_X-REQUESTED-WITH to HTTP_X_REQUESTED_WITH. The last is -correct. Also fix roundup-server to produce the latter form. (Patch -by Cédric Krier) - - -diff -r 64ceb9c14b28 -r 8e3df461d316 roundup/cgi/client.py ---- a/roundup/cgi/client.py Tue Feb 12 21:31:41 2019 -0500 -+++ b/roundup/cgi/client.py Wed Feb 27 21:47:39 2019 -0500 -@@ -1026,7 +1026,7 @@ - # If required headers are missing, raise an error - for header in header_names: - if (config["WEB_CSRF_ENFORCE_HEADER_%s"%header] == 'required' -- and "HTTP_%s"%header not in self.env): -+ and "HTTP_%s" % header.replace('-', '_') not in self.env): - logger.error(self._("csrf header %s required but missing for user%s."), header, current_user) - raise Unauthorised, self._("Missing header: %s")%header - -@@ -1062,9 +1062,9 @@ - header_pass += 1 - - enforce=config['WEB_CSRF_ENFORCE_HEADER_X-FORWARDED-HOST'] -- if 'HTTP_X-FORWARDED-HOST' in self.env: -+ if 'HTTP_X_FORWARDED_HOST' in self.env: - if enforce != "no": -- host = self.env['HTTP_X-FORWARDED-HOST'] -+ host = self.env['HTTP_X_FORWARDED_HOST'] - foundat = self.base.find('://' + host + '/') - # 4 means self.base has http:/ prefix, 5 means https:/ prefix - if foundat not in [4, 5]: -@@ -1111,7 +1111,7 @@ - # Note we do not use CSRF nonces for xmlrpc requests. - # - # see: https://www.owasp.org/index.php/Cross-Site_Request_Forgery_(CSRF)_Prevention_Cheat_Sheet#Protecting_REST_Services:_Use_of_Custom_Request_Headers -- if 'HTTP_X-REQUESTED-WITH' not in self.env: -+ if 'HTTP_X_REQUESTED_WITH' not in self.env: - logger.error(self._("csrf X-REQUESTED-WITH xmlrpc required header check failed for user%s."), current_user) - raise UsageError, self._("Required Header Missing") - -diff -r 64ceb9c14b28 -r 8e3df461d316 roundup/scripts/roundup_server.py ---- a/roundup/scripts/roundup_server.py Tue Feb 12 21:31:41 2019 -0500 -+++ b/roundup/scripts/roundup_server.py Wed Feb 27 21:47:39 2019 -0500 -@@ -384,8 +384,8 @@ - # If behind a proxy, this is the hostname supplied - # via the Host header to the proxy. Used by core code. - # Controlled by the CSRF settings. -- env['HTTP_X-FORWARDED-HOST'] = xfh -- xff = self.headers.getheader('X-Forwarded-For', None) -+ env['HTTP_X_FORWARDED_HOST'] = xfh -+ xff = self.headers.get('X-Forwarded-For', None) - if xff: - # xff is a list of ip addresses for original client/proxies: - # X-Forwarded-For: clientIP, proxy1IP, proxy2IP -@@ -394,8 +394,8 @@ - # Made available for extensions if the user trusts it. - # E.g. you may wish to disable recaptcha validation extension - # if the ip of the client matches 172.16.0.0. -- env['HTTP_X-FORWARDED-FOR'] = xff -- xfp = self.headers.getheader('X-Forwarded-Proto', None) -+ env['HTTP_X_FORWARDED_FOR'] = xff -+ xfp = self.headers.get('X-Forwarded-Proto', None) - if xfp: - # xfp is the protocol (http/https) seen by proxies in the - # path of the request. I am not sure if there is only -@@ -408,8 +408,8 @@ - # May not be trustworthy. Do not use in core without - # config option to control its use. - # Made available for extensions if the user trusts it. -- env['HTTP_X-FORWARDED-PROTO'] = xfp -- if os.environ.has_key('CGI_SHOW_TIMING'): -+ env['HTTP_X_FORWARDED_PROTO'] = xfp -+ if 'CGI_SHOW_TIMING' in os.environ: - env['CGI_SHOW_TIMING'] = os.environ['CGI_SHOW_TIMING'] - env['HTTP_ACCEPT_LANGUAGE'] = self.headers.get('accept-language') - referer = self.headers.get('Referer') -@@ -420,8 +420,8 @@ - env['HTTP_ORIGIN'] = origin - xrw = self.headers.get('x-requested-with') - if xrw: -- env['HTTP_X-REQUESTED-WITH'] = xrw -- range = self.headers.getheader('range') -+ env['HTTP_X_REQUESTED_WITH'] = xrw -+ range = self.headers.get('range') - if range: - env['HTTP_RANGE'] = range - -diff -r 64ceb9c14b28 -r 8e3df461d316 test/test_cgi.py ---- a/test/test_cgi.py Tue Feb 12 21:31:41 2019 -0500 -+++ b/test/test_cgi.py Wed Feb 27 21:47:39 2019 -0500 -@@ -888,7 +888,7 @@ - del(cl.env['HTTP_ORIGIN']) - del(out[0]) - -- cl.env['HTTP_X-FORWARDED-HOST'] = 'whoami.com' -+ cl.env['HTTP_X_FORWARDED_HOST'] = 'whoami.com' - # if there is an X-FORWARDED-HOST header it is used and - # HOST header is ignored. X-FORWARDED-HOST should only be - # passed/set by a proxy. In this case the HOST header is -@@ -899,7 +899,7 @@ - match_at=out[0].find('Redirecting to -date: Fri Mar 22 18:16:11 2019 -0400 -files: CHANGES.txt frontends/roundup.cgi roundup/cgi/wsgi_handler.py -description: -Fix fix XSS issue in wsgi and cgi when handing url not found/404. issue2551035 - - -diff -r ea35ab75a4c0 -r ab37c1705dbf frontends/roundup.cgi ---- a/frontends/roundup.cgi Thu Mar 07 15:42:21 2019 +0100 -+++ b/frontends/roundup.cgi Fri Mar 22 18:16:11 2019 -0400 -@@ -179,7 +179,7 @@ - request.send_response(404) - request.send_header('Content-Type', 'text/html') - request.end_headers() -- out.write('Not found: %s'%client.path) -+ out.write('Not found: %s'%cgi.escape(client.path)) - - else: - import urllib -diff -r ea35ab75a4c0 -r ab37c1705dbf roundup/cgi/wsgi_handler.py ---- a/roundup/cgi/wsgi_handler.py Thu Mar 07 15:42:21 2019 +0100 -+++ b/roundup/cgi/wsgi_handler.py Fri Mar 22 18:16:11 2019 -0400 -@@ -66,7 +66,7 @@ - client.main() - except roundup.cgi.client.NotFound: - request.start_response([('Content-Type', 'text/html')], 404) -- request.wfile.write('Not found: %s'%client.path) -+ request.wfile.write('Not found: %s'%cgi.escape(client.path)) - - # all body data has been written using wfile - return [] - diff --git a/www-apps/roundup/metadata.xml b/www-apps/roundup/metadata.xml index 0942edd01872..499f901ab9c1 100644 --- a/www-apps/roundup/metadata.xml +++ b/www-apps/roundup/metadata.xml @@ -13,4 +13,9 @@ roundup roundup + + Enable full support of timezone + Enable Xapian full-text indexer + Enable Whoosh full-text indexer + diff --git a/www-apps/roundup/roundup-1.6.0-r1.ebuild b/www-apps/roundup/roundup-1.6.0-r1.ebuild deleted file mode 100644 index 4e1c93d0283a..000000000000 --- a/www-apps/roundup/roundup-1.6.0-r1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 - -DESCRIPTION="Issue-tracking system with command-line, web, and e-mail interfaces" -HOMEPAGE="http://roundup.sourceforge.net https://pypi.org/project/roundup/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT ZPL" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -DEPEND="" -RDEPEND="${DEPEND}" - -DOCS="CHANGES.txt doc/*.txt" - -PATCHES=( - "${FILESDIR}/${P}-configparser.patch" - "${FILESDIR}/${P}-csrf-headers.patch" - "${FILESDIR}/${P}-xss.patch" -) - -python_install_all() { - distutils-r1_python_install_all - rm -r "${ED}"/usr/share/doc/${PN} || die -} - -pkg_postinst() { - ewarn "See installation.txt for initialisation instructions." - ewarn "See upgrading.txt for upgrading instructions." -} diff --git a/www-apps/roundup/roundup-1.6.1.ebuild b/www-apps/roundup/roundup-1.6.1.ebuild new file mode 100644 index 000000000000..eebb51a675b5 --- /dev/null +++ b/www-apps/roundup/roundup-1.6.1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 + +DESCRIPTION="Issue-tracking system with command-line, web, and e-mail interfaces" +HOMEPAGE="http://roundup.sourceforge.net https://pypi.org/project/roundup/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT ZPL" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="+tz sqlite mysql postgres xapian whoosh ssl" + +DEPEND="" +RDEPEND="${DEPEND} + tz? ( dev-python/pytz[$PYTHON_USEDEP] ) + sqlite? ( dev-lang/python:*[sqlite] ) + mysql? ( dev-python/mysql-python[$PYTHON_USEDEP] ) + postgres? ( >=dev-python/psycopg-1.1.21[$PYTHON_USEDEP] ) + xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,$PYTHON_USEDEP] ) + whoosh? ( >=dev-python/whoosh-2.5.7[$PYTHON_USEDEP] ) + ssl? ( dev-python/pyopenssl[$PYTHON_USEDEP] )" + +DOCS="CHANGES.txt doc/*.txt" + +python_install_all() { + distutils-r1_python_install_all + rm -r "${ED}"/usr/share/doc/${PN} || die +} + +pkg_postinst() { + ewarn "See installation.txt for initialisation instructions." + ewarn "See upgrading.txt for upgrading instructions." +} -- cgit v1.2.3