- update to 1.6.1.1

- remove 4 patches (already in source)
- fix MASTER_SITES

Approved by:	garga (mentor)

6 files changed, 6 insertions, 84 deletions

diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index eb4ce08111de..f6f56a976657 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	jabber
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.1.1
 PORTEPOCH=	1
 CATEGORIES=	net-im ipv6
-MASTER_SITES=	http://download.jabberd.org/jabberd14/
+MASTER_SITES=	http://download.jabberd.org/jabberd14/ \
+		http://download.jabberd.org/jabberd14/old/
 DISTNAME=	jabberd14-${PORTVERSION}
 DIST_SUBDIR=	jabber
 
diff --git a/net-im/jabber/distinfo b/net-im/jabber/distinfo
index e023fd4a0140..64af5f3e36e4 100644
--- a/net-im/jabber/distinfo
+++ b/net-im/jabber/distinfo
@@ -1,3 +1,3 @@
-MD5 (jabber/jabberd14-1.6.1.tar.gz) = 969eeb0ca79062e4390482d475b768f9
-SHA256 (jabber/jabberd14-1.6.1.tar.gz) = b2f19d53fbaf9e2eec7586ebe1b6e61dad8685b991beaadec948085fc0908e0f
-SIZE (jabber/jabberd14-1.6.1.tar.gz) = 833803
+MD5 (jabber/jabberd14-1.6.1.1.tar.gz) = 597c7ee14518ba22b1cee883b4737d87
+SHA256 (jabber/jabberd14-1.6.1.1.tar.gz) = 8bba7f8e8781a088679bdcf0e46348a29da45de3eec2421f73575c5a6b8ddc31
+SIZE (jabber/jabberd14-1.6.1.1.tar.gz) = 834112
diff --git a/net-im/jabber/files/patch-jabberd-lib-jutil.cc b/net-im/jabber/files/patch-jabberd-lib-jutil.cc
deleted file mode 100644
index b000ca03bb63..000000000000
--- a/net-im/jabber/files/patch-jabberd-lib-jutil.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index e5210b311b91..000000000000
--- a/net-im/jabber/files/patch-jabberd-log.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.cc b/net-im/jabber/files/patch-jsm-sessions.cc
deleted file mode 100644
index d297e41aa7e7..000000000000
--- a/net-im/jabber/files/patch-jsm-sessions.cc
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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) {
-     static int seeded = 0;
-+#ifdef _GLIBC_
-     static struct drand48_data rand_state;
-+#endif
-     long int rand_value;
-     int tries = 256;
- 
-@@ -118,13 +120,21 @@
- 	seed_data[0] = now.tv_sec%0x10000;
- 	seed_data[1] = now.tv_sec/0x10000;
- 	seed_data[2] = now.tv_usec%0x10000;
-+#ifdef _GLIBC_
- 	seed48_r(seed_data, &rand_state);
-+#else
-+	seed48(seed_data);
-+#endif
- 	seeded = 1;
-     }
- 
-     /* create an ID, that is not already used */
-     while (tries--) {
-+#ifdef _GLIBC_
- 	lrand48_r(&rand_state, &rand_value);
-+#else
-+	rand_value = lrand48();
-+#endif
- 	snprintf(resultbuffer, 9, "%lx", rand_value);
- 
- 	if (existing_sessions == NULL || xhash_get(existing_sessions, resultbuffer) == NULL)
diff --git a/net-im/jabber/files/patch-xdb_file-xdbfiletool.cc b/net-im/jabber/files/patch-xdb_file-xdbfiletool.cc
deleted file mode 100644
index c350b65cfeab..000000000000
--- a/net-im/jabber/files/patch-xdb_file-xdbfiletool.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- xdb_file/xdbfiletool.cc.orig	Fri Feb  9 11:46:12 2007
-+++ xdb_file/xdbfiletool.cc	Fri Feb  9 11:55:35 2007
-@@ -66,7 +66,11 @@
- 
- int main(int argc, const char **argv) {
-     char *host = NULL;
-+#ifdef __FreeBSD__
-+    const char *error = NULL;
-+#else
-     char *error = NULL;
-+#endif
-     char *cfgfile = CONFIG_DIR "/jabber.xml";
-     char *basedir = NULL;
-     char *do_get = NULL;