lp:~gandelman-a/ubuntu/quantal/netcat-openbsd/merge
- Get this branch:
- bzr branch lp:~gandelman-a/ubuntu/quantal/netcat-openbsd/merge
Branch merges
- Oliver Grawert: Approve
- Ubuntu branches: Pending requested
-
Diff: 5336 lines (+2456/-2095)52 files modified.pc/.version (+1/-0)
Makefile (+3/-18)
atomicio.c (+18/-13)
atomicio.h (+7/-1)
debian/changelog (+83/-0)
debian/compat (+1/-1)
debian/control (+7/-5)
debian/copyright (+46/-130)
debian/netcat-openbsd.README.Debian (+13/-0)
debian/netcat-openbsd.dirs (+0/-2)
debian/netcat-openbsd.examples (+1/-0)
debian/netcat-openbsd.install (+2/-0)
debian/netcat-openbsd.links (+1/-0)
debian/patches/0001-port-to-linux-with-libsd.patch (+466/-0)
debian/patches/0002-connect-timeout.patch (+118/-0)
debian/patches/0003-get-sev-by-name.patch (+34/-0)
debian/patches/0004-poll-hup.patch (+59/-0)
debian/patches/0005-send-crlf.patch (+103/-0)
debian/patches/0006-quit-timer.patch (+128/-0)
debian/patches/0007-udp-scan-timeout.patch (+56/-0)
debian/patches/0008-verbose-numeric-port.patch (+103/-0)
debian/patches/0009-dccp-support.patch (+299/-0)
debian/patches/0010-serialized-handling-multiple-clients.patch (+73/-0)
debian/patches/0011-misc-failures-and-features.patch (+443/-0)
debian/patches/connect-timeout.patch (+0/-120)
debian/patches/dccp.patch (+0/-191)
debian/patches/gcc-warnings.patch (+0/-157)
debian/patches/getservbyname.patch (+0/-24)
debian/patches/glib-strlcpy.patch (+0/-96)
debian/patches/help-version-exit.patch (+0/-21)
debian/patches/nc-1.84-udp_stop.patch (+0/-14)
debian/patches/netcat-info.patch (+8/-7)
debian/patches/no-strtonum.patch (+0/-107)
debian/patches/openbsd-compat.patch (+0/-54)
debian/patches/pollhup.patch (+0/-50)
debian/patches/quit-timer.patch (+0/-84)
debian/patches/reuseaddr.patch (+0/-15)
debian/patches/send-crlf.patch (+0/-109)
debian/patches/series (+11/-17)
debian/patches/silence-z.patch (+0/-13)
debian/patches/socks-b64-prototype.patch (+0/-13)
debian/patches/udp-scan-timeout.patch (+0/-50)
debian/patches/verbose-message-to-stderr.patch (+0/-17)
debian/patches/verbose-numeric-port.patch (+0/-54)
debian/rules (+12/-60)
debian/source/format (+1/-0)
nc.1 (+85/-36)
netcat.c (+249/-78)
openbsd-compat/base64.c (+0/-308)
openbsd-compat/readpassphrase.c (+0/-179)
openbsd-compat/readpassphrase.h (+0/-40)
socks.c (+25/-11)
Related bugs
Bug #590925: broken version of netcat installed by default | Low | Fix Released | |
Bug #1006631: Please merge netcat-openbsd 1.105-6 (main) from Debain unstable | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Adam Gandelman
- Status:
- Development
Recent revisions
- 11. By Adam Gandelman
-
* Merge from Debian unstable.
* debian/patches/ verbose- message- to-stderr. patch: Dropped,
applied upstream.
* debian/patches/ dccp.patch: Dropped, applied in Debian.
* debian/control: Update XSBC-Original-Maintainer.
* Remaining changes:
- debian/patches/ netcat- info.patch: Add info about netcat-traditional
if you are looking for an option when it is not available.
(LP: #590925)
* Fix segfaults when using -Ulv (Closes: #668558).
* Do not continue to listen on port after accepting connection.
* Add $LDFLAGS from environment (Closes: #665321).
* High urgency for fixing RC bug.
* Fix readwrite() behaviour (Closes: #662741).
* Clear up symlink of man page.
* Use Breaks instead of Conflicts.
* Fix minor warnings from man.
* Add missing Build-Depends: pkg-config.
* New upstream CVS snapshot, new maintainer.
- Verbose message to strerr (Closes: #570765).
- Can use packet's content > 1024 (Closes: #607003).
- Replace non-portable echo with printf (Closes: #510372).
* debian/patches:
- Rearrange existing patches, fix new porting issues.
- Option -l and -p are now compatible (Closes: #540073).
- Use libbsd instead of glib for strlcpy (Closes: #550611).
- Fix build with -Wl,--as-needed (Closes: #604781).
- Handling multiple clients subsquently when -k (Closes: #514792).
- Replace inet_ntoa with inet_ntop to support IPv6
(Closes: #512992).
- Modify -q behavior to be compatible with nc.traditional
(Closes: #508722, #594614, #606925, #611964).
- DCCP and broadcast support.
- Arbitrary port list to scan.
- Fix misc connection failures
(Closes: #579485, #579486, #579487, #579488, #633948).
- Improve verbose information and documentations.
* debian/rules:
- Link nc.openbsd.1 from nc.1 (Closes: #535951).
- Enable optional hardening build flags.
* debian/control:
- Replace glib with libbsd.
- Update to use debhelper 8, std-ver 3.9.2.
- Priority: important, to make it into base system.
- Add Vcs-*.
* debian/compat:
- Update to 8 from 4. - 10. By Benjamin Drung
-
* Merge from Debian unstable (LP: #803856). Remaining changes:
- debian/patches/ dccp.patch: Added support for dccp
- debian/patches/ netcat- info.patch: Add info about netcat-traditional
if you are looking for an option when it is not available.
(LP: #590925)
- debian/patches/ verbose- message- to-stderr. patch: Log "Connection to ..."
messages to stderr (LP: #519210)
- Modify Maintainer value to match the DebianMaintainerField
specification.
- Fix build failure with --as-needed.
* Quit immediately after EOF if -q is not given (i.e. make the default
equivalent to -q 0). This is the standard upstream behavior and what
other Linux distributions use. It is different from netcat-traditional,
but compatibility with other versions of OpenBSD netcat is more
important. (Closes: #502188) - 8. By Chuck Short
-
* debian/
patches/ quit-timer. patch: Re-enabled, but set default to 0 to match
current behavior.
* debian/patches/ netcat- info.patch: Add info about netcat-traditional
if you are looking for an option when it is not available.
(LP: #590925) - 7. By Chuck Short
-
debian/
patches/ quit-timer. patch: Drop quit-time.patch as per disccussion on
ubuntu-server. (LP: #590925) - 4. By Soren Hansen
-
* Merge from debian unstable.
* Reinsert quit-timer, but set default to 0 to match current behaviour.
(LP: #242350)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/netcat-openbsd