- recreated for 2.2.17

diff --git a/jabberd-binary_path.patch b/jabberd-binary_path.patch
index a8c4dd5b868ed4353698c931342f444bf6c585a8..185de1ff1b85780b42cb865205d7d38a0f7817a3 100644 (file)
--- a/jabberd-binary_path.patch
+++ b/jabberd-binary_path.patch
@@ -1,11 +1,11 @@
-diff -dur -x '*.orig' jabberd-2.0s2.orig/tools/Makefile.am jabberd-2.0s2/tools/Makefile.am
---- jabberd-2.0s2.orig/tools/Makefile.am       2003-12-16 02:01:34.000000000 +0100
-+++ jabberd-2.0s2/tools/Makefile.am    2004-02-10 13:36:11.462922856 +0100
-@@ -3,6 +3,7 @@
+diff -ur jabberd-2.2.17.orig/tools/Makefile.am jabberd-2.2.17/tools/Makefile.am
+--- jabberd-2.2.17.orig/tools/Makefile.am      2012-05-04 18:17:10.000000000 +0000
++++ jabberd-2.2.17/tools/Makefile.am   2013-07-23 17:39:51.154241563 +0000
+@@ -8,6 +8,7 @@
  
  edit = sed \
        -e 's,@sysconfdir\@,$(sysconfdir),g' \
 +      -e 's,@libdir\@,$(libdir)/jabberd,g' \
        -e 's,@VERSION\@,$(VERSION),g' \
-        -e 's,@bindir\@,$(bindir),g'
- 
+       -e 's,@bindir\@,$(bindir),g' \
+       -e 's,@libexecdir\@,$(libexecdir),g'

diff --git a/jabberd-daemonize.patch b/jabberd-daemonize.patch
index 2f9e8be00d3142d82e79ffa3c5485899ab0d43ad..e123254df8289a54471f8224929e0b8b30b185ea 100644 (file)
--- a/jabberd-daemonize.patch
+++ b/jabberd-daemonize.patch
@@ -1,15 +1,15 @@
-diff -durN jabberd-2.0b1.orig/tools/jabberd.in jabberd-2.0b1/tools/jabberd.in
---- jabberd-2.0b1.orig/tools/jabberd.in        Fri Sep 12 13:40:29 2003
-+++ jabberd-2.0b1/tools/jabberd.in     Fri Sep 12 14:49:46 2003
-@@ -15,6 +15,7 @@
+diff -ur jabberd-2.2.17.orig/tools/jabberd.in jabberd-2.2.17/tools/jabberd.in
+--- jabberd-2.2.17.orig/tools/jabberd.in       2013-07-23 16:51:33.000000000 +0000
++++ jabberd-2.2.17/tools/jabberd.in    2013-07-23 16:52:28.974241647 +0000
+@@ -14,6 +14,7 @@
  use IO::Select;
  use POSIX;
  use POSIX qw(setsid);
 +use Proc::Daemon;
-
+ 
+ 
  #-----------------------------------------------------------------------------
- # Define some initial variables and default them as needed.
-@@ -45,7 +46,24 @@
+@@ -47,7 +48,24 @@
      &usage() if (!defined($opts{c}) || ($opts{c} eq ""));
  }
  

diff --git a/jabberd-delay_jobs.patch b/jabberd-delay_jobs.patch
index d2aa484db0b9bdfb72c838e3bea6c3d1cb1f272c..135819ca800e3484d6aa200ecc87aaaebc93fdc2 100644 (file)
--- a/jabberd-delay_jobs.patch
+++ b/jabberd-delay_jobs.patch
@@ -1,9 +1,10 @@
---- jabberd-2.1.22/tools/jabberd.in.orig       2008-01-22 14:47:39.000000000 +0100
-+++ jabberd-2.1.22/tools/jabberd.in    2008-01-22 14:49:32.000000000 +0100
-@@ -146,6 +146,7 @@
+diff -ur jabberd-2.2.17.orig/tools/jabberd.in jabberd-2.2.17/tools/jabberd.in
+--- jabberd-2.2.17.orig/tools/jabberd.in       2013-07-23 16:52:28.000000000 +0000
++++ jabberd-2.2.17/tools/jabberd.in    2013-07-23 17:39:02.619178938 +0000
+@@ -148,6 +148,7 @@
  foreach my $job (@programs)
  {
-     &LaunchJob($job->[0],$job->[1]);
+     &LaunchJob($job->[0],$job->[1],$job->[2]);
 +    sleep(1);
  }
  

