cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to moinmoin 1.9.5.

Browse Source 
jasper@ ok.
This commit is contained in:
fgsch 2012-10-24 22:09:30 +00:00
parent 3526f736dd
commit 2c88b8f081
4 changed files with 13 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/moinmoin/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2012/10/22 17:52:39 jasper Exp $
# $OpenBSD: Makefile,v 1.26 2012/10/24 22:09:30 fgsch Exp $
COMMENT = wiki engine written in python
MODPY_EGG_VERSION = 1.9.4
MODPY_EGG_VERSION = 1.9.5
DISTNAME = moin-${MODPY_EGG_VERSION}
PKGNAME = moin${DISTNAME}
REVISION = 0
CATEGORIES = www
@ -22,6 +21,8 @@ MASTER_SITES = http://static.moinmo.in/files/
MODULES = lang/python
MODPY_VERSION = 2.7
NO_REGRESS = Yes
post-configure:
@ -32,6 +33,6 @@ post-configure:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/moinmoin
cd ${WRKSRC}/docs && ${INSTALL_DATA} CHANGES INSTALL.html \
README.migration ${PREFIX}/share/doc/moinmoin
README.migration UPDATE.html ${PREFIX}/share/doc/moinmoin
.include <bsd.port.mk>

7
www/moinmoin/distinfo
View File

@ -1,5 +1,2 @@
MD5 (moin-1.9.4.tar.gz) = 8nSkcEKr6xffawq7KUjolg==
RMD160 (moin-1.9.4.tar.gz) = PHTwuNImeArtymKNjR4LA+TSgiQ=
SHA1 (moin-1.9.4.tar.gz) = 9d/vVRLPrjbHHu+8uv3mhX8XkLk=
SHA256 (moin-1.9.4.tar.gz) = oRUCwxzmF6UdL5a+DXGl+z53NsdI3dlXqs/CP5ur45U=
SIZE (moin-1.9.4.tar.gz) = 36718571
SHA256 (moin-1.9.5.tar.gz) = dOHRQgcjqvIC9GCCVAUkmH9HxApET4RE1Y1XxmMkgRw=
SIZE (moin-1.9.5.tar.gz) = 36740561

22
www/moinmoin/patches/patch-MoinMoin_security___init___py
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-MoinMoin_security___init___py,v 1.2 2012/10/22 17:52:39 jasper Exp $
CVE-2012-4404, moinmoin incorrect ACL evaluation for virtual groups
http://hg.moinmo.in/moin/1.9/rev/7b9f39289e16
--- MoinMoin/security/__init__.py.orig Tue Feb 7 22:36:48 2012
+++ MoinMoin/security/__init__.py Mon Oct 22 19:49:17 2012
@@ -320,11 +320,12 @@ class AccessControlList:
handler = getattr(self, "_special_"+entry, None)
allowed = handler(request, name, dowhat, rightsdict)
elif entry in groups:
- if name in groups[entry]:
+ this_group = groups[entry]
+ if name in this_group:
allowed = rightsdict.get(dowhat)
else:
for special in self.special_users:
- if special in entry:
+ if special in this_group:
handler = getattr(self, "_special_" + special, None)
allowed = handler(request, name, dowhat, rightsdict)
break # order of self.special_users is important

7
www/moinmoin/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2012/05/25 14:32:15 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.14 2012/10/24 22:09:30 fgsch Exp $
bin/moin
lib/python${MODPY_VERSION}/site-packages/MoinMoin/
lib/python${MODPY_VERSION}/site-packages/MoinMoin/Page.py
@ -608,6 +608,8 @@ lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1080700.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1080700.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1080800.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1080800.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1080900.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1080900.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1089999.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1089999.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1090000.py
@ -620,6 +622,8 @@ lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1090300.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1090300.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1090400.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1090400.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1090500.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1090500.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/__init__.py
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/_conv160.py
@ -2122,6 +2126,7 @@ share/doc/moinmoin/
share/doc/moinmoin/CHANGES
share/doc/moinmoin/INSTALL.html
share/doc/moinmoin/README.migration
share/doc/moinmoin/UPDATE.html
share/moin/
share/moin/config/
share/moin/config/logging/