CVS commit: pkgsrc/net/portmap

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/portmap
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Mon, 29 Apr 2024 10:11:15 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Apr 29 10:11:15 UTC 2024

Modified Files:
        pkgsrc/net/portmap: distinfo
        pkgsrc/net/portmap/patches: patch-aa patch-ab
Added Files:
        pkgsrc/net/portmap/patches: patch-from__local.c patch-pmap__check.c
            patch-pmap__set.c

Log Message:
portmap: Fix building on modern NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/portmap/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/portmap/patches/patch-aa \
    pkgsrc/net/portmap/patches/patch-ab
cvs rdiff -u -r0 -r1.1 pkgsrc/net/portmap/patches/patch-from__local.c \
    pkgsrc/net/portmap/patches/patch-pmap__check.c \
    pkgsrc/net/portmap/patches/patch-pmap__set.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/portmap/distinfo
diff -u pkgsrc/net/portmap/distinfo:1.4 pkgsrc/net/portmap/distinfo:1.5
--- pkgsrc/net/portmap/distinfo:1.4     Tue Oct 26 11:06:31 2021
+++ pkgsrc/net/portmap/distinfo Mon Apr 29 10:11:14 2024
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:06:31 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/04/29 10:11:14 nia Exp $
 
 BLAKE2s (portmap_4.tar.gz) = 0887d0c6863ca31e6cd109198d0048251b4b8586d6bec9efe95c4645840f6440
 SHA512 (portmap_4.tar.gz) = 58454a6e0b9ff9d167e5734fbc7fa1287edd9b37c10496b574020254e3052231ef97dad48d11fc808edeec5102e7820a5aea19e697498c9774f6b27515aa2cfc
 Size (portmap_4.tar.gz) = 16152 bytes
-SHA1 (patch-aa) = f26735fc93188c8f1d4503bab7e9ccb616847743
-SHA1 (patch-ab) = ebc8a440384f93724dfba10df4f4583b78af4b5d
+SHA1 (patch-aa) = 0857cb92a4611de2911217b88affb65e5e6379d4
+SHA1 (patch-ab) = 38e322e6e1837cb13ecdc90d0562301659092d60
+SHA1 (patch-from__local.c) = d9576edf67237783060b30aec5bb9df4853504af
+SHA1 (patch-pmap__check.c) = 62e4f67645fe84be45a5db48689ef2cabfb1b336
+SHA1 (patch-pmap__set.c) = 37a25230e525a739aa44b6703f9c96dc532bc01c

Index: pkgsrc/net/portmap/patches/patch-aa
diff -u pkgsrc/net/portmap/patches/patch-aa:1.1.1.1 pkgsrc/net/portmap/patches/patch-aa:1.2
--- pkgsrc/net/portmap/patches/patch-aa:1.1.1.1 Fri Mar  7 23:40:06 2008
+++ pkgsrc/net/portmap/patches/patch-aa Mon Apr 29 10:11:14 2024
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/03/07 23:40:06 reed Exp $
+$NetBSD: patch-aa,v 1.2 2024/04/29 10:11:14 nia Exp $
 
---- Makefile.orig      1996-05-31 06:50:40.000000000 -0700
+--- Makefile.orig      1996-05-31 13:50:40.000000000 +0000
 +++ Makefile
 @@ -8,7 +8,7 @@
  # if you disagree. See `man 3 syslog' for examples. Some syslog versions
@@ -20,17 +20,33 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/03/07 2
  
  # Uncomment the following macro if your system does not have u_long.
  #
-@@ -46,11 +46,11 @@ CHECK_PORT = -DCHECK_PORT
+@@ -46,11 +46,7 @@ CHECK_PORT = -DCHECK_PORT
  # libwrap.a object library. WRAP_DIR should specify the directory with
  # that library.
  
 -WRAP_DIR= ../tcp_wrappers
-+#WRAP_DIR= ../tcp_wrappers
- 
- # Auxiliary object files that may be missing from your C library.
- #
+-
+-# Auxiliary object files that may be missing from your C library.
+-#
 -AUX   = daemon.o strerror.o
-+AUX   = daemon.o
++#WRAP_DIR= ../tcp_wrappers
  
  # NEXTSTEP is a little different. The following seems to work with NS 3.2
  #
+@@ -75,7 +71,7 @@ OBJECTS      = portmap.o pmap_check.o from_lo
+ all:  portmap pmap_dump pmap_set
+ 
+ portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a
+-      $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_DIR)/libwrap.a $(LIBS)
++      $(CC) $(LDFLAGS) -o $@ $(OBJECTS) -lwrap $(LIBS)
+ 
+ pmap_dump: pmap_dump.c
+       $(CC) $(CFLAGS) -o $@ $? $(LIBS)
+@@ -98,7 +94,6 @@ tidy:        clean
+ deps:
+       @$(CC) -M $(CFLAGS) *.c | grep -v /usr/include |sed 's/\.\///'
+ 
+-daemon.o: daemon.c
+ from_local.o: from_local.c
+ pmap_check.o: pmap_check.c pmap_check.h Makefile
+ pmap_dump.o: pmap_dump.c
Index: pkgsrc/net/portmap/patches/patch-ab
diff -u pkgsrc/net/portmap/patches/patch-ab:1.1.1.1 pkgsrc/net/portmap/patches/patch-ab:1.2
--- pkgsrc/net/portmap/patches/patch-ab:1.1.1.1 Fri Mar  7 23:40:06 2008
+++ pkgsrc/net/portmap/patches/patch-ab Mon Apr 29 10:11:14 2024
@@ -1,16 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/03/07 23:40:06 reed Exp $
+$NetBSD: patch-ab,v 1.2 2024/04/29 10:11:14 nia Exp $
 
