Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PKZip crypto header extensions #3

Closed
wants to merge 194 commits into from
Closed

PKZip crypto header extensions #3

wants to merge 194 commits into from

Conversation

beargiles
Copy link
Contributor

Addition of five classes that recognize PKZip crypto header extensions. Actual encryption is not supported at this time, this patch is solely so users can identify and ignore otherwise unknown extensions.

tcurdt and others added 30 commits October 6, 2008 21:49
…o that we have a starting point if we want to do a Java 1.4 compatible 1.2.x release

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/branches/commons-compress-1.2.x@1152684 13f79535-47bb-0310-9956-ffa450edef68
I'll try to port over the AR archiver to see how much effort the
switch from a stream based API to a channel based one would take.


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/branches/compress-2.0@1556196 13f79535-47bb-0310-9956-ffa450edef68
…verified the archive is valid and the extracted files are correct

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/branches/compress-2.0@1556312 13f79535-47bb-0310-9956-ffa450edef68
garydgregory and others added 26 commits July 8, 2015 08:36
found by Earl Hood over in Ant's version of the same code


git-svn-id: https://svn.apache.org/repos/asf/commons/proper/compress/trunk@1692044 13f79535-47bb-0310-9956-ffa450edef68
The headers are not decoded and one of the unit tests fails.
done with the values and one of the unit test fails.
Conflicts:
	findbugs-exclude-filter.xml
	pmd-ruleset.xml
	pom.xml
@bodewig
Copy link
Member

bodewig commented Oct 27, 2015

Oops, this looks bigger than intended :-)

It seems as if out migration to git has made the wrong branch the default branch. I'll ask the ASF infra team to fix it. After that, please re-create the PR against the master branch.

Also, I'll try to get in touch with the PKWare folks, just to be safe.

@beargiles
Copy link
Contributor Author

Let me know what you need me to do. I've never done branching and merging with git before, much less across projects, so I'm pretty much fumbling at this point.

It looks like the first step is closing this pull request and waiting for you to merge/change default branch.

@beargiles beargiles closed this Oct 27, 2015
@bodewig
Copy link
Member

bodewig commented Oct 28, 2015

Don't feel forced to create a pull request just because we are using git now. The established workflow of attaching a patch to JIRA is still in place. Whatever is more convenient to you.

This repo's default branch is master now, so a fresh github clone would be based on the correct branch.

Within the existing clone you can add a master branch that tracks our master

git checkout -b master remotes/apache/master
git push origin master -u

this is assuming you have a remote named apache defined for our git repository and origin for your github clone of it.

There are several ways you can try to merge your changes to the new master branch. This ranges from simply copying over the code (the low tech version, that always works) to cherry-picking the commits from the COMPRESS-294 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants