pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/news/inn
Module Name: pkgsrc
Committed By: hauke
Date: Fri Oct 10 16:02:17 UTC 2025
Modified Files:
pkgsrc/news/inn: Makefile distinfo
pkgsrc/news/inn/files: innd.sh
pkgsrc/news/inn/patches: patch-ad
Log Message:
MESSAGES is gone
Go full rc.subr on the rc.d script, which gives us 'inn status'
Look for site-local rc.news in PKG_SYSCONFDIR
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 pkgsrc/news/inn/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/news/inn/distinfo
cvs rdiff -u -r1.18 -r1.19 pkgsrc/news/inn/files/innd.sh
cvs rdiff -u -r1.10 -r1.11 pkgsrc/news/inn/patches/patch-ad
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/news/inn/Makefile
diff -u pkgsrc/news/inn/Makefile:1.154 pkgsrc/news/inn/Makefile:1.155
--- pkgsrc/news/inn/Makefile:1.154 Thu Oct 2 16:23:51 2025
+++ pkgsrc/news/inn/Makefile Fri Oct 10 16:02:16 2025
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.154 2025/10/02 16:23:51 hauke Exp $
+# $NetBSD: Makefile,v 1.155 2025/10/10 16:02:16 hauke Exp $
DISTNAME= inn-2.7.3
+PKGREVISION= 1
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/
MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/news/inn/
@@ -21,8 +22,6 @@ FILES_SUBST+= INN_DATA_DIR=${INN_DATA_D
BUILD_DEFS+= INN_PATHBIN
FILES_SUBST+= INN_PATHBIN=${PREFIX}/${INN_PATHBIN:Q}
-MESSAGE_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q}
-
PLIST_SUBST+= INN_PATHBIN=${INN_PATHBIN:Q}
PRINT_PLIST_AWK+= { gsub(/libexec\/inn\//, "$${INN_PATHBIN}/"); }
PRINT_PLIST_AWK+= { gsub(/.+\/auth\/passwd\/auth_krb5$$/, "$${PLIST.kerberos}&"); }
@@ -183,6 +182,11 @@ CONFIGURE_ARGS+= --with-sendmail=/usr/li
CONFIGURE_ARGS+= --with-sendmail=/usr/sbin/sendmail
.endif
+SUBST_CLASSES+= rclocal
+SUBST_FILES.rclocal= scripts/rc.news.in
+SUBST_VARS.rclocal= PKG_SYSCONFDIR
+SUBST_STAGE.rclocal= pre-configure
+
.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 099967
SUBST_CLASSES+= blcklist
SUBST_FILES.blcklist= HACKING INSTALL MANIFEST NEWS \
Index: pkgsrc/news/inn/distinfo
diff -u pkgsrc/news/inn/distinfo:1.42 pkgsrc/news/inn/distinfo:1.43
--- pkgsrc/news/inn/distinfo:1.42 Thu Oct 2 16:23:51 2025
+++ pkgsrc/news/inn/distinfo Fri Oct 10 16:02:16 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2025/10/02 16:23:51 hauke Exp $
+$NetBSD: distinfo,v 1.43 2025/10/10 16:02:16 hauke Exp $
BLAKE2s (inn-2.7.3.tar.gz) = 133ed817516d452f1324c19cad96cc2fcbae54bc53b9f4cd73e837b924b309bc
SHA512 (inn-2.7.3.tar.gz) = cc36a87d4f8ab9297c8ce56dfb4864aafc6095459fda4ab3198e0870c77e7327364b151c16bf3509cf61e07d9389f25b0da1e016b1fc908436d48bd60ed9b81d
@@ -6,7 +6,7 @@ Size (inn-2.7.3.tar.gz) = 2832795 bytes
SHA1 (patch-aa) = bf3de8a6aebae1fc8957fad31e46b1c536aa5224
SHA1 (patch-ab) = 894d7c93485bb86ebf68899968829ce6aa60b7e6
SHA1 (patch-ac) = 43e2db25f619a2c85d5e715e2044c5b4be31b62c
-SHA1 (patch-ad) = 45e50491b7705eb3f8a5c64acad9747baaf30678
+SHA1 (patch-ad) = abdd2edebb4ff61b4827b7f40f6942b90ebbfc13
SHA1 (patch-ag) = 0d1e4883ffefd0e2e7afeba2865e707ff6041a28
SHA1 (patch-ah) = 22ff361d7a098d1cf09ecb0fc5d3336927238106
SHA1 (patch-ak) = a0832c43c124d13046fcaa845a2788e6c8d63dbe
Index: pkgsrc/news/inn/files/innd.sh
diff -u pkgsrc/news/inn/files/innd.sh:1.18 pkgsrc/news/inn/files/innd.sh:1.19
--- pkgsrc/news/inn/files/innd.sh:1.18 Fri Oct 7 22:37:05 2011
+++ pkgsrc/news/inn/files/innd.sh Fri Oct 10 16:02:16 2025
@@ -1,78 +1,59 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: innd.sh,v 1.18 2011/10/07 22:37:05 shattered Exp $
+# $NetBSD: innd.sh,v 1.19 2025/10/10 16:02:16 hauke Exp $
#
# PROVIDE: inn
# REQUIRE: DAEMON
# KEYWORD: shutdown
-if [ -d @INN_DATA_DIR@/etc ] ; then
- echo ""
- echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
- echo ""
- echo "WARNING: old inn config directory @INN_DATA_DIR@/etc found"
- echo "WARNING: please move your config to @PREFIX@/etc/inn"
- echo "WARNING: before starting your new inn install"
- echo ""
- echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING"
- echo ""
- sleep 120
+if [ -f @SYSCONFBASE@/rc.subr ]
+then
+ . @SYSCONFBASE@/rc.subr
fi
-if [ -x @INN_PATHBIN@/rc.news -a -s @INN_DATA_DIR@/db/active ]
-then
- if [ ! -d @PREFIX@/etc/nntp ]
- then
- mkdir @PREFIX@/etc/nntp
- fi
+name="inn"
+rcvar=${name}
+command="@INN_PATHBIN@/rc.news"
+procname="@INN_PATHBIN@/innwatch"
+command_interpreter="@RCD_SCRIPTS_SHELL@"
+inn_user="news"
+required_files="@INN_PATHBIN@/rc.news @INN_DATA_DIR@/db/active"
+pidfile="@INN_DATA_DIR@/run/innwatch.pid"
+
+start_precmd="inn_precmd"
+start_cmd="inn_start"
+stop_cmd="inn_stop"
- if [ ! -f @PREFIX@/etc/nntp/server ]
- then
- hostname >@PREFIX@/etc/nntp/server
- fi
- if [ ! -f @PREFIX@/etc/nntp/domainname ]
- then
- (set - X `grep ^fromhost: @PKG_SYSCONFDIR@/inn.conf`
- if [ $# -eq 3 ]
- then
- echo $3 >@PREFIX@/etc/nntp/domainname
- fi)
- fi
+if [ -f @SYSCONFBASE@/rc.subr -a -d @SYSCONFBASE@/rc.d -a -f @SYSCONFBASE@/rc.d/DAEMON ]
+then
+ load_rc_config ${name}
+elif [ -f @SYSCONFBASE@/rc.conf ]
+then
+ . @SYSCONFBASE@/rc.conf
+fi
+inn_precmd()
+{
if [ -f @INN_DATA_DIR@/db/history -a \
! -s @INN_DATA_DIR@/db/history ]
then
@INN_PATHBIN@/makedbz -i -o -s 10000
fi
+}
- if [ $# -eq 0 ]
- then
- echo -n ' innd'
- su -m news -c "@INN_PATHBIN@/rc.news start" >/dev/null
- exit 0
- fi
-
- case "$1" in
- start )
- echo "Starting INN."
- su -m news -c "@INN_PATHBIN@/rc.news $1" >/dev/null
- exit 0
- ;;
- stop )
- su -m news -c "@INN_PATHBIN@/rc.news $1"
- exit 0
- ;;
- restart )
- $0 stop
- sleep 5
- exec $0 start
- ;;
- * )
- echo "Usage: $0 (start|stop|restart)"
- exit 1
- ;;
- esac
-fi
+inn_start()
+{
+ @ECHO@ "Starting ${name}."
+ doit="@SU@ -m ${inn_user} -c '${command} start ${command_args} >/dev/null'"
+ eval $doit
+}
+
+inn_stop()
+{
+ @ECHO@ "Stopping ${name}."
+ doit="@SU@ -m ${inn_user} -c '${command} stop ${command_args} >/dev/null'"
+ eval $doit
+}
-exit 0
+run_rc_command "$1"
Index: pkgsrc/news/inn/patches/patch-ad
diff -u pkgsrc/news/inn/patches/patch-ad:1.10 pkgsrc/news/inn/patches/patch-ad:1.11
--- pkgsrc/news/inn/patches/patch-ad:1.10 Thu Oct 2 16:23:51 2025
+++ pkgsrc/news/inn/patches/patch-ad Fri Oct 10 16:02:16 2025
@@ -1,7 +1,9 @@
-$NetBSD: patch-ad,v 1.10 2025/10/02 16:23:51 hauke Exp $
+$NetBSD: patch-ad,v 1.11 2025/10/10 16:02:16 hauke Exp $
raise file descriptors limit to hard limit
+site-local script wants to be local
+
--- scripts/rc.news.in.orig 2025-05-09 13:53:41.000000000 +0000
+++ scripts/rc.news.in
@@ -102,6 +102,9 @@ Xstop)
@@ -14,3 +16,14 @@ raise file descriptors limit to hard lim
## Program to start.
WHAT=${INND}
+@@ -228,8 +231,8 @@ for F in ${RMFILE} ${RMFILE}.*; do
+ done &
+
+ # Run any additional local startup commands.
+-if [ -f ${PATHBIN}/rc.news.local ]; then
+- ${PATHBIN}/rc.news.local start
++if [ -f @PKG_SYSCONFDIR@/rc.news.local ]; then
++ @PKG_SYSCONFDIR@/rc.news.local start
+ fi
+
+ ## Start innd last when using systemd.
Home |
Main Index |
Thread Index |
Old Index