From f02f30f85dbb237d69a302ac1d505337e69f6c51 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 06:39:14 +0000
Subject: import openchange-2.3-3.el7


---

diff --git a/SOURCES/openchange-2.3-libical-3.0.patch b/SOURCES/openchange-2.3-libical-3.0.patch
new file mode 100644
index 0000000..ec0bfa6
--- /dev/null
+++ b/SOURCES/openchange-2.3-libical-3.0.patch
@@ -0,0 +1,88 @@
+diff -up openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c.libical-3.0 openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c
+--- openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c.libical-3.0	2017-11-08 14:45:06.494302213 +0100
++++ openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_property.c	2017-11-08 14:47:33.465300181 +0100
+@@ -515,7 +515,7 @@ void ical_property_EXDATE(struct exchang
+ 				icalproperty_add_parameter(prop, tzid);
+ 			} else {
+ 				/*Get time from dtstart*/
+-				icaltime.is_utc = 1;
++				icaltime.zone = icaltimezone_get_utc_timezone ();
+ 				if (exchange2ical->apptEndWhole){
+ 					dttime = get_icaltime_from_FILETIME_UTC(exchange2ical->apptStartWhole);
+ 					icaltime.hour   = dttime.hour;
+diff -up openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c.libical-3.0 openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c
+--- openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c.libical-3.0	2017-11-08 14:45:43.123301706 +0100
++++ openchange-openchange-2.3-VULCAN/libexchange2ical/exchange2ical_utils.c	2017-11-08 14:47:31.873300203 +0100
+@@ -241,10 +241,9 @@ struct icaltimetype get_icaltimetype_fro
+ 	tt.minute = tm->tm_min;
+ 	tt.second = tm->tm_sec;
+ 
+-	tt.is_utc      = 0;
+ 	tt.is_date     = 0;
+ 	tt.is_daylight = 0;
+-	tt.zone        = 0;
++	tt.zone        = icaltimezone_get_utc_timezone ();
+ 
+ 	return tt;
+ }
+@@ -254,7 +253,6 @@ struct icaltimetype get_icaltimetype_fro
+ 	struct icaltimetype tt;
+ 	
+ 	tt = get_icaltimetype_from_tm(tm);
+-	tt.is_utc      = 1;
+ 	
+ 	return tt;
+ }
+@@ -270,10 +268,8 @@ struct icaltimetype get_icaldate_from_tm
+ 	tt.minute = 0;
+ 	tt.second = 0;
+ 
+-	tt.is_utc      = 1;
+ 	tt.is_date     = 1;
+ 	tt.is_daylight = 0;
+-	tt.zone        = NULL;
+ 
+ 	return tt;
+ }
+@@ -313,7 +309,6 @@ struct icaltimetype get_icaltime_from_FI
+ 	tt.minute = tm->tm_min;                                                
+ 	tt.second = tm->tm_sec;
+ 	tt.is_date = 0;
+-	tt.is_utc = 0;
+ 	tt.is_daylight = 0;
+ 	tt.zone = NULL;
+ 
+@@ -339,9 +334,8 @@ struct icaltimetype get_icaltime_from_FI
+ 	tt.minute = tm->tm_min;                                                
+ 	tt.second = tm->tm_sec;
+ 	tt.is_date = 0;
+-	tt.is_utc = 1;
+ 	tt.is_daylight = 0;
+-	tt.zone = NULL;
++	tt.zone = icaltimezone_get_utc_timezone ();
+ 
+ 	return tt;
+ }
+@@ -371,9 +365,8 @@ struct icaltimetype get_icaldate_from_FI
+ 	tt.minute = 0;                                                
+ 	tt.second = 0;
+ 	tt.is_date = 1;
+-	tt.is_utc = 1;
+ 	tt.is_daylight = 0;
+-	tt.zone = NULL;
++	tt.zone = icaltimezone_get_utc_timezone ();
+ 
+ 	return tt;
+ }
+@@ -390,10 +383,9 @@ struct icaltimetype get_icaldate_from_Gl
+ 	tt.minute = 0;
+ 	tt.second = 0;
+ 
+-	tt.is_utc      = 1;
+ 	tt.is_date     = 1;
+ 	tt.is_daylight = 0;
+-	tt.zone        = NULL;
++	tt.zone        = icaltimezone_get_utc_timezone ();
+ 
+ 	return tt;
+ }
diff --git a/SPECS/openchange.spec b/SPECS/openchange.spec
index ffa9ae5..ba30d46 100644
--- a/SPECS/openchange.spec
+++ b/SPECS/openchange.spec
@@ -1,6 +1,6 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%global samba_version 4.2.0-2
+%global samba_version 4.8.3
 %global talloc_version 2.0.5
 %global nickname VULCAN
 
@@ -20,7 +20,7 @@
 
 Name: openchange
 Version: 2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -83,6 +83,8 @@ Patch8: openchange-2.3-nomemcached.patch
 # Fix connection arguments to work properly with newer samba
 Patch9: openchange-1.0-fix-connection-args.patch
 
+Patch10: openchange-2.3-libical-3.0.patch
+
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
 using native protocols.
@@ -151,6 +153,7 @@ This package provides the server elements for OpenChange.
 %patch7 -p1 -b .samba-4.4
 %patch8 -p1 -b .nomemcached
 %patch9 -p1 -b .fix-connection-args
+%patch10 -p1 -b .libical-3.0
 
 %build
 ./autogen.sh
@@ -298,6 +301,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Aug 22 2018 Milan Crha <mcrha@redhat.com> - 2.3-3
+- Add patch to build against libical 3.0
+- Rebuild against rebased samba
+
 * Thu Apr 07 2016 Milan Crha <mcrha@redhat.com> - 2.3-2
 - Add patch to fix connection string