wendzelnntpd: Update to 2.1.4 snapshot 02817771a801e8704171799c92a9ff66efeaacb6

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: wendzelnntpd: Update to 2.1.4 snapshot 02817771a801e8704171799c92a9ff66efeaacb6
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Mon, 02 Oct 2023 10:07:21 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Mon Oct 2 12:07:21 2023 +0200
Changeset:	7578cef4bef987a76015424268212a389078f7d5

Modified Files:
	wendzelnntpd/Makefile
	wendzelnntpd/PLIST
	wendzelnntpd/distinfo
	wendzelnntpd/patches/patch-Makefile
	wendzelnntpd/patches/patch-configure
Removed Files:
	wendzelnntpd/patches/patch-src_config.y
	wendzelnntpd/patches/patch-src_hash.c

Log Message:
wendzelnntpd: Update to 2.1.4 snapshot 02817771a801e8704171799c92a9ff66efeaacb6

- Remove NetBSD patches merged upstream.
- Disable compiler check.
- Update PLIST

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

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

diffstat:
 wendzelnntpd/Makefile                   | 31 +++++++++++++++++-------------
 wendzelnntpd/PLIST                      |  2 +-
 wendzelnntpd/distinfo                   | 12 +++++-------
 wendzelnntpd/patches/patch-Makefile     |  2 +-
 wendzelnntpd/patches/patch-configure    | 33 ++++++++------------------------
 wendzelnntpd/patches/patch-src_config.y | 34 ---------------------------------
 wendzelnntpd/patches/patch-src_hash.c   | 15 ---------------
 7 files changed, 33 insertions(+), 96 deletions(-)

diffs:
diff --git a/wendzelnntpd/Makefile b/wendzelnntpd/Makefile
index 70486aa38e..857ec0999e 100644
--- a/wendzelnntpd/Makefile
+++ b/wendzelnntpd/Makefile
@@ -1,17 +1,21 @@
 # $NetBSD$
 
-DISTNAME=	v2.1.3
-PKGNAME=	wendzelnntpd-${DISTNAME:S/v//}
-CATEGORIES=	news
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wendzelnntpd/}
-
-MAINTAINER=	micha%NetBSD.org@localhost
-HOMEPAGE=	https://sourceforge.net/projects/wendzelnntpd
-COMMENT=	Free Usenet server with SQL backend and RBAC
-LICENSE=	gnu-gpl-v3
-
-USE_TOOLS+=	bison flex gmake
-USE_FEATURES=	err regcomp snprintf
+#DISTNAME=		v2.1.3
+#PKGNAME=		wendzelnntpd-${DISTNAME:S/v//}
+DISTNAME=		wendzelnntpd-2.1.4git
+CATEGORIES=		news
+#MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=wendzelnntpd/}
+MASTER_SITES=		${MASTER_SITE_GITHUB:=cdpxe/}
+#GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+GITHUB_TAG=		02817771a801e8704171799c92a9ff66efeaacb6
+
+MAINTAINER=		micha%NetBSD.org@localhost
+HOMEPAGE=		https://sourceforge.net/projects/wendzelnntpd
+COMMENT=		Free Usenet server with SQL backend and RBAC
+LICENSE=		gnu-gpl-v3
+
+USE_TOOLS+=		bison flex gmake
+USE_FEATURES=		err regcomp snprintf
 
 BUILD_DEFS+=		VARBASE
 
@@ -35,9 +39,10 @@ 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}/cdpxe-WendzelNNTPd-17d557d
+WRKSRC=			${WRKDIR}/WendzelNNTPd-02817771a801e8704171799c92a9ff66efeaacb6
 
 CONFIGURE_ENV+=		MYSQL=NO
+CONFIGURE_ENV+=		POSTGRES=NO
 CONFIGURE_ENV+=		CONFDIR=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		FAKECDIR=${FAKECDIR}
 CONFIGURE_ENV+=		DESTDIR=${DESTDIR}
diff --git a/wendzelnntpd/PLIST b/wendzelnntpd/PLIST
index 385c5e23fe..ab95587017 100644
--- a/wendzelnntpd/PLIST
+++ b/wendzelnntpd/PLIST
@@ -3,7 +3,7 @@ man/man8/wendzelnntpadm.8
 man/man8/wendzelnntpd.8
 sbin/wendzelnntpadm
 sbin/wendzelnntpd
-share/doc/wendzelnntpd/AUTHOR
+share/doc/wendzelnntpd/AUTHORS
 share/doc/wendzelnntpd/CHANGELOG
 share/doc/wendzelnntpd/HISTORY
 share/doc/wendzelnntpd/INSTALL
diff --git a/wendzelnntpd/distinfo b/wendzelnntpd/distinfo
index d9d57a9277..e3c3990e88 100644
--- a/wendzelnntpd/distinfo
+++ b/wendzelnntpd/distinfo
@@ -1,9 +1,7 @@
 $NetBSD$
 
