wendzelnntpd: Update to 2.2.0-alpha

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wendzelnntpd: Update to 2.2.0-alpha
From: Ole Ludwig (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 7 Oct 2025 20:01:11 +0000
Module Name:	pkgsrc-wip
Committed By:	Ole Ludwig <mail%oleludwig.de@localhost>
Pushed By:	oludwig
Date:		Tue Oct 7 01:34:07 2025 +0200
Changeset:	ed41967c2f503fce7c384ac8fa3d71592dceab31

Modified Files:
	wendzelnntpd/Makefile
	wendzelnntpd/PLIST
	wendzelnntpd/distinfo
Added Files:
	wendzelnntpd/INSTALL
	wendzelnntpd/files/wendzelnntpd.sh
Removed Files:
	wendzelnntpd/patches/patch-Makefile
	wendzelnntpd/patches/patch-configure

Log Message:
wendzelnntpd: Update to 2.2.0-alpha

- Change the DISTNAME to wendzelnntpd-2.2.0alpha
- Update PLIST
- Remove NetBSD patches. They are no longer required because the paths can
  now be configured with the configure scripts and the configure script is
  generated with autoconf. Remove substitutions for the Makefile for the
  same reason.
- Set GNU_CONFIGURE=YES because the new upstream version uses autoconf.
- Enable the support for mysql databases.
- Add build dependencies for openssl and mysql.
- Add a runtime dependency on bash, because the new create_certificates
  script requires bash.
- Update the path to the configuration file. It is now stored in the
  subdirectory wendzelnntpd.
- Add an RCD_SCRIPT for wendzelnntpd.
- Add an INSTALL script which creates tls certificates and initializes the
  sqlite database. The certificates are required because TLS is enabled by
  default in the new upstream version.
- Disable the creation of the certificates and database during make install.
- Change Homepage from sourceforge to github because there are more
  information about the package on the github page.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ed41967c2f503fce7c384ac8fa3d71592dceab31

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

diffstat:
 wendzelnntpd/INSTALL                 | 17 ++++++++
 wendzelnntpd/Makefile                | 54 ++++++++---------------
 wendzelnntpd/PLIST                   | 30 ++++---------
 wendzelnntpd/distinfo                |  8 ++--
 wendzelnntpd/files/wendzelnntpd.sh   | 17 ++++++++
 wendzelnntpd/patches/patch-Makefile  | 85 ------------------------------------
 wendzelnntpd/patches/patch-configure | 58 ------------------------
 7 files changed, 64 insertions(+), 205 deletions(-)

diffs:
diff --git a/wendzelnntpd/INSTALL b/wendzelnntpd/INSTALL
new file mode 100644
index 0000000000..b15f280649
--- /dev/null
+++ b/wendzelnntpd/INSTALL
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+case ${STAGE} in
+POST-INSTALL)
+    # create ssl certificates
+    if [ ! -e @PKG_SYSCONFDIR@/wendzelnntpd/ssl/server.crt ] \
+        || [ ! -e @PKG_SYSCONFDIR@/ssl/server.key ] \
+        || [ ! -e @PKG_SYSCONFDIR@/ssl/ca.crt ]; then
+        bash create_certificate --environment local
+    fi
+
+    # initialize sqlite database
+    if [ ! -e @VARBASE@/spool/news/wendzelnntpd/usenet.db ]; then
+        cat @PREFIX@/share/wendzelnntpd/usenet.db_struct | sqlite3 @VARBASE@/spool/news/wendzelnntpd/usenet.db
+        wendzelnntpadm addgroup alt.wendzelnntpd.test y
+    fi
+esac
diff --git a/wendzelnntpd/Makefile b/wendzelnntpd/Makefile
index cdfa0285fc..6e40ab24dc 100644
--- a/wendzelnntpd/Makefile
+++ b/wendzelnntpd/Makefile
@@ -1,57 +1,41 @@
 # $NetBSD$
 
-#DISTNAME=		v2.1.3
-DISTNAME=		wendzelnntpd-2.2.0git
-#PKGNAME=		wendzelnntpd-${DISTNAME:S/v//}
+DISTNAME=		wendzelnntpd-2.2.0alpha
 CATEGORIES=		news
-#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wendzelnntpd/}
 MASTER_SITES=		${MASTER_SITE_GITHUB:=cdpxe/}
