Changeset 97

Show
Ignore:
Timestamp:
07/30/07 10:54:13 (16 months ago)
Author:
jps
Message:

New experimental SCA release for testing announced OpenSC 0.11.4, LibP11 0.2.3 and Engine-pkcs11 0.1.4

Location:
trunk
Files:
6 modified

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r96 r97  
    44- OpenSSH: upgrade to 4.6p1 
    55- OpenSSL: upgrade to 0.9.8e 
     6- Upgrade to XCode 2.4.1 
    67 
    78Version 0.2.0 

  • trunk/Makefile

    r96 r97  
    11BUILDHOME = $(PWD) 
    2 OPENSCVERSION = 0.11.2 
    3 SCAVERSION = 0.2.1 
    4 LIBP11VERSION = 0.2.2 
    5 ENGINEVERSION = 0.1.3 
     2OPENSCVERSION = 0.11.3-svn-r3234 
     3SCAVERSION = 0.2.2pre1 
     4LIBP11VERSION = 0.2.3 
     5ENGINEVERSION = 0.1.4 
    66OPENSSLVERSION = 0.9.8e 
    77OPENSSHVERSION = 4.6p1 
    … …  
    102102 
    103103opensc-$(OPENSCVERSION).tar.gz: 
    104         curl -O http://www.opensc-project.org/files/opensc/$@ 
    105         # curl -O http://www.opensc-project.org/files/opensc/snapshots/$@ 
     104        # curl -O http://www.opensc-project.org/files/opensc/$@ 
     105        curl -O http://www.opensc-project.org/files/opensc/snapshots/$@ 
    106106        # curl -O http://www.opensc-project.org/files/opensc/testing/$@ 
    107107 

  • trunk/Makefile_i386

    r96 r97  
    11BUILDHOME = $(PWD) 
    22OPENSSLVERSION = 0.9.8e 
    3 OPENSCVERSION = 0.11.2 
     3OPENSCVERSION = 0.11.3-svn-r3234 
    44OPENSSHVERSION = 4.6p1 
    5 LIBP11VERSION = 0.2.2 
    6 ENGINEVERSION = 0.1.3 
     5LIBP11VERSION = 0.2.3 
     6ENGINEVERSION = 0.1.4 
    77IFDEGATEVERSION = 0.05 
    88LIBUSBVERSION = 0.1.12 
    9  
    10  
    11 all: build-openssl build-opensc build-libp11 build-engine build-openssh build-libusb build-ifd-egate 
    12 clean: clean-openssl clean-opensc clean-libp11 clean-engine clean-openssh clean-libusb clean-ifd-egate 
     9PKGCONFIGVERSION = 0.22 
     10 
     11 
     12all: build-pkg-config build-openssl build-opensc build-libp11 build-engine build-openssh build-libusb build-ifd-egate 
     13clean: clean-pkg-config clean-openssl clean-opensc clean-libp11 clean-engine clean-openssh clean-libusb clean-ifd-egate 
    1314transfer: 
    1415        tar czf compiled-i386.tgz *-i386 
    1516 
     17clean-pkg-config: 
     18        rm -rf pkg-config 
     19        rm -rf compiled-pkg-config 
     20        rm -f fetch-pkg-config build-pkg-config 
     21         
    1622clean-openssl: 
    1723        rm -rf openssl 
    … …  
    4955        rm -f fetch-ifd-egate build-ifd-egate 
    5056 
     57pkg-config-$(PKGCONFIGVERSION).tar.gz: 
     58        curl -O  http://pkgconfig.freedesktop.org/releases/$@ 
     59         
    5160openssl-$(OPENSSLVERSION).tar.gz: 
    5261        curl -O http://www.openssl.org/source/$@ 
    … …  
    5463 
    5564opensc-$(OPENSCVERSION).tar.gz: 
    56         curl -O http://www.opensc-project.org/files/opensc/$@ 
    57         # curl -O http://www.opensc-project.org/files/opensc/snapshots/$@ 
     65        # curl -O http://www.opensc-project.org/files/opensc/$@ 
     66        curl -O http://www.opensc-project.org/files/opensc/snapshots/$@ 
    5867        # curl -O http://www.opensc-project.org/files/opensc/testing/$@ 
    5968 
    … …  
    7281libusb-$(LIBUSBVERSION).tar.gz: 
    7382        curl -O http://switch.dl.sourceforge.net/sourceforge/libusb/$@ 
     83         
     84fetch-pkg-config: pkg-config-$(PKGCONFIGVERSION).tar.gz 
     85        rm -rf pkg-config 
     86        tar xzvf $^ 
     87        mv pkg-config-$(PKGCONFIGVERSION) pkg-config 
     88        touch $@ 
    7489 
    7590fetch-openssl: openssl-$(OPENSSLVERSION).tar.gz 
    … …  
    114129        tar xzvf $^ 
    115130        mv ifd-egate-$(IFDEGATEVERSION) ifd-egate 
     131        touch $@ 
     132         
     133build-pkg-config: fetch-pkg-config 
     134        cd pkg-config && \ 
     135        ./configure --prefix=$(BUILDHOME)/compiled-pkg-config && \ 
     136        make && \ 
     137        make install 
    116138        touch $@ 
    117139 
    … …  
    144166build-engine: fetch-engine 
    145167        cd engine_pkcs11  && \ 
     168        PKG_CONFIG="$(BUILDHOME)/compiled-pkg-config/bin/pkg-config" \ 
    146169        LIBP11_CFLAGS="-I$(BUILDHOME)/compiled-libp11-i386/Library/OpenSC/include" \ 
    147170        LIBP11_LIBS="-L$(BUILDHOME)/compiled-libp11-i386/Library/OpenSC/lib -lp11" \ 

  • trunk/engine-pack/Info.plist

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

  • trunk/libp11-pack/Info.plist

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

  • trunk/opensc-pack/Info.plist

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