-RMD160 (v2.1.3.tar.gz) = 8942471851dcd373854893c8e0c10d5e146195ab
-SHA512 (v2.1.3.tar.gz) = 13f2a1fdaeeb4c663a4c43d1f3a819ae0975a3dacd1f720d618e95717dd4ecca4921498f1730a9ddd2e82531866da3d0716531976b1b74510ec0fca19c15071f
-Size (v2.1.3.tar.gz) = 4773954 bytes
-SHA1 (patch-Makefile) = 83667edde0fee10d79f31983cb5250931929893e
-SHA1 (patch-configure) = f00a38e5bad77a1e2d9b662a947e7206ebe96c58
-SHA1 (patch-src_config.y) = a4e940335de40c3c77982706a1c269710a3f7396
-SHA1 (patch-src_hash.c) = 90fe9c0a02798a1b78e192ed934eb7ea3444fd6e
+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
diff --git a/wendzelnntpd/patches/patch-Makefile b/wendzelnntpd/patches/patch-Makefile
index 2e3f75f65b..221d757df2 100644
--- a/wendzelnntpd/patches/patch-Makefile
+++ b/wendzelnntpd/patches/patch-Makefile
@@ -6,7 +6,7 @@ Do not initialize sqlite3 database.
 
 --- Makefile.orig	2021-04-17 20:18:01.000000000 +0000
 +++ Makefile
-@@ -102,41 +102,42 @@ install : bin/wendzelnntpd bin/wendzelnn
+@@ -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
diff --git a/wendzelnntpd/patches/patch-configure b/wendzelnntpd/patches/patch-configure
index accf84ee07..98eee6bbce 100644
--- a/wendzelnntpd/patches/patch-configure
+++ b/wendzelnntpd/patches/patch-configure
@@ -1,33 +1,16 @@
 $NetBSD$
 
-Honor LDFLAGS.
+Seems to fail because of compiler wrappers.
+pkgsrc is responsible to provide the compiler, do not check here.
 
---- configure.orig	2021-04-17 20:18:01.000000000 +0000
+--- configure.orig	2023-09-24 17:08:59.000000000 +0000
 +++ configure
-@@ -346,7 +346,7 @@ cat << EOF >temp.c
- #include <pthread.h>
- int main(){pthread_self();return 0;}
- EOF
--gcc -o temp temp.c -lpthread >/dev/null 2>&1; check "yes" "no" "You need libpthread."
-+gcc $LDFLAGS -o temp temp.c -lpthread >/dev/null 2>&1; check "yes" "no" "You need libpthread."
- rm -f temp temp.c
+@@ -213,7 +213,7 @@ echo "done, using '$CMD_INSTALL_USEROPT 
  
- ###############
-@@ -355,7 +355,7 @@ cat << EOF >temp.c
- #include <mhash.h>
- int main(){MHASH td = mhash_init(MHASH_MD5);return 0;}
- EOF
--gcc -o temp temp.c -lmhash >/dev/null 2>&1; check "yes" "no" "You need libmhash."
-+gcc $LDFLAGS -o temp temp.c -lmhash >/dev/null 2>&1; check "yes" "no" "You need libmhash."
- rm -f temp temp.c
+ ############# OS INDEPENDENT PART #############
  
- ###############
-@@ -364,7 +364,7 @@ cat << EOF >temp.c
- #include <mhash.h>
- int main(){MHASH td = mhash_init(MHASH_SHA256);return 0;}
- EOF
--gcc -o temp temp.c -lmhash >/dev/null 2>&1; check "yes" "no" "You need a version of libmhash that supports SHA-256."
-+gcc $LDFLAGS -o temp temp.c -lmhash >/dev/null 2>&1; check "yes" "no" "You need a version of libmhash that supports SHA-256."
- rm -f temp temp.c
+-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 libc..."
diff --git a/wendzelnntpd/patches/patch-src_config.y b/wendzelnntpd/patches/patch-src_config.y
deleted file mode 100644
index 6dfe412020..0000000000
--- a/wendzelnntpd/patches/patch-src_config.y
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-
-Patch for pkgsrc feature "err" (USE_FEATURES).
-Add forward declarations for lexer and parser functions.
-
---- src/config.y.orig	2021-04-17 20:18:01.000000000 +0000
-+++ src/config.y
-@@ -18,9 +18,25 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-- 
-+
-+#if defined(HAVE_NBCOMPAT_H)
-+#include <nbcompat/config.h>    /* Needed for the other headers */
-+#include <nbcompat/cdefs.h>     /* Needed for the other headers */
-+#include <nbcompat/err.h>
-+#else
-+#include <err.h>
-+#endif
-+
- #include "main.h"
- 
-+/* Lexer generated by flex */
-+extern int
-+yylex(void);
-+
-+/* Parser generated by bison */
-+int
-+yyparse(void);
-+
- extern char *yytext;
- extern FILE *yyin;
- extern int size_sockinfo_t; /* is set to 0 on startup in main.c */
diff --git a/wendzelnntpd/patches/patch-src_hash.c b/wendzelnntpd/patches/patch-src_hash.c
deleted file mode 100644
index 4c54b83202..0000000000
--- a/wendzelnntpd/patches/patch-src_hash.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Silence "xyz redefined" warning (VERSION is defined by "main.h" and "mhash.h").
-
---- src/hash.c.orig	2021-04-17 20:18:01.000000000 +0000
-+++ src/hash.c
-@@ -18,6 +18,8 @@
-  */
-  
- #include "main.h"
-+/* VERSION is defined by mhash.h (from libmhash) too */
-+#undef VERSION
- #include <mhash.h>
- 
- #define SHA256_LEN 64 /* 32 bytes * 8 bits = 256 bits;
Prev by Date: recoll: remove, imported to pkgsrc/sysutils
Next by Date: denise: unbreak build for gcc12
Previous by Thread: recoll: remove, imported to pkgsrc/sysutils
Next by Thread: denise: unbreak build for gcc12
Indexes:
Home | Main Index | Thread Index | Old Index