-GITHUB_TAG=		73d8e69871ff09444b6cf5aa089df5ce06112758
-#GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+GITHUB_TAG=		v2.2.0-alpha
 
 MAINTAINER=		micha%NetBSD.org@localhost
-HOMEPAGE=		https://sourceforge.net/projects/wendzelnntpd
+HOMEPAGE=		https://github.com/cdpxe/WendzelNNTPd
 COMMENT=		Free Usenet server with SQL backend and RBAC
 LICENSE=		gnu-gpl-v3
 
-USE_TOOLS+=		bison flex gmake
+USE_TOOLS+=		bison flex gmake bash:run
 USE_FEATURES=		err regcomp snprintf
 
 BUILD_DEFS+=		VARBASE
 
-# Build system expects PREFIX as part of DESTDIR
-SUBST_CLASSES+=		make
-SUBST_MESSAGE.make=	Adjust Makefile
-SUBST_STAGE.make=	pre-configure
-SUBST_FILES.make+=	Makefile
-SUBST_SED.make+=	-e 's,$$(DESTDIR),$$(DESTDIR)$$(PREFIX),g'
-
 # Directory for example config file
-FAKECDIR=		${DESTDIR}${PREFIX}/share/examples/wendzelnntpd
-
-INSTALLATION_DIRS=	sbin share/doc/wendzelnntpd ${PKGMANDIR}/man8 \
-			var/spool/news/wendzelnntpd
-SPECIAL_PERMS+=		sbin/wendzelnntpd \
-			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
-SPECIAL_PERMS+=		sbin/wendzelnntpadm \
-			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
+EGDIR=			${PREFIX}/share/examples/wendzelnntpd
+
+RCD_SCRIPTS=		wendzelnntpd
+
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/wendzelnntpd \
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 OWN_DIRS_PERMS+=	${VARBASE}/spool/news/wendzelnntpd \
-			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700
-CONF_FILES_PERMS=	${FAKECDIR}/wendzelnntpd.conf \
-			${PKG_SYSCONFDIR}/wendzelnntpd.conf \
-			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
-WRKSRC=			${WRKDIR}/WendzelNNTPd-73d8e69871ff09444b6cf5aa089df5ce06112758
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
+CONF_FILES_PERMS=	${EGDIR}/wendzelnntpd/wendzelnntpd.conf \
+			${PKG_SYSCONFDIR}/wendzelnntpd/wendzelnntpd.conf \
+			${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0600
+WRKSRC=			${WRKDIR}/WendzelNNTPd-2.2.0-alpha
 
-CONFIGURE_ENV+=		MYSQL=NO
-CONFIGURE_ENV+=		POSTGRES=NO
-CONFIGURE_ENV+=		CONFDIR=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=		FAKECDIR=${FAKECDIR}
-CONFIGURE_ENV+=		DESTDIR=${DESTDIR}
+GNU_CONFIGURE=		YES
 
-do-configure:
-	cd ${WRKSRC} && env ${CONFIGURE_ENV} ${CONFIG_SHELL} ./configure
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR} UDBDIR=${PREFIX}/var/spool/news/wendzelnntpd SQLITEINST=NO CREATE_CERTIFICATES=NO
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../security/mhash/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wendzelnntpd/PLIST b/wendzelnntpd/PLIST
index 5d0e8fb188..39de019e49 100644
--- a/wendzelnntpd/PLIST
+++ b/wendzelnntpd/PLIST
@@ -1,6 +1,9 @@
 @comment $NetBSD$
+man/man5/wendzelnntpd.conf.5
+man/man8/create_certificate.8
 man/man8/wendzelnntpadm.8
 man/man8/wendzelnntpd.8
+sbin/create_certificate
 sbin/wendzelnntpadm
 sbin/wendzelnntpd
 share/doc/wendzelnntpd/AUTHORS
@@ -9,25 +12,8 @@ share/doc/wendzelnntpd/HISTORY
 share/doc/wendzelnntpd/INSTALL
 share/doc/wendzelnntpd/LICENSE
 share/doc/wendzelnntpd/README.md
