kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- update to 1.6.1.1

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

Approved by:	garga (mentor)
This commit is contained in:
Martin Matuska 2007-07-23 20:03:08 +00:00
parent 936c86d3c4
commit c19b0040d3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=196147
6 changed files with 6 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net-im/jabber/Makefile
View file

@ -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

6
net-im/jabber/distinfo
View file

@ -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

11
net-im/jabber/files/patch-jabberd-lib-jutil.cc
View file

@ -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);

20
net-im/jabber/files/patch-jabberd-log.cc
View file

@ -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] = "";

34
net-im/jabber/files/patch-jsm-sessions.cc
View file

@ -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)

14
net-im/jabber/files/patch-xdb_file-xdbfiletool.cc
View file

@ -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;