Changeset 109

Show
Ignore:
Timestamp:
08/04/08 16:47:49 (4 months ago)
Author:
jps
Message:

Preparing SCA 0.2.3

Location:
trunk
Files:
10 modified

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r108 r109  
    11BUILDHOME = $(PWD) 
    2 OPENSCVERSION = 0.11.4-svn-r3388 
    3 SCAVERSION = 0.2.3pre2 
    4 LIBP11VERSION = 0.2.3 
    5 ENGINEVERSION = 0.1.4 
    6 OPENSSLVERSION = 0.9.8g 
    7 OPENSSHVERSION = 4.7p1 
     2OPENSCVERSION = 0.11.5 
     3SCAVERSION = 0.2.3 
     4LIBP11VERSION = 0.2.4 
     5ENGINEVERSION = 0.1.5 
     6OPENSSLVERSION = 0.9.8h 
     7OPENSSHVERSION = 5.1p1 
    88IFDEGATEVERSION = 0.05 
    99LIBUSBVERSION = 0.1.12 
    … …  
    117117 
    118118openssh-$(OPENSSHVERSION).tar.gz: 
    119         curl -O http://ftp.scarlet.be/pub/openbsd/OpenSSH/portable/$@ 
     119        curl -O ftp://ftp.belnet.be/packages/openbsd/OpenSSH/portable/$@ 
    120120 
    121121ifd-egate-$(IFDEGATEVERSION)-patched.tar.gz: 
    … …  
    180180        OPENSSL_CFLAGS="-I$(BUILDHOME)/compiled-openssl/Library/OpenSC/include" \ 
    181181        OPENSSL_LIBS="-L$(BUILDHOME)/compiled-openssl/Library/OpenSC/lib -lcrypto" \ 
    182         ./configure --prefix=/Library/OpenSC --sysconfdir=/Library/OpenSC/etc && \ 
     182        ./configure --prefix=/Library/OpenSC --sysconfdir=/Library/OpenSC/etc --enable-pcsc && \ 
    183183        make && \ 
    184184        make install prefix=$(BUILDHOME)/compiled-opensc/Library/OpenSC 
    … …  
    408408 
    409409lipo-engine: compiled-engine-i386 
    410         cd compiled-engine/Library/OpenSC/lib/engines/ && \ 
    411         lipo -create engine_pkcs11.a ../../../../../compiled-engine-i386/Library/OpenSC/lib/engines/engine_pkcs11.a -output engine_pkcs11-univ.a && \ 
    412         mv -f engine_pkcs11-univ.a engine_pkcs11.a 
     410#       cd compiled-engine/Library/OpenSC/lib/engines/ && \ 
     411#       lipo -create engine_pkcs11.a ../../../../../compiled-engine-i386/Library/OpenSC/lib/engines/engine_pkcs11.a -output engine_pkcs11-univ.a && \ 
     412#       mv -f engine_pkcs11-univ.a engine_pkcs11.a 
    413413        cd compiled-engine/Library/OpenSC/lib/engines/ && \ 
    414414        lipo -create engine_pkcs11.so ../../../../../compiled-engine-i386/Library/OpenSC/lib/engines/engine_pkcs11.so -output engine_pkcs11-univ.so && \ 
    … …  
    418418lipo-libp11: compiled-libp11-i386 
    419419        cd compiled-libp11/Library/OpenSC/lib/ && \ 
    420         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 && \ 
    421         mv -f libp11.0.1.1-univ.dylib libp11.0.1.1.dylib 
     420        lipo -create libp11.0.1.2.dylib ../../../../compiled-libp11-i386/Library/OpenSC/lib/libp11.0.1.2.dylib -output libp11.0.1.2-univ.dylib && \ 
     421        mv -f libp11.0.1.2-univ.dylib libp11.0.1.2.dylib 
    422422        cd compiled-libp11/Library/OpenSC/lib/ && \ 
    423423        lipo -create libp11.a ../../../../compiled-libp11-i386/Library/OpenSC/lib/libp11.a -output libp11-univ.a && \ 
    … …  
    466466        cp opensc-uninstall compiled-opensc/Library/OpenSC/bin/ 
    467467        mkdir -p compiled-opensc/Library/OpenSC/doc/opensc/html 
    468         cp  opensc/doc/ChangeLog compiled-opensc/Library/OpenSC/doc/opensc/ 
    469         cp  opensc/doc/*.html compiled-opensc/Library/OpenSC/doc/opensc/ 
    470         cp  opensc/doc/*.css compiled-opensc/Library/OpenSC/doc/opensc/ 
    471         cp  opensc/doc/html/*.html compiled-opensc/Library/OpenSC/doc/opensc/html 
     468        #cp  opensc/doc/ChangeLog compiled-opensc/Library/OpenSC/doc/opensc/ 
     469        #cp  opensc/doc/*.html compiled-opensc/Library/OpenSC/doc/opensc/ 
     470        #cp  opensc/doc/*.css compiled-opensc/Library/OpenSC/doc/opensc/ 
     471        #cp  opensc/doc/html/*.html compiled-opensc/Library/OpenSC/doc/opensc/html 
    472472        ./libtool-bundle compiled-opensc/Library/OpenSC/lib/opensc-pkcs11.so compiled-opensc/Library/OpenSC/lib 
    473473        mkdir -p compiled-libp11/Library/OpenSC/doc/libp11/examples 
    474474        cp libp11/doc/*.html compiled-libp11/Library/OpenSC/doc/libp11 
    475         cp libp11/doc/*.css compiled-libp11/Library/OpenSC/doc/libp11 
     475        #cp libp11/doc/*.css compiled-libp11/Library/OpenSC/doc/libp11 
    476476        cp libp11/examples/* compiled-libp11/Library/OpenSC/doc/libp11/examples 
    477477        cp howto compiled-opensc/Library/OpenSC/doc/build-howto.txt 
    478         mkdir -p compiled-engine/Library/OpenSC/doc/engine_pkcs11 
    479         cp engine_pkcs11/doc/*.html compiled-engine/Library/OpenSC/doc/engine_pkcs11 
    480         cp engine_pkcs11/doc/*.css compiled-engine/Library/OpenSC/doc/engine_pkcs11 
     478        #mkdir -p compiled-engine/Library/OpenSC/doc/engine_pkcs11 
     479        #cp engine_pkcs11/doc/*.html compiled-engine/Library/OpenSC/doc/engine_pkcs11 
     480        #cp engine_pkcs11/doc/*.css compiled-engine/Library/OpenSC/doc/engine_pkcs11 
    481481        mkdir -p compiled-opensc/usr/lib/ 
    482482        cp /usr/lib/libltdl.3.dylib compiled-opensc/usr/lib/ 

  • trunk/Makefile_i386

    r108 r109  
    11BUILDHOME = $(PWD) 
    2 OPENSSLVERSION = 0.9.8g 
    3 OPENSCVERSION = 0.11.4-svn-r3388 
    4 OPENSSHVERSION = 4.7p1 
    5 LIBP11VERSION = 0.2.3 
    6 ENGINEVERSION = 0.1.4 
     2OPENSSLVERSION = 0.9.8h 
     3OPENSCVERSION = 0.11.5 
     4OPENSSHVERSION = 5.1p1 
     5LIBP11VERSION = 0.2.4 
     6ENGINEVERSION = 0.1.5 
    77IFDEGATEVERSION = 0.05 
    88LIBUSBVERSION = 0.1.12 
    … …  
    7474 
    7575openssh-$(OPENSSHVERSION).tar.gz: 
    76         curl -O http://ftp.scarlet.be/pub/openbsd/OpenSSH/portable/$@ 
     76        curl -O http://ftp.belnet.be/packages/openbsd/OpenSSH/portable/$@ 
    7777 
    7878ifd-egate-$(IFDEGATEVERSION)-patched.tar.gz: 
    … …  
    152152        OPENSSL_CFLAGS="-I$(BUILDHOME)/compiled-openssl-i386/Library/OpenSC/include" \ 
    153153        OPENSSL_LIBS="-L$(BUILDHOME)/compiled-openssl-i386/Library/OpenSC/lib -lcrypto" \ 
    154         ./configure --prefix=/Library/OpenSC --sysconfdir=/Library/OpenSC/etc && \ 
     154        ./configure --prefix=/Library/OpenSC --enable-pcsc --sysconfdir=/Library/OpenSC/etc && \ 
    155155        make && \ 
    156156        make install prefix=$(BUILDHOME)/compiled-opensc-i386/Library/OpenSC 

  • trunk/Makefile_light

    r101 r109  
    11BUILDHOME = $(PWD) 
    2 OPENSCVERSION = 0.11.4 
    3 SCAVERSION = 0.2.2 
     2OPENSCVERSION = 0.11.5 
     3SCAVERSION = 0.2.3 
    44IFDEGATEVERSION = 0.05 
    55LIBUSBVERSION = 0.1.12 
    … …  
    112112        OPENSSL_CFLAGS="-I/usr/include" \ 
    113113        OPENSSL_LIBS="-L/usr/lib -lcrypto" \ 
    114         ./configure --prefix=/Library/OpenSC --sysconfdir=/Library/OpenSC/etc && \ 
     114        ./configure --prefix=/Library/OpenSC --sysconfdir=/Library/OpenSC/etc --enable-pcsc && \ 
    115115        make && \ 
    116116        make install prefix=$(BUILDHOME)/compiled-opensc/Library/OpenSC 
    … …  
    255255        cp opensc-uninstall compiled-opensc/Library/OpenSC/bin/ 
    256256        mkdir -p compiled-opensc/Library/OpenSC/doc/opensc/html 
    257         cp  opensc/doc/ChangeLog compiled-opensc/Library/OpenSC/doc/opensc/ 
    258         cp  opensc/doc/*.html compiled-opensc/Library/OpenSC/doc/opensc/ 
    259         cp  opensc/doc/*.css compiled-opensc/Library/OpenSC/doc/opensc/ 
    260         cp  opensc/doc/html/*.html compiled-opensc/Library/OpenSC/doc/opensc/html 
     257        #cp  opensc/doc/ChangeLog compiled-opensc/Library/OpenSC/doc/opensc/ 
     258        #cp  opensc/doc/*.html compiled-opensc/Library/OpenSC/doc/opensc/ 
     259        #cp  opensc/doc/*.css compiled-opensc/Library/OpenSC/doc/opensc/ 
     260        #cp  opensc/doc/html/*.html compiled-opensc/Library/OpenSC/doc/opensc/html 
     261        ./libtool-bundle compiled-opensc/Library/OpenSC/lib/opensc-pkcs11.so compiled-opensc/Library/OpenSC/lib 
    261262        cp howto compiled-opensc/Library/OpenSC/doc/build-howto.txt 
    262263        mkdir -p compiled-opensc/usr/lib/ 

  • trunk/Makefile_light_i386

    r101 r109  
    11BUILDHOME = $(PWD) 
    2 OPENSCVERSION = 0.11.4 
     2OPENSCVERSION = 0.11.5 
    33IFDEGATEVERSION = 0.05 
    44LIBUSBVERSION = 0.1.12 
    … …  
    8282        OPENSSL_CFLAGS="-I/usr/include" \ 
    8383    OPENSSL_LIBS="-L/usr/lib -lcrypto" \ 
    84         ./configure --prefix=/Library/OpenSC --sysconfdir=/Library/OpenSC/etc && \ 
     84        ./configure --prefix=/Library/OpenSC --sysconfdir=/Library/OpenSC/etc --enable-pcsc && \ 
    8585        make && \ 
    8686        make install prefix=$(BUILDHOME)/compiled-opensc-i386/Library/OpenSC 

  • trunk/engine-pack/Info.plist

    r97 r109  
    44<dict> 
    55        <key>CFBundleGetInfoString</key> 
    6         <string>0.1.4, OpenSC Project</string> 
     6        <string>0.1.5, OpenSC Project</string> 
    77        <key>CFBundleIdentifier</key> 
    88        <string>org.opensc.engine</string> 
    99        <key>CFBundleShortVersionString</key> 
    10         <string>0.1.4</string> 
     10        <string>0.1.5</string> 
    1111        <key>IFPkgFlagAllowBackRev</key> 
    1212        <true/> 

  • trunk/howto

    r98 r109  
    1313        sudo fink install libtool14 
    1414        sudo fink install wget 
     15        sudo fink install pkgconfig 
    1516         
    1617- Install subversion 

  • trunk/libp11-pack/Info.plist

    r97 r109  
    44<dict> 
    55        <key>CFBundleGetInfoString</key> 
    6         <string>0.2.3, OpenSC Project</string> 
     6        <string>0.2.4, OpenSC Project</string> 
    77        <key>CFBundleIdentifier</key> 
    88        <string>org.opensc.libp11</string> 
    99        <key>CFBundleShortVersionString</key> 
    10         <string>0.2.3</string> 
     10        <string>0.2.4</string> 
    1111        <key>IFPkgFlagAllowBackRev</key> 
    1212        <true/> 

  • trunk/opensc-pack/Info.plist

    r97 r109  
    44<dict> 
    55        <key>CFBundleGetInfoString</key> 
    6         <string>0.11.4, OpenSC Project</string> 
     6        <string>0.11.5, OpenSC Project</string> 
    77        <key>CFBundleIdentifier</key> 
    88        <string>org.opensc.opensc</string> 
    99        <key>CFBundleShortVersionString</key> 
    10         <string>0.11.4</string> 
     10        <string>0.11.5</string> 
    1111        <key>IFPkgFlagAllowBackRev</key> 
    1212        <true/> 

  • trunk/openssh-pack/Info.plist

    r94 r109  
    44<dict> 
    55        <key>CFBundleGetInfoString</key> 
    6         <string>4.6p1, OpenSC Project</string> 
     6        <string>5.1p1, OpenSC Project</string> 
    77        <key>CFBundleIdentifier</key> 
    88        <string>org.opensc.openssh</string> 
    99        <key>CFBundleShortVersionString</key> 
    10         <string>4.6.1</string> 
     10        <string>5.1.1</string> 
    1111        <key>IFPkgFlagAllowBackRev</key> 
    1212        <true/> 

  • trunk/openssl-pack/Info.plist

    r94 r109  
    44<dict> 
    55        <key>CFBundleGetInfoString</key> 
    6         <string>0.9.8e, OpenSC Project</string> 
     6        <string>0.9.8h, OpenSC Project</string> 
    77        <key>CFBundleIdentifier</key> 
    88        <string>org.opensc.openssl</string>