rpmfusion-commits
December 2013
rpmfusion-commits@lists.rpmfusion.org
- 16 participants
- 326 discussions
rpms/xorg-x11-drv-nvidia-304xx/devel sources, 1.3, 1.4 xorg-x11-drv-nvidia-304xx.spec, 1.3, 1.4 .cvsignore, 1.3, 1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28658
Modified Files:
sources xorg-x11-drv-nvidia-304xx.spec .cvsignore
Log Message:
Update to 117
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 1 Dec 2013 11:54:38 -0000 1.3
+++ sources 14 Dec 2013 17:20:33 -0000 1.4
@@ -1,2 +1,2 @@
-5d5d50335d05f738abde45bd28126978 NVIDIA-Linux-x86_64-304.116.run
-0626e8582fd81f14e7fbd906fbca1d51 NVIDIA-Linux-x86-304.116.run
+af1c41338ac657a7340aad6a6271baa8 NVIDIA-Linux-x86_64-304.117.run
+023eb03da304a1842fc503c81e3c5694 NVIDIA-Linux-x86-304.117.run
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xorg-x11-drv-nvidia-304xx.spec 1 Dec 2013 17:14:07 -0000 1.3
+++ xorg-x11-drv-nvidia-304xx.spec 14 Dec 2013 17:20:33 -0000 1.4
@@ -6,8 +6,8 @@
%global __strip /bin/true
Name: xorg-x11-drv-nvidia-304xx
-Version: 304.116
-Release: 2%{?dist}
+Version: 304.117
+Release: 1%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -391,6 +391,9 @@
%changelog
+* Sat Dec 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-1
+- Update to 304.117
+
* Sun Dec 01 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.116-2
- disable glamor module
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 1 Dec 2013 11:54:38 -0000 1.3
+++ .cvsignore 14 Dec 2013 17:20:33 -0000 1.4
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86_64-304.116.run
-NVIDIA-Linux-x86-304.116.run
+NVIDIA-Linux-x86_64-304.117.run
+NVIDIA-Linux-x86-304.117.run
10 years, 11 months
- 1
- 0
rpms/nvidia-kmod/F-18 nvidia-kmod.spec, 1.177, 1.178 sources, 1.57, 1.58 .cvsignore, 1.53, 1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15393
Modified Files:
nvidia-kmod.spec sources .cvsignore
Log Message:
Update to 319.76
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/nvidia-kmod.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- nvidia-kmod.spec 3 Dec 2013 22:21:45 -0000 1.177
+++ nvidia-kmod.spec 14 Dec 2013 11:28:09 -0000 1.178
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-kmod
Epoch: 1
-Version: 319.60
+Version: 319.76
# Taken over by kmodtool
-Release: 3%{?dist}.3
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,8 +22,6 @@
Source11: nvidia-kmodtool-excludekernel-filterfile
-Patch0: 3.11_kernel.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -49,7 +47,7 @@
for arch in x86_64 i686 armv7hl
do
pushd nvidiapkg-${arch}
-%patch0 -p1
+echo "Nothing to patch"
popd
done
@@ -79,6 +77,9 @@
%changelog
+* Sat Dec 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.76-1
+- Update to 319.76
+
* Tue Dec 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.60-3.3
- Rebuilt for kernel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources 2 Oct 2013 10:09:17 -0000 1.57
+++ sources 14 Dec 2013 11:28:09 -0000 1.58
@@ -1 +1 @@
-213479b23769fca63806f648ddb1ee1c nvidia-kmod-data-319.60.tar.xz
+b18e096538b7c7e9be2358ce30a85294 nvidia-kmod-data-319.76.tar.xz
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-18/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore 2 Oct 2013 10:09:16 -0000 1.53
+++ .cvsignore 14 Dec 2013 11:28:09 -0000 1.54
@@ -1 +1 @@
-nvidia-kmod-data-319.60.tar.xz
+nvidia-kmod-data-319.76.tar.xz
10 years, 11 months
- 1
- 0
rpms/xorg-x11-drv-nvidia/F-18 xorg-x11-drv-nvidia.spec, 1.100, 1.101 sources, 1.57, 1.58 .cvsignore, 1.53, 1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15084
Modified Files:
xorg-x11-drv-nvidia.spec sources .cvsignore
Log Message:
Update to 319.76
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- xorg-x11-drv-nvidia.spec 2 Oct 2013 12:11:02 -0000 1.100
+++ xorg-x11-drv-nvidia.spec 14 Dec 2013 11:25:12 -0000 1.101
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 319.60
+Version: 319.76
Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
@@ -412,17 +412,21 @@
%{_nvidia_libdir}/libOpenCL.so
%{_nvidia_libdir}/libnvidia-compiler.so
%{_nvidia_libdir}/libnvidia-encode.so
+%{_nvidia_libdir}/libnvidia-ifr.so
%endif
%{_nvidia_libdir}/libcuda.so
%{_nvidia_libdir}/libGL.so
%{_nvidia_libdir}/libnvidia-glcore.so
-%{_nvidia_libdir}/libnvidia-ifr.so
%{_nvidia_libdir}/libnvcuvid.so
%{_nvidia_libdir}/libnvidia-ml.so
%{_nvidia_libdir}/libnvidia-opencl.so
%changelog
+* Sat Dec 14 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.76-1
+- Update to 319.76
+- Fix Build on ARM
+
* Wed Oct 02 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:319.60-1
- Update to 319.60
- Avoid to exclude libcuda.so in devel
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources 2 Oct 2013 10:04:42 -0000 1.57
+++ sources 14 Dec 2013 11:25:12 -0000 1.58
@@ -1,3 +1,3 @@
-28b4f8fdddf70b25d8c5f1e73fcd71e7 NVIDIA-Linux-armv7l-gnueabihf-319.60.run
-893958183acc35feb0740747c7da306b NVIDIA-Linux-x86-319.60.run
-e31404d2e5aa0fa90b5b138ed9c666a3 NVIDIA-Linux-x86_64-319.60.run
+86f540e3db0eada600c2ac0acd692153 NVIDIA-Linux-armv7l-gnueabihf-319.76.run
+f559d325b334f5bb3d0467b2a4a715bd NVIDIA-Linux-x86-319.76.run
+a1cd3a703ca0bc31662ed5616154162c NVIDIA-Linux-x86_64-319.76.run
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-18/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- .cvsignore 2 Oct 2013 10:04:42 -0000 1.53
+++ .cvsignore 14 Dec 2013 11:25:12 -0000 1.54
@@ -1,3 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-319.60.run
-NVIDIA-Linux-x86-319.60.run
-NVIDIA-Linux-x86_64-319.60.run
+NVIDIA-Linux-armv7l-gnueabihf-319.76.run
+NVIDIA-Linux-x86-319.76.run
+NVIDIA-Linux-x86_64-319.76.run
10 years, 11 months
- 1
- 0
rpms/z-push/F-18 z-push-2.1.1-package.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 z-push-README.FEDORA, 1.1, 1.2 z-push.spec, 1.13, 1.14 z-push-2.0.9-package.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17644/F-18
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.1.1-package.patch
Removed Files:
z-push-2.0.9-package.patch
Log Message:
Upgrade to 2.1.1
z-push-2.1.1-package.patch:
config.php | 20 ++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
4 files changed, 27 insertions(+), 6 deletions(-)
--- NEW FILE z-push-2.1.1-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.1.1, 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.1.1-1788/config.php 2013-11-06 19:20:31.000000000 +0100
+++ z-push-2.1.1-1788/config.php.package 2013-12-12 16:19:30.000000000 +0100
@@ -60,6 +60,7 @@
// This setting specifies the owner parameter in the certificate to look at.
define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -101,6 +102,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -185,19 +187,33 @@
// default: 49152 - 48 KB default max photo size in bytes
define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
+
/**********************************************************************************
* 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.1.1-1788/z-push-admin.php 2013-02-28 22:02:27.000000000 +0100
+++ z-push-2.1.1-1788/z-push-admin.php.package 2013-12-12 16:20:55.000000000 +0100
@@ -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');
@@ -102,8 +106,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.1.1-1788/z-push-top.php 2013-01-04 17:51:29.000000000 +0100
+++ z-push-2.1.1-1788/z-push-top.php.package 2013-12-12 16:21:28.000000000 +0100
@@ -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');
@@ -60,7 +64,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php 2013-09-05 20:50:34.000000000 +0200
+++ z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php.package 2013-12-12 22:04:34.000000000 +0100
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/F-18/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 8 Dec 2013 19:56:56 -0000 1.12
+++ .cvsignore 12 Dec 2013 21:19:51 -0000 1.13
@@ -1,2 +1,2 @@
-z-push-2.0.9-1787.tar.gz
+z-push-2.1.1-1788.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/F-18/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 8 Dec 2013 19:56:56 -0000 1.12
+++ sources 12 Dec 2013 21:19:51 -0000 1.13
@@ -1,2 +1,2 @@
-94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz
+f844d0c3b708f151284338c1a938eca8 z-push-2.1.1-1788.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push-README.FEDORA
===================================================================
RCS file: /cvs/free/rpms/z-push/F-18/z-push-README.FEDORA,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- z-push-README.FEDORA 8 Nov 2012 21:52:20 -0000 1.1
+++ z-push-README.FEDORA 12 Dec 2013 21:19:51 -0000 1.2
@@ -80,6 +80,12 @@
Z-Push will be quite talkative, so it is advisable to use log-rotate
on the log file.
+There might be repeated incorrect password messages if a password contains
+characters which are encoded differently in ISO-8859-1 and Windows-1252
+encodings (e.g. "§") the login might fail with Z-Push but it works fine with
+the WebApp/Webaccess. Solution is to add setlocale(LC_CTYPE, "en_US.UTF-8");
+to the config.php file.
+
Documentation
-------------
@@ -87,3 +93,58 @@
Further information can be found in the Zarafa Z-Push configuration manual
http://doc.zarafa.com/trunk/Administrator_Manual/en-US/html/_zpush.html and
at the homepage of Z-Push, http://z-push.sourceforge.net.
+
+
+Upgrade
+-------
+
+*Important* States of Z-Push 2.0 and Z-Push 2.1 are not compatible. A state
+migration script is available in the /usr/share/z-push/tools/ folder.
+
+Please also observe the published release notes of the new Z-Push version.
+For some releases it is necessary to e.g. resynchronize the mobile.
+
+
+S/MIME
+------
+
+Z-Push supports signing and en-/decrypting of emails 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.
+
+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
+configured properly.
+
+The major part of S/MIME deployment is the PKI setup. It includes the
+public-private key/certificate obtaining, their management in directory
+service and roll-out to the mobile devices. Individual certificates can
+either be obtained from a local (company intern) or a public CA. There are
+various public CAs offering certificates: commercial ones e.g. Symantec or
+Comodo or community-driven e.g. CAcert.org.
+
+Both most popular directory services Microsoft Active Directory (MS ADS)
+and free open source solution OpenLDAP allow to save certificates. Private
+keys/certificates reside in user's directory or on a smartcard. Public
+certificates are saved in directory. Both, Microsoft Active Directory and
+OpenLDAP use the userCertificate attribute to save it.
+
+In the Active Directory the public key for contacts from GAB is saved in
+PR_EMS_AB_TAGGED_X509_CERT (0x8C6A1102) property and if you save a key in a
+contact it’s PR_USER_X509_CERTIFICATE (0x3A701102).
+
+In LDAP public key for contacts from GAB is saved in userCertificate
+property. It should be mapped to 0x3A220102 in ldap.propmap.cfg
+(0x3A220102 = userCertificate). Make sure it looks like this in LDAP:
+
+userCertificate;binary
+ MIIFGjCCBAKgAwIBAgIQbRnqpxlPa…
+
+*Important* It is strongly recommended to use MS AD or LDAP to manage the
+certificates. Other user plugin backend options like db or unix might not
+work correctly and are not supported.
+
+For in-depth information please refer to: http://www.zarafa.com/blog/post/
+2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-18/z-push.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- z-push.spec 8 Dec 2013 19:56:56 -0000 1.13
+++ z-push.spec 12 Dec 2013 21:19:51 -0000 1.14
@@ -1,18 +1,18 @@
-%global svnrevision 1787
+%global svnrevision 1788
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.0.9
+Version: 2.1.1
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://z-push.sourceforge.net/
-Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.0/%{name}-%{vers...
+Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.1/%{name}-%{vers...
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
Source3: z-push.conf
Source4: z-push.logrotate
-Patch0: z-push-2.0.9-package.patch
+Patch0: z-push-2.1.1-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)
@@ -89,7 +89,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 6.40.0
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -118,14 +118,7 @@
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php
ln -sf ../../..%{_sysconfdir}/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
-for backend in imap maildir vcarddir; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.${backend}.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
- ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
-done
-
-for backend in combined searchldap zarafa; do
+for backend in combined imap maildir searchldap vcarddir zarafa; do
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
@@ -141,7 +134,7 @@
install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE,backend/kolab}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
@@ -200,6 +193,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Thu Dec 12 2013 Robert Scheck <robert(a)fedoraproject.org> 2.1.1-1
+- Upgrade to 2.1.1
+
* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1
- Upgrade to 2.0.9
--- z-push-2.0.9-package.patch DELETED ---
10 years, 11 months
- 1
- 0
rpms/z-push/F-19 z-push-2.1.1-package.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 z-push-README.FEDORA, 1.1, 1.2 z-push.spec, 1.15, 1.16 z-push-2.0.9-package.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17644/F-19
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.1.1-package.patch
Removed Files:
z-push-2.0.9-package.patch
Log Message:
Upgrade to 2.1.1
z-push-2.1.1-package.patch:
config.php | 20 ++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
4 files changed, 27 insertions(+), 6 deletions(-)
--- NEW FILE z-push-2.1.1-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.1.1, 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.1.1-1788/config.php 2013-11-06 19:20:31.000000000 +0100
+++ z-push-2.1.1-1788/config.php.package 2013-12-12 16:19:30.000000000 +0100
@@ -60,6 +60,7 @@
// This setting specifies the owner parameter in the certificate to look at.
define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -101,6 +102,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -185,19 +187,33 @@
// default: 49152 - 48 KB default max photo size in bytes
define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
+
/**********************************************************************************
* 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.1.1-1788/z-push-admin.php 2013-02-28 22:02:27.000000000 +0100
+++ z-push-2.1.1-1788/z-push-admin.php.package 2013-12-12 16:20:55.000000000 +0100
@@ -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');
@@ -102,8 +106,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.1.1-1788/z-push-top.php 2013-01-04 17:51:29.000000000 +0100
+++ z-push-2.1.1-1788/z-push-top.php.package 2013-12-12 16:21:28.000000000 +0100
@@ -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');
@@ -60,7 +64,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php 2013-09-05 20:50:34.000000000 +0200
+++ z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php.package 2013-12-12 22:04:34.000000000 +0100
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/F-19/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 8 Dec 2013 19:56:56 -0000 1.12
+++ .cvsignore 12 Dec 2013 21:19:51 -0000 1.13
@@ -1,2 +1,2 @@
-z-push-2.0.9-1787.tar.gz
+z-push-2.1.1-1788.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/F-19/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 8 Dec 2013 19:56:56 -0000 1.12
+++ sources 12 Dec 2013 21:19:51 -0000 1.13
@@ -1,2 +1,2 @@
-94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz
+f844d0c3b708f151284338c1a938eca8 z-push-2.1.1-1788.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push-README.FEDORA
===================================================================
RCS file: /cvs/free/rpms/z-push/F-19/z-push-README.FEDORA,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- z-push-README.FEDORA 8 Nov 2012 21:38:17 -0000 1.1
+++ z-push-README.FEDORA 12 Dec 2013 21:19:51 -0000 1.2
@@ -80,6 +80,12 @@
Z-Push will be quite talkative, so it is advisable to use log-rotate
on the log file.
+There might be repeated incorrect password messages if a password contains
+characters which are encoded differently in ISO-8859-1 and Windows-1252
+encodings (e.g. "§") the login might fail with Z-Push but it works fine with
+the WebApp/Webaccess. Solution is to add setlocale(LC_CTYPE, "en_US.UTF-8");
+to the config.php file.
+
Documentation
-------------
@@ -87,3 +93,58 @@
Further information can be found in the Zarafa Z-Push configuration manual
http://doc.zarafa.com/trunk/Administrator_Manual/en-US/html/_zpush.html and
at the homepage of Z-Push, http://z-push.sourceforge.net.
+
+
+Upgrade
+-------
+
+*Important* States of Z-Push 2.0 and Z-Push 2.1 are not compatible. A state
+migration script is available in the /usr/share/z-push/tools/ folder.
+
+Please also observe the published release notes of the new Z-Push version.
+For some releases it is necessary to e.g. resynchronize the mobile.
+
+
+S/MIME
+------
+
+Z-Push supports signing and en-/decrypting of emails 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.
+
+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
+configured properly.
+
+The major part of S/MIME deployment is the PKI setup. It includes the
+public-private key/certificate obtaining, their management in directory
+service and roll-out to the mobile devices. Individual certificates can
+either be obtained from a local (company intern) or a public CA. There are
+various public CAs offering certificates: commercial ones e.g. Symantec or
+Comodo or community-driven e.g. CAcert.org.
+
+Both most popular directory services Microsoft Active Directory (MS ADS)
+and free open source solution OpenLDAP allow to save certificates. Private
+keys/certificates reside in user's directory or on a smartcard. Public
+certificates are saved in directory. Both, Microsoft Active Directory and
+OpenLDAP use the userCertificate attribute to save it.
+
+In the Active Directory the public key for contacts from GAB is saved in
+PR_EMS_AB_TAGGED_X509_CERT (0x8C6A1102) property and if you save a key in a
+contact it’s PR_USER_X509_CERTIFICATE (0x3A701102).
+
+In LDAP public key for contacts from GAB is saved in userCertificate
+property. It should be mapped to 0x3A220102 in ldap.propmap.cfg
+(0x3A220102 = userCertificate). Make sure it looks like this in LDAP:
+
+userCertificate;binary
+ MIIFGjCCBAKgAwIBAgIQbRnqpxlPa…
+
+*Important* It is strongly recommended to use MS AD or LDAP to manage the
+certificates. Other user plugin backend options like db or unix might not
+work correctly and are not supported.
+
+For in-depth information please refer to: http://www.zarafa.com/blog/post/
+2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-19/z-push.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- z-push.spec 8 Dec 2013 19:56:56 -0000 1.15
+++ z-push.spec 12 Dec 2013 21:19:51 -0000 1.16
@@ -1,18 +1,18 @@
-%global svnrevision 1787
+%global svnrevision 1788
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.0.9
+Version: 2.1.1
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://z-push.sourceforge.net/
-Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.0/%{name}-%{vers...
+Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.1/%{name}-%{vers...
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
Source3: z-push.conf
Source4: z-push.logrotate
-Patch0: z-push-2.0.9-package.patch
+Patch0: z-push-2.1.1-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)
@@ -89,7 +89,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 6.40.0
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -118,14 +118,7 @@
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php
ln -sf ../../..%{_sysconfdir}/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
-for backend in imap maildir vcarddir; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.${backend}.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
- ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
-done
-
-for backend in combined searchldap zarafa; do
+for backend in combined imap maildir searchldap vcarddir zarafa; do
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
@@ -141,7 +134,7 @@
install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE,backend/kolab}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
@@ -200,6 +193,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Thu Dec 12 2013 Robert Scheck <robert(a)fedoraproject.org> 2.1.1-1
+- Upgrade to 2.1.1
+
* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1
- Upgrade to 2.0.9
--- z-push-2.0.9-package.patch DELETED ---
10 years, 11 months
- 1
- 0
rpms/z-push/EL-6 z-push-2.1.1-package.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 z-push-README.FEDORA, 1.1, 1.2 z-push.spec, 1.13, 1.14 z-push-2.0.9-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-serv17644/EL-6
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.1.1-package.patch
Removed Files:
z-push-2.0.9-package.patch
Log Message:
Upgrade to 2.1.1
z-push-2.1.1-package.patch:
config.php | 20 ++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
4 files changed, 27 insertions(+), 6 deletions(-)
--- NEW FILE z-push-2.1.1-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.1.1, 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.1.1-1788/config.php 2013-11-06 19:20:31.000000000 +0100
+++ z-push-2.1.1-1788/config.php.package 2013-12-12 16:19:30.000000000 +0100
@@ -60,6 +60,7 @@
// This setting specifies the owner parameter in the certificate to look at.
define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -101,6 +102,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -185,19 +187,33 @@
// default: 49152 - 48 KB default max photo size in bytes
define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
+
/**********************************************************************************
* 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.1.1-1788/z-push-admin.php 2013-02-28 22:02:27.000000000 +0100
+++ z-push-2.1.1-1788/z-push-admin.php.package 2013-12-12 16:20:55.000000000 +0100
@@ -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');
@@ -102,8 +106,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.1.1-1788/z-push-top.php 2013-01-04 17:51:29.000000000 +0100
+++ z-push-2.1.1-1788/z-push-top.php.package 2013-12-12 16:21:28.000000000 +0100
@@ -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');
@@ -60,7 +64,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php 2013-09-05 20:50:34.000000000 +0200
+++ z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php.package 2013-12-12 22:04:34.000000000 +0100
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 8 Dec 2013 19:56:56 -0000 1.12
+++ .cvsignore 12 Dec 2013 21:19:50 -0000 1.13
@@ -1,2 +1,2 @@
-z-push-2.0.9-1787.tar.gz
+z-push-2.1.1-1788.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 8 Dec 2013 19:56:56 -0000 1.12
+++ sources 12 Dec 2013 21:19:50 -0000 1.13
@@ -1,2 +1,2 @@
-94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz
+f844d0c3b708f151284338c1a938eca8 z-push-2.1.1-1788.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- z-push-README.FEDORA 8 Nov 2012 21:57:27 -0000 1.1
+++ z-push-README.FEDORA 12 Dec 2013 21:19:50 -0000 1.2
@@ -80,6 +80,12 @@
Z-Push will be quite talkative, so it is advisable to use log-rotate
on the log file.
+There might be repeated incorrect password messages if a password contains
+characters which are encoded differently in ISO-8859-1 and Windows-1252
+encodings (e.g. "§") the login might fail with Z-Push but it works fine with
+the WebApp/Webaccess. Solution is to add setlocale(LC_CTYPE, "en_US.UTF-8");
+to the config.php file.
+
Documentation
-------------
@@ -87,3 +93,58 @@
Further information can be found in the Zarafa Z-Push configuration manual
http://doc.zarafa.com/trunk/Administrator_Manual/en-US/html/_zpush.html and
at the homepage of Z-Push, http://z-push.sourceforge.net.
+
+
+Upgrade
+-------
+
+*Important* States of Z-Push 2.0 and Z-Push 2.1 are not compatible. A state
+migration script is available in the /usr/share/z-push/tools/ folder.
+
+Please also observe the published release notes of the new Z-Push version.
+For some releases it is necessary to e.g. resynchronize the mobile.
+
+
+S/MIME
+------
+
+Z-Push supports signing and en-/decrypting of emails 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.
+
+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
+configured properly.
+
+The major part of S/MIME deployment is the PKI setup. It includes the
+public-private key/certificate obtaining, their management in directory
+service and roll-out to the mobile devices. Individual certificates can
+either be obtained from a local (company intern) or a public CA. There are
+various public CAs offering certificates: commercial ones e.g. Symantec or
+Comodo or community-driven e.g. CAcert.org.
+
+Both most popular directory services Microsoft Active Directory (MS ADS)
+and free open source solution OpenLDAP allow to save certificates. Private
+keys/certificates reside in user's directory or on a smartcard. Public
+certificates are saved in directory. Both, Microsoft Active Directory and
+OpenLDAP use the userCertificate attribute to save it.
+
+In the Active Directory the public key for contacts from GAB is saved in
+PR_EMS_AB_TAGGED_X509_CERT (0x8C6A1102) property and if you save a key in a
+contact it’s PR_USER_X509_CERTIFICATE (0x3A701102).
+
+In LDAP public key for contacts from GAB is saved in userCertificate
+property. It should be mapped to 0x3A220102 in ldap.propmap.cfg
+(0x3A220102 = userCertificate). Make sure it looks like this in LDAP:
+
+userCertificate;binary
+ MIIFGjCCBAKgAwIBAgIQbRnqpxlPa…
+
+*Important* It is strongly recommended to use MS AD or LDAP to manage the
+certificates. Other user plugin backend options like db or unix might not
+work correctly and are not supported.
+
+For in-depth information please refer to: http://www.zarafa.com/blog/post/
+2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/z-push.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- z-push.spec 8 Dec 2013 19:56:56 -0000 1.13
+++ z-push.spec 12 Dec 2013 21:19:50 -0000 1.14
@@ -1,18 +1,18 @@
-%global svnrevision 1787
+%global svnrevision 1788
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.0.9
+Version: 2.1.1
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://z-push.sourceforge.net/
-Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.0/%{name}-%{vers...
+Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.1/%{name}-%{vers...
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
Source3: z-push.conf
Source4: z-push.logrotate
-Patch0: z-push-2.0.9-package.patch
+Patch0: z-push-2.1.1-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)
@@ -89,7 +89,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 6.40.0
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -118,14 +118,7 @@
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php
ln -sf ../../..%{_sysconfdir}/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
-for backend in imap maildir vcarddir; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.${backend}.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
- ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
-done
-
-for backend in combined searchldap zarafa; do
+for backend in combined imap maildir searchldap vcarddir zarafa; do
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
@@ -141,7 +134,7 @@
install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE,backend/kolab}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
@@ -200,6 +193,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Thu Dec 12 2013 Robert Scheck <robert(a)fedoraproject.org> 2.1.1-1
+- Upgrade to 2.1.1
+
* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1
- Upgrade to 2.0.9
--- z-push-2.0.9-package.patch DELETED ---
10 years, 11 months
- 1
- 0
rpms/z-push/EL-5 z-push-2.1.1-package.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 z-push-README.FEDORA, 1.1, 1.2 z-push.spec, 1.14, 1.15 z-push-2.0.9-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-serv17644/EL-5
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.1.1-package.patch
Removed Files:
z-push-2.0.9-package.patch
Log Message:
Upgrade to 2.1.1
z-push-2.1.1-package.patch:
config.php | 20 ++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
4 files changed, 27 insertions(+), 6 deletions(-)
--- NEW FILE z-push-2.1.1-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.1.1, 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.1.1-1788/config.php 2013-11-06 19:20:31.000000000 +0100
+++ z-push-2.1.1-1788/config.php.package 2013-12-12 16:19:30.000000000 +0100
@@ -60,6 +60,7 @@
// This setting specifies the owner parameter in the certificate to look at.
define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -101,6 +102,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -185,19 +187,33 @@
// default: 49152 - 48 KB default max photo size in bytes
define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
+
/**********************************************************************************
* 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.1.1-1788/z-push-admin.php 2013-02-28 22:02:27.000000000 +0100
+++ z-push-2.1.1-1788/z-push-admin.php.package 2013-12-12 16:20:55.000000000 +0100
@@ -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');
@@ -102,8 +106,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.1.1-1788/z-push-top.php 2013-01-04 17:51:29.000000000 +0100
+++ z-push-2.1.1-1788/z-push-top.php.package 2013-12-12 16:21:28.000000000 +0100
@@ -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');
@@ -60,7 +64,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php 2013-09-05 20:50:34.000000000 +0200
+++ z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php.package 2013-12-12 22:04:34.000000000 +0100
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 8 Dec 2013 19:56:55 -0000 1.12
+++ .cvsignore 12 Dec 2013 21:19:50 -0000 1.13
@@ -1,2 +1,2 @@
-z-push-2.0.9-1787.tar.gz
+z-push-2.1.1-1788.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 8 Dec 2013 19:56:56 -0000 1.12
+++ sources 12 Dec 2013 21:19:50 -0000 1.13
@@ -1,2 +1,2 @@
-94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz
+f844d0c3b708f151284338c1a938eca8 z-push-2.1.1-1788.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- z-push-README.FEDORA 8 Nov 2012 21:57:57 -0000 1.1
+++ z-push-README.FEDORA 12 Dec 2013 21:19:50 -0000 1.2
@@ -80,6 +80,12 @@
Z-Push will be quite talkative, so it is advisable to use log-rotate
on the log file.
+There might be repeated incorrect password messages if a password contains
+characters which are encoded differently in ISO-8859-1 and Windows-1252
+encodings (e.g. "§") the login might fail with Z-Push but it works fine with
+the WebApp/Webaccess. Solution is to add setlocale(LC_CTYPE, "en_US.UTF-8");
+to the config.php file.
+
Documentation
-------------
@@ -87,3 +93,58 @@
Further information can be found in the Zarafa Z-Push configuration manual
http://doc.zarafa.com/trunk/Administrator_Manual/en-US/html/_zpush.html and
at the homepage of Z-Push, http://z-push.sourceforge.net.
+
+
+Upgrade
+-------
+
+*Important* States of Z-Push 2.0 and Z-Push 2.1 are not compatible. A state
+migration script is available in the /usr/share/z-push/tools/ folder.
+
+Please also observe the published release notes of the new Z-Push version.
+For some releases it is necessary to e.g. resynchronize the mobile.
+
+
+S/MIME
+------
+
+Z-Push supports signing and en-/decrypting of emails 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.
+
+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
+configured properly.
+
+The major part of S/MIME deployment is the PKI setup. It includes the
+public-private key/certificate obtaining, their management in directory
+service and roll-out to the mobile devices. Individual certificates can
+either be obtained from a local (company intern) or a public CA. There are
+various public CAs offering certificates: commercial ones e.g. Symantec or
+Comodo or community-driven e.g. CAcert.org.
+
+Both most popular directory services Microsoft Active Directory (MS ADS)
+and free open source solution OpenLDAP allow to save certificates. Private
+keys/certificates reside in user's directory or on a smartcard. Public
+certificates are saved in directory. Both, Microsoft Active Directory and
+OpenLDAP use the userCertificate attribute to save it.
+
+In the Active Directory the public key for contacts from GAB is saved in
+PR_EMS_AB_TAGGED_X509_CERT (0x8C6A1102) property and if you save a key in a
+contact it’s PR_USER_X509_CERTIFICATE (0x3A701102).
+
+In LDAP public key for contacts from GAB is saved in userCertificate
+property. It should be mapped to 0x3A220102 in ldap.propmap.cfg
+(0x3A220102 = userCertificate). Make sure it looks like this in LDAP:
+
+userCertificate;binary
+ MIIFGjCCBAKgAwIBAgIQbRnqpxlPa…
+
+*Important* It is strongly recommended to use MS AD or LDAP to manage the
+certificates. Other user plugin backend options like db or unix might not
+work correctly and are not supported.
+
+For in-depth information please refer to: http://www.zarafa.com/blog/post/
+2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/z-push.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- z-push.spec 8 Dec 2013 19:56:56 -0000 1.14
+++ z-push.spec 12 Dec 2013 21:19:50 -0000 1.15
@@ -1,18 +1,18 @@
-%global svnrevision 1787
+%global svnrevision 1788
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.0.9
+Version: 2.1.1
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://z-push.sourceforge.net/
-Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.0/%{name}-%{vers...
+Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.1/%{name}-%{vers...
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
Source3: z-push.conf
Source4: z-push.logrotate
-Patch0: z-push-2.0.9-package.patch
+Patch0: z-push-2.1.1-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)
@@ -89,7 +89,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 6.40.0
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -118,14 +118,7 @@
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php
ln -sf ../../..%{_sysconfdir}/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
-for backend in imap maildir vcarddir; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.${backend}.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
- ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
-done
-
-for backend in combined searchldap zarafa; do
+for backend in combined imap maildir searchldap vcarddir zarafa; do
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
@@ -141,7 +134,7 @@
install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE,backend/kolab}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
@@ -200,6 +193,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Thu Dec 12 2013 Robert Scheck <robert(a)fedoraproject.org> 2.1.1-1
+- Upgrade to 2.1.1
+
* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1
- Upgrade to 2.0.9
--- z-push-2.0.9-package.patch DELETED ---
10 years, 11 months
- 1
- 0
rpms/z-push/devel z-push-2.1.1-package.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 z-push-README.FEDORA, 1.1, 1.2 z-push.spec, 1.15, 1.16 z-push-2.0.9-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-serv17644/devel
Modified Files:
.cvsignore sources z-push-README.FEDORA z-push.spec
Added Files:
z-push-2.1.1-package.patch
Removed Files:
z-push-2.0.9-package.patch
Log Message:
Upgrade to 2.1.1
z-push-2.1.1-package.patch:
config.php | 20 ++++++++++++++++++--
tools/migrate-2.0.x-2.1.0.php | 2 +-
z-push-admin.php | 6 ++++--
z-push-top.php | 5 ++++-
4 files changed, 27 insertions(+), 6 deletions(-)
--- NEW FILE z-push-2.1.1-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 2.1.1, 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.1.1-1788/config.php 2013-11-06 19:20:31.000000000 +0100
+++ z-push-2.1.1-1788/config.php.package 2013-12-12 16:19:30.000000000 +0100
@@ -60,6 +60,7 @@
// This setting specifies the owner parameter in the certificate to look at.
define("CERTIFICATE_OWNER_PARAMETER", "SSL_CLIENT_S_DN_CN");
+
/**********************************************************************************
* Default FileStateMachine settings
*/
@@ -101,6 +102,7 @@
// Uncomment and modify the following line if the validation of the certificates fails.
// define('CAINFO', '/etc/ssl/certs/EmailCA.pem');
+
/**********************************************************************************
* Mobile settings
*/
@@ -185,19 +187,33 @@
// default: 49152 - 48 KB default max photo size in bytes
define('SYNC_CONTACTS_MAXPICTURESIZE', 49152);
+
/**********************************************************************************
* 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.1.1-1788/z-push-admin.php 2013-02-28 22:02:27.000000000 +0100
+++ z-push-2.1.1-1788/z-push-admin.php.package 2013-12-12 16:20:55.000000000 +0100
@@ -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');
@@ -102,8 +106,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.1.1-1788/z-push-top.php 2013-01-04 17:51:29.000000000 +0100
+++ z-push-2.1.1-1788/z-push-top.php.package 2013-12-12 16:21:28.000000000 +0100
@@ -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');
@@ -60,7 +64,6 @@
* MAIN
*/
declare(ticks = 1);
- define('BASE_PATH_CLI', dirname(__FILE__) ."/");
try {
ZPush::CheckConfig();
--- z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php 2013-09-05 20:50:34.000000000 +0200
+++ z-push-2.1.1-1788/tools/migrate-2.0.x-2.1.0.php.package 2013-12-12 22:04:34.000000000 +0100
@@ -44,7 +44,7 @@
************************************************/
// Please adjust to match your z-push installation directory, usually /usr/share/z-push
-define('ZPUSH_BASE_PATH', "../");
+define('ZPUSH_BASE_PATH', "/usr/share/z-push/");
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 8 Dec 2013 19:56:56 -0000 1.12
+++ .cvsignore 12 Dec 2013 21:19:51 -0000 1.13
@@ -1,2 +1,2 @@
-z-push-2.0.9-1787.tar.gz
+z-push-2.1.1-1788.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 8 Dec 2013 19:56:56 -0000 1.12
+++ sources 12 Dec 2013 21:19:51 -0000 1.13
@@ -1,2 +1,2 @@
-94fad4d31cad30c762018937a4542e17 z-push-2.0.9-1787.tar.gz
+f844d0c3b708f151284338c1a938eca8 z-push-2.1.1-1788.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- z-push-README.FEDORA 8 Nov 2012 21:38:17 -0000 1.1
+++ z-push-README.FEDORA 12 Dec 2013 21:19:51 -0000 1.2
@@ -80,6 +80,12 @@
Z-Push will be quite talkative, so it is advisable to use log-rotate
on the log file.
+There might be repeated incorrect password messages if a password contains
+characters which are encoded differently in ISO-8859-1 and Windows-1252
+encodings (e.g. "§") the login might fail with Z-Push but it works fine with
+the WebApp/Webaccess. Solution is to add setlocale(LC_CTYPE, "en_US.UTF-8");
+to the config.php file.
+
Documentation
-------------
@@ -87,3 +93,58 @@
Further information can be found in the Zarafa Z-Push configuration manual
http://doc.zarafa.com/trunk/Administrator_Manual/en-US/html/_zpush.html and
at the homepage of Z-Push, http://z-push.sourceforge.net.
+
+
+Upgrade
+-------
+
+*Important* States of Z-Push 2.0 and Z-Push 2.1 are not compatible. A state
+migration script is available in the /usr/share/z-push/tools/ folder.
+
+Please also observe the published release notes of the new Z-Push version.
+For some releases it is necessary to e.g. resynchronize the mobile.
+
+
+S/MIME
+------
+
+Z-Push supports signing and en-/decrypting of emails 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.
+
+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
+configured properly.
+
+The major part of S/MIME deployment is the PKI setup. It includes the
+public-private key/certificate obtaining, their management in directory
+service and roll-out to the mobile devices. Individual certificates can
+either be obtained from a local (company intern) or a public CA. There are
+various public CAs offering certificates: commercial ones e.g. Symantec or
+Comodo or community-driven e.g. CAcert.org.
+
+Both most popular directory services Microsoft Active Directory (MS ADS)
+and free open source solution OpenLDAP allow to save certificates. Private
+keys/certificates reside in user's directory or on a smartcard. Public
+certificates are saved in directory. Both, Microsoft Active Directory and
+OpenLDAP use the userCertificate attribute to save it.
+
+In the Active Directory the public key for contacts from GAB is saved in
+PR_EMS_AB_TAGGED_X509_CERT (0x8C6A1102) property and if you save a key in a
+contact it’s PR_USER_X509_CERTIFICATE (0x3A701102).
+
+In LDAP public key for contacts from GAB is saved in userCertificate
+property. It should be mapped to 0x3A220102 in ldap.propmap.cfg
+(0x3A220102 = userCertificate). Make sure it looks like this in LDAP:
+
+userCertificate;binary
+ MIIFGjCCBAKgAwIBAgIQbRnqpxlPa…
+
+*Important* It is strongly recommended to use MS AD or LDAP to manage the
+certificates. Other user plugin backend options like db or unix might not
+work correctly and are not supported.
+
+For in-depth information please refer to: http://www.zarafa.com/blog/post/
+2013/05/smime-z-push-signing-and-en-decrypting-emails-mobile-devices
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- z-push.spec 8 Dec 2013 19:56:56 -0000 1.15
+++ z-push.spec 12 Dec 2013 21:19:51 -0000 1.16
@@ -1,18 +1,18 @@
-%global svnrevision 1787
+%global svnrevision 1788
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 2.0.9
+Version: 2.1.1
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
URL: http://z-push.sourceforge.net/
-Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.0/%{name}-%{vers...
+Source0: http://www.zarafa-deutschland.de/z-push-download/final/2.1/%{name}-%{vers...
Source1: z-push-permission.pdf
Source2: z-push-README.FEDORA
Source3: z-push.conf
Source4: z-push.logrotate
-Patch0: z-push-2.0.9-package.patch
+Patch0: z-push-2.1.1-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)
@@ -89,7 +89,7 @@
%package zarafa
Summary: Zarafa data backend provider for Z-Push
Group: Applications/Productivity
-Requires: %{name} = %{version}-%{release}, php-mapi >= 6.40.0
+Requires: %{name} = %{version}-%{release}, php-mapi >= 7.0.6
Provides: zarafa-%{name} = %{version}-%{release}
Obsoletes: zarafa-%{name} < %{version}-%{release}
@@ -118,14 +118,7 @@
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.php
ln -sf ../../..%{_sysconfdir}/%{name}/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}/config.php
-for backend in imap maildir vcarddir; do
- mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/
- mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/config.${backend}.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
- ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
-done
-
-for backend in combined searchldap zarafa; do
+for backend in combined imap maildir searchldap vcarddir zarafa; do
mv -f $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/${backend}.php
ln -sf ../../../../..%{_sysconfdir}/%{name}/${backend}.php $RPM_BUILD_ROOT%{_datadir}/%{name}/backend/${backend}/config.php
done
@@ -141,7 +134,7 @@
install -D -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
# Remove all unwanted files and directories
-rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE,backend/kolab}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/{INSTALL,LICENSE}
# Copy permission and README for later usage
cp -pf %{SOURCE1} permission.pdf
@@ -200,6 +193,9 @@
%{_datadir}/%{name}/backend/zarafa/
%changelog
+* Thu Dec 12 2013 Robert Scheck <robert(a)fedoraproject.org> 2.1.1-1
+- Upgrade to 2.1.1
+
* Sun Dec 08 2013 Robert Scheck <robert(a)fedoraproject.org> 2.0.9-1
- Upgrade to 2.0.9
--- z-push-2.0.9-package.patch DELETED ---
10 years, 11 months
- 1
- 0
rpms/nvidia-kmod/F-19 nvidia-kmod.spec,1.156,1.157
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18253
Modified Files:
nvidia-kmod.spec
Log Message:
Bump
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-19/nvidia-kmod.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- nvidia-kmod.spec 11 Dec 2013 23:25:57 -0000 1.156
+++ nvidia-kmod.spec 11 Dec 2013 23:28:27 -0000 1.157
@@ -3,13 +3,13 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
Name: nvidia-kmod
Epoch: 1
Version: 331.20
# Taken over by kmodtool
-Release: 3%{?dist}.1
+Release: 9%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
10 years, 11 months
- 1
- 0
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.145,1.146
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17700/devel
Modified Files:
nvidia-kmod.spec
Log Message:
Fix for ARM kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- nvidia-kmod.spec 10 Dec 2013 19:23:55 -0000 1.145
+++ nvidia-kmod.spec 11 Dec 2013 23:25:56 -0000 1.146
@@ -9,7 +9,7 @@
Epoch: 1
Version: 331.20
# Taken over by kmodtool
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -64,13 +64,17 @@
%build
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}/kernel/
- make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" \
+ make %{?_smp_mflags} \
+ KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \
+ IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
%{?_nv_build_module_instances:NV_BUILD_MODULE_INSTANCES=%{?_nv_build_module_instances}} \
- SYSSRC="${kernel_version##*___}" module
+ module
popd
pushd _kmod_build_${kernel_version%%___*}/kernel/uvm
- make %{?_smp_mflags} IGNORE_CC_MISMATCH=1 KERNEL_UNAME="${kernel_version%%___*}" \
- SYSSRC="${kernel_version##*___}" module
+ make %{?_smp_mflags} \
+ KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \
+ IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
+ module
popd
done
@@ -90,6 +94,9 @@
%changelog
+* Wed Dec 11 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-9
+- Resort and IGNORE XEN/RT Checks
+
* Tue Dec 10 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-8
- Rebuilt for f20 final kernel
10 years, 11 months
- 1
- 0