From owner-svn-ports-head@freebsd.org Sun Nov 24 18:57:23 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05B1E1B79A9; Sun, 24 Nov 2019 18:57:23 +0000 (UTC) (envelope-from dbaio@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47LfYG6MxDz4LL0; Sun, 24 Nov 2019 18:57:22 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A48CF83D; Sun, 24 Nov 2019 18:57:22 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAOIvM4B079824; Sun, 24 Nov 2019 18:57:22 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAOIvLhQ079819; Sun, 24 Nov 2019 18:57:21 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201911241857.xAOIvLhQ079819@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 24 Nov 2019 18:57:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518350 - in head: . irc/eggdrop irc/eggdrop/files X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: in head: . irc/eggdrop irc/eggdrop/files X-SVN-Commit-Revision: 518350 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Nov 2019 18:57:23 -0000 Author: dbaio Date: Sun Nov 24 18:57:21 2019 New Revision: 518350 URL: https://svnweb.freebsd.org/changeset/ports/518350 Log: irc/eggdrop: Update to 1.8.4 Changelog: https://raw.githubusercontent.com/eggheads/eggdrop/v1.8.4/NEWS Deleted: head/irc/eggdrop/files/patch-src__Makefile.in head/irc/eggdrop/files/patch-src_eggdrop.h head/irc/eggdrop/files/patch-src_main.c head/irc/eggdrop/files/patch-src_match.c head/irc/eggdrop/files/patch-src_mod_share.mod__share.c head/irc/eggdrop/files/patch-src_modules.c head/irc/eggdrop/files/patch-src_net.c head/irc/eggdrop/files/patch-src_proto.h head/irc/eggdrop/files/patch-src_tclhash.c head/irc/eggdrop/files/patch-src_tclhash.h Modified: head/UPDATING head/irc/eggdrop/Makefile head/irc/eggdrop/distinfo head/irc/eggdrop/files/patch-eggdrop.conf head/irc/eggdrop/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Nov 24 18:56:27 2019 (r518349) +++ head/UPDATING Sun Nov 24 18:57:21 2019 (r518350) @@ -5,6 +5,24 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20191124: + AFFECTS: users of irc/eggdrop + AUTHOR: dbaio@FreeBSD.org + + The irc/eggdrop port has been updated to 1.8.4 and its config is not + backward compatible with 1.6.21. A new port was created to keep 1.6.21 + version available at irc/eggdrop16 and it will be available for 3 months + until users have time to upgrade their configuration. + + More information at: + https://raw.githubusercontent.com/eggheads/eggdrop/v1.8.4/NEWS + + If you would like to keep using 1.6.21, please run the following command + to update pkg database: + + pkg set -n eggdrop:eggdrop16 + pkg set -o irc/eggdrop:irc/eggdrop16 + 20191108: AFFECTS: users of databases/redis[-devel] AUTHOR: osa@FreeBSD.org Modified: head/irc/eggdrop/Makefile ============================================================================== --- head/irc/eggdrop/Makefile Sun Nov 24 18:56:27 2019 (r518349) +++ head/irc/eggdrop/Makefile Sun Nov 24 18:57:21 2019 (r518350) @@ -2,38 +2,40 @@ # $FreeBSD$ PORTNAME= eggdrop -PORTVERSION= 1.6.21 -PORTREVISION= 1 +PORTVERSION= 1.8.4 +DISTVERSIONPREFIX= v CATEGORIES= irc -MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/ -DISTNAME= ${PORTNAME}${PORTVERSION} -DISTFILES= ${PORTNAME}${PORTVERSION}.tar.bz2 MAINTAINER= dbaio@FreeBSD.org -COMMENT= The most popular open source Internet Relay Chat bot +COMMENT= Eggdrop is the most popular Internet Relay Chat (IRC) bot LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING -OPTIONS_DEFINE= DOCS +USES= tcl ssl -USES= tcl +USE_GITHUB= yes +GH_ACCOUNT= eggheads + GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \ --with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h + MAKE_JOBS_UNSAFE= yes LLD_UNSAFE= yes SUB_FILES= pkg-message -PORTDOCS= * +CONFLICTS= eggdrop-devel eggdrop16 + +OPTIONS_DEFINE= DOCS + post-patch: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \ > ${WRKSRC}/eggdrop.conf.sample post-configure: @(cd ${WRKSRC}; ${MAKE} config) -# Workaround broken relative path in SSL-patch -# @(cd ${WRKSRC}/src && ${LN} -fs ../config.h) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${STAGEDIR}${PREFIX}/bin @@ -42,7 +44,7 @@ do-install: @${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 wire.so + transfer.so uptime.so ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/lib/eggdrop .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/help @@ -52,8 +54,8 @@ do-install: filesys.mod/help/filesys.help irc.mod/help/irc.help \ notes.mod/help/notes.help seen.mod/help/seen.help \ server.mod/help/server.help share.mod/help/share.help \ - transfer.mod/help/transfer.help uptime.mod/help/uptime.help \ - wire.mod/help/wire.help + transfer.mod/help/transfer.help uptime.mod/help/uptime.help + ${INSTALL_DATA} ${WRKSRC}/src/mod/${f} ${STAGEDIR}${DATADIR}/help .endfor @${MKDIR} ${STAGEDIR}${DATADIR}/help/set Modified: head/irc/eggdrop/distinfo ============================================================================== --- head/irc/eggdrop/distinfo Sun Nov 24 18:56:27 2019 (r518349) +++ head/irc/eggdrop/distinfo Sun Nov 24 18:57:21 2019 (r518350) @@ -1,2 +1,3 @@ -SHA256 (eggdrop1.6.21.tar.bz2) = 75bd5573a609eac3940c0b6ca8251c3f38ea5d54b520e1cad93c650b4bc21754 -SIZE (eggdrop1.6.21.tar.bz2) = 999211 +TIMESTAMP = 1574378274 +SHA256 (eggheads-eggdrop-v1.8.4_GH0.tar.gz) = 960c7813ccd70e14ac145941f253c8ab394e8876b0ff0cff8327438533419fdf +SIZE (eggheads-eggdrop-v1.8.4_GH0.tar.gz) = 1766635 Modified: head/irc/eggdrop/files/patch-eggdrop.conf ============================================================================== --- head/irc/eggdrop/files/patch-eggdrop.conf Sun Nov 24 18:56:27 2019 (r518349) +++ head/irc/eggdrop/files/patch-eggdrop.conf Sun Nov 24 18:57:21 2019 (r518350) @@ -1,12 +1,12 @@ ---- eggdrop.conf 2010-07-05 14:07:05.000000000 +0200 -+++ eggdrop.conf 2011-01-07 06:13:49.000000000 +0100 +--- eggdrop.conf.orig 2018-12-27 18:51:16 UTC ++++ eggdrop.conf @@ -1,4 +1,4 @@ -#! /path/to/executable/eggdrop +#!%%PREFIX%%/bin/eggdrop # ^- This should contain a fully qualified path to your Eggdrop executable. # - # $Id: eggdrop.conf,v 1.66 2010/07/05 12:07:05 pseudo Exp $ -@@ -444,7 +444,7 @@ + # 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 :) @@ -15,15 +15,15 @@ #### BLOWFISH MODULE #### -@@ -842,6 +842,11 @@ - another.example.com:7000:password +@@ -1047,6 +1047,11 @@ set servers { + [2001:db8:618:5c0:263::]:6669:password + ssl.example.net:+6697 } - ++ +# 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 - # at 512 bytes/2 seconds. Modified: head/irc/eggdrop/pkg-plist ============================================================================== --- head/irc/eggdrop/pkg-plist Sun Nov 24 18:56:27 2019 (r518349) +++ head/irc/eggdrop/pkg-plist Sun Nov 24 18:57:21 2019 (r518350) @@ -1,6 +1,5 @@ bin/eggdrop etc/eggdrop.conf.sample -man/man1/eggdrop.1.gz lib/eggdrop/assoc.so lib/eggdrop/blowfish.so lib/eggdrop/channels.so @@ -16,7 +15,44 @@ lib/eggdrop/server.so lib/eggdrop/share.so lib/eggdrop/transfer.so lib/eggdrop/uptime.so -lib/eggdrop/wire.so +man/man1/eggdrop.1.gz +%%PORTDOCS%%%%DOCSDIR%%/ABOUT +%%PORTDOCS%%%%DOCSDIR%%/BANS +%%PORTDOCS%%%%DOCSDIR%%/BOTNET +%%PORTDOCS%%%%DOCSDIR%%/BUG-REPORT +%%PORTDOCS%%%%DOCSDIR%%/COMPILE-GUIDE +%%PORTDOCS%%%%DOCSDIR%%/CONTENTS +%%PORTDOCS%%%%DOCSDIR%%/Changes1.6 +%%PORTDOCS%%%%DOCSDIR%%/FIRST-SCRIPT +%%PORTDOCS%%%%DOCSDIR%%/KNOWN-PROBLEMS +%%PORTDOCS%%%%DOCSDIR%%/MODULES +%%PORTDOCS%%%%DOCSDIR%%/PARTYLINE +%%PORTDOCS%%%%DOCSDIR%%/PATCH-HOWTO +%%PORTDOCS%%%%DOCSDIR%%/TEXT-SUBSTITUTIONS +%%PORTDOCS%%%%DOCSDIR%%/TRICKS +%%PORTDOCS%%%%DOCSDIR%%/USERS +%%PORTDOCS%%%%DOCSDIR%%/WEIRD-MESSAGES +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%%%DOCSDIR%%/html/search.html +%%PORTDOCS%%%%DOCSDIR%%/settings/CONTENTS +%%PORTDOCS%%%%DOCSDIR%%/settings/core.settings +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.assoc +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.blowfish +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.channels +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.compress +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.console +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.ctcp +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.dns +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.filesys +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.irc +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.notes +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.seen +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.server +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.share +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.transfer +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.uptime +%%PORTDOCS%%%%DOCSDIR%%/settings/mod.woobie +%%PORTDOCS%%%%DOCSDIR%%/tcl-commands.doc %%DATADIR%%/help/assoc.help %%DATADIR%%/help/chaninfo.help %%DATADIR%%/help/channels.help @@ -48,22 +84,24 @@ lib/eggdrop/wire.so %%DATADIR%%/help/share.help %%DATADIR%%/help/transfer.help %%DATADIR%%/help/uptime.help -%%DATADIR%%/help/wire.help %%DATADIR%%/language/assoc.danish.lang %%DATADIR%%/language/assoc.english.lang %%DATADIR%%/language/assoc.finnish.lang %%DATADIR%%/language/assoc.french.lang %%DATADIR%%/language/assoc.german.lang +%%DATADIR%%/language/assoc.portuguese.lang %%DATADIR%%/language/console.danish.lang %%DATADIR%%/language/console.english.lang %%DATADIR%%/language/console.finnish.lang %%DATADIR%%/language/console.french.lang %%DATADIR%%/language/console.german.lang +%%DATADIR%%/language/console.portuguese.lang %%DATADIR%%/language/core.danish.lang %%DATADIR%%/language/core.english.lang %%DATADIR%%/language/core.finnish.lang %%DATADIR%%/language/core.french.lang %%DATADIR%%/language/core.german.lang +%%DATADIR%%/language/core.portuguese.lang %%DATADIR%%/language/filesys.danish.lang %%DATADIR%%/language/filesys.english.lang %%DATADIR%%/language/filesys.finnish.lang @@ -74,16 +112,13 @@ lib/eggdrop/wire.so %%DATADIR%%/language/notes.finnish.lang %%DATADIR%%/language/notes.french.lang %%DATADIR%%/language/notes.german.lang +%%DATADIR%%/language/notes.portuguese.lang %%DATADIR%%/language/transfer.danish.lang %%DATADIR%%/language/transfer.english.lang %%DATADIR%%/language/transfer.finnish.lang %%DATADIR%%/language/transfer.french.lang %%DATADIR%%/language/transfer.german.lang -%%DATADIR%%/language/wire.danish.lang -%%DATADIR%%/language/wire.english.lang -%%DATADIR%%/language/wire.finnish.lang -%%DATADIR%%/language/wire.french.lang -%%DATADIR%%/language/wire.german.lang +%%DATADIR%%/language/transfer.portuguese.lang %%DATADIR%%/scripts/CONTENTS %%DATADIR%%/scripts/action.fix.tcl %%DATADIR%%/scripts/alltools.tcl