rpms/dcap/F-11 .cvsignore, 1.2, 1.3 dcap-libs.patch, 1.1, 1.2 dcap.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3 dcap-adler32.patch, 1.1, NONE

Wed Apr 7 14:00:51 UTC 2010

Author: ellert

Update of /cvs/pkgs/rpms/dcap/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18211/F-11

Modified Files:
	.cvsignore dcap-libs.patch dcap.spec import.log sources 
Removed Files:
	dcap-adler32.patch 
Log Message:
* Wed Apr 07 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.47.2-1
- New upstream release
- Drop dcap-adler32.patch - implemented upstream



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	17 Mar 2010 18:18:34 -0000	1.2
+++ .cvsignore	7 Apr 2010 14:00:49 -0000	1.3
@@ -1 +1 @@
-dcap-2.44.0.tar.gz
+dcap-2.47.2.tar.gz

dcap-libs.patch:
 configure.ac    |  338 ++------------------------------------------------------
 src/Makefile.am |    6 
 2 files changed, 20 insertions(+), 324 deletions(-)

Index: dcap-libs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/dcap-libs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dcap-libs.patch	17 Mar 2010 18:18:34 -0000	1.1
+++ dcap-libs.patch	7 Apr 2010 14:00:50 -0000	1.2
@@ -1,383 +1,430 @@
-diff -ur dcap-2.44.0.orig/configure.ac dcap-2.44.0/configure.ac
---- dcap-2.44.0.orig/configure.ac	2010-03-10 06:16:52.180550505 +0100
-+++ dcap-2.44.0/configure.ac	2010-03-11 22:16:16.928885522 +0100
-@@ -179,8 +179,8 @@
- EPEL_LIBS_NOT=1
- ])
- 
+diff -ur dcap-2.47.2.orig/configure.ac dcap-2.47.2/configure.ac
+--- dcap-2.47.2.orig/configure.ac	2010-04-07 11:19:38.000000000 +0200
++++ dcap-2.47.2/configure.ac	2010-04-07 13:46:48.557795270 +0200
+@@ -53,7 +53,6 @@
+ AM_PROG_CC_C_O
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([bind], [socket])
+-AC_SEARCH_LIBS([adler32], [z])
+ AC_CHECK_FUNCS([alarm])
+ AC_CHECK_FUNCS([atexit])
+ AC_CHECK_FUNCS([bzero])
+@@ -124,12 +123,21 @@
+ AC_C_BIGENDIAN
+ 
+ 
+-dnl Store the compile flags prior to testing the presance.
++dnl Store the compile flags prior to testing the presence.
+ 
+ _cppflags="${CPPFLAGS}"
+ _ldflags="${LDFLAGS}"
+ _ldlibpath="${LD_LIBRARY_PATH}"
+ 
++dnl === zlib stuff ===
++
++AC_CHECK_LIB(z, adler32, [ZLIB="-lz"])
++AC_SUBST(ZLIB)
++
++CPPFLAGS=${_cppflags}
++LDFLAGS=${_ldflags}
++LD_LIBRARY_PATH=${_ldlibpath}
++
+ dnl === openssl stuff ===
+ 
+ nossl=0
+@@ -139,7 +147,12 @@
+ AC_MSG_RESULT([Disabling ssl plugin as header files not found.])
+ else
+ AC_CHECK_LIB(ssl,SSL_library_init,[
+-SSL_LIBS="-lssl ${SSL_LIBS}"
++SSL_LIBS="-lssl"
++],[
++nossl=1
++])
++AC_CHECK_LIB(crypto,ERR_print_errors_fp,[
++SSL_LIBS="-lcrypto ${SSL_LIBS}"
+ ],[
+ nossl=1
+ ])
+@@ -188,66 +201,6 @@
+ GCC32PTHR_LIBS_NOT=0
+ GCC32DBGPTHR_LIBS_NOT=0
+ 
+-AC_CHECK_LIB(globus_common, globus_version_print, [
+-GLOBUS_EPEL_LIBS="-lglobus_common ${GLOBUS_EPEL_LIBS}"
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_proxy_ssl, X509V3_conf_free, [
 -GLOBUS_EPEL_LIBS="-lglobus_proxy_ssl ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(crypto, X509V3_conf_free, [
-+GLOBUS_EPEL_LIBS="-lcrypto ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
-@@ -191,49 +191,49 @@
- EPEL_LIBS_NOT=1
- ])
- 
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
+-AC_CHECK_LIB(globus_oldgaa, internal_error_handler, [
+-GLOBUS_EPEL_LIBS="-lglobus_oldgaa ${GLOBUS_EPEL_LIBS}"
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_error, globus_module_getenv, [
 -GLOBUS_EPEL_LIBS="-lglobus_openssl_error ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(globus_common, globus_module_getenv, [
-+GLOBUS_EPEL_LIBS="-lglobus_common ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
- 
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_sysconfig, globus_fifo_enqueue, [
 -GLOBUS_EPEL_LIBS="-lglobus_gsi_sysconfig ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(globus_common, globus_fifo_enqueue, [
-+GLOBUS_EPEL_LIBS="-lglobus_common ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
- 
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl, globus_module_activate, [
 -GLOBUS_EPEL_LIBS="-lglobus_openssl ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(globus_common, globus_module_activate, [
-+GLOBUS_EPEL_LIBS="-lglobus_common ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
- 
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_credential,globus_module_getenv, [
 -GLOBUS_EPEL_LIBS="-lglobus_gsi_credential ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(globus_common, globus_module_getenv, [
-+GLOBUS_EPEL_LIBS="-lglobus_common ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
- 
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_proxy_core,X509_sign, [
 -GLOBUS_EPEL_LIBS="-lglobus_gsi_proxy_core ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(crypto, X509_sign, [
-+GLOBUS_EPEL_LIBS="-lcrypto ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
- 
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_cert_utils,X509_get_subject_name, [
 -GLOBUS_EPEL_LIBS="-lglobus_gsi_cert_utils ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(crypto, X509_get_subject_name, [
-+GLOBUS_EPEL_LIBS="-lcrypto ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
- 
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_callback,X509_get_subject_name, [
 -GLOBUS_EPEL_LIBS="-lglobus_gsi_callback ${GLOBUS_EPEL_LIBS}"
-+AC_CHECK_LIB(crypto, X509_get_subject_name, [
-+GLOBUS_EPEL_LIBS="-lcrypto ${GLOBUS_EPEL_LIBS}"
- ],[
- EPEL_LIBS_NOT=1
- ])
- 
--AC_CHECK_LIB(globus_gssapi_gsi,gss_wrap, [
-+AC_CHECK_LIB(globus_gssapi_gsi, gss_wrap, [
+-],[
+-EPEL_LIBS_NOT=1
+-])
+-
+ AC_CHECK_LIB(globus_gssapi_gsi,gss_wrap, [
  GLOBUS_EPEL_LIBS="-lglobus_gssapi_gsi ${GLOBUS_EPEL_LIBS}"
  ],[
- EPEL_LIBS_NOT=1
-@@ -247,8 +247,8 @@
- GCC64PTHR_LIBS_NOT=1
- ])
+@@ -257,133 +210,14 @@
+ 
+ dnl == 64pthreads libary checking version ==
  
+-AC_CHECK_LIB(globus_common_gcc64pthr, globus_version_print, [
+-GLOBUS_GCC64PTHR_LIBS="-lglobus_common_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_proxy_ssl_gcc64pthr, X509V3_conf_free, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_proxy_ssl_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64pthr, X509V3_conf_free, [
-+GLOBUS_GCC64PTHR_LIBS="-lcrypto_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
-@@ -259,49 +259,49 @@
- GCC64PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
+-AC_CHECK_LIB(globus_oldgaa_gcc64pthr, internal_error_handler, [
+-GLOBUS_GCC64PTHR_LIBS="-lglobus_oldgaa_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_error_gcc64pthr, globus_module_getenv, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_openssl_error_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64pthr, globus_module_getenv, [
-+GLOBUS_GCC64PTHR_LIBS="-lglobus_common_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_sysconfig_gcc64pthr, globus_fifo_enqueue, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_sysconfig_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64pthr, globus_fifo_enqueue, [
-+GLOBUS_GCC64PTHR_LIBS="-lglobus_common_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_gcc64pthr, globus_module_activate, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_openssl_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64pthr, globus_module_activate, [
-+GLOBUS_GCC64PTHR_LIBS="-lglobus_common_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_credential_gcc64pthr,globus_module_getenv, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_credential_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64pthr, globus_module_getenv, [
-+GLOBUS_GCC64PTHR_LIBS="-lglobus_common_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_proxy_core_gcc64pthr,X509_sign, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_proxy_core_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64pthr, X509_sign, [
-+GLOBUS_GCC64PTHR_LIBS="-lcrypto_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_cert_utils_gcc64pthr,X509_get_subject_name, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_cert_utils_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64pthr, X509_get_subject_name, [
-+GLOBUS_GCC64PTHR_LIBS="-lcrypto_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_callback_gcc64pthr,X509_get_subject_name, [
 -GLOBUS_GCC64PTHR_LIBS="-lglobus_gsi_callback_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64pthr, X509_get_subject_name, [
-+GLOBUS_GCC64PTHR_LIBS="-lcrypto_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
- ])
- 
--AC_CHECK_LIB(globus_gssapi_gsi_gcc64pthr,gss_wrap, [
-+AC_CHECK_LIB(globus_gssapi_gsi_gcc64pthr, gss_wrap, [
+-],[
+-GCC64PTHR_LIBS_NOT=1
+-])
+-
+ AC_CHECK_LIB(globus_gssapi_gsi_gcc64pthr,gss_wrap, [
  GLOBUS_GCC64PTHR_LIBS="-lglobus_gssapi_gsi_gcc64pthr ${GLOBUS_GCC64PTHR_LIBS}"
- ],[
- GCC64PTHR_LIBS_NOT=1
-@@ -316,8 +316,8 @@
- GCC64DBGPTHR_LIBS_NOT=1
++GCC64PTHR_LIBS_NOT=1
  ])
  
+ 
+ dnl == 64dbgpthr libary checking version ==
+ 
+-AC_CHECK_LIB(globus_common_gcc64dbgpthr, globus_version_print, [
+-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_common_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_proxy_ssl_gcc64dbgpthr, X509V3_conf_free, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_proxy_ssl_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64dbgpthr, X509V3_conf_free, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lcrypto_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
-@@ -328,49 +328,49 @@
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
+-AC_CHECK_LIB(globus_oldgaa_gcc64dbgpthr, internal_error_handler, [
+-GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_oldgaa_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_error_gcc64dbgpthr, globus_module_getenv, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_openssl_error_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64dbgpthr, globus_module_getenv, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_common_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_sysconfig_gcc64dbgpthr, globus_fifo_enqueue, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_sysconfig_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64dbgpthr, globus_fifo_enqueue, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_common_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_gcc64dbgpthr, globus_module_activate, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_openssl_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64dbgpthr, globus_module_activate, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_common_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_credential_gcc64dbgpthr,globus_module_getenv, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_credential_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc64dbgpthr,globus_module_getenv, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_common_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_proxy_core_gcc64dbgpthr,X509_sign, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_proxy_core_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64dbgpthr, X509_sign, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lcrypto_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_cert_utils_gcc64dbgpthr,X509_get_subject_name, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_cert_utils_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64dbgpthr, X509_get_subject_name, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lcrypto_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_callback_gcc64dbgpthr,X509_get_subject_name, [
 -GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gsi_callback_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc64dbgpthr, X509_get_subject_name, [
-+GLOBUS_GCC64DBGPTHR_LIBS="-lcrypto_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
- ],[
- GCC64DBGPTHR_LIBS_NOT=1
- ])
- 
--AC_CHECK_LIB(globus_gssapi_gsi_gcc64dbgpthr,gss_wrap, [
-+AC_CHECK_LIB(globus_gssapi_gsi_gcc64dbgpthr, gss_wrap, [
+-],[
+-GCC64DBGPTHR_LIBS_NOT=1
+-])
+-
+ AC_CHECK_LIB(globus_gssapi_gsi_gcc64dbgpthr,gss_wrap, [
  GLOBUS_GCC64DBGPTHR_LIBS="-lglobus_gssapi_gsi_gcc64dbgpthr ${GLOBUS_GCC64DBGPTHR_LIBS}"
  ],[
- GCC64DBGPTHR_LIBS_NOT=1
-@@ -388,8 +388,8 @@
- GCC32PTHR_LIBS_NOT=1
- ])
+@@ -393,66 +227,6 @@
  
+ dnl == 32pthreads libary checking version ==
+ 
+-AC_CHECK_LIB(globus_common_gcc32pthr, globus_version_print, [
+-GLOBUS_GCC32PTHR_LIBS="-lglobus_common_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_proxy_ssl_gcc32pthr, X509V3_conf_free, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_proxy_ssl_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32pthr, X509V3_conf_free, [
-+GLOBUS_GCC32PTHR_LIBS="-lcrypto_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
-@@ -400,49 +400,49 @@
- GCC32PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
+-AC_CHECK_LIB(globus_oldgaa_gcc32pthr, internal_error_handler, [
+-GLOBUS_GCC32PTHR_LIBS="-lglobus_oldgaa_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_error_gcc32pthr, globus_module_getenv, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_openssl_error_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32pthr, globus_module_getenv, [
-+GLOBUS_GCC32PTHR_LIBS="-lglobus_common_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_sysconfig_gcc32pthr, globus_fifo_enqueue, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_sysconfig_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32pthr, globus_fifo_enqueue, [
-+GLOBUS_GCC32PTHR_LIBS="-lglobus_common_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_gcc32pthr, globus_module_activate, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_openssl_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32pthr, globus_module_activate, [
-+GLOBUS_GCC32PTHR_LIBS="-lglobus_common_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_credential_gcc32pthr,globus_module_getenv, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_credential_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32pthr, globus_module_getenv, [
-+GLOBUS_GCC32PTHR_LIBS="-lglobus_common_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_proxy_core_gcc32pthr,X509_sign, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_proxy_core_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32pthr, X509_sign, [
-+GLOBUS_GCC32PTHR_LIBS="-lcrypto_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_cert_utils_gcc32pthr,X509_get_subject_name, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_cert_utils_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32pthr, X509_get_subject_name, [
-+GLOBUS_GCC32PTHR_LIBS="-lcrypto_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_callback_gcc32pthr,X509_get_subject_name, [
 -GLOBUS_GCC32PTHR_LIBS="-lglobus_gsi_callback_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32pthr, X509_get_subject_name, [
-+GLOBUS_GCC32PTHR_LIBS="-lcrypto_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
- ],[
- GCC32PTHR_LIBS_NOT=1
- ])
- 
--AC_CHECK_LIB(globus_gssapi_gsi_gcc32pthr,gss_wrap, [
-+AC_CHECK_LIB(globus_gssapi_gsi_gcc32pthr, gss_wrap, [
+-],[
+-GCC32PTHR_LIBS_NOT=1
+-])
+-
+ AC_CHECK_LIB(globus_gssapi_gsi_gcc32pthr,gss_wrap, [
  GLOBUS_GCC32PTHR_LIBS="-lglobus_gssapi_gsi_gcc32pthr ${GLOBUS_GCC32PTHR_LIBS}"
  ],[
- GCC32PTHR_LIBS_NOT=1
-@@ -456,8 +456,8 @@
- GCC32DBGPTHR_LIBS_NOT=1
- ])
+@@ -462,66 +236,6 @@
+ 
+ dnl == 32dbgpthr libary checking version ==
  
+-AC_CHECK_LIB(globus_common_gcc32dbgpthr, globus_version_print, [
+-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_common_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_proxy_ssl_gcc32dbgpthr, X509V3_conf_free, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_proxy_ssl_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32dbgpthr, X509V3_conf_free, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lcrypto_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
- ])
-@@ -468,49 +468,49 @@
- GCC32DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
+-AC_CHECK_LIB(globus_oldgaa_gcc32dbgpthr, internal_error_handler, [
+-GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_oldgaa_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_error_gcc32dbgpthr, globus_module_getenv, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_openssl_error_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32dbgpthr, globus_module_getenv, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_common_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_sysconfig_gcc32dbgpthr, globus_fifo_enqueue, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_sysconfig_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32dbgpthr, globus_fifo_enqueue, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_common_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_openssl_gcc32dbgpthr, globus_module_activate, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_openssl_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32dbgpthr, globus_module_activate, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_common_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_credential_gcc32dbgpthr,globus_module_getenv, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_credential_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(globus_common_gcc32dbgpthr, globus_module_getenv, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_common_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_proxy_core_gcc32dbgpthr,X509_sign, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_proxy_core_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32dbgpthr, X509_sign, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lcrypto_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_cert_utils_gcc32dbgpthr,X509_get_subject_name, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_cert_utils_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32dbgpthr, X509_get_subject_name, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lcrypto_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
- ])
- 
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
 -AC_CHECK_LIB(globus_gsi_callback_gcc32dbgpthr,X509_get_subject_name, [
 -GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gsi_callback_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
-+AC_CHECK_LIB(crypto_gcc32dbgpthr, X509_get_subject_name, [
-+GLOBUS_GCC32DBGPTHR_LIBS="-lcrypto_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
+-],[
+-GCC32DBGPTHR_LIBS_NOT=1
+-])
+-
+ AC_CHECK_LIB(globus_gssapi_gsi_gcc32dbgpthr,gss_wrap, [
+ GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gssapi_gsi_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
  ],[
- GCC32DBGPTHR_LIBS_NOT=1
+@@ -606,24 +320,6 @@
+ nokrb=1
  ])
  
--AC_CHECK_LIB(globus_gssapi_gsi_gcc32dbgpthr,gss_wrap, [
-+AC_CHECK_LIB(globus_gssapi_gsi_gcc32dbgpthr, gss_wrap, [
- GLOBUS_GCC32DBGPTHR_LIBS="-lglobus_gssapi_gsi_gcc32dbgpthr ${GLOBUS_GCC32DBGPTHR_LIBS}"
- ],[
- GCC32DBGPTHR_LIBS_NOT=1
+-AC_CHECK_LIB(crypto,fread, [
+-KRB_LIBS="-lcrypto ${KRB_LIBS}"
+-],[
+-nokrb=1
+-])
+-
+-AC_CHECK_LIB(c,strcmp, [
+-KRB_LIBS="-lc ${KRB_LIBS}"
+-],[
+-nokrb=1
+-])
+-
+-AC_CHECK_LIB(resolv,fopen, [
+-KRB_LIBS="-lresolv ${KRB_LIBS}"
+-],[
+-nokrb=1
+-])
+-
+ fi
+ AC_SUBST(KRB_LIBS)
+ 
+diff -ur dcap-2.47.2.orig/src/Makefile.am dcap-2.47.2/src/Makefile.am
+--- dcap-2.47.2.orig/src/Makefile.am	2010-04-07 11:19:38.000000000 +0200
++++ dcap-2.47.2/src/Makefile.am	2010-04-07 12:06:42.888544481 +0200
+@@ -109,14 +109,14 @@
+ lib_LTLIBRARIES = libdcap.la libpdcap.la
+ 
+ libdcap_la_SOURCES = $(c_sources)
+-libdcap_la_LIBADD = -lpthread -ldl
++libdcap_la_LIBADD = $(ZLIB) -lpthread -ldl
+ libdcap_la_LDFLAGS = -no-undefined -version-info $(LIBRARY_VERSION)
+ 
+ libpdcap_la_SOURCES = $(p_loadsrc) $(c_sources)
+-libpdcap_la_LIBADD = -lpthread -ldl
++libpdcap_la_LIBADD = $(ZLIB) -lpthread -ldl
+ libpdcap_la_LDFLAGS = -no-undefined -version-info $(LIBRARY_VERSION)
+ 
+-bin_PROGRAMS = dccp dcap_test dcsuck readv_test wdccp dcap_url-test
++bin_PROGRAMS = dccp dcap_test dcsuck readv_test wdccp dcap_url_test
+ 
+ dccp_SOURCES = dccp.c $(h_internal)
+ dccp_LDFLAGS =


Index: dcap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/dcap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dcap.spec	17 Mar 2010 18:18:34 -0000	1.1
+++ dcap.spec	7 Apr 2010 14:00:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		dcap
-Version:	2.44.0
-Release:	3%{?dist}
+Version:	2.47.2
+Release:	1%{?dist}
 Summary:	Client Tools for dCache
 
 Group:		Applications/Internet
@@ -9,20 +9,17 @@ Group:		Applications/Internet
 License:	LGPLv2+ and BSD
 URL:		http://www.dcache.org/manuals/libdcap.shtml
 #		The source tarfile is created from a subversion checkout:
-#		svn co http://svn.dcache.org/dCache/tags/dcap-2.44.0-0 \
-#		    dcap-2.44.0
-#		tar -z -c --exclude .svn -f dcap-2.44.0.tar.gz dcap-2.44.0
+#		svn co http://svn.dcache.org/dCache/tags/dcap-2.47.2-0 \
+#		    dcap-2.47.2
+#		tar -z -c --exclude .svn -f dcap-2.47.2.tar.gz dcap-2.47.2
 Source0:	%{name}-%{version}.tar.gz
 Patch0:		%{name}-dlopen.patch
 #		Don't install empty documentation files:
 #		http://rb.dcache.org/r/1645
 Patch1:		%{name}-docs.patch
-#		Drop the bundled adler32 source from zlib:
-#		http://rb.dcache.org/r/1628
-Patch2:		%{name}-adler32.patch
-#		Make configure look in the correct libraries:
+#		Reduce overlinking
 #		http://rb.dcache.org/r/1646
-Patch3:		%{name}-libs.patch
+Patch2:		%{name}-libs.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
@@ -100,8 +97,7 @@ This library is dynamically loaded at ru
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
-%patch3 -p1
+%patch2 -p1
 
 for f in Copyright base64.c base64.h util.c ; do
     iconv -f iso-8859-1 -t utf-8 plugins/gssapi/$f -o plugins/gssapi/$f.new
@@ -146,6 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/dccp
 %{_bindir}/dcap_test
+%{_bindir}/dcap_url_test
 %{_bindir}/dcsuck
 %{_bindir}/readv_test
 %{_bindir}/wdccp
@@ -184,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/%{name}/libtelnetTunnel.so
 
 %changelog
+* Wed Apr 07 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.47.2-1
+- New upstream release
+- Drop dcap-adler32.patch - implemented upstream
+
 * Thu Mar 11 2010 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.44.0-3
 - Add missing build requires on autotools
 - Fix configure to look for functions in the right libraries


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	17 Mar 2010 18:18:34 -0000	1.1
+++ import.log	7 Apr 2010 14:00:50 -0000	1.2
@@ -1 +1,2 @@
 dcap-2_44_0-3_fc12:F-11:dcap-2.44.0-3.fc12.src.rpm:1268849894
+dcap-2_47_2-1_fc12:F-11:dcap-2.47.2-1.fc12.src.rpm:1270648828


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dcap/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	17 Mar 2010 18:18:35 -0000	1.2
+++ sources	7 Apr 2010 14:00:50 -0000	1.3
@@ -1 +1 @@
-cd6e7ae4638da51f522b5cf9a5a6deff  dcap-2.44.0.tar.gz
+d605ca58fd387350ecf0254ed6b17e93  dcap-2.47.2.tar.gz


--- dcap-adler32.patch DELETED ---

