Skip to content

Conversation

@germanblanco
Copy link
Contributor

This is a Pull request with the same goal as #167.
This one has a clean history with just one commit and strictly the changes required for DNIe support.

@JenkinsForOpenSC
Copy link

Can one of the admins verify this patch?

@LudovicRousseau
Copy link
Member

@JenkinsForOpenSC ok to test

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change duplicates the line for sc_hsm_tool. It is a result of the squashing of the commits history, and it should be removed.

@germanblanco
Copy link
Contributor Author

Is there any action required from my part in order to fix these two errors or will they be solved in the merge?

@LudovicRousseau
Copy link
Member

It is strange these two patches have not be removed after the rebase.

@germanblanco
Copy link
Contributor Author

Sorry about that, I must have made a mistake with the rebase. The initial for of the repository was from somewhere in April, but it also had several merges trying to keep up-to-date with the changes in OpenSC/master. When doing the rebase with upstream it went back to the April commit of OpenSC, so I selected manually only the commits that were related with DNIe on top of that. The additional change in configure.ac must have been included by my error when doing this.
After checking again, the change src/tools/Makefile.am didn't actually come from the squashing, it was introduced in one of the commits on our side.
Anyway, after reviewing the Pull Request several times and also using git to compare the origin of the Pull Request with another repository in which I haven't done the squash of commits, I believe those two are the only changes that are wrong.

@germanblanco
Copy link
Contributor Author

Are there any actions required on my part to continue with this?

LudovicRousseau added a commit that referenced this pull request Aug 27, 2013
@LudovicRousseau LudovicRousseau merged commit 02727a1 into OpenSC:master Aug 27, 2013
@LudovicRousseau
Copy link
Member

Please update the wiki pages.
It is a wiki so any body (including you) can update the pages.

@LudovicRousseau
Copy link
Member

Update the wiki pages at github.com only.
The project do not use opensc-project.org any more. Read https://github.com/OpenSC/OpenSC/wiki/OpenSC-Services

@germanblanco germanblanco deleted the opendnie branch August 28, 2013 08:56
@germanblanco
Copy link
Contributor Author

Thanks a lot!

@LudovicRousseau
Copy link
Member

timofonic, you should use the OpenSC opensc-devel mailing list at https://lists.sourceforge.net/lists/listinfo/opensc-devel

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants