- update to 1.6.1

- additional patches
- fix jabber.in, pkg-message.in

Approved by:	garga (mentor)

5 files changed, 35 insertions, 5 deletions

diff --git a/net-im/jabber/files/jabber.in b/net-im/jabber/files/jabber.in
index a0c509b15952..2cb773512240 100644
--- a/net-im/jabber/files/jabber.in
+++ b/net-im/jabber/files/jabber.in
@@ -27,8 +27,7 @@ required_files=%%JABBER_ETCDIR%%/jabber.xml
 : ${jabber_group="%%JABBER_GROUP%%"}
 
 command=%%PREFIX%%/bin/jabberd14
-command_args="${jabberd_flags}"
-pidfile=${jabberd_pidfile}
+pidfile=${jabber_pidfile}
 extra_commands="reload"
 
 run_rc_command "$1"
diff --git a/net-im/jabber/files/patch-jabberd-lib-jutil.cc b/net-im/jabber/files/patch-jabberd-lib-jutil.cc
new file mode 100644
index 000000000000..b000ca03bb63
--- /dev/null
+++ b/net-im/jabber/files/patch-jabberd-lib-jutil.cc
@@ -0,0 +1,11 @@
+--- jabberd/lib/jutil.cc.orig	Tue Jul 17 16:03:22 2007
++++ jabberd/lib/jutil.cc	Tue Jul 17 16:04:28 2007
+@@ -261,7 +261,7 @@
+     struct tm *new_time = NULL;
+ 
+     gettimeofday(&tv, &tz);
+-    new_time = gmtime(&(tv.tv_sec));
++    new_time = gmtime((time_t *)&(tv.tv_sec));
+     snprintf(buffer, sizeof(char[25]), "%d-%02d-%02dT%02d:%02d:%02d.%03dZ", 1900+new_time->tm_year,
+ 	     new_time->tm_mon+1, new_time->tm_mday, new_time->tm_hour,
+ 	     new_time->tm_min, new_time->tm_sec, tv.tv_usec/1000);
diff --git a/net-im/jabber/files/patch-jabberd-log.cc b/net-im/jabber/files/patch-jabberd-log.cc
new file mode 100644
index 000000000000..e5210b311b91
--- /dev/null
+++ b/net-im/jabber/files/patch-jabberd-log.cc
@@ -0,0 +1,20 @@
+--- jabberd/log.cc.orig	Tue Jul 17 01:20:44 2007
++++ jabberd/log.cc	Tue Jul 17 15:57:22 2007
+@@ -282,7 +282,7 @@
+  * @param action action that is logged (e.g. a failed auth)
+  * @param msgfmt printf()-like format string, parameters are following
+  */
+-void log_generic(const char *logtype, const char *id, const char *type, const char *action, const char *msgfmt, ...) {
++void log_generic(char *logtype, char *id, char *type, char *action, const char *msgfmt, ...) {
+     va_list ap;
+     char logmsg[512] = "";
+     xmlnode log;
+@@ -327,7 +327,7 @@
+  * @param action action that is logged (e.g. a failed auth)
+  * @param msgfmt printf()-like format string, parameters are following
+  */
+-void log_record(const char *id, const char *type, const char *action, const char *msgfmt, ...) {
++void log_record(char *id, char *type, char *action, const char *msgfmt, ...) {
+     va_list ap;
+     char logmsg[512] = "";
+ 
diff --git a/net-im/jabber/files/patch-jsm-sessions.c b/net-im/jabber/files/patch-jsm-sessions.cc
index 6f77d05a8676..d297e41aa7e7 100644
--- a/net-im/jabber/files/patch-jsm-sessions.c
+++ b/net-im/jabber/files/patch-jsm-sessions.cc
@@ -1,5 +1,5 @@
---- jsm/sessions.c.orig	Fri Feb  9 11:27:52 2007
-+++ jsm/sessions.c	Fri Feb  9 11:45:32 2007
+--- jsm/sessions.cc.orig	Fri Feb  9 11:27:52 2007
++++ jsm/sessions.cc	Fri Feb  9 11:45:32 2007
 @@ -105,7 +105,9 @@
   */
  static void _js_create_session_id(char resultbuffer[9], xht existing_sessions) {
diff --git a/net-im/jabber/files/pkg-message.in b/net-im/jabber/files/pkg-message.in
index dd33daa33c2a..3070422bef8c 100644
--- a/net-im/jabber/files/pkg-message.in
+++ b/net-im/jabber/files/pkg-message.in
@@ -7,7 +7,7 @@ To configure jabberd14, please copy:
 and edit this file.
 
 For automatic startup define in your rc.conf: 
-jabberd14_enable="YES"
+jabber_enable="YES"
 
 If you want to use file logging instead of syslog, 
 confgiure this in jabber.xml and create the log directory defined there