Date: Thu, 4 Mar 2004 16:57:03 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63767: [MAINTAINER] irc/eggdrop: Add SSL support Message-ID: <200403041557.i24Fv3Ep073774@roadrunner.q.local> Resent-Message-ID: <200403041600.i24G0aJ3003978@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63767 >Category: ports >Synopsis: [MAINTAINER] irc/eggdrop: Add SSL support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Mar 04 08:00:35 PST 2004 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 5.2.1-RC2 i386 >Organization: >Environment: System: FreeBSD roadrunner 5.2.1-RC2 FreeBSD 5.2.1-RC2 #7: Tue Feb 17 13:39:24 CET 2004 >Description: - Integrate SSL patch (disabled by default) - various cleanups - new file: files/patch-eggdrop.conf Generated with FreeBSD Port Tools 0.50 >How-To-Repeat: >Fix: --- eggdrop-1.6.15_4.patch begins here --- ? files/patch-eggdrop.conf Index: Makefile =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile 19 Feb 2004 09:00:55 -0000 1.7 +++ Makefile 4 Mar 2004 15:51:16 -0000 @@ -7,15 +7,19 @@ PORTNAME= eggdrop PORTVERSION= 1.6.15 -PORTREVISION= 3 -CATEGORIES= irc tcl84 +PORTREVISION= 4 +CATEGORIES= irc tcl84 ipv6 MASTER_SITES= ftp://ftp.eggheads.org/pub/eggdrop/source/1.6/ DISTNAME= ${PORTNAME:S/-//}${PORTVERSION} +PATCHFILES= eggdrop1.6.15-ssl.fixed.diff.gz +PATCH_SITES= http://www.egghelp.org/files/patches/ +PATCH_WRKSRC= ${WRKDIR} + MAINTAINER= q@uni.de COMMENT= The most popular open source Internet Relay Chat bot -.include <bsd.port.pre.mk> +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} .if !defined(WITHOUT_TCL) LIB_DEPENDS+= tcl84.1:${PORTSDIR}/lang/tcl84 @@ -23,6 +27,15 @@ --with-tclinc=${LOCALBASE}/include/tcl8.4/tcl.h .endif +.if defined(WITH_SSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+= --with-ssl +.else +CONFIGURE_ARGS+= --without-ssl +.endif + +.include <bsd.port.pre.mk> + .if ${OSVERSION} >= 400014 && defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 PLIST_SUB+= IPV6="@comment " @@ -31,7 +44,6 @@ .endif GNU_CONFIGURE= yes -USE_REINPLACE= yes INSTALLS_SHLIB= yes MAN1= eggdrop.1 @@ -40,19 +52,21 @@ .if ${OSVERSION} >= 400014 && !defined(WITH_IPV6) @${ECHO_MSG} 'Define WITH_IPV6 to enable IPv6 support' .endif - -post-patch: - @(cd ${WRKSRC} && ${REINPLACE_CMD} \ - -e 's,modules/,${PREFIX}/lib/eggdrop/,' \ - -e 's,#! /path/to/executable/,#!${PREFIX}/bin/,' eggdrop.conf) +.if !defined(WITH_SSL) + @${ECHO_MSG} 'Define WITH_SSL to enable SSL support' +.endif post-configure: - @(cd ${BUILD_WRKSRC}; ${MAKE} config) + @(cd ${WRKSRC}; ${MAKE} config) + @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${WRKSRC}/eggdrop.conf \ + > ${WRKSRC}/eggdrop.conf.sample + # Workaround broken relative path in SSL-patch + @(cd ${WRKSRC}/src && ${LN} -s ../config.h) do-install: @${INSTALL_PROGRAM} ${WRKSRC}/eggdrop ${PREFIX}/bin @${INSTALL_MAN} ${WRKSRC}/doc/man1/eggdrop.1 ${PREFIX}/man/man1 - @${INSTALL_DATA} ${WRKSRC}/eggdrop.conf ${PREFIX}/etc/eggdrop.conf.sample + @${INSTALL_DATA} ${WRKSRC}/eggdrop.conf.sample ${PREFIX}/etc @${MKDIR} ${DATADIR}/help/set ${DATADIR}/help/msg ${DATADIR}/scripts \ ${DATADIR}/language ${DATADIR}/text ${PREFIX}/lib/eggdrop @${INSTALL_DATA} ${WRKSRC}/language/core.*.lang ${DATADIR}/language @@ -101,6 +115,6 @@ .endif post-install: - @${SED} -e 's#$${PREFIX}#${PREFIX}#g' ${PKGMESSAGE} + @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${PKGMESSAGE} .include <bsd.port.post.mk> Index: distinfo =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/distinfo,v retrieving revision 1.2 diff -u -u -r1.2 distinfo --- distinfo 11 Jun 2003 05:44:24 -0000 1.2 +++ distinfo 4 Mar 2004 15:51:16 -0000 @@ -1 +1,4 @@ MD5 (eggdrop1.6.15.tar.gz) = f1f0c3e8b914d626c06a567560f737dd +SIZE (eggdrop1.6.15.tar.gz) = 961868 +MD5 (eggdrop1.6.15-ssl.fixed.diff.gz) = ac2a146dc1ec2c4e28bf8e77178fae74 +SIZE (eggdrop1.6.15-ssl.fixed.diff.gz) = 20318 Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/pkg-message,v retrieving revision 1.2 diff -u -u -r1.2 pkg-message --- pkg-message 18 Oct 2003 21:59:59 -0000 1.2 +++ pkg-message 4 Mar 2004 15:51:16 -0000 @@ -1,6 +1,10 @@ +======================================================================== + This Port of Eggdrop differs from a normal eggdrop installation, because it does respect hier(7). That means your eggdrop.conf goes to -${PREFIX}/etc/eggdrop.conf and .chan, .notes, .user files go to -${PREFIX}/share/eggdrop. Modules will go to ${PREFIX}/lib/eggdrop and -documentation can be found in ${PREFIX}/share/doc/eggdrop, scripts go -to ${PREFIX}/share/eggdrop/scripts. +%%PREFIX%%/etc/eggdrop.conf and .chan, .notes, .user files go to +%%PREFIX%%/share/eggdrop. Modules will go to %%PREFIX%%/lib/eggdrop and +documentation can be found in %%PREFIX%%/share/doc/eggdrop, scripts go +to %%PREFIX%%/share/eggdrop/scripts. + +======================================================================== Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/pkg-plist,v retrieving revision 1.3 diff -u -u -r1.3 pkg-plist --- pkg-plist 18 Oct 2003 21:59:59 -0000 1.3 +++ pkg-plist 4 Mar 2004 15:51:16 -0000 @@ -164,4 +164,4 @@ @dirrm %%DATADIR%%/language @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%%/text -@dirrm %%DATADIR%% +@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true Index: files/patch-ab =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ab,v retrieving revision 1.2 diff -u -u -r1.2 patch-ab --- files/patch-ab 11 Jun 2003 05:44:25 -0000 1.2 +++ files/patch-ab 4 Mar 2004 15:51:16 -0000 @@ -1,5 +1,5 @@ ---- src/main.c.orig Mon May 5 06:05:32 2003 -+++ src/main.c Mon Jun 2 11:16:57 2003 +--- eggdrop1.6.15/src/main.c.orig Mon May 5 06:05:32 2003 ++++ eggdrop1.6.15/src/main.c Mon Jun 2 11:16:57 2003 @@ -70,7 +70,7 @@ #define _POSIX_SOURCE 1 #endif @@ -14,7 +14,7 @@ int term_z = 0; /* Foreground: use the terminal as a party * line? */ -char configfile[121] = "eggdrop.conf"; /* Name of the config file */ -+char configfile[121] = __PREFIX__ "eggdrop.conf"; /* Name of the config file */ ++char configfile[121] = __PREFIX__ "/etc/eggdrop.conf"; /* Name of the config file */ char helpdir[121] = "help/"; /* Directory of help files (if used) */ char textdir[121] = "text/"; /* Directory for text files that get dumped */ int keep_all_logs = 0; /* Never erase logfiles, no matter how old Index: files/patch-ac =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ac,v retrieving revision 1.2 diff -u -u -r1.2 patch-ac --- files/patch-ac 11 Jun 2003 05:44:25 -0000 1.2 +++ files/patch-ac 4 Mar 2004 15:51:16 -0000 @@ -1,20 +1,20 @@ ---- src/Makefile.in.orig Mon Jun 2 11:23:55 2003 -+++ src/Makefile.in Mon Jun 2 11:24:24 2003 -@@ -16,7 +16,7 @@ - LD = @CC@ +--- eggdrop1.6.15/src/Makefile.in.orig Mon Feb 9 22:42:35 2004 ++++ eggdrop1.6.15/src/Makefile.in Mon Feb 9 22:43:23 2004 +@@ -17,7 +17,7 @@ STRIP = @STRIP@ - CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS) + #CFLAGS = @CFLAGS@ -I.. -I$(top_srcdir) @DEFS@ $(CFLGS) + CFLAGS = @CFLAGS@ -I$(XSSL_INCLUDE) -I.. -I$(top_srcdir) @DEFS@ $(CFLGS) -CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"' ++CPPFLAGS = @CPPFLAGS@ '-D__PREFIX__="@prefix@"' eggdrop_objs = bg.o botcmd.o botmsg.o botnet.o chanprog.o cmds.o dcc.o \ dccutil.o dns.o flags.o language.o match.o main.o mem.o misc.o misc_file.o \ -@@ -37,7 +37,7 @@ - @echo "Linking eggdrop... $(EGGBUILD)" +@@ -39,7 +39,7 @@ @echo "" @touch mod/mod.xlibs -- $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` -+ $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLDFLAGS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` + # $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` +- $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(XSSL_LIBS) $(MODOBJS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` ++ $(LD) -o ../$(EGGEXEC) $(eggdrop_objs) $(XSSL_LIBS) $(MODOBJS) $(XLDFLAGS) $(XLIBS) md5/md5c.o compat/*.o `cat mod/mod.xlibs` $(STRIP) ../$(EGGEXEC) @echo "Successful compile: $(EGGEXEC)" @echo "" Index: files/patch-ad =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ad,v retrieving revision 1.2 diff -u -u -r1.2 patch-ad --- files/patch-ad 11 Jun 2003 05:44:25 -0000 1.2 +++ files/patch-ad 4 Mar 2004 15:51:16 -0000 @@ -1,5 +1,5 @@ ---- src/mod/filesys.mod/filesys.c.orig Mon Jun 2 11:25:01 2003 -+++ src/mod/filesys.mod/filesys.c Mon Jun 2 11:25:46 2003 +--- eggdrop1.6.15/src/mod/filesys.mod/filesys.c.orig Mon Jun 2 11:25:01 2003 ++++ eggdrop1.6.15/src/mod/filesys.mod/filesys.c Mon Jun 2 11:25:46 2003 @@ -452,7 +452,7 @@ if (at_limit(nick)) { char xxx[1024]; Index: files/patch-ae =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ae,v retrieving revision 1.2 diff -u -u -r1.2 patch-ae --- files/patch-ae 11 Jun 2003 05:44:25 -0000 1.2 +++ files/patch-ae 4 Mar 2004 15:51:16 -0000 @@ -1,5 +1,5 @@ ---- src/mod/ctcp.mod/ctcp.c.orig Mon Jun 2 11:27:58 2003 -+++ src/mod/ctcp.mod/ctcp.c Mon Jun 2 11:29:29 2003 +--- eggdrop1.6.15/src/mod/ctcp.mod/ctcp.c.orig Mon Jun 2 11:27:58 2003 ++++ eggdrop1.6.15/src/mod/ctcp.mod/ctcp.c Mon Jun 2 11:29:29 2003 @@ -160,8 +160,8 @@ /* Do me a favour and don't change this back to a CTCP reply, * CTCP replies are NOTICE's this has to be a PRIVMSG Index: files/patch-ah =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ah,v retrieving revision 1.2 diff -u -u -r1.2 patch-ah --- files/patch-ah 11 Jun 2003 05:44:25 -0000 1.2 +++ files/patch-ah 4 Mar 2004 15:51:16 -0000 @@ -1,5 +1,5 @@ ---- src/modules.c.orig Mon Jun 2 11:31:15 2003 -+++ src/modules.c Mon Jun 2 11:31:44 2003 +--- eggdrop1.6.15/src/modules.c.orig Mon Jun 2 11:31:15 2003 ++++ eggdrop1.6.15/src/modules.c Mon Jun 2 11:31:44 2003 @@ -101,7 +101,7 @@ #ifndef STATIC Index: files/patch-ai =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ai,v retrieving revision 1.3 diff -u -u -r1.3 patch-ai --- files/patch-ai 18 Nov 2003 21:49:35 -0000 1.3 +++ files/patch-ai 4 Mar 2004 15:51:16 -0000 @@ -1,5 +1,5 @@ ---- src/mod/share.mod/share.c.orig Mon May 5 00:05:33 2003 -+++ src/mod/share.mod/share.c Tue Nov 18 16:51:41 2003 +--- eggdrop1.6.15/src/mod/share.mod/share.c.orig Mon May 5 00:05:33 2003 ++++ eggdrop1.6.15/src/mod/share.mod/share.c Tue Nov 18 16:51:41 2003 @@ -1113,7 +1113,7 @@ int i, sock; FILE *f; Index: files/patch-aj =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-aj,v retrieving revision 1.2 diff -u -u -r1.2 patch-aj --- files/patch-aj 11 Jun 2003 05:44:25 -0000 1.2 +++ files/patch-aj 4 Mar 2004 15:51:16 -0000 @@ -1,5 +1,5 @@ ---- src/mod/Makefile.in.orig Mon Jun 2 11:36:50 2003 -+++ src/mod/Makefile.in Mon Jun 2 11:39:02 2003 +--- eggdrop1.6.15/src/mod/Makefile.in.orig Mon Jun 2 11:36:50 2003 ++++ eggdrop1.6.15/src/mod/Makefile.in Mon Jun 2 11:39:02 2003 @@ -87,7 +87,7 @@ echo "Configuring module $${modname} ..."; \ echo ""; \ Index: files/patch-ak =================================================================== RCS file: /home/ncvs/ports/irc/eggdrop/files/patch-ak,v retrieving revision 1.2 diff -u -u -r1.2 patch-ak --- files/patch-ak 11 Jun 2003 05:44:25 -0000 1.2 +++ files/patch-ak 4 Mar 2004 15:51:16 -0000 @@ -1,5 +1,5 @@ ---- src/eggdrop.h.orig Mon Jun 2 11:39:45 2003 -+++ src/eggdrop.h Mon Jun 2 11:40:17 2003 +--- eggdrop1.6.15/src/eggdrop.h.orig Mon Jun 2 11:39:45 2003 ++++ eggdrop1.6.15/src/eggdrop.h Mon Jun 2 11:40:17 2003 @@ -85,7 +85,7 @@ --- /dev/null Thu Mar 4 16:51:17 2004 +++ files/patch-eggdrop.conf Wed Mar 3 21:43:38 2004 @@ -0,0 +1,29 @@ +--- eggdrop1.6.15/eggdrop.conf.orig Mon May 5 00:05:32 2003 ++++ eggdrop1.6.15/eggdrop.conf Wed Mar 3 21:17:14 2004 +@@ -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.26 2003/04/17 04:38:33 wcc Exp $ +@@ -422,7 +422,7 @@ + # 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 :) +-set mod-path "modules/" ++set mod-path "%%PREFIX%%/lib/eggdrop/" + + + #### DNS MODULE #### +@@ -814,6 +814,11 @@ + you.need.to.change.this:6667 + another.example.com: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 + + # This setting makes the bot try to get his original nickname back if its + # primary nickname is already in use. --- eggdrop-1.6.15_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403041557.i24Fv3Ep073774>