jabberd: Remove, ancient release that's broken with OpenSSl 1.1.

"This version of jabberd is very very old and no longer maintained."

The wip package jabberd14 indicates that it can eventually be imported
as jabberd14 rather than directly replacing this package, but isn't
ready yet due to stability concerns.

15 files changed, 1 insertions, 504 deletions

diff --git a/chat/Makefile b/chat/Makefile
index dc97c8a539c..32604e0a128 100644
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.243 2020/02/06 09:14:25 nia Exp $
+# $NetBSD: Makefile,v 1.244 2020/03/13 11:57:37 nia Exp $
 #
 
 COMMENT=	Communication programs
@@ -50,7 +50,6 @@ SUBDIR+=	iroffer
 SUBDIR+=	irssi
 SUBDIR+=	irssi-icb
 SUBDIR+=	irssi-xmpp
-SUBDIR+=	jabberd
 SUBDIR+=	jabberd2
 SUBDIR+=	kgb-bot
 SUBDIR+=	konversation
diff --git a/chat/jabberd/DESCR b/chat/jabberd/DESCR
deleted file mode 100644
index bb580b99944..00000000000
--- a/chat/jabberd/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-Jabber is an open XML protocol for real-time exchange of messages and
-presence notification between any two points on the Internet.  The first
-application of Jabber technology is an asynchronous, extensible instant
-messaging platform, and an IM network that offers functionality similar
-to legacy IM systems such as AIM, ICQ, MSN, and Yahoo.
-
-This version of jabberd is very very old and no longer maintained.
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
deleted file mode 100644
index 30ef3a84131..00000000000
--- a/chat/jabberd/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-# $NetBSD: Makefile,v 1.46 2020/01/18 21:47:58 jperkin Exp $
-#
-
-# (Note that there is a pending update in wip for jabberd14-1.6, not yet released.)
-DISTNAME=		jabber-1.4.2
-PKGNAME=		jabberd-1.4.2
-PKGREVISION=		14
-CATEGORIES=		chat
-MASTER_SITES=		http://download.jabberd.org/jabberd14/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		https://jabberd.org/
-COMMENT=		Instant messaging server
-
-CONFLICTS=		jabberd2-[0-9]*
-
-# A self-made configure script, and GNU ones in subdirectories.
-HAS_CONFIGURE=			yes
-OVERRIDE_GNU_CONFIG_SCRIPTS=	yes
-USE_TOOLS+=			gmake
-
-CONFIGURE_ARGS+=	--enable-ssl
-CONFIGURE_ENV+=		prefix=${PREFIX}
-CONFIGURE_ENV+=		SSLBASE=${SSLBASE}
-
-RCD_SCRIPTS=		jabberd
-PKG_SYSCONFSUBDIR=	jabberd
-
-EGDIR=			${PREFIX}/share/examples/jabberd
-LIBDIR=			${PREFIX}/lib/jabberd
-INCDIR=			${PREFIX}/include/jabberd
-
-.include "options.mk"
-
-# some systems don't have u_intN_t
-CPPFLAGS+=		-Du_int8_t=uint8_t
-
-BUILD_DEFS+=		JABBERD_LOGDIR	JABBERD_SPOOLDIR \
-			JABBERD_PIDDIR
-
-PKG_GROUPS=		${JABBERD_GROUP}
-PKG_USERS=		${JABBERD_USER}:${JABBERD_GROUP}
-
-PKG_USERS_VARS+=	JABBERD_USER
-PKG_GROUPS_VARS+=	JABBERD_GROUP
-
-FILES_SUBST+=		JABBERD_USER=${JABBERD_USER}
-FILES_SUBST+=		JABBERD_GROUP=${JABBERD_GROUP}
-FILES_SUBST+=		JABBERD_SPOOLDIR=${JABBERD_SPOOLDIR}
-FILES_SUBST+=		JABBERD_PIDDIR=${JABBERD_PIDDIR}
-
-.for f in ${JABBERD_LOGDIR} ${JABBERD_SPOOLDIR} ${JABBERD_PIDDIR}
-OWN_DIRS_PERMS+=	${f} ${JABBERD_USER} ${JABBERD_GROUP} 750
-.endfor
-
-CONF_FILES=		${EGDIR}/jabber.xml ${PKG_SYSCONFDIR}/jabber.xml
-CONF_FILES+=		${EGDIR}/platform-settings \
-			${PKG_SYSCONFDIR}/platform-settings
-
-INSTALLATION_DIRS=	sbin
-
-post-extract:
-	@${MV} ${WRKSRC}/jabber.xml ${WRKSRC}/jabber.xml.in
-
-pre-configure:
-	@${SED}	\
-		-e "s|@LIBDIR@|${PREFIX}/lib/jabberd|g" \
-		-e "s|@LOGDIR@|${JABBERD_LOGDIR}|g" \
-		-e "s|@PIDDIR@|${JABBERD_PIDDIR}|g" \
-		-e "s|@SPOOLDIR@|${JABBERD_SPOOLDIR}|g" \
-		${WRKSRC}/jabber.xml.in > ${WRKSRC}/jabber.xml
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/jabberd/pth-1.4.0
-	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/jabberd/pth-1.4.0
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} ${DESTDIR}${LIBDIR} \
-		${DESTDIR}${INCDIR} ${DESTDIR}${INCDIR}/lib
-	${INSTALL_DATA} ${WRKSRC}/jabber.xml ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/platform-settings ${DESTDIR}${EGDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/jabberd/jabberd ${DESTDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/jsm/jsm.so ${DESTDIR}${LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/xdb_file/xdb_file.so ${DESTDIR}${LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/pthsock/pthsock_client.so ${DESTDIR}${LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/dnsrv/dnsrv.so ${DESTDIR}${LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/dialback/dialback.so ${DESTDIR}${LIBDIR}
-	${INSTALL_DATA} ${WRKSRC}/jabberd/jabberd.h ${DESTDIR}${INCDIR}
-	${INSTALL_DATA} ${WRKSRC}/jabberd/lib/lib.h ${DESTDIR}${INCDIR}/lib
-	${INSTALL_DATA} ${WRKSRC}/jabberd/lib/xmlparse.h ${DESTDIR}${INCDIR}/lib
-
-#.include "../../devel/pth/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/chat/jabberd/PLIST b/chat/jabberd/PLIST
deleted file mode 100644
index 961fc746b8c..00000000000
--- a/chat/jabberd/PLIST
+++ /dev/null
@@ -1,12 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:59 jperkin Exp $
-include/jabberd/jabberd.h
-include/jabberd/lib/lib.h
-include/jabberd/lib/xmlparse.h
-lib/jabberd/dialback.so
-lib/jabberd/dnsrv.so
-lib/jabberd/jsm.so
-lib/jabberd/pthsock_client.so
-lib/jabberd/xdb_file.so
-sbin/jabberd
-share/examples/jabberd/jabber.xml
-share/examples/jabberd/platform-settings
diff --git a/chat/jabberd/buildlink3.mk b/chat/jabberd/buildlink3.mk
deleted file mode 100644
index 1baab50e946..00000000000
--- a/chat/jabberd/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.20 2020/01/18 21:47:58 jperkin Exp $
-
-BUILDLINK_TREE+=	jabberd
-
-.if !defined(JABBERD_BUILDLINK3_MK)
-JABBERD_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.jabberd+=	jabberd>=1.4.2
-BUILDLINK_ABI_DEPENDS.jabberd+=	jabberd>=1.4.2nb14
-BUILDLINK_PKGSRCDIR.jabberd?=	../../chat/jabberd
-
-.include "../../security/openssl/buildlink3.mk"
-.endif # JABBERD_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-jabberd
diff --git a/chat/jabberd/distinfo b/chat/jabberd/distinfo
deleted file mode 100644
index a86b52648d8..00000000000
--- a/chat/jabberd/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 01:20:20 agc Exp $
-
-SHA1 (jabber-1.4.2.tar.gz) = aa0bc2e9815e4fa4a1ca8ba7f320bfd3c85ba11f
-RMD160 (jabber-1.4.2.tar.gz) = bff5a02d3b76243ce59ddb66873ca1c51ef4bb5f
-SHA512 (jabber-1.4.2.tar.gz) = 5955089a7221605f88e154b8d0deb830c9a5ac5c06c76c2cd099ca6811821457f6565fa369e990354bf21dc30c5b23cd60b2918747fff5c5309a3d24959d29e0
-Size (jabber-1.4.2.tar.gz) = 690217 bytes
-SHA1 (patch-aa) = 5e62a744f35697961fc6708c2be2c374a9782505
-SHA1 (patch-ab) = 8722b0db3870e14eaf3e40f5493544db8a813fc1
-SHA1 (patch-ac) = 3b17761c9ea2d1e17f3194ac8cf54fbca4c80367
-SHA1 (patch-ad) = 1eb45d4433731867bc23afebefb54b7e18217a8d
-SHA1 (patch-jabberd_base_base__accept.c) = 824bc096a9440010e534e700bae71c182fa4456e
-SHA1 (patch-jabberd_lib_xstream.c) = 7a6eb4012057abb0478ca07d0deb38109ab255cf
-SHA1 (patch-jabberd_mio__xml.c) = 45c57d481bfa7b84dbe5fa73f2b2c9127490d683
diff --git a/chat/jabberd/files/jabberd.sh b/chat/jabberd/files/jabberd.sh
deleted file mode 100644
index 8809638a5ae..00000000000
--- a/chat/jabberd/files/jabberd.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: jabberd.sh,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
-#
-
-# PROVIDE: jabberd
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-name="jabberd"
-help_name="jabber"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="@PKG_SYSCONFDIR@/jabber.xml"
-command_args="-B -c $required_files 2> /dev/null"
-pidfile="@JABBERD_PIDDIR@/${help_name}.pid"
-jabberd_user="@JABBERD_USER@"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/chat/jabberd/options.mk b/chat/jabberd/options.mk
deleted file mode 100644
index 8b86fc05781..00000000000
--- a/chat/jabberd/options.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2012/06/12 15:45:55 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.jabberd
-PKG_SUPPORTED_OPTIONS=	inet6
-PKG_SUGGESTED_OPTIONS=	inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
diff --git a/chat/jabberd/patches/patch-aa b/chat/jabberd/patches/patch-aa
deleted file mode 100644
index ded076a1a65..00000000000
--- a/chat/jabberd/patches/patch-aa
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2008/08/03 05:17:40 obache Exp $
-
---- configure.orig	2002-02-11 19:14:06.000000000 +0000
-+++ configure
-@@ -32,7 +32,8 @@ MCFLAGS="$MCFLAGS -shared"
- LDFLAGS="$LDFLAGS"
- LIBS="$LIBS"
- XLDFLAGS="$XLDFLAGS "
--JHOME=`pwd`
-+JHOME=${PKG_SYSCONFDIR}
-+WRKSRC="`cat .wrksrc-freebsd`"
- 
- ##
- # Print a cool header
-@@ -45,7 +46,7 @@ printf "========================\n\n"
- ##
- if [ $WANT_SSL -eq 1 ]; then
-     printf "Searching for SSL...";
--    for dir in ${prefix} /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
-+    for dir in ${SSLBASE}; do
-         ssldir="$dir"
-         if test -f "$dir/include/openssl/ssl.h"; then
-             found_ssl="yes";
-@@ -76,31 +77,19 @@ fi;
- ##
- # Pth check
- ##
--printf "Getting pth settings..."
--PTH_CFLAGS=`pth-config --cflags`
--PTH_LDFLAGS=`pth-config --ldflags`
--PTH_LIBS=`pth-config --libs`
--PTH_LIBDIR=`pth-config --libdir`
--if [ -n "$PTH_CFLAGS" ]; then
--    CFLAGS="$CFLAGS $PTH_CFLAGS";
--    LDFLAGS="$LDFLAGS $PTH_LDFLAGS";
--    LIBS="$LIBS $PTH_LIBS";
--    SLIBS="$SLIBS $PTH_LIBDIR/libpth.a";
--    printf "         Done.\n";
--else
--    if [ -d "jabberd/pth-1.4.0" ]; then
--        opwd=`pwd`
--        cd jabberd/pth-1.4.0;
--        ./configure || (printf "Error Configuring pth"; exit 1);
--        cd $opwd;
--        PSUBDIR="pth-1.4.0";
--        PTHP=`pwd`"/jabberd/pth-1.4.0";
--        PLINK="$PTHP/pth_*.o";
--        CFLAGS="$CFLAGS -I`pwd`/jabberd/pth-1.4.0";
--    else
--        printf "          Error.\n\n No version of PTH is available on this system\nhttp://www.gnu.org/software/pth/";
--    fi
--fi
-+echo "Using jabber's internal copy of pth 1.4.0 because 1.4.1 is incompatible"
-+opwd=`pwd`
-+cd jabberd/pth-1.4.0;
-+echo "Configuring jabber pth-1.4.0..."
-+./configure || (echo "Error Configuring pth"; exit 1);
-+echo "Building pth-1.4.0..."
-+gmake
-+cd $opwd;
-+PSUBDIR="pth-1.4.0";
-+PTHP="`pwd`/jabberd/pth-1.4.0";
-+PLINK="$PTHP/pth_*.o";
-+CFLAGS="$CFLAGS -I${PTHP}";
-+LDFLAGS="$LDFLAGS -L${PTHP}";
- 
- 
- 
-@@ -123,10 +112,11 @@ case $hosttype in
-         CFLAGS="$CFLAGS -fPIC -D_REENTRANT"
-         SLIBS="$SLIBS /usr/lib/libresolv.a";
-         LIBS="$LIBS -ldl -lsocket -lnsl -lresolv";;
--    FreeBSD)
-+    FreeBSD|DragonFly)
- 	CFLAGS="$CFLAGS -fPIC"
-         XLDFLAGS="$XLDFLAGS -Wl,-E";;
-     NetBSD)
-+	CFLAGS="$CFLAGS -fPIC"
-         LIBS="$LIBS -lresolv"
-         SLIBS="$SLIBS /usr/lib/libresolv.a";
-         XLDFLAGS="$XLDFLAGS -Wl,--export-dynamic";;
diff --git a/chat/jabberd/patches/patch-ab b/chat/jabberd/patches/patch-ab
deleted file mode 100644
index c3702c8fcb1..00000000000
--- a/chat/jabberd/patches/patch-ab
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
-
---- jabber.xml.in.orig	Tue May 15 17:21:56 2001
-+++ jabber.xml.in	Sat Feb 14 02:06:11 2004
-@@ -264,26 +264,26 @@
-     -->
- 
-     <load main="jsm">
--      <jsm>./jsm/jsm.so</jsm>
--      <mod_echo>./jsm/jsm.so</mod_echo>
--      <mod_roster>./jsm/jsm.so</mod_roster>
--      <mod_time>./jsm/jsm.so</mod_time>
--      <mod_vcard>./jsm/jsm.so</mod_vcard>
--      <mod_last>./jsm/jsm.so</mod_last>
--      <mod_version>./jsm/jsm.so</mod_version>
--      <mod_announce>./jsm/jsm.so</mod_announce>
--      <mod_agents>./jsm/jsm.so</mod_agents>
--      <mod_browse>./jsm/jsm.so</mod_browse>
--      <mod_admin>./jsm/jsm.so</mod_admin>
--      <mod_filter>./jsm/jsm.so</mod_filter>
--      <mod_offline>./jsm/jsm.so</mod_offline>
--      <mod_presence>./jsm/jsm.so</mod_presence>
--      <mod_auth_plain>./jsm/jsm.so</mod_auth_plain>
--      <mod_auth_digest>./jsm/jsm.so</mod_auth_digest>
--      <mod_auth_0k>./jsm/jsm.so</mod_auth_0k>
--      <mod_log>./jsm/jsm.so</mod_log>
--      <mod_register>./jsm/jsm.so</mod_register>
--      <mod_xml>./jsm/jsm.so</mod_xml>
-+      <jsm>@LIBDIR@/jsm.so</jsm>
-+      <mod_echo>@LIBDIR@/jsm.so</mod_echo>
-+      <mod_roster>@LIBDIR@/jsm.so</mod_roster>
-+      <mod_time>@LIBDIR@/jsm.so</mod_time>
-+      <mod_vcard>@LIBDIR@/jsm.so</mod_vcard>
-+      <mod_last>@LIBDIR@/jsm.so</mod_last>
-+      <mod_version>@LIBDIR@/jsm.so</mod_version>
-+      <mod_announce>@LIBDIR@/jsm.so</mod_announce>
-+      <mod_agents>@LIBDIR@/jsm.so</mod_agents>
-+      <mod_browse>@LIBDIR@/jsm.so</mod_browse>
-+      <mod_admin>@LIBDIR@/jsm.so</mod_admin>
-+      <mod_filter>@LIBDIR@/jsm.so</mod_filter>
-+      <mod_offline>@LIBDIR@/jsm.so</mod_offline>
-+      <mod_presence>@LIBDIR@/jsm.so</mod_presence>
-+      <mod_auth_plain>@LIBDIR@/jsm.so</mod_auth_plain>
-+      <mod_auth_digest>@LIBDIR@/jsm.so</mod_auth_digest>
-+      <mod_auth_0k>@LIBDIR@/jsm.so</mod_auth_0k>
-+      <mod_log>@LIBDIR@/jsm.so</mod_log>
-+      <mod_register>@LIBDIR@/jsm.so</mod_register>
-+      <mod_xml>@LIBDIR@/jsm.so</mod_xml>
-     </load>
- 
-   </service>
-@@ -295,10 +295,10 @@
-   <xdb id="xdb">
-     <host/>
-     <load>
--      <xdb_file>./xdb_file/xdb_file.so</xdb_file>
-+      <xdb_file>@LIBDIR@/xdb_file.so</xdb_file>
-     </load>
-     <xdb_file xmlns="jabber:config:xdb_file">
--      <spool><jabberd:cmdline flag='s'>./spool</jabberd:cmdline></spool>
-+      <spool><jabberd:cmdline flag='s'>@SPOOLDIR@</jabberd:cmdline></spool>
-     </xdb_file>
-   </xdb>
- 
-@@ -319,7 +319,7 @@
- 
-   <service id="c2s">
-     <load>
--      <pthsock_client>./pthsock/pthsock_client.so</pthsock_client>
-+      <pthsock_client>@LIBDIR@/pthsock_client.so</pthsock_client>
-     </load>
-     <pthcsock xmlns='jabber:config:pth-csock'>
-       <authtime/>
-@@ -359,7 +359,7 @@
-     <host/>
-     <logtype/>
-     <format>%d: [%t] (%h): %s</format>
--    <file>error.log</file>
-+    <file>@LOGDIR@/error.log</file>
-     <stderr/>
-   </log>
- 
-@@ -372,7 +372,7 @@
-     <host/>
-     <logtype>record</logtype>
-     <format>%d %h %s</format>
--    <file>record.log</file>
-+    <file>@LOGDIR@/record.log</file>
-   </log>
- 
-   <!-- The following two services are for handling server-to-server traffic. -->
-@@ -382,7 +382,7 @@
-   <service id="dnsrv">
-     <host/>
-     <load>
--      <dnsrv>./dnsrv/dnsrv.so</dnsrv>
-+      <dnsrv>@LIBDIR@/dnsrv.so</dnsrv>
-     </load>
-     <dnsrv xmlns="jabber:config:dnsrv">
-     	<resend service="_jabber._tcp">s2s</resend> <!-- for supporting SRV records -->
-@@ -401,7 +401,7 @@
- 
-   <service id="s2s">
-     <load>
--      <dialback>./dialback/dialback.so</dialback>
-+      <dialback>@LIBDIR@/dialback.so</dialback>
-     </load>
-     <dialback xmlns='jabber:config:dialback'>
-       <legacy/>
-@@ -596,7 +596,7 @@
-   <!--
-   This specifies the file to store the pid of the process in.
-   -->
--  <pidfile>./jabber.pid</pidfile>
-+  <pidfile>@PIDDIR@/jabber.pid</pidfile>
- 
- 
- </jabber>
diff --git a/chat/jabberd/patches/patch-ac b/chat/jabberd/patches/patch-ac
deleted file mode 100644
index 0e96d9558e7..00000000000
--- a/chat/jabberd/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/02/21 05:38:29 xtraeme Exp $
-
---- jabberd/jabberd.c.orig	2003-12-19 12:17:00.000000000 +0000
-+++ jabberd/jabberd.c	2003-12-19 12:17:52.000000000 +0000
-@@ -199,15 +199,6 @@
-     if(home != NULL && chdir(home))
-         fprintf(stderr,"Unable to access home folder %s: %s\n",home,strerror(errno));
- 
--    /* background ourselves if we have been flagged to do so */
--    if(do_background != 0)
--    {
--        if (fork() != 0)
--        {
--            exit(0);
--        }
--    }
--
-     /* load the config passing the file if it was manually set */
-     cfgfile=ghash_get(cmd__line,"c");
-     if(configurate(cfgfile))
-@@ -234,6 +225,15 @@
-     dynamic_init();
-     deliver_init();
- 
-+    /* background ourselves if we have been flagged to do so */
-+    if(do_background != 0)
-+    {
-+        if (fork() != 0)
-+        {
-+            exit(0);
-+        }
-+    }
-+
-     /* everything should be registered for the config pass, validate */
-     deliver__flag = 0; /* pause deliver() while starting up */
-     if(configo(0))
diff --git a/chat/jabberd/patches/patch-ad b/chat/jabberd/patches/patch-ad
deleted file mode 100644
index 1b2d65032c8..00000000000
--- a/chat/jabberd/patches/patch-ad
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2010/05/04 18:33:35 gdt Exp $
-
---- jabberd/mio_ssl.c.orig	2002-02-08 07:39:27.000000000 +0000
-+++ jabberd/mio_ssl.c
-@@ -63,6 +63,7 @@ void mio_ssl_init(xmlnode x)
- 
-     log_debug(ZONE, "Handling configuration using: %s", xmlnode2str(x));
-     /* Generic SSL Inits */
-+    SSL_library_init();
- 	OpenSSL_add_all_algorithms();    
-     SSL_load_error_strings();
- 
-@@ -219,6 +220,15 @@ int _mio_ssl_accept(mio m, struct sockad
-     SSL_CTX *ctx = NULL;
-     int fd;
-     int sret;
-+    int flags;
-+
-+    fd = accept(m->fd, serv_addr, addrlen);
-+
-+    /* set the socket to non-blocking as this is not
-+       inherited */
-+    flags =  fcntl(fd, F_GETFL, 0);
-+    flags |= O_NONBLOCK;
-+    fcntl(fd, F_SETFL, flags);
- 
-     if(m->ip == NULL)
-     {
-@@ -226,8 +236,6 @@ int _mio_ssl_accept(mio m, struct sockad
-         return -1;
-     }
- 
--    fd = accept(m->fd, serv_addr, addrlen);
--    
-     ctx = ghash_get(ssl__ctxs, m->ip);
-     if(ctx == NULL)
-     {
diff --git a/chat/jabberd/patches/patch-jabberd_base_base__accept.c b/chat/jabberd/patches/patch-jabberd_base_base__accept.c
deleted file mode 100644
index eb693f117ad..00000000000
--- a/chat/jabberd/patches/patch-jabberd_base_base__accept.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-jabberd_base_base__accept.c,v 1.1 2012/11/16 00:34:35 joerg Exp $
-
---- jabberd/base/base_accept.c.orig	2012-11-15 15:40:49.000000000 +0000
-+++ jabberd/base/base_accept.c
-@@ -64,7 +64,7 @@ typedef struct accept_instance_st
-     char *secret;
-     int port;
-     int timeout;
--    int restrict;
-+    int restricted;
-     xdbcache offline;
-     jid offjid;
-     queue q;
-@@ -157,7 +157,7 @@ void base_accept_process_xml(mio m, int 
-                 */
- 
-                 /* if we are supposed to be careful about what comes from this socket */
--                if(ai->restrict)
-+                if(ai->restricted)
-                 {
-                     jp = jpacket_new(x);
-                     if(jp->type == JPACKET_UNKNOWN || jp->to == NULL || jp->from == NULL || deliver_hostcheck(jp->from->server) != ai->i)
-@@ -358,7 +358,7 @@ result base_accept_config(instance id, x
-     inst->port        = port;
-     inst->timeout     = j_atoi(xmlnode_get_tag_data(x, "timeout"),10);
-     if(xmlnode_get_tag(x,"restrict") != NULL)
--        inst->restrict = 1;
-+        inst->restricted = 1;
-     if(xmlnode_get_tag(x,"offline") != NULL)
-     {
-         inst->offline = xdb_cache(id);
diff --git a/chat/jabberd/patches/patch-jabberd_lib_xstream.c b/chat/jabberd/patches/patch-jabberd_lib_xstream.c
deleted file mode 100644
index b9a49f7761a..00000000000
--- a/chat/jabberd/patches/patch-jabberd_lib_xstream.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-jabberd_lib_xstream.c,v 1.1 2011/07/03 08:26:55 obache Exp $
-
-* fix CVE-2011-1754
-
---- jabberd/lib/xstream.c.orig	2002-02-08 07:39:24.000000000 +0000
-+++ jabberd/lib/xstream.c
-@@ -142,6 +142,7 @@ xstream xstream_new(pool p, xstream_onNo
- 
-     /* create expat parser and ensure cleanup */
-     newx->parser = XML_ParserCreate(NULL);
-+    XML_SetDefaultHandler(newx->parser, NULL);
-     XML_SetUserData(newx->parser, (void *)newx);
-     XML_SetElementHandler(newx->parser, (void *)_xstream_startElement, (void *)_xstream_endElement);
-     XML_SetCharacterDataHandler(newx->parser, (void *)_xstream_charData);
diff --git a/chat/jabberd/patches/patch-jabberd_mio__xml.c b/chat/jabberd/patches/patch-jabberd_mio__xml.c
deleted file mode 100644
index d3e022ed856..00000000000
--- a/chat/jabberd/patches/patch-jabberd_mio__xml.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-jabberd_mio__xml.c,v 1.1 2011/07/03 08:26:55 obache Exp $
-
-* fix CVE-2011-1754
-
---- jabberd/mio_xml.c.orig	2002-02-08 07:39:27.000000000 +0000
-+++ jabberd/mio_xml.c
-@@ -118,6 +118,7 @@ void _mio_xstream_init(mio m)
- 	    /* Initialize the parser */
- 	    m->parser = XML_ParserCreate(NULL);
- 	    XML_SetUserData(m->parser, m);
-+	    XML_SetDefaultHandler(m->parser, NULL);
- 	    XML_SetElementHandler(m->parser, (void*)_mio_xstream_startElement, (void*)_mio_xstream_endElement);
- 	    XML_SetCharacterDataHandler(m->parser, (void*)_mio_xstream_CDATA);
- 	    /* Setup a cleanup routine to release the parser when everything is done */