rpms/smplayer/devel .cvsignore, 1.28, 1.29 smplayer-14.9.0.6966-system-qtsingleapplication.patch, 1.1, 1.2 smplayer.spec, 1.44, 1.45 smtube-15.5.10-system-qtsingleapplication.patch, 1.1, 1.2 sources, 1.30, 1.31 smplayer-14.9.0-get_svn_revision.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2215
Modified Files:
.cvsignore
smplayer-14.9.0.6966-system-qtsingleapplication.patch
smplayer.spec smtube-15.5.10-system-qtsingleapplication.patch
sources
Removed Files:
smplayer-14.9.0-get_svn_revision.patch
Log Message:
* Fri Oct 02 2015 Sérgio Basto <sergio(a)serjux.com> - 15.9.0-1
- Update smplayer to 15.9.0 and smtube to 15.9.0 .
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 17 Jun 2015 01:43:00 -0000 1.28
+++ .cvsignore 2 Oct 2015 21:21:16 -0000 1.29
@@ -1,2 +1,2 @@
-smplayer-14.9.0.6994.tar.bz2
-smtube-15.5.17.tar.bz2
+smplayer-15.9.0.tar.bz2
+smtube-15.9.0.tar.bz2
smplayer-14.9.0.6966-system-qtsingleapplication.patch:
smplayer.pro | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
Index: smplayer-14.9.0.6966-system-qtsingleapplication.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer-14.9.0.6966-system-qtsingleapplication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smplayer-14.9.0.6966-system-qtsingleapplication.patch 6 Jun 2015 21:26:41 -0000 1.1
+++ smplayer-14.9.0.6966-system-qtsingleapplication.patch 2 Oct 2015 21:21:16 -0000 1.2
@@ -1,5 +1,5 @@
---- ./src/smplayer.pro.orig 2015-04-18 03:11:32.000000000 +0100
-+++ ./src/smplayer.pro 2015-06-06 19:37:48.769799609 +0100
+--- ./src/smplayer.pro.orig 2015-08-03 22:54:00.000000000 +0100
++++ ./src/smplayer.pro 2015-10-02 22:07:32.679161412 +0100
@@ -3,6 +3,7 @@ LANGUAGE = C++
CONFIG += qt warn_on
@@ -8,9 +8,9 @@
#CONFIG += debug
QT += network xml
-@@ -283,14 +284,6 @@ FORMS = inputdvddirectory.ui logwindowba
- about.ui inputmplayerversion.ui errordialog.ui timedialog.ui stereo3ddialog.ui \
- toolbareditor.ui multilineinputdialog.ui
+@@ -309,14 +310,6 @@ contains( DEFINES, MPLAYER_SUPPORT ) {
+ SOURCES += mplayerprocess.cpp inforeadermplayer.cpp
+ }
-# qtsingleapplication
-contains( DEFINES, SINGLE_INSTANCE ) {
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- smplayer.spec 17 Jun 2015 01:40:21 -0000 1.44
+++ smplayer.spec 2 Oct 2015 21:21:16 -0000 1.45
@@ -1,7 +1,7 @@
-%global smtube_ver 15.5.17
+%global smtube_ver 15.9.0
Name: smplayer
-Version: 14.9.0.6994
+Version: 15.9.0
Release: 1%{?dist}
Summary: A graphical frontend for mplayer
@@ -13,7 +13,7 @@
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
-Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
+Source3: http://downloads.sourceforge.net/smtube/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
Patch0: smplayer-0.8.3-desktop-files.patch
@@ -60,7 +60,7 @@
mv Changelog.utf8 Changelog
# fix path of docs
-sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile
+sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer|' Makefile
# use %{?_smp_mflags}
sed -i '/cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make/s!$! %{?_smp_mflags}!' Makefile
@@ -73,7 +73,7 @@
pushd smtube-%{smtube_ver}
sed -i 's|/usr/local|%{_prefix}|' Makefile
-sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
+sed -i 's|doc/smtube|doc/%{name}/smtube|' Makefile
sed -i 's|smtube/translations|smplayer/translations|' Makefile
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} LRELEASE=%{_bindir}/lrelease-qt4
popd
@@ -117,7 +117,6 @@
update-desktop-database &> /dev/null || :
%files
-%{_docdir}/%{name}-%{version}/
%{_bindir}/smplayer
%{_bindir}/smtube
%{_datadir}/applications/rpmfusion-smplayer*.desktop
@@ -126,11 +125,19 @@
%{_datadir}/icons/hicolor/*/apps/smplayer.svg
%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
-%{_mandir}/man1/smplayer.1.gz
%dir %{_datadir}/kde4/services/ServiceMenus/
%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
+%{_mandir}/man1/smplayer.1.gz
+%{_docdir}/%{name}/
%changelog
+* Fri Oct 02 2015 Sérgio Basto <sergio(a)serjux.com> - 15.9.0-1
+- Update smplayer to 15.9.0 and smtube to 15.9.0 .
+
+* Thu Aug 20 2015 Sérgio Basto <sergio(a)serjux.com> - 14.9.0.6994-2
+- Update smtube to 15.8.0 .
+- Removed version of package from _docdir directory (following the guidelines).
+
* Wed Jun 17 2015 Sérgio Basto <sergio(a)serjux.com> - 14.9.0.6994-1
- Update to 4.9.0.6994 .
- Drop smplayer-14.9.0-get_svn_revision.patch .
smtube-15.5.10-system-qtsingleapplication.patch:
smtube.pro | 2 ++
1 file changed, 2 insertions(+)
Index: smtube-15.5.10-system-qtsingleapplication.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smtube-15.5.10-system-qtsingleapplication.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smtube-15.5.10-system-qtsingleapplication.patch 6 Jun 2015 21:26:41 -0000 1.1
+++ smtube-15.5.10-system-qtsingleapplication.patch 2 Oct 2015 21:21:16 -0000 1.2
@@ -1,5 +1,5 @@
---- ./src/smtube.pro.orig 2015-06-06 19:41:57.132618395 +0100
-+++ ./src/smtube.pro 2015-06-06 19:43:23.309596085 +0100
+--- ./src/smtube.pro.orig 2015-08-19 23:20:59.000000000 +0100
++++ ./src/smtube.pro 2015-08-20 20:36:29.130599873 +0100
@@ -1,12 +1,14 @@
TEMPLATE = app
@@ -13,5 +13,5 @@
DEFINES += YT_USE_SCRIPT
+DEFINES += USE_SINGLE_APPLICATION
- isEqual(QT_MAJOR_VERSION, 5) {
- QT += webkitwidgets widgets gui
+ DEFINES += D_PLAYERS
+
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources 17 Jun 2015 01:43:01 -0000 1.30
+++ sources 2 Oct 2015 21:21:16 -0000 1.31
@@ -1,2 +1,2 @@
-666a589b1fc3480a29e87f0ee7efd511 smplayer-14.9.0.6994.tar.bz2
-577ebdf5fbcd3d17959294e688c124b4 smtube-15.5.17.tar.bz2
+6ab6f96030df63b79f3a28fb3f99107d smplayer-15.9.0.tar.bz2
+9717ae650d1bbb47d4cd94b942306695 smtube-15.9.0.tar.bz2
--- smplayer-14.9.0-get_svn_revision.patch DELETED ---
8 years, 6 months
- 1
- 0
rpms/vdr-softhddevice/devel .cvsignore, 1.27, 1.28 sources, 1.27, 1.28 vdr-softhddevice.spec, 1.32, 1.33
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-softhddevice/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv896/devel
Modified Files:
.cvsignore sources vdr-softhddevice.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 2 Oct 2015 19:16:38 -0000 1.27
+++ .cvsignore 2 Oct 2015 20:23:27 -0000 1.28
@@ -1 +1 @@
-vdr-plugin-softhddevice-f47ee3a2018e9c64927d9a5bd892e4bbc74630e8.tar.bz2
+vdr-plugin-softhddevice-5dc5601576c617516ec41c9c4899d3e18c0cc030.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources 2 Oct 2015 19:16:38 -0000 1.27
+++ sources 2 Oct 2015 20:23:27 -0000 1.28
@@ -1 +1 @@
-c3f45687cc3fcf173a89fc21d6dab935 vdr-plugin-softhddevice-f47ee3a2018e9c64927d9a5bd892e4bbc74630e8.tar.bz2
+6c331eb57b5a319b313fbb3e5b3c3d9f vdr-plugin-softhddevice-5dc5601576c617516ec41c9c4899d3e18c0cc030.tar.bz2
Index: vdr-softhddevice.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/vdr-softhddevice.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- vdr-softhddevice.spec 2 Oct 2015 19:16:38 -0000 1.32
+++ vdr-softhddevice.spec 2 Oct 2015 20:23:27 -0000 1.33
@@ -1,6 +1,6 @@
-%global commit f47ee3a2018e9c64927d9a5bd892e4bbc74630e8
+%global commit 5dc5601576c617516ec41c9c4899d3e18c0cc030
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20150930
+%global gitdate 20151001
Name: vdr-softhddevice
Version: 0.6.1
@@ -82,6 +82,9 @@
%license AGPL-3.0.txt
%changelog
+* Fri Oct 02 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-6.20151001git5dc5601
+- update for new git snapshot
+
* Wed Sep 30 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-5.20150930gitf47ee3a
- update for new git snapshot
8 years, 6 months
- 1
- 0
rpms/vdr-softhddevice/devel .cvsignore, 1.26, 1.27 sources, 1.26, 1.27 vdr-softhddevice.spec, 1.31, 1.32
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-softhddevice/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31861/devel
Modified Files:
.cvsignore sources vdr-softhddevice.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 25 Sep 2015 20:47:41 -0000 1.26
+++ .cvsignore 2 Oct 2015 19:16:38 -0000 1.27
@@ -1 +1 @@
-vdr-plugin-softhddevice-509329c90a524600be720ed332574fbf6454735e.tar.bz2
+vdr-plugin-softhddevice-f47ee3a2018e9c64927d9a5bd892e4bbc74630e8.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 25 Sep 2015 20:47:41 -0000 1.26
+++ sources 2 Oct 2015 19:16:38 -0000 1.27
@@ -1 +1 @@
-9d068b920374fd83d3fd79f630c6e820 vdr-plugin-softhddevice-509329c90a524600be720ed332574fbf6454735e.tar.bz2
+c3f45687cc3fcf173a89fc21d6dab935 vdr-plugin-softhddevice-f47ee3a2018e9c64927d9a5bd892e4bbc74630e8.tar.bz2
Index: vdr-softhddevice.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-softhddevice/devel/vdr-softhddevice.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vdr-softhddevice.spec 25 Sep 2015 20:47:41 -0000 1.31
+++ vdr-softhddevice.spec 2 Oct 2015 19:16:38 -0000 1.32
@@ -1,10 +1,10 @@
-%global commit 509329c90a524600be720ed332574fbf6454735e
+%global commit f47ee3a2018e9c64927d9a5bd892e4bbc74630e8
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20150924
+%global gitdate 20150930
Name: vdr-softhddevice
Version: 0.6.1
-Release: 4.%{gitdate}git%{shortcommit}%{?dist}
+Release: 5.%{gitdate}git%{shortcommit}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -82,6 +82,9 @@
%license AGPL-3.0.txt
%changelog
+* Wed Sep 30 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-5.20150930gitf47ee3a
+- update for new git snapshot
+
* Fri Sep 25 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-4.20150924git509329c
- update for new git snapshot
8 years, 6 months
- 1
- 0
rpms/vdr-markad/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 vdr-markad.spec, 1.4, 1.5
by Martin Gansser
Author: martinkg
Update of /cvs/free/rpms/vdr-markad/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31561/devel
Modified Files:
.cvsignore sources vdr-markad.spec
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vdr-markad/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2 Sep 2014 18:17:44 -0000 1.3
+++ .cvsignore 2 Oct 2015 19:12:51 -0000 1.4
@@ -1 +1 @@
-vdr-plugin-markad-c55f43f413dff8740f99d684e8879835d4409920.tar.bz2
+vdr-plugin-markad-53454360c279844d0783b70cde023fecfc8ea69a.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vdr-markad/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 2 Sep 2014 18:17:44 -0000 1.3
+++ sources 2 Oct 2015 19:12:51 -0000 1.4
@@ -1 +1 @@
-7c9b53c5a8f565c11504444add2d5609 vdr-plugin-markad-c55f43f413dff8740f99d684e8879835d4409920.tar.bz2
+f60a78f5ee51e19b8c529d2deaae84ac vdr-plugin-markad-53454360c279844d0783b70cde023fecfc8ea69a.tar.bz2
Index: vdr-markad.spec
===================================================================
RCS file: /cvs/free/rpms/vdr-markad/devel/vdr-markad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vdr-markad.spec 20 Oct 2014 01:38:06 -0000 1.4
+++ vdr-markad.spec 2 Oct 2015 19:12:51 -0000 1.5
@@ -1,10 +1,10 @@
-%global commit c55f43f413dff8740f99d684e8879835d4409920
+%global commit 53454360c279844d0783b70cde023fecfc8ea69a
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global gitdate 20140902
+%global gitdate 20150926
Name: vdr-markad
Version: 0.1.4
-Release: 6.%{gitdate}git%{shortcommit}%{?dist}
+Release: 7.%{gitdate}git%{shortcommit}%{?dist}
Summary: Advanced commercial detection for VDR
License: GPLv2+
# how to get the tarball
@@ -68,6 +68,9 @@
%{vdr_vardir}/markad/
%changelog
+* Fri Oct 02 2015 Martin Gansser <martinkg(a)fedoraproject.org> - 0.1.4-7.20150926git5345436
+- rebuild for new git version
+
* Mon Oct 20 2014 Sérgio Basto <sergio(a)serjux.com> - 0.1.4-6.20140902gitc55f43f
- Rebuilt for FFmpeg 2.4.3
8 years, 6 months
- 1
- 0
rpms/z-push/EL-6 z-push-2.2.4-package.patch, NONE, 1.1 z-push-autodiscover-README.FEDORA, NONE, 1.1 z-push-autodiscover.conf, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 z-push-README.FEDORA, 1.2, 1.3 z-push.spec, 1.16, 1.17 z-push-2.1.2-package.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27244/EL-6
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.2.4-package.patch z-push-autodiscover-README.FEDORA
z-push-autodiscover.conf
Removed Files:
z-push-2.1.2-package.patch
Log Message:
Upgrade to 2.2.4
z-push-2.2.4-package.patch:
autodiscover/config.php | 17 ++++++++++++++++-
config.php | 21 +++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
5 files changed, 44 insertions(+), 7 deletions(-)
--- NEW FILE z-push-2.2.4-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.2.4, which changes the original
paths from Z-Push upstream to Fedora compliant ones. Additionally, it adds some installation and
configuration hints regarding multiple data backend providers.
--- z-push-2.2.4/config.php 2015-09-30 15:05:38.000000000 +0200
+++ z-push-2.2.4/config.php.package. 2015-10-02 16:41:22.017747249 +0200
@@ -69,6 +69,8 @@
* true - use the complete email address.
*/
define('USE_FULLEMAIL_FOR_LOGIN', false);
+
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -110,6 +112,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -208,19 +211,33 @@
// NOTE: THIS IS AN EXPERIMENTAL FEATURE WHICH COULD PREVENT YOUR MOBILES FROM SYNCHRONIZING.
define('USE_PARTIAL_FOLDERSYNC', false);
+
/**********************************************************************************
* Backend settings
+ *
+ * Z-Push supports currently the data backend providers Zarafa, IMAP, vCard directory,
+ * Maildir and a mixture by the combined one. Ensure that the used backend is installed
+ * and proper configured as well:
+ * BackendZarafa - configure /etc/z-push/zarafa.php (provided by z-push-zarafa)
+ * BackendCombined - configure /etc/z-push/combined.php (provided by z-push-combined)
+ * and of course the wanted (at least two) other backend providers
+ * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap)
+ * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir)
+ * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir)
+ * If only one data backend provider has been installed, that one is used by default.
+ * In case of multiple installed data backend providers, they are tried in order above.
*/
- // the backend data provider
+ // The backend data provider
define('BACKEND_PROVIDER', '');
+
/**********************************************************************************
* Search provider settings
*
* Alternative backend to perform SEARCH requests (GAL search)
* By default the main Backend defines the preferred search functionality.
* If set, the Search Provider will always be preferred.
- * Use 'BackendSearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
+ * Use 'BackendSearchLDAP' to search in a LDAP directory (see /etc/z-push/searchldap.php)
*/
define('SEARCH_PROVIDER', '');
// Time in seconds for the server search. Setting it too high might result in timeout.
--- z-push-2.2.4/z-push-admin.php 2015-09-30 19:10:45.000000000 +0200
+++ z-push-2.2.4/z-push-admin.php.package 2015-10-02 16:41:57.955453602 +0200
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
include('lib/core/stateobject.php');
@@ -103,8 +107,6 @@
/************************************************
* MAIN
*/
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
- set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
try {
ZPush::CheckConfig();
ZPushAdminCLI::CheckEnv();
--- z-push-2.2.4/z-push-top.php 2015-09-30 19:10:44.000000000 +0200
+++ z-push-2.2.4/z-push-top.php.package 2015-10-02 16:42:27.440212676 +0200
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/exceptions/exceptions.php');
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
@@ -61,7 +65,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php 2015-09-30 19:10:45.000000000 +0200
+++ z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php.package 2015-10-02 16:42:51.376017089 +0200
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../src");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
--- z-push-2.2.4/autodiscover/config.php 2015-09-30 15:05:39.000000000 +0200
+++ z-push-2.2.4/autodiscover/config.php.package 2015-10-02 17:02:20.586475499 +0200
@@ -59,6 +59,7 @@
*/
define('USE_FULLEMAIL_FOR_LOGIN', false);
+
/**********************************************************************************
* Logging settings
* Possible LOGLEVEL and LOGUSERLEVEL values are:
@@ -81,9 +82,23 @@
define('LOGERRORFILE', LOGFILEDIR . 'autodiscover-error.log');
define('LOGLEVEL', LOGLEVEL_INFO);
define('LOGUSERLEVEL', LOGLEVEL);
+
+
/**********************************************************************************
* Backend settings
+ *
+ * Z-Push supports currently the data backend providers Zarafa, IMAP, vCard directory,
+ * Maildir and a mixture by the combined one. Ensure that the used backend is installed
+ * and proper configured as well:
+ * BackendZarafa - configure /etc/z-push/zarafa.php (provided by z-push-zarafa)
+ * BackendCombined - configure /etc/z-push/combined.php (provided by z-push-combined)
+ * and of course the wanted (at least two) other backend providers
+ * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap)
+ * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir)
+ * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir)
+ * If only one data backend provider has been installed, that one is used by default.
+ * In case of multiple installed data backend providers, they are tried in order above.
*/
- // the backend data provider
+ // The backend data provider
define('BACKEND_PROVIDER', '');
?>
\ No newline at end of file
--- NEW FILE z-push-autodiscover-README.FEDORA ---
Z-Push AutoDiscover manual
==========================
Introduction
------------
AutoDiscover is the service used to simplify the configuration of collaboration
accounts for clients, especially for mobile phones.
While in the past the user was required to enter the server name, user name and
password manually into his mobile phone in order to connect, with AutoDiscover
the user is only required to fill in his e-mail address and the password.
AutoDiscover will try several methods to reach the correct server automatically.
How does it work?
-----------------
When speaking about AutoDiscover, this includes two distinct realms:
- AutoDiscover is a specification which defines the steps a client should take
in order to contact a service to request additional data.
- The AutoDiscover service is piece of software which accepts requests from the
clients, authenticates them, requests some additional data from the
collaboration server and sends this data back to the client.
The specification suggests several ways for client to contact the responsible
server to receive additional information. Tests have shown, that basically all
mobile phones tested support only the most basic ways. These are sufficient for
almost all types of scenarios and are the ones implemented by Z-Push AutoDiscover.
Please refer to the Mobile Compatibility List (http://z-push.sf.net/compatibility)
for an overview of supported and tested devices.
The used e-mail address is the key for the process. The client splits it up into
the local and domain part (before and after the @-sign). The client then tries
to connect to this domain in order to get in contact with the AutoDiscover
service. The local part of the e-mail address is used as "login" to the
AutoDiscover service. There is also an option, to use the full e-mail address as
login name (see "Configuration" section below for details).
---------------
| Client |
| e.g. mobile |
---------------
/ \
1. Searches for / \ 2. Data access
information / \
/ \
V V
---------------- --------------
| AutoDiscover | redirects to | Z-Push |
| | --------------------> | ActiveSync |
---------------- --------------
\ /
Authen- \ / Synchronizes
ticates \ /
via Z-Push \ /
Backend V V
-----------------
| Collaboration |
| Platform |
-----------------
Requirements
------------
As described in the previous chapter, the local part of the e-mail address or
the e-mail address is used in order to log in.
Your configuration requires that this type of login is possible:
- either the user name is used to login and must be used in the e-mail address
entered on the mobile, or
- the entire e-mail address is used to login.
Which option is used has to be configured in the AutoDiscover configuration and
in the underlying platform (e.g. ZCP (hosting mode)).
Most companies use the user name as local part of the e-mail by default. From the
AutoDiscover point of view, it is not required that user is able to receive
e-mails at the used e-mail address. It is recommended allowing that in order not
to confuse end users.
AutoDiscover also requires a valid SSL certificate to work as expected. A very
little percentage of mobiles support self-signed certificates (showing a
pop-up alerting the user). Most mobiles silently ignore self-signed certificates
and just declare the AutoDiscover process as failed in such cases.
If AutoDiscover fails, the user is generally redirected to the "manual
configuration" of the client.
If you do not plan to acquire an official certificate, you will probably not be
able to use the AutoDiscover service.
Depending on your setup, it could be necessary to add new DNS entries for your
mail domain.
Domain setup
------------
There are two general ways the AutoDiscover process can be configured:
1. Directly with "yourdomain.com" website ("www.yourdomain.com" will most
probably not work)
2. With the sub-domain "autodiscover.yourdomain.com"
In both cases, an official SSL certificate is required. If you already have a
certificate for your domain, the webserver answering for that domain could be
reconfigured to allow AutoDiscover requests as well. In the case that you do
not have direct access to this type of configuration (e.g. hosting provider),
it's recommended to acquire a dedicated certificate for
"autodiscover.yourdomain.com". Please note, that this sub-domain can NOT be
renamed. In general, "wildcard" certificates can be used, as long they are
valid for the required domain.
Installation
------------
AutoDiscover is part of the "z-push-autodiscover" RPM package and uses some
of the functionality available in Z-Push.
It is possible to install AutoDiscover on the same host as Z-Push, or to
install them on different hosts.
If you do not want to setup Z-Push on the host, disable the "Alias" for the
ActiveSync configuration in "/etc/httpd/conf.d/z-push.conf".
To setup the SSL certificate, please refer to one of the many setup guides
available on the internet, like that one:
http://www.apache.com/resources/how-to-setup-an-ssl-certificate-on-apache/
The mobiles requests these URLs (where "yourdomain.com" corresponds to the
domain part of the e-mail used in the client):
https://yourdomain.com/Autodiscover/Autodiscover.xml
and/or
https://autodiscover.yourdomain.com/Autodiscover/Autodiscover.xml
Configuration
-------------
There are several parameters in the configuration file, which allow to customize
the behaviour of the AutoDiscover Service.
The configuration is located in the file "/etc/z-push/autodiscover.php".
The parameters:
BASE_PATH This property specifies where the AutoDiscover files are
located. Normally there is no need to adjust this parameter.
SERVERURL This is the full URL where the Z-Push server is available.
You should adjust it to the domain/server where Z-Push is
installed.
USE_FULLEMAIL_FOR_LOGIN If this is set to "true", AutoDiscover will attempt to
login on the collaboration server with the full e-mail
address sent by the client. If disabled (default), the
local part of the e-mail address is used.
LOGFILEDIR The directory where logfiles are created.
LOGFILE The default AutoDiscover log file.
LOGERRORFILE The default AutoDiscover error log file.
LOGLEVEL The loglevel, set it to WBXML to see the data received
and sent from/to clients.
LOGAUTHFAIL Set to true, to explicitly log failed login attempts.
BACKEND_PROVIDER The backend to be used. If empty (default) the code
will auto detect which backend to use.
Please note: The desired backend also needs to be configured, in the
"/etc/z-push/<backend>.php" file.
Test installation
-----------------
If everything is correct, accessing with a browser the URL for your setup, you
should see:
1. a pop-up asking for your username + password. Always use the e-mail
address which you would also enter on the mobile (independently from
the configuration).
2. if the authentication was successful, you will see a Z-Push informational
page (like when accessing the Z-Push location).
Note: The same test can also be performed in the mobiles web browser to check
if the access works correctly from the mobile network.
If the authentication fails, please check the configuration options of AutoDiscover.
Also check the logfiles for possible failures.
If the manual method works, try setting up your mobile phone! :)
--- NEW FILE z-push-autodiscover.conf ---
#
# Z-Push AutoDiscover - ActiveSync over-the-air implementation
#
AliasMatch (?i)/Autodiscover/Autodiscover.xml /usr/share/z-push/autodiscover/autodiscover.php
# If the PHP settings are not set up correctly, login will fail
#
<Directory /usr/share/z-push/>
# Some apache settings
Options -Indexes +FollowSymLinks
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
# Register globals must be off
php_flag register_globals off
# Magic quotes must be off
php_flag magic_quotes_gpc off
php_flag magic_quotes_runtime off
# Short open tags must be on
php_flag short_open_tag on
# Set memory limit to 128 MB
php_value memory_limit 128M
</Directory>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 8 Jul 2014 09:59:49 -0000 1.15
+++ .cvsignore 2 Oct 2015 15:50:44 -0000 1.16
@@ -1,2 +1,2 @@
-z-push-2.1.3-1892.tar.gz
+z-push-2.2.4.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 8 Jul 2014 09:59:49 -0000 1.15
+++ sources 2 Oct 2015 15:50:45 -0000 1.16
@@ -1,2 +1,2 @@
-a5bc26143cf1961988bbff1eb1442d98 z-push-2.1.3-1892.tar.gz
+9ed1a04d122c44b5c03aa8ceb8d79c3d z-push-2.2.4.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push-README.FEDORA
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/z-push-README.FEDORA,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push-README.FEDORA 12 Dec 2013 21:19:50 -0000 1.2
+++ z-push-README.FEDORA 2 Oct 2015 15:50:45 -0000 1.3
@@ -108,11 +108,11 @@
S/MIME
------
-Z-Push supports signing and en-/decrypting of emails on mobile devices since
+Z-Push supports signing and en-/decrypting of e-mails on mobile devices since
the version 2.0.7.
*Important* Currently only Android 4.X and higher and Apple iOS 5 and higher
-devices are known to support encryption/signing of emails.
+devices are known to support encryption/signing of e-mails.
It might be possible that PHP functions require CA information in order to
validate certs. Therefore the CAINFO parameter in the config.php must be
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/z-push.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- z-push.spec 8 Jul 2014 09:59:50 -0000 1.16
+++ z-push.spec 2 Oct 2015 15:50:45 -0000 1.17
@@ -1,18 +1,18 @@
-%global svnrevision 1892
-
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.1.3
+Version: 2.2.4
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
-URL: http://www.z-push.org/
-Source0: http://download.z-push.org/final/2.1/%{name}-%{version}-%{svnrevision}.ta...
+URL: https://z-push.org/
+Source0: http://download.z-push.org/final/2.2/%{name}-%{version}.tar.gz
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
-Source3: z-push.conf
-Source4: z-push.logrotate
-Patch0: z-push-2.1.2-package.patch
+Source3: z-push-autodiscover-README.FEDORA
+Source4: z-push.conf
+Source5: z-push-autodiscover.conf
+Source6: z-push.logrotate
+Patch0: z-push-2.2.4-package.patch
Requires: httpd, php-iconv, php-sysvsem, php-sysvshm
Requires: coreutils, bash, grep, less, php-pcntl
# Bug: php53 from RHEL 5 does not provide php (#717158)
@@ -30,6 +30,20 @@
Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With
Z-Push any groupware can be connected and synced with these devices.
+%package autodiscover
+Summary: Simplify account configuration for ActiveSync users
+Group: Applications/Productivity
+Requires: %{name} = %{version}-%{release}, php-xml >= 5.1.0
+
+%description autodiscover
+The z-push-autodiscover package contains the AutoDiscover service to
+simplify the account configuration for clients, especially for mobile
+phones. While in the past the user was required to enter the server
+name, username and password manually into his mobile phone in order to
+connect, with AutoDiscover the user is only required to fill in his
+e-mail address and the password. AutoDiscover will try several methods
+to reach the correct server automatically.
+
%package combined
Summary: Combines several data backend providers for Z-Push
Group: Applications/Productivity
@@ -89,7 +103,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.1.11
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -100,7 +114,7 @@
install this package.
%prep
-%setup -q -n %{name}-%{version}-%{svnrevision}
+%setup -q -n %{name}-%{version}
%patch0 -p1
%build
@@ -123,29 +137,39 @@
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/autodiscover.php
+ln -sf ../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php
+
# Install the command line utilities
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-admin.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-admin
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-top.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-top
-# Install the apache configuration file
-install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+# Install the apache configuration files
+install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf
# Install the logrotate configuration file
-install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
+install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{autodiscover/INSTALL,composer.json,INSTALL,LICENSE}
+
+# Correct the wrong file permissions
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/syncobjects/syncresolverecipient.php
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
cp -pf %{SOURCE2} README.FEDORA
+cp -pf %{SOURCE3} autodiscover/README.FEDORA
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc LICENSE README.FEDORA permission.pdf
+%{!?_licensedir:%global license %%doc}
+%license LICENSE permission.pdf
+%doc README.FEDORA
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %{_sysconfdir}/%{name}/
@@ -153,6 +177,7 @@
%{_sbindir}/z-push-admin
%{_sbindir}/z-push-top
%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/autodiscover/
%exclude %{_datadir}/%{name}/backend/combined/
%exclude %{_datadir}/%{name}/backend/imap/
%exclude %{_datadir}/%{name}/backend/maildir/
@@ -162,6 +187,13 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/
%attr(-,apache,apache) %dir %{_localstatedir}/log/%{name}/
+%files autodiscover
+%defattr(-,root,root,-)
+%doc autodiscover/README.FEDORA
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf
+%config(noreplace) %{_sysconfdir}/%{name}/autodiscover.php
+%{_datadir}/%{name}/autodiscover/
+
%files combined
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/combined.php
@@ -193,6 +225,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Fri Oct 02 2015 Robert Scheck <robert(a)fedoraproject.org> 2.2.4-1
+- Upgrade to 2.2.4
+
* Mon Jun 30 2014 Robert Scheck <robert(a)fedoraproject.org> 2.1.3-1
- Upgrade to 2.1.3
--- z-push-2.1.2-package.patch DELETED ---
8 years, 6 months
- 1
- 0
rpms/z-push/EL-5 z-push-2.2.4-package.patch, NONE, 1.1 z-push-autodiscover-README.FEDORA, NONE, 1.1 z-push-autodiscover.conf, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 z-push-README.FEDORA, 1.2, 1.3 z-push.spec, 1.17, 1.18 z-push-2.1.2-package.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/EL-5
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27244/EL-5
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.2.4-package.patch z-push-autodiscover-README.FEDORA
z-push-autodiscover.conf
Removed Files:
z-push-2.1.2-package.patch
Log Message:
Upgrade to 2.2.4
z-push-2.2.4-package.patch:
autodiscover/config.php | 17 ++++++++++++++++-
config.php | 21 +++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
5 files changed, 44 insertions(+), 7 deletions(-)
--- NEW FILE z-push-2.2.4-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.2.4, which changes the original
paths from Z-Push upstream to Fedora compliant ones. Additionally, it adds some installation and
configuration hints regarding multiple data backend providers.
--- z-push-2.2.4/config.php 2015-09-30 15:05:38.000000000 +0200
+++ z-push-2.2.4/config.php.package. 2015-10-02 16:41:22.017747249 +0200
@@ -69,6 +69,8 @@
* true - use the complete email address.
*/
define('USE_FULLEMAIL_FOR_LOGIN', false);
+
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -110,6 +112,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -208,19 +211,33 @@
// NOTE: THIS IS AN EXPERIMENTAL FEATURE WHICH COULD PREVENT YOUR MOBILES FROM SYNCHRONIZING.
define('USE_PARTIAL_FOLDERSYNC', false);
+
/**********************************************************************************
* Backend settings
+ *
+ * Z-Push supports currently the data backend providers Zarafa, IMAP, vCard directory,
+ * Maildir and a mixture by the combined one. Ensure that the used backend is installed
+ * and proper configured as well:
+ * BackendZarafa - configure /etc/z-push/zarafa.php (provided by z-push-zarafa)
+ * BackendCombined - configure /etc/z-push/combined.php (provided by z-push-combined)
+ * and of course the wanted (at least two) other backend providers
+ * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap)
+ * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir)
+ * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir)
+ * If only one data backend provider has been installed, that one is used by default.
+ * In case of multiple installed data backend providers, they are tried in order above.
*/
- // the backend data provider
+ // The backend data provider
define('BACKEND_PROVIDER', '');
+
/**********************************************************************************
* Search provider settings
*
* Alternative backend to perform SEARCH requests (GAL search)
* By default the main Backend defines the preferred search functionality.
* If set, the Search Provider will always be preferred.
- * Use 'BackendSearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
+ * Use 'BackendSearchLDAP' to search in a LDAP directory (see /etc/z-push/searchldap.php)
*/
define('SEARCH_PROVIDER', '');
// Time in seconds for the server search. Setting it too high might result in timeout.
--- z-push-2.2.4/z-push-admin.php 2015-09-30 19:10:45.000000000 +0200
+++ z-push-2.2.4/z-push-admin.php.package 2015-10-02 16:41:57.955453602 +0200
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
include('lib/core/stateobject.php');
@@ -103,8 +107,6 @@
/************************************************
* MAIN
*/
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
- set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
try {
ZPush::CheckConfig();
ZPushAdminCLI::CheckEnv();
--- z-push-2.2.4/z-push-top.php 2015-09-30 19:10:44.000000000 +0200
+++ z-push-2.2.4/z-push-top.php.package 2015-10-02 16:42:27.440212676 +0200
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/exceptions/exceptions.php');
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
@@ -61,7 +65,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php 2015-09-30 19:10:45.000000000 +0200
+++ z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php.package 2015-10-02 16:42:51.376017089 +0200
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../src");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
--- z-push-2.2.4/autodiscover/config.php 2015-09-30 15:05:39.000000000 +0200
+++ z-push-2.2.4/autodiscover/config.php.package 2015-10-02 17:02:20.586475499 +0200
@@ -59,6 +59,7 @@
*/
define('USE_FULLEMAIL_FOR_LOGIN', false);
+
/**********************************************************************************
* Logging settings
* Possible LOGLEVEL and LOGUSERLEVEL values are:
@@ -81,9 +82,23 @@
define('LOGERRORFILE', LOGFILEDIR . 'autodiscover-error.log');
define('LOGLEVEL', LOGLEVEL_INFO);
define('LOGUSERLEVEL', LOGLEVEL);
+
+
/**********************************************************************************
* Backend settings
+ *
+ * Z-Push supports currently the data backend providers Zarafa, IMAP, vCard directory,
+ * Maildir and a mixture by the combined one. Ensure that the used backend is installed
+ * and proper configured as well:
+ * BackendZarafa - configure /etc/z-push/zarafa.php (provided by z-push-zarafa)
+ * BackendCombined - configure /etc/z-push/combined.php (provided by z-push-combined)
+ * and of course the wanted (at least two) other backend providers
+ * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap)
+ * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir)
+ * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir)
+ * If only one data backend provider has been installed, that one is used by default.
+ * In case of multiple installed data backend providers, they are tried in order above.
*/
- // the backend data provider
+ // The backend data provider
define('BACKEND_PROVIDER', '');
?>
\ No newline at end of file
--- NEW FILE z-push-autodiscover-README.FEDORA ---
Z-Push AutoDiscover manual
==========================
Introduction
------------
AutoDiscover is the service used to simplify the configuration of collaboration
accounts for clients, especially for mobile phones.
While in the past the user was required to enter the server name, user name and
password manually into his mobile phone in order to connect, with AutoDiscover
the user is only required to fill in his e-mail address and the password.
AutoDiscover will try several methods to reach the correct server automatically.
How does it work?
-----------------
When speaking about AutoDiscover, this includes two distinct realms:
- AutoDiscover is a specification which defines the steps a client should take
in order to contact a service to request additional data.
- The AutoDiscover service is piece of software which accepts requests from the
clients, authenticates them, requests some additional data from the
collaboration server and sends this data back to the client.
The specification suggests several ways for client to contact the responsible
server to receive additional information. Tests have shown, that basically all
mobile phones tested support only the most basic ways. These are sufficient for
almost all types of scenarios and are the ones implemented by Z-Push AutoDiscover.
Please refer to the Mobile Compatibility List (http://z-push.sf.net/compatibility)
for an overview of supported and tested devices.
The used e-mail address is the key for the process. The client splits it up into
the local and domain part (before and after the @-sign). The client then tries
to connect to this domain in order to get in contact with the AutoDiscover
service. The local part of the e-mail address is used as "login" to the
AutoDiscover service. There is also an option, to use the full e-mail address as
login name (see "Configuration" section below for details).
---------------
| Client |
| e.g. mobile |
---------------
/ \
1. Searches for / \ 2. Data access
information / \
/ \
V V
---------------- --------------
| AutoDiscover | redirects to | Z-Push |
| | --------------------> | ActiveSync |
---------------- --------------
\ /
Authen- \ / Synchronizes
ticates \ /
via Z-Push \ /
Backend V V
-----------------
| Collaboration |
| Platform |
-----------------
Requirements
------------
As described in the previous chapter, the local part of the e-mail address or
the e-mail address is used in order to log in.
Your configuration requires that this type of login is possible:
- either the user name is used to login and must be used in the e-mail address
entered on the mobile, or
- the entire e-mail address is used to login.
Which option is used has to be configured in the AutoDiscover configuration and
in the underlying platform (e.g. ZCP (hosting mode)).
Most companies use the user name as local part of the e-mail by default. From the
AutoDiscover point of view, it is not required that user is able to receive
e-mails at the used e-mail address. It is recommended allowing that in order not
to confuse end users.
AutoDiscover also requires a valid SSL certificate to work as expected. A very
little percentage of mobiles support self-signed certificates (showing a
pop-up alerting the user). Most mobiles silently ignore self-signed certificates
and just declare the AutoDiscover process as failed in such cases.
If AutoDiscover fails, the user is generally redirected to the "manual
configuration" of the client.
If you do not plan to acquire an official certificate, you will probably not be
able to use the AutoDiscover service.
Depending on your setup, it could be necessary to add new DNS entries for your
mail domain.
Domain setup
------------
There are two general ways the AutoDiscover process can be configured:
1. Directly with "yourdomain.com" website ("www.yourdomain.com" will most
probably not work)
2. With the sub-domain "autodiscover.yourdomain.com"
In both cases, an official SSL certificate is required. If you already have a
certificate for your domain, the webserver answering for that domain could be
reconfigured to allow AutoDiscover requests as well. In the case that you do
not have direct access to this type of configuration (e.g. hosting provider),
it's recommended to acquire a dedicated certificate for
"autodiscover.yourdomain.com". Please note, that this sub-domain can NOT be
renamed. In general, "wildcard" certificates can be used, as long they are
valid for the required domain.
Installation
------------
AutoDiscover is part of the "z-push-autodiscover" RPM package and uses some
of the functionality available in Z-Push.
It is possible to install AutoDiscover on the same host as Z-Push, or to
install them on different hosts.
If you do not want to setup Z-Push on the host, disable the "Alias" for the
ActiveSync configuration in "/etc/httpd/conf.d/z-push.conf".
To setup the SSL certificate, please refer to one of the many setup guides
available on the internet, like that one:
http://www.apache.com/resources/how-to-setup-an-ssl-certificate-on-apache/
The mobiles requests these URLs (where "yourdomain.com" corresponds to the
domain part of the e-mail used in the client):
https://yourdomain.com/Autodiscover/Autodiscover.xml
and/or
https://autodiscover.yourdomain.com/Autodiscover/Autodiscover.xml
Configuration
-------------
There are several parameters in the configuration file, which allow to customize
the behaviour of the AutoDiscover Service.
The configuration is located in the file "/etc/z-push/autodiscover.php".
The parameters:
BASE_PATH This property specifies where the AutoDiscover files are
located. Normally there is no need to adjust this parameter.
SERVERURL This is the full URL where the Z-Push server is available.
You should adjust it to the domain/server where Z-Push is
installed.
USE_FULLEMAIL_FOR_LOGIN If this is set to "true", AutoDiscover will attempt to
login on the collaboration server with the full e-mail
address sent by the client. If disabled (default), the
local part of the e-mail address is used.
LOGFILEDIR The directory where logfiles are created.
LOGFILE The default AutoDiscover log file.
LOGERRORFILE The default AutoDiscover error log file.
LOGLEVEL The loglevel, set it to WBXML to see the data received
and sent from/to clients.
LOGAUTHFAIL Set to true, to explicitly log failed login attempts.
BACKEND_PROVIDER The backend to be used. If empty (default) the code
will auto detect which backend to use.
Please note: The desired backend also needs to be configured, in the
"/etc/z-push/<backend>.php" file.
Test installation
-----------------
If everything is correct, accessing with a browser the URL for your setup, you
should see:
1. a pop-up asking for your username + password. Always use the e-mail
address which you would also enter on the mobile (independently from
the configuration).
2. if the authentication was successful, you will see a Z-Push informational
page (like when accessing the Z-Push location).
Note: The same test can also be performed in the mobiles web browser to check
if the access works correctly from the mobile network.
If the authentication fails, please check the configuration options of AutoDiscover.
Also check the logfiles for possible failures.
If the manual method works, try setting up your mobile phone! :)
--- NEW FILE z-push-autodiscover.conf ---
#
# Z-Push AutoDiscover - ActiveSync over-the-air implementation
#
AliasMatch (?i)/Autodiscover/Autodiscover.xml /usr/share/z-push/autodiscover/autodiscover.php
# If the PHP settings are not set up correctly, login will fail
#
<Directory /usr/share/z-push/>
# Some apache settings
Options -Indexes +FollowSymLinks
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
# Register globals must be off
php_flag register_globals off
# Magic quotes must be off
php_flag magic_quotes_gpc off
php_flag magic_quotes_runtime off
# Short open tags must be on
php_flag short_open_tag on
# Set memory limit to 128 MB
php_value memory_limit 128M
</Directory>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 8 Jul 2014 09:59:49 -0000 1.15
+++ .cvsignore 2 Oct 2015 15:50:44 -0000 1.16
@@ -1,2 +1,2 @@
-z-push-2.1.3-1892.tar.gz
+z-push-2.2.4.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 8 Jul 2014 09:59:49 -0000 1.15
+++ sources 2 Oct 2015 15:50:44 -0000 1.16
@@ -1,2 +1,2 @@
-a5bc26143cf1961988bbff1eb1442d98 z-push-2.1.3-1892.tar.gz
+9ed1a04d122c44b5c03aa8ceb8d79c3d z-push-2.2.4.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push-README.FEDORA
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/z-push-README.FEDORA,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push-README.FEDORA 12 Dec 2013 21:19:50 -0000 1.2
+++ z-push-README.FEDORA 2 Oct 2015 15:50:44 -0000 1.3
@@ -108,11 +108,11 @@
S/MIME
------
-Z-Push supports signing and en-/decrypting of emails on mobile devices since
+Z-Push supports signing and en-/decrypting of e-mails on mobile devices since
the version 2.0.7.
*Important* Currently only Android 4.X and higher and Apple iOS 5 and higher
-devices are known to support encryption/signing of emails.
+devices are known to support encryption/signing of e-mails.
It might be possible that PHP functions require CA information in order to
validate certs. Therefore the CAINFO parameter in the config.php must be
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/z-push.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- z-push.spec 8 Jul 2014 09:59:49 -0000 1.17
+++ z-push.spec 2 Oct 2015 15:50:44 -0000 1.18
@@ -1,18 +1,18 @@
-%global svnrevision 1892
-
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.1.3
+Version: 2.2.4
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
-URL: http://www.z-push.org/
-Source0: http://download.z-push.org/final/2.1/%{name}-%{version}-%{svnrevision}.ta...
+URL: https://z-push.org/
+Source0: http://download.z-push.org/final/2.2/%{name}-%{version}.tar.gz
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
-Source3: z-push.conf
-Source4: z-push.logrotate
-Patch0: z-push-2.1.2-package.patch
+Source3: z-push-autodiscover-README.FEDORA
+Source4: z-push.conf
+Source5: z-push-autodiscover.conf
+Source6: z-push.logrotate
+Patch0: z-push-2.2.4-package.patch
Requires: httpd, php-iconv, php-sysvsem, php-sysvshm
Requires: coreutils, bash, grep, less, php-pcntl
# Bug: php53 from RHEL 5 does not provide php (#717158)
@@ -30,6 +30,20 @@
Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With
Z-Push any groupware can be connected and synced with these devices.
+%package autodiscover
+Summary: Simplify account configuration for ActiveSync users
+Group: Applications/Productivity
+Requires: %{name} = %{version}-%{release}, php-xml >= 5.1.0
+
+%description autodiscover
+The z-push-autodiscover package contains the AutoDiscover service to
+simplify the account configuration for clients, especially for mobile
+phones. While in the past the user was required to enter the server
+name, username and password manually into his mobile phone in order to
+connect, with AutoDiscover the user is only required to fill in his
+e-mail address and the password. AutoDiscover will try several methods
+to reach the correct server automatically.
+
%package combined
Summary: Combines several data backend providers for Z-Push
Group: Applications/Productivity
@@ -89,7 +103,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.1.11
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -100,7 +114,7 @@
install this package.
%prep
-%setup -q -n %{name}-%{version}-%{svnrevision}
+%setup -q -n %{name}-%{version}
%patch0 -p1
%build
@@ -123,29 +137,39 @@
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/autodiscover.php
+ln -sf ../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php
+
# Install the command line utilities
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-admin.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-admin
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-top.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-top
-# Install the apache configuration file
-install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+# Install the apache configuration files
+install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf
# Install the logrotate configuration file
-install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
+install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{autodiscover/INSTALL,composer.json,INSTALL,LICENSE}
+
+# Correct the wrong file permissions
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/syncobjects/syncresolverecipient.php
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
cp -pf %{SOURCE2} README.FEDORA
+cp -pf %{SOURCE3} autodiscover/README.FEDORA
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc LICENSE README.FEDORA permission.pdf
+%{!?_licensedir:%global license %%doc}
+%license LICENSE permission.pdf
+%doc README.FEDORA
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %{_sysconfdir}/%{name}/
@@ -153,6 +177,7 @@
%{_sbindir}/z-push-admin
%{_sbindir}/z-push-top
%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/autodiscover/
%exclude %{_datadir}/%{name}/backend/combined/
%exclude %{_datadir}/%{name}/backend/imap/
%exclude %{_datadir}/%{name}/backend/maildir/
@@ -162,6 +187,13 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/
%attr(-,apache,apache) %dir %{_localstatedir}/log/%{name}/
+%files autodiscover
+%defattr(-,root,root,-)
+%doc autodiscover/README.FEDORA
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf
+%config(noreplace) %{_sysconfdir}/%{name}/autodiscover.php
+%{_datadir}/%{name}/autodiscover/
+
%files combined
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/combined.php
@@ -193,6 +225,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Fri Oct 02 2015 Robert Scheck <robert(a)fedoraproject.org> 2.2.4-1
+- Upgrade to 2.2.4
+
* Mon Jun 30 2014 Robert Scheck <robert(a)fedoraproject.org> 2.1.3-1
- Upgrade to 2.1.3
--- z-push-2.1.2-package.patch DELETED ---
8 years, 6 months
- 1
- 0
rpms/z-push/devel z-push-2.2.4-package.patch, NONE, 1.1 z-push-autodiscover-README.FEDORA, NONE, 1.1 z-push-autodiscover.conf, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 z-push-README.FEDORA, 1.2, 1.3 z-push.spec, 1.18, 1.19 z-push-2.1.2-package.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27244/devel
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.2.4-package.patch z-push-autodiscover-README.FEDORA
z-push-autodiscover.conf
Removed Files:
z-push-2.1.2-package.patch
Log Message:
Upgrade to 2.2.4
z-push-2.2.4-package.patch:
autodiscover/config.php | 17 ++++++++++++++++-
config.php | 21 +++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
5 files changed, 44 insertions(+), 7 deletions(-)
--- NEW FILE z-push-2.2.4-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.2.4, which changes the original
paths from Z-Push upstream to Fedora compliant ones. Additionally, it adds some installation and
configuration hints regarding multiple data backend providers.
--- z-push-2.2.4/config.php 2015-09-30 15:05:38.000000000 +0200
+++ z-push-2.2.4/config.php.package. 2015-10-02 16:41:22.017747249 +0200
@@ -69,6 +69,8 @@
* true - use the complete email address.
*/
define('USE_FULLEMAIL_FOR_LOGIN', false);
+
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -110,6 +112,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -208,19 +211,33 @@
// NOTE: THIS IS AN EXPERIMENTAL FEATURE WHICH COULD PREVENT YOUR MOBILES FROM SYNCHRONIZING.
define('USE_PARTIAL_FOLDERSYNC', false);
+
/**********************************************************************************
* Backend settings
+ *
+ * Z-Push supports currently the data backend providers Zarafa, IMAP, vCard directory,
+ * Maildir and a mixture by the combined one. Ensure that the used backend is installed
+ * and proper configured as well:
+ * BackendZarafa - configure /etc/z-push/zarafa.php (provided by z-push-zarafa)
+ * BackendCombined - configure /etc/z-push/combined.php (provided by z-push-combined)
+ * and of course the wanted (at least two) other backend providers
+ * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap)
+ * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir)
+ * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir)
+ * If only one data backend provider has been installed, that one is used by default.
+ * In case of multiple installed data backend providers, they are tried in order above.
*/
- // the backend data provider
+ // The backend data provider
define('BACKEND_PROVIDER', '');
+
/**********************************************************************************
* Search provider settings
*
* Alternative backend to perform SEARCH requests (GAL search)
* By default the main Backend defines the preferred search functionality.
* If set, the Search Provider will always be preferred.
- * Use 'BackendSearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
+ * Use 'BackendSearchLDAP' to search in a LDAP directory (see /etc/z-push/searchldap.php)
*/
define('SEARCH_PROVIDER', '');
// Time in seconds for the server search. Setting it too high might result in timeout.
--- z-push-2.2.4/z-push-admin.php 2015-09-30 19:10:45.000000000 +0200
+++ z-push-2.2.4/z-push-admin.php.package 2015-10-02 16:41:57.955453602 +0200
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
include('lib/core/stateobject.php');
@@ -103,8 +107,6 @@
/************************************************
* MAIN
*/
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
- set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
try {
ZPush::CheckConfig();
ZPushAdminCLI::CheckEnv();
--- z-push-2.2.4/z-push-top.php 2015-09-30 19:10:44.000000000 +0200
+++ z-push-2.2.4/z-push-top.php.package 2015-10-02 16:42:27.440212676 +0200
@@ -44,6 +44,10 @@
* Consult LICENSE file for details
************************************************/
+// Script stays in /usr/sbin and is not a symlink to /usr/share/z-push
+define('BASE_PATH_CLI', "/usr/share/z-push/");
+set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH_CLI);
+
include('lib/exceptions/exceptions.php');
include('lib/core/zpushdefs.php');
include('lib/core/zpush.php');
@@ -61,7 +65,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php 2015-09-30 19:10:45.000000000 +0200
+++ z-push-2.2.4/tools/migrate-2.0.x-2.1.0.php.package 2015-10-02 16:42:51.376017089 +0200
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../src");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
--- z-push-2.2.4/autodiscover/config.php 2015-09-30 15:05:39.000000000 +0200
+++ z-push-2.2.4/autodiscover/config.php.package 2015-10-02 17:02:20.586475499 +0200
@@ -59,6 +59,7 @@
*/
define('USE_FULLEMAIL_FOR_LOGIN', false);
+
/**********************************************************************************
* Logging settings
* Possible LOGLEVEL and LOGUSERLEVEL values are:
@@ -81,9 +82,23 @@
define('LOGERRORFILE', LOGFILEDIR . 'autodiscover-error.log');
define('LOGLEVEL', LOGLEVEL_INFO);
define('LOGUSERLEVEL', LOGLEVEL);
+
+
/**********************************************************************************
* Backend settings
+ *
+ * Z-Push supports currently the data backend providers Zarafa, IMAP, vCard directory,
+ * Maildir and a mixture by the combined one. Ensure that the used backend is installed
+ * and proper configured as well:
+ * BackendZarafa - configure /etc/z-push/zarafa.php (provided by z-push-zarafa)
+ * BackendCombined - configure /etc/z-push/combined.php (provided by z-push-combined)
+ * and of course the wanted (at least two) other backend providers
+ * BackendIMAP - configure /etc/z-push/imap.php (provided by z-push-imap)
+ * BackendVCardDir - configure /etc/z-push/vcarddir.php (provided by z-push-vcarddir)
+ * BackendMaildir - configure /etc/z-push/maildir.php (provided by z-push-maildir)
+ * If only one data backend provider has been installed, that one is used by default.
+ * In case of multiple installed data backend providers, they are tried in order above.
*/
- // the backend data provider
+ // The backend data provider
define('BACKEND_PROVIDER', '');
?>
\ No newline at end of file
--- NEW FILE z-push-autodiscover-README.FEDORA ---
Z-Push AutoDiscover manual
==========================
Introduction
------------
AutoDiscover is the service used to simplify the configuration of collaboration
accounts for clients, especially for mobile phones.
While in the past the user was required to enter the server name, user name and
password manually into his mobile phone in order to connect, with AutoDiscover
the user is only required to fill in his e-mail address and the password.
AutoDiscover will try several methods to reach the correct server automatically.
How does it work?
-----------------
When speaking about AutoDiscover, this includes two distinct realms:
- AutoDiscover is a specification which defines the steps a client should take
in order to contact a service to request additional data.
- The AutoDiscover service is piece of software which accepts requests from the
clients, authenticates them, requests some additional data from the
collaboration server and sends this data back to the client.
The specification suggests several ways for client to contact the responsible
server to receive additional information. Tests have shown, that basically all
mobile phones tested support only the most basic ways. These are sufficient for
almost all types of scenarios and are the ones implemented by Z-Push AutoDiscover.
Please refer to the Mobile Compatibility List (http://z-push.sf.net/compatibility)
for an overview of supported and tested devices.
The used e-mail address is the key for the process. The client splits it up into
the local and domain part (before and after the @-sign). The client then tries
to connect to this domain in order to get in contact with the AutoDiscover
service. The local part of the e-mail address is used as "login" to the
AutoDiscover service. There is also an option, to use the full e-mail address as
login name (see "Configuration" section below for details).
---------------
| Client |
| e.g. mobile |
---------------
/ \
1. Searches for / \ 2. Data access
information / \
/ \
V V
---------------- --------------
| AutoDiscover | redirects to | Z-Push |
| | --------------------> | ActiveSync |
---------------- --------------
\ /
Authen- \ / Synchronizes
ticates \ /
via Z-Push \ /
Backend V V
-----------------
| Collaboration |
| Platform |
-----------------
Requirements
------------
As described in the previous chapter, the local part of the e-mail address or
the e-mail address is used in order to log in.
Your configuration requires that this type of login is possible:
- either the user name is used to login and must be used in the e-mail address
entered on the mobile, or
- the entire e-mail address is used to login.
Which option is used has to be configured in the AutoDiscover configuration and
in the underlying platform (e.g. ZCP (hosting mode)).
Most companies use the user name as local part of the e-mail by default. From the
AutoDiscover point of view, it is not required that user is able to receive
e-mails at the used e-mail address. It is recommended allowing that in order not
to confuse end users.
AutoDiscover also requires a valid SSL certificate to work as expected. A very
little percentage of mobiles support self-signed certificates (showing a
pop-up alerting the user). Most mobiles silently ignore self-signed certificates
and just declare the AutoDiscover process as failed in such cases.
If AutoDiscover fails, the user is generally redirected to the "manual
configuration" of the client.
If you do not plan to acquire an official certificate, you will probably not be
able to use the AutoDiscover service.
Depending on your setup, it could be necessary to add new DNS entries for your
mail domain.
Domain setup
------------
There are two general ways the AutoDiscover process can be configured:
1. Directly with "yourdomain.com" website ("www.yourdomain.com" will most
probably not work)
2. With the sub-domain "autodiscover.yourdomain.com"
In both cases, an official SSL certificate is required. If you already have a
certificate for your domain, the webserver answering for that domain could be
reconfigured to allow AutoDiscover requests as well. In the case that you do
not have direct access to this type of configuration (e.g. hosting provider),
it's recommended to acquire a dedicated certificate for
"autodiscover.yourdomain.com". Please note, that this sub-domain can NOT be
renamed. In general, "wildcard" certificates can be used, as long they are
valid for the required domain.
Installation
------------
AutoDiscover is part of the "z-push-autodiscover" RPM package and uses some
of the functionality available in Z-Push.
It is possible to install AutoDiscover on the same host as Z-Push, or to
install them on different hosts.
If you do not want to setup Z-Push on the host, disable the "Alias" for the
ActiveSync configuration in "/etc/httpd/conf.d/z-push.conf".
To setup the SSL certificate, please refer to one of the many setup guides
available on the internet, like that one:
http://www.apache.com/resources/how-to-setup-an-ssl-certificate-on-apache/
The mobiles requests these URLs (where "yourdomain.com" corresponds to the
domain part of the e-mail used in the client):
https://yourdomain.com/Autodiscover/Autodiscover.xml
and/or
https://autodiscover.yourdomain.com/Autodiscover/Autodiscover.xml
Configuration
-------------
There are several parameters in the configuration file, which allow to customize
the behaviour of the AutoDiscover Service.
The configuration is located in the file "/etc/z-push/autodiscover.php".
The parameters:
BASE_PATH This property specifies where the AutoDiscover files are
located. Normally there is no need to adjust this parameter.
SERVERURL This is the full URL where the Z-Push server is available.
You should adjust it to the domain/server where Z-Push is
installed.
USE_FULLEMAIL_FOR_LOGIN If this is set to "true", AutoDiscover will attempt to
login on the collaboration server with the full e-mail
address sent by the client. If disabled (default), the
local part of the e-mail address is used.
LOGFILEDIR The directory where logfiles are created.
LOGFILE The default AutoDiscover log file.
LOGERRORFILE The default AutoDiscover error log file.
LOGLEVEL The loglevel, set it to WBXML to see the data received
and sent from/to clients.
LOGAUTHFAIL Set to true, to explicitly log failed login attempts.
BACKEND_PROVIDER The backend to be used. If empty (default) the code
will auto detect which backend to use.
Please note: The desired backend also needs to be configured, in the
"/etc/z-push/<backend>.php" file.
Test installation
-----------------
If everything is correct, accessing with a browser the URL for your setup, you
should see:
1. a pop-up asking for your username + password. Always use the e-mail
address which you would also enter on the mobile (independently from
the configuration).
2. if the authentication was successful, you will see a Z-Push informational
page (like when accessing the Z-Push location).
Note: The same test can also be performed in the mobiles web browser to check
if the access works correctly from the mobile network.
If the authentication fails, please check the configuration options of AutoDiscover.
Also check the logfiles for possible failures.
If the manual method works, try setting up your mobile phone! :)
--- NEW FILE z-push-autodiscover.conf ---
#
# Z-Push AutoDiscover - ActiveSync over-the-air implementation
#
AliasMatch (?i)/Autodiscover/Autodiscover.xml /usr/share/z-push/autodiscover/autodiscover.php
# If the PHP settings are not set up correctly, login will fail
#
<Directory /usr/share/z-push/>
# Some apache settings
Options -Indexes +FollowSymLinks
<IfModule mod_authz_core.c>
# Apache 2.4
Require all granted
</IfModule>
<IfModule !mod_authz_core.c>
# Apache 2.2
Order allow,deny
Allow from all
</IfModule>
# Register globals must be off
php_flag register_globals off
# Magic quotes must be off
php_flag magic_quotes_gpc off
php_flag magic_quotes_runtime off
# Short open tags must be on
php_flag short_open_tag on
# Set memory limit to 128 MB
php_value memory_limit 128M
</Directory>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 8 Jul 2014 10:00:26 -0000 1.15
+++ .cvsignore 2 Oct 2015 15:50:45 -0000 1.16
@@ -1,2 +1,2 @@
-z-push-2.1.3-1892.tar.gz
+z-push-2.2.4.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 8 Jul 2014 10:00:26 -0000 1.15
+++ sources 2 Oct 2015 15:50:45 -0000 1.16
@@ -1,2 +1,2 @@
-a5bc26143cf1961988bbff1eb1442d98 z-push-2.1.3-1892.tar.gz
+9ed1a04d122c44b5c03aa8ceb8d79c3d z-push-2.2.4.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push-README.FEDORA
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push-README.FEDORA,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- z-push-README.FEDORA 12 Dec 2013 21:19:51 -0000 1.2
+++ z-push-README.FEDORA 2 Oct 2015 15:50:45 -0000 1.3
@@ -108,11 +108,11 @@
S/MIME
------
-Z-Push supports signing and en-/decrypting of emails on mobile devices since
+Z-Push supports signing and en-/decrypting of e-mails on mobile devices since
the version 2.0.7.
*Important* Currently only Android 4.X and higher and Apple iOS 5 and higher
-devices are known to support encryption/signing of emails.
+devices are known to support encryption/signing of e-mails.
It might be possible that PHP functions require CA information in order to
validate certs. Therefore the CAINFO parameter in the config.php must be
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- z-push.spec 8 Jul 2014 10:00:26 -0000 1.18
+++ z-push.spec 2 Oct 2015 15:50:45 -0000 1.19
@@ -1,18 +1,18 @@
-%global svnrevision 1892
-
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.1.3
+Version: 2.2.4
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
-URL: http://www.z-push.org/
-Source0: http://download.z-push.org/final/2.1/%{name}-%{version}-%{svnrevision}.ta...
+URL: https://z-push.org/
+Source0: http://download.z-push.org/final/2.2/%{name}-%{version}.tar.gz
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
-Source3: z-push.conf
-Source4: z-push.logrotate
-Patch0: z-push-2.1.2-package.patch
+Source3: z-push-autodiscover-README.FEDORA
+Source4: z-push.conf
+Source5: z-push-autodiscover.conf
+Source6: z-push.logrotate
+Patch0: z-push-2.2.4-package.patch
Requires: httpd, php-iconv, php-sysvsem, php-sysvshm
Requires: coreutils, bash, grep, less, php-pcntl
# Bug: php53 from RHEL 5 does not provide php (#717158)
@@ -30,6 +30,20 @@
Mobile, Android, iPhone, Sony Ericsson and Nokia mobile devices. With
Z-Push any groupware can be connected and synced with these devices.
+%package autodiscover
+Summary: Simplify account configuration for ActiveSync users
+Group: Applications/Productivity
+Requires: %{name} = %{version}-%{release}, php-xml >= 5.1.0
+
+%description autodiscover
+The z-push-autodiscover package contains the AutoDiscover service to
+simplify the account configuration for clients, especially for mobile
+phones. While in the past the user was required to enter the server
+name, username and password manually into his mobile phone in order to
+connect, with AutoDiscover the user is only required to fill in his
+e-mail address and the password. AutoDiscover will try several methods
+to reach the correct server automatically.
+
%package combined
Summary: Combines several data backend providers for Z-Push
Group: Applications/Productivity
@@ -89,7 +103,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.1.11
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -100,7 +114,7 @@
install this package.
%prep
-%setup -q -n %{name}-%{version}-%{svnrevision}
+%setup -q -n %{name}-%{version}
%patch0 -p1
%build
@@ -123,29 +137,39 @@
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
+mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/autodiscover.php
+ln -sf ../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/autodiscover/config.php
+
# Install the command line utilities
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-admin.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-admin
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}-top.php $RPM_BUILD_ROOT%{_sbindir}/%{name}-top
-# Install the apache configuration file
-install -D -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+# Install the apache configuration files
+install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -D -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf
# Install the logrotate configuration file
-install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
+install -D -p -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{autodiscover/INSTALL,composer.json,INSTALL,LICENSE}
+
+# Correct the wrong file permissions
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/%{name}/lib/syncobjects/syncresolverecipient.php
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
cp -pf %{SOURCE2} README.FEDORA
+cp -pf %{SOURCE3} autodiscover/README.FEDORA
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc LICENSE README.FEDORA permission.pdf
+%{!?_licensedir:%global license %%doc}
+%license LICENSE permission.pdf
+%doc README.FEDORA
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%dir %{_sysconfdir}/%{name}/
@@ -153,6 +177,7 @@
%{_sbindir}/z-push-admin
%{_sbindir}/z-push-top
%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/autodiscover/
%exclude %{_datadir}/%{name}/backend/combined/
%exclude %{_datadir}/%{name}/backend/imap/
%exclude %{_datadir}/%{name}/backend/maildir/
@@ -162,6 +187,13 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}/
%attr(-,apache,apache) %dir %{_localstatedir}/log/%{name}/
+%files autodiscover
+%defattr(-,root,root,-)
+%doc autodiscover/README.FEDORA
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-autodiscover.conf
+%config(noreplace) %{_sysconfdir}/%{name}/autodiscover.php
+%{_datadir}/%{name}/autodiscover/
+
%files combined
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/%{name}/combined.php
@@ -193,6 +225,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Fri Oct 02 2015 Robert Scheck <robert(a)fedoraproject.org> 2.2.4-1
+- Upgrade to 2.2.4
+
* Mon Jun 30 2014 Robert Scheck <robert(a)fedoraproject.org> 2.1.3-1
- Upgrade to 2.1.3
--- z-push-2.1.2-package.patch DELETED ---
8 years, 6 months
- 1
- 0
rpms/qmc2/devel .cvsignore, 1.40, 1.41 qmc2.spec, 1.54, 1.55 sources, 1.40, 1.41
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3741
Modified Files:
.cvsignore qmc2.spec sources
Log Message:
* Thu Oct 01 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.56-1
- Updated to 0.56
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore 29 Aug 2015 04:31:55 -0000 1.40
+++ .cvsignore 1 Oct 2015 17:29:36 -0000 1.41
@@ -1 +1 @@
-qmc2-0.55.tar.bz2
+qmc2-0.56.tar.bz2
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- qmc2.spec 29 Aug 2015 04:31:56 -0000 1.54
+++ qmc2.spec 1 Oct 2015 17:29:36 -0000 1.55
@@ -1,5 +1,5 @@
Name: qmc2
-Version: 0.55
+Version: 0.56
Release: 1%{?dist}
Summary: M.A.M.E. Catalog / Launcher II
@@ -87,6 +87,9 @@
%changelog
+* Thu Oct 01 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.56-1
+- Updated to 0.56
+
* Sat Aug 29 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.55-1
- Updated to 0.55
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources 29 Aug 2015 04:31:56 -0000 1.40
+++ sources 1 Oct 2015 17:29:36 -0000 1.41
@@ -1 +1 @@
-d20e937e00e122bb9212ba8e352b8135 qmc2-0.55.tar.bz2
+e3b4ae78239bc83c7f811e7fc8ad60ad qmc2-0.56.tar.bz2
8 years, 6 months
- 1
- 0
rpms/mame/devel .cvsignore, 1.91, 1.92 mame.spec, 1.119, 1.120 sources, 1.91, 1.92 0001-emudummy.c-change-GAME_NO_SOUND-to-MACHINE_.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3011
Modified Files:
.cvsignore mame.spec sources
Removed Files:
0001-emudummy.c-change-GAME_NO_SOUND-to-MACHINE_.patch
Log Message:
* Thu Oct 01 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.166-1
- Updated to 0.166
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- .cvsignore 29 Aug 2015 04:33:51 -0000 1.91
+++ .cvsignore 1 Oct 2015 16:43:54 -0000 1.92
@@ -1,2 +1,2 @@
-mame0165s.exe
+mame0166s.exe
whatsnew.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- mame.spec 5 Sep 2015 20:40:05 -0000 1.119
+++ mame.spec 1 Oct 2015 16:43:55 -0000 1.120
@@ -5,7 +5,7 @@
%bcond_with debug
%bcond_with simd
-%global baseversion 165
+%global baseversion 166
# work around low memory on the RPM Fusion builder
%bcond_without lowmem
@@ -23,7 +23,6 @@
Source0: http://mamedev.org/downloader.php?file=%{name}0%{baseversion}/%{name}0%{b...
Source100: whatsnew.zip
Patch0: %{name}-fortify.patch
-Patch1: 0001-emudummy.c-change-GAME_NO_SOUND-to-MACHINE_.patch
Patch2: %{name}-genie-smpfix.patch
BuildRequires: expat-devel
@@ -126,7 +125,6 @@
-o -wholename ./makefile \) -exec sed -i 's@\r@@' {} \;
%patch0 -p1 -b .fortify
-%patch1 -p1
%patch2 -p1 -b .smpfix
# Fix encoding
@@ -322,6 +320,9 @@
%changelog
+* Thu Oct 01 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.166-1
+- Updated to 0.166
+
* Thu Aug 27 2015 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.165-1
- Updated to 0.165
- Updated the smpfix patch
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- sources 29 Aug 2015 04:33:51 -0000 1.91
+++ sources 1 Oct 2015 16:43:55 -0000 1.92
@@ -1,2 +1,2 @@
-7573cc953d865602bfe9c60303e3a793 mame0165s.exe
-fbe0884984ccaa01cd51ef70426c052b whatsnew.zip
+22197b7a2255d6ec8be92eecd0ebdf0c mame0166s.exe
+ac46ff93eb4af900f6b1fc0fcd546505 whatsnew.zip
--- 0001-emudummy.c-change-GAME_NO_SOUND-to-MACHINE_.patch DELETED ---
8 years, 6 months
- 1
- 0