---- portmap.c.orig     2003-03-19 23:42:46.000000000 -0800
-+++ portmap.c  2003-03-19 23:44:06.000000000 -0800
-@@ -85,6 +85,7 @@
+--- portmap.c.orig     1996-05-31 13:52:59.000000000 +0000
++++ portmap.c
+@@ -85,6 +85,8 @@ static char sccsid[] = "@(#)portmap.c 1.
  #include <stdio.h>
  #include <syslog.h>
  #include <netdb.h>
 +#include <errno.h>
++#include <unistd.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <sys/wait.h>
-@@ -124,7 +125,6 @@
+@@ -124,7 +126,6 @@ void reap();
  static void callit();
  struct pmaplist *pmaplist;
  int debugging = 0;
@@ -18,7 +19,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/07 2
  
  #include "pmap_check.h"
  
-@@ -235,7 +235,7 @@
+@@ -235,7 +236,7 @@ main(argc, argv)
  /* need to override perror calls in rpc library */
  void
  perror(what)

Added files:

Index: pkgsrc/net/portmap/patches/patch-from__local.c
diff -u /dev/null pkgsrc/net/portmap/patches/patch-from__local.c:1.1
--- /dev/null   Mon Apr 29 10:11:15 2024
+++ pkgsrc/net/portmap/patches/patch-from__local.c      Mon Apr 29 10:11:14 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-from__local.c,v 1.1 2024/04/29 10:11:14 nia Exp $
+
+Eliminate implicit function decls.
+
+--- from_local.c.orig  1996-05-31 13:52:58.000000000 +0000
++++ from_local.c
+@@ -46,6 +46,9 @@ static char sccsid[] = "@(#) from_local.
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #include <netdb.h>
+ #include <netinet/in.h>
+ #include <net/if.h>
Index: pkgsrc/net/portmap/patches/patch-pmap__check.c
diff -u /dev/null pkgsrc/net/portmap/patches/patch-pmap__check.c:1.1
--- /dev/null   Mon Apr 29 10:11:15 2024
+++ pkgsrc/net/portmap/patches/patch-pmap__check.c      Mon Apr 29 10:11:14 2024
@@ -0,0 +1,28 @@
+$NetBSD: patch-pmap__check.c,v 1.1 2024/04/29 10:11:14 nia Exp $
+
+Eliminate implicit function decls.
+
+--- pmap_check.c.orig  2024-04-29 10:04:26.609849565 +0000
++++ pmap_check.c
+@@ -36,16 +36,16 @@ static char sccsid[] = "@(#) pmap_check.
+ #endif
+ 
+ #include <rpc/rpc.h>
++#include <rpc/rpcent.h>
+ #include <rpc/pmap_prot.h>
++#include <stdio.h>
++#include <stdlib.h>
+ #include <syslog.h>
+ #include <netdb.h>
++#include <unistd.h>
+ #include <sys/signal.h>
+-#ifdef SYSV40
++#include <arpa/inet.h>
+ #include <netinet/in.h>
+-#include <rpc/rpcent.h>
+-#endif
+-
+-extern char *inet_ntoa();
+ 
+ #include "pmap_check.h"
+ 
Index: pkgsrc/net/portmap/patches/patch-pmap__set.c
diff -u /dev/null pkgsrc/net/portmap/patches/patch-pmap__set.c:1.1
--- /dev/null   Mon Apr 29 10:11:15 2024
+++ pkgsrc/net/portmap/patches/patch-pmap__set.c        Mon Apr 29 10:11:14 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-pmap__set.c,v 1.1 2024/04/29 10:11:14 nia Exp $
+
+Eliminate implicit function decls.
+
+--- pmap_set.c.orig    2024-04-29 10:03:29.969754569 +0000
++++ pmap_set.c
+@@ -10,6 +10,7 @@ static char sccsid[] = "@(#) pmap_set.c 
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/types.h>
+ #ifdef SYSV40
+ #include <netinet/in.h>

Prev by Date: CVS commit: pkgsrc/filesystems/fuse-lzofs
Next by Date: CVS commit: pkgsrc/finance/py-crytic-compile
Previous by Thread: CVS commit: pkgsrc/filesystems/fuse-lzofs
Next by Thread: CVS commit: pkgsrc/finance/py-crytic-compile
Indexes:

Home | Main Index | Thread Index | Old Index