search

OpenSC / OpenSC.tokend

Tokend module for OS X with support for all cards supported by OpenSC
Other
35 stars 20 forks source link

branch 10.6-0.13.0 (import it as a new branch "10.6-0.13.0" to keep it in martinpaljak's standard) #2

Closed pettai closed 11 years ago

pettai commented 11 years ago

Hi again,

It would be better if you could pull this branch (import it as a new branch "10.6-0.13.0" preferable? to keep it in martinpaljak's standard way of different branches for different MacOSX / OpenSC releases), and backout my last suggested Pull Request (4f41dc13d84b2afde60e7ca0aafc5b4daf12337b)

PS. I'm new to git(hub), and didn't fully understand Martin Paljak's way of organising his OpenSC.tokend code. DS.

(Hmm... I see that this Pull Request also want's to go into your master, which wasn't my intention...)

martinpaljak commented 11 years ago

The difference should now be minor, especially when it only makes sense to target 10.6 and 10.7.

I'll have a look at it tomorrow.

On Tue, Feb 5, 2013 at 6:10 PM, pettai notifications@github.com wrote:

Hi again,

It would be better if you could pull this branch (import it as a new branch "10.6-0.13.0" preferable? to keep it in martinpaljak's standard way of different branches for different MacOSX / OpenSC releases), and backout my last suggested Pull Request (4f41dc1)

PS. I'm new to git(hub), and didn't fully understand Martin Paljak's way of organising his OpenSC.tokend code. DS.

You can merge this Pull Request by running

git pull https://github.com/pettai/OpenSC.tokend 10.6-0.13.0

Or view, comment on, or merge it at:

https://github.com/OpenSC/OpenSC.tokend/pull/2

Commit Summary

Header inclusion fix Fix building on 10.6: one missing file changed to new debug log; use 10.6 SDK Look for OpenSC headers in build/opensc-src, which should be a symlink to a built OpenSC/src tree Add script to fetch the binary pieces from Apple. MacInstaller: upgrade tokend for r4788 Increase the default score to 300. Synchronize with r5041 of OpenSC OpenSC.tokend: don't require hard /Library/OpenSC for building OpenSC.tokend Search for libraries in OpenSC build directory, not /Library/OpenSC MacInstaller: update OpenSC.tokend code to reflect changes in d888b3fd55053894dcc751b21301d53669e966ba Fix compilation error on 10.7 with clang Remove compiler warning. Fix proposed in:

File Changes

M OpenSC/OpenSCAttributeCoder.cpp (8) M OpenSC/OpenSCRecord.cpp (7) M OpenSC/OpenSCToken.cpp (30) M Tokend.xcodeproj/project.pbxproj (35) M Tokend/DbValue.cpp (6) M Tokend/Token.cpp (2) M Tokend/Token.h (2) A fetch-binary-build.py (49)

Patch Links:

https://github.com/OpenSC/OpenSC.tokend/pull/2.patch https://github.com/OpenSC/OpenSC.tokend/pull/2.diff

martinpaljak commented 11 years ago

It seemed to be easier to make two slightly different scripts for 10.5 and 10.6 at some point in time, which no longer stands. Thus the two ppc/intel-only branches. To adjust for internal changes (like the change in certificate data encoding in #1) the different OpenSC version based branches, so that those who required depending on an older version (don't ask) would be able to do it.

None of this is reasonable any more, thus no need for this quite messy branch-polka. Current master should build nicely with the master of OpenSC.

Thus no need for a separate branch.