CVS commit: pkgsrc/net/rinetd

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/rinetd
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Sun, 24 Apr 2022 01:35:39 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Apr 24 01:35:39 UTC 2022

Modified Files:
        pkgsrc/net/rinetd: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/rinetd/patches: patch-Makefile.in patch-src_rinetd.c
Removed Files:
        pkgsrc/net/rinetd/patches: patch-ab patch-ac

Log Message:
rinetd: update HOMEPAGE and MASTER_SITE. While here update to 0.73.

Version 0.73 (2021/02/19)
  improve error reporting
  fixed another configuration parsing bug
Version 0.72 (2021/02/16)
  fixed a configuration parsing bug making 0.71 almost unusable
Version 0.71 (2021/02/14)
  IPv6 support
  fixed a display overflow in data usage statistics
  made the configuration parser more tolerant with service names that contain
    dashes (e.g. snmp-trap) or hostnames with underscores
  create the log file if it does not exist
  new Visual Studio project file
Version 0.70 (2017/09/09)
  UDP support
  source address binding support
  use a real grammar for the configuration file and get rid of the hand-made
    parser
Version 0.63 (2017/07/19)
  added a -f flag to run in the foreground
  quit cleanly when SIGINT is received
  increased data buffer size for better performance
  fixed random uninitialised data accesses
  fixed a memory leak in connection reallocation
  fixed a file descriptor leak in configuration reload
  fixed configuration file parsing (many bugs including a buffer overflow)
  fixed configuration error reporting (line numbers were wrong)
  log accepted connections in addition to denied ones
  log DNS errors
  code quality refactoring: got rid of a lot of old code, used C library
    functions instead of custom ones, enforced const correctness


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/rinetd/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/rinetd/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/rinetd/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/rinetd/patches/patch-Makefile.in \
    pkgsrc/net/rinetd/patches/patch-src_rinetd.c
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/net/rinetd/patches/patch-ab \
    pkgsrc/net/rinetd/patches/patch-ac

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

Modified files:

Index: pkgsrc/net/rinetd/Makefile
diff -u pkgsrc/net/rinetd/Makefile:1.19 pkgsrc/net/rinetd/Makefile:1.20
--- pkgsrc/net/rinetd/Makefile:1.19     Thu May 23 19:23:10 2019
+++ pkgsrc/net/rinetd/Makefile  Sun Apr 24 01:35:38 2022
@@ -1,38 +1,32 @@
-# $NetBSD: Makefile,v 1.19 2019/05/23 19:23:10 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2022/04/24 01:35:38 tnn Exp $
 #
 
-DISTNAME=              rinetd
-PKGNAME=               ${DISTNAME}-0.62
-PKGREVISION=           3
+DISTNAME=              rinetd-0.73
 CATEGORIES=            net
-MASTER_SITES=          http://www.boutell.com/rinetd/http/
+MASTER_SITES=          ${MASTER_SITE_GITHUB:=samhocevar/}
+GITHUB_RELEASE=                v${PKGVERSION_NOREV}
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://www.boutell.com/rinetd/
+HOMEPAGE=              https://github.com/samhocevar/rinetd
 COMMENT=               Internet redirection server
+LICENSE=               gnu-gpl-v2
 
-NO_CONFIGURE=          yes
-BUILD_TARGET=          rinetd
+GNU_CONFIGURE=         yes
 
-CPPFLAGS+=             -DRINETD_CONF="\"${PKG_SYSCONFDIR}/rinetd.conf\""
-
-INSTALLATION_DIRS=     sbin ${PKGMANDIR}/man8
-
-RCD_SCRIPTS=           rinetd
+CPPFLAGS.NetBSD+=      -D_NETBSD_SOURCE # for SA_RESTART
+CPPFLAGS.SunOS+=       -D__EXTENSIONS__ # for SA_RESTART
 
 SUBST_CLASSES+=                paths
-SUBST_FILES.paths=     rinetd.8
-SUBST_VARS.paths=      PREFIX
-SUBST_VARS.paths+=     PKG_SYSCONFDIR
+SUBST_FILES.paths=     src/rinetd.h
+SUBST_SED.paths=       -e 's,/etc/rinetd.conf,${PKG_SYSCONFDIR}/rinetd.conf,'
 SUBST_STAGE.paths=     pre-configure
 
-LDFLAGS.SunOS+=                -lsocket -lnsl
+RCD_SCRIPTS=           rinetd
 
