<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/760a4e06aa4248f2061def11c9504c13dd89ab33">https://github.com/macports/macports-ports/commit/760a4e06aa4248f2061def11c9504c13dd89ab33</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 760a4e06aa4 tcp_wrappers: Add prototype of hosts_ctl to tcpd.h
</span>760a4e06aa4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 760a4e06aa4248f2061def11c9504c13dd89ab33
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 7 03:59:33 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> tcp_wrappers: Add prototype of hosts_ctl to tcpd.h
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes "implicit declaration of function 'hosts_ctl' is invalid in C99"
</span><span style='display:block; white-space:pre;color:#404040;'> in software that uses tcp_wrappers, such as openldap.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The same fix has been made in other systems years ago, such as:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.illumos.org/issues/4385
</span><span style='display:block; white-space:pre;color:#404040;'> https://www.funkthat.com/gitea/jmg/freebsd/commit/42209922ff3dc9d65e9ddb3ef6f1da42e818ccf0
</span><span style='display:block; white-space:pre;color:#404040;'> https://build.opensuse.org/package/view_file/openSUSE:Factory/tcpd/tcp_wrappers_7.6-hosts_ctl.diff
</span>---
net/tcp_wrappers/Portfile | 2 +-
net/tcp_wrappers/files/fix-prototypes.patch | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tcp_wrappers/Portfile b/net/tcp_wrappers/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ca3586bfddf..035fb0fc687 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tcp_wrappers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tcp_wrappers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> PortSystem 1.0
name tcp_wrappers
version 20
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories net
license Permissive
maintainers {jeremyhu @jeremyhu} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tcp_wrappers/files/fix-prototypes.patch b/net/tcp_wrappers/files/fix-prototypes.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d746855c874..85fac82f865 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tcp_wrappers/files/fix-prototypes.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tcp_wrappers/files/fix-prototypes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tcpd.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tcpd.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tcpd.h.orig 2009-10-05 16:17:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tcpd.h 2020-08-07 03:49:33.000000000 -0500
</span> @@ -4,6 +4,11 @@
* Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span> /* Structure to describe one communications endpoint. */
#define STRING_LENGTH 128 /* hosts, users, processes */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,10 +38,10 @@ struct request_info {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,10 +97,10 @@
</span> char pid[10]; /* access via eval_pid(request) */
struct host_info client[1]; /* client endpoint info */
struct host_info server[1]; /* server endpoint info */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> struct netconfig *config; /* netdir handle */
};
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,20 +79,22 @@ extern void fromhost(); /* get/validat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,20 +142,23 @@
</span> #define fromhost sock_host /* no TLI support needed */
#endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,7 @@
</span> -extern int numeric_addr(); /* IP4/IP6 inet_addr (restricted) */
-extern struct hostent *tcpd_gethostbyname();
+extern int hosts_access(struct request_info *request); /* access control */
<span style='display:block; white-space:pre;background:#e0ffe0;'>++extern int hosts_ctl(char *daemon, char *name, char *addr, char *user); /* wrapper around request_init() */
</span> +extern void shell_cmd(char *); /* execute shell command */
+extern char *percent_x(char *, int, char *, struct request_info *);
+ /* do %<char> expansion */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,14 +56,14 @@
</span> +extern unsigned long dot_quad_addr(char *); /* restricted inet_addr() */
+extern int numeric_addr(char *str, union gen_addr *addr, int *af, int *len); /* IP4/IP6 inet_addr (restricted) */
+extern struct hostent *tcpd_gethostbyname(char *host, int af);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* IP4/IP6 gethostbyname */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* IP4/IP6 gethostbyname */
</span> #ifdef HAVE_IPV6
-extern char *skip_ipv6_addrs(); /* skip over colons in IPv6 addrs */
+extern char *skip_ipv6_addrs(char *str); /* skip over colons in IPv6 addrs */
#else
#define skip_ipv6_addrs(x) x
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -121,20 +139,23 @@ extern struct request_info *request_set(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,20 +204,23 @@
</span> * host_info structures serve as caches for the lookup results.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +96,7 @@
</span> #define sock_methods(r) \
{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,7 +203,7 @@ extern struct tcpd_context tcpd_context;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -257,7 +268,7 @@
</span> * behavior.
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,16 +105,16 @@
</span> extern int dry_run; /* verification flag */
/* Bug workarounds. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,3 +242,6 @@ extern char *fix_strtok();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,3 +307,6 @@
</span> #define strtok my_strtok
extern char *my_strtok();
#endif
+
+__END_DECLS
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- scaffold.c 2005-03-09 18:22:04.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scaffold.c 2005-03-09 18:20:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -237,10 +237,12 @@ struct request_info *request;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scaffold.c.orig 2009-10-05 16:17:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scaffold.c 2020-08-07 03:47:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -179,10 +179,12 @@
</span>
/* ARGSUSED */
</pre><pre style='margin:0'>
</pre>