Compare commits

..

No commits in common. "master" and "upstream" have entirely different histories.

12 changed files with 4 additions and 333 deletions

View File

@ -52,10 +52,4 @@ arrays correctly when reallocating memory to
accommodate more connections. Thanks to accommodate more connections. Thanks to
Sam Hocevar. Sam Hocevar.
Version 0.62+syslog: added logging to syslog
support (SuSE)
Version 0.62+syslog+bind: added optional
sourceaddress column in configuration file to bind
to a specific local address for outgoing connections
(Lutz Pressler, <lp@SerNet.DE>)

172
debian/changelog vendored
View File

@ -1,172 +0,0 @@
rinetd (0.62.1sam-2) unstable; urgency=high
* New upstream release.
* This release fixes memory initialisation issues causing erratic
behaviour (Closes: #806902, #753629).
* This release fixes an error in the man page (Closes: #406878).
-- Sam Hocevar <sho@debian.org> Wed, 13 Jan 2016 07:58:00 +0100
rinetd (0.62.0sam-1) unstable; urgency=medium
* Maintainer upload.
* New release from a GitHub fork (https://github.com/samhocevar/rinetd).
* Upstream: fixed uninitialised memory access that could cause infinite
loops and excessive logging (Closes: #796235).
* Upstream: applied Flavio Stanchinas patch for logging all connections
(Closes: #628061).
* debian/*: switch to modern debhelper and dh-autoreconf.
* debian/rinetd.logrotate: activate compression (Closes: #425002)
and add missingok (Closes: #707480) to avoid issues when the
user deactivates logging.
* debian/init: add status reporting, patch courtesy of Chris Lamb and
“je” <elonen@iki.fi> (Closes: #747304, #681523).
-- Sam Hocevar <sho@debian.org> Sun, 10 Jan 2016 23:43:48 +0100
rinetd (0.62-5.1) unstable; urgency=low
* Non-maintainer upload to solve release goal.
* Add LSB dependency header to init.d scripts (Closes: #466976).
-- Petter Reinholdtsen <pere@debian.org> Sun, 30 Mar 2008 12:59:52 +0200
rinetd (0.62-5) unstable; urgency=low
* debian/rules:
+ Fixed timestamps to avoid build issues (Closes: #277979).
-- Sam Hocevar <sho@debian.org> Sun, 24 Oct 2004 13:14:09 +0200
rinetd (0.62-4) unstable; urgency=low
* debian/changelog:
+ Converted to UTF-8.
* debian/control:
+ Set policy to 3.6.1.1.
-- Sam Hocevar <sho@debian.org> Mon, 2 Aug 2004 12:07:56 +0200
rinetd (0.62-3) unstable; urgency=low
* debian/rules:
+ Fixed autotools clock skews.
-- Sam Hocevar <sho@debian.org> Sat, 1 Nov 2003 11:56:55 +0100
rinetd (0.62-2) unstable; urgency=low
* debian/control:
+ Set policy to 3.6.1.0.
+ Set debhelper build-dependency to (>= 4.1.68) because of dh_installppp.
+ Removed leading "an" from the short description and enhanced the long
description.
* debian/rules:
+ Use dh_installppp instead of doing the work by hand (Closes: #212909).
-- Sam Hocevar <sho@debian.org> Mon, 27 Oct 2003 11:15:48 +0100
rinetd (0.62-1) unstable; urgency=low
* New upstream release, includes our fix for DSA 289-1.
* Set policy to 3.5.10.
-- Sam Hocevar <sho@debian.org> Tue, 27 May 2003 15:41:37 +0200
rinetd (0.61-2) unstable; urgency=low
* New maintainer.
* Maintainer upload (Closes: #86201, #145756).
* Fixed then applied a user-contributed patch to make logging non-buffered
(Closes: #163654).
* Added a 1 second delay in the init.d script to avoid restarting rinetd
too quickly (Closes: #180449). This isn't perfect, though: the real problem
is the race condition when using daemon() and writing a PID file.
* rinetd now closes its configuration file (Closes: #182705).
* Fixed an off-by-one overflow and a missing reallocation in handleAccept().
* Replaced malloc/strcpy with strdup in readArgs().
* Added a -f flag to run rinetd in the foreground, and updated manpage and
index.html accordingly.
-- Sam Hocevar <sho@debian.org> Sun, 13 Apr 2003 19:12:01 +0200
rinetd (0.61-1.2) unstable; urgency=low
* NMU (bug squashing party).
* Fixed debian/rules (./configure and make clean) (closes: #145756).
-- Sebastien Bacher <seb128@debian.org> Sat, 31 Aug 2002 15:15:25 +0200
rinetd (0.61-1.1) unstable; urgency=low
* NMU.
* Fixed detection of numeric addresses. This fixes a bug that occurs when
starting rinetd in an unconnected machine.
* Added missing includes.
* Added -O2 to compilation options. Added -Wall and -Wstring
compilation options and removed all the warnings.
* Changed a lot of fprintf(stder,...) to syslogs.
* The program was reporting a bogus line number in errors.
* Replaced signal with sigaction.
* Uses autoconf.
* Now it logs DNS errors.
* Checks closing of pid file, this catchs the failure to write the pidfile
due to a disk full.
* Removed unused function Sleep.
* You don't need bind(2) on a socket you'll use for connect(2).
* Uses compatibility mode 4 of debhelper.
* Reload rinetd configuration when a PPP connection goues up. This useful
when using DNS names in /etc/rinetd.conf that can't be resolved without
an Internet connection. The proper solution to this is to resolve DNS
names *each time that is needed* (with perhaps a small caching period).
* Uses logrotate to rotate logs instead of savelog and cron.
-- Nicolás Lichtmaier <nick@debian.org> Sat, 4 May 2002 00:27:47 -0300
rinetd (0.61-1) unstable; urgency=low
* Non maintainer upload
* New upstream release
* Updated Standards-Version to 3.5.1
* Reference to GPL in debian/copyright is corrected to
/usr/share/common-licenses/GPL
* Upstream URL in debian/copyright is corrected to
ftp://ftp.boutell.com/pub/boutell/rinetd/rinetd.tar.gz
* Upstream changelog will be installed with dh_installchangelogs
instead of dh_installdocs
* dh_suidregister call is removed from debian/rules
* Build-Depends on debhelper added
* Recompiled with newer debhelper version doing the /usr/doc to
/usr/share/doc transition for us
* Moved man pages from /usr/man to /usr/share/man to comply with FHS
-- Roland Bauerschmidt <rb@debian.org> Fri, 16 Feb 2001 10:53:19 -0600
rinetd (0.52-2) unstable; urgency=low
* Add cron.weekly entry for rotating the logs
-- Gergely Madarasz <gorgo@caesar.elte.hu> Sat, 16 Jan 1999 01:21:26 +0100
rinetd (0.52-1) unstable; urgency=low
* New upstream version
-- Gergely Madarasz <gorgo@caesar.elte.hu> Fri, 15 Jan 1999 21:22:14 +0100
rinetd (0.41-1) unstable; urgency=low
* added reload, restart and force-reload entries to init.d script
* marked init.d script as conffile
* remove dh_du calls from debian/rules
* New upstream version
-- Gergely Madarasz <gorgo@caesar.elte.hu> Thu, 5 Mar 1998 18:53:03 +0100
rinetd (0.3-1) unstable; urgency=low
* Initial release
-- Gergely Madarasz <gorgo@caesar.elte.hu> Sun, 7 Dec 1997 02:07:00 +0100

1
debian/compat vendored
View File

@ -1 +0,0 @@
9

20
debian/control vendored
View File

@ -1,20 +0,0 @@
Source: rinetd
Section: net
Priority: optional
Maintainer: Sam Hocevar <sho@debian.org>
Build-Depends: debhelper (>= 9.0), dh-autoreconf
Standards-Version: 3.9.6
Package: rinetd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Internet TCP redirection server
rinetd redirects TCP connections from one IP address and port to another,
with basic IP-based access control.
.
rinetd is a single-process server which handles any number of connections
to the address/port pairs specified in the file /etc/rinetd.conf. Since
rinetd runs as a single process using nonblocking I/O, it is able to
redirect a large number of connections without a severe impact on the
machine. This makes it practical to run services on machines inside an IP
masquerading firewall.

11
debian/copyright vendored
View File

@ -1,11 +0,0 @@
This package was debianized by Gergely Madarasz gorgo@caesar.elte.hu on
Sun, 07 Dec 1997 01:14:33 +0100.
It was downloaded from
https://github.com/samhocevar/rinetd/releases
Copyright (c) 1997, Thomas Boutell and Boutell.Com, Inc. This software
is released for free use under the terms of the GNU Public License, version
2 or higher.
On Debian systems see /usr/share/common-licenses/GPL-2

2
debian/docs vendored
View File

@ -1,2 +0,0 @@
README
index.html

58
debian/init vendored
View File

@ -1,58 +0,0 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: rinetd
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
### END INIT INFO
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/rinetd
CONFFILE=/etc/rinetd.conf
PIDFILE=/var/run/rinetd.pid
NAME=rinetd
DESC="internet redirection server"
test -f $DAEMON || exit 0
test -f $CONFFILE || exit 0
set -e
. /lib/lsb/init-functions
case "$1" in
start)
echo -n "Starting $DESC:"
start-stop-daemon --start --quiet --exec $DAEMON && echo -n " $NAME"
echo "."
;;
stop)
echo -n "Stopping $DESC:"
start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON && echo -n " $NAME"
echo "."
;;
reload|force-reload)
echo -n "Reloading configuration of $DESC:"
start-stop-daemon --stop --quiet --pidfile $PIDFILE --signal 1 --exec $DAEMON && echo -n " $NAME"
echo "."
;;
restart)
echo -n "Stopping $DESC:"
start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON && echo -n " $NAME"
echo "."
sleep 1
echo -n "Starting $DESC:"
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON && echo -n " $NAME"
echo "."
;;
status)
status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
;;
*)
echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload}"
exit 1
;;
esac
exit 0

View File

@ -1,7 +0,0 @@
/var/log/rinetd.log {
rotate 7
weekly
copytruncate
compress
}

View File

@ -1,8 +0,0 @@
#! /bin/sh
set -e
if [ -x /usr/sbin/rinetd ]; then
/etc/init.d/rinetd reload > /dev/null
fi

8
debian/rules vendored
View File

@ -1,8 +0,0 @@
#!/usr/bin/make -f
%:
dh $@ --with autoreconf
override_dh_installchangelogs:
dh_installchangelogs CHANGES

View File

@ -1 +0,0 @@
3.0 (quilt)

View File

@ -12,7 +12,7 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm /usr/sbin/rinetd .Nm /usr/sbin/rinetd
.Sh VERSION .Sh VERSION
Version 0.62+syslog+bind, 04/14/2003. Version 0.62, 04/14/2003.
.Sh DESCRIPTION .Sh DESCRIPTION
.Nm rinetd .Nm rinetd
redirects TCP connections from one IP address and port to another. rinetd redirects TCP connections from one IP address and port to another. rinetd
@ -34,7 +34,7 @@ another file is specified using the -c command line option.
Most entries in the configuration file are forwarding rules. The Most entries in the configuration file are forwarding rules. The
format of a forwarding rule is as follows: format of a forwarding rule is as follows:
.Pp .Pp
bindaddress bindport connectaddress connectport [sourceaddress] bindaddress bindport connectaddress connectport
.Pp .Pp
For example: For example:
.Pp .Pp
@ -64,9 +64,6 @@ service names are defined in the file /etc/services.
Both IP addresses and hostnames are accepted for Both IP addresses and hostnames are accepted for
bindaddress and connectaddress. bindaddress and connectaddress.
.Pp .Pp
The optional sourceaddress can be used to bind to a specific local
address for the outgoing connection.
.Pp
.Sh ALLOW AND DENY RULES .Sh ALLOW AND DENY RULES
Configuration files can also contain allow and deny rules. Configuration files can also contain allow and deny rules.
.Pp .Pp
@ -114,9 +111,8 @@ is prohibitive. Since rinetd is a single process server, all other
connections would be forced to pause during the address lookup. connections would be forced to pause during the address lookup.
.Pp .Pp
.Sh LOGGING .Sh LOGGING
rinetd is able to produce a log output in three ways: rinetd is able to produce a log file in either of two formats:
tab-delimited , web server-style "common log format." both are file-based tab-delimited and web server-style "common log format."
or as syslog output.
.Pp .Pp
By default, rinetd does not produce a log file. To activate logging, add By default, rinetd does not produce a log file. To activate logging, add
the following line to the configuration file: the following line to the configuration file:
@ -150,34 +146,6 @@ To activate web server-style "common log format" logging,
add the following line to the configuration file: add the following line to the configuration file:
.Pp .Pp
logcommon logcommon
to activate syslog output enter the following line to the
configuration file:
syslog facility priority
Example1:
syslog local0 info
in this case all output is logged to the destination configured
in your syslogd config for facility local0 and priority info
Example2:
syslog
in this case everything goes to daemon info
Example3:
syslog wrongfacility wrongpriority
logging to default: daemon info
.Pp
If configured, the local source address is given in square brackets
after the "listening host" entry.
.Sh COMMAND LINE OPTIONS .Sh COMMAND LINE OPTIONS
The -c command line option is used to specify an alternate The -c command line option is used to specify an alternate
configuration file. configuration file.
@ -219,9 +187,6 @@ IS EXPRESSED OR IMPLIED. USE THIS SOFTWARE AT YOUR OWN RISK.
.Sh CONTACT INFORMATION .Sh CONTACT INFORMATION
See http://www.boutell.com/rinetd/ for the latest release. See http://www.boutell.com/rinetd/ for the latest release.
Thomas Boutell can be reached by email: boutell@boutell.com Thomas Boutell can be reached by email: boutell@boutell.com
.Pp
Logging to syslog added by SuSE.
Sourceaddress extension added by Lutz Pressler <lp@SerNet.DE>.
.Sh THANKS .Sh THANKS
Thanks are due to Bill Davidsen, Libor Pechachek, Sascha Ziemann, the Thanks are due to Bill Davidsen, Libor Pechachek, Sascha Ziemann, the
Apache Group, and many others who have contributed advice Apache Group, and many others who have contributed advice