pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat jabberd: Remove, ancient release that's broken wi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/da532ca9d089
branches: trunk
changeset: 412917:da532ca9d089
user: nia <nia%pkgsrc.org@localhost>
date: Fri Mar 13 11:57:37 2020 +0000
description:
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.
diffstat:
chat/Makefile | 3 +-
chat/jabberd/DESCR | 7 -
chat/jabberd/Makefile | 92 -------------
chat/jabberd/PLIST | 12 -
chat/jabberd/buildlink3.mk | 15 --
chat/jabberd/distinfo | 13 -
chat/jabberd/files/jabberd.sh | 21 ---
chat/jabberd/options.mk | 11 -
chat/jabberd/patches/patch-aa | 81 -----------
chat/jabberd/patches/patch-ab | 118 -----------------
chat/jabberd/patches/patch-ac | 36 -----
chat/jabberd/patches/patch-ad | 37 -----
chat/jabberd/patches/patch-jabberd_base_base__accept.c | 31 ----
chat/jabberd/patches/patch-jabberd_lib_xstream.c | 14 --
chat/jabberd/patches/patch-jabberd_mio__xml.c | 14 --
15 files changed, 1 insertions(+), 504 deletions(-)
diffs (truncated from 575 to 300 lines):
diff -r 6e2e87958be7 -r da532ca9d089 chat/Makefile
--- a/chat/Makefile Fri Mar 13 11:16:59 2020 +0000
+++ b/chat/Makefile Fri Mar 13 11:57:37 2020 +0000
@@ -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+= irssi
SUBDIR+= irssi-icb
SUBDIR+= irssi-xmpp
-SUBDIR+= jabberd
SUBDIR+= jabberd2
SUBDIR+= kgb-bot
SUBDIR+= konversation
diff -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/DESCR
--- a/chat/jabberd/DESCR Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/Makefile
--- a/chat/jabberd/Makefile Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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@localhost
-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 -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/PLIST
--- a/chat/jabberd/PLIST Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/buildlink3.mk
--- a/chat/jabberd/buildlink3.mk Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/distinfo
--- a/chat/jabberd/distinfo Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/files/jabberd.sh
--- a/chat/jabberd/files/jabberd.sh Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/options.mk
--- a/chat/jabberd/options.mk Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 6e2e87958be7 -r da532ca9d089 chat/jabberd/patches/patch-aa
--- a/chat/jabberd/patches/patch-aa Fri Mar 13 11:16:59 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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";
Home |
Main Index |
Thread Index |
Old Index