RPM Packacing: update qca-tls

pull/3/head
François Andriot 10 years ago
parent 24d35ee37d
commit b630ff2dbb

@ -1,10 +0,0 @@
--- ./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) {

@ -1,26 +0,0 @@
--- ./qca-tls.cpp.ossl098 2003-12-10 17:53:57.000000000 +0100
+++ ./qca-tls.cpp 2005-11-13 22:21:50.000000000 +0100
@@ -454,7 +454,11 @@
if(!r) {
// try this other public function, for whatever reason
p = (void *)in;
+#ifdef OSSL_097
+ r = d2i_RSA_PUBKEY(NULL, (const unsigned char **)&p, len);
+#else
r = d2i_RSA_PUBKEY(NULL, (unsigned char **)&p, len);
+#endif
}
if(r) {
if(pub) {
@@ -798,7 +802,11 @@
bool createFromDER(const char *in, unsigned int len)
{
+#ifdef OSSL_097
+ const unsigned char *p = (const unsigned char *)in;
+#else
unsigned char *p = (unsigned char *)in;
+#endif
X509 *t = d2i_X509(NULL, &p, len);
if(!t)
return false;

@ -1,15 +0,0 @@
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;

@ -28,14 +28,7 @@ Packager: Francois Andriot <francois.andriot@free.fr>
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: tqca-tls-master.tar.gz Source0: tqca-tls-3.5.13.2.tar.gz
# Fix build in mach for QT apps
Patch0: qca-tls-1.0-mach.patch
# Build with openssl 1.0.0
Patch2: qca-tls-1.0-ossl10.patch
# Allows building with TQT3 from TDE
Patch10: tqca-tls-qt3.patch
BuildRequires: qt3-devel >= 3.3.8.d BuildRequires: qt3-devel >= 3.3.8.d
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
@ -58,17 +51,12 @@ contains the TLS plugin.
########## ##########
%prep %prep
%setup -q -n tqca-tls-master %setup -q -n tqca-tls-3.5.13.2
%patch0 -p0 -b .mach
%patch2 -p1 -b .ossl10
%patch10 -p1 -b .qt
# Revert TQCA to QCA
%__sed -i * -e "s|TQCA|QCA|g"
%build %build
unset QTDIR || : ; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"

@ -1,105 +0,0 @@
--- tqca-tls-master/configure.qt 2012-06-20 03:30:48.000000000 +0200
+++ tqca-tls-master/configure 2013-05-28 20:30:52.827808679 +0200
@@ -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/lib64/tqt /usr/local/lib64/tqt /usr/lib64/tqt3 /usr/local/lib64/tqt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do
+ for p in /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/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/qt3 /usr/lib64/qt /usr/local/lib64/qt /usr/lib64/qt3 /usr/local/lib64/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/tqmake" ]; then
+if [ ! -x "$QTDIR/bin/qmake" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
- echo Warning: tqmake not in \$QTDIR/bin/tqmake
+ echo Warning: qmake not in \$QTDIR/bin/qmake
echo trying to find it in \$PATH
fi
- qm=`type -p tqmake`
+ qm=`type -p qmake`
if [ -x "$qm" ]; then
if [ "$QC_DEBUG" = "Y" ]; then
- echo tqmake found in $qm
+ echo qmake 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/tqmake exists.
+ echo \$QTDIR/bin/qmake exists.
echo
exit 1;
fi
else
- qm=$QTDIR/bin/tqmake
+ qm=$QTDIR/bin/qmake
fi
gen_files() {
@@ -184,7 +184,9 @@
conf->addLib("-lssl -lcrypto");
// Make sure tqtinterface can be found
- conf->addIncludePath("/usr/include/tqt");
+ conf->addIncludePath("/usr/include/tqt");
+ // Make sure tqt3 can be found
+ conf->addIncludePath("${QTINC:-${QTDIR}/include}");
return true;
}
@@ -476,7 +478,7 @@
TQString str;
str += "# qconf\n";
- str += "QT_PATH_PLUGINS = " + TQString(tqInstallPathPlugins()) + '\n';
+ str += "QT_PATH_PLUGINS = " + TQString(qInstallPathPlugins()) + '\n';
if(!conf->DEFINES.isEmpty())
str += "DEFINES += " + conf->DEFINES + '\n';
if(!conf->INCLUDEPATH.isEmpty())
@@ -511,7 +513,7 @@
TEMPLATE = app
CONFIG += qt x11 thread console
TARGET = conf
-INCLUDEPATH += '/usr/include/tqt'
+INCLUDEPATH += '/usr/include/tqt' '${QTINC:-${QTDIR}/include}'
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"'
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"'
@@ -537,16 +539,16 @@
)
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"
echo "TQt 3.x Multithreaded (MT) build environment set up."
- if [ ! -f "$QTDIR/lib/libtqt-mt.so.3" ]; then
- if [ ! -f "$QTDIR/lib64/libtqt-mt.so.3" ]; then
+ if [ ! -f "${QTLIB:-${QTDIR}/lib}/libqt-mt.so.3" ]; then
+ if [ ! -f "${QTLIB:-${QTDIR}/lib64}/libqt-mt.so.3" ]; then
echo
echo "One possible reason is that you don't have"
- echo "libtqt-mt.so.3 installed in $QTDIR/lib/"
+ echo "libqt-mt.so.3 installed in $QTDIR/lib/"
echo "or $QTDIR/lib64/."
fi
fi
@@ -575,7 +577,7 @@
if [ -x "./qcextra" ]; then
./qcextra
fi
-# run tqmake
+# run qmake
if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then
$qm QMAKE_STRIP=true qca-tls.pro
else
Loading…
Cancel
Save