-do-build:
-       cd ${WRKSRC} && env ${MAKE_ENV} ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o rinetd *.c
+INSTALLATION_DIRS=     share/examples/rinetd
+EGDIR=                 ${PREFIX}/share/examples/rinetd
+CONF_FILES=            ${EGDIR}/rinetd.conf ${PKG_SYSCONFDIR}/rinetd.conf
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/rinetd ${DESTDIR}${PREFIX}/sbin/.
-       ${INSTALL_MAN} ${WRKSRC}/rinetd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/.
+LDFLAGS.SunOS+=                -lsocket -lnsl
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/rinetd/PLIST
diff -u pkgsrc/net/rinetd/PLIST:1.4 pkgsrc/net/rinetd/PLIST:1.5
--- pkgsrc/net/rinetd/PLIST:1.4 Tue Mar 11 14:05:11 2014
+++ pkgsrc/net/rinetd/PLIST     Sun Apr 24 01:35:38 2022
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:11 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/04/24 01:35:38 tnn Exp $
 man/man8/rinetd.8
 sbin/rinetd
+share/examples/rinetd/rinetd.conf
+@pkgdir etc

Index: pkgsrc/net/rinetd/distinfo
diff -u pkgsrc/net/rinetd/distinfo:1.6 pkgsrc/net/rinetd/distinfo:1.7
--- pkgsrc/net/rinetd/distinfo:1.6      Tue Oct 26 11:06:48 2021
+++ pkgsrc/net/rinetd/distinfo  Sun Apr 24 01:35:38 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:06:48 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/04/24 01:35:38 tnn Exp $
 
-BLAKE2s (rinetd.tar.gz) = ef14ffc19ef8eccd30cc20caa38660e188138f228ee56681d95ea63f81e94008
-SHA512 (rinetd.tar.gz) = b6ddb496b4542ad46aacaef4b2241b16b9ee43f2f6761a18a4813d83a0a9db23fbd73a554393dcf01ae7350e8b6662571414ca6f93a949ce4effbbeddc198606
-Size (rinetd.tar.gz) = 115541 bytes
-SHA1 (patch-ab) = 9fa5cf00111a56051a40d73293ca071c125802a0
-SHA1 (patch-ac) = 743b979bfc287bb0968e418a06cab8a8d2b6dc64
+BLAKE2s (rinetd-0.73.tar.gz) = 209c299937246e078a9434f8b6c12036d06be645cd01d68c3b729538b9923f3f
+SHA512 (rinetd-0.73.tar.gz) = e4a96f9251707eb130d063a76413beda13c2aebee9756d3b2d0d5987bcb735f8f38be348a41ead128b4177ebab6da9d8344223fcdce7404858944e2c954a4662
+Size (rinetd-0.73.tar.gz) = 140115 bytes
+SHA1 (patch-Makefile.in) = baf3940ae964e534abb674572e1ea711373c23ee
+SHA1 (patch-src_rinetd.c) = 24e600beadd00dc3ede98aa1280c95e498b00176

Added files:

Index: pkgsrc/net/rinetd/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/net/rinetd/patches/patch-Makefile.in:1.1
--- /dev/null   Sun Apr 24 01:35:39 2022
+++ pkgsrc/net/rinetd/patches/patch-Makefile.in Sun Apr 24 01:35:38 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile.in,v 1.1 2022/04/24 01:35:38 tnn Exp $
+
+Fix config file installation.
+
+--- Makefile.in.orig   2021-02-19 08:57:40.000000000 +0000
++++ Makefile.in
+@@ -420,7 +420,7 @@ install-sysconfDATA: $(sysconf_DATA)
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+-        $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
++        $(INSTALL_DATA) $$files "$(DESTDIR)$(PREFIX)/share/examples/rinetd" || exit $$?; \
+       done
+ 
+ uninstall-sysconfDATA:
Index: pkgsrc/net/rinetd/patches/patch-src_rinetd.c
diff -u /dev/null pkgsrc/net/rinetd/patches/patch-src_rinetd.c:1.1
--- /dev/null   Sun Apr 24 01:35:39 2022
+++ pkgsrc/net/rinetd/patches/patch-src_rinetd.c        Sun Apr 24 01:35:39 2022
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_rinetd.c,v 1.1 2022/04/24 01:35:39 tnn Exp $
+
+include <netdb.h> for NI_MAXHOST
+
+--- src/rinetd.c.orig  2021-02-19 08:57:10.000000000 +0000
++++ src/rinetd.c
+@@ -37,6 +37,7 @@
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
++#include <netdb.h>
+ #if _WIN32 || (!TIME_WITH_SYS_TIME && !HAVE_SYS_TIME_H)
+ #     include <time.h>
+ #endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index