esc/win32 coolkey-64.iss,1.1.2.2,1.1.2.3
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6607
Modified Files:
Tag: PKI_8_0_RTM_BRANCH
coolkey-64.iss
Log Message:
Fixed minor missed file.
Index: coolkey-64.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/coolkey-64.iss,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- coolkey-64.iss 9 Oct 2009 01:18:19 -0000 1.1.2.2
+++ coolkey-64.iss 14 Oct 2009 02:23:53 -0000 1.1.2.3
@@ -34,6 +34,7 @@
Source: BUILD\clkcsp.sig; DestDir: {sys}
Source: BUILD\vcredist_x64.exe; DestDir: "{tmp}"
Source: BUILD\coolkeypk11.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\zlibwapi.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\libckyapplet-1.dll; DestDir: {sys}; Flags: restartreplace
14 years, 5 months
mod_restartd Makefile.in, 1.12, 1.13 README, 1.2, 1.3 aclocal.m4, 1.11, 1.12 configure, 1.11, 1.12 ltmain.sh, 1.4, 1.5
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/mod_restartd
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17341
Modified Files:
Makefile.in README aclocal.m4 configure ltmain.sh
Log Message:
this is now obsolete - mod_restartd has been moved into the adminserver source tree
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_restartd/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Makefile.in 12 Jan 2009 16:47:33 -0000 1.12
+++ Makefile.in 9 Oct 2009 16:17:02 -0000 1.13
@@ -197,6 +197,7 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
Index: README
===================================================================
RCS file: /cvs/dirsec/mod_restartd/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- README 3 Nov 2005 20:12:57 -0000 1.2
+++ README 9 Oct 2009 16:17:02 -0000 1.3
@@ -1,3 +1,9 @@
+NOTE: As of October 8, 2009, there is no longer a standalone mod_restartd
+CVS repository. mod_restartd is now part of the admin server git source
+tree. The contents of this directory should only be used for historical
+purposes.
+
+
08/15/2005
This is a modified mod_cgid.c from httpd-2.0.46. The changes have
Index: aclocal.m4
===================================================================
RCS file: /cvs/dirsec/mod_restartd/aclocal.m4,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aclocal.m4 12 Jan 2009 16:47:33 -0000 1.11
+++ aclocal.m4 9 Oct 2009 16:17:02 -0000 1.12
@@ -1578,10 +1578,27 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4288,6 +4305,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -4421,11 +4441,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -4437,7 +4457,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -4517,7 +4537,7 @@
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6353,6 +6373,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,6 +6406,7 @@
done
])
SED=$lt_cv_path_SED
+AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_restartd/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 12 Jan 2009 16:47:33 -0000 1.11
+++ configure 9 Oct 2009 16:17:02 -0000 1.12
@@ -462,7 +462,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG APXS
HAVE_ADMINSERVER_TRUE HAVE_ADMINSERVER_FALSE apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags ap_ver_suf moddir LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL APR_CONFIG A
PXS HAVE_ADMINSERVER_TRUE HAVE_ADMINSERVER_FALSE apr_inc apache_inc apache_conf apache_prefix apache_bin extra_cppflags ap_ver_suf moddir LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -3200,6 +3200,7 @@
done
done
done
+IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -3234,6 +3235,7 @@
fi
SED=$lt_cv_path_SED
+
echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6
@@ -3674,7 +3676,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3677 "configure"' > conftest.$ac_ext
+ echo '#line 3679 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5273,7 +5275,7 @@
# Provide some information about the compiler.
-echo "$as_me:5276:" \
+echo "$as_me:5278:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6336,11 +6338,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6339: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6341: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6343: \$? = $ac_status" >&5
+ echo "$as_me:6345: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6604,11 +6606,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6607: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6611: \$? = $ac_status" >&5
+ echo "$as_me:6613: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6708,11 +6710,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6711: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6713: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6715: \$? = $ac_status" >&5
+ echo "$as_me:6717: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8173,10 +8175,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 8182 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -9053,7 +9076,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9056 "configure"
+#line 9079 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9153,7 +9176,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9156 "configure"
+#line 9179 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9484,6 +9507,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -9617,11 +9643,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects
+predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects
+postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -9633,7 +9659,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -9713,7 +9739,7 @@
link_all_deplibs=$link_all_deplibs
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -11493,11 +11519,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11496: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11522: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11500: \$? = $ac_status" >&5
+ echo "$as_me:11526: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11597,11 +11623,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11600: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11626: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11604: \$? = $ac_status" >&5
+ echo "$as_me:11630: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12129,10 +12155,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 12162 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12516,6 +12563,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_CXX
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -12649,11 +12699,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_CXX
+predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_CXX
+postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -12665,7 +12715,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12745,7 +12795,7 @@
link_all_deplibs=$link_all_deplibs_CXX
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -13167,11 +13217,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13170: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13220: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13174: \$? = $ac_status" >&5
+ echo "$as_me:13224: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13271,11 +13321,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13274: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13324: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13278: \$? = $ac_status" >&5
+ echo "$as_me:13328: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14716,10 +14766,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 14773 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15103,6 +15174,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_F77
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -15236,11 +15310,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_F77
+predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_F77
+postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -15252,7 +15326,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -15332,7 +15406,7 @@
link_all_deplibs=$link_all_deplibs_F77
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -15474,11 +15548,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15477: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15551: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15481: \$? = $ac_status" >&5
+ echo "$as_me:15555: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15742,11 +15816,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15745: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15819: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15749: \$? = $ac_status" >&5
+ echo "$as_me:15823: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15846,11 +15920,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15849: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15923: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15853: \$? = $ac_status" >&5
+ echo "$as_me:15927: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17311,10 +17385,31 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # find out which ABI we are using
+ libsuff=
+ case "$host_cpu" in
+ x86_64*|s390x*|powerpc64*)
+ echo '#line 17392 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ case `/usr/bin/file conftest.$ac_objext` in
+ *64-bit*)
+ libsuff=64
+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ ;;
+ esac
+ fi
+ rm -rf conftest*
+ ;;
+ esac
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17698,6 +17793,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_GCJ
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -17831,11 +17929,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_GCJ
+predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
+postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -17847,7 +17945,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -17927,7 +18025,7 @@
link_all_deplibs=$link_all_deplibs_GCJ
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -18179,6 +18277,9 @@
# Is the compiler the GNU C compiler?
with_gcc=$GCC_RC
+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
# An ERE matcher.
EGREP=$lt_EGREP
@@ -18312,11 +18413,11 @@
# Dependencies to place before the objects being linked to create a
# shared library.
-predep_objects=$lt_predep_objects_RC
+predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
-postdep_objects=$lt_postdep_objects_RC
+postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
@@ -18328,7 +18429,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -18408,7 +18509,7 @@
link_all_deplibs=$link_all_deplibs_RC
# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -19899,6 +20000,7 @@
s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
+s,@SED@,$SED,;t t
s,@EGREP@,$EGREP,;t t
s,@LN_S@,$LN_S,;t t
s,@ECHO@,$ECHO,;t t
Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/mod_restartd/ltmain.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ltmain.sh 12 Jan 2009 16:47:33 -0000 1.4
+++ ltmain.sh 9 Oct 2009 16:17:02 -0000 1.5
@@ -46,10 +46,16 @@
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
+else
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
# Check that we have a working $echo.
@@ -105,12 +111,14 @@
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
- save_LANG="$LANG"; LANG=C; export LANG
-fi
+for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+ eval "if test \"\${$lt_var+set}\" = set; then
+ save_$lt_var=\$$lt_var
+ $lt_var=C
+ export $lt_var
+ fi"
+done
# Make sure IFS has a sensible default
lt_nl='
@@ -136,6 +144,8 @@
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
#####################################
# Shell function definitions:
@@ -327,7 +337,17 @@
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
- my_xdir="$my_gentop/$my_xlib"
+ my_xlib_u=$my_xlib
+ while :; do
+ case " $extracted_archives " in
+ *" $my_xlib_u "*)
+ extracted_serial=`expr $extracted_serial + 1`
+ my_xlib_u=lt$extracted_serial-$my_xlib ;;
+ *) break ;;
+ esac
+ done
+ extracted_archives="$extracted_archives $my_xlib_u"
+ my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@@ -758,6 +778,7 @@
*.f90) xform=f90 ;;
*.for) xform=for ;;
*.java) xform=java ;;
+ *.obj) xform=obj ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -1138,8 +1159,9 @@
for arg
do
case $arg in
- -all-static | -static)
- if test "X$arg" = "X-all-static"; then
+ -all-static | -static | -static-libtool-libs)
+ case $arg in
+ -all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@@ -1147,12 +1169,20 @@
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
- else
+ ;;
+ -static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
- fi
+ ;;
+ -static-libtool-libs)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ prefer_static_libs=yes
+ ;;
+ esac
build_libtool_libs=no
build_old_libs=yes
break
@@ -1712,7 +1742,7 @@
continue
;;
- -static)
+ -static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@@ -2490,7 +2520,9 @@
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ { { test "$prefer_static_libs" = no ||
+ test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@@ -3186,7 +3218,7 @@
# which has an extra 1 added just for fun
#
case $version_type in
- darwin|linux|osf|windows)
+ darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@@ -3410,11 +3442,11 @@
fi
# Eliminate all temporary directories.
- for path in $notinst_path; do
- lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
- deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
- dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
- done
+# for path in $notinst_path; do
+# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+# done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@@ -3515,13 +3547,12 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
- if test "$name" != "" && test "$name" -ne "0"; then
+ if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -3560,9 +3591,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC $LTCFLAGS -o conftest conftest.c $i
- # Did it work?
- if test "$?" -eq 0 ; then
+ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@@ -3594,7 +3623,7 @@
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
- $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** make it link in! You will probably need to install it or some"
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
@@ -4239,12 +4268,14 @@
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec
+ # -Wl from whole_archive_flag_spec and hope we can get by with
+ # turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@@ -4692,16 +4723,16 @@
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE(a)%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@@ -4716,13 +4747,13 @@
# really was required.
# Nullify the symbol file.
- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@@ -4809,7 +4840,7 @@
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@@ -4846,7 +4877,7 @@
fi
done
relink_command="(cd `pwd`; $relink_command)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@@ -5253,6 +5284,18 @@
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
+ setopt NO_GLOB_SUBST
+else
+ case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5395,7 +5438,7 @@
;;
esac
$echo >> $output "\
- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ \$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@@ -5581,7 +5624,7 @@
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@@ -5926,9 +5969,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6137,7 +6180,7 @@
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@@ -6413,12 +6456,15 @@
fi
# Restore saved environment variables
- if test "${save_LC_ALL+set}" = set; then
- LC_ALL="$save_LC_ALL"; export LC_ALL
- fi
- if test "${save_LANG+set}" = set; then
- LANG="$save_LANG"; export LANG
- fi
+ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+ do
+ eval "if test \"\${save_$lt_var+set}\" = set; then
+ $lt_var=\$save_$lt_var; export $lt_var
+ else
+ $lt_unset $lt_var
+ fi"
+ done
+
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@@ -6775,9 +6821,9 @@
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
- try to export only the symbols listed in SYMFILE
+ try to export only the symbols listed in SYMFILE
-export-symbols-regex REGEX
- try to export only the symbols matching REGEX
+ try to export only the symbols matching REGEX
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
@@ -6791,9 +6837,11 @@
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
- -static do not do any dynamic linking of libtool libraries
+ -static do not do any dynamic linking of uninstalled libtool libraries
+ -static-libtool-libs
+ do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
- specify library version info [each variable defaults to 0]
+ specify library version info [each variable defaults to 0]
All other options (arguments beginning with \`-') are ignored.
14 years, 5 months
mod_admserv README,1.3,1.4 mod_admserv.c,1.38,1.39
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17203
Modified Files:
README mod_admserv.c
Log Message:
this is now obsolete - mod_admserv has been moved into the adminserver source tree
Index: README
===================================================================
RCS file: /cvs/dirsec/mod_admserv/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README 7 Oct 2005 21:00:49 -0000 1.3
+++ README 9 Oct 2009 16:16:20 -0000 1.4
@@ -1,3 +1,8 @@
+NOTE: As of October 8, 2009, there is no longer a standalone mod_admserv
+CVS repository. mod_admserv is now part of the admin server git source
+tree. The contents of this directory should only be used for historical
+purposes.
+
mod_admserv - http://directory.fedora.redhat.com/wiki/mod_admserv
mod_admserv provides the HTTP functionality associated with the Fedora Administration Server http://directory.fedora.redhat.com/wiki/AdminServer. It is a standard Apache module and uses standard Apache build tools and configure. In addition, you will also need NSPR, NSS, and the LDAP C SDK from Mozilla, as well as the AdminUtil component provided as part of the Fedora DS - http://directory.fedora.redhat.com/wiki/AdminUtil.
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mod_admserv.c 28 Jan 2009 00:05:13 -0000 1.38
+++ mod_admserv.c 9 Oct 2009 16:16:21 -0000 1.39
@@ -569,14 +569,25 @@
static apr_status_t close_pipe(void *thefd)
{
int fd = (int)((intptr_t)thefd);
+ int rc;
- return close(fd);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0 /* status */, NULL,
+ "close_pipe(): closing pipe %d errno %d", fd, errno);
+ errno = 0;
+
+ rc = close(fd);
+
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0 /* status */, NULL,
+ "close_pipe(): closed pipe rc = %d errno = %d",
+ rc, errno);
+
+ return rc;
}
static int password_pipe(request_rec *r)
{
apr_table_t *e = r->subprocess_env;
- int fd;
+ int fd, wfd;
apr_size_t nbytes;
apr_file_t *readp = NULL;
apr_file_t *writep = NULL;
@@ -619,6 +630,10 @@
/* Get the low-level file descriptor */
apr_os_file_get(&fd, readp);
+ apr_os_file_get(&wfd, writep);
+
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+ "password_pipe(): created pipe read %d write %d", fd, wfd);
/* Register a cleanup callback so this gets closed at the end of the
request. */
@@ -631,9 +646,15 @@
nbytes = strlen(ans);
apr_file_write(writep, ans, &nbytes);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+ "password_pipe(): wrote %d bytes");
+
/* Close the writing side, we don't need this any more */
apr_file_close(writep);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+ "password_pipe(): closed write descriptor");
+
return 0;
}
@@ -747,7 +768,7 @@
extractLdapError(const server_rec *s, const char *url)
{
ap_log_error(APLOG_MARK, APLOG_ERR, 0 /* status */, s,
- "extractLdapServerData(): the LDAP url [%s] is invalid\n",
+ "extractLdapServerData(): the LDAP url [%s] is invalid",
url ? url : "(null)");
return FALSE;
}
@@ -2495,6 +2516,8 @@
cf->adminsdk = flag;
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, "[%d] adminsdk [0x%p] flag %d",
+ getpid(), cf, flag);
return NULL;
}
@@ -2612,6 +2635,10 @@
int pw_expiring = 0;
int tries = 0;
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
+ "authenticate_user: begin auth user [%s] pw [%s] in [%s] for [%s:%d]",
+ user, pw, baseDN, data->host, data->port);
+
if (!(server = openLDAPConnection(data)))
ap_log_rerror(APLOG_MARK, APLOG_NOTICE|APLOG_NOERRNO, 0, r,
"unable to open LDAPConnection to server [%s:%d]", data->host, data->port);
@@ -2826,6 +2853,9 @@
admserv_config *cf = ap_get_module_config(r->per_dir_config,
&admserv_module);
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "fixup_adminsdk flag is %d", cf->adminsdk);
+
if (!cf->adminsdk)
return DECLINED;
14 years, 5 months
esc/win32 coolkey-64.iss,1.1.2.1,1.1.2.2
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26146
Modified Files:
Tag: PKI_8_0_RTM_BRANCH
coolkey-64.iss
Log Message:
Forgot needed coolkey files.
Index: coolkey-64.iss
===================================================================
RCS file: /cvs/dirsec/esc/win32/coolkey-64.iss,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- coolkey-64.iss 8 Oct 2009 23:40:52 -0000 1.1.2.1
+++ coolkey-64.iss 9 Oct 2009 01:18:19 -0000 1.1.2.2
@@ -33,6 +33,8 @@
Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\clkcsp.sig; DestDir: {sys}
Source: BUILD\vcredist_x64.exe; DestDir: "{tmp}"
+Source: BUILD\coolkeypk11.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\libckyapplet-1.dll; DestDir: {sys}; Flags: restartreplace
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
14 years, 5 months
esc/win32 build.sh,1.11.2.2,1.11.2.3
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25110
Modified Files:
Tag: PKI_8_0_RTM_BRANCH
build.sh
Log Message:
Fix typo.
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -r1.11.2.2 -r1.11.2.3
--- build.sh 9 Oct 2009 00:48:49 -0000 1.11.2.2
+++ build.sh 9 Oct 2009 01:14:43 -0000 1.11.2.3
@@ -630,7 +630,7 @@
exit 1
fi
-#buildCOOLKEY
+buildCOOLKEY
if [ $? != 0 ];
then
14 years, 5 months
esc/win32 build.sh,1.11.2.1,1.11.2.2
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15414
Modified Files:
Tag: PKI_8_0_RTM_BRANCH
build.sh
Log Message:
Change coolkey tag.
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- build.sh 8 Oct 2009 23:40:51 -0000 1.11.2.1
+++ build.sh 9 Oct 2009 00:48:49 -0000 1.11.2.2
@@ -66,7 +66,7 @@
#CoolKey values
COOLKEY_NAME=coolkey
-COOLKEY_TAG=HEAD
+COOLKEY_TAG=PKI_8_0_RTM_BRANCH
#Fedora repo for CoolKey and ESC
14 years, 5 months
esc/win32 coolkey-64-info-before.txt, 1.1, 1.2 coolkey-64.iss, 1.1, 1.2 build.sh, 1.11, 1.12
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28146
Modified Files:
build.sh
Added Files:
coolkey-64-info-before.txt coolkey-64.iss
Log Message:
#514341 simple changes to compile 64 bit installer.
Index: coolkey-64-info-before.txt
===================================================================
RCS file: coolkey-64-info-before.txt
diff -N coolkey-64-info-before.txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ coolkey-64-info-before.txt 8 Oct 2009 23:45:30 -0000 1.2
@@ -0,0 +1,4 @@
+This installation program will install the following:
+
+1. The PKCS #11 module needed for Smart Cards.
+2. The CAPI driver for Smart Cards.
Index: coolkey-64.iss
===================================================================
RCS file: coolkey-64.iss
diff -N coolkey-64.iss
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ coolkey-64.iss 8 Oct 2009 23:45:30 -0000 1.2
@@ -0,0 +1,78 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+[Setup]
+AppName=Coolkey
+AppId=Coolkey
+AppVerName=Coolkey 1.0.0-1
+AppPublisher=Red Hat
+CreateAppDir=true
+Compression=lzma
+SolidCompression=true
+MinVersion=0,5.0.2195
+ShowLanguageDialog=yes
+OutputBaseFilename=CoolkeySetup-1.0.0-1.win64.x64
+DefaultDirName={pf}\Red Hat\Coolkey
+DisableProgramGroupPage=false
+DefaultGroupName=Red Hat
+SetupIconFile=..\src\app\xpcom\tray\esc.ico
+UninstallDisplayIcon={app}\esc.ico
+WizardSmallImageFile=..\src\app\xpcom\tray\esc.bmp
+AllowNoIcons=yes
+LicenseFile=esc-license.txt
+InfoBeforeFile=coolkey-64-info-before.txt
+PrivilegesRequired=admin
+VersionInfoVersion=1.0.0.1
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode=x64
+
+[Files]
+Source: BUILD\regcerts.exe; DestDir: {app}
+Source: ..\src\app\xpcom\tray\esc.ico; DestDir: {app}
+Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
+Source: BUILD\clkcsp.sig; DestDir: {sys}
+Source: BUILD\vcredist_x64.exe; DestDir: "{tmp}"
+
+
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Run]
+
+
+Filename: {tmp}\vcredist_x64.exe; Parameters: "/q:a"; Flags: skipifdoesntexist; StatusMsg: "Installing Microsoft Visual C++ Redistributable Package"
+Filename: {sys}\regsvr32 ; Parameters: "/s {sys}\clkcsp.dll"
+
+[UninstallRun]
+Filename: {sys}\regsvr32 ; Parameters: "/u /s {sys}\clkcsp.dll"
+[_ISTool]
+OutputExeFilename=BUILD\coolkey-setup.exe
+UseAbsolutePaths=false
+LogFile=inst.log
+LogFileAppend=false
+[Registry]
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS #11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
+
+; Now register the Gemalto 64K V2
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask; ValueData: ff ff 00 ff 00 ff ff ff 00 00; Flags: uninsdeletekey
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATR; ValueData: 3b 95 00 40 00 ae 01 03 00 00
+
+; Now register the Safenet 330J
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
+
+Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00
+
+
+Root: HKLM; Subkey: Software\
+; Turn off the "pick a cert" dialog box
+Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3; ValueType: dword; ValueName: 1A04; ValueData: 0
+; Enable TLS 1.0
+Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings; ValueType: dword; ValueName: SecureProtocols; ValueData: 168
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.sh 24 Jun 2009 23:17:50 -0000 1.11
+++ build.sh 8 Oct 2009 23:45:30 -0000 1.12
@@ -26,6 +26,8 @@
### CSP_PATH - Path to the directory containing the CSP if desired
+### USE_64 - Are we trying to build the 64 bit version
+
NUM_ARGS=0
ARG_COMMAND=
@@ -53,9 +55,14 @@
ZLIB_NAME=zlib
ZLIB_DLL=zlib1
+
+ZLIB_DLL_64=zlibwapi
ZLIB_ARCHIVE=zlib123-dll
ZLIB_BIN_URL=http://www.zlib.net
+ZLIB_ARCHIVE_64=zlib123dllx64
+ZLIB_BIN_URL_64=http://winimage.com/zLibDll
+
#CoolKey values
COOLKEY_NAME=coolkey
@@ -103,7 +110,7 @@
echo "BUILDING NSS..."
- if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ];
+ if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ] || [ $USE_64 == 1 ];
then
echo "Do not build NSS."
return 0
@@ -181,7 +188,14 @@
ZLIB_INC_PATH=${BASE_DIR}/zlib/include
ZLIB_LIB_PATH=${BASE_DIR}/zlib/lib
- ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/$ZLIB_DLL.dll
+
+ if [ $USE_64 == 1 ];
+ then
+ ZLIB_LIB_PATH=${BASE_DIR}/zlib/dll_x64
+ ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/dll_x64/$ZLIB_DLL_64.dll
+ else
+ ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/$ZLIB_DLL.dll
+ fi
ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH`
ZLIB_LIB_PATH=`cygpath -m $ZLIB_LIB_PATH`
@@ -198,7 +212,14 @@
export ZLIB_LIB=$ZLIB_LIB_PATH
export ZLIB_INCLUDE=$ZLIB_INC_PATH
- ./configure NSS_CFLAGS="$NSS_CFLAGS" NSS_LIBS="$NSS_LIBS" --enable-pk11install
+ if [ $USE_64 == 1 ];
+ then
+ PK11=
+ else
+ PK11=--enable-pk11install
+ fi
+
+ ./configure NSS_CFLAGS="$NSS_CFLAGS" NSS_LIBS="$NSS_LIBS" $PK11
if [ $? != 0 ];
then
@@ -223,12 +244,21 @@
cp -f coolkey/src/coolkey/.libs/libcoolkeypk11.dll BUILD/coolkeypk11.dll
cp -f coolkey/src/libckyapplet/.libs/libckyapplet-1.dll BUILD
- cp -f zlib/$ZLIB_DLL.dll BUILD
+
+ if [ $USE_64 == 1 ];
+ then
+ cp -f zlib/dll_x64/zlibwapi.dll BUILD
+ else
+ cp -f zlib/$ZLIB_DLL.dll BUILD
+ fi
# Grab pk11install
- cp -f coolkey/src/install/pk11install.exe BUILD
+ if [ $USE_64 != 1 ];
+ then
+ cp -f coolkey/src/install/pk11install.exe BUILD
+ fi
export PATH=${ORIG_PATH}
return 0
@@ -250,6 +280,29 @@
cd $ZLIB_NAME
+ if [ $USE_64 == 1 ]
+ then
+ wget $ZLIB_BIN_URL_64/$ZLIB_ARCHIVE_64.zip
+
+ if [ $? != 0 ];
+ then
+ echo "Can't obtain zlib 64 bit bundle...."
+ return 1
+ fi
+
+ unzip $ZLIB_ARCHIVE_64.zip
+
+ if [ $? != 0 ];
+ then
+ echo "Can't obtain zlib 64 bit bundle...."
+ fi
+
+ rm -f README.txt
+
+ cp dll_x64/zlibwapi.lib dll_x64/zdll.lib
+
+ fi
+
wget $ZLIB_BIN_URL/$ZLIB_ARCHIVE.zip
if [ $? != 0 ];
then
@@ -275,7 +328,7 @@
echo "BUILDING ESC"
cd $BASE_DIR
- if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ];
+ if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ] || [ $USE_64 == 1 ];
then
echo "Do not build ESC."
return 0
@@ -442,10 +495,11 @@
then
echo "NO MSVC path specified!"
echo "Set environ var: MSVC_PATH ."
+ return 1
fi
- cp $MSVC_PATH/*.dll BUILD
+ cp $MSVC_PATH/* BUILD
if [ $? != 0 ];
then
@@ -456,30 +510,37 @@
then
echo "No Path to the INNO installer specified!"
echo "Set environ var: INNO_PATH ."
- return 0
+ return 1
fi
#Move over extra files we don't keep in the open source world
- cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
+ if [ $USE_64 == 1 ];
+ then
+ INNO_SCRIPT=coolkey-64.iss
+ else
+ cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
- #Transport the nss files needed for pk11install.exe
+ #Transport the nss files needed for pk11install.exe
- cp $NSS_LIB_PATH/softokn3.dll BUILD
- cp $NSS_LIB_PATH/libplc4.dll BUILD
- cp $NSS_LIB_PATH/libnspr4.dll BUILD
- cp $NSS_LIB_PATH/libplds4.dll BUILD
+ cp $NSS_LIB_PATH/softokn3.dll BUILD
+ cp $NSS_LIB_PATH/libplc4.dll BUILD
+ cp $NSS_LIB_PATH/libnspr4.dll BUILD
+ cp $NSS_LIB_PATH/libplds4.dll BUILD
+
+ INNO_SCRIPT=setup.iss
+ fi
# Build the INNO executable installer
- "$INNO_PATH" setup.iss
+ "$INNO_PATH" $INNO_SCRIPT
if [ $? != 0 ];
then
- echo "Can't build final ESC installer...."
+ echo "Can't build final ESC/Coolkey installer...."
return 1
fi
@@ -548,7 +609,7 @@
exit 1
fi
-obtainEGATE
+#obtainEGATE
if [ $? != 0 ];
then
@@ -569,7 +630,7 @@
exit 1
fi
-buildCOOLKEY
+#buildCOOLKEY
if [ $? != 0 ];
then
14 years, 5 months
esc/win32 coolkey-64-info-before.txt, NONE, 1.1.2.1 coolkey-64.iss, NONE, 1.1.2.1 build.sh, 1.11, 1.11.2.1
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/esc/win32
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26450
Modified Files:
Tag: PKI_8_0_RTM_BRANCH
build.sh
Added Files:
Tag: PKI_8_0_RTM_BRANCH
coolkey-64-info-before.txt coolkey-64.iss
Log Message:
#514341 simple changes to compile 64 bit installer.
--- NEW FILE coolkey-64-info-before.txt ---
This installation program will install the following:
1. The PKCS #11 module needed for Smart Cards.
2. The CAPI driver for Smart Cards.
--- NEW FILE coolkey-64.iss ---
; Script generated by the Inno Setup Script Wizard.
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
[Setup]
AppName=Coolkey
AppId=Coolkey
AppVerName=Coolkey 1.0.0-1
AppPublisher=Red Hat
CreateAppDir=true
Compression=lzma
SolidCompression=true
MinVersion=0,5.0.2195
ShowLanguageDialog=yes
OutputBaseFilename=CoolkeySetup-1.0.0-1.win64.x64
DefaultDirName={pf}\Red Hat\Coolkey
DisableProgramGroupPage=false
DefaultGroupName=Red Hat
SetupIconFile=..\src\app\xpcom\tray\esc.ico
UninstallDisplayIcon={app}\esc.ico
WizardSmallImageFile=..\src\app\xpcom\tray\esc.bmp
AllowNoIcons=yes
LicenseFile=esc-license.txt
InfoBeforeFile=coolkey-64-info-before.txt
PrivilegesRequired=admin
VersionInfoVersion=1.0.0.1
ArchitecturesAllowed=x64
ArchitecturesInstallIn64BitMode=x64
[Files]
Source: BUILD\regcerts.exe; DestDir: {app}
Source: ..\src\app\xpcom\tray\esc.ico; DestDir: {app}
Source: BUILD\clkcsp.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\cspres.dll; DestDir: {sys}; Flags: restartreplace
Source: BUILD\clkcsp.sig; DestDir: {sys}
Source: BUILD\vcredist_x64.exe; DestDir: "{tmp}"
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
[Run]
Filename: {tmp}\vcredist_x64.exe; Parameters: "/q:a"; Flags: skipifdoesntexist; StatusMsg: "Installing Microsoft Visual C++ Redistributable Package"
Filename: {sys}\regsvr32 ; Parameters: "/s {sys}\clkcsp.dll"
[UninstallRun]
Filename: {sys}\regsvr32 ; Parameters: "/u /s {sys}\clkcsp.dll"
[_ISTool]
OutputExeFilename=BUILD\coolkey-setup.exe
UseAbsolutePaths=false
LogFile=inst.log
LogFileAppend=false
[Registry]
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Defaults\Provider\CoolKey PKCS #11 CSP; ValueType: string; ValueName: PKCS11Module; ValueData: coolkeypk11.dll; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Axalto Developer; ValueType: binary; ValueName: ATR; ValueData: 3b 75 94 00 00 62 02 02 00 00
; Now register the Gemalto 64K V2
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATRMask; ValueData: ff ff 00 ff 00 ff ff ff 00 00; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Gemalto 64K V2; ValueType: binary; ValueName: ATR; ValueData: 3b 95 00 40 00 ae 01 03 00 00
; Now register the Safenet 330J
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATRMask; ValueData: ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff 00 00; Flags: uninsdeletekey
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: string; ValueName: Crypto Provider; ValueData: CoolKey PKCS #11 CSP
Root: HKLM; Subkey: Software\Microsoft\Cryptography\Calais\SmartCards\Safenet 330J; ValueType: binary; ValueName: ATR; ValueData: 3b ec 00 ff 81 31 fe 45 a0 00 00 00 56 33 33 30 4a 33 06 00 00
Root: HKLM; Subkey: Software\
; Turn off the "pick a cert" dialog box
Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings\Zones\3; ValueType: dword; ValueName: 1A04; ValueData: 0
; Enable TLS 1.0
Root: HKCU; Subkey: Software\Microsoft\Windows\CurrentVersion\Internet Settings; ValueType: dword; ValueName: SecureProtocols; ValueData: 168
Index: build.sh
===================================================================
RCS file: /cvs/dirsec/esc/win32/build.sh,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- build.sh 24 Jun 2009 23:17:50 -0000 1.11
+++ build.sh 8 Oct 2009 23:40:51 -0000 1.11.2.1
@@ -26,6 +26,8 @@
### CSP_PATH - Path to the directory containing the CSP if desired
+### USE_64 - Are we trying to build the 64 bit version
+
NUM_ARGS=0
ARG_COMMAND=
@@ -53,9 +55,14 @@
ZLIB_NAME=zlib
ZLIB_DLL=zlib1
+
+ZLIB_DLL_64=zlibwapi
ZLIB_ARCHIVE=zlib123-dll
ZLIB_BIN_URL=http://www.zlib.net
+ZLIB_ARCHIVE_64=zlib123dllx64
+ZLIB_BIN_URL_64=http://winimage.com/zLibDll
+
#CoolKey values
COOLKEY_NAME=coolkey
@@ -103,7 +110,7 @@
echo "BUILDING NSS..."
- if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ];
+ if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doNSS ] || [ $USE_64 == 1 ];
then
echo "Do not build NSS."
return 0
@@ -181,7 +188,14 @@
ZLIB_INC_PATH=${BASE_DIR}/zlib/include
ZLIB_LIB_PATH=${BASE_DIR}/zlib/lib
- ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/$ZLIB_DLL.dll
+
+ if [ $USE_64 == 1 ];
+ then
+ ZLIB_LIB_PATH=${BASE_DIR}/zlib/dll_x64
+ ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/dll_x64/$ZLIB_DLL_64.dll
+ else
+ ZLIB_LIB_FLAGS=${BASE_DIR}/zlib/$ZLIB_DLL.dll
+ fi
ZLIB_INC_PATH=`cygpath -m $ZLIB_INC_PATH`
ZLIB_LIB_PATH=`cygpath -m $ZLIB_LIB_PATH`
@@ -198,7 +212,14 @@
export ZLIB_LIB=$ZLIB_LIB_PATH
export ZLIB_INCLUDE=$ZLIB_INC_PATH
- ./configure NSS_CFLAGS="$NSS_CFLAGS" NSS_LIBS="$NSS_LIBS" --enable-pk11install
+ if [ $USE_64 == 1 ];
+ then
+ PK11=
+ else
+ PK11=--enable-pk11install
+ fi
+
+ ./configure NSS_CFLAGS="$NSS_CFLAGS" NSS_LIBS="$NSS_LIBS" $PK11
if [ $? != 0 ];
then
@@ -223,12 +244,21 @@
cp -f coolkey/src/coolkey/.libs/libcoolkeypk11.dll BUILD/coolkeypk11.dll
cp -f coolkey/src/libckyapplet/.libs/libckyapplet-1.dll BUILD
- cp -f zlib/$ZLIB_DLL.dll BUILD
+
+ if [ $USE_64 == 1 ];
+ then
+ cp -f zlib/dll_x64/zlibwapi.dll BUILD
+ else
+ cp -f zlib/$ZLIB_DLL.dll BUILD
+ fi
# Grab pk11install
- cp -f coolkey/src/install/pk11install.exe BUILD
+ if [ $USE_64 != 1 ];
+ then
+ cp -f coolkey/src/install/pk11install.exe BUILD
+ fi
export PATH=${ORIG_PATH}
return 0
@@ -250,6 +280,29 @@
cd $ZLIB_NAME
+ if [ $USE_64 == 1 ]
+ then
+ wget $ZLIB_BIN_URL_64/$ZLIB_ARCHIVE_64.zip
+
+ if [ $? != 0 ];
+ then
+ echo "Can't obtain zlib 64 bit bundle...."
+ return 1
+ fi
+
+ unzip $ZLIB_ARCHIVE_64.zip
+
+ if [ $? != 0 ];
+ then
+ echo "Can't obtain zlib 64 bit bundle...."
+ fi
+
+ rm -f README.txt
+
+ cp dll_x64/zlibwapi.lib dll_x64/zdll.lib
+
+ fi
+
wget $ZLIB_BIN_URL/$ZLIB_ARCHIVE.zip
if [ $? != 0 ];
then
@@ -275,7 +328,7 @@
echo "BUILDING ESC"
cd $BASE_DIR
- if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ];
+ if [ $NUM_ARGS -ne 0 ] && [ $THE_ARG != -doEsc ] || [ $USE_64 == 1 ];
then
echo "Do not build ESC."
return 0
@@ -442,10 +495,11 @@
then
echo "NO MSVC path specified!"
echo "Set environ var: MSVC_PATH ."
+ return 1
fi
- cp $MSVC_PATH/*.dll BUILD
+ cp $MSVC_PATH/* BUILD
if [ $? != 0 ];
then
@@ -456,30 +510,37 @@
then
echo "No Path to the INNO installer specified!"
echo "Set environ var: INNO_PATH ."
- return 0
+ return 1
fi
#Move over extra files we don't keep in the open source world
- cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
+ if [ $USE_64 == 1 ];
+ then
+ INNO_SCRIPT=coolkey-64.iss
+ else
+ cp esc-image-large.bmp BUILD/ESC/chrome/content/esc
- #Transport the nss files needed for pk11install.exe
+ #Transport the nss files needed for pk11install.exe
- cp $NSS_LIB_PATH/softokn3.dll BUILD
- cp $NSS_LIB_PATH/libplc4.dll BUILD
- cp $NSS_LIB_PATH/libnspr4.dll BUILD
- cp $NSS_LIB_PATH/libplds4.dll BUILD
+ cp $NSS_LIB_PATH/softokn3.dll BUILD
+ cp $NSS_LIB_PATH/libplc4.dll BUILD
+ cp $NSS_LIB_PATH/libnspr4.dll BUILD
+ cp $NSS_LIB_PATH/libplds4.dll BUILD
+
+ INNO_SCRIPT=setup.iss
+ fi
# Build the INNO executable installer
- "$INNO_PATH" setup.iss
+ "$INNO_PATH" $INNO_SCRIPT
if [ $? != 0 ];
then
- echo "Can't build final ESC installer...."
+ echo "Can't build final ESC/Coolkey installer...."
return 1
fi
@@ -548,7 +609,7 @@
exit 1
fi
-obtainEGATE
+#obtainEGATE
if [ $? != 0 ];
then
@@ -569,7 +630,7 @@
exit 1
fi
-buildCOOLKEY
+#buildCOOLKEY
if [ $? != 0 ];
then
14 years, 5 months
coolkey/src/windows/csp Makefile, 1.1, 1.2 RegDll.cpp, 1.3, 1.4 Session.cpp, 1.1, 1.2 csp.cpp, 1.3, 1.4
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/coolkey/src/windows/csp
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19524/src/windows/csp
Modified Files:
Makefile RegDll.cpp Session.cpp csp.cpp
Log Message:
Bugzilla #514341, get coolkey working on 64bit Windows.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/coolkey/src/windows/csp/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 11 Oct 2006 18:12:58 -0000 1.1
+++ Makefile 2 Oct 2009 01:43:53 -0000 1.2
@@ -18,29 +18,51 @@
#
#
# Nmake capable makefile.
+#
+
+
+# Deal with flags for the debug version.
#
-LCFLAGS=-Od -I$(CAPISDK)/sdkinc -DWIN32 -D_DEBUG -D_WINDOWS -D_USRDLL \
+DBGLCFLAGS =
+DBGFLAGS =
+MTLIB = -MT
+
+!IF "$(BUILD_OPT)" == "1"
+DBGLCFLAGS = -ZI -DEBUG -D_DEBUG
+DBGFLAGS = /DEBUG
+MTLIB = -MTd
+!ENDIF
+
+# Deal with 32 or 64 bit machine.
+#
+ARCH = X86
+
+!IF "$(USE_64)" == "1"
+ARCH = X64
+!ENDIF
+
+LCFLAGS=-Od -I$(CAPISDK)/sdkinc -DWIN32 -D_WINDOWS -D_USRDLL \
-D_CONSOLE -DCSP_EXPORTS -D_WINDLL -DIDA_PROMPT_PINGUI -D_MBCS \
- -Gm -EHsc -RTC1 -W3 -nologo -c -ZI -TP
+ -EHsc -RTC1 -W3 -nologo -c $(DBGCLFLAGS) -TP
-CSPRESFLAGS=/INCREMENTAL:NO /NOLOGO /DLL /DEF:"cspres.def" /DEBUG \
+CSPRESFLAGS=/INCREMENTAL:NO /NOLOGO /DLL /DEF:"cspres.def" $(DBGFLAGS) \
/SUBSYSTEM:WINDOWS /OPT:REF /OPT:ICF /IMPLIB:"cspres.lib" \
- /MACHINE:X86
+ /MACHINE:$(ARCH)
-CSPFLAGS=/INCREMENTAL:NO /NOLOGO /DLL /DEF:"csp.def" /DEBUG \
- /SUBSYSTEM:WINDOWS /IMPLIB:"clkcsp.lib" /MACHINE:X86 crypt32.lib \
+CSPFLAGS=/INCREMENTAL:NO /NOLOGO /DLL /DEF:"csp.def" $(DBGFLAGS) \
+ /SUBSYSTEM:WINDOWS /IMPLIB:"clkcsp.lib" /MACHINE:$(ARCH) crypt32.lib \
RpcRT4.Lib winscard.lib Scarddlg.lib cspres.lib kernel32.lib \
user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib \
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
-REGCERTSFLAGS=/INCREMENTAL:NO /NOLOGO /DEBUG /SUBSYSTEM:CONSOLE /MACHINE:X86 \
+REGCERTSFLAGS=/INCREMENTAL:NO /NOLOGO $(DBGFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(ARCH) \
kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib \
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib \
odbc32.lib odbccp32.lib
CC=cl
TARGETS=cspres.dll clkcsp.dll regcerts.exe clkcsp.sig
-TRASH=*.pdb *.lib *.exp *.idb
+TRASH=*.pdb *.lib *.exp *.idb *.manifest
CSP_OBJ = \
csp.obj \
@@ -67,7 +89,7 @@
.SUFFIXES: .cpp .obj .OBJ .rc .res .Obj .dll .sig
.cpp.obj:
- $(CC) $(LCFLAGS) -MTd $<
+ $(CC) $(LCFLAGS) $(MTLIB) $<
.cpp.Obj:
$(CC) $(LCFLAGS) -MLd -Wp64 $<
@@ -89,10 +111,17 @@
cspres.dll: $(CSP_RES_OBJ)
link /OUT:cspres.dll $(CSP_RES_OBJ) $(CSPRESFLAGS)
-
+#Process manifest file if applicable.
+!IF "$(_NMAKE_VER)" >= "8.00"
+ mt.exe -manifest cspres.dll.manifest -outputresource:"cspres.dll;2"
+!ENDIF
clkcsp.dll: $(CSP_OBJ)
link /OUT:clkcsp.dll $(CSP_OBJ) $(CSPFLAGS)
-
+!IF "$(_NMAKE_VER)" >= "8.00"
+ mt.exe -manifest clkcsp.dll.manifest -outputresource:"clkcsp.dll;2"
+!ENDIF
regcerts.exe: $(REG_CERTS_OBJ)
link /OUT:regcerts.exe $(REG_CERTS_OBJ) $(REGCERTSFLAGS)
-
+!IF "$(_NMAKE_VER)" >= "8.00"
+ mt.exe -manifest regcerts.exe.manifest -outputresource:"regcerts.exe;1"
+!ENDIF
Index: RegDll.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/windows/csp/RegDll.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RegDll.cpp 11 Aug 2007 00:57:06 -0000 1.3
+++ RegDll.cpp 2 Oct 2009 01:43:53 -0000 1.4
@@ -101,7 +101,7 @@
return NULL;
}
- ext = strrchr(libName, '.');
+ ext = (char *) strrchr(libName, '.');
if (ext) {
libLen = ext - libName;
}
Index: Session.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/windows/csp/Session.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Session.cpp 27 Jul 2006 22:23:07 -0000 1.1
+++ Session.cpp 2 Oct 2009 01:43:53 -0000 1.2
@@ -107,8 +107,10 @@
else
(*container_name) = fqcn;
- LOG("ParseFQCN: container_name: \"%s\"\n", StringifyBin(*container_name, false).c_str());
- LOG("ParseFQCN: reader_name: \"%s\"\n", StringifyBin(*reader_name, false).c_str());
+ if(container_name->size())
+ LOG("ParseFQCN: container_name: \"%s\"\n", StringifyBin(*container_name, false).c_str());
+ if(reader_name->size())
+ LOG("ParseFQCN: reader_name: \"%s\"\n", StringifyBin(*reader_name, false).c_str());
}
} // namespace MCSP
Index: csp.cpp
===================================================================
RCS file: /cvs/dirsec/coolkey/src/windows/csp/csp.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- csp.cpp 30 Apr 2007 23:30:58 -0000 1.3
+++ csp.cpp 2 Oct 2009 01:43:53 -0000 1.4
@@ -999,8 +999,8 @@
BinStr containerName = (char*)pbData;
CRYPT_KEY_PROV_INFO provInfo;
- provInfo.pwszContainerName = new unsigned short[containerName.size()];
- provInfo.pwszProvName = new unsigned short[strlen(PROVIDER_NAME) + 1];;
+ provInfo.pwszContainerName = (LPWSTR) new unsigned short[containerName.size()];
+ provInfo.pwszProvName = (LPWSTR) new unsigned short[strlen(PROVIDER_NAME) + 1];
provInfo.dwProvType = PROVIDER_TYPE;
provInfo.dwFlags = 0;
provInfo.cProvParam = 0;
14 years, 5 months
coolkey/src/libckyapplet cky_card.c,1.2,1.3
by Jack Magne
Author: jmagne
Update of /cvs/dirsec/coolkey/src/libckyapplet
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19524/src/libckyapplet
Modified Files:
cky_card.c
Log Message:
Bugzilla #514341, get coolkey working on 64bit Windows.
Index: cky_card.c
===================================================================
RCS file: /cvs/dirsec/coolkey/src/libckyapplet/cky_card.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cky_card.c 24 Jan 2009 00:08:01 -0000 1.2
+++ cky_card.c 2 Oct 2009 01:43:53 -0000 1.3
@@ -50,10 +50,10 @@
SCARDCONTEXT hContext);
typedef long (WINAPI * SCardBeginTransactionFn) (
- long hCard);
+ SCARDHANDLE hCard);
typedef long (WINAPI * SCardEndTransactionFn) (
- long hCard,
+ SCARDHANDLE hCard,
unsigned long dwDisposition);
typedef long (WINAPI * SCardConnectFn) (
@@ -61,15 +61,15 @@
const char *szReader,
unsigned long dwShareMode,
unsigned long dwPreferredProtocols,
- long *phCard,
+ SCARDHANDLE *phCard,
unsigned long *pdwActiveProtocol);
typedef long (WINAPI * SCardDisconnectFn) (
- long hCard,
+ SCARDHANDLE hCard,
unsigned long dwDisposition);
typedef long (WINAPI * SCardTransmitFn) (
- long hCard,
+ SCARDHANDLE hCard,
LPCSCARD_IO_REQUEST pioSendPci,
const unsigned char *pbSendBuffer,
unsigned long cbSendLength,
@@ -78,7 +78,7 @@
unsigned long *pcbRecvLength);
typedef long (WINAPI * SCardReconnectFn) (
- long hCard,
+ SCARDHANDLE hCard,
unsigned long dwShareMode,
unsigned long dwPreferredProtocols,
unsigned long dwInitialization,
@@ -91,7 +91,7 @@
unsigned long *pcchReaders);
typedef long (WINAPI * SCardStatusFn) (
- long hCard,
+ SCARDHANDLE hCard,
char *mszReaderNames,
unsigned long *pcchReaderLen,
unsigned long *pdwState,
@@ -100,7 +100,7 @@
unsigned long *pcbAtrLen);
typedef long (WINAPI * SCardGetAttribFn) (
- long hCard,
+ SCARDHANDLE hCard,
unsigned long dwAttId,
char *pbAttr,
unsigned long *pchAttrLen);
14 years, 5 months