-share/doc/wendzelnntpd/docs.pdf
-share/doc/wendzelnntpd/docs/contents.png
-share/doc/wendzelnntpd/docs/docs.css
-share/doc/wendzelnntpd/docs/docs.html
-share/doc/wendzelnntpd/docs/footnode.html
-share/doc/wendzelnntpd/docs/footnote.png
-share/doc/wendzelnntpd/docs/img1.png
-share/doc/wendzelnntpd/docs/img1.svg
-share/doc/wendzelnntpd/docs/img2.svg
-share/doc/wendzelnntpd/docs/index.html
-share/doc/wendzelnntpd/docs/index.png
-share/doc/wendzelnntpd/docs/next.png
-share/doc/wendzelnntpd/docs/next_g.png
-share/doc/wendzelnntpd/docs/nx_grp_g.png
-share/doc/wendzelnntpd/docs/prev.png
-share/doc/wendzelnntpd/docs/prev_g.png
-share/doc/wendzelnntpd/docs/up.png
-share/doc/wendzelnntpd/docs/up_g.png
-share/doc/wendzelnntpd/mysql_db_struct.sql
-share/doc/wendzelnntpd/usenet.db_struct
-share/examples/wendzelnntpd/wendzelnntpd.conf
-var/spool/news/wendzelnntpd/usenet.db
+share/examples/wendzelnntpd/wendzelnntpd/wendzelnntpd.conf
+share/wendzelnntpd/mysql_db_struct.sql
+share/wendzelnntpd/openssl.cnf
+share/wendzelnntpd/usenet.db_struct
+@pkgdir var/spool/news/wendzelnntpd
diff --git a/wendzelnntpd/distinfo b/wendzelnntpd/distinfo
index 2ec7f3929f..a6711d1bd4 100644
--- a/wendzelnntpd/distinfo
+++ b/wendzelnntpd/distinfo
@@ -1,7 +1,5 @@
 $NetBSD$
 
