5 files changed, 170 insertions, 0 deletions
diff --git a/redhat/components.txt b/redhat/components.txt
index c7b7a1b39..b2f84234b 100644
--- a/redhat/components.txt
+++ b/redhat/components.txt
@@ -6,11 +6,13 @@ libraries/python-trinity
 libraries/pykdeextensions
 dependencies/qt3
 dependencies/tqt3
+dependencies/tqca-tls
 dependencies/libcaldav
 dependencies/libcarddav
 dependencies/tqtinterface
 dependencies/dbus-tqt
 dependencies/dbus-1-tqt
+dependencies/avahi-tqt
 dependencies/arts
 dependencies/tqscintilla
 kdelibs
diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch
new file mode 100644
index 000000000..9bac68b83
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/qca-tls-1.0-mach.patch
@@ -0,0 +1,10 @@
+--- ./qca-tls.pro.mach	2004-06-10 11:55:22.411187448 +0200
++++ ./qca-tls.pro	2004-06-10 11:55:43.460987392 +0200
+@@ -2,6 +2,7 @@
+ 
+ TEMPLATE = lib
+ CONFIG  += qt thread release plugin
++CONFIG += no_fixpath
+ TARGET   = qca-tls
+ 
+ !exists(qcaprovider.h) {
diff --git a/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch
new file mode 100644
index 000000000..7b2406f61
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/qca-tls-1.0-ossl10.patch
@@ -0,0 +1,15 @@
+diff -up qca-tls-1.0/qca-tls.cpp.ossl10 qca-tls-1.0/qca-tls.cpp
+--- qca-tls-1.0/qca-tls.cpp.ossl10	2009-08-26 10:08:36.000000000 +0200
++++ qca-tls-1.0/qca-tls.cpp	2009-08-26 10:11:57.000000000 +0200
+@@ -953,7 +953,11 @@ public:
+ 	RSAKeyContext *key;
+ 
+ 	SSL *ssl;
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
++	const SSL_METHOD *method;
++#else
+ 	SSL_METHOD *method;
++#endif
+ 	SSL_CTX *context;
+ 	BIO *rbio, *wbio;
+ 	CertContext cc;
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch b/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch
new file mode 100644
index 000000000..5dd7c5a47
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/tqca-tls-qmake-tqt3.patch
@@ -0,0 +1,74 @@
+diff -Nuar tqca-tls.ORI//configure tqca-tls.P//configure
+--- tqca-tls.ORI//configure	2012-02-18 11:09:57.695893820 +0100
++++ tqca-tls.P//configure	2012-02-18 11:28:09.442846406 +0100
+@@ -60,7 +60,7 @@
+ 	if [ "$QC_DEBUG" = "Y" ]; then
+ 		echo \$QTDIR not set... trying to find Qt manually
+ 	fi
+-	for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
++	for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
+ 		if [ -d "$p/mkspecs" ]; then
+ 			QTDIR=$p
+ 			break;
+@@ -79,15 +79,15 @@
+ 	fi
+ fi
+ 
+-if [ ! -x "$QTDIR/bin/qmake" ]; then
++if [ ! -x "$QTDIR/bin/qmake-tqt3" ]; then
+ 	if [ "$QC_DEBUG" = "Y" ]; then
+-		echo Warning: qmake not in \$QTDIR/bin/qmake
++		echo Warning: qmake-tqt3 not in \$QTDIR/bin/qmake-tqt3
+ 		echo trying to find it in \$PATH
+ 	fi
+-	qm=`type -p qmake`
++	qm=`type -p qmake-tqt3`
+ 	if [ -x "$qm" ]; then
+ 		if [ "$QC_DEBUG" = "Y" ]; then
+-			echo qmake found in $qm
++			echo qmake-tqt3 found in $qm
+ 		fi
+ 	else
+ 		echo fail
+@@ -96,12 +96,12 @@
+ 		echo or I missdetected \$QTDIR=$QTDIR
+ 		echo
+ 		echo Please set \$QTDIR manually and make sure that
+-		echo \$QTDIR/bin/qmake exists.
++		echo \$QTDIR/bin/qmake-tqt3 exists.
+ 		echo
+ 		exit 1;
+ 	fi
+ else
+-	qm=$QTDIR/bin/qmake
++	qm=$QTDIR/bin/qmake-tqt3
+ fi
+ 
+ gen_files() {
+@@ -185,6 +185,8 @@
+ 
+ 		// Make sure tqtinterface can be found
+ 		conf->addIncludePath("/usr/include/tqt");
++		// Make sure tqt3 can be found
++		conf->addIncludePath("/usr/include/tqt3");
+ 
+ 		return true;
+ 	}
+@@ -507,7 +509,7 @@
+ TEMPLATE = app
+ CONFIG += qt x11 thread console
+ TARGET = conf
+-INCLUDEPATH += '/usr/include/tqt'
++INCLUDEPATH += '/usr/include/tqt' '/usr/include/tqt3'
+ 
+ DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
+ DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
+@@ -533,7 +535,7 @@
+ )
+ 
+ if [ "$?" != "0" ]; then
+-	rm -rf .qconftemp
++#	rm -rf .qconftemp
+ 	echo fail
+ 	echo
+ 	echo "There was an error compiling 'conf'.  Be sure you have a proper"
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
new file mode 100644
index 000000000..4f1cb6fa4
--- /dev/null
+++ b/redhat/dependencies/tqca-tls/tqca-tls.spec
@@ -0,0 +1,69 @@
+%define _prefix /usr
+
+Name:		tqca-tls
+Version:	r14
+Release:	1%{?dist}
+
+Summary:	TLS plugin for the Qt Cryptographic Architecture
+License:	LGPLv2+
+Group:		Applications/Internet
+
+URL:		http://delta.affinix.com/qca/
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+
+Source0:	%{name}-%{version}.tar.gz
+
+# Fix build in mach for QT apps
+Patch0:		qca-tls-1.0-mach.patch
+# Missing ifdefs for openssl 0.9.8
+Patch1:     qca-tls-1.0-ossl098.patch
+# Build with openssl 1.0.0
+Patch2:     qca-tls-1.0-ossl10.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch10:	tqca-tls-qmake-tqt3.patch
+
+BuildRequires:	tqt3-devel >= 3.4.0
+# To build with openssl 0.9.7, disable patch1
+BuildRequires:	openssl-devel >= 0.9.8
+
+
+%description
+This is a plugin to provide SSL/TLS capability to programs that use the TQt
+Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
+for several cryptographic algorithms to TQt programs.  This package only
+contains the TLS plugin.
+
+%prep
+%setup -q -n dependencies/%{name}
+%patch0 -p0 -b .mach
+#patch1 -p0 -b .ossl098
+%patch2 -p1 -b .ossl10
+%patch10 -p1
+
+%build
+./configure \
+  --qtdir=/usr
+%__make %{?_smp_mflags}
+
+
+%install
+%__rm -rf %{?buildroot}
+%__mkdir -p %{?buildroot}%{_libdir}/tqt3/plugins/crypto
+%__make install INSTALL_ROOT=%{?buildroot}
+
+
+%clean
+%__rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(0644,root,root,0755)
+%doc README COPYING
+%attr(755,root,root) %{_libdir}/tqt3/plugins/crypto
+
+
+%changelog
+* Sat Feb 18 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
+- Initial build for TDE R14
+- Spec file based on Fedora 12 'qca-tls-1.0-18'