diff options
| author | Oliver Eikemeier <eik@FreeBSD.org> | 2004-06-26 15:07:21 +0000 |
|---|---|---|
| committer | Oliver Eikemeier <eik@FreeBSD.org> | 2004-06-26 15:07:21 +0000 |
| commit | 477c5a327ba5d99c5ff7a2be8cba6d0cc6a7ebc6 (patch) | |
| tree | d79f74c7807f3a6cdcd944c1ebc94e82fda11d09 /www/moinmoin/files | |
| parent | new paranoia and jail options handled by rc variables to easy they use. (diff) | |
Updating www/moinmoin to 1.2.2.
MoinMoin 1.1 contains administrative group name privilege escalation vulnerability.
<http://www.freebsd.org/ports/portaudit/da9e6438-bfc0-11d8-b00e-000347a4fa7d.html>
Fix UnpicklingError in MoinMoin/userp.py.
PR: 68365
Submitted by: TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
Notes
Notes:
svn path=/head/; revision=112321
Diffstat (limited to 'www/moinmoin/files')
| -rw-r--r-- | www/moinmoin/files/patch-setup.py | 30 | ||||
| -rw-r--r-- | www/moinmoin/files/patch-user.py | 11 |
2 files changed, 26 insertions, 15 deletions
diff --git a/www/moinmoin/files/patch-setup.py b/www/moinmoin/files/patch-setup.py index 955742b648f9..1b8fd8eed8a7 100644 --- a/www/moinmoin/files/patch-setup.py +++ b/www/moinmoin/files/patch-setup.py @@ -1,16 +1,16 @@ ---- setup.py.orig Sun Nov 9 16:00:45 2003 -+++ setup.py Sun Dec 7 01:04:52 2003 -@@ -167,10 +167,10 @@ +--- setup.py.orig Sun Jun 6 08:58:33 2004 ++++ setup.py Fri Jun 25 03:31:38 2004 +@@ -167,9 +167,11 @@ + 'scripts': moin_scripts, + 'data_files': [ - ('share/moin/cgi-bin', - glob.glob('wiki/cgi-bin/*.cgi') + -- glob.glob('wiki/cgi-bin/*.py') ), -+ glob.glob('wiki/cgi-bin/*.py.default') ), - ('share/moin/data', - ['wiki/data/intermap.txt']), -- ('share/moin/data/text', -+ ('share/moin/data/text.default', - filter(pagefile_filter, glob.glob('wiki/data/text/*'))), - ('share/moin/data/backup', []), - ('share/moin/data/cache', []), - +- ('share/moin/cgi-bin', filter(trash_filter, glob.glob('wiki/cgi-bin/*'))), ++ ('share/moin/cgi-bin', filter(trash_filter, ++ glob.glob('wiki/cgi-bin/*.cgi') + ++ glob.glob('wiki/cgi-bin/*.py.default'))), + ('share/moin/data', ['wiki/data/intermap.txt']), +- ('share/moin/data/text', filter(trash_filter, glob.glob('wiki/data/text/*'))), ++ ('share/moin/data/text.default', filter(trash_filter, glob.glob('wiki/data/text/*'))), + ('share/moin/data/plugin', ['wiki/data/plugin/__init__.py']), + ('share/moin/data/plugin/action', ['wiki/data/plugin/action/__init__.py']), + ('share/moin/data/plugin/macro', ['wiki/data/plugin/macro/__init__.py']), diff --git a/www/moinmoin/files/patch-user.py b/www/moinmoin/files/patch-user.py new file mode 100644 index 000000000000..c3592c98c022 --- /dev/null +++ b/www/moinmoin/files/patch-user.py @@ -0,0 +1,11 @@ +--- MoinMoin/user.py.orig Sun Jun 6 08:58:39 2004 ++++ MoinMoin/user.py Sat Jun 26 20:57:34 2004 +@@ -46,7 +46,7 @@ + userdictpickle = os.path.join(config.user_dir, "userdict.pickle") + try: + _name2id = pickle.load(open(userdictpickle)) +- except (UnpicklingError,IOError,EOFError,ValueError): ++ except (pickle.UnpicklingError,IOError,EOFError,ValueError): + _name2id = {} + id = _name2id.get(searchName, None) + if id is None: |