[Midnightbsd-cvs] mports: irc/bitchx: Update to 1.1.0.1.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Aug 30 12:10:18 EDT 2007
Log Message:
-----------
Update to 1.1.0.1. Several patches were integrated upstream.
What is unclear is if this patches the recent securina advisory. The exploit was from May and this update came out this month.
Modified Files:
--------------
mports/irc/bitchx:
Makefile (r1.3 -> r1.4)
distinfo (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
Removed Files:
-------------
mports/irc/bitchx/files:
patch-64bit
patch-source-ctcp.c
patch-source-timer.c
patch-source_term_c
-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/irc/bitchx/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lirc/bitchx/pkg-plist -Lirc/bitchx/pkg-plist -u -r1.1 -r1.2
--- irc/bitchx/pkg-plist
+++ irc/bitchx/pkg-plist
@@ -986,7 +986,6 @@
share/bx/translation/UNITED_KINGDOM
share/bx/translation/UNITED_KINGDOM_COM
%%NOGNOME:%%share/bx/wserv
-%%PORTDOCS%%@dirrm share/doc/bitchx
@dirrm share/bx/translation
@dirrm share/bx/script
@dirrm share/bx/plugins
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/irc/bitchx/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lirc/bitchx/Makefile -Lirc/bitchx/Makefile -u -r1.3 -r1.4
--- irc/bitchx/Makefile
+++ irc/bitchx/Makefile
@@ -7,21 +7,19 @@
#
PORTNAME= BitchX
-PORTVERSION= 1.1
+PORTVERSION= 1.1.0.1
CATEGORIES+= irc
MASTER_SITES= ftp://ftp.bitchx.org/pub/BitchX/source/ \
- ftp://ftp.cyberpunkz.org/pub/BitchX/source/ \
- ftp://ftp.cyberpunkz.org/pub/BitchX/tcl-o/:tcl
-DISTFILES= ircii-pana-${PORTVERSION}-final${EXTRACT_SUFX}
-EXTRACT_ONLY= ircii-pana-${PORTVERSION}-final${EXTRACT_SUFX}
+ CENKES
+DISTFILES= ircii-pana-1.1a-final${EXTRACT_SUFX}
+EXTRACT_ONLY= ircii-pana-1.1a-final${EXTRACT_SUFX}
MAINTAINER?= ports at MidnightBSD.org
-COMMENT?= An alternative ircII color client with optional GTK/GNOME support
+COMMENT?= ircII color client with optional GTK/GNOME support
OPTIONS= XMMS "Build BitchX with XMMS-Plugin" off \
PLUGINS "Build BitchX with addition plugins" off \
LATIN "Improved ISO-8859-1 display support" off \
- TCL "Build BitchX with TCL scripting" off \
SOCKS5 "Enable SOCKS5 support" off \
SSL "Enable SSL support" off \
IPV6 "Enable IPv6 support" off \
@@ -37,9 +35,10 @@
--bindir="${PREFIX}/bin" \
--datadir="${PREFIX}/share" \
--libdir="${PREFIX}/share" \
- --build=${MACHINE_ARCH}-portbld-freebsd$6.0
+ --build=${MACHINE_ARCH}-portbld-freebsd6.0
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib" \
+ CFLAGS="${CFLAGS}"
MAN1= BitchX.1
@@ -71,9 +70,8 @@
.include <bsd.port.pre.mk>
-.if defined(WITH_TCL)
-BROKEN= "Binary TCL files are missing"
-DISTFILES+= freebsd4-tcl83-bx1.0c19-tcl.o:tcl
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+CFLAGS+= -fPIC
.endif
.if defined(WITH_XMMS)
@@ -88,15 +86,6 @@
CONFIGURE_ARGS+=--enable-ipv6
.endif
-.if defined(WITH_TCL)
-BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=--with-tcl \
- --with-tcl-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3"
-CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3
-ONLY_FOR_ARCHS= i386
-.endif
-
.if defined(WITH_SOCKS5)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
CONFIGURE_ARGS+= --with-socks5=${LOCALBASE}
@@ -131,24 +120,6 @@
.endif
CONFIGURE_ENV+= CFLAGS="${CFLAGS}"
-.if defined(WITH_TCL)
-
-pre-fetch:
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
- ${DIALOG} --yesno "SECURITY NOTICE: TCL support is only \
- available by linking a precompiled binary object into the Application. \
- Do you really want to proceed building BitchX with TCL support?" 7 70 || ${FALSE}
-.endif # BATCH
-
-.endif # WITH_TCL
-
-.if defined(WITH_TCL)
-
-post-extract:
- @${CP} ${DISTDIR}/freebsd4-tcl83-bx1.0c19-tcl.o ${WRKSRC}/source/tcl.o
-
-.endif
-
pre-patch:
.if defined(WITH_LATIN)
${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|g' ${WRKSRC}/include/config.h
@@ -158,16 +129,15 @@
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/bx/help
- ${MKDIR} ${PREFIX}/share/doc/bitchx
- ${TAR} --directory ${WRKSRC}/bitchx-docs -cf - . --exclude CVS | \
+ ${TAR} --directory ${WRKSRC}/bitchx-docs -cf - . | \
${TAR} --directory ${PREFIX}/share/bx/help -xf -
.else
${RMDIR} ${PREFIX}/share/bx/help
.endif
.if defined(WITH_GNOME)
- ${STRIP_CMD} ${PREFIX}/bin/gtkBitchX-${PORTVERSION}-final
+ ${STRIP_CMD} ${PREFIX}/bin/gtkBitchX-1.1-final
.else
- ${STRIP_CMD} ${PREFIX}/bin/BitchX-${PORTVERSION}-final
+ ${STRIP_CMD} ${PREFIX}/bin/BitchX-1.1-final
${STRIP_CMD} ${PREFIX}/bin/scr-bx
.endif
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/irc/bitchx/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lirc/bitchx/distinfo -Lirc/bitchx/distinfo -u -r1.1 -r1.2
--- irc/bitchx/distinfo
+++ irc/bitchx/distinfo
@@ -1,5 +1,3 @@
-MD5 (ircii-pana-1.1-final.tar.gz) = 611d2dda222f00c10140236f4c331572
-SHA256 (ircii-pana-1.1-final.tar.gz) = 7464cd75a10f2d117a10cf0184e5d4b9ece44de03a226402c17bdd3f2c7eca57
-SIZE (ircii-pana-1.1-final.tar.gz) = 2532476
-MD5 (freebsd4-tcl83-bx1.0c19-tcl.o) = a49fd4cab976de64ea8b4215a50a9553
-SIZE (freebsd4-tcl83-bx1.0c19-tcl.o) = 46620
+MD5 (ircii-pana-1.1a-final.tar.gz) = cd77b52b2ba92cc9a082e4ddb631d05c
+SHA256 (ircii-pana-1.1a-final.tar.gz) = 40cea400fa7592bed47071fec9d31e5ff69088d6cf78e5cdfe9cc7ee7198618e
+SIZE (ircii-pana-1.1a-final.tar.gz) = 2599126
--- irc/bitchx/files/patch-source_term_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- source/term.c.orig Fri Jul 23 01:10:02 2004
-+++ source/term.c Fri Jul 23 01:11:02 2004
-@@ -92,7 +92,6 @@
- #endif
-
- extern char *getenv();
--extern char *tparm();
-
- /*
- * The old code assumed termcap. termcap is almost always present, but on
--- irc/bitchx/files/patch-64bit
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur BitchX.orig/include/module.h BitchX/include/module.h
---- BitchX.orig/include/module.h Fri Apr 11 03:09:07 2003
-+++ include/module.h Sun Jan 8 17:18:15 2006
-@@ -15,7 +15,7 @@
-
- #include "struct.h"
-
--typedef int (*Function_ptr)();
-+typedef long (*Function_ptr)();
-
- #ifdef WANT_DLL
- #ifdef HPUX
-diff -ur BitchX.orig/include/modval.h BitchX/include/modval.h
---- BitchX.orig/include/modval.h Fri Apr 11 03:09:07 2003
-+++ include/modval.h Sun Jan 8 17:18:15 2006
-@@ -318,7 +318,7 @@
- #define show_window(x) ((void) (global[SHOW_WINDOW]((Window *)x)))
- #define get_status_by_refnum(x, y) ((char *) (global[GET_STATUS_BY_REFNUM]((unsigned int)x, (unsigned int)y)))
- #define get_visible_by_refnum(x) ((int) (global[GET_VISIBLE_BY_REFNUM]((char *)x)))
--#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned int)x)))
-+#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned long)x)))
- #define get_window_by_refnum(x) ((Window *) (global[GET_WINDOW_BY_REFNUM]((unsigned int)x)))
- #define get_window_by_name(x) ((Window *) (global[GET_WINDOW_BY_NAME]((char *)x)))
- #define next_window(x, y) ((void) (global[FUNC_NEXT_WINDOW]((char)x, (char *)y)))
-diff -ur BitchX.orig/source/screen.c BitchX/source/screen.c
---- BitchX.orig/source/screen.c Thu Jul 31 09:01:08 2003
-+++ source/screen.c Sun Jan 8 17:18:18 2006
-@@ -1377,8 +1377,8 @@
- {
- if (!w)
- w = current_window;
-- if (w->screen)
-- w->screen->cursor_window = w;
-+/* if (w->screen)
-+ w->screen->cursor_window = w;*/
- }
-
- /*
--- irc/bitchx/files/patch-source-timer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/timer.c.orig Mon Dec 18 22:29:15 2006
-+++ source/timer.c Mon Dec 18 22:29:30 2006
-@@ -148,7 +148,7 @@
- * This is put here on purpose -- we dont want any of the above functions
- * to have any knowledge of this struct.
- */
--static TimerList *PendingTimers;
-+TimerList *PendingTimers;
- static char *schedule_timer (TimerList *ntimer);
-
- static char *current_exec_timer = empty_string;
--- irc/bitchx/files/patch-source-ctcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/ctcp.c.orig Mon Dec 18 22:26:09 2006
-+++ source/ctcp.c Mon Dec 18 22:26:24 2006
-@@ -176,7 +176,7 @@
-
- /* CDE do ops and unban logging */
-
--static char *ctcp_type[] =
-+char *ctcp_type[] =
- {
- "PRIVMSG",
- "NOTICE"
More information about the Midnightbsd-cvs
mailing list