summaryrefslogtreecommitdiff
path: root/staging/python/gdbm-magic-values.patch
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-24 11:07:35 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2011-11-24 11:07:35 -0300
commit8d32e471d53634b308adf93007922a6ccbd2b830 (patch)
tree606fdcd5508936ffdfc7cf510a16b7324c2792e2 /staging/python/gdbm-magic-values.patch
parent4c9d76f582ae64854e30113e7f7dc621af3db820 (diff)
parent1e1e4927b05d9b242bfe83794e3a98ab2c8f79ef (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/augeas/PKGBUILD community/chmsee/PKGBUILD community/cupsddk/PKGBUILD community/optipng/PKGBUILD community/pcb/PKGBUILD community/taglib-rcc/PKGBUILD community/wmctrl/PKGBUILD extra/c-ares/PKGBUILD multilib/lib32-freetype2/PKGBUILD
Diffstat (limited to 'staging/python/gdbm-magic-values.patch')
-rw-r--r--staging/python/gdbm-magic-values.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/staging/python/gdbm-magic-values.patch b/staging/python/gdbm-magic-values.patch
new file mode 100644
index 000000000..e8ce828cf
--- /dev/null
+++ b/staging/python/gdbm-magic-values.patch
@@ -0,0 +1,13 @@
+diff -up Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic Python-3.2.2/Lib/dbm/__init__.py
+--- Python-3.2.2/Lib/dbm/__init__.py.gdbm-1.9-magic 2011-09-03 12:16:40.000000000 -0400
++++ Python-3.2.2/Lib/dbm/__init__.py 2011-09-30 15:47:27.488863694 -0400
+@@ -166,7 +166,7 @@ def whichdb(filename):
+ return ""
+
+ # Check for GNU dbm
+- if magic == 0x13579ace:
++ if magic in (0x13579ace, 0x13579acd, 0x13579acf):
+ return "dbm.gnu"
+
+ # Later versions of Berkeley db hash file have a 12-byte pad in
+diff -up Python-3.2.2/Misc/NEWS.gdbm-1.9-magic Python-3.2.2/Misc/NEWS