Update of /cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7601/10.3/crypto/finkinfo
Modified Files:
kdelibs3-ssl.info kdelibs3-ssl.patch
postgresql-ssl-python-py.patch
Log Message:
enforce openssl loading if possible
Index: postgresql-ssl-python-py.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/postgresql-ssl-python-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postgresql-ssl-python-py.patch 19 Jul 2004 19:45:45 -0000 1.1
+++ postgresql-ssl-python-py.patch 25 Oct 2004 17:14:04 -0000 1.2
@@ -1,14 +1,14 @@
-diff -uNr PyGreSQL-3.4/setup.py PyGreSQL-3.4-new/setup.py
---- PyGreSQL-3.4/setup.py Tue Jan 13 07:29:57 2004
-+++ PyGreSQL-3.4-new/setup.py Thu Jun 3 20:39:08 2004
-@@ -30,8 +30,8 @@
+diff -uNr PyGreSQL-3.5/setup.py PyGreSQL-3.5-new/setup.py
+--- PyGreSQL-3.5/setup.py Sun Aug 29 20:12:24 2004
++++ PyGreSQL-3.5-new/setup.py Mon Oct 25 12:02:33 2004
+@@ -36,8 +36,8 @@
optional_libs=[ 'libpqdll', 'wsock32', 'advapi32' ]
data_files = [ 'libpq.dll' ]
else:
-- include_dirs=['/usr/include/pgsql']
-- library_dirs=['/usr/lib/pgsql']
-+ include_dirs=['@INSTPREFIX@/include/postgresql','@INSTPREFIX@/include']
-+ library_dirs=['@INSTPREFIX@/lib/postgresql-7.4', '@INSTPREFIX@/lib']
+- include_dirs=[getconfig ('includedir'),getconfig('includedir-server')]
+- library_dirs=[getconfig('libdir')]
++
include_dirs=['@INSTPREFIX@/include/postgresql','@INSTPREFIX@/include',getconfig
('includedir'),getconfig('includedir-server')]
++ library_dirs=['@INSTPREFIX@/lib/postgresql-7.4',
'@INSTPREFIX@/lib',getconfig('libdir')]
optional_libs=['pq']
data_files = []
Index: kdelibs3-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdelibs3-ssl.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- kdelibs3-ssl.patch 13 Oct 2004 20:50:04 -0000 1.15
+++ kdelibs3-ssl.patch 25 Oct 2004 17:14:03 -0000 1.16
@@ -1,6 +1,6 @@
diff -uNr kdelibs-3.3.1/admin/ltmain.sh kdelibs-3.3.1-new/admin/ltmain.sh
--- kdelibs-3.3.1/admin/ltmain.sh Tue Jun 15 12:47:06 2004
-+++ kdelibs-3.3.1-new/admin/ltmain.sh Wed Oct 13 11:34:12 2004
++++ kdelibs-3.3.1-new/admin/ltmain.sh Mon Oct 25 11:56:02 2004
@@ -4397,6 +4397,7 @@
# We should set the shlibpath_var
rpath=
@@ -19,7 +19,7 @@
fi
diff -uNr kdelibs-3.3.1/configure kdelibs-3.3.1-new/configure
--- kdelibs-3.3.1/configure Fri Oct 8 09:54:21 2004
-+++ kdelibs-3.3.1-new/configure Wed Oct 13 11:33:52 2004
++++ kdelibs-3.3.1-new/configure Mon Oct 25 11:56:02 2004
@@ -7899,6 +7899,19 @@
lt_cv_sys_max_cmd_len=8192;
;;
@@ -175,7 +175,7 @@
_ACEOF
diff -uNr kdelibs-3.3.1/dcop/dcopclient.cpp kdelibs-3.3.1-new/dcop/dcopclient.cpp
--- kdelibs-3.3.1/dcop/dcopclient.cpp Sat Jul 17 15:22:23 2004
-+++ kdelibs-3.3.1-new/dcop/dcopclient.cpp Wed Oct 13 11:33:53 2004
++++ kdelibs-3.3.1-new/dcop/dcopclient.cpp Mon Oct 25 11:56:03 2004
@@ -675,7 +675,7 @@
static bool peerIsUs(int sockfd)
{
@@ -187,7 +187,7 @@
return (cred.uid == getuid());
diff -uNr kdelibs-3.3.1/kdecore/Makefile.in kdelibs-3.3.1-new/kdecore/Makefile.in
--- kdelibs-3.3.1/kdecore/Makefile.in Fri Oct 8 09:54:02 2004
-+++ kdelibs-3.3.1-new/kdecore/Makefile.in Wed Oct 13 11:33:53 2004
++++ kdelibs-3.3.1-new/kdecore/Makefile.in Mon Oct 25 11:56:03 2004
@@ -637,7 +637,7 @@
xdg_menudir = @xdg_menudir@
INCLUDES = -I$(top_srcdir)/kdefx -I$(top_srcdir)/kdecore/network $(all_includes)
$(LIBART_CFLAGS)
@@ -199,7 +199,7 @@
lib_LIBRARIES = libkdefakes_nonpic.a
diff -uNr kdelibs-3.3.1/kdecore/kextsock.cpp kdelibs-3.3.1-new/kdecore/kextsock.cpp
--- kdelibs-3.3.1/kdecore/kextsock.cpp Sun Oct 3 03:40:15 2004
-+++ kdelibs-3.3.1-new/kdecore/kextsock.cpp Wed Oct 13 11:33:53 2004
++++ kdelibs-3.3.1-new/kdecore/kextsock.cpp Mon Oct 25 11:56:04 2004
@@ -534,7 +534,7 @@
return d->addressReusable;
@@ -238,7 +238,7 @@
if (retval == -1 || errcode != 0)
diff -uNr kdelibs-3.3.1/kdecore/kglobalsettings.cpp
kdelibs-3.3.1-new/kdecore/kglobalsettings.cpp
--- kdelibs-3.3.1/kdecore/kglobalsettings.cpp Sat May 22 16:55:09 2004
-+++ kdelibs-3.3.1-new/kdecore/kglobalsettings.cpp Wed Oct 13 11:33:53 2004
++++ kdelibs-3.3.1-new/kdecore/kglobalsettings.cpp Mon Oct 25 11:56:04 2004
@@ -466,7 +466,7 @@
s_desktopPath->append('/');
@@ -250,7 +250,7 @@
if ( !s_trashPath->endsWith("/") )
diff -uNr kdelibs-3.3.1/kdecore/ksocks.cpp kdelibs-3.3.1-new/kdecore/ksocks.cpp
--- kdelibs-3.3.1/kdecore/ksocks.cpp Sat May 22 16:55:10 2004
-+++ kdelibs-3.3.1-new/kdecore/ksocks.cpp Wed Oct 13 11:33:53 2004
++++ kdelibs-3.3.1-new/kdecore/ksocks.cpp Mon Oct 25 11:56:04 2004
@@ -475,7 +475,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
@@ -323,7 +323,7 @@
diff -uNr kdelibs-3.3.1/kdecore/kstandarddirs.cpp
kdelibs-3.3.1-new/kdecore/kstandarddirs.cpp
--- kdelibs-3.3.1/kdecore/kstandarddirs.cpp Sun Oct 3 03:40:15 2004
-+++ kdelibs-3.3.1-new/kdecore/kstandarddirs.cpp Wed Oct 13 11:33:53 2004
++++ kdelibs-3.3.1-new/kdecore/kstandarddirs.cpp Mon Oct 25 11:56:04 2004
@@ -922,7 +922,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
@@ -335,7 +335,7 @@
if (!strcmp(type, "config"))
diff -uNr kdelibs-3.3.1/kdecore/network/kresolvermanager.cpp
kdelibs-3.3.1-new/kdecore/network/kresolvermanager.cpp
--- kdelibs-3.3.1/kdecore/network/kresolvermanager.cpp Sun Oct 3 03:40:16 2004
-+++ kdelibs-3.3.1-new/kdecore/network/kresolvermanager.cpp Wed Oct 13 11:33:53
2004
++++ kdelibs-3.3.1-new/kdecore/network/kresolvermanager.cpp Mon Oct 25 11:56:04
2004
@@ -31,6 +31,7 @@
#ifdef HAVE_RES_INIT
@@ -346,7 +346,7 @@
diff -uNr kdelibs-3.3.1/kdecore/network/ksocketdevice.cpp
kdelibs-3.3.1-new/kdecore/network/ksocketdevice.cpp
--- kdelibs-3.3.1/kdecore/network/ksocketdevice.cpp Sun Oct 3 03:40:16 2004
-+++ kdelibs-3.3.1-new/kdecore/network/ksocketdevice.cpp Wed Oct 13 11:33:54
2004
++++ kdelibs-3.3.1-new/kdecore/network/ksocketdevice.cpp Mon Oct 25 11:56:04
2004
@@ -311,7 +311,7 @@
}
@@ -385,7 +385,7 @@
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
diff -uNr kdelibs-3.3.1/kdecore/network/syssocket.h
kdelibs-3.3.1-new/kdecore/network/syssocket.h
--- kdelibs-3.3.1/kdecore/network/syssocket.h Tue May 25 22:34:35 2004
-+++ kdelibs-3.3.1-new/kdecore/network/syssocket.h Wed Oct 13 11:33:54 2004
++++ kdelibs-3.3.1-new/kdecore/network/syssocket.h Mon Oct 25 11:56:04 2004
@@ -53,7 +53,7 @@
}
@@ -427,7 +427,7 @@
}
diff -uNr kdelibs-3.3.1/kdecore/tests/kresolvertest.cpp
kdelibs-3.3.1-new/kdecore/tests/kresolvertest.cpp
--- kdelibs-3.3.1/kdecore/tests/kresolvertest.cpp Sat May 22 16:55:11 2004
-+++ kdelibs-3.3.1-new/kdecore/tests/kresolvertest.cpp Wed Oct 13 11:33:54 2004
++++ kdelibs-3.3.1-new/kdecore/tests/kresolvertest.cpp Mon Oct 25 11:56:04 2004
@@ -164,7 +164,7 @@
#else
int sock;
@@ -439,7 +439,7 @@
printf("\tTrying to create an IPv6 socket...");
diff -uNr kdelibs-3.3.1/kdesu/client.cpp kdelibs-3.3.1-new/kdesu/client.cpp
--- kdelibs-3.3.1/kdesu/client.cpp Wed Jun 25 10:56:23 2003
-+++ kdelibs-3.3.1-new/kdesu/client.cpp Wed Oct 13 11:33:54 2004
++++ kdelibs-3.3.1-new/kdesu/client.cpp Mon Oct 25 11:56:04 2004
@@ -42,7 +42,7 @@
};
@@ -460,7 +460,7 @@
if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &cred, &siz) == 0)
diff -uNr kdelibs-3.3.1/kdesu/su.cpp kdelibs-3.3.1-new/kdesu/su.cpp
--- kdelibs-3.3.1/kdesu/su.cpp Sat May 22 16:55:16 2004
-+++ kdelibs-3.3.1-new/kdesu/su.cpp Wed Oct 13 11:33:54 2004
++++ kdelibs-3.3.1-new/kdesu/su.cpp Mon Oct 25 11:56:04 2004
@@ -74,13 +74,14 @@
setTerminal(true);
@@ -479,7 +479,7 @@
if (::access(__PATH_SU, X_OK) != 0)
diff -uNr kdelibs-3.3.1/kdeui/Makefile.in kdelibs-3.3.1-new/kdeui/Makefile.in
--- kdelibs-3.3.1/kdeui/Makefile.in Fri Oct 8 09:54:06 2004
-+++ kdelibs-3.3.1-new/kdeui/Makefile.in Wed Oct 13 11:33:54 2004
++++ kdelibs-3.3.1-new/kdeui/Makefile.in Mon Oct 25 11:56:04 2004
@@ -591,11 +591,11 @@
lib_LTLIBRARIES = libkdeui.la libkspell.la
#>- libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
@@ -494,9 +494,20 @@
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
picsdir = $(kde_datadir)/kdeui/pics
+diff -uNr kdelibs-3.3.1/kio/kssl/kopenssl.cc kdelibs-3.3.1-new/kio/kssl/kopenssl.cc
+--- kdelibs-3.3.1/kio/kssl/kopenssl.cc Sat May 22 16:55:48 2004
++++ kdelibs-3.3.1-new/kio/kssl/kopenssl.cc Mon Oct 25 13:10:45 2004
+@@ -322,6 +322,7 @@
+ #elif defined(_AIX)
+ << "libcrypto.a(libcrypto.so.0)"
+ #elif defined(__APPLE__)
++ << "libcrypto.0.9.7.dylib"
+ << "libcrypto.dylib"
+ << "libcrypto.0.9.dylib"
+ #else
diff -uNr kdelibs-3.3.1/kio/misc/kpac/Makefile.in
kdelibs-3.3.1-new/kio/misc/kpac/Makefile.in
--- kdelibs-3.3.1/kio/misc/kpac/Makefile.in Fri Oct 8 09:54:12 2004
-+++ kdelibs-3.3.1-new/kio/misc/kpac/Makefile.in Wed Oct 13 11:33:54 2004
++++ kdelibs-3.3.1-new/kio/misc/kpac/Makefile.in Mon Oct 25 11:56:04 2004
@@ -517,7 +517,7 @@
downloader.cpp discovery.cpp proxyscout_skel.cpp
@@ -508,7 +519,7 @@
noinst_HEADERS = proxyscout.h script.h downloader.h discovery.h
diff -uNr kdelibs-3.3.1/kioslave/ftp/ftp.cc kdelibs-3.3.1-new/kioslave/ftp/ftp.cc
--- kdelibs-3.3.1/kioslave/ftp/ftp.cc Sun Oct 3 03:40:52 2004
-+++ kdelibs-3.3.1-new/kioslave/ftp/ftp.cc Wed Oct 13 11:33:55 2004
++++ kdelibs-3.3.1-new/kioslave/ftp/ftp.cc Mon Oct 25 11:56:04 2004
@@ -283,7 +283,7 @@
textClear();
}
@@ -520,7 +531,7 @@
}
diff -uNr kdelibs-3.3.1/kioslave/ftp/ftp.h kdelibs-3.3.1-new/kioslave/ftp/ftp.h
--- kdelibs-3.3.1/kioslave/ftp/ftp.h Tue Jun 22 13:36:42 2004
-+++ kdelibs-3.3.1-new/kioslave/ftp/ftp.h Wed Oct 13 11:33:55 2004
++++ kdelibs-3.3.1-new/kioslave/ftp/ftp.h Mon Oct 25 11:56:04 2004
@@ -196,7 +196,7 @@
/**
* utility to simplify calls to ::setsockopt(). Uses sock().
@@ -532,7 +543,7 @@
* utility to read data from the effective socket, see sock()
diff -uNr kdelibs-3.3.1/libltdl/Makefile.in kdelibs-3.3.1-new/libltdl/Makefile.in
--- kdelibs-3.3.1/libltdl/Makefile.in Fri Oct 8 09:54:17 2004
-+++ kdelibs-3.3.1-new/libltdl/Makefile.in Wed Oct 13 11:33:55 2004
++++ kdelibs-3.3.1-new/libltdl/Makefile.in Mon Oct 25 11:56:04 2004
@@ -50,9 +50,7 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -778,7 +789,7 @@
docs-am:
diff -uNr kdelibs-3.3.1/libltdl/ltdl.c kdelibs-3.3.1-new/libltdl/ltdl.c
--- kdelibs-3.3.1/libltdl/ltdl.c Fri Apr 2 08:48:51 2004
-+++ kdelibs-3.3.1-new/libltdl/ltdl.c Wed Oct 13 11:33:55 2004
++++ kdelibs-3.3.1-new/libltdl/ltdl.c Mon Oct 25 11:56:04 2004
@@ -29,12 +29,22 @@
# include <config.h>
#endif
@@ -5716,7 +5727,7 @@
-#endif /* _AIX */
diff -uNr kdelibs-3.3.1/libltdl/ltdl.h kdelibs-3.3.1-new/libltdl/ltdl.h
--- kdelibs-3.3.1/libltdl/ltdl.h Thu Apr 5 23:56:42 2001
-+++ kdelibs-3.3.1-new/libltdl/ltdl.h Wed Oct 13 11:33:55 2004
++++ kdelibs-3.3.1-new/libltdl/ltdl.h Mon Oct 25 11:56:04 2004
@@ -34,6 +34,9 @@
/* --- MACROS FOR PORTABILITY --- */
Index: kdelibs3-ssl.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/10.3/crypto/finkinfo/kdelibs3-ssl.info,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kdelibs3-ssl.info 13 Oct 2004 20:50:04 -0000 1.41
+++ kdelibs3-ssl.info 25 Oct 2004 17:14:03 -0000 1.42
@@ -1,6 +1,6 @@
Package: kdelibs3-ssl
Version: 3.3.1
-Revision: 21
+Revision: 22
Description: KDE - essential libraries (with SSL)
License: GPL/LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
