[packages/horde: 12/13] manual update from 3.3 branch
glen
glen at pld-linux.org
Thu Jul 17 21:19:04 CEST 2014
commit f443ad876b471cd486bedeb1e0b44a9d340f58f4
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Jul 17 22:16:37 2014 +0300
manual update from 3.3 branch
horde-lighttpd.conf | 14 ---------
horde-mime_drivers.patch | 59 +++++++++++++++++++++++-------------
horde-path.patch | 4 +--
horde-shell.disabled.patch | 71 +++++++++++++++++++++-----------------------
horde.spec | 74 +++++++++++++++++++---------------------------
5 files changed, 104 insertions(+), 118 deletions(-)
---
diff --git a/horde.spec b/horde.spec
index 617af80..d86306d 100644
--- a/horde.spec
+++ b/horde.spec
@@ -7,7 +7,6 @@
%define hordeapp horde
%define php_min_version 5.2.0
-%define pearname horde
%include /usr/lib/rpm/macros.php
Summary: The common Horde Framework for all Horde modules
Summary(es.UTF-8): Elementos básicos do Horde Web Application Suite
@@ -23,19 +22,16 @@ Source0: http://ftp.horde.org/pub/horde/%{hordeapp}-%{version}.tar.gz
Source1: %{name}.conf
Source2: %{name}-lighttpd.conf
Source3: README.PLD
-#Patch0: %{name}-path.patch
+Patch0: %{name}-path.patch
Patch1: %{name}-shell.disabled.patch
Patch3: %{name}-blank-admins.patch
Patch4: %{name}-config-xml.patch
Patch5: %{name}-mime_drivers.patch
-#Patch6: %{name}-webroot.patch
+Patch6: %{name}-webroot.patch
Patch7: %{name}-geoip.patch
Patch8: %{name}-crypt-detect.patch
Patch9: %{name}-ssh2-vfs-realpath.patch
URL: http://www.horde.org/
-BuildRequires: php-channel(pear.horde.org)
-BuildRequires: php-horde-Horde_Role
-BuildRequires: php-pear-PEAR >= 1:1.7.0
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.654
Requires: php(core) >= %{php_min_version}
@@ -59,33 +55,23 @@ Requires: webserver(php) >= 4.1.0
# Suggests: smtpserver(for /usr/lib/sendmail) || smtp server
Suggests: dpkg
Suggests: enscript
-Suggests: php(fileinfo)
-Suggests: php(geoip)
-Suggests: php(iconv)
-Suggests: php(lzf)
-Suggests: php(memcache)
-Suggests: php(pam)
-Suggests: php(radius)
-Suggests: php(sasl)
-Suggests: php(ssh2)
-Suggests: php(uuid)
-Suggests: php(xdiff)
-Suggests: php-horde-Horde_ActiveSync
-Suggests: php-horde-Horde_DataTree
-Suggests: php-horde-Horde_Db
-Suggests: php-horde-Horde_Feed
-Suggests: php-horde-Horde_Oauth
-Suggests: php-horde-Horde_Service_Facebook
-Suggests: php-horde-Horde_Service_Twitter
-Suggests: php-horde-Horde_SyncMl
Suggests: php-pear-DB >= 1.7.8
Suggests: php-pear-Date
Suggests: php-pear-File
Suggests: php-pear-HTTP_WebDAV_Server
Suggests: php-pear-Net_DNS
Suggests: php-pear-Net_GeoIP
-Suggests: php-pear-SOAP
Suggests: php-pear-Services_Weather
+Suggests: php-pecl-fileinfo
+Suggests: php-pecl-geoip
+Suggests: php-pecl-lzf
+Suggests: php-pecl-memcache
+Suggests: php-pecl-pam
+Suggests: php-pecl-radius
+Suggests: php-pecl-sasl
+Suggests: php-pecl-ssh2
+Suggests: php-pecl-uuid
+Suggests: php-pecl-xdiff
Suggests: samba-client
Suggests: source-highlight
Suggests: wv
@@ -161,21 +147,13 @@ Horde developmnent tools.
Narzędzia deweloperskie horde.
%prep
-%pear_package_setup -d horde_dir=%{_appdir}
-
-mv ./%{php_pear_dir}/data/horde/* .
-mv docs/horde/* docs
-
-cp -p %{SOURCE3} .
-
-cd ./%{_appdir}
-
-#%patch0 -p1
+%setup -q
+%patch0 -p1
%patch1 -p1
%patch3 -p0
%patch4 -p1
%patch5 -p1
-#%patch6 -p1
+%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
@@ -193,18 +171,24 @@ rm test.php
# remove backup files from patching
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
+# enable if you want to update patch0
+%if 0
+sed -i -e "
+s#dirname(__FILE__) . '/..#'%{hordedir}#g
+" config/registry.php.dist
+exit 1
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_appdir}/docs} \
$RPM_BUILD_ROOT{/var/{lib,log}/horde,%{schemadir}}
-cd ./%{_appdir}
cp -a *.php $RPM_BUILD_ROOT%{_appdir}
cp -a config/* $RPM_BUILD_ROOT%{_sysconfdir}
touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
cp -a admin js lib locale rpc services templates themes $RPM_BUILD_ROOT%{_appdir}
-#cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-cd -
+cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -228,6 +212,10 @@ if [ ! -f %{_sysconfdir}/conf.php.bak ]; then
install /dev/null -o root -g http -m660 %{_sysconfdir}/conf.php.bak
fi
+%banner -o %{name} -e <<'EOF'
+Please read README.PLD from documentation.
+EOF
+
%post -n openldap-schema-horde
%openldap_schema_register %{schemadir}/horde.schema -d core
%service -q ldap restart
@@ -258,9 +246,9 @@ fi
%files
%defattr(644,root,root,755)
-%doc README README.PLD scripts
-%doc docs/{CHANGES,CODING_STANDARDS,CONTRIBUTING,CREDITS,INSTALL}
-%doc docs/{PERFORMANCE,RELEASE,RELEASE_NOTES,SECURITY,TRANSLATIONS,UPGRADING}
+%doc README README.PLD scripts util
+%doc docs/{CHANGES,CODING_STANDARDS,CONTRIBUTING,CREDITS,HACKING,INSTALL}
+%doc docs/{PERFORMANCE,RELEASE_NOTES,SECURITY,TODO,TRANSLATIONS,UPGRADING}
%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
diff --git a/horde-lighttpd.conf b/horde-lighttpd.conf
index 5a06297..dd3cdfa 100644
--- a/horde-lighttpd.conf
+++ b/horde-lighttpd.conf
@@ -1,17 +1,3 @@
alias.url += (
"/horde/" => "/usr/share/horde/",
)
-
-url.rewrite-once += (
- ## RPC Rewrite Rules
- "^/horde/rpc/(.*)$" => "/horde/rpc/index.php/$1",
-
- ## For Routes to work with Content component. Note you should verify
- ## that the path below is correct for your installation.
- "^/horde/incubator/content/(.*)\?(.*)$" => "/horde/incubator/content/index.php?$2",
- "^/horde/incubator/content/(.*)$" => "/horde/incubator/content/index.php"
-)
-
-$HTTP["url"] =~ "(/templates/|(?<!js/syntaxhighlighter)\/scripts/|/lib/|/po/|/locale/|(?<!admin)\/config\/)" {
- url.access-deny = ("")
-}
diff --git a/horde-mime_drivers.patch b/horde-mime_drivers.patch
index 0f7ce07..e6bc620 100644
--- a/horde-mime_drivers.patch
+++ b/horde-mime_drivers.patch
@@ -1,21 +1,38 @@
---- horde/config/mime_drivers.php~ 2011-04-09 01:03:15.000000000 +0300
-+++ horde/config/mime_drivers.php 2011-04-09 01:04:13.509122695 +0300
-@@ -326,8 +326,7 @@
-
- /* RPM archive display. */
- 'rpm' => array(
-- // Disabled by default
-- 'disable' => true,
-+ 'disable' => false,
- 'handles' => array(
- 'application/x-rpm'
- ),
-@@ -336,7 +335,7 @@
- ),
-
- // REQUIRED: Location of the rpm binary
-- 'location' => '/usr/bin/rpm'
-+ 'location' => '/bin/rpm'
- ),
-
- /* Debian archive display. */
+--- horde-3.2-alpha/config/mime_drivers.php.dist~ 2007-08-27 12:44:27.337252725 +0300
++++ horde-3.2-alpha/config/mime_drivers.php.dist 2007-08-27 12:44:29.067291838 +0300
+@@ -68,7 +68,7 @@
+ // 'msword',
+ // 'msexcel',
+ // 'mspowerpoint',
+- // 'rpm',
++ 'rpm',
+ // 'rtf',
+ // 'srchighlite',
+ // 'webcpp',
+@@ -403,7 +403,7 @@
+ * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
+ */
+ $mime_drivers['horde']['msexcel'] = array(
+- 'location' => '/usr/local/bin/xlhtml',
++ 'location' => '/usr/bin/xlhtml',
+ 'inline' => false,
+ 'handles' => array(
+ 'application/vnd.ms-excel', 'application/msexcel',
+@@ -421,7 +421,7 @@
+ * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
+ */
+ $mime_drivers['horde']['mspowerpoint'] = array(
+- 'location' => '/usr/local/bin/ppthtml',
++ 'location' => '/usr/bin/ppthtml',
+ 'inline' => false,
+ 'handles' => array(
+ 'application/vnd.ms-powerpoint', 'application/mspowerpoint'
+@@ -449,7 +449,7 @@
+ * RPM driver settings
+ */
+ $mime_drivers['horde']['rpm'] = array(
+- 'location' => '/usr/bin/rpm',
++ 'location' => '/bin/rpm',
+ 'inline' => false,
+ 'handles' => array(
+ 'application/x-rpm'
diff --git a/horde-path.patch b/horde-path.patch
index 7620190..6095444 100644
--- a/horde-path.patch
+++ b/horde-path.patch
@@ -1,5 +1,5 @@
---- horde-3.3/config/registry.php~ 2008-10-09 16:26:10.000000000 +0200
-+++ horde-3.3/config/registry.php 2008-10-09 16:35:56.000000000 +0200
+--- horde-3.3/config/registry.php.dist~ 2008-10-09 16:26:10.000000000 +0200
++++ horde-3.3/config/registry.php.dist 2008-10-09 16:35:56.000000000 +0200
@@ -44,24 +44,24 @@
// 'horde' stanza below.
diff --git a/horde-shell.disabled.patch b/horde-shell.disabled.patch
index bfdaf85..c78f577 100644
--- a/horde-shell.disabled.patch
+++ b/horde-shell.disabled.patch
@@ -1,39 +1,34 @@
---- horde/lib/Api.php~ 2011-04-09 01:01:50.000000000 +0300
-+++ horde/lib/Api.php 2011-04-09 01:02:19.292467869 +0300
-@@ -57,21 +57,21 @@
- 'name' => _("Sessions"),
- 'icon' => Horde_Themes::img('user.png')
- ),
-- 'phpshell' => array(
-- 'link' => '%application%/admin/phpshell.php',
-- 'name' => _("P_HP Shell"),
-- 'icon' => Horde_Themes::img('mime/php.png')
-- ),
-- 'sqlshell' => array(
-- 'link' => '%application%/admin/sqlshell.php',
-- 'name' => _("S_QL Shell"),
-- 'icon' => Horde_Themes::img('sql.png')
-- ),
-- 'cmdshell' => array(
-- 'link' => '%application%/admin/cmdshell.php',
-- 'name' => _("_CLI"),
-- 'icon' => Horde_Themes::img('shell.png')
-- )
-+# 'phpshell' => array(
-+# 'link' => '%application%/admin/phpshell.php',
-+# 'name' => _("P_HP Shell"),
-+# 'icon' => Horde_Themes::img('mime/php.png')
-+# ),
-+# 'sqlshell' => array(
-+# 'link' => '%application%/admin/sqlshell.php',
-+# 'name' => _("S_QL Shell"),
-+# 'icon' => Horde_Themes::img('sql.png')
-+# ),
-+# 'cmdshell' => array(
-+# 'link' => '%application%/admin/cmdshell.php',
-+# 'name' => _("_CLI"),
-+# 'icon' => Horde_Themes::img('shell.png')
-+# )
- );
+diff -ur horde-3.1-rc1/lib/api.php horde-3.1-rc1.new/lib/api.php
+--- horde-3.1-rc1/lib/api.php 2005-10-18 11:33:39.000000000 +0000
++++ horde-3.1-rc1.new/lib/api.php 2006-01-06 15:56:02.321528000 +0000
+@@ -144,18 +144,18 @@
+ 'link' => '%application%/admin/sessions.php',
+ 'name' => _("Sessions"),
+ 'icon' => 'user.png'),
+- 'phpshell' => array(
+- 'link' => '%application%/admin/phpshell.php',
+- 'name' => _("P_HP Shell"),
+- 'icon' => 'mime/php.png'),
+- 'sqlshell' => array(
+- 'link' => '%application%/admin/sqlshell.php',
+- 'name' => _("S_QL Shell"),
+- 'icon' => 'sql.png'),
+- 'cmdshell' => array(
+- 'link' => '%application%/admin/cmdshell.php',
+- 'name' => _("_CLI"),
+- 'icon' => 'shell.png'),
++# 'phpshell' => array(
++# 'link' => '%application%/admin/phpshell.php',
++# 'name' => _("P_HP Shell"),
++# 'icon' => 'shell.png'),
++# 'sqlshell' => array(
++# 'link' => '%application%/admin/sqlshell.php',
++# 'name' => _("S_QL Shell"),
++# 'icon' => 'sql.png'),
++# 'cmdshell' => array(
++# 'link' => '%application%/admin/cmdshell.php',
++# 'name' => _("_CLI"),
++# 'icon' => 'shell.png'),
+ );
+ }
- if (!empty($GLOBALS['conf']['activesync']['enabled'])) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/horde.git/commitdiff/5e6316a033a18497edf16e25b5e8c3776b9ee21e
More information about the pld-cvs-commit
mailing list