Am Montag 01 Februar 2010 13:15:00 schrieb Martin Paljak: > On Feb 1, 2010, at 14:04 , Alon Bar-Lev wrote: > > Having two libopensc is quite confusing... > > Same here... > ok, new version. pkcs15init is build before libopensc/ directory, and the shared library is now created in libopensc/ as it was before - except it includes pkcs15init and scconf (and libcompat) internaly. thus only one shared library left instead of three. better?
also I addressed the issues alon mentioned. good? Andreas
diff -udrNPp --exclude=.svn opensc.orig/src/Makefile.am opensc/src/Makefile.am --- opensc.orig/src/Makefile.am 2010-02-01 08:03:26.000000000 +0100 +++ opensc/src/Makefile.am 2010-02-01 14:42:37.000000000 +0100 @@ -2,5 +2,5 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil EXTRA_DIST = Makefile.mak # Order IS important -SUBDIRS = common include scconf libopensc pkcs15init pkcs11 \ - tests tools openssh +SUBDIRS = common include scconf pkcs15init libopensc pkcs11 \ + tools tests openssh diff -udrNPp --exclude=.svn opensc.orig/src/Makefile.mak opensc/src/Makefile.mak --- opensc.orig/src/Makefile.mak 2005-12-29 13:36:30.000000000 +0100 +++ opensc/src/Makefile.mak 2010-02-01 14:42:13.000000000 +0100 @@ -2,7 +2,7 @@ TOPDIR = .. !INCLUDE $(TOPDIR)\win32\Make.rules.mak -SUBDIRS = include common scconf libopensc tests pkcs15init pkcs11 tools +SUBDIRS = include common scconf pkcs15init libopensc pkcs11 tools tests all:: diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/Makefile.am opensc/src/libopensc/Makefile.am --- opensc.orig/src/libopensc/Makefile.am 2010-02-01 08:03:26.000000000 +0100 +++ opensc/src/libopensc/Makefile.am 2010-02-01 14:57:52.000000000 +0100 @@ -1,8 +1,6 @@ include $(top_srcdir)/win32/ltrc.inc -MAINTAINERCLEANFILES = \ - $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc -CLEANFILES = versioninfo.rc +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in EXTRA_DIST = Makefile.mak bin_SCRIPTS = opensc-config @@ -47,7 +45,6 @@ libopensc_la_SOURCES = \ pkcs15-actalis.c pkcs15-atrust-acos.c pkcs15-tccardos.c pkcs15-piv.c \ pkcs15-esinit.c p15emu-westcos.c pkcs15-pteid.c \ compression.c p15card-helper.c \ - \ libopensc.exports if WIN32 libopensc_la_SOURCES += versioninfo.rc @@ -55,24 +52,26 @@ else dist_noinst_DATA = versioninfo.rc endif libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \ - $(OPTIONAL_ZLIB_LIBS) $(OPTIONAL_ICONV_LIBS) $(LTLIB_LIBS) \ - $(top_builddir)/src/scconf/libscconf.la \ - $(top_builddir)/src/common/libcompat.la + $(OPTIONAL_ZLIB_LIBS) $(OPTIONAL_ICONV_LIBS) $(LTLIB_LIBS) \ + $(top_builddir)/src/pkcs15init/libpkcs15init.la \ + $(top_builddir)/src/scconf/libscconf.la \ + $(top_builddir)/src/common/libcompat.la if WIN32 libopensc_la_LIBADD += -lws2_32 endif libopensc_la_LDFLAGS = $(AM_LDFLAGS) \ - -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \ - -export-symbols "$(srcdir)/libopensc.exports" \ - -no-undefined + -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \ + -export-symbols "$(srcdir)/libopensc.exports" \ + -no-undefined versioninfo.rc: sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \ - "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc + "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc if WIN32 # def file required for MS users to build library mylibdir=$(libdir) -mylib_DATA=.libs/@win_libpre...@opensc-@[email protected] -.libs/@win_libpre...@opensc-@[email protected]: libopensc.la +# not sure what to put here as mylib_DATA ? +mylib_DATA=.libs/@win_libpre...@libopensc-@[email protected] endif + diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/libopensc.exports opensc/src/libopensc/libopensc.exports --- opensc.orig/src/libopensc/libopensc.exports 2010-02-01 08:03:26.000000000 +0100 +++ opensc/src/libopensc/libopensc.exports 2010-02-01 07:47:52.000000000 +0100 @@ -1,3 +1,32 @@ +scconf_block_add +scconf_block_copy +scconf_block_destroy +scconf_find_block +scconf_find_blocks +scconf_find_list +scconf_free +scconf_get_bool +scconf_get_int +scconf_get_str +scconf_item_add +scconf_item_copy +scconf_item_destroy +scconf_list_add +scconf_list_array_length +scconf_list_copy +scconf_list_destroy +scconf_list_strdup +scconf_list_strings_length +scconf_list_toarray +scconf_new +scconf_parse +scconf_parse_entries +scconf_parse_string +scconf_put_bool +scconf_put_int +scconf_put_str +scconf_write +scconf_write_entries _sc_asn1_decode _sc_asn1_encode _sc_debug @@ -212,3 +241,61 @@ sc_wait_for_event sc_write_binary sc_write_record sc_get_iso7816_driver +sc_keycache_find_named_pin +sc_keycache_forget_key +sc_keycache_get_key +sc_keycache_get_pin +sc_keycache_get_pin_name +sc_keycache_put_key +sc_keycache_put_pin +sc_keycache_set_pin_name +sc_pkcs15init_add_app +sc_pkcs15init_authenticate +sc_pkcs15init_bind +sc_pkcs15init_change_attrib +sc_pkcs15init_create_file +sc_pkcs15init_delete_by_path +sc_pkcs15init_delete_object +sc_pkcs15init_erase_card +sc_pkcs15init_erase_card_recursively +sc_pkcs15init_finalize_card +sc_pkcs15init_fixup_acls +sc_pkcs15init_fixup_file +sc_pkcs15init_generate_key +sc_pkcs15init_get_asepcos_ops +sc_pkcs15init_get_cardos_ops +sc_pkcs15init_get_cryptoflex_ops +sc_pkcs15init_get_cyberflex_ops +sc_pkcs15init_get_gpk_ops +sc_pkcs15init_get_incrypto34_ops +sc_pkcs15init_get_jcop_ops +sc_pkcs15init_get_label +sc_pkcs15init_get_manufacturer +sc_pkcs15init_get_miocos_ops +sc_pkcs15init_get_muscle_ops +sc_pkcs15init_get_oberthur_ops +sc_pkcs15init_get_pin_info +sc_pkcs15init_get_rutoken_ops +sc_pkcs15init_get_rtecp_ops +sc_pkcs15init_get_serial +sc_pkcs15init_get_setcos_ops +sc_pkcs15init_get_starcos_ops +sc_pkcs15init_requires_restrictive_usage +sc_pkcs15init_rmdir +sc_pkcs15init_set_callbacks +sc_pkcs15init_set_lifecycle +sc_pkcs15init_set_p15card +sc_pkcs15init_set_pin_data +sc_pkcs15init_set_secret +sc_pkcs15init_set_serial +sc_pkcs15init_store_certificate +sc_pkcs15init_store_data_object +sc_pkcs15init_store_pin +sc_pkcs15init_store_private_key +sc_pkcs15init_store_public_key +sc_pkcs15init_store_split_key +sc_pkcs15init_unbind +sc_pkcs15init_update_any_df +sc_pkcs15init_update_certificate +sc_pkcs15init_update_file +sc_pkcs15init_verify_key diff -udrNPp --exclude=.svn opensc.orig/src/libopensc/versioninfo.rc opensc/src/libopensc/versioninfo.rc --- opensc.orig/src/libopensc/versioninfo.rc 1970-01-01 01:00:00.000000000 +0100 +++ opensc/src/libopensc/versioninfo.rc 2010-02-01 11:56:30.000000000 +0100 @@ -0,0 +1,37 @@ +/* This file is processed by configure to create versioninfo.rc */ +/* Every component changes OpenSC Core Library to local string */ + +#include <winresrc.h> + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,0,0,0 + PRODUCTVERSION 0,12,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x21L +#else + FILEFLAGS 0x20L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "Provided under the terms of the GNU General Public License (LGPLv2.1+).\0" + VALUE "CompanyName", "OpenSC Project\0" + VALUE "FileDescription", "OpenSC Core Library\0" + VALUE "FileVersion", "2.0.0.0\0" + VALUE "InternalName", "opensc\0" + VALUE "LegalCopyright", "OpenSC Project\0" + VALUE "LegalTrademarks", "\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "opensc\0" + VALUE "ProductVersion", "0,12,0,0\0" + VALUE "SpecialBuild", "\0" + END + END +END + diff -udrNPp --exclude=.svn opensc.orig/src/pkcs11/Makefile.am opensc/src/pkcs11/Makefile.am --- opensc.orig/src/pkcs11/Makefile.am 2010-02-01 08:03:22.000000000 +0100 +++ opensc/src/pkcs11/Makefile.am 2010-02-01 14:47:05.000000000 +0100 @@ -11,7 +11,7 @@ lib_LTLIBRARIES = opensc-pkcs11.la pkcs1 noinst_LTLIBRARIES = libpkcs11.la AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(LTLIB_CFLAGS) $(PTHREAD_CFLAGS) -INCLUDES = -I$(top_srcdir)/src/pkcs15init -I$(top_builddir)/src/include -I$(top_builddir)/src/common +INCLUDES = -I$(top_srcdir)/src/pkcs15init -I$(top_builddir)/src/include -I$(top_srcdir)/src/common OPENSC_PKCS11_INC = sc-pkcs11.h OPENSC_PKCS11_SRC = pkcs11-global.c pkcs11-session.c pkcs11-object.c misc.c slot.c \ @@ -19,10 +19,8 @@ OPENSC_PKCS11_SRC = pkcs11-global.c pkcs framework-pkcs15init.c debug.c opensc-pkcs11.exports \ pkcs11-display.c pkcs11-display.h OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) \ - $(top_builddir)/src/pkcs15init/libpkcs15init.la \ - $(top_builddir)/src/libopensc/libopensc.la \ - $(top_builddir)/src/scconf/libscconf.la \ - $(top_builddir)/src/common/libcompat.la + $(top_builddir)/src/common/libcompat.la \ + $(top_builddir)/src/libopensc/libopensc.la libpkcs11_la_SOURCES = libpkcs11.c diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/Makefile.am opensc/src/pkcs15init/Makefile.am --- opensc.orig/src/pkcs15init/Makefile.am 2010-02-01 08:03:23.000000000 +0100 +++ opensc/src/pkcs15init/Makefile.am 2010-02-01 14:57:36.000000000 +0100 @@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = \ CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak -lib_LTLIBRARIES = libpkcs15init.la +noinst_LTLIBRARIES = libpkcs15init.la openscinclude_HEADERS = pkcs15-init.h noinst_HEADERS = profile.h keycache.h dist_pkgdata_DATA = \ @@ -34,34 +34,9 @@ INCLUDES = -I$(top_srcdir)/src/common -I libpkcs15init_la_SOURCES = \ pkcs15-lib.c profile.c keycache.c \ - pkcs15-westcos.c \ + pkcs15-westcos.c \ pkcs15-gpk.c pkcs15-miocos.c pkcs15-cflex.c \ pkcs15-cardos.c pkcs15-jcop.c pkcs15-starcos.c \ pkcs15-oberthur.c pkcs15-setcos.c pkcs15-incrypto34.c \ pkcs15-muscle.c pkcs15-asepcos.c pkcs15-rutoken.c \ - pkcs15-entersafe.c pkcs15-rtecp.c pkcs15-myeid.c \ - pkcs15init.exports -if WIN32 -libpkcs15init_la_SOURCES += versioninfo.rc -else -dist_noinst_DATA = versioninfo.rc -endif -libpkcs15init_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \ - $(top_builddir)/src/libopensc/libopensc.la \ - $(top_builddir)/src/scconf/libscconf.la \ - $(top_builddir)/src/common/libcompat.la -libpkcs15init_la_LDFLAGS = $(AM_LDFLAGS) \ - -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \ - -export-symbols "$(srcdir)/pkcs15init.exports" \ - -no-undefined - -versioninfo.rc: - sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \ - "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc - -if WIN32 -# def file required for MS users to build library -mylibdir=$(libdir) -mylib_DATA=.libs/@win_libpre...@pkcs15init-@[email protected] -.libs/@win_libpre...@pkcs15init-@[email protected]: libpkcs15init.la -endif + pkcs15-entersafe.c pkcs15-rtecp.c pkcs15-myeid.c diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/libopensc.la opensc/src/pkcs15init/libopensc.la --- opensc.orig/src/pkcs15init/libopensc.la 1970-01-01 01:00:00.000000000 +0100 +++ opensc/src/pkcs15init/libopensc.la 2010-02-01 11:56:30.000000000 +0100 @@ -0,0 +1,41 @@ +# libopensc.la - a libtool library file +# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4 +# +# Please DO NOT delete this file! +# It is necessary for linking the library. + +# The name that we can dlopen(3). +dlname='libopensc.so.2' + +# Names of this library. +library_names='libopensc.so.2.0.0 libopensc.so.2 libopensc.so' + +# The name of the static archive. +old_library='libopensc.a' + +# Linker flags that can not go in dependency_libs. +inherited_linker_flags='' + +# Libraries that this one depends upon. +dependency_libs=' -lcrypto -L/home/aj/opentest/lib /home/aj/opentest/lib/libopenct.la -lz /usr/lib/libltdl.la -ldl' + +# Names of additional weak libraries provided by this library +weak_library_names='' + +# Version information for libopensc. +current=2 +age=0 +revision=0 + +# Is this an already installed library? +installed=no + +# Should we warn about portability when linking against -modules? +shouldnotlink=no + +# Files to dlopen/dlpreopen +dlopen='' +dlpreopen='' + +# Directory that this library needs to be installed in: +libdir='/home/aj/opentest/lib' diff -udrNPp --exclude=.svn opensc.orig/src/pkcs15init/pkcs15init.exports opensc/src/pkcs15init/pkcs15init.exports --- opensc.orig/src/pkcs15init/pkcs15init.exports 2009-12-13 10:14:27.000000000 +0100 +++ opensc/src/pkcs15init/pkcs15init.exports 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -sc_keycache_find_named_pin -sc_keycache_forget_key -sc_keycache_get_key -sc_keycache_get_pin -sc_keycache_get_pin_name -sc_keycache_put_key -sc_keycache_put_pin -sc_keycache_set_pin_name -sc_pkcs15init_add_app -sc_pkcs15init_authenticate -sc_pkcs15init_bind -sc_pkcs15init_change_attrib -sc_pkcs15init_create_file -sc_pkcs15init_delete_by_path -sc_pkcs15init_delete_object -sc_pkcs15init_erase_card -sc_pkcs15init_erase_card_recursively -sc_pkcs15init_finalize_card -sc_pkcs15init_fixup_acls -sc_pkcs15init_fixup_file -sc_pkcs15init_generate_key -sc_pkcs15init_get_asepcos_ops -sc_pkcs15init_get_cardos_ops -sc_pkcs15init_get_cryptoflex_ops -sc_pkcs15init_get_cyberflex_ops -sc_pkcs15init_get_gpk_ops -sc_pkcs15init_get_incrypto34_ops -sc_pkcs15init_get_jcop_ops -sc_pkcs15init_get_label -sc_pkcs15init_get_manufacturer -sc_pkcs15init_get_miocos_ops -sc_pkcs15init_get_muscle_ops -sc_pkcs15init_get_oberthur_ops -sc_pkcs15init_get_pin_info -sc_pkcs15init_get_rutoken_ops -sc_pkcs15init_get_rtecp_ops -sc_pkcs15init_get_serial -sc_pkcs15init_get_setcos_ops -sc_pkcs15init_get_starcos_ops -sc_pkcs15init_requires_restrictive_usage -sc_pkcs15init_rmdir -sc_pkcs15init_set_callbacks -sc_pkcs15init_set_lifecycle -sc_pkcs15init_set_p15card -sc_pkcs15init_set_pin_data -sc_pkcs15init_set_secret -sc_pkcs15init_set_serial -sc_pkcs15init_store_certificate -sc_pkcs15init_store_data_object -sc_pkcs15init_store_pin -sc_pkcs15init_store_private_key -sc_pkcs15init_store_public_key -sc_pkcs15init_store_split_key -sc_pkcs15init_unbind -sc_pkcs15init_update_any_df -sc_pkcs15init_update_certificate -sc_pkcs15init_update_file -sc_pkcs15init_verify_key diff -udrNPp --exclude=.svn opensc.orig/src/scconf/Makefile.am opensc/src/scconf/Makefile.am --- opensc.orig/src/scconf/Makefile.am 2009-12-13 10:14:27.000000000 +0100 +++ opensc/src/scconf/Makefile.am 2010-02-01 07:44:15.000000000 +0100 @@ -1,35 +1,18 @@ include $(top_srcdir)/win32/ltrc.inc -MAINTAINERCLEANFILES = \ - $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc +MAINTAINERCLEANFILES = $(srcdir)/Makefile.in DISTCLEANFILES = lex-parse.c -CLEANFILES = versioninfo.rc EXTRA_DIST = Makefile.mak dist_noinst_DATA = README.scconf lex-parse.l openscinclude_HEADERS = scconf.h noinst_HEADERS = internal.h noinst_PROGRAMS = test-conf -lib_LTLIBRARIES = libscconf.la +noinst_LTLIBRARIES = libscconf.la INCLUDES = -I$(top_srcdir)/src/common -libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c \ - scconf.exports -if WIN32 -libscconf_la_SOURCES += versioninfo.rc -else -dist_noinst_DATA += versioninfo.rc -endif -libscconf_la_LIBADD = $(top_builddir)/src/common/libcompat.la -libscconf_la_LDFLAGS = $(AM_LDFLAGS) \ - -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \ - -export-symbols "$(srcdir)/scconf.exports" \ - -no-undefined +libscconf_la_SOURCES = scconf.c parse.c write.c sclex.c test_conf_SOURCES = test-conf.c -test_conf_LDADD = libscconf.la - -versioninfo.rc: - sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \ - "$(top_builddir)/win32/versioninfo.rc.in" > versioninfo.rc +test_conf_LDADD = libscconf.la $(top_builddir)/src/common/libcompat.la diff -udrNPp --exclude=.svn opensc.orig/src/scconf/scconf.exports opensc/src/scconf/scconf.exports --- opensc.orig/src/scconf/scconf.exports 2009-12-13 10:14:27.000000000 +0100 +++ opensc/src/scconf/scconf.exports 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -scconf_block_add -scconf_block_copy -scconf_block_destroy -scconf_find_block -scconf_find_blocks -scconf_find_list -scconf_free -scconf_get_bool -scconf_get_int -scconf_get_str -scconf_item_add -scconf_item_copy -scconf_item_destroy -scconf_list_add -scconf_list_array_length -scconf_list_copy -scconf_list_destroy -scconf_list_strdup -scconf_list_strings_length -scconf_list_toarray -scconf_new -scconf_parse -scconf_parse_entries -scconf_parse_string -scconf_put_bool -scconf_put_int -scconf_put_str -scconf_write -scconf_write_entries diff -udrNPp --exclude=.svn opensc.orig/src/tools/Makefile.am opensc/src/tools/Makefile.am --- opensc.orig/src/tools/Makefile.am 2010-02-01 08:03:21.000000000 +0100 +++ opensc/src/tools/Makefile.am 2010-02-01 14:47:43.000000000 +0100 @@ -18,8 +18,8 @@ endif AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_READLINE_CFLAGS) INCLUDES = -I$(top_srcdir)/src/common -I$(top_builddir)/src/include -LIBS = $(top_builddir)/src/libopensc/libopensc.la \ - $(top_builddir)/src/common/libcompat.la +LIBS = $(top_builddir)/src/common/libcompat.la \ + $(top_builddir)/src/libopensc/libopensc.la opensc_tool_SOURCES = opensc-tool.c util.c piv_tool_SOURCES = piv-tool.c util.c @@ -36,8 +36,7 @@ pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_ cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c cryptoflex_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) pkcs15_init_SOURCES = pkcs15-init.c util.c -pkcs15_init_LDADD = $(OPTIONAL_OPENSSL_LIBS) \ - $(top_builddir)/src/pkcs15init/libpkcs15init.la +pkcs15_init_LDADD = $(OPTIONAL_OPENSSL_LIBS) cardos_tool_SOURCES = cardos-tool.c util.c cardos_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) eidenv_SOURCES = eidenv.c util.c
_______________________________________________ opensc-devel mailing list [email protected] http://www.opensc-project.org/mailman/listinfo/opensc-devel
