From 6b93a6b12b468615d3a32840380923cb7452e225 Mon Sep 17 00:00:00 2001 From: fgsch Date: Fri, 9 May 2008 22:15:30 +0000 Subject: [PATCH] SECURITY: update to 1.6.3. see http://hg.moinmo.in/moin/1.6/raw-file/1.6.3/docs/CHANGES for details. --- www/moinmoin/Makefile | 32 +++++++++++++++++--------------- www/moinmoin/distinfo | 10 +++++----- www/moinmoin/pkg/PLIST | 17 +++++++++++------ 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile index e58a404efb4..965479142f5 100644 --- a/www/moinmoin/Makefile +++ b/www/moinmoin/Makefile @@ -1,27 +1,29 @@ -# $OpenBSD: Makefile,v 1.10 2008/04/02 15:30:51 fgsch Exp $ +# $OpenBSD: Makefile,v 1.11 2008/05/09 22:15:30 fgsch Exp $ -COMMENT= Python clone of WikiWiki +COMMENT = wiki engine written in python -DISTNAME= moin-1.6.2 -PKGNAME= moin${DISTNAME} -CATEGORIES= www +MODPY_EGG_VERSION = 1.6.3 +DISTNAME = moin-${MODPY_EGG_VERSION} +PKGNAME = moin${DISTNAME} -HOMEPAGE= http://moinmo.in/ +CATEGORIES = www + +HOMEPAGE = http://moinmo.in/ # GPL -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes +PERMIT_PACKAGE_CDROM = Yes +PERMIT_PACKAGE_FTP = Yes +PERMIT_DISTFILES_CDROM = Yes +PERMIT_DISTFILES_FTP = Yes -MASTER_SITES= http://static.moinmo.in/files/ +MASTER_SITES = http://static.moinmo.in/files/ -MODULES= lang/python -RUN_DEPENDS= ${MODPY_EXPAT_DEPENDS} +MODULES = lang/python +RUN_DEPENDS = ${MODPY_EXPAT_DEPENDS} -NO_REGRESS= Yes +NO_REGRESS = Yes -PKG_ARCH= * +PKG_ARCH = * post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/moinmoin diff --git a/www/moinmoin/distinfo b/www/moinmoin/distinfo index 8eb10064215..1039dbf2727 100644 --- a/www/moinmoin/distinfo +++ b/www/moinmoin/distinfo @@ -1,5 +1,5 @@ -MD5 (moin-1.6.2.tar.gz) = NLdpgiEQXpsq91GLdFvwIw== -RMD160 (moin-1.6.2.tar.gz) = DNU0yDwxVIZ5UYsQotLY+3zRYn8= -SHA1 (moin-1.6.2.tar.gz) = NKozgrGsagxVgu9KUk8/xggLMAY= -SHA256 (moin-1.6.2.tar.gz) = Uar3TzodKHtmFH39OV+4IfJsXjcpxesK284aHdumSic= -SIZE (moin-1.6.2.tar.gz) = 5159236 +MD5 (moin-1.6.3.tar.gz) = CBqg3YK0IgyP8oqadRutfA== +RMD160 (moin-1.6.3.tar.gz) = /dbRs0IRS3xwMdV6QaWo3hDlPhM= +SHA1 (moin-1.6.3.tar.gz) = qh6t7Ubw2DlLNqU4in/a07kx2xk= +SHA256 (moin-1.6.3.tar.gz) = e+bYGyBv6SnRCgWL5R15k1mFR8TuMzIQKP1UsBDOgMw= +SIZE (moin-1.6.3.tar.gz) = 5199116 diff --git a/www/moinmoin/pkg/PLIST b/www/moinmoin/pkg/PLIST index e12b4fd2fba..ed5b58ee6e8 100644 --- a/www/moinmoin/pkg/PLIST +++ b/www/moinmoin/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2008/04/02 15:30:51 fgsch Exp $ +@comment $OpenBSD: PLIST,v 1.7 2008/05/09 22:15:30 fgsch Exp $ bin/moin lib/python${MODPY_VERSION}/site-packages/MoinMoin/ lib/python${MODPY_VERSION}/site-packages/MoinMoin/Page.py @@ -488,6 +488,8 @@ lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1060100.py lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1060100.pyc lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1060200.py lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1060200.pyc +lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1060300.py +lib/python${MODPY_VERSION}/site-packages/MoinMoin/script/migration/1060300.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 @@ -750,7 +752,7 @@ lib/python${MODPY_VERSION}/site-packages/MoinMoin/xmlrpc/__init__.py lib/python${MODPY_VERSION}/site-packages/MoinMoin/xmlrpc/__init__.pyc lib/python${MODPY_VERSION}/site-packages/MoinMoin/xmlrpc/putClientInfo.py lib/python${MODPY_VERSION}/site-packages/MoinMoin/xmlrpc/putClientInfo.pyc -lib/python${MODPY_VERSION}/site-packages/moin-1.6.2-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/moin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info share/doc/moinmoin/ share/doc/moinmoin/CHANGES share/doc/moinmoin/INSTALL.html @@ -1841,7 +1843,6 @@ share/moin/underlay/pages/AbandonedPages/revisions/ share/moin/underlay/pages/AbandonedPages/revisions/00000001 share/moin/underlay/pages/AutoAdminGroup/ share/moin/underlay/pages/AutoAdminGroup/current -share/moin/underlay/pages/AutoAdminGroup/edit-log share/moin/underlay/pages/AutoAdminGroup/revisions/ share/moin/underlay/pages/AutoAdminGroup/revisions/00000001 share/moin/underlay/pages/BadContent/ @@ -2156,6 +2157,12 @@ share/moin/underlay/pages/HelpOnLanguages/current share/moin/underlay/pages/HelpOnLanguages/revisions/ share/moin/underlay/pages/HelpOnLanguages/revisions/00000001 share/moin/underlay/pages/HelpOnLinking/ +share/moin/underlay/pages/HelpOnLinking(2f)NotesLinks/ +share/moin/underlay/pages/HelpOnLinking(2f)NotesLinks/attachments/ +share/moin/underlay/pages/HelpOnLinking(2f)NotesLinks/attachments/docprop.jpg +share/moin/underlay/pages/HelpOnLinking(2f)NotesLinks/current +share/moin/underlay/pages/HelpOnLinking(2f)NotesLinks/revisions/ +share/moin/underlay/pages/HelpOnLinking(2f)NotesLinks/revisions/00000001 share/moin/underlay/pages/HelpOnLinking/current share/moin/underlay/pages/HelpOnLinking/revisions/ share/moin/underlay/pages/HelpOnLinking/revisions/00000001 @@ -2394,7 +2401,6 @@ share/moin/underlay/pages/MoinMoin/revisions/ share/moin/underlay/pages/MoinMoin/revisions/00000001 share/moin/underlay/pages/MoinPagesEditorGroup/ share/moin/underlay/pages/MoinPagesEditorGroup/current -share/moin/underlay/pages/MoinPagesEditorGroup/edit-log share/moin/underlay/pages/MoinPagesEditorGroup/revisions/ share/moin/underlay/pages/MoinPagesEditorGroup/revisions/00000001 share/moin/underlay/pages/OrphanedPages/ @@ -2463,12 +2469,10 @@ share/moin/underlay/pages/SystemInfo/revisions/ share/moin/underlay/pages/SystemInfo/revisions/00000001 share/moin/underlay/pages/SystemPagesGroup/ share/moin/underlay/pages/SystemPagesGroup/current -share/moin/underlay/pages/SystemPagesGroup/edit-log share/moin/underlay/pages/SystemPagesGroup/revisions/ share/moin/underlay/pages/SystemPagesGroup/revisions/00000001 share/moin/underlay/pages/SystemPagesInEnglishGroup/ share/moin/underlay/pages/SystemPagesInEnglishGroup/current -share/moin/underlay/pages/SystemPagesInEnglishGroup/edit-log share/moin/underlay/pages/SystemPagesInEnglishGroup/revisions/ share/moin/underlay/pages/SystemPagesInEnglishGroup/revisions/00000001 share/moin/underlay/pages/SystemPagesSetup/ @@ -2486,6 +2490,7 @@ share/moin/underlay/pages/SystemPagesSetup/attachments/Hebrew.zip share/moin/underlay/pages/SystemPagesSetup/attachments/Hindi.zip share/moin/underlay/pages/SystemPagesSetup/attachments/Hungarian.zip share/moin/underlay/pages/SystemPagesSetup/attachments/Indonesian.zip +share/moin/underlay/pages/SystemPagesSetup/attachments/Irish.zip share/moin/underlay/pages/SystemPagesSetup/attachments/Italian.zip share/moin/underlay/pages/SystemPagesSetup/attachments/Japanese.zip share/moin/underlay/pages/SystemPagesSetup/attachments/Korean.zip