Author: glen Date: Fri Feb 25 00:31:59 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- strict apache version require (for confdir support)
- package conf.php.bak as ghost for clean uninstall
- keep write permission only on conf.php
---- Files affected:
SPECS:
horde.spec (1.73 -> 1.74) , imp.spec (1.65 -> 1.66) , kronolith.spec (1.5 ->
1.6)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.73 SPECS/horde.spec:1.74
--- SPECS/horde.spec:1.73 Thu Feb 24 22:22:43 2005
+++ SPECS/horde.spec Fri Feb 25 01:31:54 2005
@@ -9,7 +9,7 @@
Summary(pt_BR): Componentes comuns do Horde usados por todos os módulos
Name: horde
Version: 3.0.3
-Release: 2.24
+Release: 2.27
License: LGPL
Vendor: The Horde Project
Group: Development/Languages/PHP
@@ -92,7 +92,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/horde \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
$RPM_BUILD_ROOT%{hordedir}/{admin,js,lib,locale,services} \
$RPM_BUILD_ROOT%{hordedir}/{templates,themes,util} \
$RPM_BUILD_ROOT/var/log/%{name}
@@ -104,16 +104,13 @@
cp -pR $i/* $RPM_BUILD_ROOT%{hordedir}/$i
done
-for i in lib locale templates; do
- cp -p $i/.htaccess $RPM_BUILD_ROOT%{hordedir}/$i
-done
-
for i in config/*.php.dist; do
- cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/horde/$(basename $i .dist)
+ cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist)
done
-cp -p config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/horde
+cp -p config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak
-sed -i -e 's,/tmp/horde.log,/var/log/%{name}/%{name}.log,'
$RPM_BUILD_ROOT%{_sysconfdir}/horde/conf.xml
+sed -i -e 's,/tmp/horde.log,/var/log/%{name}/%{name}.log,'
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml
> $RPM_BUILD_ROOT/var/log/%{name}/%{name}.log
@@ -231,7 +228,9 @@
%dir %{_sysconfdir}
%attr(770,root,http) %dir %{_sysconfdir}/%{name}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
-%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.php
+%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php
+%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[^c]*.php
+%ghost %{_sysconfdir}/%{name}/*.php.bak
%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
%dir %{hordedir}
@@ -255,6 +254,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.74 2005/02/25 00:31:54 glen
+- strict apache version require (for confdir support)
+- package conf.php.bak as ghost for clean uninstall
+- keep write permission only on conf.php
+
Revision 1.73 2005/02/24 21:22:43 glen
- unified apache config location
================================================================
Index: SPECS/imp.spec
diff -u SPECS/imp.spec:1.65 SPECS/imp.spec:1.66
--- SPECS/imp.spec:1.65 Thu Feb 24 23:03:15 2005
+++ SPECS/imp.spec Fri Feb 25 01:31:54 2005
@@ -5,7 +5,7 @@
Summary(pt_BR): Programa de Mail via Web
Name: imp
Version: 4.0.2
-Release: 1.7
+Release: 1.8
License: GPL v2
Group: Applications/Mail
Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz
@@ -70,6 +70,7 @@
sed -e '
s,/somewhere/ca-bundle.crt,/usr/share/ssl/ca-bundle.crt,
' < config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml
+> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak
cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib
cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale
@@ -142,8 +143,10 @@
%doc README docs/* scripts/*.reg
%attr(770,root,http) %dir %{_sysconfdir}/%{name}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
-%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.php
+%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php
+%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[^c]*.php
%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.txt
+%ghost %{_sysconfdir}/%{name}/*.php.bak
%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
%dir %{_appdir}
@@ -161,6 +164,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.66 2005/02/25 00:31:54 glen
+- strict apache version require (for confdir support)
+- package conf.php.bak as ghost for clean uninstall
+- keep write permission only on conf.php
+
Revision 1.65 2005/02/24 22:03:15 glen
- update default path to ca-bundle.crt
@@ -225,7 +233,7 @@
- fix chmod for conf directory
Revision 1.45 2005/01/17 11:43:59 matipl
-repair - add lost directories,files *.xml and change chmod to 660 for confs
files
+- repair - add lost directories,files *.xml and change chmod to 660 for confs
files
Revision 1.44 2005/01/04 21:53:10 paszczus
- updated to 4.0.1
@@ -279,11 +287,11 @@
Revision 1.30 2004/08/18 07:03:47 misi3k
- security update to 3.2.5
-Changelog:
-SECURITY: Close an XSS hole in the HTML viewer, a variation to the one
-reported in http://www.greymagic.com/security/advisories/gm005-mc/.
-SECURITY: Close an XSS hole exploited via the Content-type header
-of malicious emails.
+ Changelog:
+ SECURITY: Close an XSS hole in the HTML viewer, a variation to the one
+ reported in http://www.greymagic.com/security/advisories/gm005-mc/.
+ SECURITY: Close an XSS hole exploited via the Content-type header
+ of malicious emails.
Revision 1.29 2003/12/23 15:38:48 eothane
- updated to 3.2.2
@@ -350,13 +358,13 @@
Revision 1.11 2002/04/26 23:38:39 blues
- 3.1RC2 (SECURITY update)
- Release 0.1 (just started updating)
-NFY
+ NFY
Revision 1.10 2002/04/26 23:17:14 blues
- removed non-existenz patch
Revision 1.9 2002/04/25 16:36:26 arturs
-fixed a small typo
+- fixed a small typo
Revision 1.8 2002/02/23 02:59:07 kloczek
- adapterized.
@@ -366,14 +374,14 @@
Group field using gettext).
Revision 1.6 2002/01/18 02:13:19 kloczek
-perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
+- perl -pi -e "s/[EMAIL PROTECTED]/[EMAIL PROTECTED]/"
Revision 1.5 2001/07/27 17:50:44 blues
- 2.3.6
- translation added
- some cleanups
- %pre/%post more conventional (PLD-like)
-NOTE: This is security update. I'm not using this package so... check me...
+ NOTE: This is security update. I'm not using this package so... check me...
Revision 1.4 2001/02/20 13:31:32 mkierus
- change apacheuser and group to http
================================================================
Index: SPECS/kronolith.spec
diff -u SPECS/kronolith.spec:1.5 SPECS/kronolith.spec:1.6
--- SPECS/kronolith.spec:1.5 Thu Feb 24 22:28:00 2005
+++ SPECS/kronolith.spec Fri Feb 25 01:31:54 2005
@@ -3,7 +3,7 @@
Summary(pl): Kronolith - kalendarz dla HORDE
Name: kronolith
Version: 2.0.2
-Release: 0.5
+Release: 0.7
License: LGPL
Vendor: The Horde Project
Group: Applications/Mail
@@ -11,8 +11,8 @@
# Source0-md5: 876acd83dda5a0fd786989247131c678
Source1: %{name}.conf
URL: http://www.horde.org/kronolith/
-PreReq: apache
BuildRequires: rpmbuild(macros) >= 1.177
+Requires: apache >= 1.3.33-2
Requires: horde >= 3.0
Requires: php-xml >= 4.1.0
BuildArch: noarch
@@ -68,8 +68,9 @@
for i in config/*.dist; do
cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist)
done
-cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
+cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak
cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib
cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale
@@ -131,7 +132,9 @@
%doc README docs/* scripts/*
%attr(770,root,http) %dir %{_sysconfdir}/%{name}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
-%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.php
+%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php
+%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[^c]*.php
+%ghost %{_sysconfdir}/%{name}/*.php.bak
%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
%dir %{_appdir}
@@ -148,6 +151,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2005/02/25 00:31:54 glen
+- strict apache version require (for confdir support)
+- package conf.php.bak as ghost for clean uninstall
+- keep write permission only on conf.php
+
Revision 1.5 2005/02/24 21:28:00 glen
- unified with other horde apps
@@ -156,4 +164,3 @@
Revision 1.3 2005/02/03 22:00:37 qboosh
- pl, Log, removed bogus dep
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.73&r2=1.74&f=u
http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.65&r2=1.66&f=u
http://cvs.pld-linux.org/SPECS/kronolith.spec?r1=1.5&r2=1.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
