aboutsummaryrefslogtreecommitdiffstats
path: root/net-im/jabber
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2008-04-30 19:27:21 +0800
committermm <mm@FreeBSD.org>2008-04-30 19:27:21 +0800
commit2302204bd136297730f73db3a47bd05031379306 (patch)
tree9eb678144325def603d9a326fd9a7c5885217a55 /net-im/jabber
parentb6d4fd0a5f33d66a9f2308538d280eb0c91e62f4 (diff)
downloadfreebsd-ports-gnome-2302204bd136297730f73db3a47bd05031379306.tar.gz
freebsd-ports-gnome-2302204bd136297730f73db3a47bd05031379306.tar.zst
freebsd-ports-gnome-2302204bd136297730f73db3a47bd05031379306.zip
- fix IPv6 support [1]
- remove autodetection of MySQL and PostgreSQL if not selected - bump PORTREVISION PR: ports/123253 [1] Submitted by: Ruben van Staveren <ruben@verweg.com> Approved by: mm (maintainer)
Diffstat (limited to 'net-im/jabber')
-rw-r--r--net-im/jabber/Makefile2
-rw-r--r--net-im/jabber/files/patch-configure40
-rw-r--r--net-im/jabber/files/patch-jabberd-lib-socket.cc11
-rw-r--r--net-im/jabber/files/patch-jabberd-mio.cc17
4 files changed, 62 insertions, 8 deletions
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 3cb71cdad63c..4d95f0bf2961 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -7,7 +7,7 @@
PORTNAME= jabber
PORTVERSION= 1.6.1.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net-im ipv6
MASTER_SITES= http://download.jabberd.org/jabberd14/ \
diff --git a/net-im/jabber/files/patch-configure b/net-im/jabber/files/patch-configure
index a7ebde67a905..89cd51559276 100644
--- a/net-im/jabber/files/patch-configure
+++ b/net-im/jabber/files/patch-configure
@@ -1,6 +1,32 @@
---- configure.orig Sat Feb 17 10:54:39 2007
-+++ configure Sat Feb 17 10:56:22 2007
-@@ -23750,8 +23750,8 @@
+--- configure.orig 2007-07-19 00:24:45.000000000 +0200
++++ configure 2008-04-29 18:51:04.000000000 +0200
+@@ -21168,6 +21168,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
++#include <sys/stddef.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netdb.h>
+@@ -22554,7 +22555,7 @@
+ if test "${with_mysql+set}" = set; then
+ withval=$with_mysql; mysql=$withval
+ else
+- mysql=yes
++ mysql=no
+ fi
+
+ if test "$mysql" != "no"; then
+@@ -22778,7 +22779,7 @@
+ if test "${with_postgresql+set}" = set; then
+ withval=$with_postgresql; postgresql=$withval
+ else
+- postgresql=yes
++ postgresql=no
+ fi
+
+ if test "$postgresql" != "no"; then
+@@ -22787,8 +22788,8 @@
CPPFLAGS="${CPPFLAGS} -I$postgresql/include"
fi
if test "${ac_cv_header_postgresql_libpq_fe_h+set}" = set; then
@@ -11,7 +37,7 @@
if test "${ac_cv_header_postgresql_libpq_fe_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-@@ -23759,8 +23759,8 @@
+@@ -22796,8 +22797,8 @@
echo "${ECHO_T}$ac_cv_header_postgresql_libpq_fe_h" >&6; }
else
# Is the header compilable?
@@ -22,7 +48,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23768,7 +23768,7 @@
+@@ -22805,7 +22806,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -31,7 +57,7 @@
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -23817,15 +23817,15 @@
+@@ -22837,15 +22838,15 @@
echo "${ECHO_T}$ac_header_compiler" >&6; }
# Is the header present?
@@ -50,7 +76,7 @@
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -23865,30 +23865,30 @@
+@@ -22878,30 +22879,30 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
yes:no: )
diff --git a/net-im/jabber/files/patch-jabberd-lib-socket.cc b/net-im/jabber/files/patch-jabberd-lib-socket.cc
new file mode 100644
index 000000000000..7fa886369201
--- /dev/null
+++ b/net-im/jabber/files/patch-jabberd-lib-socket.cc
@@ -0,0 +1,11 @@
+--- jabberd/lib/socket.cc.orig 2007-07-17 01:20:44.000000000 +0200
++++ jabberd/lib/socket.cc 2008-04-29 19:05:42.000000000 +0200
+@@ -95,6 +95,8 @@
+ sa.sin_addr.s_addr = saddr->s_addr;
+ #endif
+
++ flag = 0;
++ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&flag, sizeof(flag));
+ if(bind(s,(struct sockaddr*)&sa,sizeof sa) < 0)
+ {
+ close(s);
diff --git a/net-im/jabber/files/patch-jabberd-mio.cc b/net-im/jabber/files/patch-jabberd-mio.cc
new file mode 100644
index 000000000000..2deabd342a89
--- /dev/null
+++ b/net-im/jabber/files/patch-jabberd-mio.cc
@@ -0,0 +1,17 @@
+--- jabberd/mio.cc.orig 2008-04-29 18:54:19.000000000 +0200
++++ jabberd/mio.cc 2008-04-29 19:00:45.000000000 +0200
+@@ -673,11 +673,14 @@
+ sa.sin6_flowinfo = 0;
+
+ inet_pton(AF_INET6, addr_str, &sa.sin6_addr);
++ flag = 0;
++ setsockopt(newm->fd, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&flag, sizeof(flag));
+ #else
+ struct sockaddr_in sa;
+ sa.sin_family = AF_INET;
+ sa.sin_port = 0;
+ inet_aton(xmlnode_get_data(xmlnode_get_list_item(xmlnode_get_tags(greymatter__, "io/bind", namespaces, temp_pool), 0)), &sa.sin_addr);
++
+ #endif
+ bind(newm->fd, (struct sockaddr*)&sa, sizeof(sa));
+ }