diff --git a/pytest-requirement.patch b/pytest-requirement.patch deleted file mode 100644 index 4c7111a..0000000 --- a/pytest-requirement.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: bleach-2.1.2/setup.py -=================================================================== ---- bleach-2.1.2.orig/setup.py -+++ bleach-2.1.2/setup.py -@@ -11,7 +11,7 @@ from setuptools import setup, find_packa - setup_requires = [] - if 'test' in sys.argv: - # Only add pytest-runner to setup_requires if running tests -- setup_requires.append('pytest-runner>=2.0,<3dev') -+ setup_requires.append('pytest-runner>=2.0') - - tests_require = [ - 'pytest>=3.0.0', diff --git a/python-bleach.changes b/python-bleach.changes index a3ff661..5021ba4 100644 --- a/python-bleach.changes +++ b/python-bleach.changes @@ -1,20 +1,143 @@ ------------------------------------------------------------------- -Wed Dec 13 14:29:13 UTC 2017 - tchvatal@suse.com +Thu Dec 7 16:50:14 UTC 2017 - arun@gmx.de -- Add patch pytest-requirement.patch to build with new pytest-runner +- specfile: + * update copyright year + +- update to version 2.1.2: + * Bug fixes + + Support html5lib-python 1.0.1. (#337) + + Add deprecation warning for supporting html5lib-python < 1.0. + + Switch to semver. ------------------------------------------------------------------- -Wed Dec 13 14:16:03 UTC 2017 - tchvatal@suse.com +Sat Nov 11 17:17:50 UTC 2017 - arun@gmx.de -- Version update to 2.1.2: - * Support new html5lib +- specfile: + * update copyright year + +- update to version 2.1.1: + * Bug fixes + + Fix setup.py opening files when LANG=. (#324) + +- changes from version 2.1: + * Security fixes + + Convert control characters (backspace particularly) to “?” + preventing malicious copy-and-paste situations. (#298) + See https://github.com/mozilla/bleach/issues/298 for more details. + This affects all previous versions of Bleach. Check the comments + on that issue for ways to alleviate the issue if you can’t + upgrade to Bleach 2.1. + * Backwards incompatible changes + + Redid versioning. bleach.VERSION is no longer available. Use the + string version at bleach.__version__ and parse it with + pkg_resources.parse_version. (#307) + + clean, linkify: linkify and clean should only accept text types; + thank you, Janusz! (#292) + + clean, linkify: accept only unicode or utf-8-encoded str (#176) + * Bug fixes + + bleach.clean() no longer unescapes entities including ones that + are missing a ; at the end which can happen in urls and other + places. (#143) + + linkify: fix http links inside of mailto links; thank you, + sedrubal! (#300) + + clarify security policy in docs (#303) + + fix dependency specification for html5lib 1.0b8, 1.0b9, and + 1.0b10; thank you, Zoltán! (#268) + + add Bleach vs. html5lib comparison to README; thank you, Stu + Cox! (#278) + + fix KeyError exceptions on tags without href attr; thank you, + Alex Defsen! (#273) + + add test website and scripts to test bleach.clean() output in + browser; thank you, Greg Guthe! ------------------------------------------------------------------- -Wed Dec 13 14:15:21 UTC 2017 - tchvatal@suse.com +Wed Apr 12 15:15:17 UTC 2017 - toddrme2178@gmail.com -- Convert to singlespec and enable tests/etc. +- Fix source URL. ------------------------------------------------------------------- -Mon Dec 4 11:25:19 UTC 2017 - tampakrap@opensuse.org +Thu Apr 6 17:49:43 UTC 2017 - toddrme2178@gmail.com + +- Update to Version 2.0.0 + + Backwards incompatible changes + * Removed support for Python 2.6. #206 + * Removed support for Python 3.2. #224 + * Bleach no longer supports html5lib < 0.99999999 (8 9s). + * ``bleach.clean`` and friends were rewrittenped. + * ``bleach.clean`` and friends attribute callables now take three arguments: + tag, attribute name and attribute value. Previously they only took attribute + name and attribute value. + * ``bleach.linkify`` was rewritten + * ``bleach.linkify`` and friends had a ``skip_pre`` argument--that's been + replaced with a more general ``skip_tags`` argument. + + Changes + * Supports Python 3.6. + * Supports html5lib >= 0.99999999 (8 9s). + * There's a ``bleach.sanitizer.Cleaner`` class that you can instantiate with your + favorite clean settings for easy reuse. + * There's a ``bleach.linkifier.Linker`` class that you can instantiate with your + favorite linkify settings for easy reuse. + * There's a ``bleach.linkifier.LinkifyFilter`` which is an htm5lib filter that + you can pass as a filter to ``bleach.sanitizer.Cleaner`` allowing you to clean + and linkify in one pass. + * ``bleach.clean`` and friends can now take a callable as an attributes arg value. + * Tons of bug fixes. + * Cleaned up tests. + * Documentation fixes. +- Update to Version 1.5 + + Backwards incompatible changes + * clean: The list of ``ALLOWED_PROTOCOLS`` now defaults to http, https and + mailto. + + Changes + * clean: Added ``protocols`` to arguments list to let you override the list of + allowed protocols. Thank you, Andreas Malecki! #149 + * linkify: Fix a bug involving periods at the end of an email address. Thank you, + Lorenz Schori! #219 + * linkify: Fix linkification of non-ascii ports. Thank you Alexandre, Macabies! + #207 + * linkify: Fix linkify inappropriately removing node tails when dropping nodes. + #132 + * Fixed a test that failed periodically. #161 + * Switched from nose to py.test. #204 + * Add test matrix for all supported Python and html5lib versions. #230 + * Limit to html5lib ``>=0.999,!=0.9999,!=0.99999,<0.99999999`` because 0.9999 + and 0.99999 are busted. + * Add support for ``python setup.py test``. #97 +- Update to Version 1.4.3 (May 23rd, 2016) + + Changes + * Limit to html5lib ``>=0.999,<0.99999999`` because of impending change to + sanitizer api. #195 +- Update to Version 1.4.2 + + Changes + * linkify: Fix hang in linkify with ``parse_email=True``. #124 + * linkify: Fix crash in linkify when removing a link that is a first-child. #136 + * Updated TLDs. + * linkify: Don't remove exterior brackets when linkifying. #146 +- Implemenet single-spec version + +------------------------------------------------------------------- +Thu Sep 3 14:39:11 UTC 2015 - toddrme2178@gmail.com + +- Fix build on SLE 11 + +------------------------------------------------------------------- +Fri Aug 7 22:19:47 UTC 2015 - hpj@urpla.net + +- eabled checks again: don't know, why they failed in the first place + +------------------------------------------------------------------- +Thu Jul 30 09:34:52 UTC 2015 - hpj@urpla.net + +- disabled checks: developer unresponsive + +------------------------------------------------------------------- +Wed Jun 17 18:11:49 UTC 2015 - hpj@urpla.net + +- updated to version 1.4.1 + +------------------------------------------------------------------- +Mon May 26 22:28:56 UTC 2014 - hpj@urpla.net + +- version 1.4: initial build -- Initial package diff --git a/python-bleach.spec b/python-bleach.spec index 0b993ec..a2d42b7 100644 --- a/python-bleach.spec +++ b/python-bleach.spec @@ -2,6 +2,7 @@ # spec file for package python-bleach # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,29 +21,50 @@ Name: python-bleach Version: 2.1.2 Release: 0 -Summary: An easy safelist-based HTML-sanitizing tool +Summary: An easy whitelist-based HTML-sanitizing tool License: Apache-2.0 Group: Development/Languages/Python -Url: https://github.com/mozilla/bleach +Url: http://github.com/jsocol/bleach Source: https://files.pythonhosted.org/packages/source/b/bleach/bleach-%{version}.tar.gz -Patch0: pytest-requirement.patch -BuildRequires: %{python_module flake8 >= 3.3.0} -BuildRequires: %{python_module html5lib} >= 1.0.1 -BuildRequires: %{python_module pytest >= 3.0.0} +BuildRequires: %{python_module devel} +BuildRequires: %{python_module html5lib >= 0.99999999} BuildRequires: %{python_module pytest-runner} +BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module six} +BuildRequires: %{python_module webencodings} +BuildRequires: fdupes BuildRequires: python-rpm-macros -Requires: python-html5lib >= 1.0.1 +Requires: python-html5lib >= 0.99999999 +Requires: python-six +Requires: python-webencodings +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch + %python_subpackages %description -Bleach is an allowed-list-based HTML sanitizing library that escapes or strips markup and attributes. -Bleach can also linkify text safely, applying filters that Django’s urlize filter cannot, and optionally setting rel attributes, even on links already in the text. +Bleach is an HTML sanitizing library that escapes or strips markup and +attributes based on a white list. Bleach can also linkify text safely, applying +filters that Django's ``urlize`` filter cannot, and optionally setting ``rel`` +attributes, even on links already in the text. + +Bleach is intended for sanitizing text from *untrusted* sources. If you find +yourself jumping through hoops to allow your site administrators to do lots of +things, you're probably outside the use cases. Either trust those users, or +don't. + +Because it relies on html5lib, Bleach is as good as modern browsers at dealing +with weird, quirky HTML fragments. And *any* of Bleach's methods will fix +unbalanced or mis-nested tags. + +The version on GitHub_ is the most up-to-date and contains the latest bug +fixes. You can find full documentation on `ReadTheDocs`. + +http://bleach.readthedocs.org/ %prep %setup -q -n bleach-%{version} -%autopatch -p1 %build %python_build @@ -50,10 +72,16 @@ Bleach can also linkify text safely, applying filters that Django’s urlize fil %install %python_install +%python_expand %fdupes %{buildroot}%{$python_sitelib} + %check -%python_exec setup.py test +%{python_expand export PYTHONPATH=%{buildroot}%{$python_sitelib} +py.test-%{$python_bin_suffix} +} %files %{python_files} +%defattr(-,root,root,-) +%doc CHANGES LICENSE README.rst %{python_sitelib}/* %changelog