From a68b1de1076929c837f73a9fa81362162c1dc8ee Mon Sep 17 00:00:00 2001 From: aanriot Date: Sat, 26 May 2007 01:16:13 +0000 Subject: [PATCH] update to 0.9.11 (0.9.10 was broken and has been fixed upstream). tested by rui@ --- security/prelude/prewikka/Makefile | 14 +++++++++----- security/prelude/prewikka/distinfo | 10 +++++----- security/prelude/prewikka/files/siteconfig.py | 5 +++++ .../prewikka/patches/patch-prewikka_Database_py | 12 ------------ .../patches/patch-prewikka_siteconfig_py | 10 ---------- security/prelude/prewikka/patches/patch-setup_py | 16 ++++++++++++---- security/prelude/prewikka/pkg/PLIST | 14 +++++++++++--- 7 files changed, 42 insertions(+), 39 deletions(-) create mode 100644 security/prelude/prewikka/files/siteconfig.py delete mode 100644 security/prelude/prewikka/patches/patch-prewikka_Database_py delete mode 100644 security/prelude/prewikka/patches/patch-prewikka_siteconfig_py diff --git a/security/prelude/prewikka/Makefile b/security/prelude/prewikka/Makefile index 5e6cdef364c..7ee0191ccff 100644 --- a/security/prelude/prewikka/Makefile +++ b/security/prelude/prewikka/Makefile @@ -1,21 +1,25 @@ -# $OpenBSD: Makefile,v 1.10 2007/04/15 11:40:48 aanriot Exp $ +# $OpenBSD: Makefile,v 1.11 2007/05/26 01:16:13 aanriot Exp $ COMMENT= "Prelude Management Console" -DISTNAME= prewikka-0.9.9 +DISTNAME= prewikka-0.9.11 PKGNAME= prelude-${DISTNAME} MODULES= lang/python BUILD_DEPENDS= :py-cheetah-*:devel/py-cheetah -RUN_DEPENDS= :prelude-manager-*:security/prelude/manager \ +RUN_DEPENDS= :prelude-manager-*:security/prelude/manager \ :py-cheetah-*:devel/py-cheetah pre-install: - @perl -pi -e "s,%%PREFIX%%,${PREFIX}," \ + @${INSTALL_DATA} ${FILESDIR}/siteconfig.py \ ${WRKSRC}/prewikka/siteconfig.py - @perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \ + @perl -pi -e "s,%%PREFIX%%,${PREFIX}," \ + ${WRKSRC}/prewikka/siteconfig.py + @perl -pi -e "s,%%SYSCONFDIR%%,${SYSCONFDIR}," \ + ${WRKSRC}/prewikka/siteconfig.py + @perl -pi -e "s,%%VERSION%%,${DISTNAME:S/prewikka-//}," \ ${WRKSRC}/prewikka/siteconfig.py post-install: diff --git a/security/prelude/prewikka/distinfo b/security/prelude/prewikka/distinfo index 4b8662c6e34..a5ed142a57f 100644 --- a/security/prelude/prewikka/distinfo +++ b/security/prelude/prewikka/distinfo @@ -1,5 +1,5 @@ -MD5 (prewikka-0.9.9.tar.gz) = xhX6FML4h9qzVxRvSrAp8Q== -RMD160 (prewikka-0.9.9.tar.gz) = jb54XYdoEk5rKXYwsujKieAbiqE= -SHA1 (prewikka-0.9.9.tar.gz) = tAq7GrzyfeUKJK+In8q9nwpPEQc= -SHA256 (prewikka-0.9.9.tar.gz) = VUB4/WHOJufvdMo3V18K/pUpTyGi4KqEz3OsxRMa4+w= -SIZE (prewikka-0.9.9.tar.gz) = 188355 +MD5 (prewikka-0.9.11.tar.gz) = pqxE6kwFt2VnGAe8N+sucw== +RMD160 (prewikka-0.9.11.tar.gz) = vTee2nwVu7lvr1vDCbsR71wdrFE= +SHA1 (prewikka-0.9.11.tar.gz) = kP/9QpEELzGKHMcFsJKqxYMR4Z8= +SHA256 (prewikka-0.9.11.tar.gz) = awIshMyOn9YksAwO6uHqp27XNeRWO/+H0uaEXE5GcPA= +SIZE (prewikka-0.9.11.tar.gz) = 228263 diff --git a/security/prelude/prewikka/files/siteconfig.py b/security/prelude/prewikka/files/siteconfig.py new file mode 100644 index 00000000000..d414dc0ac8c --- /dev/null +++ b/security/prelude/prewikka/files/siteconfig.py @@ -0,0 +1,5 @@ +htdocs_dir = '%%PREFIX%%/share/prewikka/htdocs' +database_dir = '%%PREFIX%%/share/prewikka/database' +locale_dir = '%%PREFIX%%/share/locale/' +conf_dir = '%%SYSCONFDIR%%/prewikka' +version = '%%VERSION%%' diff --git a/security/prelude/prewikka/patches/patch-prewikka_Database_py b/security/prelude/prewikka/patches/patch-prewikka_Database_py deleted file mode 100644 index 58a0c2d368d..00000000000 --- a/security/prelude/prewikka/patches/patch-prewikka_Database_py +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-prewikka_Database_py,v 1.2 2006/10/06 08:04:23 aanriot Exp $ ---- prewikka/Database.py.orig Mon Feb 20 00:09:41 2006 -+++ prewikka/Database.py Wed May 31 01:26:07 2006 -@@ -157,7 +157,7 @@ class Database: - self.query("DELETE FROM Prewikka_User WHERE login = %s" % login) - self.query("DELETE FROM Prewikka_Permission WHERE login = %s" % login) - self.query("DELETE FROM Prewikka_Session WHERE login = %s" % login) -- self.query("DELETE FROM Prewikka_Filter_Criterion USING Prewikka_Filter, Prewikka_Filter_Criterion " -+ self.query("DELETE FROM Prewikka_Filter_Criterion USING Prewikka_Filter " - "WHERE Prewikka_Filter.login = %s AND Prewikka_Filter.id = Prewikka_Filter_Criterion.id" % login) - self.query("DELETE FROM Prewikka_Filter WHERE login = %s" % login) - self.transaction_end() diff --git a/security/prelude/prewikka/patches/patch-prewikka_siteconfig_py b/security/prelude/prewikka/patches/patch-prewikka_siteconfig_py deleted file mode 100644 index 51f3b13c6c5..00000000000 --- a/security/prelude/prewikka/patches/patch-prewikka_siteconfig_py +++ /dev/null @@ -1,10 +0,0 @@ -$OpenBSD: patch-prewikka_siteconfig_py,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ ---- prewikka/siteconfig.py.orig Thu May 4 09:20:17 2006 -+++ prewikka/siteconfig.py Tue May 30 23:57:42 2006 -@@ -1,3 +1,3 @@ --htdocs_dir = '/home/yoann/dev/prelude/svk/trunk/prewikka/bin/share/prewikka/htdocs' --database_dir = '/home/yoann/dev/prelude/svk/trunk/prewikka/bin/share/prewikka/database' --conf_dir = '/home/yoann/dev/prelude/svk/trunk/prewikka/bin/etc/prewikka' -+htdocs_dir = '%%PREFIX%%/share/prewikka/htdocs' -+database_dir = '%%PREFIX%%/share/prewikka/database' -+conf_dir = '%%SYSCONFDIR%%/prewikka' diff --git a/security/prelude/prewikka/patches/patch-setup_py b/security/prelude/prewikka/patches/patch-setup_py index d65d242850c..88b7d20fe19 100644 --- a/security/prelude/prewikka/patches/patch-setup_py +++ b/security/prelude/prewikka/patches/patch-setup_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-setup_py,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ ---- setup.py.orig Fri Jun 23 04:18:57 2006 -+++ setup.py Fri Jun 23 04:20:19 2006 -@@ -117,7 +117,7 @@ class my_install(install): +$OpenBSD: patch-setup_py,v 1.2 2007/05/26 01:16:13 aanriot Exp $ +--- setup.py.orig Thu Apr 5 17:21:20 2007 ++++ setup.py Fri May 18 14:21:59 2007 +@@ -152,7 +152,7 @@ class my_install(install): def finalize_options(self): ### if no prefix is given, configuration should go to /etc or in {prefix}/etc otherwise if self.prefix: @@ -10,3 +10,11 @@ $OpenBSD: patch-setup_py,v 1.1.1.1 2006/06/26 18:04:25 aanriot Exp $ else: self.conf_prefix = "/etc/prewikka" +@@ -178,7 +178,6 @@ class my_install(install): + def run(self): + os.umask(022) + self.install_conf() +- self.init_siteconfig() + install.run(self) + + for dir in ("/", diff --git a/security/prelude/prewikka/pkg/PLIST b/security/prelude/prewikka/pkg/PLIST index 0b4c3d68c57..ddb80319893 100644 --- a/security/prelude/prewikka/pkg/PLIST +++ b/security/prelude/prewikka/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2007/04/15 11:40:48 aanriot Exp $ +@comment $OpenBSD: PLIST,v 1.7 2007/05/26 01:16:13 aanriot Exp $ bin/prewikka-httpd lib/python${MODPY_VERSION}/site-packages/prewikka/ lib/python${MODPY_VERSION}/site-packages/prewikka/Auth.py @@ -25,14 +25,14 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/ModPythonHandler.py lib/python${MODPY_VERSION}/site-packages/prewikka/ModPythonHandler.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/MyConfigParser.py lib/python${MODPY_VERSION}/site-packages/prewikka/MyConfigParser.pyc -lib/python${MODPY_VERSION}/site-packages/prewikka/ParametersNormalizer.py -lib/python${MODPY_VERSION}/site-packages/prewikka/ParametersNormalizer.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/Request.py lib/python${MODPY_VERSION}/site-packages/prewikka/Request.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/User.py lib/python${MODPY_VERSION}/site-packages/prewikka/User.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/__init__.py lib/python${MODPY_VERSION}/site-packages/prewikka/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/prewikka/localization.py +lib/python${MODPY_VERSION}/site-packages/prewikka/localization.pyc lib/python${MODPY_VERSION}/site-packages/prewikka/modules/ lib/python${MODPY_VERSION}/site-packages/prewikka/modules/__init__.py lib/python${MODPY_VERSION}/site-packages/prewikka/modules/__init__.pyc @@ -125,6 +125,11 @@ lib/python${MODPY_VERSION}/site-packages/prewikka/views/usermanagement.py lib/python${MODPY_VERSION}/site-packages/prewikka/views/usermanagement.pyc share/doc/prewikka/ share/doc/prewikka/README.OpenBSD +share/locale/de/LC_MESSAGES/prewikka.mo +share/locale/es/LC_MESSAGES/prewikka.mo +share/locale/fr/LC_MESSAGES/prewikka.mo +share/locale/pt_BR/LC_MESSAGES/prewikka.mo +share/locale/ru/LC_MESSAGES/prewikka.mo share/prewikka/ share/prewikka/cgi-bin/ share/prewikka/cgi-bin/prewikka.cgi @@ -134,11 +139,14 @@ share/prewikka/conf/prewikka.conf @sample ${SYSCONFDIR}/prewikka/prewikka.conf share/prewikka/database/ share/prewikka/database/mysql-update-0.9.1.sql +share/prewikka/database/mysql-update-0.9.11.sql share/prewikka/database/mysql.sql share/prewikka/database/mysql2pgsql.sh share/prewikka/database/mysql2sqlite.sh share/prewikka/database/pgsql-update-0.9.1.sql +share/prewikka/database/pgsql-update-0.9.11.sql share/prewikka/database/pgsql.sql +share/prewikka/database/sqlite-update-0.9.11.sql share/prewikka/database/sqlite.sql share/prewikka/htdocs/ share/prewikka/htdocs/css/