rpms/openafs/devel .cvsignore, 1.4, 1.5 openafs.spec, 1.15, 1.16 sources, 1.7, 1.8 openafs-1.6.0-xstat-cm-test.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24887
Modified Files:
.cvsignore openafs.spec sources
Removed Files:
openafs-1.6.0-xstat-cm-test.patch
Log Message:
* Wed Feb 08 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre2
- Update to OpenAFS 1.6.1 pre-release 2
- Drop setserverprefs patch (merged in http://gerrit.openafs.org/5566)
- Drop xstat_cm_test patch (merged in http://gerrit.openafs.org/6386)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 30 Dec 2011 23:15:11 -0000 1.4
+++ .cvsignore 8 Feb 2012 14:42:24 -0000 1.5
@@ -1,2 +1,2 @@
-openafs-1.6.1pre1-src.tar.bz2
-openafs-1.6.1pre1-doc.tar.bz2
+openafs-1.6.1pre2-src.tar.bz2
+openafs-1.6.1pre2-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openafs.spec 16 Jan 2012 22:03:25 -0000 1.15
+++ openafs.spec 8 Feb 2012 14:42:24 -0000 1.16
@@ -10,12 +10,12 @@
%define sysname amd64_linux26
%endif
-%define pre pre1
+%define pre pre2
Summary: Enterprise Network File System
Name: openafs
Version: 1.6.1
-Release: 0.%{pre}.1%{?dist}
+Release: 0.%{pre}%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -32,10 +32,6 @@
Patch0: openafs-1.6.0-fPIC.patch
-# Already merged in master, awaiting 1.6.
-Patch1: openafs-1.6.0-setserverprefs.patch
-Patch2: openafs-1.6.0-xstat-cm-test.patch
-
%description
The AFS distributed filesystem. AFS is a distributed filesystem
allowing cross-platform sharing of files among multiple computers.
@@ -101,8 +97,6 @@
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
-# These patches are already merged in master.
-
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
iconv -f ISO-8859-1 -t UTF8 src/LICENSE~ > src/LICENSE
@@ -327,6 +321,11 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Wed Feb 08 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre2
+- Update to OpenAFS 1.6.1 pre-release 2
+- Drop setserverprefs patch (merged in http://gerrit.openafs.org/5566)
+- Drop xstat_cm_test patch (merged in http://gerrit.openafs.org/6386)
+
* Mon Jan 16 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1.1
- Log an error if we couldn't load the kernel module (RF BZ #2006)
- Fix setserverprefs for vlservers (http://gerrit.openafs.org/5465)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 30 Dec 2011 23:15:11 -0000 1.7
+++ sources 8 Feb 2012 14:42:24 -0000 1.8
@@ -1,2 +1,2 @@
-99a79608d68a7f087a1357d2f3ad2b01 openafs-1.6.1pre1-src.tar.bz2
-be0f3db9d12603684126c56a3aa4c613 openafs-1.6.1pre1-doc.tar.bz2
+9715d40c4226d2bc119f139392b2f57b openafs-1.6.1pre2-src.tar.bz2
+ecea0ca0c1669c2885f34cd7b2a1c4e2 openafs-1.6.1pre2-doc.tar.bz2
--- openafs-1.6.0-xstat-cm-test.patch DELETED ---
12 years, 9 months
rpms/openni-nite/devel NITE-1.4.1.2-fedora.patch, NONE, 1.1 openni-nite.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Tim Niemueller
Author: timn
Update of /cvs/nonfree/rpms/openni-nite/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2261/devel
Modified Files:
.cvsignore sources
Added Files:
NITE-1.4.1.2-fedora.patch openni-nite.spec
Log Message:
Initial import of openni-nite
NITE-1.4.1.2-fedora.patch:
Boxes/Boxes.mak | 2 +-
CircleControl/CircleControl.mak | 2 +-
Players/Players.mak | 2 +-
PointViewer/PointViewer.mak | 2 +-
SceneAnalysis/SceneAnalysis.mak | 2 +-
TrackPad/TrackPad.mak | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE NITE-1.4.1.2-fedora.patch ---
diff -urN NITE-1.4.1.2/Samples/Boxes/Boxes.mak NITE-1.4.1.2.fedora/Samples/Boxes/Boxes.mak
--- NITE-1.4.1.2/Samples/Boxes/Boxes.mak 2011-07-19 14:53:03.000000000 +0200
+++ NITE-1.4.1.2.fedora/Samples/Boxes/Boxes.mak 2011-08-30 17:17:01.587017594 +0200
@@ -10,7 +10,7 @@
ifeq ("$(OSTYPE)","Darwin")
LDFLAGS += -framework OpenGL -framework GLUT
else
- USED_LIBS += glut
+ USED_LIBS += glut GL
endif
DEFINES = USE_GLUT
diff -urN NITE-1.4.1.2/Samples/CircleControl/CircleControl.mak NITE-1.4.1.2.fedora/Samples/CircleControl/CircleControl.mak
--- NITE-1.4.1.2/Samples/CircleControl/CircleControl.mak 2011-07-19 14:53:05.000000000 +0200
+++ NITE-1.4.1.2.fedora/Samples/CircleControl/CircleControl.mak 2011-08-30 17:17:01.587017594 +0200
@@ -12,7 +12,7 @@
ifeq ("$(OSTYPE)","Darwin")
LDFLAGS += -framework OpenGL -framework GLUT
else
- USED_LIBS += glut
+ USED_LIBS += glut GL
endif
EXE_NAME = Sample-CircleControl
diff -urN NITE-1.4.1.2/Samples/Players/Players.mak NITE-1.4.1.2.fedora/Samples/Players/Players.mak
--- NITE-1.4.1.2/Samples/Players/Players.mak 2011-07-19 14:53:02.000000000 +0200
+++ NITE-1.4.1.2.fedora/Samples/Players/Players.mak 2011-08-30 17:17:01.588017592 +0200
@@ -15,7 +15,7 @@
ifeq ("$(OSTYPE)","Darwin")
LDFLAGS += -framework OpenGL -framework GLUT
else
- USED_LIBS += glut
+ USED_LIBS += glut GL
endif
include ../NiteSampleMakefile
diff -urN NITE-1.4.1.2/Samples/PointViewer/PointViewer.mak NITE-1.4.1.2.fedora/Samples/PointViewer/PointViewer.mak
--- NITE-1.4.1.2/Samples/PointViewer/PointViewer.mak 2011-07-19 14:53:05.000000000 +0200
+++ NITE-1.4.1.2.fedora/Samples/PointViewer/PointViewer.mak 2011-08-30 17:17:01.588017592 +0200
@@ -21,7 +21,7 @@
ifeq ("$(OSTYPE)","Darwin")
LDFLAGS += -framework OpenGL -framework GLUT
else
- USED_LIBS += glut
+ USED_LIBS += glut GL
endif
endif
include ../NiteSampleMakefile
diff -urN NITE-1.4.1.2/Samples/SceneAnalysis/SceneAnalysis.mak NITE-1.4.1.2.fedora/Samples/SceneAnalysis/SceneAnalysis.mak
--- NITE-1.4.1.2/Samples/SceneAnalysis/SceneAnalysis.mak 2011-07-19 14:53:06.000000000 +0200
+++ NITE-1.4.1.2.fedora/Samples/SceneAnalysis/SceneAnalysis.mak 2011-08-30 17:17:01.589017590 +0200
@@ -20,7 +20,7 @@
ifeq ("$(OSTYPE)","Darwin")
LDFLAGS += -framework OpenGL -framework GLUT
else
- USED_LIBS += glut
+ USED_LIBS += glut GL
endif
endif
diff -urN NITE-1.4.1.2/Samples/TrackPad/TrackPad.mak NITE-1.4.1.2.fedora/Samples/TrackPad/TrackPad.mak
--- NITE-1.4.1.2/Samples/TrackPad/TrackPad.mak 2011-07-19 14:53:04.000000000 +0200
+++ NITE-1.4.1.2.fedora/Samples/TrackPad/TrackPad.mak 2011-08-30 17:17:01.589017590 +0200
@@ -10,7 +10,7 @@
ifeq ("$(OSTYPE)","Darwin")
LDFLAGS += -framework OpenGL -framework GLUT
else
- USED_LIBS += glut
+ USED_LIBS += glut GL
endif
DEFINES = USE_GLUT
--- NEW FILE openni-nite.spec ---
#define gitrev 894cea01
Name: openni-nite
Version: 1.4.1.2
Release: 2%{?dist}
Summary: OpenNI-based toolbox for hand movement tracking
Group: System Environment/Libraries
License: Proprietary
URL: http://www.openni.org
Source0: http://www.openni.org/downloads/NITE-Bin-Linux64-v%{version}.tar.bz2
Source1: http://www.openni.org/downloads/NITE-Bin-Linux32-v%{version}.tar.bz2
Patch0: NITE-1.4.1.2-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: x86_64 i386 i686
Requires: openni >= 1.3.2.1
%description
NITE is a toolbox to allow application to build flows based on the user's
hands movement. The hand movement is understood as gestures and is tracked,
to provide hand points. NITE works over OpenNI.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package examples
Summary: Sample programs for %{name}
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
%description examples
The %{name}-examples package contains sample programs for OpenNI Nite.
%prep
%ifarch x86_64
%define srcnum 0
%else
%define srcnum 1
%endif
%setup -q -c -n NITE-%{version} -T -b %{srcnum}
%patch0 -p1 -b .fedora
%build
sed -i "s|^make$|make CFLAGS_EXT=\\\"%{optflags} -I$PWD/Include\\\" LDFLAGS_EXT=\\\"-L$RPM_BUILD_ROOT%{_libdir}\\\" SSE_GENERATION=2 DEBUG=1|" install.sh
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}
mkdir -p $RPM_BUILD_ROOT%{_includedir}/nite
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/openni/XnVFeatures
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/openni/XnVHandGenerator
# We omit .net stuff for now
#rm -f $RPM_BUILD_ROOT%{_libdir}/XnVNite.net.dll
for l in XnVCNITE XnVFeatures XnVHandGenerator XnVNite; do
install -m 0755 Bin/lib${l}_1_4_1.so $RPM_BUILD_ROOT%{_libdir}
done
cp -a Data/* $RPM_BUILD_ROOT%{_sysconfdir}/openni
cp -a Features_1_4_1/Data/* $RPM_BUILD_ROOT%{_sysconfdir}/openni/XnVFeatures
cp -a Hands_1_4_1/Data/* $RPM_BUILD_ROOT%{_sysconfdir}/openni/XnVHandGenerator
cp -a Include/* $RPM_BUILD_ROOT%{_includedir}/nite
for s in Boxes CircleControl Players PointServer PointViewer SceneAnalysis SingleControl TrackPad; do
install -m 0755 Samples/Bin/Release/Sample-$s $RPM_BUILD_ROOT%{_bindir}/Nite$s;
done
%clean
rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
if [ $1 == 1 ]; then
for l in XnVCNITE XnVFeatures XnVHandGenerator XnVNite; do
niReg %{_libdir}/lib${l}_1_4_1.so %{_sysconfdir}/openni/XnVFeatures
done
niLicense PrimeSense "0KOIk2JeIBYClPWVnMoRKn5cdY4="
fi
%preun
if [ $1 == 0 ]; then
for l in XnVCNITE XnVFeatures XnVHandGenerator XnVNite; do
niReg -u %{_libdir}/lib${l}_1_4_1.so
done
fi
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/openni/*
%{_libdir}/*.so*
%files devel
%defattr(-,root,root,-)
%doc Documentation/html
%{_includedir}/*
%files examples
%defattr(-,root,root,-)
%{_bindir}/*
%changelog
* Wed Feb 02 2012 Tim Niemueller <tim(a)niemueller.de> - 1.4.1.2-2
- Apply minor updates from rpmfusion review
* Tue Aug 30 2011 Tim Niemueller <tim(a)niemueller.de> - 1.4.1.2-1
- Update to 1.4.1.2
* Thu Mar 03 2011 Tim Niemueller <tim(a)niemueller.de> - 1.3.0.18-2
- Mark config files
- Comment with original download URLs
* Tue Jan 25 2011 Tim Niemueller <tim(a)niemueller.de> - 1.3.0.18-1
- Initial revision
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/openni-nite/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Feb 2012 19:50:18 -0000 1.1
+++ .cvsignore 8 Feb 2012 11:27:26 -0000 1.2
@@ -0,0 +1,2 @@
+NITE-Bin-Linux32-v1.4.1.2.tar.bz2
+NITE-Bin-Linux64-v1.4.1.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/openni-nite/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Feb 2012 19:50:18 -0000 1.1
+++ sources 8 Feb 2012 11:27:26 -0000 1.2
@@ -0,0 +1,2 @@
+b8a75b21b0800aa0cb7a846e44e81440 NITE-Bin-Linux32-v1.4.1.2.tar.bz2
+4727baabd2b9a4ed8a1c5b687b54da70 NITE-Bin-Linux64-v1.4.1.2.tar.bz2
12 years, 9 months
rpms/z-push/F-16 z-push.spec,1.5,1.6
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24852/F-16
Modified Files:
z-push.spec
Log Message:
Also bump patch versions inside of the spec file
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-16/z-push.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
+++ z-push.spec 7 Feb 2012 22:22:12 -0000 1.6
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.6-package.patch
-Patch1: z-push-1.5.6-zarafa.patch
+Patch0: z-push-1.5.7-package.patch
+Patch1: z-push-1.5.7-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
12 years, 9 months
rpms/z-push/F-15 z-push.spec,1.5,1.6
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24852/F-15
Modified Files:
z-push.spec
Log Message:
Also bump patch versions inside of the spec file
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-15/z-push.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
+++ z-push.spec 7 Feb 2012 22:22:12 -0000 1.6
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.6-package.patch
-Patch1: z-push-1.5.6-zarafa.patch
+Patch0: z-push-1.5.7-package.patch
+Patch1: z-push-1.5.7-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
12 years, 9 months
rpms/z-push/EL-6 z-push.spec,1.5,1.6
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24852/EL-6
Modified Files:
z-push.spec
Log Message:
Also bump patch versions inside of the spec file
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/z-push.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
+++ z-push.spec 7 Feb 2012 22:22:12 -0000 1.6
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.6-package.patch
-Patch1: z-push-1.5.6-zarafa.patch
+Patch0: z-push-1.5.7-package.patch
+Patch1: z-push-1.5.7-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
12 years, 9 months
rpms/z-push/EL-5 z-push.spec,1.5,1.6
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/EL-5
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24852/EL-5
Modified Files:
z-push.spec
Log Message:
Also bump patch versions inside of the spec file
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-5/z-push.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
+++ z-push.spec 7 Feb 2012 22:22:11 -0000 1.6
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.6-package.patch
-Patch1: z-push-1.5.6-zarafa.patch
+Patch0: z-push-1.5.7-package.patch
+Patch1: z-push-1.5.7-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
12 years, 9 months
rpms/z-push/devel z-push.spec,1.5,1.6
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24852/devel
Modified Files:
z-push.spec
Log Message:
Also bump patch versions inside of the spec file
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/devel/z-push.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
+++ z-push.spec 7 Feb 2012 22:22:12 -0000 1.6
@@ -14,8 +14,8 @@
Source3: z-push-README.FEDORA.zarafa
Source4: z-push.conf
Source5: zarafa-z-push.conf
-Patch0: z-push-1.5.6-package.patch
-Patch1: z-push-1.5.6-zarafa.patch
+Patch0: z-push-1.5.7-package.patch
+Patch1: z-push-1.5.7-zarafa.patch
Requires: httpd, php >= 4.3.0, php-imap >= 4.3.0
%if %{with_ldap}
Requires: php-ldap >= 4.3.0
12 years, 9 months
rpms/z-push/F-16 z-push-1.5.7-package.patch, NONE, 1.1 z-push-1.5.7-zarafa.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 z-push.spec, 1.4, 1.5 z-push-1.5.6-package.patch, 1.1, NONE z-push-1.5.6-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24328/F-16
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.7-package.patch z-push-1.5.7-zarafa.patch
Removed Files:
z-push-1.5.6-package.patch z-push-1.5.6-zarafa.patch
Log Message:
Upgrade to 1.5.7
z-push-1.5.7-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.7-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.7, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.7/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.7/debug.php.package 2011-12-11 23:34:15.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.7/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.7/config.php.package 2011-12-11 23:35:34.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,16 +94,8 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 30);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.7/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.7/index.php.package 2011-12-11 23:35:57.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.7-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.7-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.7, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.7/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.7/debug.php.zarafa 2011-12-11 23:27:55.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.7/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.7/config.php.zarafa 2011-12-11 23:29:14.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,7 +94,7 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 30);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -107,41 +105,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.7/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.7/index.php.zarafa 2011-12-11 23:29:43.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/F-16/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 11 Dec 2011 22:41:42 -0000 1.5
+++ .cvsignore 7 Feb 2012 22:20:47 -0000 1.6
@@ -1,2 +1,2 @@
-z-push-1.5.6-954.tar.gz
+z-push-1.5.7-1101.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/F-16/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Dec 2011 22:41:42 -0000 1.5
+++ sources 7 Feb 2012 22:20:47 -0000 1.6
@@ -1,2 +1,2 @@
-730df738da44757fdd270b37b36fa3e7 z-push-1.5.6-954.tar.gz
+9fc2d6e2d72d540de2eb52e157b8efe2 z-push-1.5.7-1101.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-16/z-push.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z-push.spec 11 Dec 2011 22:41:42 -0000 1.4
+++ z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
@@ -1,9 +1,9 @@
-%global svnrevision 954
+%global svnrevision 1101
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Tue Feb 07 2012 Robert Scheck <robert(a)fedoraproject.org> 1.5.7-1
+- Upgrade to 1.5.7
+
* Sun Dec 11 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.6-1
- Upgrade to 1.5.6
--- z-push-1.5.6-package.patch DELETED ---
--- z-push-1.5.6-zarafa.patch DELETED ---
12 years, 9 months
rpms/z-push/F-15 z-push-1.5.7-package.patch, NONE, 1.1 z-push-1.5.7-zarafa.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 z-push.spec, 1.4, 1.5 z-push-1.5.6-package.patch, 1.1, NONE z-push-1.5.6-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24328/F-15
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.7-package.patch z-push-1.5.7-zarafa.patch
Removed Files:
z-push-1.5.6-package.patch z-push-1.5.6-zarafa.patch
Log Message:
Upgrade to 1.5.7
z-push-1.5.7-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.7-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.7, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.7/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.7/debug.php.package 2011-12-11 23:34:15.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.7/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.7/config.php.package 2011-12-11 23:35:34.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,16 +94,8 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 30);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.7/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.7/index.php.package 2011-12-11 23:35:57.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.7-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.7-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.7, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.7/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.7/debug.php.zarafa 2011-12-11 23:27:55.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.7/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.7/config.php.zarafa 2011-12-11 23:29:14.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,7 +94,7 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 30);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -107,41 +105,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.7/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.7/index.php.zarafa 2011-12-11 23:29:43.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/F-15/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 11 Dec 2011 22:41:39 -0000 1.5
+++ .cvsignore 7 Feb 2012 22:20:47 -0000 1.6
@@ -1,2 +1,2 @@
-z-push-1.5.6-954.tar.gz
+z-push-1.5.7-1101.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/F-15/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Dec 2011 22:41:40 -0000 1.5
+++ sources 7 Feb 2012 22:20:47 -0000 1.6
@@ -1,2 +1,2 @@
-730df738da44757fdd270b37b36fa3e7 z-push-1.5.6-954.tar.gz
+9fc2d6e2d72d540de2eb52e157b8efe2 z-push-1.5.7-1101.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/F-15/z-push.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z-push.spec 11 Dec 2011 22:41:42 -0000 1.4
+++ z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
@@ -1,9 +1,9 @@
-%global svnrevision 954
+%global svnrevision 1101
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Tue Feb 07 2012 Robert Scheck <robert(a)fedoraproject.org> 1.5.7-1
+- Upgrade to 1.5.7
+
* Sun Dec 11 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.6-1
- Upgrade to 1.5.6
--- z-push-1.5.6-package.patch DELETED ---
--- z-push-1.5.6-zarafa.patch DELETED ---
12 years, 9 months
rpms/z-push/EL-6 z-push-1.5.7-package.patch, NONE, 1.1 z-push-1.5.7-zarafa.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 z-push.spec, 1.4, 1.5 z-push-1.5.6-package.patch, 1.1, NONE z-push-1.5.6-zarafa.patch, 1.1, NONE
by Robert Scheck
Author: robert
Update of /cvs/free/rpms/z-push/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24328/EL-6
Modified Files:
.cvsignore sources z-push.spec
Added Files:
z-push-1.5.7-package.patch z-push-1.5.7-zarafa.patch
Removed Files:
z-push-1.5.6-package.patch z-push-1.5.6-zarafa.patch
Log Message:
Upgrade to 1.5.7
z-push-1.5.7-package.patch:
config.php | 20 +++++---------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 15 insertions(+), 16 deletions(-)
--- NEW FILE z-push-1.5.7-package.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.7, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.7/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.7/debug.php.package 2011-12-11 23:34:15.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.7/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.7/config.php.package 2011-12-11 23:35:34.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,16 +94,8 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 30);
- // The data providers that we are using (see configuration below)
- $BACKEND_PROVIDER = "BackendICS";
-
- // ************************
- // BackendICS settings
- // ************************
-
- // Defines the server to which we want to connect
- define('MAPI_SERVER', 'file:///var/run/zarafa');
-
+ // The data provider that we are using
+ $BACKEND_PROVIDER = "BackendIMAP";
// ************************
// BackendIMAP settings
--- z-push-1.5.7/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.7/index.php.package 2011-12-11 23:35:57.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
z-push-1.5.7-zarafa.patch:
config.php | 45 ++++-----------------------------------------
debug.php | 2 +-
index.php | 9 +++++++++
3 files changed, 14 insertions(+), 42 deletions(-)
--- NEW FILE z-push-1.5.7-zarafa.patch ---
Patch by Robert Scheck <robert(a)fedoraproject.org> for z-push >= 1.5.7, that
changes the original paths from Z-Push upstream to Fedora compliant ones.
--- z-push-1.5.7/debug.php 2010-11-19 22:20:24.000000000 +0100
+++ z-push-1.5.7/debug.php.zarafa 2011-12-11 23:27:55.000000000 +0100
@@ -57,7 +57,7 @@
function debugLog($message) {
global $auth_user;
$user = (isset($auth_user))?"[". $auth_user ."] ":"";
- @$fp = fopen(BASE_PATH . "/debug.txt","a");
+ @$fp = fopen("/var/lib/zarafa-z-push/debug.txt","a");
@$date = strftime("%x %X");
@fwrite($fp, "$date [". getmypid() ."] ". $user . "$message\n");
@fclose($fp);
--- z-push-1.5.7/config.php 2011-11-24 22:39:15.000000000 +0100
+++ z-push-1.5.7/config.php.zarafa 2011-12-11 23:29:14.000000000 +0100
@@ -40,10 +40,8 @@
*
* Consult LICENSE file for details
************************************************/
- // Defines the default time zone
- if (function_exists("date_default_timezone_set")){
- date_default_timezone_set("Europe/Amsterdam");
- }
+ // Defines the default time zone, change e.g. to "Europe/London" if necessary
+ define('TIMEZONE', '');
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -57,7 +55,7 @@
"/usr/share/php5/" . PATH_SEPARATOR .
"/usr/share/pear/");
- define('STATE_DIR', BASE_PATH.'/state');
+ define('STATE_DIR', '/var/lib/zarafa-z-push/state');
// Try to set unlimited timeout
define('SCRIPT_TIMEOUT', 0);
@@ -96,7 +94,7 @@
// a higher value if you have a high load on the server.
define('PING_INTERVAL', 30);
- // The data providers that we are using (see configuration below)
+ // The data provider that we are using
$BACKEND_PROVIDER = "BackendICS";
// ************************
@@ -107,41 +105,6 @@
define('MAPI_SERVER', 'file:///var/run/zarafa');
- // ************************
- // BackendIMAP settings
- // ************************
-
- // Defines the server to which we want to connect
- // recommended to use local servers only
- define('IMAP_SERVER', 'localhost');
- // connecting to default port (143)
- define('IMAP_PORT', 143);
- // best cross-platform compatibility (see http://php.net/imap_open for options)
- define('IMAP_OPTIONS', '/notls/norsh');
- // overwrite the "from" header if it isn't set when sending emails
- // options: 'username' - the username will be set (usefull if your login is equal to your emailaddress)
- // 'domain' - the value of the "domain" field is used
- // '@mydomain.com' - the username is used and the given string will be appended
- define('IMAP_DEFAULTFROM', '');
- // copy outgoing mail to this folder. If not set z-push will try the default folders
- define('IMAP_SENTFOLDER', '');
- // forward messages inline (default off - as attachment)
- define('IMAP_INLINE_FORWARD', false);
- // use imap_mail() to send emails (default) - off uses mail()
- define('IMAP_USE_IMAPMAIL', true);
-
-
- // ************************
- // BackendMaildir settings
- // ************************
- define('MAILDIR_BASE', '/tmp');
- define('MAILDIR_SUBDIR', 'Maildir');
-
- // **********************
- // BackendVCDir settings
- // **********************
- define('VCARDDIR_DIR', '/home/%u/.kde/share/apps/kabc/stdvcf');
-
// Alternative backend to perform SEARCH requests (GAL search)
// if an empty value is used, the default search functionality of the main backend is used
// use 'SearchLDAP' to search in a LDAP directory (see backend/searchldap/config.php)
--- z-push-1.5.7/index.php 2011-08-04 19:32:40.000000000 +0200
+++ z-push-1.5.7/index.php.zarafa 2011-12-11 23:29:43.000000000 +0100
@@ -53,6 +53,15 @@
include_once("compat.php");
include_once("version.php");
+// Set timezone, see https://developer.berlios.de/mantis/view.php?id=479
+if(function_exists("date_default_timezone_set")) {
+ if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
+ date_default_timezone_set(TIMEZONE);
+ } else if(!ini_get('date.timezone')) {
+ date_default_timezone_set('Europe/Amsterdam');
+ }
+}
+
// Attempt to set maximum execution time
ini_set('max_execution_time', SCRIPT_TIMEOUT);
set_time_limit(SCRIPT_TIMEOUT);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 11 Dec 2011 22:41:38 -0000 1.5
+++ .cvsignore 7 Feb 2012 22:20:47 -0000 1.6
@@ -1,2 +1,2 @@
-z-push-1.5.6-954.tar.gz
+z-push-1.5.7-1101.tar.gz
z-push-permission.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 11 Dec 2011 22:41:38 -0000 1.5
+++ sources 7 Feb 2012 22:20:47 -0000 1.6
@@ -1,2 +1,2 @@
-730df738da44757fdd270b37b36fa3e7 z-push-1.5.6-954.tar.gz
+9fc2d6e2d72d540de2eb52e157b8efe2 z-push-1.5.7-1101.tar.gz
0d25be91b27fe7ebab16ed593c9fbf48 z-push-permission.pdf
Index: z-push.spec
===================================================================
RCS file: /cvs/free/rpms/z-push/EL-6/z-push.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- z-push.spec 11 Dec 2011 22:41:39 -0000 1.4
+++ z-push.spec 7 Feb 2012 22:20:47 -0000 1.5
@@ -1,9 +1,9 @@
-%global svnrevision 954
+%global svnrevision 1101
%global with_ldap 1
Summary: ActiveSync over-the-air implementation for mobile syncing
Name: z-push
-Version: 1.5.6
+Version: 1.5.7
Release: 1%{?dist}
License: AGPLv3 with exceptions
Group: Applications/Productivity
@@ -178,6 +178,9 @@
%attr(-,apache,apache) %dir %{_localstatedir}/lib/zarafa-%{name}/state/
%changelog
+* Tue Feb 07 2012 Robert Scheck <robert(a)fedoraproject.org> 1.5.7-1
+- Upgrade to 1.5.7
+
* Sun Dec 11 2011 Robert Scheck <robert(a)fedoraproject.org> 1.5.6-1
- Upgrade to 1.5.6
--- z-push-1.5.6-package.patch DELETED ---
--- z-push-1.5.6-zarafa.patch DELETED ---
12 years, 9 months