Changeset 36

Show
Ignore:
Timestamp:
01/23/06 13:34:05 (3 years ago)
Author:
jps
Message:

- apply opensc/src/openssh/ask-for-pin.diff to openssh before compiling
- prepend sc to ssh executables and man pages,

so /Library/OpenSC/bin can be put in $PATH

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r35 r36  
     1Version 0.1.8 
     2------------- 
     3- Add launchd style pcscd starter 
     4- apply opensc/src/openssh/ask-for-pin.diff to openssh before compiling 
     5- prepend sc to ssh executables and man pages,  
     6    so /Library/OpenSC/bin can be put in $PATH 
     7 
    18Version 0.1.7 
    29------------- 

  • trunk/Makefile

    r35 r36  
    162162         
    163163build-openssh: 
     164        cd openssh && patch -p1 <../opensc/src/openssh/ask-for-pin.diff 
    164165        cd openssh && \ 
    165166        DYLD_LIBRARY_PATH="$(BUILDHOME)/compiled-openssl/Library/OpenSC/lib"  \ 
    … …  
    182183        rm -rf $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man8 
    183184        rm -rf $(BUILDHOME)/compiled-openssh/Library/OpenSC/sbin 
     185        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/ssh $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/scssh 
     186        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/ssh-add $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/scssh-add 
     187        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/ssh-agent $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/scssh-agent 
     188        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/ssh-keygen $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/scssh-keygen 
     189        rm -f $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/slogin 
     190        cd $(BUILDHOME)/compiled-openssh/Library/OpenSC/bin/ && ln -s ./scssh scslogin 
     191        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/ssh-add.1 $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/scssh-add.1 
     192        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/ssh-agent.1 $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/scssh-agent.1 
     193        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/ssh-keygen.1 $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/scssh-keygen.1 
     194        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/ssh.1 $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/scssh.1 
     195        rm -f $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/slogin.1 
     196        cd $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man1/ && ln -s ./scssh.1 scslogin.1 
     197        mv $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man5/ssh_config.5 $(BUILDHOME)/compiled-openssh/Library/OpenSC/man/man5/scssh_config.5 
    184198         
    185199build-libusb: 
    … …  
    271285        -i opensc_tokend-pack/Info.plist -d opensc_tokend-pack/Description.plist 
    272286 
     287uninstall-all: uninstall uninstall-pcscd_autostart 
    273288 
    274289uninstall: 
    275290        rm -rf /Library/Receipts/libusb.pkg 
    276291        rm -rf /Library/Receipts/ifd-egate.pkg 
    277         rm -rf /Library/Receipts/pcscd_autostart.pkg 
    278292        rm -rf /Library/Receipts/libp11.pkg 
    279293        rm -rf /Library/Receipts/engine_pkcs11.pkg 
    … …  
    282296        rm -rf /Library/Receipts/openssh.pkg 
    283297        rm -rf /Library/Receipts/opensc.tokend.pkg 
    284 #       rm -rf /Library/StartupItems/pcscd_autostart 
    285298        rm -rf /Library/OpenSC 
    286  
     299         
     300uninstall-pcscd_autostart:       
     301        rm -rf /Library/Receipts/pcscd_autostart.pkg 
     302        launchctl unload -w /Library/LaunchDaemons/org.opensc.pcscd.autostart 
     303        rm -f /Library/LaunchDaemons/org.opensc.pcscd.autostart