RPM: merge redhat directory with master branch

3 files changed, 185 insertions, 32 deletions

diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index c02b79769..27e23795e 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libcarddav (version R14.0.0)
+# spec file for package libcarddav (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,12 +12,14 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg libcarddav
 %define tde_prefix /opt/trinity
 %define tde_includedir %{tde_prefix}/include
@@ -33,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	0.6.2
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	A portable CardDAV client implementation
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
@@ -52,19 +54,17 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+Patch1:		libcarddav-14.0.1-rhel5.patch
+
 BuildRequires:	make
 BuildRequires:	libtool
 
 # CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
-%define libcurl_devel libcurl-devel
-%else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel libcurl-devel >= 7.15.5
 %else
 # Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel curl-devel >= 7.15.5
 %endif
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
@@ -151,11 +151,14 @@ This package contains the development files.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%if 0%{?rhel} == 5
+%patch1 -p1 -b .ftbfs
+%endif
 
 # Fix empty ChangeLog cause invalid macro in 'configure.ac'
 echo "%{name} (%{version})" >ChangeLog
 
-./autogen.sh
+autoreconf -fiv
 
 
 %build
@@ -191,6 +194,4 @@ fi
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.6.2-1
-- Initial release for TDE R14.0.0
+%changelog
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch
new file mode 100644
index 000000000..a6bf4e6e0
--- /dev/null
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.1-rhel5.patch
@@ -0,0 +1,164 @@
+diff --git a/src/add-carddav-object.c b/src/add-carddav-object.c
+index 5574991..a1586d8 100644
+--- a/src/add-carddav-object.c
++++ b/src/add-carddav-object.c
+@@ -104,7 +104,6 @@ gboolean carddav_add(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/delete-carddav-object.c b/src/delete-carddav-object.c
+index 96b9033..6984a82 100644
+--- a/src/delete-carddav-object.c
++++ b/src/delete-carddav-object.c
+@@ -132,7 +132,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	g_free(search);
+ 	curl_slist_free_all(http_header);
+@@ -231,7 +230,6 @@ gboolean carddav_delete(carddav_settings* settings, carddav_error* error) {
+ 					curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+ 					curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 					curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-					curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 					res = curl_easy_perform(curl);
+ 					if (LOCKSUPPORT && lock_token) {
+ 						carddav_unlock_object(
+@@ -417,7 +415,6 @@ gboolean carddav_delete_by_uri(carddav_settings* settings, carddav_error* error)
+ 			curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
+ 			curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 			curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-			curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 			res = curl_easy_perform(curl);
+ 			if (LOCKSUPPORT && lock_token) {
+ 				carddav_unlock_object(
+diff --git a/src/get-carddav-report.c b/src/get-carddav-report.c
+index b44fd2c..7655b29 100644
+--- a/src/get-carddav-report.c
++++ b/src/get-carddav-report.c
+@@ -117,7 +117,6 @@ static gchar* carddav_dirlist(carddav_settings* settings, carddav_error* error)
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -243,7 +242,6 @@ gboolean carddav_getall(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -345,7 +343,6 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+@@ -378,4 +375,4 @@ gboolean carddav_getall_by_uri(carddav_settings* settings, carddav_error* error)
+ 	curl_easy_cleanup(curl);
+ 	g_free(dav_file_listing);
+ 	return result;
+-}
+\ No newline at end of file
++}
+diff --git a/src/get-display-name.c b/src/get-display-name.c
+index 9e782e0..16c3e4b 100644
+--- a/src/get-display-name.c
++++ b/src/get-display-name.c
+@@ -100,7 +100,6 @@ gboolean carddav_getname(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PROPFIND");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	if (res != 0) {
+ 		error->code = -1;
+diff --git a/src/lock-carddav-object.c b/src/lock-carddav-object.c
+index 163264c..2292cad 100644
+--- a/src/lock-carddav-object.c
++++ b/src/lock-carddav-object.c
+@@ -109,7 +109,6 @@ gchar* carddav_lock_object(
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "LOCK");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	if (res != 0) {
+@@ -214,7 +213,6 @@ gboolean carddav_unlock_object(gchar* lock_token, gchar* URI,
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "UNLOCK");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	if (res != 0) {
+diff --git a/src/modify-carddav-object.c b/src/modify-carddav-object.c
+index 1822068..a8b6de2 100644
+--- a/src/modify-carddav-object.c
++++ b/src/modify-carddav-object.c
+@@ -133,7 +133,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "REPORT");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	res = curl_easy_perform(curl);
+ 	curl_slist_free_all(http_header);
+ 	http_header = NULL;
+@@ -231,7 +230,6 @@ gboolean carddav_modify(carddav_settings* settings, carddav_error* error) {
+ 									strlen(settings->file));
+ 						curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 						curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-						curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 						curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 						res = curl_easy_perform(curl);
+ 						if (LOCKSUPPORT && lock_token) {
+@@ -430,7 +428,6 @@ gboolean carddav_modify_by_uri(carddav_settings* settings, carddav_error* error)
+ 							strlen(settings->file));
+ 				curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 				curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-				curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 				curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
+ 				res = curl_easy_perform(curl);
+ 				if (LOCKSUPPORT && lock_token) {
+diff --git a/src/options-carddav-server.c b/src/options-carddav-server.c
+index b774401..b44aae2 100644
+--- a/src/options-carddav-server.c
++++ b/src/options-carddav-server.c
+@@ -75,7 +75,6 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
+ 	curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "OPTIONS");
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, 1);
+-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+ 	if (settings->debug) {
+ 		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+ 	}
+@@ -106,15 +105,12 @@ gboolean carddav_getoptions(CURL* curl, carddav_settings* settings, response* re
+ 	}
+ 	else if (
+ 		(res == CURLE_SSL_CONNECT_ERROR ||
+-		 CURLE_PEER_FAILED_VERIFICATION ||
+ 		 CURLE_SSL_ENGINE_NOTFOUND ||
+ 		 CURLE_SSL_ENGINE_SETFAILED ||
+ 		 CURLE_SSL_CERTPROBLEM ||
+ 		 CURLE_SSL_CIPHER ||
+ 		 CURLE_SSL_CACERT ||
+-		 CURLE_SSL_CACERT_BADFILE ||
+-		 CURLE_SSL_CRL_BADFILE ||
+-		 CURLE_SSL_ISSUER_ERROR) && settings->usehttps) {
++		 CURLE_SSL_CRL_BADFILE ) && settings->usehttps) {
+ 		error->code = -2;
+ 		error->str = g_strdup(error_buf);
+ 	}
diff --git a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
index d09b0fed7..152f1cf90 100644
--- a/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-3.5.13.2.spec
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # TDE variables
@@ -33,7 +33,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	0.6.2
-Release:	%{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:5}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	A portable CardDAV client implementation
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
@@ -56,15 +56,11 @@ BuildRequires:	make
 BuildRequires:	libtool
 
 # CURL support
-%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define libcurl_devel libcurl-devel
 %else
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define libcurl_devel %{_lib}curl-devel
-%else
 # Specific CURL version for TDE on RHEL 5 (and older)
-#define libcurl_devel trinity-libcurl-devel
-%endif
+%define libcurl_devel trinity-libcurl-devel
 %endif
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
@@ -151,6 +147,7 @@ This package contains the development files.
 
 %prep
 %setup -q -n libcarddav-%{version}
+%__sed -i "src/get-carddav-report.c" -e "89s/return TRUE/return NULL/"
 autoreconf --force --install --symlink
 
 
@@ -195,13 +192,4 @@ fi
 %__rm -rf %{buildroot}
 
 
-%Changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.6.2-4
-- Build for Fedora 19
-
-* Sat Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.2-3
-- Renames to 'trinity-libcaldav'
-- Build on MGA2
-
-* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 0.6.2-2debian2 .1
-- Initial release for RHEL 6, RHEL 5, and Fedora 15
+%changelog