-BLAKE2s (wendzelnntpd-2.2.0git-73d8e69871ff09444b6cf5aa089df5ce06112758.tar.gz) = c012ea8fafe28b9d0260277c9a59a31f927bcd24f200c6447f3a815413bc8101
-SHA512 (wendzelnntpd-2.2.0git-73d8e69871ff09444b6cf5aa089df5ce06112758.tar.gz) = 0dc1ed9c9b9ee8b990029bbeaac3996d904d653392ce68b3d7b95f51027e0c594965dae109a7bb850a45bdcbb9db50eeb03b395f9c907c29c30d652644759c65
-Size (wendzelnntpd-2.2.0git-73d8e69871ff09444b6cf5aa089df5ce06112758.tar.gz) = 5194773 bytes
-SHA1 (patch-Makefile) = 0745c7754a8cab59dbff29177927f63aa3f637f7
-SHA1 (patch-configure) = 545200aa618f08b72ef35e18bc212b83ae30d0b3
+BLAKE2s (wendzelnntpd-2.2.0alpha.tar.gz) = d6f9c529f6182682ee69c3dd59f221c5102d98eb45b023f5af6a038ec7819522
+SHA512 (wendzelnntpd-2.2.0alpha.tar.gz) = e22c288f69250feb6122df86c9d3bcd5bf60f4b159fde05d71d333f4062a9b8e031bf4da8ec8436edd6d104a52841e741028dd9485158fec88f87ccb8c360062
+Size (wendzelnntpd-2.2.0alpha.tar.gz) = 5058299 bytes
diff --git a/wendzelnntpd/files/wendzelnntpd.sh b/wendzelnntpd/files/wendzelnntpd.sh
new file mode 100644
index 0000000000..35e588bf8b
--- /dev/null
+++ b/wendzelnntpd/files/wendzelnntpd.sh
@@ -0,0 +1,17 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: wendzelnntpd
+# REQUIRE: DAEMON
+
+if [ -f @SYSCONFBASE@/rc.subr ]; then
+	. @SYSCONFBASE@/rc.subr
+fi
+
+name="wendzelnntpd"
+rcvar="${name}"
+command="@PREFIX@/sbin/wendzelnntpd"
+command_args="-d"
+required_files="@PKG_SYSCONFDIR@/wendzelnntpd/wendzelnntpd.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/wendzelnntpd/patches/patch-Makefile b/wendzelnntpd/patches/patch-Makefile
deleted file mode 100644
index e2225db9ad..0000000000
--- a/wendzelnntpd/patches/patch-Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD$
-
-Do not set permissions here (handled by pkgsrc).
-Install man pages to "man" instead of "share/man" directory.
-
---- Makefile.orig	2024-09-10 17:15:06.000000000 +0000
-+++ Makefile
-@@ -5,7 +5,7 @@
- 
- include Makefile.inc
- 
--UDBFILE=/var/spool/news/wendzelnntpd/usenet.db
-+UDBFILE=$(DESTDIR)/var/spool/news/wendzelnntpd/usenet.db
- DESTCFLAGS=-DCONFDIR=\"$(CONFDIR)\"
- HEADERS=$(SRC)/include/cdpstrings.h $(SRC)/include/main.h $(SRC)/include/wendzelnntpdpath.h
- CFLAGS= -c -Wall $(STACK_PROT) $(DESTCFLAGS)
-@@ -109,35 +109,35 @@ install : bin/wendzelnntpd bin/wendzelnn
- 	if [ ! -d $(DESTDIR)/share ]; then install -d -m 0755 $(DESTDIR)/share; fi
- 	if [ ! -d $(DESTDIR)/share/doc ]; then install -d -m 0755 $(DESTDIR)/share/doc; fi
- 	if [ ! -d $(DESTDIR)/share/doc/wendzelnntpd ]; then install -d -m 0755 $(DESTDIR)/share/doc/wendzelnntpd; fi
--	if [ ! -d $(DESTDIR)/share/man/man8 ]; then install -d -m 0755 $(DESTDIR)/share/man/man8; fi
-+	if [ ! -d $(DESTDIR)/man/man8 ]; then install -d -m 0755 $(DESTDIR)/man/man8; fi
- 	# binaries
- 	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)/sbin/
--	chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
--	chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
-+	#chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
-+	#chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
- 	# documentation and config files
- 	cp $(DOCFILES_TO_INST) $(DESTDIR)/share/doc/wendzelnntpd/
- 	cp -r docs/docs $(DESTDIR)/share/doc/wendzelnntpd/
- 	cp docs/docs.pdf $(DESTDIR)/share/doc/wendzelnntpd/docs.pdf
--	chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
--	chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
-+	#chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
-+	#chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
- 	# manpages
--	cp $(MANPAGES) $(DESTDIR)/share/man/man8/
--	chmod 644 $(DESTDIR)/share/man/man8/wendzelnntpd.8
--	chmod 644 $(DESTDIR)/share/man/man8/wendzelnntpadm.8
-+	cp $(MANPAGES) $(DESTDIR)/man/man8/
-+	#chmod 644 $(DESTDIR)/man/man8/wendzelnntpd.8
-+	#chmod 644 $(DESTDIR)/man/man8/wendzelnntpadm.8
- 	# config
--	@if [ -f $(FAKECDIR)/wendzelnntpd.conf ]; then cp $(FAKECDIR)/wendzelnntpd.conf $(FAKECDIR)/wendzelnntpd.conf.bkp; chmod 0644 $(FAKECDIR)/wendzelnntpd.conf.bkp; echo "***Your old wendzelnntpd.conf was backuped!***"; fi
-+	#@if [ -f $(FAKECDIR)/wendzelnntpd.conf ]; then cp $(FAKECDIR)/wendzelnntpd.conf $(FAKECDIR)/wendzelnntpd.conf.bkp; chmod 0644 $(FAKECDIR)/wendzelnntpd.conf.bkp; echo "***Your old wendzelnntpd.conf was backuped!***"; fi
- 	cp $(CONFFILE) $(FAKECDIR)/wendzelnntpd.conf
--	chown 0:0 $(FAKECDIR)/wendzelnntpd.conf
--	chmod 0644 $(FAKECDIR)/wendzelnntpd.conf
-+	#chown 0:0 $(FAKECDIR)/wendzelnntpd.conf
-+	#chmod 0644 $(FAKECDIR)/wendzelnntpd.conf
- 	# nextmsgid and database/usenet.db are placed here:
--	mkdir -p /var/spool/news/wendzelnntpd
-+	mkdir -p $(DESTDIR)/var/spool/news/wendzelnntpd
- 	# og-rwx since the passwords are stored in the database too!
--	chmod 700 /var/spool/news/wendzelnntpd
-+	#chmod 700 /var/spool/news/wendzelnntpd
- 	# create a backup of the old usenet database, if needed (only if not dev-mode)
--	@if [ -f $(UDBFILE) ] && [ $(CONFFILE) != *"dev"* ]; then mv $(UDBFILE) $(UDBFILE).`date +"%m-%d-%y-%H:%M"`.bkp; chmod 0600 $(UDBFILE).`date +"%m-%d-%y-%H:%M"`.bkp; echo "***Your old usenet database was backuped!***"; fi
-+	#@if [ -f $(UDBFILE) ] && [ $(CONFFILE) != *"dev"* ]; then mv $(UDBFILE) $(UDBFILE).`date +"%m-%d-%y-%H:%M"`.bkp; chmod 0600 $(UDBFILE).`date +"%m-%d-%y-%H:%M"`.bkp; echo "***Your old usenet database was backuped!***"; fi
- 			
- 	@# create new database, dir already exists due to earlier mkdir call
--	install -d -m 0700 $(CMD_INSTALL_USEROPT) 0 -g 0 /var/spool/news/wendzelnntpd
-+	install -d -m 0700 $(CMD_INSTALL_USEROPT) 0 -g 0 $(DESTDIR)/var/spool/news/wendzelnntpd
- 	@#
- 	@# create sqlite initial database if Sqlite3 is used
- 	@# AND
-@@ -153,13 +153,13 @@ upgrade : bin/wendzelnntpd bin/wendzelnn
- 	@read uselessinput
- 	# binaries
- 	cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)/sbin/
--	chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
--	chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
-+	#chown 0:0 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
-+	#chmod 0755 $(DESTDIR)/sbin/wendzelnntpd $(DESTDIR)/sbin/wendzelnntpadm
- 	# documentation
- 	cp -r docs/docs $(DESTDIR)/share/doc/wendzelnntpd/
- 	cp docs/docs.pdf $(DESTDIR)/share/doc/wendzelnntpd/docs.pdf
--	chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
--	chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
-+	#chown 0:0 $(DESTDIR)/share/doc/wendzelnntpd/*
-+	#chmod 0644 $(DESTDIR)/share/doc/wendzelnntpd/*
- 	@echo "Upgrade finished. Thank you for upgrading and using this software. Have fun!"
- 
- exec : bin/wendzelnntpd
diff --git a/wendzelnntpd/patches/patch-configure b/wendzelnntpd/patches/patch-configure
deleted file mode 100644
index ced2e818ea..0000000000
--- a/wendzelnntpd/patches/patch-configure
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD$
-
-out(): Use POSIX printf instead of echo for portability.
-check(): Nonzero exit status is required for abort.
-Fix newline for BSD.
-"$COMPILER -v" does not work. Use "$COMPILER --version".
-
---- configure.orig	2024-09-10 17:15:06.000000000 +0000
-+++ configure
-@@ -56,11 +56,16 @@ USE_TLS="YES"
- 
- out()
- {
--	if [ "$OS" = "SunOS" ]; then
--		echo $1 '\c'
--	else
--		echo -n $1
--	fi
-+	# This does not work for other SysV based OS.
-+	#if [ "$OS" = "SunOS" ]; then
-+	#	echo $1 '\c'
-+	#else
-+	#	echo -n $1
-+	#fi
-+
-+	# Use POSIX printf
-+	# https://pubs.opengroup.org/onlinepubs/9799919799/utilities/printf.html
-+	printf "%s" "$1"
- }
- 
- check()
-@@ -77,7 +82,7 @@ check()
- 	else
- 		echo "$2 (returned $RET_VAL, what is not eq to $CHK_VAL)"
- 		echo $3
--		exit
-+		exit 1
- 	fi
- }
- 
-@@ -205,7 +210,7 @@ fi
- echo "done"
- 
- if [ "$OS" = "FreeBSD" -o "$OS" = "OpenBSD" -o "$OS" = "NetBSD" ]; then
--    out "*BSD detected, setting compiler to 'cc'.\n"
-+    echo "*BSD detected, setting compiler to 'cc'."
-     COMPILER=cc
- fi
- 
-@@ -242,7 +247,7 @@ echo "done, using '$CMD_INSTALL_USEROPT 
- 
- ############# OS INDEPENDENT PART #############
- 
--out "checking for (g)cc..."; $COMPILER -v >/dev/null 2>&1; check "yes" "no" "You need (g)cc (or set PATH)."
-+out "checking for (g)cc..."; $COMPILER --version >/dev/null 2>&1; check "yes" "no" "You need (g)cc (or set PATH)."
- 
- ###############
- out "checking for libc..."
Prev by Date: librewolf: update to 143.0.4-1
Next by Date: kibana: add reference to CVE-2025-25009
Previous by Thread: librewolf: update to 143.0.4-1
Next by Thread: kibana: add reference to CVE-2025-25009
Indexes:
Home | Main Index | Thread Index | Old Index