lp:~ubuntu-branches/ubuntu/quantal/socat/quantal-201207210015

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu/quantal/socat

Ubuntu branches: Pending requested 2012-07-21

Diff: 27502 lines (+27415/-0) (has conflicts)

15 files modified

.pc/fix-segfault-xio-gopen.patch/xio-gopen.c (+123/-0)
.pc/socat-opensslcompress.patch/sslcls.c (+320/-0)
.pc/socat-opensslcompress.patch/sslcls.h (+104/-0)
.pc/socat-opensslcompress.patch/xio-openssl.c (+1229/-0)
.pc/socat-opensslcompress2.patch/doc/socat.yo (+3501/-0)
.pc/socat-opensslcompress2.patch/doc/xio.help (+4959/-0)
.pc/socat-opensslcompress2.patch/test.sh (+10369/-0)
.pc/socat-opensslcompress2.patch/xio-openssl.c (+1157/-0)
.pc/socat-opensslcompress2.patch/xio-openssl.h (+52/-0)
.pc/socat-opensslcompress2.patch/xioopts.c (+4166/-0)
.pc/socat-opensslcompress2.patch/xioopts.h (+987/-0)
debian/patches/fix-segfault-xio-gopen.patch (+18/-0)
debian/patches/socat-opensslcompress.patch (+128/-0)
debian/patches/socat-opensslcompress2.patch (+291/-0)
xio-gopen.c.rej (+11/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

18. By Clint Byrum on 2012-07-20

releasing version 1.7.1.3-1.4ubuntu1

17. By Clint Byrum on 2012-07-20

d/patches/fix-segfault-xio-gopen.patch: Applying patch to prevent
segfaults. (LP: #481776) This is also included in socat 2.0.

16. By Clint Byrum on 2012-07-20

d/patches/socat-opensslcompress*.patch: Add OpenSSL compression
patches from upstream. (LP: #745603) These are included in 2.0 so
these patches can be dropped when it is synced from Debian.

15. By Moritz Muehlenhoff <email address hidden> on 2012-05-11

* Non-maintainer upload for release goal
* Update debhelper compat level to 9, results in hardened build
  flags (Closes: #654152)

14. By Jakub Wilk on 2012-04-22

* Non-maintainer upload.
* Disable readline support (closes: #632481). GNU Readline license (GPL) is
  incompatible with the OpenSSL license. Thanks to Julien Cristau for the
  bug report.
  + Pass --disable-readline to the configure script.
  + Remove libreadline-gplv2-dev from Build-Depends.

13. By Hector Oron on 2011-09-20

* Non-maintainer upload.
* Replace libreadline5-dev build dependency with libreadline-
  gplv2-dev" (Closes: #553853)

12. By Jean-Louis Dupond on 2011-07-28

Replace Build-Depend from libreadline5-dev to libreadline-gplv2-dev
to fix FTBFS. (LP: #817527)

11. By Julien Cristau on 2011-07-02

* Non-maintainer upload.
* Fix build against new openssl (without SSLv2 support), closes: #622018.

10. By Chris Taylor on 2010-08-03

* New upstream release.
* Upstream release fixes CVE-2010-2799 (Closes: #591443)
* Bump Standards-Version.

9. By Chris Taylor on 2010-04-28

Build-dep on libreadline5-dev (Closes: #579494)