Ubuntu
jsch package

Merge lp://qastaging/~veger/ubuntu/quantal/jsch/fix-for-803492-v2 into lp://qastaging/ubuntu/quantal/jsch

  1. Quantal (12.10)
  2. fix-for-803492-v2
  3. Merge into quantal
Proposed by Maarten Bezemer
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp://qastaging/~veger/ubuntu/quantal/jsch/fix-for-803492-v2
Merge into: lp://qastaging/ubuntu/quantal/jsch
Diff against target: 7636 lines (+2809/-994)
141 files modified
.pc/.version (+0/-1)
.pc/applied-patches (+0/-1)
.pc/jsch-build-xml.patch/build.xml (+0/-77)
ChangeLog (+94/-1)
LICENSE.txt (+1/-1)
build.xml (+29/-9)
debian/changelog (+9/-0)
debian/control (+1/-1)
debian/patches/jsch-build-xml.patch (+6/-6)
debian/pom.xml (+1/-1)
examples/AES.java (+4/-0)
examples/ChangePassphrase.java (+11/-0)
examples/Compression.java (+9/-0)
examples/Daemon.java (+10/-2)
examples/Exec.java (+9/-0)
examples/KeyGen.java (+12/-0)
examples/KnownHosts.java (+10/-0)
examples/Logger.java (+4/-0)
examples/PortForwardingL.java (+11/-0)
examples/PortForwardingR.java (+11/-0)
examples/README (+16/-0)
examples/ScpFrom.java (+9/-0)
examples/ScpTo.java (+25/-2)
examples/ScpToNoneCipher.java (+4/-0)
examples/Sftp.java (+11/-0)
examples/Shell.java (+45/-89)
examples/StreamForwarding.java (+12/-0)
examples/Subsystem.java (+4/-0)
examples/Sudo.java (+184/-0)
examples/UserAuthKI.java (+8/-0)
examples/UserAuthPubKey.java (+8/-0)
examples/ViaHTTP.java (+8/-0)
examples/ViaSOCKS5.java (+8/-0)
examples/X11Forwarding.java (+10/-0)
src/main/java/com/jcraft/jsch/Buffer.java (+31/-3)
src/main/java/com/jcraft/jsch/Channel.java (+131/-92)
src/main/java/com/jcraft/jsch/ChannelAgentForwarding.java (+67/-28)
src/main/java/com/jcraft/jsch/ChannelDirectTCPIP.java (+40/-65)
src/main/java/com/jcraft/jsch/ChannelExec.java (+2/-2)
src/main/java/com/jcraft/jsch/ChannelForwardedTCPIP.java (+13/-9)
src/main/java/com/jcraft/jsch/ChannelSession.java (+8/-7)
src/main/java/com/jcraft/jsch/ChannelSftp.java (+424/-121)
src/main/java/com/jcraft/jsch/ChannelShell.java (+1/-1)
src/main/java/com/jcraft/jsch/ChannelSubsystem.java (+2/-2)
src/main/java/com/jcraft/jsch/ChannelX11.java (+11/-6)
src/main/java/com/jcraft/jsch/Cipher.java (+2/-1)
src/main/java/com/jcraft/jsch/CipherNone.java (+2/-1)
src/main/java/com/jcraft/jsch/Compression.java (+2/-2)
src/main/java/com/jcraft/jsch/DH.java (+1/-1)
src/main/java/com/jcraft/jsch/DHG1.java (+2/-2)
src/main/java/com/jcraft/jsch/DHG14.java (+310/-0)
src/main/java/com/jcraft/jsch/DHGEX.java (+2/-2)
src/main/java/com/jcraft/jsch/ForwardedTCPIPDaemon.java (+1/-1)
src/main/java/com/jcraft/jsch/GSSContext.java (+1/-1)
src/main/java/com/jcraft/jsch/HASH.java (+1/-1)
src/main/java/com/jcraft/jsch/HostKey.java (+6/-6)
src/main/java/com/jcraft/jsch/HostKeyRepository.java (+1/-1)
src/main/java/com/jcraft/jsch/IO.java (+1/-1)
src/main/java/com/jcraft/jsch/Identity.java (+1/-1)
src/main/java/com/jcraft/jsch/IdentityFile.java (+93/-15)
src/main/java/com/jcraft/jsch/IdentityRepository.java (+44/-0)
src/main/java/com/jcraft/jsch/JSch.java (+272/-42)
src/main/java/com/jcraft/jsch/JSchAuthCancelException.java (+1/-1)
src/main/java/com/jcraft/jsch/JSchException.java (+1/-1)
src/main/java/com/jcraft/jsch/JSchPartialAuthException.java (+1/-1)
src/main/java/com/jcraft/jsch/KeyExchange.java (+17/-17)
src/main/java/com/jcraft/jsch/KeyPair.java (+84/-20)
src/main/java/com/jcraft/jsch/KeyPairDSA.java (+4/-4)
src/main/java/com/jcraft/jsch/KeyPairGenDSA.java (+1/-1)
src/main/java/com/jcraft/jsch/KeyPairGenRSA.java (+1/-1)
src/main/java/com/jcraft/jsch/KeyPairRSA.java (+4/-4)
src/main/java/com/jcraft/jsch/KnownHosts.java (+37/-31)
src/main/java/com/jcraft/jsch/LocalIdentityRepository.java (+99/-0)
src/main/java/com/jcraft/jsch/Logger.java (+1/-1)
src/main/java/com/jcraft/jsch/MAC.java (+1/-1)
src/main/java/com/jcraft/jsch/Packet.java (+5/-4)
src/main/java/com/jcraft/jsch/PortWatcher.java (+1/-1)
src/main/java/com/jcraft/jsch/Proxy.java (+1/-1)
src/main/java/com/jcraft/jsch/ProxyHTTP.java (+6/-6)
src/main/java/com/jcraft/jsch/ProxySOCKS4.java (+2/-2)
src/main/java/com/jcraft/jsch/ProxySOCKS5.java (+4/-4)
src/main/java/com/jcraft/jsch/Random.java (+1/-1)
src/main/java/com/jcraft/jsch/Request.java (+1/-1)
src/main/java/com/jcraft/jsch/RequestAgentForwarding.java (+2/-2)
src/main/java/com/jcraft/jsch/RequestEnv.java (+2/-2)
src/main/java/com/jcraft/jsch/RequestExec.java (+3/-2)
src/main/java/com/jcraft/jsch/RequestPtyReq.java (+4/-4)
src/main/java/com/jcraft/jsch/RequestSftp.java (+3/-3)
src/main/java/com/jcraft/jsch/RequestShell.java (+2/-2)
src/main/java/com/jcraft/jsch/RequestSignal.java (+3/-3)
src/main/java/com/jcraft/jsch/RequestSubsystem.java (+3/-3)
src/main/java/com/jcraft/jsch/RequestWindowChange.java (+2/-2)
src/main/java/com/jcraft/jsch/RequestX11.java (+4/-4)
src/main/java/com/jcraft/jsch/ServerSocketFactory.java (+1/-1)
src/main/java/com/jcraft/jsch/Session.java (+278/-101)
src/main/java/com/jcraft/jsch/SftpATTRS.java (+5/-5)
src/main/java/com/jcraft/jsch/SftpException.java (+1/-1)
src/main/java/com/jcraft/jsch/SftpProgressMonitor.java (+2/-1)
src/main/java/com/jcraft/jsch/SignatureDSA.java (+1/-1)
src/main/java/com/jcraft/jsch/SignatureRSA.java (+1/-1)
src/main/java/com/jcraft/jsch/SocketFactory.java (+1/-1)
src/main/java/com/jcraft/jsch/UIKeyboardInteractive.java (+1/-1)
src/main/java/com/jcraft/jsch/UserAuth.java (+1/-1)
src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMIC.java (+6/-6)
src/main/java/com/jcraft/jsch/UserAuthKeyboardInteractive.java (+28/-30)
src/main/java/com/jcraft/jsch/UserAuthNone.java (+6/-12)
src/main/java/com/jcraft/jsch/UserAuthPassword.java (+14/-8)
src/main/java/com/jcraft/jsch/UserAuthPublicKey.java (+17/-19)
src/main/java/com/jcraft/jsch/UserInfo.java (+1/-1)
src/main/java/com/jcraft/jsch/Util.java (+19/-9)
src/main/java/com/jcraft/jsch/jce/AES128CBC.java (+3/-1)
src/main/java/com/jcraft/jsch/jce/AES128CTR.java (+3/-1)
src/main/java/com/jcraft/jsch/jce/AES192CBC.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/AES192CTR.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/AES256CBC.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/AES256CTR.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/ARCFOUR.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/ARCFOUR128.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/ARCFOUR256.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/BlowfishCBC.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/DH.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/HMACMD5.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/HMACMD596.java (+2/-2)
src/main/java/com/jcraft/jsch/jce/HMACSHA1.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/HMACSHA196.java (+2/-2)
src/main/java/com/jcraft/jsch/jce/KeyPairGenDSA.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/KeyPairGenRSA.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/MD5.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/Random.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/SHA1.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/SignatureDSA.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/SignatureRSA.java (+1/-1)
src/main/java/com/jcraft/jsch/jce/TripleDESCBC.java (+2/-1)
src/main/java/com/jcraft/jsch/jce/TripleDESCTR.java (+2/-1)
src/main/java/com/jcraft/jsch/jcraft/Compression.java (+23/-28)
src/main/java/com/jcraft/jsch/jcraft/HMAC.java (+1/-1)
src/main/java/com/jcraft/jsch/jcraft/HMACMD5.java (+1/-1)
src/main/java/com/jcraft/jsch/jcraft/HMACMD596.java (+1/-1)
src/main/java/com/jcraft/jsch/jcraft/HMACSHA1.java (+1/-1)
src/main/java/com/jcraft/jsch/jcraft/HMACSHA196.java (+1/-1)
src/main/java/com/jcraft/jsch/jgss/GSSContextKrb5.java (+1/-1)
To merge this branch: bzr merge lp://qastaging/~veger/ubuntu/quantal/jsch/fix-for-803492-v2
Reviewer Review Type Date Requested Status
James Page Approve
Ubuntu branches Pending
Review via email: mp+104706@code.qastaging.launchpad.net

Description of the change

Changes from 0.1.42 to 0.1.48 can be found at: http://www.jcraft.com/jsch/ChangeLog

To post a comment you must log in.
lp://qastaging/~veger/ubuntu/quantal/jsch/fix-for-803492-v2 updated
11. By Maarten Bezemer

Reverted removal (and refreshed) jsch-build-xml.patch as it still is required

Revision history for this message
James Page (james-page) wrote :

Hi Maarten

Thanks for preparing this update; I have two bits of feedback

1) The Merge proposal looks a little odd (removal of files in the .pc directory) because you have not applied all patched and added the .pc directory. This is a little counter intuitive but makes it easier to review

2) d/manifest.mf needed an update as well for the new version.

I've fixed both of these issues and uploaded - thanks for your contribution!

Cheers

James

review: Approve
Revision history for this message
James Page (james-page) wrote :

Oh - I missed this last point as well - you should really reference the bug report in the changelog entry with a (LP: #xxxxx) reference - that way the bug report gets closed as well.

I obviously still need more coffee...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches