Changeset 64

Show
Ignore:
Timestamp:
04/21/06 15:30:24 (3 years ago)
Author:
jps
Message:

OpenSC 0.11.0-RC1 and first UB release

Location:
trunk
Files:
1 added
5 modified

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r50 r64  
    11Version 0.1.9pre 
    22---------------- 
     3- Universal Binaries (except for OpenSC.Tokend) 
    34- OpenSSH: upgrade to 4.3p2 
     5- libusb: upgrade to 0.1.12 
    46- opensc.conf: will not overwrite a user modified one 
    5 - experimental: with snapshot version of opensc (0.11.0-pre-r....) and  
    6         openssl (0.9.8-stable-SNAP) 
     7- experimental: with RC1 version of opensc 0.11.0 and  
     8        snapshot version of openssl (0.9.8-stable-SNAP) 
    79- OpenSC.Tokend now based on 10.4.4 (Build8G32) 
    810        To compile, you need to build a new disk image  
    911        (http://www.opensc-project.org/opensc/wiki/MacOsXTokend using Build8G32) 
     12        Works only on PPC based Macs! 
    1013- pcscd_autostart will also modify securityd option 
    1114- Uninstaller: /Library/OpenSC/bin/opensc-uninstall 

  • trunk/Makefile

    r63 r64  
    11BUILDHOME = $(PWD) 
    22#OPENSCVERSION = 0.10.1 
    3 OPENSCVERSION = 0.11.0-pre-r2884 
    4 SCAVERSION = 0.1.9pre2 
     3OPENSCVERSION = 0.11.0-rc1 
     4SCAVERSION = 0.1.9pre3 
    55LIBP11VERSION = 0.2.1 
    66ENGINEVERSION = 0.1.3 
    77#OPENSSLVERSION = 0.9.7i 
    8 OPENSSLVERSION = 0.9.8-stable-SNAP-20060406 
     8OPENSSLVERSION = 0.9.8-stable-SNAP-20060421 
    99OPENSSHVERSION = 4.3p2 
    1010IFDEGATEVERSION = 0.05 
    11 LIBUSBVERSION = 0.1.10a 
     11LIBUSBVERSION = 0.1.12 
    1212TOKEND_IMAGE_LOCATION = $(HOME)/darwinbuild-0.7.2/Builds.dmg 
    1313TOKEND_IMAGE_NAME = /Volumes/Builds 
    … …  
    2525        rm -rf compiled-opensc 
    2626        rm -rf OpenSC.pkg 
    27         rm -f fetch-opensc build-opensc package-opensc 
     27        rm -f fetch-opensc build-opensc package-opensc lipo-opensc 
    2828 
    2929clean-libp11: 
    … …  
    3131        rm -rf libp11.pkg 
    3232        rm -rf compiled-libp11 
    33         rm -f fetch-libp11 build-libp11 package-libp11 
     33        rm -f fetch-libp11 build-libp11 package-libp11 lipo-libp11 
    3434 
    3535clean-engine: 
    … …  
    3737        rm -rf engine_pkcs11.pkg 
    3838        rm -rf compiled-engine 
    39         rm -f fetch-engine build-engine package-engine 
     39        rm -f fetch-engine build-engine package-engine lipo-engine 
    4040 
    4141clean-openssl: 
    … …  
    4343        rm -rf openssl.pkg 
    4444        rm -rf compiled-openssl 
    45         rm -f fetch-openssl build-openssl package-openssl 
     45        rm -f fetch-openssl build-openssl package-openssl lipo-openssl 
    4646 
    4747clean-openssh: 
    … …  
    4949        rm -rf openssh.pkg 
    5050        rm -rf compiled-openssh 
    51         rm -f fetch-openssh build-openssh package-openssh 
     51        rm -f fetch-openssh build-openssh package-openssh lipo-openssh 
    5252 
    5353clean-libusb: 
    … …  
    5555        rm -rf libusb.pkg 
    5656        rm -rf compiled-libusb 
    57         rm -f fetch-libusb build-libusb package-libusb 
     57        rm -f fetch-libusb build-libusb package-libusb lipo-libusb 
    5858 
    5959clean-ifd-egate: 
    … …  
    6161        rm -rf ifd-egate.pkg 
    6262        rm -rf compiled-ifd-egate 
    63         rm -f fetch-ifd-egate build-ifd-egate package-ifd-egate 
     63        rm -f fetch-ifd-egate build-ifd-egate package-ifd-egate lipo-ifd-egate 
    6464 
    6565clean-pcscd_autostart: 
    … …  
    7777        rm -f sca-$(SCAVERSION).dmg* 
    7878        rm -rf sca.mpkg 
     79         
     80clean-i386: 
     81        rm -rf compiled-*-i386 
     82        rm -f compiled-i386.tgz 
    7983 
    8084dist: sca-$(SCAVERSION).dmg 
    … …  
    99103opensc-$(OPENSCVERSION).tar.gz: 
    100104        # wget http://www.opensc-project.org/files/opensc/$@ 
    101         wget http://www.opensc-project.org/files/opensc/snapshots/$@ 
    102  
     105        # wget http://www.opensc-project.org/files/opensc/snapshots/$@ 
     106        wget http://www.opensc-project.org/files/opensc/testing/$@ 
     107         
    103108libp11-$(LIBP11VERSION).tar.gz: 
    104109        wget http://www.opensc-project.org/files/libp11/$@ 
    … …  
    275280        cp -R pcscd_autostart/files/* compiled-pcscd_autostart 
    276281        touch build-pcscd_autostart 
     282         
     283lipo: lipo-openssl lipo-opensc lipo-engine lipo-libp11 lipo-openssh lipo-libusb lipo-ifd-egate 
     284         
     285lipo-openssl: compiled-openssl-i386 
     286        cd compiled-openssl/Library/OpenSC/bin/ && \ 
     287        lipo -create openssl ../../../../compiled-openssl-i386/Library/OpenSC/bin/openssl -output openssl_univ && \ 
     288        mv -f openssl_univ openssl 
     289        cd compiled-openssl/Library/OpenSC/lib/ && \ 
     290        lipo -create libcrypto.a ../../../../compiled-openssl-i386/Library/OpenSC/lib/libcrypto.a -output libcrypto_univ.a && \ 
     291        mv -f libcrypto_univ.a libcrypto.a 
     292        cd compiled-openssl/Library/OpenSC/lib/ && \ 
     293        lipo -create libssl.a ../../../../compiled-openssl-i386/Library/OpenSC/lib/libssl.a -output libssl_univ.a && \ 
     294        mv -f libssl_univ.a libssl.a 
     295        cd compiled-openssl/Library/OpenSC/lib/ && \ 
     296        lipo -create libcrypto.0.9.8.dylib ../../../../compiled-openssl-i386/Library/OpenSC/lib/libcrypto.0.9.8.dylib -output libcrypto_univ.0.9.8.dylib && \ 
     297        mv -f libcrypto_univ.0.9.8.dylib libcrypto.0.9.8.dylib 
     298        cd compiled-openssl/Library/OpenSC/lib/ && \ 
     299        lipo -create libssl.0.9.8.dylib ../../../../compiled-openssl-i386/Library/OpenSC/lib/libssl.0.9.8.dylib -output libssl_univ.0.9.8.dylib && \ 
     300        mv -f libssl_univ.0.9.8.dylib libssl.0.9.8.dylib 
     301        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     302        lipo -create lib4758cca.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/lib4758cca.so -output lib4758cca_univ.so && \ 
     303        mv -f lib4758cca_univ.so lib4758cca.so 
     304        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     305        lipo -create libaep.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libaep.so -output libaep_univ.so && \ 
     306        mv -f libaep_univ.so libaep.so 
     307        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     308        lipo -create libatalla.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libatalla.so -output libatalla_univ.so && \ 
     309        mv -f libatalla_univ.so libatalla.so 
     310        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     311        lipo -create libchil.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libchil.so -output libchil_univ.so && \ 
     312        mv -f libchil_univ.so libchil.so 
     313        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     314        lipo -create libcswift.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libcswift.so -output libcswift_univ.so && \ 
     315        mv -f libcswift_univ.so libcswift.so 
     316        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     317        lipo -create libgmp.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libgmp.so -output libgmp_univ.so && \ 
     318        mv -f libgmp_univ.so libgmp.so 
     319        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     320        lipo -create libnuron.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libnuron.so -output libnuron_univ.so && \ 
     321        mv -f libnuron_univ.so libnuron.so 
     322        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     323        lipo -create libsureware.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libsureware.so -output libsureware_univ.so && \ 
     324        mv -f libsureware_univ.so libsureware.so 
     325        cd compiled-openssl/Library/OpenSC/lib/engines/ && \ 
     326        lipo -create libubsec.so ../../../../../compiled-openssl-i386/Library/OpenSC/lib/engines/libubsec.so -output libubsec_univ.so && \ 
     327        mv -f libubsec_univ.so libubsec.so 
     328        touch lipo-openssl 
     329         
     330lipo-opensc: compiled-opensc-i386 
     331        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     332        lipo -create cardos-info ../../../../compiled-opensc-i386/Library/OpenSC/bin/cardos-info -output cardos-info_univ && \ 
     333        mv -f cardos-info_univ cardos-info 
     334        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     335        lipo -create cryptoflex-tool ../../../../compiled-opensc-i386/Library/OpenSC/bin/cryptoflex-tool -output cryptoflex-tool_univ && \ 
     336        mv -f cryptoflex-tool_univ cryptoflex-tool 
     337        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     338        lipo -create eidenv ../../../../compiled-opensc-i386/Library/OpenSC/bin/eidenv -output eidenv_univ && \ 
     339        mv -f eidenv_univ eidenv 
     340        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     341        lipo -create netkey-tool ../../../../compiled-opensc-i386/Library/OpenSC/bin/netkey-tool -output netkey-tool_univ && \ 
     342        mv -f netkey-tool_univ netkey-tool 
     343        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     344        lipo -create opensc-explorer ../../../../compiled-opensc-i386/Library/OpenSC/bin/opensc-explorer -output opensc-explorer_univ && \ 
     345        mv -f opensc-explorer_univ opensc-explorer 
     346        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     347        lipo -create opensc-tool ../../../../compiled-opensc-i386/Library/OpenSC/bin/opensc-tool -output opensc-tool_univ && \ 
     348        mv -f opensc-tool_univ opensc-tool 
     349        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     350        lipo -create piv-tool ../../../../compiled-opensc-i386/Library/OpenSC/bin/piv-tool -output piv-tool_univ && \ 
     351        mv -f piv-tool_univ piv-tool 
     352        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     353        lipo -create pkcs11-tool ../../../../compiled-opensc-i386/Library/OpenSC/bin/pkcs11-tool -output pkcs11-tool_univ && \ 
     354        mv -f pkcs11-tool_univ pkcs11-tool 
     355        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     356        lipo -create pkcs15-crypt ../../../../compiled-opensc-i386/Library/OpenSC/bin/pkcs15-crypt -output pkcs15-crypt_univ && \ 
     357        mv -f pkcs15-crypt_univ pkcs15-crypt 
     358        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     359        lipo -create pkcs15-init ../../../../compiled-opensc-i386/Library/OpenSC/bin/pkcs15-init -output pkcs15-init_univ && \ 
     360        mv -f pkcs15-init_univ pkcs15-init 
     361        cd compiled-opensc/Library/OpenSC/bin/ && \ 
     362        lipo -create pkcs15-tool ../../../../compiled-opensc-i386/Library/OpenSC/bin/pkcs15-tool -output pkcs15-tool_univ && \ 
     363        mv -f pkcs15-tool_univ pkcs15-tool 
     364        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     365        lipo -create libopensc.2.0.0.dylib ../../../../compiled-opensc-i386/Library/OpenSC/lib/libopensc.2.0.0.dylib -output libopensc.2.0.0_univ.dylib && \ 
     366        mv -f libopensc.2.0.0_univ.dylib libopensc.2.0.0.dylib 
     367        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     368        lipo -create libpkcs15init.2.0.0.dylib ../../../../compiled-opensc-i386/Library/OpenSC/lib/libpkcs15init.2.0.0.dylib -output libpkcs15init.2.0.0_univ.dylib && \ 
     369        mv -f libpkcs15init.2.0.0_univ.dylib libpkcs15init.2.0.0.dylib 
     370        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     371        lipo -create libscconf.2.0.0.dylib ../../../../compiled-opensc-i386/Library/OpenSC/lib/libscconf.2.0.0.dylib -output libscconf.2.0.0_univ.dylib && \ 
     372        mv -f libscconf.2.0.0_univ.dylib libscconf.2.0.0.dylib 
     373        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     374        lipo -create opensc-pkcs11.so ../../../../compiled-opensc-i386/Library/OpenSC/lib/opensc-pkcs11.so -output opensc-pkcs11_univ.so && \ 
     375        mv -f opensc-pkcs11_univ.so opensc-pkcs11.so 
     376        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     377        lipo -create pkcs11-spy.so ../../../../compiled-opensc-i386/Library/OpenSC/lib/pkcs11-spy.so -output pkcs11-spy_univ.so && \ 
     378        mv -f pkcs11-spy_univ.so pkcs11-spy.so 
     379        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     380        lipo -create libopensc.a ../../../../compiled-opensc-i386/Library/OpenSC/lib/libopensc.a -output libopensc_univ.a && \ 
     381        mv -f libopensc_univ.a libopensc.a 
     382        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     383        lipo -create libpkcs15init.a ../../../../compiled-opensc-i386/Library/OpenSC/lib/libpkcs15init.a -output libpkcs15init_univ.a && \ 
     384        mv -f libpkcs15init_univ.a libpkcs15init.a 
     385        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     386        lipo -create libscconf.a ../../../../compiled-opensc-i386/Library/OpenSC/lib/libscconf.a -output libscconf_univ.a && \ 
     387        mv -f libscconf_univ.a libscconf.a 
     388        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     389        lipo -create opensc-pkcs11.a ../../../../compiled-opensc-i386/Library/OpenSC/lib/opensc-pkcs11.a -output opensc-pkcs11_univ.a && \ 
     390        mv -f opensc-pkcs11_univ.a opensc-pkcs11.a 
     391        cd compiled-opensc/Library/OpenSC/lib/ && \ 
     392        lipo -create pkcs11-spy.a ../../../../compiled-opensc-i386/Library/OpenSC/lib/pkcs11-spy.a -output pkcs11-spy_univ.a && \ 
     393        mv -f pkcs11-spy_univ.a pkcs11-spy.a 
     394        touch lipo-opensc 
     395         
     396lipo-engine: compiled-engine-i386 
     397        cd compiled-engine/Library/OpenSC/lib/engines/ && \ 
     398        lipo -create engine_pkcs11.a ../../../../../compiled-engine-i386/Library/OpenSC/lib/engines/engine_pkcs11.a -output engine_pkcs11-univ.a && \ 
     399        mv -f engine_pkcs11-univ.a engine_pkcs11.a 
     400        cd compiled-engine/Library/OpenSC/lib/engines/ && \ 
     401        lipo -create engine_pkcs11.so ../../../../../compiled-engine-i386/Library/OpenSC/lib/engines/engine_pkcs11.so -output engine_pkcs11-univ.so && \ 
     402        mv -f engine_pkcs11-univ.so engine_pkcs11.so 
     403        touch lipo-engine 
     404         
     405lipo-libp11: compiled-libp11-i386 
     406        cd compiled-libp11/Library/OpenSC/lib/ && \ 
     407        lipo -create libp11.0.1.1.dylib ../../../../compiled-libp11-i386/Library/OpenSC/lib/libp11.0.1.1.dylib -output libp11.0.1.1-univ.dylib && \ 
     408        mv -f libp11.0.1.1-univ.dylib libp11.0.1.1.dylib 
     409        cd compiled-libp11/Library/OpenSC/lib/ && \ 
     410        lipo -create libp11.a ../../../../compiled-libp11-i386/Library/OpenSC/lib/libp11.a -output libp11-univ.a && \ 
     411        mv -f libp11-univ.a libp11.a 
     412        touch lipo-libp11 
     413         
     414lipo-openssh: compiled-openssh-i386 
     415        cd compiled-openssh/Library/OpenSC/bin/ && \ 
     416        lipo -create scssh ../../../../compiled-openssh-i386/Library/OpenSC/bin/scssh -output scssh_univ && \ 
     417        mv -f scssh_univ scssh 
     418        cd compiled-openssh/Library/OpenSC/bin/ && \ 
     419        lipo -create scssh-add ../../../../compiled-openssh-i386/Library/OpenSC/bin/scssh-add -output scssh-add_univ && \ 
     420        mv -f scssh-add_univ scssh-add 
     421        cd compiled-openssh/Library/OpenSC/bin/ && \ 
     422        lipo -create scssh-agent ../../../../compiled-openssh-i386/Library/OpenSC/bin/scssh-agent -output scssh-agent_univ && \ 
     423        mv -f scssh-agent_univ scssh-agent 
     424        cd compiled-openssh/Library/OpenSC/bin/ && \ 
     425        lipo -create scssh-keygen ../../../../compiled-openssh-i386/Library/OpenSC/bin/scssh-keygen -output scssh-keygen_univ && \ 
     426        mv -f scssh-keygen_univ scssh-keygen 
     427        touch lipo-openssh 
     428         
     429lipo-libusb: compiled-libusb-i386 
     430        cd compiled-libusb/Library/OpenSC/lib/ && \ 
     431        lipo -create libusb-0.1.4.4.4.dylib ../../../../compiled-libusb-i386/Library/OpenSC/lib/libusb-0.1.4.4.4.dylib -output libusb-0.1.4.4.4-univ.dylib && \ 
     432        mv -f libusb-0.1.4.4.4-univ.dylib libusb-0.1.4.4.4.dylib 
     433        cd compiled-libusb/Library/OpenSC/lib/ && \ 
     434        lipo -create libusbpp-0.1.4.4.4.dylib ../../../../compiled-libusb-i386/Library/OpenSC/lib/libusbpp-0.1.4.4.4.dylib -output libusbpp-0.1.4.4.4-univ.dylib && \ 
     435        mv -f libusbpp-0.1.4.4.4-univ.dylib libusbpp-0.1.4.4.4.dylib 
     436        cd compiled-libusb/Library/OpenSC/lib/ && \ 
     437        lipo -create libusb.a ../../../../compiled-libusb-i386/Library/OpenSC/lib/libusb.a -output libusb-univ.a && \ 
     438        mv -f libusb-univ.a libusb.a 
     439        cd compiled-libusb/Library/OpenSC/lib/ && \ 
     440        lipo -create libusbpp.a ../../../../compiled-libusb-i386/Library/OpenSC/lib/libusbpp.a -output libusbpp-univ.a && \ 
     441        mv -f libusbpp-univ.a libusbpp.a 
     442        touch lipo-libusb 
     443 
     444lipo-ifd-egate: compiled-ifd-egate-i386 
     445        cd compiled-ifd-egate/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS/ && \ 
     446        lipo -create libifd_egate.dylib ../../../../../../../../compiled-ifd-egate-i386/usr/libexec/SmartCardServices/drivers/ifd-egate.bundle/Contents/MacOS/libifd_egate.dylib -output libifd_egate-univ.dylib && \ 
     447        mv -f libifd_egate-univ.dylib libifd_egate.dylib 
     448        touch lipo-ifd-egate 
    277449 
    278450install: 

  • trunk/howto

    r49 r64  
    11Requirements 
    22------------ 
    3 - Mac OS X 10.4 (With latest updates, currently 10.4.4) 
     3- Mac OS X 10.4 (With latest updates, currently 10.4.6) 
    44- Install Xcode 2.2 from Apple on their developer site 
    55(http://developer.apple.com/tools/xcode/index.html) for the ADC member. 
    … …  
    1515        sudo fink install svn-client-ssl 
    1616 
    17 Building the package 
    18 -------------------- 
     17Building the package for PPC only 
     18--------------------------------- 
    1919- Check out the sca project to your Documents folder 
    2020  svn co http://www.opensc-project.org/svn/sca/trunk opensc 
    … …  
    3030         
    3131The resulting file sca-X.X.dmg can be distributed.       
     32 
     33Building the Universal package 
     34------------------------------ 
     35- You need first create the i386 part on a MacIntel system. 
     36        The MacIntel need to have the Developer Xcode installed which is available 
     37        on the Installation DVD. 
     38        Transfer the Makefile_i386 
     39        and then do: 
     40        make -f Makefile_i386 all ; make -f Makefile_i386 transfer 
     41        The compiled-i386.tgz obtained need to be transfered back to your your PPC system, 
     42        in Documents/opensc. 
     43        There do tar xzf compiled-i386.tgz 
     44         
     45- Check out the sca project to your Documents folder 
     46  svn co http://www.opensc-project.org/svn/sca/trunk opensc 
     47 
     48In the newly created directory "opensc": 
     49!Edit the makefile! 
     50!Edit xxxx-pack/Info.plist for version number! 
     51 
     52        make fetch 
     53        make build 
     54        make lipo 
     55        sudo make install 
     56        make package 
     57         
     58The resulting file sca-X.X.dmg can be distributed.       
     59 
    3260 
    3361Before building the file for distribution, check: 

  • trunk/libusb-pack/Info.plist

    r19 r64  
    44<dict> 
    55        <key>CFBundleGetInfoString</key> 
    6         <string>0.1.10a, OpenSC Project</string> 
     6        <string>0.1.12, OpenSC Project</string> 
    77        <key>CFBundleIdentifier</key> 
    88        <string>org.opensc.libusb</string> 
    99        <key>CFBundleShortVersionString</key> 
    10         <string>0.1.10</string> 
     10        <string>0.1.12</string> 
    1111        <key>IFPkgFlagAllowBackRev</key> 
    1212        <true/> 

  • trunk/opensc-pack/Info.plist

    r30 r64  
    44<dict> 
    55        <key>CFBundleGetInfoString</key> 
    6         <string>0.10.1, OpenSC Project</string> 
     6        <string>0.11.0, OpenSC Project</string> 
    77        <key>CFBundleIdentifier</key> 
    88        <string>org.opensc.opensc</string> 
    99        <key>CFBundleShortVersionString</key> 
    10         <string>0.10.1</string> 
     10        <string>0.11.0</string> 
    1111        <key>IFPkgFlagAllowBackRev</key> 
    1212        <true/>