OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

264 lines
11 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../tcp_wrappers/0003-tcp_wrappers-7.6-man-portability.patch
  5. # Copyright (C) 2011 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. diff -ruNp tcp_wrappers_7.6.orig/hosts_access.3 tcp_wrappers_7.6/hosts_access.3
  17. --- tcp_wrappers_7.6.orig/hosts_access.3 2005-03-09 18:30:25.000000000 +0100
  18. +++ tcp_wrappers_7.6/hosts_access.3 2005-03-09 18:27:03.000000000 +0100
  19. @@ -3,7 +3,7 @@
  20. hosts_access, hosts_ctl, request_init, request_set \- access control library
  21. .SH SYNOPSIS
  22. .nf
  23. -#include "tcpd.h"
  24. +#include <tcpd.h>
  25. extern int allow_severity;
  26. extern int deny_severity;
  27. diff -ruNp tcp_wrappers_7.6.orig/hosts_access.5 tcp_wrappers_7.6/hosts_access.5
  28. --- tcp_wrappers_7.6.orig/hosts_access.5 2005-03-09 18:30:25.000000000 +0100
  29. +++ tcp_wrappers_7.6/hosts_access.5 2005-03-09 18:30:18.000000000 +0100
  30. @@ -8,9 +8,9 @@ name, host name/address) patterns. Exam
  31. impatient reader is encouraged to skip to the EXAMPLES section for a
  32. quick introduction.
  33. .PP
  34. -An extended version of the access control language is described in the
  35. -\fIhosts_options\fR(5) document. The extensions are turned on at
  36. -program build time by building with -DPROCESS_OPTIONS.
  37. +The extended version of the access control language is described in the
  38. +\fIhosts_options\fR(5) document. \fBNote that this language supersedes
  39. +the meaning of \fIshell_command\fB as documented below.\fR
  40. .PP
  41. In the following text, \fIdaemon\fR is the process name of a
  42. network daemon process, and \fIclient\fR is the name and/or address of
  43. @@ -346,8 +346,8 @@ in.tftpd: LOCAL, .my.domain
  44. /etc/hosts.deny:
  45. .in +3
  46. .nf
  47. -in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\
  48. - /usr/ucb/mail -s %d-%h root) &
  49. +in.tftpd: ALL: (/usr/sbin/safe_finger -l @%h | \\
  50. + /usr/bin/mail -s %d-%h root) &
  51. .fi
  52. .PP
  53. The safe_finger command comes with the tcpd wrapper and should be
  54. @@ -383,6 +383,7 @@ that shouldn\'t. All problems are repor
  55. .fi
  56. .SH SEE ALSO
  57. .nf
  58. +hosts_options(5) extended syntax.
  59. tcpd(8) tcp/ip daemon wrapper program.
  60. tcpdchk(8), tcpdmatch(8), test programs.
  61. .SH BUGS
  62. diff -ruNp tcp_wrappers_7.6.orig/hosts_options.5 tcp_wrappers_7.6/hosts_options.5
  63. --- tcp_wrappers_7.6.orig/hosts_options.5 2005-03-09 18:30:24.000000000 +0100
  64. +++ tcp_wrappers_7.6/hosts_options.5 2005-03-09 18:27:03.000000000 +0100
  65. @@ -2,10 +2,8 @@
  66. .SH NAME
  67. hosts_options \- host access control language extensions
  68. .SH DESCRIPTION
  69. -This document describes optional extensions to the language described
  70. -in the hosts_access(5) document. The extensions are enabled at program
  71. -build time. For example, by editing the Makefile and turning on the
  72. -PROCESS_OPTIONS compile-time option.
  73. +This document describes extensions to the language described
  74. +in the hosts_access(5) document.
  75. .PP
  76. The extensible language uses the following format:
  77. .sp
  78. @@ -58,12 +56,12 @@ Notice the leading dot on the domain nam
  79. Execute, in a child process, the specified shell command, after
  80. performing the %<letter> expansions described in the hosts_access(5)
  81. manual page. The command is executed with stdin, stdout and stderr
  82. -connected to the null device, so that it won\'t mess up the
  83. +connected to the null device, so that it won't mess up the
  84. conversation with the client host. Example:
  85. .sp
  86. .nf
  87. .ti +3
  88. -spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) &
  89. +spawn (/usr/sbin/safe_finger -l @%h | /usr/bin/mail root) &
  90. .fi
  91. .sp
  92. executes, in a background child process, the shell command "safe_finger
  93. diff -ruNp tcp_wrappers_7.6.orig/inetcf.c tcp_wrappers_7.6/inetcf.c
  94. --- tcp_wrappers_7.6.orig/inetcf.c 1997-02-12 02:13:24.000000000 +0100
  95. +++ tcp_wrappers_7.6/inetcf.c 2005-03-09 18:27:03.000000000 +0100
  96. @@ -26,13 +26,17 @@ extern void exit();
  97. * guesses. Shorter names follow longer ones.
  98. */
  99. char *inet_files[] = {
  100. +#if 0
  101. "/private/etc/inetd.conf", /* NEXT */
  102. "/etc/inet/inetd.conf", /* SYSV4 */
  103. "/usr/etc/inetd.conf", /* IRIX?? */
  104. +#endif
  105. "/etc/inetd.conf", /* BSD */
  106. +#if 0
  107. "/etc/net/tlid.conf", /* SYSV4?? */
  108. "/etc/saf/tlid.conf", /* SYSV4?? */
  109. "/etc/tlid.conf", /* SYSV4?? */
  110. +#endif
  111. 0,
  112. };
  113. diff -ruNp tcp_wrappers_7.6.orig/tcpd.8 tcp_wrappers_7.6/tcpd.8
  114. --- tcp_wrappers_7.6.orig/tcpd.8 1996-02-21 16:39:16.000000000 +0100
  115. +++ tcp_wrappers_7.6/tcpd.8 2005-03-09 18:27:03.000000000 +0100
  116. @@ -12,7 +12,11 @@ The program supports both 4.3BSD-style s
  117. TLI. Functionality may be limited when the protocol underneath TLI is
  118. not an internet protocol.
  119. .PP
  120. -Operation is as follows: whenever a request for service arrives, the
  121. +There are two possible modes of operation: execution of \fItcpd\fP
  122. +before a service started by \fIinetd\fP, or linking a daemon with
  123. +the \fIlibwrap\fP shared library as documented in the \fIhosts_access\fR(3)
  124. +manual page. Operation when started by \fIinetd\fP
  125. +is as follows: whenever a request for service arrives, the
  126. \fIinetd\fP daemon is tricked into running the \fItcpd\fP program
  127. instead of the desired server. \fItcpd\fP logs the request and does
  128. some additional checks. When all is well, \fItcpd\fP runs the
  129. @@ -88,11 +92,11 @@ configuration files.
  130. .sp
  131. .in +5
  132. # mkdir /other/place
  133. -# mv /usr/etc/in.fingerd /other/place
  134. -# cp tcpd /usr/etc/in.fingerd
  135. +# mv /usr/sbin/in.fingerd /other/place
  136. +# cp tcpd /usr/sbin/in.fingerd
  137. .fi
  138. .PP
  139. -The example assumes that the network daemons live in /usr/etc. On some
  140. +The example assumes that the network daemons live in /usr/sbin. On some
  141. systems, network daemons live in /usr/sbin or in /usr/libexec, or have
  142. no `in.\' prefix to their name.
  143. .SH EXAMPLE 2
  144. @@ -101,35 +105,34 @@ are left in their original place.
  145. .PP
  146. In order to monitor access to the \fIfinger\fR service, perform the
  147. following edits on the \fIinetd\fR configuration file (usually
  148. -\fI/etc/inetd.conf\fR or \fI/etc/inet/inetd.conf\fR):
  149. +\fI/etc/inetd.conf\fR):
  150. .nf
  151. .sp
  152. .ti +5
  153. -finger stream tcp nowait nobody /usr/etc/in.fingerd in.fingerd
  154. +finger stream tcp nowait nobody /usr/sbin/in.fingerd in.fingerd
  155. .sp
  156. becomes:
  157. .sp
  158. .ti +5
  159. -finger stream tcp nowait nobody /some/where/tcpd in.fingerd
  160. +finger stream tcp nowait nobody /usr/sbin/tcpd in.fingerd
  161. .sp
  162. .fi
  163. .PP
  164. -The example assumes that the network daemons live in /usr/etc. On some
  165. +The example assumes that the network daemons live in /usr/sbin. On some
  166. systems, network daemons live in /usr/sbin or in /usr/libexec, the
  167. daemons have no `in.\' prefix to their name, or there is no userid
  168. field in the inetd configuration file.
  169. .PP
  170. Similar changes will be needed for the other services that are to be
  171. covered by \fItcpd\fR. Send a `kill -HUP\' to the \fIinetd\fR(8)
  172. -process to make the changes effective. AIX users may also have to
  173. -execute the `inetimp\' command.
  174. +process to make the changes effective.
  175. .SH EXAMPLE 3
  176. In the case of daemons that do not live in a common directory ("secret"
  177. or otherwise), edit the \fIinetd\fR configuration file so that it
  178. specifies an absolute path name for the process name field. For example:
  179. .nf
  180. .sp
  181. - ntalk dgram udp wait root /some/where/tcpd /usr/local/lib/ntalkd
  182. + ntalk dgram udp wait root /usr/sbin/tcpd /usr/local/lib/ntalkd
  183. .sp
  184. .fi
  185. .PP
  186. @@ -164,6 +167,7 @@ The default locations of the host access
  187. .SH SEE ALSO
  188. .na
  189. .nf
  190. +hosts_access(3), functions provided by the libwrap library.
  191. hosts_access(5), format of the tcpd access control tables.
  192. syslog.conf(5), format of the syslogd control file.
  193. inetd.conf(5), format of the inetd control file.
  194. diff -ruNp tcp_wrappers_7.6.orig/tcpdchk.8 tcp_wrappers_7.6/tcpdchk.8
  195. --- tcp_wrappers_7.6.orig/tcpdchk.8 1995-01-08 17:00:31.000000000 +0100
  196. +++ tcp_wrappers_7.6/tcpdchk.8 2005-03-09 18:27:03.000000000 +0100
  197. @@ -9,8 +9,8 @@ tcpdchk [-a] [-d] [-i inet_conf] [-v]
  198. potential and real problems it can find. The program examines the
  199. \fItcpd\fR access control files (by default, these are
  200. \fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR), and compares the
  201. -entries in these files against entries in the \fIinetd\fR or \fItlid\fR
  202. -network configuration files.
  203. +entries in these files against entries in the \fIinetd\fR
  204. +network configuration file.
  205. .PP
  206. \fItcpdchk\fR reports problems such as non-existent pathnames; services
  207. that appear in \fItcpd\fR access control rules, but are not controlled
  208. @@ -26,14 +26,13 @@ problem.
  209. .SH OPTIONS
  210. .IP -a
  211. Report access control rules that permit access without an explicit
  212. -ALLOW keyword. This applies only when the extended access control
  213. -language is enabled (build with -DPROCESS_OPTIONS).
  214. +ALLOW keyword.
  215. .IP -d
  216. Examine \fIhosts.allow\fR and \fIhosts.deny\fR files in the current
  217. directory instead of the default ones.
  218. .IP "-i inet_conf"
  219. Specify this option when \fItcpdchk\fR is unable to find your
  220. -\fIinetd.conf\fR or \fItlid.conf\fR network configuration file, or when
  221. +\fIinetd.conf\fR network configuration file, or when
  222. you suspect that the program uses the wrong one.
  223. .IP -v
  224. Display the contents of each access control rule. Daemon lists, client
  225. @@ -54,7 +53,6 @@ tcpdmatch(8), explain what tcpd would do
  226. hosts_access(5), format of the tcpd access control tables.
  227. hosts_options(5), format of the language extensions.
  228. inetd.conf(5), format of the inetd control file.
  229. -tlid.conf(5), format of the tlid control file.
  230. .SH AUTHORS
  231. .na
  232. .nf
  233. diff -ruNp tcp_wrappers_7.6.orig/tcpdmatch.8 tcp_wrappers_7.6/tcpdmatch.8
  234. --- tcp_wrappers_7.6.orig/tcpdmatch.8 2005-03-09 18:30:24.000000000 +0100
  235. +++ tcp_wrappers_7.6/tcpdmatch.8 2005-03-09 18:27:03.000000000 +0100
  236. @@ -13,7 +13,7 @@ request for service. Examples are given
  237. The program examines the \fItcpd\fR access control tables (default
  238. \fI/etc/hosts.allow\fR and \fI/etc/hosts.deny\fR) and prints its
  239. conclusion. For maximal accuracy, it extracts additional information
  240. -from your \fIinetd\fR or \fItlid\fR network configuration file.
  241. +from your \fIinetd\fR network configuration file.
  242. .PP
  243. When \fItcpdmatch\fR finds a match in the access control tables, it
  244. identifies the matched rule. In addition, it displays the optional
  245. @@ -50,7 +50,7 @@ Examine \fIhosts.allow\fR and \fIhosts.d
  246. directory instead of the default ones.
  247. .IP "-i inet_conf"
  248. Specify this option when \fItcpdmatch\fR is unable to find your
  249. -\fIinetd.conf\fR or \fItlid.conf\fR network configuration file, or when
  250. +\fIinetd.conf\fR network configuration file, or when
  251. you suspect that the program uses the wrong one.
  252. .SH EXAMPLES
  253. To predict how \fItcpd\fR would handle a telnet request from the local
  254. @@ -86,7 +86,6 @@ tcpdchk(8), tcpd configuration checker
  255. hosts_access(5), format of the tcpd access control tables.
  256. hosts_options(5), format of the language extensions.
  257. inetd.conf(5), format of the inetd control file.
  258. -tlid.conf(5), format of the tlid control file.
  259. .SH AUTHORS
  260. .na
  261. .nf