remove net/ejabberd
project is abandoned upstream since 2 years and no fork is active net/prosody is a solid alternative ok mariani@ kn@ cwen@
This commit is contained in:
solene
parent
9251499c77
commit
215ba41f31
@ -1,109 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.63 2019/07/12 20:48:29 sthen Exp $
|
||||
|
||||
COMMENT= jabber server
|
||||
DISTNAME= jabberd-2.0s11
|
||||
REVISION= 12
|
||||
EPOCH= 1
|
||||
CATEGORIES= net
|
||||
HOMEPAGE= http://jabberd2.org/
|
||||
|
||||
# GPL
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB= c crypto ssl
|
||||
|
||||
COMPILER = base-clang ports-gcc base-gcc
|
||||
|
||||
MASTER_SITES= http://www.linklevel.net/distfiles/
|
||||
|
||||
JABBERDUSER= _jabberd
|
||||
JABBERDGROUP= _jabberd
|
||||
JABBERDDIR= /var/jabberd
|
||||
|
||||
CONFIG_DIR= ${SYSCONFDIR}/jabberd
|
||||
EXAMPLES= ${PREFIX}/share/examples/jabberd
|
||||
|
||||
SUBST_VARS= CONFIG_DIR EXAMPLES \
|
||||
JABBERDUSER JABBERDGROUP JABBERDDIR
|
||||
|
||||
STORAGES= mysql postgresql db
|
||||
FLAVORS= ${STORAGES} ldap
|
||||
FLAVOR?= mysql
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --enable-debug \
|
||||
--enable-ssl \
|
||||
--disable-idn \
|
||||
--with-extra-include-path="${EXTRA_INCLUDE_PATH}" \
|
||||
--with-extra-library-path="${EXTRA_LIBRARY_PATH}"
|
||||
EXTRA_INCLUDE_PATH= ${LOCALBASE}/include
|
||||
EXTRA_LIBRARY_PATH= ${LOCALBASE}/lib
|
||||
|
||||
.if ${FLAVOR:Mmysql}
|
||||
LIB_DEPENDS+= databases/mariadb
|
||||
WANTLIB += lib/mysql/mysqlclient m pthread ${COMPILER_LIBCXX} z
|
||||
CONFIGURE_ARGS+= --enable-mysql
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-mysql
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:Mpostgresql}
|
||||
LIB_DEPENDS+= databases/postgresql
|
||||
WANTLIB += pq>=4
|
||||
CONFIGURE_ARGS+= --enable-pgsql
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-pgsql
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:Mdb}
|
||||
LIB_DEPENDS+= databases/db/v4
|
||||
WANTLIB += lib/db4/db>=4
|
||||
CONFIGURE_ARGS+= --enable-db
|
||||
EXTRA_INCLUDE_PATH:= ${EXTRA_INCLUDE_PATH}:${LOCALBASE}/include/db4
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-db
|
||||
.endif
|
||||
|
||||
.if ${FLAVOR:Mldap}
|
||||
LIB_DEPENDS+= databases/openldap>=2.3
|
||||
WANTLIB += lber-2.4 ldap-2.4 sasl2
|
||||
CONFIGURE_ARGS+= --enable-ldap
|
||||
.else
|
||||
CONFIGURE_ARGS+= --disable-ldap
|
||||
.endif
|
||||
|
||||
.for s in ${STORAGES}
|
||||
. if ${FLAVOR:M$s}
|
||||
storage_flag=1
|
||||
. endif
|
||||
.endfor
|
||||
.if !defined(storage_flag)
|
||||
ERRORS+= "Fatal: You need to select at least one storage driver"
|
||||
.endif
|
||||
|
||||
do-install:
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/tools/jabberd ${PREFIX}/sbin
|
||||
${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/jabberd
|
||||
.for dir in c2s resolver router s2s sm
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/${dir}/${dir} ${PREFIX}/libexec/jabberd
|
||||
.endfor
|
||||
${INSTALL_MAN} ${WRKSRC}/man/*.8 ${PREFIX}/man/man8
|
||||
${INSTALL_DATA_DIR} ${EXAMPLES}
|
||||
${INSTALL_DATA_DIR} ${EXAMPLES}/templates
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/jabberd.cfg.dist ${EXAMPLES}/jabberd.cfg
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/c2s.xml.dist ${EXAMPLES}/c2s.xml
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/resolver.xml.dist ${EXAMPLES}/resolver.xml
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/router-users.xml.dist ${EXAMPLES}/router-users.xml
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/router.xml.dist ${EXAMPLES}/router.xml
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/s2s.xml.dist ${EXAMPLES}/s2s.xml
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/sm.xml.dist ${EXAMPLES}/sm.xml
|
||||
${INSTALL_DATA} ${WRKSRC}/etc/templates/roster.xml.dist ${EXAMPLES}/templates/roster.xml
|
||||
.if ${FLAVOR:Mmysql}
|
||||
${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${EXAMPLES}
|
||||
${INSTALL_DATA} ${WRKSRC}/tools/db-update.mysql ${EXAMPLES}
|
||||
.endif
|
||||
.if ${FLAVOR:Mpostgresql}
|
||||
${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${EXAMPLES}
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
@ -1,2 +0,0 @@
|
||||
SHA256 (jabberd-2.0s11.tar.gz) = DvD2aPXYa4wizgriNmv/C+nUyWHW9It7hJ6+dJvbITo=
|
||||
SIZE (jabberd-2.0s11.tar.gz) = 777466
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-c2s_authreg_mysql_c,v 1.1 2019/05/09 03:48:56 jca Exp $
|
||||
|
||||
Index: c2s/authreg_mysql.c
|
||||
--- c2s/authreg_mysql.c.orig
|
||||
+++ c2s/authreg_mysql.c
|
||||
@@ -388,6 +388,7 @@ int ar_mysql_init(authreg_t ar) {
|
||||
int strlentur; /* string length of table, user, and realm strings */
|
||||
MYSQL *conn;
|
||||
mysqlcontext_t mysqlcontext;
|
||||
+ my_bool reconnect;
|
||||
|
||||
/* configure the database context with field names and SQL statements */
|
||||
mysqlcontext = (mysqlcontext_t) malloc( sizeof( struct mysqlcontext_st ) );
|
||||
@@ -527,7 +528,8 @@ int ar_mysql_init(authreg_t ar) {
|
||||
}
|
||||
|
||||
/* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */
|
||||
- conn->reconnect = 1;
|
||||
+ reconnect = 1;
|
||||
+ mysql_options(conn, MYSQL_OPT_RECONNECT, &reconnect);
|
||||
|
||||
ar->user_exists = _ar_mysql_user_exists;
|
||||
ar->get_password = _ar_mysql_get_password;
|
||||
@ -1,28 +0,0 @@
|
||||
$OpenBSD: patch-s2s_out_c,v 1.1 2012/08/24 07:24:12 jasper Exp $
|
||||
|
||||
Security fix for CVE-2012-3525
|
||||
jabberd XMPP Dialback Protection Bypass Vulnerability
|
||||
|
||||
Patch from upstream git:
|
||||
https://github.com/Jabberd2/jabberd2/commit/aabcffae560d5fd00cd1d2ffce5d760353cf0a4d
|
||||
|
||||
--- s2s/out.c.orig Fri Aug 24 09:18:34 2012
|
||||
+++ s2s/out.c Fri Aug 24 09:20:03 2012
|
||||
@@ -717,7 +717,7 @@ static void _out_result(conn_t out, nad_t nad) {
|
||||
rkey = s2s_route_key(NULL, to->domain, from->domain);
|
||||
|
||||
/* key is valid */
|
||||
- if(nad_find_attr(nad, 0, -1, "type", "valid") >= 0) {
|
||||
+ if(nad_find_attr(nad, 0, -1, "type", "valid") >= 0 && xhash_get(out->states, rkey) == (void*) conn_INPROGRESS) {
|
||||
log_write(out->s2s->log, LOG_NOTICE, "[%d] [%s, port=%d] outgoing route '%s' is now valid%s", out->fd, out->ip, out->port, rkey, out->s->ssf ? ", SSL negotiated" : "");
|
||||
|
||||
xhash_put(out->states, pstrdup(xhash_pool(out->states), rkey), (void *) conn_VALID); /* !!! small leak here */
|
||||
@@ -822,7 +822,7 @@ static void _out_verify(conn_t out, nad_t nad) {
|
||||
rkey = s2s_route_key(NULL, to->domain, from->domain);
|
||||
|
||||
attr = nad_find_attr(nad, 0, -1, "type", "valid");
|
||||
- if(attr >= 0) {
|
||||
+ if(attr >= 0 && xhash_get(in->states, rkey) == (void*) conn_INPROGRESS) {
|
||||
xhash_put(in->states, pstrdup(xhash_pool(in->states), rkey), (void *) conn_VALID);
|
||||
log_write(in->s2s->log, LOG_NOTICE, "[%d] [%s, port=%d] incoming route '%s' is now valid%s", in->fd, in->ip, in->port, rkey, in->s->ssf ? ", SSL negotiated" : "");
|
||||
valid = 1;
|
||||
@ -1,23 +0,0 @@
|
||||
$OpenBSD: patch-sm_storage_mysql_c,v 1.1 2019/05/09 03:48:56 jca Exp $
|
||||
|
||||
Index: sm/storage_mysql.c
|
||||
--- sm/storage_mysql.c.orig
|
||||
+++ sm/storage_mysql.c
|
||||
@@ -535,6 +535,7 @@ st_ret_t st_mysql_init(st_driver_t drv) {
|
||||
char *host, *port, *dbname, *user, *pass;
|
||||
MYSQL *conn;
|
||||
drvdata_t data;
|
||||
+ my_bool reconnect;
|
||||
|
||||
host = config_get_one(drv->st->sm->config, "storage.mysql.host", 0);
|
||||
port = config_get_one(drv->st->sm->config, "storage.mysql.port", 0);
|
||||
@@ -566,7 +567,8 @@ st_ret_t st_mysql_init(st_driver_t drv) {
|
||||
}
|
||||
|
||||
/* Set reconnect flag to 1 (set to 0 by default from mysql 5 on) */
|
||||
- conn->reconnect = 1;
|
||||
+ reconnect = 1;
|
||||
+ mysql_options(conn, MYSQL_OPT_RECONNECT, &reconnect);
|
||||
|
||||
data = (drvdata_t) malloc(sizeof(struct drvdata_st));
|
||||
memset(data, 0, sizeof(struct drvdata_st));
|
||||
@ -1,18 +0,0 @@
|
||||
$OpenBSD: patch-sx_io_c,v 1.1 2007/04/03 15:04:32 jasper Exp $
|
||||
--- sx/io.c.orig Wed Jun 22 22:33:40 2005
|
||||
+++ sx/io.c Tue Apr 3 17:03:04 2007
|
||||
@@ -294,9 +294,11 @@ int sx_can_write(sx_t s) {
|
||||
|
||||
ret = _sx_get_pending_write(s);
|
||||
if (ret < 0) {
|
||||
- /* fatal error */
|
||||
- /* !!! shut down */
|
||||
- return 0;
|
||||
+ /* fatal error */
|
||||
+ _sx_debug(ZONE, "fatal error after attempt to write on fd %d", s->tag);
|
||||
+ /* permanent error so inform the app it can kill us */
|
||||
+ sx_kill(s);
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
/* if there's nothing to write, then we're done */
|
||||
@ -1,41 +0,0 @@
|
||||
$OpenBSD: patch-tools_jabberd_in,v 1.3 2007/04/03 15:04:32 jasper Exp $
|
||||
--- tools/jabberd.in.orig Wed Jun 22 22:32:05 2005
|
||||
+++ tools/jabberd.in Tue Apr 3 17:03:04 2007
|
||||
@@ -68,23 +68,23 @@ $SIG{CHLD} = "IGNORE";
|
||||
#-----------------------------------------------------------------------------
|
||||
$jobs{jabberd}->{prefix} = "JBRD";
|
||||
|
||||
-$jobs{router}->{cmd} = "$Bin/router";
|
||||
+$jobs{router}->{cmd} = "$Bin/../libexec/jabberd/router";
|
||||
$jobs{router}->{config} = "$config_dir/router.xml";
|
||||
$jobs{router}->{prefix} = "ROUT";
|
||||
|
||||
-$jobs{resolver}->{cmd} = "$Bin/resolver";
|
||||
+$jobs{resolver}->{cmd} = "$Bin/../libexec/jabberd/resolver";
|
||||
$jobs{resolver}->{config} = "$config_dir/resolver.xml";
|
||||
$jobs{resolver}->{prefix} = "RSLV";
|
||||
|
||||
-$jobs{sm}->{cmd} = "$Bin/sm";
|
||||
+$jobs{sm}->{cmd} = "$Bin/../libexec/jabberd/sm";
|
||||
$jobs{sm}->{config} = "$config_dir/sm.xml";
|
||||
$jobs{sm}->{prefix} = "SM";
|
||||
|
||||
-$jobs{c2s}->{cmd} = "$Bin/c2s";
|
||||
+$jobs{c2s}->{cmd} = "$Bin/../libexec/jabberd/c2s";
|
||||
$jobs{c2s}->{config} = "$config_dir/c2s.xml";
|
||||
$jobs{c2s}->{prefix} = "C2S";
|
||||
|
||||
-$jobs{s2s}->{cmd} = "$Bin/s2s";
|
||||
+$jobs{s2s}->{cmd} = "$Bin/../libexec/jabberd/s2s";
|
||||
$jobs{s2s}->{config} = "$config_dir/s2s.xml";
|
||||
$jobs{s2s}->{prefix} = "S2S";
|
||||
|
||||
@@ -112,7 +112,7 @@ else
|
||||
# Assume that all the commands are in the same directory
|
||||
# as the jabberd script. The current configuration file
|
||||
# format does not allow specification of pathnames for commands.
|
||||
- my $cmd = "$Bin/$job";
|
||||
+ my $cmd = "$Bin/../libexec/jabberd/$job";
|
||||
push(@programs,[$job,$config,$cmd]);
|
||||
}
|
||||
close(CFG);
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-util_util_h,v 1.2 2007/04/03 15:04:32 jasper Exp $
|
||||
--- util/util.h.orig Sun Oct 2 17:42:44 2005
|
||||
+++ util/util.h Tue Apr 3 17:03:04 2007
|
||||
@@ -39,6 +39,8 @@
|
||||
# include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
+#include <sys/socket.h>
|
||||
+
|
||||
#if defined(HAVE_SYS_TIME_H)
|
||||
# include <sys/time.h>
|
||||
#elif defined(HAVE_SYS_TIMEB_H)
|
||||
@ -1,5 +0,0 @@
|
||||
The jabberd project aims to provide an open-source server implementation of
|
||||
the Jabber protocols for instant messaging and XML routing. The goal of this
|
||||
project is to provide a scalable, reliable, efficient and extensible server
|
||||
that provides a complete set of features and is up to date with the latest
|
||||
protocol revisions.
|
||||
@ -1,4 +0,0 @@
|
||||
@comment $OpenBSD: PFRAG.mysql,v 1.2 2005/09/14 10:41:02 espie Exp $
|
||||
@pkgpath net/jabberd
|
||||
share/examples/jabberd/db-setup.mysql
|
||||
share/examples/jabberd/db-update.mysql
|
||||
@ -1,2 +0,0 @@
|
||||
@comment $OpenBSD: PFRAG.postgresql,v 1.1 2005/06/10 19:56:37 naddy Exp $
|
||||
share/examples/jabberd/db-setup.pgsql
|
||||
@ -1,48 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2007/04/01 13:12:42 steven Exp $
|
||||
@newgroup ${JABBERDGROUP}:533
|
||||
@newuser ${JABBERDUSER}:533:${JABBERDGROUP}:daemon:jabberd account:/nonexistent:/bin/sh
|
||||
libexec/jabberd/
|
||||
libexec/jabberd/c2s
|
||||
libexec/jabberd/resolver
|
||||
libexec/jabberd/router
|
||||
libexec/jabberd/s2s
|
||||
libexec/jabberd/sm
|
||||
@man man/man8/c2s.8
|
||||
@man man/man8/jabberd.8
|
||||
@man man/man8/resolver.8
|
||||
@man man/man8/router.8
|
||||
@man man/man8/s2s.8
|
||||
@man man/man8/sm.8
|
||||
sbin/jabberd
|
||||
share/examples/jabberd/
|
||||
@sample ${CONFIG_DIR}/
|
||||
@mode 640
|
||||
@owner ${JABBERDUSER}
|
||||
@group ${JABBERDGROUP}
|
||||
share/examples/jabberd/c2s.xml
|
||||
@sample ${CONFIG_DIR}/c2s.xml
|
||||
%%mysql%%
|
||||
%%postgresql%%
|
||||
share/examples/jabberd/jabberd.cfg
|
||||
@sample ${CONFIG_DIR}/jabberd.cfg
|
||||
share/examples/jabberd/resolver.xml
|
||||
@sample ${CONFIG_DIR}/resolver.xml
|
||||
share/examples/jabberd/router-users.xml
|
||||
@sample ${CONFIG_DIR}/router-users.xml
|
||||
share/examples/jabberd/router.xml
|
||||
@sample ${CONFIG_DIR}/router.xml
|
||||
share/examples/jabberd/s2s.xml
|
||||
@sample ${CONFIG_DIR}/s2s.xml
|
||||
share/examples/jabberd/sm.xml
|
||||
@sample ${CONFIG_DIR}/sm.xml
|
||||
@mode 750
|
||||
share/examples/jabberd/templates/
|
||||
@sample ${CONFIG_DIR}/templates/
|
||||
@mode 640
|
||||
share/examples/jabberd/templates/roster.xml
|
||||
@sample ${CONFIG_DIR}/templates/roster.xml
|
||||
@mode 771
|
||||
@sample ${JABBERDDIR}/
|
||||
@mode 775
|
||||
@sample ${JABBERDDIR}/pid/
|
||||
@sample ${JABBERDDIR}/log/
|
||||
Loading…
Reference in New Issue
Block a user