pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wendzelnntpd: Update to 2.2 alpha
Module Name: pkgsrc-wip
Committed By: Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By: micha
Date: Wed Sep 11 16:24:45 2024 +0200
Changeset: 56afc96db1e60c7774f6dea5bfa2c8c2bf0171da
Modified Files:
wendzelnntpd/Makefile
wendzelnntpd/distinfo
wendzelnntpd/patches/patch-Makefile
wendzelnntpd/patches/patch-configure
Log Message:
wendzelnntpd: Update to 2.2 alpha
TLS support and several other features.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=56afc96db1e60c7774f6dea5bfa2c8c2bf0171da
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wendzelnntpd/Makefile | 6 +-
wendzelnntpd/distinfo | 10 ++--
wendzelnntpd/patches/patch-Makefile | 103 +++++++++++++++++++++--------------
wendzelnntpd/patches/patch-configure | 54 ++++++++++++++++--
4 files changed, 118 insertions(+), 55 deletions(-)
diffs:
diff --git a/wendzelnntpd/Makefile b/wendzelnntpd/Makefile
index 857ec0999e..855d02e38e 100644
--- a/wendzelnntpd/Makefile
+++ b/wendzelnntpd/Makefile
@@ -2,12 +2,12 @@
#DISTNAME= v2.1.3
#PKGNAME= wendzelnntpd-${DISTNAME:S/v//}
-DISTNAME= wendzelnntpd-2.1.4git
+DISTNAME= wendzelnntpd-2.2.0git
CATEGORIES= news
#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wendzelnntpd/}
MASTER_SITES= ${MASTER_SITE_GITHUB:=cdpxe/}
#GITHUB_RELEASE= v${PKGVERSION_NOREV}
-GITHUB_TAG= 02817771a801e8704171799c92a9ff66efeaacb6
+GITHUB_TAG= 73d8e69871ff09444b6cf5aa089df5ce06112758
MAINTAINER= micha%NetBSD.org@localhost
HOMEPAGE= https://sourceforge.net/projects/wendzelnntpd
@@ -39,7 +39,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/spool/news/wendzelnntpd \
CONF_FILES_PERMS= ${FAKECDIR}/wendzelnntpd.conf \
${PKG_SYSCONFDIR}/wendzelnntpd.conf \
${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0644
-WRKSRC= ${WRKDIR}/WendzelNNTPd-02817771a801e8704171799c92a9ff66efeaacb6
+WRKSRC= ${WRKDIR}/WendzelNNTPd-73d8e69871ff09444b6cf5aa089df5ce06112758
CONFIGURE_ENV+= MYSQL=NO
CONFIGURE_ENV+= POSTGRES=NO
diff --git a/wendzelnntpd/distinfo b/wendzelnntpd/distinfo
index e3c3990e88..bf32ce9a2e 100644
--- a/wendzelnntpd/distinfo
+++ b/wendzelnntpd/distinfo
@@ -1,7 +1,7 @@
$NetBSD$
-BLAKE2s (wendzelnntpd-2.1.4git-02817771a801e8704171799c92a9ff66efeaacb6.tar.gz) = f97b4185f5647bd8f220ac5e6cdb132b870468508a997c257bf6ed235e1ed540
-SHA512 (wendzelnntpd-2.1.4git-02817771a801e8704171799c92a9ff66efeaacb6.tar.gz) = 7f7c498d66061377b8d52723193a3ab26c0533b6f6545152d8e17c6919c9b081403feaf035ed565492637df98640eac440c114c4d9fc63da2c4e493628c7f27b
-Size (wendzelnntpd-2.1.4git-02817771a801e8704171799c92a9ff66efeaacb6.tar.gz) = 5156059 bytes
-SHA1 (patch-Makefile) = e224bc4f23f0a93fe862055f7532518735154c2e
-SHA1 (patch-configure) = c08aa51668b9476548d22f467e943a029f6a6833
+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) = 6939a29c52fb3c8e6156fe1a7eb90051bef76452
+SHA1 (patch-configure) = 545200aa618f08b72ef35e18bc212b83ae30d0b3
diff --git a/wendzelnntpd/patches/patch-Makefile b/wendzelnntpd/patches/patch-Makefile
index 221d757df2..13598c3224 100644
--- a/wendzelnntpd/patches/patch-Makefile
+++ b/wendzelnntpd/patches/patch-Makefile
@@ -2,65 +2,86 @@ $NetBSD$
Do not set permissions here (handled by pkgsrc).
Install man pages to "man" instead of "share/man" directory.
-Do not initialize sqlite3 database.
---- Makefile.orig 2021-04-17 20:18:01.000000000 +0000
+--- Makefile.orig 2024-09-10 17:15:06.000000000 +0000
+++ Makefile
-@@ -105,41 +105,42 @@ 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
+@@ -105,36 +105,36 @@ wendzelnntpadm : cdpnntpadm.o db_abstrac
+ install : bin/wendzelnntpd bin/wendzelnntpadm
+ if [ ! -d $(FAKECDIR) ]; then install -d -m 0755 $(FAKECDIR); fi
+ if [ ! -d $(FAKECDIR)/etc ]; then install -d -m 0755 $(FAKECDIR)/etc; fi
+- if [ ! -d $(DESTDIR)/sbin ]; then install -d -m 0755 $(DESTDIR)/sbin; fi
+- 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
++ if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin; fi
++ if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share; fi
++ if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc; fi
++ if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd; fi
++ if [ ! -d $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/man/man8 ]; then install -d -m 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/man/man8; fi
# binaries
- cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)/sbin/
+- 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
++ cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/
++ #chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpadm
++ #chmod 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/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
+- 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/*
++ cp $(DOCFILES_TO_INST) $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/
++ cp -r docs/docs $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/
++ cp docs/docs.pdf $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/docs.pdf
++ #chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/*
++ #chmod 0644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/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
++ cp $(MANPAGES) $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/man/man8/
++ #chmod 644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/man/man8/wendzelnntpd.8
++ #chmod 644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/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
- cp wendzelnntpd.conf $(FAKECDIR)/
+- @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
++ #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 /var/spool/news/wendzelnntpd
+ mkdir -p /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
- @if [ -f $(UDBFILE) ]; 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
++ #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 /var/spool/news/wendzelnntpd
- @#
- @# create sqlite initial database if Sqlite3 is used
- @# AND
- @# create initial newsgroup for sqlite3
- @#
-- @if [ "$(SQLITEINST)" != "NO" ]; then echo "Setting up sqlite3 database ..."; cat database/usenet.db_struct | sqlite3 $(UDBFILE) && ( ./bin/wendzelnntpadm addgroup alt.wendzelnntpd.test y || echo "no new newsgroup created." ); else echo "*** NO sqlite3 database setup performed (you use MySQL). Please read the manual (docs/docs.pdf) to learn how to set up the MySQL database within a few minutes. ***"; fi
-- @echo "Installation finished. Please note that your existing wendzelnntpd.conf might have been replaced (a backup should be located in the same folder as your original configuration file)."
-+ #@if [ "$(SQLITEINST)" != "NO" ]; then echo "Setting up sqlite3 database ..."; cat database/usenet.db_struct | sqlite3 $(UDBFILE) && ( ./bin/wendzelnntpadm addgroup alt.wendzelnntpd.test y || echo "no new newsgroup created." ); else echo "*** NO sqlite3 database setup performed (you use MySQL). Please read the manual (docs/docs.pdf) to learn how to set up the MySQL database within a few minutes. ***"; fi
-+ @echo "Installation finished."
-+ #"Please note that your existing wendzelnntpd.conf might have been replaced (a backup should be located in the same folder as your original configuration file)."
- @echo "Thank you for using this software! Have fun using it!"
+ install -d -m 0700 $(CMD_INSTALL_USEROPT) 0 -g 0 /var/spool/news/wendzelnntpd
+@@ -152,14 +152,14 @@ upgrade : bin/wendzelnntpd bin/wendzelnn
+ @echo "*** Please only upgrade your WendzelNNTPd if your existing installation is WendzelNNTPd version 2.0.0 or newer. This script replaces only binaries and documentation files. Your databases and configuration files remain untouched. Press RETURN to perform an upgrade or press CTRL+C to abort. ***"
+ @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
++ cp bin/wendzelnntpd bin/wendzelnntpadm $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/
++ #chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpadm
++ #chmod 0755 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/sbin/wendzelnntpd $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/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/*
++ cp -r docs/docs $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/
++ cp docs/docs.pdf $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/docs.pdf
++ #chown 0:0 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/*
++ #chmod 0644 $(DESTDIR)$(PREFIX)$(PREFIX)$(PREFIX)$(PREFIX)/share/doc/wendzelnntpd/*
+ @echo "Upgrade finished. Thank you for upgrading and using this software. Have fun!"
- upgrade : bin/wendzelnntpd bin/wendzelnntpadm
+ exec : bin/wendzelnntpd
diff --git a/wendzelnntpd/patches/patch-configure b/wendzelnntpd/patches/patch-configure
index 98eee6bbce..ced2e818ea 100644
--- a/wendzelnntpd/patches/patch-configure
+++ b/wendzelnntpd/patches/patch-configure
@@ -1,16 +1,58 @@
$NetBSD$
-Seems to fail because of compiler wrappers.
-pkgsrc is responsible to provide the compiler, do not check here.
+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 2023-09-24 17:08:59.000000000 +0000
+--- configure.orig 2024-09-10 17:15:06.000000000 +0000
+++ configure
-@@ -213,7 +213,7 @@ echo "done, using '$CMD_INSTALL_USEROPT
+@@ -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 gcc..."; $COMPILER -v >/dev/null 2>&1; check "yes" "no" "You need gcc (or set PATH)."
-+#out "checking for gcc..."; $COMPILER -v >/dev/null 2>&1; check "yes" "no" "You need gcc (or set PATH)."
+-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..."
Home |
Main Index |
Thread Index |
Old Index