lp:~gandelman-a/ubuntu/oneiric/openbsd-inetd/merge
- Get this branch:
- bzr branch lp:~gandelman-a/ubuntu/oneiric/openbsd-inetd/merge
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 24426 lines (+23302/-164)44 files modified.pc/.version (+1/-0)
.pc/applied-patches (+11/-0)
.pc/buftuning/inetd.8 (+465/-0)
.pc/buftuning/inetd.c (+2194/-0)
.pc/discard_env/inetd.8 (+419/-0)
.pc/discard_env/inetd.c (+2059/-0)
.pc/global_queuelen/inetd.8 (+455/-0)
.pc/global_queuelen/inetd.c (+2173/-0)
.pc/libwrap/inetd.8 (+427/-0)
.pc/libwrap/inetd.c (+2110/-0)
.pc/misc_portability/inetd.8 (+407/-0)
.pc/misc_portability/inetd.c (+1991/-0)
.pc/nodaemon/inetd.8 (+452/-0)
.pc/nodaemon/inetd.c (+2165/-0)
.pc/print_pause_time/inetd.c (+2179/-0)
.pc/setproctitle/inetd.c (+2056/-0)
.pc/tcp46/inetd.8 (+460/-0)
.pc/tcp46/inetd.c (+2180/-0)
ChangeLog (+37/-0)
Makefile.debian (+16/-0)
bsd-closefrom.c (+115/-0)
debian/changelog (+17/-0)
debian/control (+1/-0)
debian/copyright (+26/-1)
debian/openbsd-inetd.postrm (+10/-0)
debian/openbsd-inetd.preinst (+0/-19)
debian/patches/buftuning (+6/-6)
debian/patches/discard_env (+8/-10)
debian/patches/global_queuelen (+30/-9)
debian/patches/libwrap (+10/-10)
debian/patches/makefile (+1/-1)
debian/patches/misc_portability (+150/-19)
debian/patches/nodaemon (+10/-11)
debian/patches/print_pause_time (+1/-1)
debian/patches/setproctitle (+6/-6)
debian/patches/tcp46 (+2/-2)
debian/rules (+7/-9)
debian/source/format (+1/-0)
inetd.8 (+100/-19)
inetd.c (+316/-41)
setproctitle.c (+146/-0)
setproctitle.h (+4/-0)
strlcpy.c (+63/-0)
test.conf (+15/-0)
Related bugs
Bug #527143: /etc/default/openbsd-inetd missing from package | Low | Fix Released | |
Bug #803384: Pleaes merge openbsd-inetd 0.20091229-1 (main) from Debain unstable (main) | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Adam Gandelman
- Status:
- Development
Recent revisions
- 12. By Adam Gandelman
-
* Merge from debian unstable. Remaining changes:
- debian/openbsd- inetd.default: Add missing default file. (LP: #527143)
- Update maintainer according to spec. - 10. By Chuck Short
-
* Merge from debian unstable. Remaining changes:
- debian/openbsd- inetd.default: Add missing default file. (LP: #527143)
- Update maintainer according to spec.
- debian/rules: Add hardening. - 8. By Chuck Short
-
* Merge from debian testing. Remaining changes:
- Update maintainer according to spec. - 7. By Chuck Short
-
* Merge from debian testing, remaining changes:
- debian/{control, rules}: add and enable hardened build for PIE (Debian bug 542738). - 5. By Marco d'Itri
-
* Added dh_md5sums to debian/rules, since apparently people nowadays
believe again that it is a good idea. (Closes: #484483)
* Fixed the init script to povide "openbsd-inetd" instead of "inetd".
(Closes: #507119)
* Updated patches misc_portability and setproctitle with some missing
prototypes.
* Updated patch misc_portability with missing arguments to two syslog(3)
calls.
* Updated patch libwrap to fix a possibly uninitialized variable.
The last three fixes are courtesy of Denis Zaitsev. - 4. By Marco d'Itri
-
Try again to fix #386469 by stopping the daemon in postinst before
starting it, because update-inetd run by the maintainer script of a
different package may have restarted it after the prerm ran on upgrade.
Patch courtesy of Steve Langasek. (Closes: #386469) - 3. By Marco d'Itri
-
* New CVS snapshot.
+ Fixes gcc 4.0 FTBFS. (Closes: #287860)
* Made the init script source /etc/default/openbsd- inetd, if present.
(Closes: #251224)
* Documented in inetd(8) that switching between binding to INADDR_ANY and
to a specific address requires restarting the daemon. (Closes: #242392)
* Added code to create the requested type of IPv6 socket using
setsockopt(IPPROTO_ IPV6). This requires a modern 2.4 or 2.6 kernel.
* Added Conflicts+Replaces+ Provides: netkit-inetd to fully replace it.
prerm will unlink netkit-inetd's conffiles and the init script is
named openbsd-inetd to allow purging netkit-inetd.
Alternative solutions to both issues are welcome.
* Changed the default inetd.conf to satisfy people who think that every
listening socket is a security hole: no internal services are enabled
by default. This means that the daemon will not even be started by the
init script until some service is enabled in inetd.conf.
* Removed from the default inetd.conf the already-commented examples
of the internal services which are actually dangerous to run.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/oneiric/openbsd-inetd