[Midnightbsd-cvs] mports [18960] trunk/net-im/jabberd/files: drop patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu May 14 23:30:13 EDT 2015
Revision: 18960
http://svnweb.midnightbsd.org/mports/?rev=18960
Author: laffer1
Date: 2015-05-14 23:30:12 -0400 (Thu, 14 May 2015)
Log Message:
-----------
drop patchset
Removed Paths:
-------------
trunk/net-im/jabberd/files/jabberd.in
trunk/net-im/jabberd/files/patch-etc-Makefile.in
trunk/net-im/jabberd/files/patch-s2s-out.c
trunk/net-im/jabberd/files/patch-sm-mod_iq_time.c
trunk/net-im/jabberd/files/patch-sm-mod_roster.c
trunk/net-im/jabberd/files/patch-tools-jabberd.in
trunk/net-im/jabberd/files/pkg-deinstall.in
trunk/net-im/jabberd/files/pkg-install.in
Deleted: trunk/net-im/jabberd/files/jabberd.in
===================================================================
--- trunk/net-im/jabberd/files/jabberd.in 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/jabberd.in 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# $MidnightBSD$
-
-# PROVIDE: jabberd
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-
-
-# Define these jabberd_* variables in one of these files:
-# /etc/rc.conf
-# /etc/rc.conf.local
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-jabberd_chdir=${jabberd_chdir-"%%JABBER_RUNDIR%%/pid"}
-jabberd_enable=${jabberd_enable-"NO"}
-jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
-
-. /etc/rc.subr
-
-name="jabberd"
-rcvar=jabberd_enable
-command_interpreter="%%PERL%%"
-command="%%PREFIX%%/bin/jabberd"
-command_args="-b"
-stop_postcmd=jabberd_post_stopcmd
-
-load_rc_config $name
-
-jabberd_post_stopcmd()
-{
- for file in c2s router s2s sm; do
- rm -f ${jabberd_chdir}/$file.pid
- done
-}
-
-case "$1" in
- forcestop)
- echo "Stopping jabberd."
- killall -u ${jabberd_user} c2s router s2s sm
- jabberd_post_stopcmd
- ;;
- *)
- run_rc_command "$1"
- ;;
-esac
Deleted: trunk/net-im/jabberd/files/patch-etc-Makefile.in
===================================================================
--- trunk/net-im/jabberd/files/patch-etc-Makefile.in 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/patch-etc-Makefile.in 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,20 +0,0 @@
---- etc/Makefile.in.orig 2011-06-19 11:33:59.341460610 +0200
-+++ etc/Makefile.in 2011-06-19 11:35:29.949061936 +0200
-@@ -539,7 +539,7 @@
- uninstall: uninstall-recursive
-
- install-am: all-am
-- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-
- installcheck: installcheck-recursive
- install-strip:
-@@ -623,7 +623,7 @@
-
- ps-am:
-
--uninstall-am: uninstall-initDATA uninstall-sysconfDATA
-+uninstall-am: uninstall-sysconfDATA
-
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-data-am install-strip tags-recursive
Deleted: trunk/net-im/jabberd/files/patch-s2s-out.c
===================================================================
--- trunk/net-im/jabberd/files/patch-s2s-out.c 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/patch-s2s-out.c 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,11 +0,0 @@
---- s2s/out.c.orig 2012-08-22 08:03:58.000000000 +0200
-+++ s2s/out.c 2013-06-13 23:25:13.528682146 +0200
-@@ -627,7 +627,7 @@
- nad_free(pkt->nad);
- free(pkt);
-
-- return;
-+ return 0;
- }
-
- /* new route key */
Deleted: trunk/net-im/jabberd/files/patch-sm-mod_iq_time.c
===================================================================
--- trunk/net-im/jabberd/files/patch-sm-mod_iq_time.c 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/patch-sm-mod_iq_time.c 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,11 +0,0 @@
---- sm/mod_iq_time.c.orig 2007-10-17 21:15:26.000000000 +0200
-+++ sm/mod_iq_time.c 2007-10-21 22:13:05.000000000 +0200
-@@ -77,7 +77,7 @@
-
- datetime_out(t, dt_DATETIME, buf, 64);
- nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
--#ifdef HAVE_TZSET
-+#ifdef HAVE_TZNAME
- snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60), -((int)timezone)%(60*60));
- #else
- snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
Deleted: trunk/net-im/jabberd/files/patch-sm-mod_roster.c
===================================================================
--- trunk/net-im/jabberd/files/patch-sm-mod_roster.c 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/patch-sm-mod_roster.c 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,11 +0,0 @@
---- sm/mod_roster.c.orig 2012-02-12 22:36:18.000000000 +0100
-+++ sm/mod_roster.c 2013-06-13 23:42:35.669583304 +0200
-@@ -460,7 +460,7 @@
- log_debug(ZONE, "added %s to roster (to %d from %d ask %d name %s ngroups %d)", jid_full(item->jid), item->to, item->from, item->ask, item->name, item->ngroups);
-
- if (sm_storage_rate_limit(sess->user->sm, jid_user(sess->user->jid)))
-- return -stanza_err_RESOURCE_CONSTRAINT;
-+ return;
-
- /* save changes */
- _roster_save_item(sess->user, item);
Deleted: trunk/net-im/jabberd/files/patch-tools-jabberd.in
===================================================================
--- trunk/net-im/jabberd/files/patch-tools-jabberd.in 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/patch-tools-jabberd.in 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,53 +0,0 @@
---- tools/jabberd.in.orig 2008-05-22 17:36:30.000000000 +0200
-+++ tools/jabberd.in 2008-06-20 13:24:34.000000000 +0200
-@@ -1,9 +1,4 @@
--#!/bin/sh
--#-*-Perl-*-
--
--exec perl -w -x $0 "$@"
--
--#!perl
-+#!%%PERL%%
-
- ##############################################################################
- #
-@@ -27,8 +22,7 @@
- my $Bin = "@bindir@";
- my $VERSION = "@VERSION@";
- my $config_dir = "@sysconfdir@";
--my $config = $config_dir."/jabberd.cfg";
--$config = "internal" unless (-e $config);
-+my $config = "jabberd.cfg";
- my $debug = 0;
- my $daemon = 0;
- my $select = IO::Select->new();
-@@ -42,13 +36,20 @@
- # Process the command line arguments
- #-----------------------------------------------------------------------------
- my %opts;
--getopts("c:Dhb",\%opts);
-+getopts("c:d:Dhb",\%opts);
- &usage if exists($opts{h});
- if (exists($opts{c}))
- {
- $config = $opts{c} if (defined($opts{c}) && ($opts{c} ne ""));
- &usage() if (!defined($opts{c}) || ($opts{c} eq ""));
- }
-+if (exists($opts{d}))
-+{
-+ $config_dir = $opts{d} if (defined($opts{d}) && ($opts{d} ne ""));
-+ &usage() if (!defined($opts{d}) || ($opts{d} eq ""));
-+}
-+$config = $config_dir.'/'.$config if ($config !~ /^\//);
-+$config = "internal" unless (-e $config);
-
- $debug = 1 if exists($opts{D});
- $daemon = 1 if exists($opts{b});
-@@ -113,6 +114,7 @@
- &debug("jabberd","stdout","debug on\n");
- &debug("jabberd","stdout","version($VERSION)\n");
- &debug("jabberd","stdout","config_dir($config_dir)\n");
-+ &debug("jabberd","stdout","config($config)\n");
- }
-
- #-----------------------------------------------------------------------------
Deleted: trunk/net-im/jabberd/files/pkg-deinstall.in
===================================================================
--- trunk/net-im/jabberd/files/pkg-deinstall.in 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/pkg-deinstall.in 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,13 +0,0 @@
-#!/bin/sh
-# $MidnightBSD$
-
-if [ "$2" != "POST-DEINSTALL" ]; then
- exit 0
-fi
-
-RUNDIR="%%JABBER_RUNDIR%%"
-
-echo "===> You should manually delete the following directories:"
-echo "${RUNDIR}"
-
-exit 0
Deleted: trunk/net-im/jabberd/files/pkg-install.in
===================================================================
--- trunk/net-im/jabberd/files/pkg-install.in 2015-05-15 03:28:38 UTC (rev 18959)
+++ trunk/net-im/jabberd/files/pkg-install.in 2015-05-15 03:30:12 UTC (rev 18960)
@@ -1,24 +0,0 @@
-#!/bin/sh
-# $MidnightBSD$
-
-if [ "$2" != "POST-INSTALL" ]; then
- exit 0
-fi
-
-USER=%%JABBER_USER%%
-GROUP=%%JABBER_GROUP%%
-ETCDIR=%%JABBER_ETCDIR%%
-RUNDIR=%%JABBER_RUNDIR%%
-
-if [ ! -d ${RUNDIR} ]; then
- echo "===> Creating \"${RUNDIR}\"."
- mkdir -p ${RUNDIR}/pid ${RUNDIR}/db ${RUNDIR}/logs
-fi
-
-echo "===> Changing owner and modes for \"${ETCDIR}\"."
-chown -R ${USER}:${GROUP} ${ETCDIR}
-chmod -R go= ${ETCDIR}
-
-echo "===> Changing owner and modes for \"${RUNDIR}\"."
-chown -R ${USER}:${GROUP} ${RUNDIR}
-chmod -R go= ${RUNDIR}
More information about the Midnightbsd-cvs
mailing list