diff --git a/jabberd-perlscript.patch b/jabberd-perlscript.patch
index 6d620bc2a973f3e62b9d72312abddec8578c33ab..fee589d6862dfc0797d0bbdab1413cd6b127a276 100644 (file)
--- a/jabberd-perlscript.patch
+++ b/jabberd-perlscript.patch
@@ -1,6 +1,6 @@
-diff -durN jabberd-2.0b1.orig/tools/jabberd.in jabberd-2.0b1/tools/jabberd.in
---- jabberd-2.0b1.orig/tools/jabberd.in        Thu Mar 13 22:23:42 2003
-+++ jabberd-2.0b1/tools/jabberd.in     Thu Sep 11 09:23:21 2003
+diff -ur jabberd-2.2.17.orig/tools/jabberd.in jabberd-2.2.17/tools/jabberd.in
+--- jabberd-2.2.17.orig/tools/jabberd.in       2012-02-12 21:38:25.000000000 +0000
++++ jabberd-2.2.17/tools/jabberd.in    2013-07-23 16:51:33.574241731 +0000
 @@ -1,9 +1,4 @@
 -#!/bin/sh
 -#-*-Perl-*-

diff --git a/jabberd-reconnect.patch b/jabberd-reconnect.patch
index e46ec8c7f87d202cff8fef54987216d4861e2689..622fbeaad13d1f576febc8570872a0e10c694ce5 100644 (file)
--- a/jabberd-reconnect.patch
+++ b/jabberd-reconnect.patch
@@ -1,6 +1,7 @@
---- jabberd-2.1.22/storage/authreg_mysql.c.orig        2008-01-21 16:16:58.000000000 +0100
-+++ jabberd-2.1.22/storage/authreg_mysql.c     2008-01-22 14:57:56.000000000 +0100
-@@ -421,8 +421,10 @@
+diff -ur jabberd-2.2.17.orig/storage/authreg_mysql.c jabberd-2.2.17/storage/authreg_mysql.c
+--- jabberd-2.2.17.orig/storage/authreg_mysql.c        2011-10-22 19:56:00.000000000 +0000
++++ jabberd-2.2.17/storage/authreg_mysql.c     2013-07-23 17:41:21.229180366 +0000
+@@ -557,8 +557,10 @@
  
      mysql_query(conn, "SET NAMES 'utf8'");
  
@@ -12,10 +13,11 @@
 +    }
  
      ar->user_exists = _ar_mysql_user_exists;
-     ar->get_password = _ar_mysql_get_password;
---- jabberd-2.1.22/storage/storage_mysql.c.orig        2008-01-21 16:16:58.000000000 +0100
-+++ jabberd-2.1.22/storage/storage_mysql.c     2008-01-22 14:57:49.000000000 +0100
-@@ -632,8 +632,10 @@
+     if (MPC_PLAIN == mysqlcontext->password_type) {
+diff -ur jabberd-2.2.17.orig/storage/storage_mysql.c jabberd-2.2.17/storage/storage_mysql.c
+--- jabberd-2.2.17.orig/storage/storage_mysql.c        2011-10-30 18:46:36.000000000 +0000
++++ jabberd-2.2.17/storage/storage_mysql.c     2013-07-23 17:41:21.229180366 +0000
+@@ -610,8 +610,10 @@
          return st_FAILED;
      }