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: