[Kolab-devel] server/kolab kolab.spec,1.22.2.9,1.22.2.10 by martin at doto.intevation.de

root at intevation.de root at intevation.de
Wed Jul 30 00:27:12 CEST 2003


Update of /kolabrepository/server/kolab
In directory doto:/tmp/cvs-serv22106

Modified Files:
      Tag: KOLAB_1_0
	kolab.spec 
Log Message:
Martin K.: stricter permissions as tested in 1.0.6 and webcalendar support with
DefChar workaround, Issue352 fix


Index: kolab.spec
===================================================================
RCS file: /kolabrepository/server/kolab/kolab.spec,v
retrieving revision 1.22.2.9
retrieving revision 1.22.2.10
diff -u -d -r1.22.2.9 -r1.22.2.10
--- kolab.spec	27 Jul 2003 14:17:21 -0000	1.22.2.9
+++ kolab.spec	29 Jul 2003 22:27:10 -0000	1.22.2.10
@@ -9,14 +9,14 @@
 #   package information
 Name:         kolab
 Summary:      Kolab Groupware Server
-URL:          http://ftp.kde.org/pub/kde/unstable/server/kolab/kolab-current
+URL:          http://www.erfrakon.de/projects/kolab/download/
 Vendor:       Erfrakon http://www.erfrakon.de
 Packager:     The Kroupware Project
 Distribution: Kolab
 Group:        core
 License:      GPL
 Version:      %{V_kolab}
-Release:      1.0.5
+Release:      1.0.8
 
 #   list of sources
 Source0:      ftp://ftp.kde.org/pub/kde/unstable/server/kolab/kolab-current/kolab-%{version}.tar.gz
@@ -26,8 +26,8 @@
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 1.1.0
-PreReq:       OpenPKG, openpkg >= 1.1.0, openldap, postfix, imapd, sasl, apache, proftpd, perl-ldap
+BuildPreReq:  OpenPKG, openpkg >= 1.2.0
+PreReq:       OpenPKG, openpkg >= 1.2.0, openldap, postfix, imapd, sasl, apache, proftpd, perl-ldap
 AutoReq:      no
 AutoReqProv:  no
 
@@ -47,64 +47,67 @@
 %install
     rm -rf $RPM_BUILD_ROOT
 
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/kolab
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/log
-    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/cgi-bin
-    %{l_shtool} mkdir -p -m 777 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy
+    %{l_shtool} mkdir -p -m 750 $RPM_BUILD_ROOT%{l_prefix}/etc/kolab
+    %{l_shtool} mkdir -p -m 750 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
+    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab
+    %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www
+    %{l_shtool} mkdir -p -m 750 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/log
+    %{l_shtool} mkdir -p -m 750 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/cgi-bin
+    %{l_shtool} mkdir -p -m 775 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/freebusy
     %{l_shtool} mkdir -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/icons
-    %{l_shtool} mkdir -p -m 777 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks
+    %{l_shtool} mkdir -p -m 775 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/locks
+    %{l_shtool} mkdir -p -m 775 $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/webcalendar
 
-    %{l_shtool} install -c -m 755 -e "s;@l_prefix@;%{l_prefix};g" %{SOURCE rc.kolab} \
+    %{l_shtool} install -c -m 750 -e "s;@l_prefix@;%{l_prefix};g" %{SOURCE rc.kolab} \
 	$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     # gets overwritten later
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
+    %{l_shtool} install -c -m 740 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
 	kolab_sslcert.sh $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 smtpd.conf.template virtual.template transport.template aliases.template \
+    %{l_shtool} install -c -m 640 smtpd.conf.template virtual.template transport.template aliases.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' cyrus.conf.template \
+    %{l_shtool} install -c -m 640 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' cyrus.conf.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/    
-    %{l_shtool} install -c -m 644 \
+    %{l_shtool} install -c -m 640 \
     	-e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
 	-e 's;@l_nusr@;%{l_nusr};g' \
 	-e 's;@l_ngrp@;%{l_ngrp};g' httpd.conf.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' legacy.conf.template \
+    %{l_shtool} install -c -m 640 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' legacy.conf.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' imapd.conf.template \
+    %{l_shtool} install -c -m 640 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' imapd.conf.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 imapd.group.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' kolab \
+    %{l_shtool} install -c -m 640 imapd.group.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    %{l_shtool} install -c -m 740 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' kolab \
 	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 kolab.conf $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 kolab.schema $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
+    %{l_shtool} install -c -m 640 kolab.conf $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    %{l_shtool} install -c -m 640 kolab.schema $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    %{l_shtool} install -c -m 740 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
 	-e "s;@@@l_musr@@@;%{l_musr};g" \
         -e "s;@@@l_rgrp@@@;%{l_rgrp};g" kolab_bootstrap \
 	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 \
+    %{l_shtool} install -c -m 640 \
         -e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
         -e "s;@@@l_musr@@@;%{l_musr};g" \
         -e "s;@@@l_rgrp@@@;%{l_rgrp};g" \
         -e "s;@@@l_nusr@@@;%{l_nusr};g" main.cf.template \
  	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 master.cf.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    #%{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' monit.conf.template \
+    %{l_shtool} install -c -m 640 master.cf.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    #%{l_shtool} install -c -m 640 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' monit.conf.template \
 #	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 php.ini.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 \
+    %{l_shtool} install -c -m 640 php.ini.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    %{l_shtool} install -c -m 640 \
     	-e 's;@@@kolab_prefix@@@;%{l_prefix};g' \
 	-e 's;@@@l_nusr@@@;%{l_nusr};g' -e 's;@@@l_nuid@@@;%{l_nuid};g' \
 	-e 's;@@@l_ngrp@@@;%{l_ngrp};g' -e 's;@@@l_ngid@@@;%{l_ngid};g' proftpd.conf.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-#    %{l_shtool} install -c -m 644 proftpd.group.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-#    %{l_shtool} install -c -m 644 proftpd.passwd.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 saslauthd.conf.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 session_vars.php.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 644 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' slapd.conf.template \
+#    %{l_shtool} install -c -m 640 proftpd.group.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+#    %{l_shtool} install -c -m 640 proftpd.passwd.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    %{l_shtool} install -c -m 640 saslauthd.conf.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    %{l_shtool} install -c -m 640 session_vars.php.template $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+    %{l_shtool} install -c -m 640 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' slapd.conf.template \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
-    %{l_shtool} install -c -m 744 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' workaround.sh \
+    %{l_shtool} install -c -m 740 -e 's;@@@kolab_prefix@@@;%{l_prefix};g' workaround.sh \
 	$RPM_BUILD_ROOT%{l_prefix}/etc/kolab/ 	
     cp -r admin/ $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/
     





More information about the devel mailing list