- changed default config to more secure (zope user, 127.0.0.1:8080 socket)

[packages/Zope.git] / Zope.spec

diff --git a/Zope.spec b/Zope.spec
index bc2740ed7211afb6d6f0e68a1e352e4df3907a5b..f95a91c23f2c3f543ae179b54179c854f6f0cf6f 100644 (file)
--- a/Zope.spec
+++ b/Zope.spec
@@ -3,12 +3,12 @@ Summary(es):  Un servidor de aplicaciones y un conjunto de herramientas para la c
 Summary(pl):   Serwer aplikacji i toolkit portalowy do tworzenia serwisów WWW
 Summary(pt_BR):        Um servidor de aplicações e um conjunto de ferramentas para construção de sites Web
 Name:          Zope
-Version:       2.6.2b5
-Release:       4
+Version:       2.6.2
+Release:       1
 License:       Zope Public License (ZPL)
 Group:         Networking/Daemons
 Source0:       http://www.zope.org/Products/%{name}/%{version}/%{version}/%{name}-%{version}-src.tgz
-# Source0-md5: 60ddbd685febb73e10ecdb5da6eda895
+# Source0-md5: a0e873d54994231d7c03640f7092a4fb
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig
@@ -21,27 +21,27 @@ Source7:    http://www.zope.org/Documentation/Guides/DTML/Compressed%20html%202.1.1
 Source8:       http://www.zope.org/Documentation/Guides/ZSQL/2.1.1/ZSQL.html.tgz
 # Source8-md5: 0cddb5688fc0f886db468da08251fb81
 Source9:       http://www.zope.org/Documentation/Guides/ZDG/HTML%201.2/ZDG.html.tgz
-# Source-md5:  0344ca88acb8a71688d2925975a55443
+# Source9-md5: 0344ca88acb8a71688d2925975a55443
 Source10:      http://www.zope.org/Documentation/Guides/ZAG/HTML%201.0/ZAG.html.tgz
 # Source10-md5:        b28bfc4ba4bee880767fcf89d79532d2
 Source11:      http://openbsd.secsup.org/distfiles/zopebook-2.5/ZopeBook.tgz
 # Source11-md5:        268c38a4c7d9f7334cdc98b0a152f8da
 Patch0:                %{name}-http-virtual-cache.patch
 URL:           http://www.zope.org/
-BuildRequires: python-devel >= 2.2.2
+BuildRequires: python-devel < 2.3
 BuildRequires: perl
 PreReq:                rc-scripts
-Requires(pre): /usr/bin/getgid
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Requires(postun):      /usr/sbin/userdel
-Requires(postun):      /usr/sbin/groupdel
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      logrotate
-Requires:      python >= 2.2.2
-Requires:      python-modules >= 2.2.2
-Requires:      python-libs >= 2.2.2
+Requires:      python >= 2.2.3
+Requires:      python-modules >= 2.2.3
+Requires:      python-libs >= 2.2.3
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                python_prefix           %(echo `python -c "import sys; print sys.prefix"`)
@@ -88,7 +88,7 @@ eles ao inv
 %prep
 %setup -q -n %{name}-%{version}-src -a6
 %patch0 -p1
-mkdir ZopeContentManagersGuide GuideToDTML GuideToZSQL ZopeDevelopersGuide 
+mkdir ZopeContentManagersGuide GuideToDTML GuideToZSQL ZopeDevelopersGuide
 mkdir ZopeAdminGuide ZopeBook
 tar xzf %{SOURCE6} -C ZopeContentManagersGuide
 tar xzf %{SOURCE7} -C GuideToDTML
@@ -147,21 +147,28 @@ fi
 
 %post
 /sbin/chkconfig --add zope
+was_stopped=0
 if [ -f /var/lib/zope/Data.fs ]; then
        echo "Found the database in old location. Migrating..."
        if [ -f /var/lock/subsys/zope ]; then
            /etc/rc.d/init.d/zope stop >&2
            was_stopped=1
        fi
-       [ -d /var/lib/zope/main ] && cd /var/lib/zope && mv -f * ./main
+       umask 022
+       [ -d /var/lib/zope/main ] && cd /var/lib/zope && mv -f * ./main 2>/dev/null
+       touch /var/lib/zope/access
        if [ "x$was_stopped" = "x1" ]; then
-           /etc/rc.d/init.d/zope start
+           /etc/rc.d/init.d/zope start >&2
        fi
        echo "Migration completed (new db location is /var/lib/zope/main)"
-elif [ -f /var/lock/subsys/zope ]; then
-       /etc/rc.d/init.d/zope restart >&2
+fi
+if [ -f /var/lock/subsys/zope ]; then
+       if [ "x$was_stopped" != "x1" ]; then
+           /etc/rc.d/init.d/zope restart >&2
+       fi
 else
        echo "Create inituser using \"zpasswd inituser\" in directory \"/var/lib/zope/main\"" >&2
+       echo "look at /etc/zope/instances/main" >&2
        echo "Run then \"/etc/rc.d/init.d/zope start\" to start Zope." >&2
 fi
 
@@ -178,13 +185,13 @@ if [ "$1" = "0" ] ; then
        echo "Removing user zope"
        /usr/sbin/userdel zope >/dev/null 2>&1 || :
        echo "Removing group zope"
-       /usr/sbin/groupdel zope >/dev/null 2>&1 || :    
+       /usr/sbin/groupdel zope >/dev/null 2>&1 || :
 fi
 
 %files
 %defattr(644,root,root,755)
 %doc doc/*.txt *.txt ZopeContentManagersGuide GuideToZSQL ZopeDevelopersGuide ZopeAdminGuide ZopeBook
-%attr(755,root,root) /etc/rc.d/init.d/zope
+%attr(754,root,root) /etc/rc.d/init.d/zope
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 %{_libdir}/zope