From nobody Sun Dec 22 09:38:02 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YGGKk3NDRz5jL6k; Sun, 22 Dec 2024 09:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YGGKk2rQLz4py1; Sun, 22 Dec 2024 09:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734860282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NPbcgewxMH7ViEiB+R7Hw7HPCFSHzc168bUCCcYyUjI=; b=yhaa4qTnOoFofrC/4EC+XaAno+UkxslBV7e4BEY43VQYLgEVca8PSmqb7mmvmNZ5G14OPh fNkp5KI4UxY7vcH/DExl7aWcQKMkToYfb6bp7jWf2iOfy2DHsQglPwgvNxT+ZzcmM+9Bgb IdsKDScnxYabxG4jkpXadEfPg68FR3we/Kc05SuSv1teBzOe70R+JPjEuQPCAHuNk2Zzaf tQR/1K/ZqX2M+QNENyshpU+M5Ig5Es/dFGqWZBbeDTi8jcmOknHWVs5ELJGuiE6EvnfIDH iCOniDmgVBIKpKtMl2r54g4yFGUYOrspDKrjx8V7SXf7yCG0Uy1Kg2Wa3RlHMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734860282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NPbcgewxMH7ViEiB+R7Hw7HPCFSHzc168bUCCcYyUjI=; b=iK/d5VA2rPuY59207DZznlzIMxxsMc+goh+j7pwKGMNq6psI5dY7lHgKIZXC6I//HRtPcf BHQM8NqssFhV9/9JTRNWILjVE2ixkDWn3AiEriAOFhCVIojNv1JXZXiZsovH6gf1BaU31d tWNysIM3MR5qPXBMg9lft+F0rUaaHX8rVu+x4t58lzx5GJQxAzPr6VN3Qz57R10q09WSQH 5cEmXL0h8HCwGfu9o5MNeAo9tzF9jYoTxW60VZvJFOh+uBKgOhQP5JOTWoI0USDMjBBJZ8 7dUkXAdrdyCcgswZk++OW4PySJXaMyotRV7SZAaf4EsluvCH4MtYWcZyQ8rRtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734860282; a=rsa-sha256; cv=none; b=A6QiKr3prcggMK7ZFvKZhHmjPsWq4dfu/uq3RIF27z05zbs5edgFuTzRurZ8/sdA6pWBzJ McsSCaZHhUPcTlaiJ4pe8YZnm55Y8lR6n4OCrZ5NV40QKlKcK/HdZa2p1GilHWkxGrZdIy 6e6s6mGOglQkcegSzJ9vuzvplZYBklDCI4tg2eAv+5WR1CCMclRklC9WskonBuIP4sfFU7 l8T0Qal8wjwOKTYbGMkP7fAZI0ZpkB2cFD8hzEZQwzKGPMILbVp4rzW3t3GmMKfXeiaLyg QM0r2q0H2Y8jl9M4QHkaVQ143GH+MwcS1JsVJmcsO0hVQXYWFrlipTbt5GFYlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YGGKk2K23z13RD; Sun, 22 Dec 2024 09:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BM9c2Ra029426; Sun, 22 Dec 2024 09:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BM9c2Ft029423; Sun, 22 Dec 2024 09:38:02 GMT (envelope-from git) Date: Sun, 22 Dec 2024 09:38:02 GMT Message-Id: <202412220938.4BM9c2Ft029423@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: fd74609c1205 - main - irc/eggdrop: Update to 1.10.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd74609c120546646c4fabb08a7be5883f18d79d Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd74609c120546646c4fabb08a7be5883f18d79d commit fd74609c120546646c4fabb08a7be5883f18d79d Author: Chris Petrik AuthorDate: 2024-12-22 09:34:25 +0000 Commit: Zsolt Udvari CommitDate: 2024-12-22 09:37:43 +0000 irc/eggdrop: Update to 1.10.0 Use compiler:c11. Use TCL_INCLUDEDIR and TCL_LIBDIR variables in CONFIGURE_ARGS. Pet portfmt. Submitter takes maintainership. Changelog: https://github.com/eggheads/eggdrop/blob/develop/NEWS PR: 283431 --- irc/eggdrop/Makefile | 44 ++++++++++++++++++------------------ irc/eggdrop/distinfo | 6 ++--- irc/eggdrop/files/patch-eggdrop.conf | 31 ++++++++++++------------- irc/eggdrop/pkg-plist | 11 ++++++++- 4 files changed, 50 insertions(+), 42 deletions(-) diff --git a/irc/eggdrop/Makefile b/irc/eggdrop/Makefile index e3c87d00436b..1d7d305414b0 100644 --- a/irc/eggdrop/Makefile +++ b/irc/eggdrop/Makefile @@ -1,29 +1,29 @@ PORTNAME= eggdrop -DISTVERSION= 1.9.3 -PORTREVISION= 1 +DISTVERSION= 1.10.0 CATEGORIES= irc MASTER_SITES= https://github.com/eggheads/${PORTNAME}/releases/download/v${DISTVERSION}/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= cpetrik@proton.me COMMENT= Popular Internet Relay Chat (IRC) bot WWW= https://www.eggheads.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -USES= tcl ssl +USES= compiler:c11 cpe ssl tcl GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \ - --with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h \ - --with-sslinc=${OPENSSLINC} \ - --with-ssllib=${OPENSSLLIB} +CONFIGURE_ARGS= --with-sslinc=${OPENSSLINC} \ + --with-ssllib=${OPENSSLLIB} \ + --with-tclinc=${TCL_INCLUDEDIR}/tcl.h \ + --with-tcllib=${TCL_LIBDIR}/libtcl${TCL_SHLIB_VER}.so SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS post-patch: + @${REINPLACE_CMD} -e 's|tcl.h|tcl${TCL_VER}/tcl.h|g' ${WRKSRC}/src/mod/python.mod/pycmds.c @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \ > ${WRKSRC}/eggdrop.conf.sample @@ -35,9 +35,9 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${STAGEDIR}${PREFIX}/share/man/man1 ${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.sample ${STAGEDIR}${PREFIX}/etc @${MKDIR} ${STAGEDIR}${PREFIX}/lib/eggdrop -.for f in assoc.so blowfish.so channels.so compress.so console.so ctcp.so \ - dns.so filesys.so irc.so notes.so seen.so server.so share.so \ - transfer.so uptime.so +.for f in assoc.so blowfish.so channels.so compress.so console.so ctcp.so dns.so \ + filesys.so irc.so notes.so seen.so server.so share.so transfer.so \ + uptime.so ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib/eggdrop .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/help @@ -53,11 +53,11 @@ do-install: .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/help/set .for f in channels.mod/help/set/channels.help \ - compress.mod/help/set/compress.help \ - console.mod/help/set/console.help ctcp.mod/help/set/ctcp.help \ - filesys.mod/help/set/filesys.help irc.mod/help/set/irc.help \ - notes.mod/help/set/notes.help server.mod/help/set/server.help \ - share.mod/help/set/share.help transfer.mod/help/set/transfer.help + compress.mod/help/set/compress.help console.mod/help/set/console.help \ + ctcp.mod/help/set/ctcp.help filesys.mod/help/set/filesys.help \ + irc.mod/help/set/irc.help notes.mod/help/set/notes.help \ + server.mod/help/set/server.help share.mod/help/set/share.help \ + transfer.mod/help/set/transfer.help ${INSTALL_DATA} ${WRKSRC}/src/mod/$f ${STAGEDIR}${DATADIR}/help/set .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/help/msg @@ -71,8 +71,8 @@ do-install: && ${FIND} . -name "*.lang" -exec ${INSTALL_DATA} {} \ ${STAGEDIR}${DATADIR}/language ";" @${MKDIR} ${STAGEDIR}${DATADIR}/scripts -.for f in CONTENTS action.fix.tcl autobotchk alltools.tcl botchk \ - cmd_resolve.tcl compat.tcl dccwhois.tcl getops.tcl klined.tcl notes2.tcl ques5.tcl \ +.for f in CONTENTS action.fix.tcl autobotchk alltools.tcl botchk cmd_resolve.tcl \ + compat.tcl dccwhois.tcl getops.tcl klined.tcl notes2.tcl ques5.tcl \ quotepong.tcl sentinel.tcl userinfo.tcl weed ${INSTALL_DATA} ${WRKSRC}/scripts/${f} ${STAGEDIR}${DATADIR}/scripts .endfor @@ -97,10 +97,10 @@ do-install: do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for f in ABOUT BANS BOTNET BUG-REPORT COMPILE-GUIDE CONTENTS \ - FIRST-SCRIPT MODULES PARTYLINE PATCH-HOWTO \ - TRICKS Changes1.6 USERS \ - tcl-commands.doc +.for f in ABOUT ACCOUNTS AUTOSCRIPTS BANS BOTNET BUG-REPORT COMPILE-GUIDE \ + CONTENTS FIRST-SCRIPT IPV6 IRCv3 LEGAL modules/MODULES PARTYLINE \ + PATCH-HOWTO PBKDF2 TLS TRICKS TWITCH Changes1.9 USERS tcl-commands.doc \ + twitch-tcl-commands.doc ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR}/html diff --git a/irc/eggdrop/distinfo b/irc/eggdrop/distinfo index 8a3603b08200..bf8ccf6a5af9 100644 --- a/irc/eggdrop/distinfo +++ b/irc/eggdrop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661601129 -SHA256 (eggdrop-1.9.3.tar.gz) = 658542e8cba4705aeb096b08d8a42d1a994a808c204a4d7050c8a37bd24bc79f -SIZE (eggdrop-1.9.3.tar.gz) = 2046726 +TIMESTAMP = 1734666962 +SHA256 (eggdrop-1.10.0.tar.gz) = 1f1707eb5023df8e0bcaa53c937e7ce5282fa1f85dc37e11d6ce4aa9d438d752 +SIZE (eggdrop-1.10.0.tar.gz) = 2215632 diff --git a/irc/eggdrop/files/patch-eggdrop.conf b/irc/eggdrop/files/patch-eggdrop.conf index a8c1635b29dc..b2e3a00a6837 100644 --- a/irc/eggdrop/files/patch-eggdrop.conf +++ b/irc/eggdrop/files/patch-eggdrop.conf @@ -1,29 +1,28 @@ ---- eggdrop.conf.orig 2018-12-27 18:51:16 UTC -+++ eggdrop.conf +--- eggdrop.conf.bak 2024-12-19 22:03:18.314826000 -0600 ++++ eggdrop.conf 2024-12-19 22:11:55.124362000 -0600 @@ -1,4 +1,4 @@ -#! /path/to/executable/eggdrop +#!%%PREFIX%%/bin/eggdrop # ^- This should contain a fully qualified path to your Eggdrop executable. # # This is a sample Eggdrop configuration file which includes all possible -@@ -604,7 +604,7 @@ die "Please make sure you edit your config file comple - # If you run the bot from the compilation directory, you will want to set - # this to "". If you use 'make install' (like all good kiddies do ;), this - # is a fine default. Otherwise, use your head :) +@@ -607,7 +607,7 @@ + # This path specifies the path were Eggdrop should look for its modules. + # If you use 'make install' (like all good kiddies do ;), this is a fine + # default. Otherwise, use your head :) -set mod-path "modules/" -+set mod-path "%%PREFIX%%/lib/eggdrop/" ++set mod-path "%%PREFIX%%/lib/modules/" - #### BLOWFISH MODULE #### -@@ -1047,6 +1047,11 @@ set servers { - [2001:db8:618:5c0:263::]:6669:password - ssl.example.net:+6697 - } -+ + #### PBKDF2 MODULE #### +@@ -1082,6 +1082,10 @@ + server add 2001:db8:618:5c0:263:: 6669 password + server add ssl.example.net +7000 + +# Set this option, if you want a SSL connection to the IRC Server(s) specified +# above. This setting applies to all servers, so make sure they all support SSL +# connections. Eggdrop has to be compiled with SSL support for this to work! +set use-ssl 0 - - # Number of seconds to wait between transmitting queued lines to the server. - # Lower this value at your own risk. ircd is known to start flood control + #### CAP Features #### + # This section controls IRCv3 capabilities supported natively by Eggdrop. You + # can enable individual settings here to be requested as part of the diff --git a/irc/eggdrop/pkg-plist b/irc/eggdrop/pkg-plist index 336985511232..923ae93ee118 100644 --- a/irc/eggdrop/pkg-plist +++ b/irc/eggdrop/pkg-plist @@ -17,18 +17,27 @@ lib/eggdrop/transfer.so lib/eggdrop/uptime.so share/man/man1/eggdrop.1.gz %%PORTDOCS%%%%DOCSDIR%%/ABOUT +%%PORTDOCS%%%%DOCSDIR%%/ACCOUNTS +%%PORTDOCS%%%%DOCSDIR%%/AUTOSCRIPTS %%PORTDOCS%%%%DOCSDIR%%/BANS %%PORTDOCS%%%%DOCSDIR%%/BOTNET %%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT %%PORTDOCS%%%%DOCSDIR%%/COMPILE-GUIDE %%PORTDOCS%%%%DOCSDIR%%/CONTENTS -%%PORTDOCS%%%%DOCSDIR%%/Changes1.6 +%%PORTDOCS%%%%DOCSDIR%%/Changes1.9 %%PORTDOCS%%%%DOCSDIR%%/FIRST-SCRIPT %%PORTDOCS%%%%DOCSDIR%%/MODULES %%PORTDOCS%%%%DOCSDIR%%/PARTYLINE %%PORTDOCS%%%%DOCSDIR%%/PATCH-HOWTO %%PORTDOCS%%%%DOCSDIR%%/TRICKS %%PORTDOCS%%%%DOCSDIR%%/USERS +%%PORTDOCS%%%%DOCSDIR%%/IPV6 +%%PORTDOCS%%%%DOCSDIR%%/IRCv3 +%%PORTDOCS%%%%DOCSDIR%%/LEGAL +%%PORTDOCS%%%%DOCSDIR%%/PBKDF2 +%%PORTDOCS%%%%DOCSDIR%%/TLS +%%PORTDOCS%%%%DOCSDIR%%/TWITCH +%%PORTDOCS%%%%DOCSDIR%%/twitch-tcl-commands.doc %%PORTDOCS%%%%DOCSDIR%%/html/index.html %%PORTDOCS%%%%DOCSDIR%%/html/search.html %%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS