Accepting request 573216 from server:php:applications

OBS-URL: https://build.opensuse.org/request/show/573216
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/roundcubemail?expand=0&rev=48
This commit is contained in:
Dominique Leuenberger 2018-02-06 15:49:57 +00:00 committed by Git OBS Bridge
commit 0898562a39
8 changed files with 150 additions and 68 deletions

2
robots.txt Normal file
View File

@ -0,0 +1,2 @@
User-agent: *
Disallow: /

View File

@ -1,19 +1,7 @@
diff -Ppru roundcubemail-1.1-beta-dep.orig/installer/index.php roundcubemail-1.1-beta-dep/installer/index.php
--- roundcubemail-1.1-beta-dep.orig/installer/index.php 2014-11-10 20:54:51.000000000 +0100
+++ roundcubemail-1.1-beta-dep/installer/index.php 2015-01-02 19:49:03.914591933 +0100
@@ -41,7 +41,7 @@ ini_set('display_errors', 1);
define('INSTALL_PATH', realpath(__DIR__ . '/../').'/');
define('RCUBE_INSTALL_PATH', INSTALL_PATH);
-define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
+define('RCUBE_CONFIG_DIR', '/etc/roundcubemail/');
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
$include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
diff -Ppru roundcubemail-1.1-beta-dep.orig/program/include/iniset.php roundcubemail-1.1-beta-dep/program/include/iniset.php
--- roundcubemail-1.1-beta-dep.orig/program/include/iniset.php 2014-11-10 20:54:51.000000000 +0100
+++ roundcubemail-1.1-beta-dep/program/include/iniset.php 2015-01-02 19:50:06.909427933 +0100
@@ -29,7 +29,7 @@ if (!defined('INSTALL_PATH')) {
diff -Naur roundcubemail-1.3.4.orig/program/include/iniset.php roundcubemail-1.3.4/program/include/iniset.php
--- roundcubemail-1.3.4.orig/program/include/iniset.php 2018-01-14 14:00:51.000000000 +0100
+++ roundcubemail-1.3.4/program/include/iniset.php 2018-02-04 23:47:34.217834831 +0100
@@ -29,7 +29,7 @@
}
if (!defined('RCMAIL_CONFIG_DIR')) {

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:01390256365587c40cf22f79051656daf3e4b0efe133cdfa64f9b48ea22d749b
size 3597463

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJaA1KXAAoJEMKUapYJzVa0KgoP/0Ny6yneBwvKAqu6a+FjjwsT
3ExukUj4yLn9gxqNfL0kU4dzolDVFAfYDh6fK3EiSEghXOegI2nqqi3mr419bXEQ
9rboUv67UVrbO3og/8GM2uStIoB5WHQmFWaXyES6NKfDfl47KU5xIZcN6Ww/bquf
GTzISSIEkBox/BiMvi5Hm0p5XUCwnj0HujFVDXGvTzgYsjK0M+6IHB2rcyZR/+PM
n9yFH0+oNXvE/9+9RRvryt97kC0/Vl+KyQpMBUNHcZaF3hsSzNXoUOles4embte1
HUYvxnLn52iHQ+y4p9gN5/D5FBhWaBM0J248i8c5djuDp2OpOL1lugKH9xw9QC1a
rTDulpFrm9sshv3CiYz+5eNQ6YhERK6pp20AUoCMn3mb2JMWVFbgpsHaqCFzduOh
oL2NOJPBtGjBcZCZsk94UwpaWkQHi1X8jFmTv0MmrhNUsvVL5p/dzp11H+sRNtc1
ygdExAS5K+vuam4QBGKIxxACOVCNmRDpR9hGS+E4S9i0UOqt85IjUvhW8zuQXUhu
prraNd4jtJ9/yufFC+dfNCdcnCoX9mtAGYZ7+X94O2UpDeMWn1y5krUp4ANuLaPG
MT6QTSKBWjzeQvOPBROOmicouD0fjwiiqifC+h7JyFe0g352bWPQVtNeLgW/Z3r+
iFYt9EM7Kh3+YhD+jkXa
=eoxj
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bde95a620f0f5670450d3b94e093c30a4bdf2717183fcc92c8018019ad66c556
size 5506887

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIcBAABCAAGBQJaW2FDAAoJEMKUapYJzVa0GhsQAKMsZic1fs9YTYwbHprMrkXs
ZpEZXO2lhsq8nnHFeGI2QkLKAZYPNfT+R3vPaxQ/gWgPaFHmiQUwJR6dNX0b22Xd
kbjKl5g0bGoVfH2iPgJxsEg76jXqYD9Y31ffKzTY7ANgKhfWk+F2LofcRnLeKL0f
fzcNnY3v0IVL4aMmrPgutBVFSFACwoTXYS+lfBMQJmcz4KCAmuo/We2WqCHn+UIc
4Kfon0E65rsXcTuHXSskZQIUFQ8e+se13nQ60yAPQOhaDdSlSl8AFP8ODLCoAKef
Bk8eQ5VnoVnZTc00WpDLyqlRQtBbBPC3fm5yGB62cFQoN2OYl1A1BRjU+NHrYpet
Jxq3eo7TpptVNShaVaq4YEMBQeFWc7dsobOXmEfD0LWwALqy0xpm5xEhYejZ4T5C
u6fkrh411LovrTj8I5+4FEFSnPhD7e2DzqmcD1Hqfj/5OvgmbpelTe8D2Eo2ufxy
Xm4FsxJigXHDG/ZXw5CdMOwEzYsIQEhiT8sFiVHZx3FJPb4c4v1X1JQWZgb5JIIA
Yb+fQEF7a+yI2DQTqERYgBzrxuSP6iO2TvQ4ZB+aDeC1zAev8VTSzasLGh+QpLZS
i0Cdd+JvYTtLfi3xYo1+fkJ9Qh4BfY6W5W6ZMh6fjpyYkLRWj8kV6kmtwWb18QrB
7TpH5tQwdS3GvYJzuiIG
=nfZG
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,92 @@
-------------------------------------------------------------------
Mon Feb 5 19:14:45 UTC 2018 - jengelh@inai.de
- Trim bias from description.
- Replace %__-type macro indirections.
- Avoid bashisms in build logic.
-------------------------------------------------------------------
Sun Feb 4 22:36:44 UTC 2018 - joop.boonen@opensuse.org
- Upgrade to version 1.3.4
- RELEASE 1.3.4
* Fix bug where contacts search could skip some records (#6130)
* Fix possible information leak - add more strict sql error check on user creation (#6125)
* Fix a couple of warnings on PHP 7.2 (#6098)
* Fix broken long filenames when using imap4d server - workaround server bug (#6048)
* Fix so temp_dir misconfiguration prints an error to the log (#6045)
* Fix untagged COPYUID responses handling - again (#5982)
* Fix PHP warning "idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated" with PHP 7.2 (#6075)
* Fix bug where Archive folder wasn't auto-created on login with create_default_folders=true
* Fix performance issue when parsing malformed and long Date header (#6087)
* Fix syntax error in mssql.initial.sql (#6097)
* Fix bug where contacts export by selection returned no more than 10 entries (#6103)
* Fix searching contacts by address in LDAP source (#6084)
* Fix X-Frame-Options:ALLOW-FROM support, remove custom click-jacking protection (#6057)
- RELEASE 1.3.3
* Fix decoding of mailto: links with + character in HTML messages (#6020)
* Fix false reporting of failed upgrade in installto.sh (#6019)
* Fix file disclosure vulnerability caused by insufficient input validation [CVE-2017-16651] (#6026)
* Fix mangled non-ASCII characters in links in HTML messages (#6028)
- RELEASE 1.3.2
* Fix bug where pink image was used instead of a thumbnail when image resize fails (#5933)
* Fix so files size/count limit is verified (client-side) also on drag-n-drop uploads (#5940)
* Fix invalid template loading on a message error in preview frame (#5941)
* Fix bug where HTML messages could have been rendered empty on some systems (#5957)
* Fix wording of "Mark previewed messages as read" to "Mark messages as read" (#5952)
* Enigma: Fix decryption of messages encoded with non-ascii charset (#5962)
* Fix missing cursor in HTML editor on mail reply (#5969)
* Fix (again) bug where image data URIs in css style were treated as evil/remote in mail preview (#5580)
* Fix bug where mail search could return empty result on servers without SORT capability (#5973)
* Fix bug where assets_path wasn't added to some watermark frames
* Fix so untagged COPYUID responses are also supported according to RFC6851 (#5982)
* Fix issue caused by non-default session.cookie_lifetime setting (#5961)
* Fix Edge encoding bug when pasting text into the HTML editor, update to TinyMCE 4.5.8 (#5885)
* Fix handling of unknown Content-Disposition type (#6002)
* Fix truncated folder name on messages list in multi-folder mode, for folders with non-ascii characters (#6004)
* Fix bug where removing the last subfolder did not hide toggle button on its parent record (#6007)
* Fix bug where ghost messages could be added to the list after fast delete (#5941)
- RELEASE 1.3.1
* Add Preferences > Mailbox View > Main Options > Layout (#5829)
* Password: Fix compatibility with PHP 7+ in cpanel_webmail driver (#5820)
* Managesieve: Fix parsing dot-staffed lines in multiline text (#5838)
* Managesieve: Fix AM/PM suffix in vacation time selectors
* Managesieve: Fix bug where 'exists' operator was reset to 'contains' (#5899)
* Remove non-printable characters from filenames on download/display (#5880)
* Fix decoding non-ascii attachment names from TNEF attachments (#5646, #5799)
* Fix uninitialized string offset in rcube_utils::bin2ascii() and make sure rcube_utils::random_bytes() result has always requested length (#5788)
* Fix bug where HTML messages with @media styles could moddify style of page body (#5811)
* Fix style issue on selected and unfocused message that is part of a thread (#5798)
* Fix bug where a.button style from managesieve plugin could impact other elements (#5800)
* Fix position of selected icon for (Mailvelope) Encrypt button
* Fix fatal error when using DMY- or MDY-based date format in PostgreSQL (#5808)
* Fix bug where errors were not printed when using bin/update.sh (#5834)
* Fix PHP 7.2 warnings on count() use (#5845)
* Fix bug where Chrome could not upload the same file that was selected before (#5854)
* Fix duplicate messages on the list after deleting messages on the next to the last page (#5862)
* Fix bug where messages count was not updated after delete when imap_cache is set (#5872)
* Fix potential XSS vulnerability with malformed HTML message markup
* Fix sending message with "Too many public recipients" dialog buttons (#5924)
* Bring back double-click behavior on the message list which was removed in 1.3.0 (#5823)
* Enigma: Fix decrypting an encrypted+signed message when signature verification fails (#5914)
- RELEASE 1.3.0
* Update to TinyMCE 4.5.7
* Fix bug where invalid recipients could be silently discarded (#5739)
* Fix conflict with _gid cookie of Google Analytics (#5748)
* Print error from CLI scripts when system/exec function is disabled (#5744)
* Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)
* Fix bug where it wasn't possible to scroll folders list in Edge (#5750)
* Fix folders list sorting on Windows - if php-intl is available (#5732)
* Fix addressbook searching by gender (#5757)
* Fix prevention from using % and * characters in folder name (#5762)
* Fix POST parameter reflection in default_charset selector (#5768)
* Enigma: Fix compatibility with assets_dir
* Managesieve: Skip redundant LISTSCRIPTS command
* Fix SQL syntax error on MariaDB 10.2 (#5774)
* Fix bug where zipdownload ignored files with the same name (#5777)
* Fix bug where it wasn't possible to set timezone to auto-detected value (#5782)
- Build roundcube correcty for both php5 and php7
-------------------------------------------------------------------
Fri Nov 10 10:50:57 UTC 2017 - lars@linux-schulserver.de

View File

@ -1,7 +1,7 @@
#
# spec file for package roundcubemail
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,20 +17,21 @@
Name: roundcubemail
Version: 1.2.7
Version: 1.3.4
Release: 0
Summary: A modern browser-based multilingual IMAP client
Summary: A browser-based multilingual IMAP client
License: GPL-3.0+ and GPL-2.0 and BSD-3-Clause
Group: Productivity/Networking/Email/Clients
Url: https://www.roundcube.net/
Source0: https://github.com/roundcube/roundcubemail/releases/download/%{version}/%{name}-%{version}.tar.gz
Source0: https://github.com/roundcube/roundcubemail/releases/download/%{version}/%{name}-%{version}-complete.tar.gz
Source1: %{name}-rpmlintrc
Source2: %{name}-httpd.conf
Source4: README.openSUSE
Source5: %{name}.logrotate
Source6: https://roundcube.net/download/pubkey.asc#/%{name}.keyring
Source7: https://github.com/roundcube/roundcubemail/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
Source7: https://github.com/roundcube/roundcubemail/releases/download/%{version}/%{name}-%{version}-complete.tar.gz.asc
Source8: robots.txt
# PATCH-FIX-OPENSUSE roundcubemail-1.1-beta-config_dir.patch -- use the general config directory /etc
Patch0: %{name}-1.1-beta-config_dir.patch
@ -40,6 +41,7 @@ BuildRequires: apache2-devel
BuildRequires: fdupes
%endif
BuildRequires: pcre-devel
BuildRequires: php
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: http_daemon
@ -81,16 +83,15 @@ Conflicts: roundcube-framework
%define apache_sysconfdir %(/usr/sbin/apxs2 -q SYSCONFDIR)
%define roundcubepath %{apache_serverroot}/%{name}
%define roundcubeconfigpath %{_sysconfdir}/%{name}
%define php_major_version %(php -r "echo PHP_MAJOR_VERSION;")
%description
Roundcube Webmail is a browser-based multilingual IMAP client with an
application-like user interface. It provides full functionality you
expect from an e-mail client, including MIME support, address book,
folder manipulation, message searching and spell checking.
Roundcube Webmail is written in PHP and requires the MySQL database.
The user interface is fully skinnable using XHTML and CSS 2.
application-like user interface. It provides MIME support, address
book, folder manipulation, message searching and spell checking.
Roundcube Webmail is written in PHP and requires a MySQL database.
The user interface is skinnable using XHTML and CSS 2.
%prep
%setup -q
@ -102,65 +103,66 @@ find . -name ".gitignore" -delete
# no need to check .htaccess each time, the apache config takes care of the restrictions
find . -name ".htaccess" -delete
# remove mssql scripts (not needed on openSUSE)
%{__rm} -rf \
rm -rf \
SQL/mssql/ \
SQL/mssql.*.sql
# remove shebang from chpass-wrapper
sed -i '1d' plugins/password/helpers/chpass-wrapper.py
# remove INSTALL doc
%{__rm} INSTALL
rm INSTALL
%build
%install
# install roundcubemail.logrotate
%{__install} -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
%{__install} %{SOURCE5} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
install -d -m 0755 %{buildroot}/%{_sysconfdir}/logrotate.d
install %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
# extract roundcube-framework
%{__install} -d -m 0755 %{buildroot}%{_datadir}/php5
mv program/lib/Roundcube %{buildroot}%{_datadir}/php5/Roundcube
install -d -m 0755 %{buildroot}/%{_datadir}/php%{php_major_version}
mv program/lib/Roundcube %{buildroot}%{_datadir}/php%{php_major_version}/Roundcube
# install roundcubemail
%{__install} -d -m 0755 %{buildroot}%{roundcubepath}
install -d -m 0755 %{buildroot}/%{roundcubepath}
cp -a * %{buildroot}%{roundcubepath}/
%{__ln_s} %{roundcubepath}/installer %{buildroot}%{roundcubepath}/public_html/installer
cp %{SOURCE8} %{buildroot}%{roundcubepath}/
ln -s %{roundcubepath}/installer %{buildroot}/%{roundcubepath}/public_html/installer
# install config
mkdir -p %{buildroot}%{_sysconfdir}/%{name}
cp config/* %{buildroot}%{roundcubeconfigpath}/
%{__install} %{buildroot}%{roundcubeconfigpath}/config.inc.php.sample %{buildroot}%{roundcubeconfigpath}/config.inc.php
%{__rm} -rf %{buildroot}%{roundcubepath}/config
%{__ln_s} %{roundcubeconfigpath} %{buildroot}%{roundcubepath}/config
install %{buildroot}/%{roundcubeconfigpath}/config.inc.php.sample %{buildroot}/%{roundcubeconfigpath}/config.inc.php
rm -rf %{buildroot}/%{roundcubepath}/config
ln -s %{roundcubeconfigpath} %{buildroot}/%{roundcubepath}/config
# logs + temp go into /var/
%{__rm} -rf %{buildroot}%{roundcubepath}/logs \
rm -rf %{buildroot}/%{roundcubepath}/logs \
%{buildroot}%{roundcubepath}/temp
%{__install} -d %{buildroot}%{_localstatedir}/log/%{name} \
install -d %{buildroot}/%{_localstatedir}/log/%{name} \
%{buildroot}%{_localstatedir}/lib/%{name}
%{__ln_s} %{_localstatedir}/log/%{name}/ %{buildroot}%{roundcubepath}/logs
%{__ln_s} %{_localstatedir}/lib/%{name}/ %{buildroot}%{roundcubepath}/temp
ln -s %{_localstatedir}/log/%{name}/ %{buildroot}/%{roundcubepath}/logs
ln -s %{_localstatedir}/lib/%{name}/ %{buildroot}/%{roundcubepath}/temp
# move some plugin configs to /etc/roundcubemail
for PLUGIN in acl managesieve password; do
if [[ -f %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist ]]; then
if [ -f %{buildroot}/%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist ]; then
mv %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php.dist %{buildroot}%{roundcubeconfigpath}/$PLUGIN.inc.php
%{__ln_s} %{roundcubeconfigpath}/$PLUGIN.inc.php %{buildroot}%{roundcubepath}/plugins/$PLUGIN/config.inc.php
ln -s %{roundcubeconfigpath}/$PLUGIN.inc.php %{buildroot}/%{roundcubepath}/plugins/$PLUGIN/config.inc.php
fi
done
# install httpd.conf file and adapt the configuration
%{__install} -d -m 0755 %{buildroot}%{apache_sysconfdir}/conf.d
install -d -m 0755 %{buildroot}/%{apache_sysconfdir}/conf.d
sed -e "s#__ROUNDCUBEPATH__#%{roundcubepath}#g" %{SOURCE2} > %{buildroot}%{apache_sysconfdir}/conf.d/roundcubemail.conf
# install docs
%{__install} -d -m 0755 %{buildroot}%{_defaultdocdir}/%{name}
install -d -m 0755 %{buildroot}/%{_defaultdocdir}/%{name}
for i in CHANGELOG UPGRADING LICENSE README.md README.openSUSE SQL; do
mv -v %{buildroot}%{roundcubepath}/$i %{buildroot}%{_defaultdocdir}/%{name}/
done
# create a link for SQL
%{__ln_s} %{_defaultdocdir}/%{name}/SQL %{buildroot}%{roundcubepath}/SQL
ln -s %{_defaultdocdir}/%{name}/SQL %{buildroot}/%{roundcubepath}/SQL
# Make ghost files
mkdir %{buildroot}%{roundcubepath}/migrated
@ -289,8 +291,9 @@ exit 0
%{roundcubepath}/skins/
%{roundcubepath}/SQL
%{roundcubepath}/temp
%dir %{_datadir}/php5
%{_datadir}/php5/Roundcube/
%{roundcubepath}/vendor/
%dir %{_datadir}/php%{php_major_version}
%{_datadir}/php%{php_major_version}/Roundcube/
%attr(-, wwwrun, root) %{_localstatedir}/log/%{name}
%attr(-, wwwrun, root) %{_localstatedir}/lib/%{name}