Index: head/net-im/jabber/Makefile =================================================================== --- head/net-im/jabber/Makefile (revision 433021) +++ head/net-im/jabber/Makefile (revision 433022) @@ -1,119 +1,119 @@ # Created by: joe # $FreeBSD$ PORTNAME= jabber PORTVERSION= 1.6.1.1 -PORTREVISION= 19 +PORTREVISION= 20 PORTEPOCH= 1 CATEGORIES= net-im ipv6 MASTER_SITES= http://download.jabberd.org/jabberd14/%SUBDIR%/ MASTER_SITE_SUBDIR= . old DISTNAME= jabberd14-${PORTVERSION} DIST_SUBDIR= jabber MAINTAINER= ports@FreeBSD.org COMMENT= XMPP/Jabber server daemon LICENSE= GPLv2 LIB_DEPENDS= libpopt.so:devel/popt \ libpth.so:devel/pth-hard \ libidn.so:dns/libidn \ libgnutls.so:security/gnutls \ libexpat.so:textproc/expat2 OPTIONS_DEFINE= IPV6 MYSQL PGSQL DOCS GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= gettext gmake iconv libtool pkgconfig USE_RC_SUBR= jabber CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${JABBER_ETCDIR} \ --includedir=${PREFIX}/include/jabber \ --libdir=${PREFIX}/lib/jabber USE_LDCONFIG= ${PREFIX}/lib/jabber MAKE_JOBS_UNSAFE= yes CPPFLAGS+= $$(pth-config --cflags) \ -I${LOCALBASE}/include LDFLAGS+= $$(pth-config --ldflags) \ -L${LOCALBASE}/lib SUB_FILES= pkg-message SUB_LIST= JABBER_USER=${JABBER_USER} \ JABBER_GROUP=${JABBER_GROUP} \ JABBER_ETCDIR="${JABBER_ETCDIR}" \ JABBER_LOGDIR="${JABBER_LOGDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \ JABBER_RUNDIR="${JABBER_RUNDIR}" PLIST_SUB= JABBER_USER=${JABBER_USER} \ JABBER_GROUP=${JABBER_GROUP} \ JABBER_LOGDIR="${JABBER_LOGDIR}" \ JABBER_SPOOLDIR="${JABBER_SPOOLDIR}" \ JABBER_RUNDIR="${JABBER_RUNDIR}" USERS= ${JABBER_USER} GROUPS= ${JABBER_GROUP} JABBER_USER= jabber JABBER_GROUP= jabber JABBER_ETCDIR= ${PREFIX}/etc JABBER_RUNDIR= /var/run/jabberd JABBER_SPOOLDIR=/var/spool/jabberd JABBER_LOGDIR= /var/log/jabberd .include .if ${PORT_OPTIONS:MMYSQL} USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .endif .if ${PORT_OPTIONS:MPGSQL} USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} .endif .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif .if exists(${LOCALBASE}/include/pth/pthread.h) IGNORE= pth with soft syscalls is installed, please reinstall pth from devel/pth-hard .endif post-patch: @${REINPLACE_CMD} -e \ 's|\\\$$(localstatedir)/log/jabberd|${JABBER_LOGDIR}|g ; \ s|\\\$$(localstatedir)/spool/jabberd|${JABBER_SPOOLDIR}| ; \ s|\\\$$(localstatedir)/run/jabberd|${JABBER_RUNDIR}|g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ 's|@localstatedir@/log/jabberd|${JABBER_LOGDIR}|g ; \ s|@localstatedir@/spool/jabberd|${JABBER_SPOOLDIR}|g ; \ s|@localstatedir@/run/jabberd|${JABBER_RUNDIR}|g' \ ${WRKSRC}/jabber.xml.dist.in @${REINPLACE_CMD} -e \ '//s|^|//| ; \ /gcry_control/s|^|//|' \ ${WRKSRC}/jabberd/gcrypt_init.c @${REINPLACE_CMD} -e \ 's|locale, LOCALEDIR)|locale)|' \ ${WRKSRC}/jabberd/lib/messages.cc @${REINPLACE_CMD} -e \ 's|"$$(localedir)|"$$(DESTDIR)$$(localedir)|' \ ${WRKSRC}/po/Makefile.in @${LN} -s jabberd.8.in ${WRKSRC}/man/jabberd14.8.in post-install: @${TOUCH} ${STAGEDIR}${PREFIX}/include/jabber/platform-settings (cd ${WRKSRC} && ${INSTALL_DATA} jabber.xml.dist \ ${STAGEDIR}${PREFIX}/etc/jabber.xml.sample) @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog INSTALL NEWS README README.SQL README.config \ README.filespool README.karma README.protocols TODO UPGRADE mysql.sql (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR}) .endfor .include Index: head/net-im/jabber/files/patch-jabberd_lib_xmlnode.cc =================================================================== --- head/net-im/jabber/files/patch-jabberd_lib_xmlnode.cc (nonexistent) +++ head/net-im/jabber/files/patch-jabberd_lib_xmlnode.cc (revision 433022) @@ -0,0 +1,37 @@ +--- jabberd/lib/xmlnode.cc.orig 2007-04-07 19:43:18 UTC ++++ jabberd/lib/xmlnode.cc +@@ -879,9 +879,9 @@ xmlnode xmlnode_get_tag(xmlnode parent, + xmlnode_list_item xmlnode_get_tags(xmlnode context_node, const char *path, xht namespaces, pool p) { + char *this_step = NULL; + const char *ns_iri = NULL; +- char *next_step = NULL; +- char *start_predicate = NULL; +- char *end_predicate = NULL; ++ const char *next_step = NULL; ++ const char *start_predicate = NULL; ++ const char *end_predicate = NULL; + char *predicate = NULL; + char *end_prefix = NULL; + int axis = 0; /* 0 = child, 1 = parent, 2 = attribute */ +@@ -1830,13 +1830,14 @@ xmlnode xmlnode_select_by_lang(xmlnode_l + } + + /* if language has a geographical veriant, get the language as well */ +- if (lang != NULL && strchr(lang, '-') != NULL) { +- snprintf(general_lang, sizeof(general_lang), "%s", lang); +- if (strchr(lang, '-') != NULL) { +- strchr(lang, '-')[0] = 0; +- } else { +- general_lang[0] = 0; +- } ++ if (lang != NULL) { ++#define MIN(a,b) ((a) < (b) ? (a) : (b)) ++ size_t len = sizeof(general_lang); ++ const char *pos; ++ if ((pos = strchr(lang, '-'))) ++ len = MIN(len, pos - lang + 1); ++ ++ snprintf(general_lang, len, "%s", lang); + } + + /* iterate the nodes */ Property changes on: head/net-im/jabber/files/patch-jabberd_lib_xmlnode.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-im/jabber/files/patch-jabberd_log.cc =================================================================== --- head/net-im/jabber/files/patch-jabberd_log.cc (nonexistent) +++ head/net-im/jabber/files/patch-jabberd_log.cc (revision 433022) @@ -0,0 +1,32 @@ +--- jabberd/log.cc.orig 2007-07-20 13:56:59 UTC ++++ jabberd/log.cc +@@ -83,21 +83,22 @@ static char *debug_log_timestamp(void) { + * @return 1 if it should be logged, 0 if not + */ + static inline int _debug_log_zonefilter(char const* zone) { +- char *pos, c = '\0'; ++ const char *pos; ++ char *tmp; ++ int ret = 1; + if(zone != NULL && debug__zones != NULL) + { + pos = strchr(zone,'.'); + if(pos != NULL) + { +- c = *pos; +- *pos = '\0'; /* chop */ ++ tmp = strndup(zone, pos - zone); + } +- if(xhash_get(debug__zones,zone) == NULL) +- return 0; ++ if(xhash_get(debug__zones, (pos ? tmp : zone)) == NULL) ++ ret = 0; + if(pos != NULL) +- *pos = c; /* restore */ ++ free(tmp); + } +- return 1; ++ return ret; + } + + /** Property changes on: head/net-im/jabber/files/patch-jabberd_log.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property