Date: Fri, 31 May 2013 09:48:33 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319475 - in head/irc/bitchx: . files Message-ID: <201305310948.r4V9mXxJ023358@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Fri May 31 09:48:32 2013 New Revision: 319475 URL: http://svnweb.freebsd.org/changeset/ports/319475 Log: Update to 1.2 The release is finally here! Add vulnerabilities to vuxml, and remove bitchx-devel Approved by: Dan Mashal <dan.mashal@gmail.com> (maintainer) Security: CVE-2007-4584 Security: CVE-2007-5839 Security: CVE-2007-5922 Deleted: head/irc/bitchx/files/patch-amd64_fix head/irc/bitchx/files/patch-ap head/irc/bitchx/files/patch-configure head/irc/bitchx/files/patch-source_gcc_fix head/irc/bitchx/files/patch-source_server_c Modified: head/irc/bitchx/Makefile head/irc/bitchx/distinfo head/irc/bitchx/files/patch-aq head/irc/bitchx/pkg-plist Modified: head/irc/bitchx/Makefile ============================================================================== --- head/irc/bitchx/Makefile Fri May 31 09:41:35 2013 (r319474) +++ head/irc/bitchx/Makefile Fri May 31 09:48:32 2013 (r319475) @@ -2,30 +2,29 @@ # $FreeBSD$ PORTNAME= BitchX -PORTVERSION= 1.1.0.1 -PORTREVISION= 4 +DISTVERSION= 1.2-final PORTEPOCH= 1 CATEGORIES+= irc -MASTER_SITES= SF/bitchx/ircii-pana/ircii-pana-1.1 -DISTNAME= ircii-pana-1.1-final +MASTER_SITES= http://bitchx.ca/ MAINTAINER?= dan.mashal@gmail.com COMMENT?= Feature-rich scriptable IRC client -WRKSRC= ${WRKDIR}/BitchX +WRKSRC= ${WRKDIR}/${DISTNAME:C,-final$,,} USE_PERL5= yes GNU_CONFIGURE= yes WANT_GNOME= yes USE_GMAKE= yes -DOCSDIR= ${PREFIX}/share/bx/help -PORTDOCS= * CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \ --bindir="${PREFIX}/bin" \ --datadir="${PREFIX}/share" \ --libdir="${PREFIX}/share" CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" -CPPFLAGS+= -I${LOCALBASE}/include +PLIST_SUB+= DISTVERSION=${DISTVERSION} +DOCSDIR= ${PREFIX}/share/bx/help +PORTDOCS= * +DATADIR= ${PREFIX}/share/bx MAN1= BitchX.1 OPTIONS_DEFINE= ESOUND GNOME IPV6 LATIN PLUGINS SSL XMMS @@ -37,11 +36,7 @@ XMMS_DESC= Build XMMS plugin OPTIONS_DEFAULT= IPV6 PLUGINS SSL -.include <bsd.port.pre.mk> - -.if ${ARCH} == "amd64" || ${ARCH} == "ia64" -CFLAGS+= -fPIC -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 @@ -66,8 +61,8 @@ PLIST_SUB+= GNOME="@comment " NOGNOME="" .endif .if ${PORT_OPTIONS:MPLUGINS} -PLUGINS= abot acro arcfour autocycle blowfish cdrom encrypt scan \ - europa fserv hint nicklist pkga possum qbx qmail wavplay +PLUGINS= abot acro aim arcfour autocycle blowfish cavlink cdrom encrypt \ + europa fserv hint nap nicklist pkga possum qbx qmail wavplay PLIST_SUB+= PLUGINS="" .else PLIST_SUB+= PLUGINS="@comment " @@ -96,9 +91,9 @@ post-patch: post-install: .if ${PORT_OPTIONS:MGNOME} - ${STRIP_CMD} ${PREFIX}/bin/gtkBitchX-1.1-final + ${STRIP_CMD} ${PREFIX}/bin/gtkBitchX .else - ${STRIP_CMD} ${PREFIX}/bin/BitchX-1.1-final + ${STRIP_CMD} ${PREFIX}/bin/BitchX ${STRIP_CMD} ${PREFIX}/bin/scr-bx .endif .if ${PORT_OPTIONS:MDOCS} @@ -106,12 +101,8 @@ post-install: cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${DOCSDIR} .endif +# Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff) add-plist-post: - @${ECHO_CMD} "@dirrm share/bx" >> ${TMPPLIST} -.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") - @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} -.else - @${DO_NADA} -.endif + @${ECHO_CMD} "@dirrm ${DATADIR_REL}" >> ${TMPPLIST} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/irc/bitchx/distinfo ============================================================================== --- head/irc/bitchx/distinfo Fri May 31 09:41:35 2013 (r319474) +++ head/irc/bitchx/distinfo Fri May 31 09:48:32 2013 (r319475) @@ -1,2 +1,2 @@ -SHA256 (ircii-pana-1.1-final.tar.gz) = 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57 -SIZE (ircii-pana-1.1-final.tar.gz) = 2532476 +SHA256 (BitchX-1.2-final.tar.gz) = 7058d4be640c881fe91cbda6701b271c47846e0d3d7a13b52a3a36948094ec36 +SIZE (BitchX-1.2-final.tar.gz) = 2609717 Modified: head/irc/bitchx/files/patch-aq ============================================================================== --- head/irc/bitchx/files/patch-aq Fri May 31 09:41:35 2013 (r319474) +++ head/irc/bitchx/files/patch-aq Fri May 31 09:48:32 2013 (r319475) @@ -9,15 +9,6 @@ /* if you use cidentd the filename is called .authlie instead of .noident. * as well some modifications to the format of the file were made. So we -@@ -449,7 +449,7 @@ - #define DEFAULT_FTP_GRAB OFF - #define DEFAULT_HTTP_GRAB OFF - #define DEFAULT_HELP_WINDOW OFF --#define DEFAULT_NICK_COMPLETION ON -+#define DEFAULT_NICK_COMPLETION OFF - #define DEFAULT_NICK_COMPLETION_LEN 2 - #define DEFAULT_NICK_COMPLETION_TYPE 0 /* 0 1 2 */ - #define DEFAULT_NOTIFY ON @@ -480,9 +480,9 @@ #define DEFAULT_AINV 0 #define DEFAULT_ANNOY_KICK OFF Modified: head/irc/bitchx/pkg-plist ============================================================================== --- head/irc/bitchx/pkg-plist Fri May 31 09:41:35 2013 (r319474) +++ head/irc/bitchx/pkg-plist Fri May 31 09:48:32 2013 (r319475) @@ -1,82 +1,84 @@ -@unexec if [ -f %D/share/bx/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi +@unexec if [ -f %D/%%DATADIR%%/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi %%NOGNOME%%bin/BitchX -%%NOGNOME%%bin/BitchX-1.1-final +%%NOGNOME%%bin/BitchX-%%DISTVERSION%% %%GNOME%%bin/gtkBitchX -%%GNOME%%bin/gtkBitchX-1.1-final +%%GNOME%%bin/gtkBitchX-%%DISTVERSION%% %%NOGNOME%%bin/scr-bx -share/bx/BitchX.help -share/bx/BitchX.ircnames -share/bx/BitchX.quit -share/bx/BitchX.kick -%%PLUGINS%%share/bx/plugins/BitchX.hints -%%PLUGINS%%share/bx/plugins/acro.so -%%PLUGINS%%share/bx/plugins/autobot.so -%%PLUGINS%%share/bx/plugins/blowfish.so -%%PLUGINS%%share/bx/plugins/encrypt.so -%%PLUGINS%%share/bx/plugins/fserv.so -%%PLUGINS%%share/bx/plugins/hint.so -%%PLUGINS%%share/bx/plugins/pkga.so -%%PLUGINS%%share/bx/plugins/possum.so -%%PLUGINS%%share/bx/plugins/qmail.so -%%PLUGINS%%share/bx/plugins/scan.so -%%PLUGINS%%share/bx/plugins/wavplay.so -%%PLUGINS%%share/bx/plugins/qbx.so -%%PLUGINS%%share/bx/plugins/arcfour.so -%%PLUGINS%%share/bx/plugins/autocycle.so -%%PLUGINS%%share/bx/plugins/cdrom.so -%%PLUGINS%%share/bx/plugins/nicklist.so -%%XMMS%%share/bx/plugins/xmms.so -share/bx/script/SCRIPTS -share/bx/script/actplug.gmz -share/bx/script/bxglobal -share/bx/script/bxtcl.tcl -share/bx/script/cyp1.0k.tar.gz -share/bx/script/dcc_fserve-0.50.tgz -share/bx/script/example-.bitchxrc -share/bx/script/file.tcl -share/bx/script/fserve+vfs.tar.gz -share/bx/script/logger.bx -share/bx/script/menu.bx -share/bx/script/operchallenge-1.3.tar -share/bx/script/query.bx -share/bx/script/auto_resume -share/bx/script/fserve.irc -share/bx/script/query -share/bx/translation/ASCII -share/bx/translation/CP437 -share/bx/translation/CP850 -share/bx/translation/DANISH -share/bx/translation/DEC_MCS -share/bx/translation/DG_MCS -share/bx/translation/DUTCH -share/bx/translation/FINNISH -share/bx/translation/FRENCH -share/bx/translation/FRENCH_CANADIAN -share/bx/translation/GERMAN -share/bx/translation/HP_MCS -share/bx/translation/IRV -share/bx/translation/ITALIAN -share/bx/translation/JIS -share/bx/translation/MACINTOSH -share/bx/translation/NEXT -share/bx/translation/NORWEGIAN_1 -share/bx/translation/NORWEGIAN_2 -share/bx/translation/POLISH -share/bx/translation/POLISH_NOPL -share/bx/translation/PORTUGUESE -share/bx/translation/PORTUGUESE_COM -share/bx/translation/RUSSIAN -share/bx/translation/RUSSIAN_ALT -share/bx/translation/RUSSIAN_WIN -share/bx/translation/SPANISH -share/bx/translation/SWEDISH -share/bx/translation/SWEDISH_NAMES -share/bx/translation/SWEDISH_NAMES_COM -share/bx/translation/SWISS -share/bx/translation/UNITED_KINGDOM -share/bx/translation/UNITED_KINGDOM_COM -%%NOGNOME%%share/bx/wserv -@dirrm share/bx/translation -@dirrm share/bx/script -@dirrm share/bx/plugins -@dirrm share/bx +%%DATADIR%%/BitchX.help +%%DATADIR%%/BitchX.ircnames +%%DATADIR%%/BitchX.quit +%%DATADIR%%/BitchX.kick +%%PLUGINS%%%%DATADIR%%/plugins/BitchX.hints +%%PLUGINS%%%%DATADIR%%/plugins/acro.so +%%PLUGINS%%%%DATADIR%%/plugins/aim.so +%%PLUGINS%%%%DATADIR%%/plugins/autobot.so +%%PLUGINS%%%%DATADIR%%/plugins/blowfish.so +%%PLUGINS%%%%DATADIR%%/plugins/cavlink.so +%%PLUGINS%%%%DATADIR%%/plugins/encrypt.so +%%PLUGINS%%%%DATADIR%%/plugins/fserv.so +%%PLUGINS%%%%DATADIR%%/plugins/hint.so +%%PLUGINS%%%%DATADIR%%/plugins/nap.so +%%PLUGINS%%%%DATADIR%%/plugins/pkga.so +%%PLUGINS%%%%DATADIR%%/plugins/possum.so +%%PLUGINS%%%%DATADIR%%/plugins/qmail.so +%%PLUGINS%%%%DATADIR%%/plugins/wavplay.so +%%PLUGINS%%%%DATADIR%%/plugins/qbx.so +%%PLUGINS%%%%DATADIR%%/plugins/arcfour.so +%%PLUGINS%%%%DATADIR%%/plugins/autocycle.so +%%PLUGINS%%%%DATADIR%%/plugins/cdrom.so +%%PLUGINS%%%%DATADIR%%/plugins/nicklist.so +%%XMMS%%%%DATADIR%%/plugins/xmms.so +%%DATADIR%%/script/SCRIPTS +%%DATADIR%%/script/actplug.gmz +%%DATADIR%%/script/bxglobal +%%DATADIR%%/script/bxtcl.tcl +%%DATADIR%%/script/cyp1.0k.tar.gz +%%DATADIR%%/script/dcc_fserve-0.50.tgz +%%DATADIR%%/script/example-.bitchxrc +%%DATADIR%%/script/file.tcl +%%DATADIR%%/script/fserve+vfs.tar.gz +%%DATADIR%%/script/logger.bx +%%DATADIR%%/script/menu.bx +%%DATADIR%%/script/operchallenge-1.3.tar +%%DATADIR%%/script/query.bx +%%DATADIR%%/script/auto_resume +%%DATADIR%%/script/fserve.irc +%%DATADIR%%/script/query +%%DATADIR%%/translation/ASCII +%%DATADIR%%/translation/CP437 +%%DATADIR%%/translation/CP850 +%%DATADIR%%/translation/DANISH +%%DATADIR%%/translation/DEC_MCS +%%DATADIR%%/translation/DG_MCS +%%DATADIR%%/translation/DUTCH +%%DATADIR%%/translation/FINNISH +%%DATADIR%%/translation/FRENCH +%%DATADIR%%/translation/FRENCH_CANADIAN +%%DATADIR%%/translation/GERMAN +%%DATADIR%%/translation/HP_MCS +%%DATADIR%%/translation/IRV +%%DATADIR%%/translation/ITALIAN +%%DATADIR%%/translation/JIS +%%DATADIR%%/translation/MACINTOSH +%%DATADIR%%/translation/NEXT +%%DATADIR%%/translation/NORWEGIAN_1 +%%DATADIR%%/translation/NORWEGIAN_2 +%%DATADIR%%/translation/POLISH +%%DATADIR%%/translation/POLISH_NOPL +%%DATADIR%%/translation/PORTUGUESE +%%DATADIR%%/translation/PORTUGUESE_COM +%%DATADIR%%/translation/RUSSIAN +%%DATADIR%%/translation/RUSSIAN_ALT +%%DATADIR%%/translation/RUSSIAN_WIN +%%DATADIR%%/translation/SPANISH +%%DATADIR%%/translation/SWEDISH +%%DATADIR%%/translation/SWEDISH_NAMES +%%DATADIR%%/translation/SWEDISH_NAMES_COM +%%DATADIR%%/translation/SWISS +%%DATADIR%%/translation/UNITED_KINGDOM +%%DATADIR%%/translation/UNITED_KINGDOM_COM +%%NOGNOME%%%%DATADIR%%/wserv +@dirrm %%DATADIR%%/translation +@dirrm %%DATADIR%%/script +@dirrm %%DATADIR%%/plugins +@comment @dirrm %%DATADIR%% must be appended after PORTDOCS stuff, see Makefile
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305310948.r4V9mXxJ023358>