Hello community, here is the log from the commit of package moinmoin-wiki for openSUSE:Factory checked in at 2018-01-19 11:50:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/moinmoin-wiki (Old) and /work/SRC/openSUSE:Factory/.moinmoin-wiki.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "moinmoin-wiki" Fri Jan 19 11:50:22 2018 rev:4 rq:560032 version:1.9.9 Changes: -------- --- /work/SRC/openSUSE:Factory/moinmoin-wiki/moinmoin-wiki.changes 2017-09-20 17:13:49.775938105 +0200 +++ /work/SRC/openSUSE:Factory/.moinmoin-wiki.new/moinmoin-wiki.changes 2018-01-19 11:50:27.915409778 +0100 @@ -1,0 +2,16 @@ +Tue Dec 26 16:01:34 UTC 2017 - [email protected] + +- Trim filler wording from description. + +------------------------------------------------------------------- +Mon Dec 18 21:10:35 UTC 2017 - [email protected] + +- Upgrade to version 1.9.9: + + added raw#199.patch as specified by upstream +- Remove obsolete Java drawing Applets from package + + removed anywikidraw-java8.patch + + removed anywikidraw-java9.patch + + removed anywikidraw.patch + + removed twikidraw-java9.patch + +------------------------------------------------------------------- Old: ---- anywikidraw-java8.patch anywikidraw-java9.patch anywikidraw.patch moin-1.9.8.tar.gz twikidraw-java9.patch New: ---- moin-1.9.9.tar.gz raw#199.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ moinmoin-wiki.spec ++++++ --- /var/tmp/diff_new_pack.WFmn5C/_old 2018-01-19 11:50:30.923267984 +0100 +++ /var/tmp/diff_new_pack.WFmn5C/_new 2018-01-19 11:50:30.923267984 +0100 @@ -22,9 +22,9 @@ BuildArch: noarch %endif Name: moinmoin-wiki -Version: 1.9.8 +Version: 1.9.9 Release: 0 -Summary: Fully-featured wiki engine written in Python +Summary: Wiki engine written in Python License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends Url: http://moinmo.in/MoinMoinWiki @@ -33,52 +33,44 @@ Source2: moin-apache22.conf Source3: moin-apache24.conf Source4: mkwiki.moin +# NB: the AnyWikiDraw applet is no longer included in openSUSE package Source80: Re:_Proprietary_code_in_AnyWikiDraw.mbox Source90: README.SUSE Source91: moin.1 Source92: mkwiki.moin.8 Source99: moinmoin-wiki.rpmlintrc -Patch0: anywikidraw.patch -Patch1: anywikidraw-java8.patch -Patch2: anywikidraw-java9.patch -Patch3: twikidraw-java9.patch -BuildRequires: ant >= 1.5.4 +Patch0: https://bitbucket.org/thomaswaldmann/moin-1.9/commits/561b7a9c2bd91b61d26cd8a5f39aa36bf5c6159e/raw#199.patch BuildRequires: apache2 BuildRequires: dos2unix BuildRequires: fdupes -BuildRequires: java-devel >= 1.5 +%if 0%{?sle_version} < 120300 BuildRequires: python-devel >= 2.5 +%else +BuildRequires: python2-devel >= 2.5 +%endif Requires: apache2-mod_wsgi -Requires: python-xml +Requires: python2-xml BuildRoot: %{_tmppath}/%{name}-%{version}-build Obsoletes: python-moin < 1.9.8-50.0 -Provides: python-moin = 1.9.8-50.0 +Provides: python-moin = %{version} %description -MoinMoin is an advanced, easy to use and extensible wiki engine with a large -community of users. Said in a few words, it is about collaboration on easily -editable web pages. All wiki data is stored in plain files - no database is -required. MoinMoin is implemented in Python. +MoinMoin is an extensible wiki engine. It focuss on collaboration on +editable web pages. All wiki data is stored in plain files - no +database is required. MoinMoin is implemented in Python. This package configures MoinMoin to serve wiki pages via the Apache web server. %prep %setup -q -n moin-%{version} +%patch0 -p1 # Always use python2 grep -rl "#!/usr/bin/env python" . | xargs -L 1 --verbose sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/python2|g" sed -i -e "s|#!/usr/bin/python|#!/usr/bin/python2|g" wiki/server/moin.fcgi -# remove pre-built JARs +# remove pre-built applet JARs find . -type f -name "*.jar" -print -delete -# prepare rebuild of TWikiDraw applet -%patch3 -# prepare rebuild of AnyWikiDraw applet JAR -cd contrib/AnyWikiDraw -tar -xjf src.tar.bz -%patch0 -%patch1 -%patch2 %build @@ -91,17 +83,9 @@ dos2unix MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/connector.cgi dos2unix MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/perl/upload.cgi -(cd contrib/TWikiDrawPlugin; ant) -ln contrib/TWikiDrawPlugin/build/twikidraw.jar MoinMoin/web/static/htdocs/applets/TWikiDrawPlugin/twikidraw.jar - -(cd contrib/AnyWikiDraw/AnyWikiDraw; ant -f build-for-moinmoin.xml applet.jar) -ln contrib/AnyWikiDraw/AnyWikiDraw/dist/AnyWikiDraw\ 0.14/anywikidraw/moinmoin/AnyWikiDrawForMoinMoin.jar MoinMoin/web/static/htdocs/applets/anywikidraw/lib/AnyWikiDrawForMoinMoin.jar - %install python setup.py install --root=%{buildroot} --prefix=%{_prefix} -sed -i -e "s|#! /usr/bin/python|#!/usr/bin/python2|g" %{buildroot}/usr/bin/moin - mkdir -p %{buildroot}%{_sbindir} install -m 744 %{SOURCE4} %{buildroot}%{_sbindir} ++++++ moin-1.9.8.tar.gz -> moin-1.9.9.tar.gz ++++++ /work/SRC/openSUSE:Factory/moinmoin-wiki/moin-1.9.8.tar.gz /work/SRC/openSUSE:Factory/.moinmoin-wiki.new/moin-1.9.9.tar.gz differ: char 5, line 1 ++++++ moin-apache22.conf ++++++ --- /var/tmp/diff_new_pack.WFmn5C/_old 2018-01-19 11:50:31.031262894 +0100 +++ /var/tmp/diff_new_pack.WFmn5C/_new 2018-01-19 11:50:31.031262894 +0100 @@ -1,4 +1,4 @@ -Alias /moin_static198 /usr/lib/python2.7/site-packages/MoinMoin/web/static/htdocs +Alias /moin_static199 /usr/lib/python2.7/site-packages/MoinMoin/web/static/htdocs <Directory /usr/lib/python2.7/site-packages/MoinMoin/web/static/htdocs> Order allow,deny ++++++ moin-apache24.conf ++++++ --- /var/tmp/diff_new_pack.WFmn5C/_old 2018-01-19 11:50:31.051261950 +0100 +++ /var/tmp/diff_new_pack.WFmn5C/_new 2018-01-19 11:50:31.051261950 +0100 @@ -1,4 +1,4 @@ -Alias /moin_static198 /usr/lib/python2.7/site-packages/MoinMoin/web/static/htdocs +Alias /moin_static199 /usr/lib/python2.7/site-packages/MoinMoin/web/static/htdocs <Directory /usr/lib/python2.7/site-packages/MoinMoin/web/static/htdocs> Require all granted ++++++ raw#199.patch ++++++ # HG changeset patch # User Thomas Waldmann <tw AT waldmann-edv DOT de> # Date 1478019392 -3600 # Node ID 561b7a9c2bd91b61d26cd8a5f39aa36bf5c6159e # Parent af23cef9675c698d13974cd330cdfbd7540a4310 fix wrong digestmod of hmac.new calls stdlib default is md5, but we need sha1. this bug was introduced when removing python_compatibility module usage in changeset 500f68d3e2fd594b2f4ea4a272b828a07d9eac1d. diff --git a/MoinMoin/action/cache.py b/MoinMoin/action/cache.py --- a/MoinMoin/action/cache.py +++ b/MoinMoin/action/cache.py @@ -28,7 +28,7 @@ """ from datetime import datetime -import hmac +import hmac, hashlib from MoinMoin import log logging = log.getLogger(__name__) @@ -99,7 +99,7 @@ raise AssertionError('cache_key called with unsupported parameters') hmac_data = hmac_data.encode('utf-8') - key = hmac.new(secret, hmac_data).hexdigest() + key = hmac.new(secret, hmac_data, digestmod=hashlib.sha1).hexdigest() return key diff --git a/MoinMoin/security/textcha.py b/MoinMoin/security/textcha.py --- a/MoinMoin/security/textcha.py +++ b/MoinMoin/security/textcha.py @@ -19,7 +19,7 @@ @copyright: 2007 by MoinMoin:ThomasWaldmann @license: GNU GPL, see COPYING for details. """ -import hmac +import hmac, hashlib import re import random @@ -84,7 +84,7 @@ def _compute_signature(self, question, timestamp): signature = u"%s%d" % (question, timestamp) - return hmac.new(self.secret, signature.encode('utf-8')).hexdigest() + return hmac.new(self.secret, signature.encode('utf-8'), digestmod=hashlib.sha1).hexdigest() def _init_qa(self, question=None): """ Initialize the question / answer. diff --git a/MoinMoin/user.py b/MoinMoin/user.py --- a/MoinMoin/user.py +++ b/MoinMoin/user.py @@ -1260,7 +1260,7 @@ def generate_recovery_token(self): key = random_string(64, "abcdefghijklmnopqrstuvwxyz0123456789") msg = str(int(time.time())) - h = hmac.new(key, msg).hexdigest() + h = hmac.new(key, msg, digestmod=hashlib.sha1).hexdigest() self.recoverpass_key = key self.save() return msg + '-' + h @@ -1278,7 +1278,7 @@ return False # check hmac # key must be of type string - h = hmac.new(str(self.recoverpass_key), str(stamp)).hexdigest() + h = hmac.new(str(self.recoverpass_key), str(stamp), digestmod=hashlib.sha1).hexdigest() if not safe_str_equal(h, parts[1]): return False self.recoverpass_key = "" diff --git a/MoinMoin/wikiutil.py b/MoinMoin/wikiutil.py --- a/MoinMoin/wikiutil.py +++ b/MoinMoin/wikiutil.py @@ -12,7 +12,7 @@ import cgi import codecs -import hmac +import hmac, hashlib import os import re import time @@ -2530,7 +2530,7 @@ hmac_data.append(value) h = hmac.new(request.cfg.secrets['wikiutil/tickets'], - ''.join(hmac_data)) + ''.join(hmac_data), digestmod=hashlib.sha1) return "%s.%s" % (tm, h.hexdigest())
