Import gabber-0.8.3

gabber is a complete GNOME jabber client. Jabber is an extensible,
open source Instant Messaging system that provides advanced IM
features in a completely distributed environment.

WWW: http://gabber.sourceforge.net/

Maintainer Alexander Yurchenko <grange@rt.mipt.ru>
This commit is contained in:
todd 2002-10-28 17:22:17 +00:00
parent a8518b08c6
commit 08f78ca76c
10 changed files with 470 additions and 0 deletions

43
net/gabber/Makefile Normal file
View File

@ -0,0 +1,43 @@
# $OpenBSD: Makefile,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
# $RuOBSD: Makefile,v 1.9 2002/10/28 16:01:41 grange Exp $
COMMENT= "GNOME jabber client"
DISTNAME= gabber-0.8.7
CATEGORIES= net x11/gnome
HOMEPAGE= http://gabber.sourceforge.net/
MAINTAINER= Alexander Yurchenko <grange@rt.mipt.ru>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gabber/}
LIB_DEPENDS= sigc.0::devel/libsigc++ gal.19::devel/gal \
gnomemm.9::x11/gnomemm
RUN_DEPENDS= :gnupg-*:security/gnupg
BUILD_DEPENDS= ${RUN_DEPENDS}
USE_X11= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --enable-ipv6
NO_REGRESS= Yes
FLAVORS= xmms
FLAVOR?=
.if ${FLAVOR:L:Mxmms}
LIB_DEPENDS+= xmms.3::audio/xmms
.else
CONFIGURE_ARGS+= --disable-xmms
.endif
.include <bsd.port.mk>

3
net/gabber/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (gabber-0.8.7.tar.gz) = afd0c258b27dfb386e7ec668a9d371aa
RMD160 (gabber-0.8.7.tar.gz) = 91a03d469c9304a85df29b9e58095a8b28c7cdff
SHA1 (gabber-0.8.7.tar.gz) = f12526a158bb132451fc210c28a41247c3ec7dc9

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
$RuOBSD: patch-configure,v 1.1 2002/10/16 23:57:38 grange Exp $
--- configure.orig Thu Oct 17 03:29:40 2002
+++ configure Thu Oct 17 03:29:49 2002
@@ -13264,6 +13264,7 @@ echo $ECHO_N "checking for IPv6... $ECHO
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <arpa/inet.h>
#ifdef F77_DUMMY_MAIN

View File

@ -0,0 +1,22 @@
$OpenBSD: patch-doc_C_Makefile_in,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
$RuOBSD: patch-doc_C_Makefile_in,v 1.1 2002/10/16 01:24:18 grange Exp $
--- doc/C/Makefile.in.orig Wed Oct 16 04:31:36 2002
+++ doc/C/Makefile.in Wed Oct 16 04:35:39 2002
@@ -370,14 +370,14 @@ dist-hook:
-cp *.png $(distdir)/
install-data-local: index.html
- $(mkinstalldirs) $(gabber_helpdir)/stylesheet-images
+ $(mkinstalldirs) $(DESTDIR)$(gabber_helpdir)/stylesheet-images
-for file in $(SGML_FILES) $(srcdir)/gabber/*.html $(srcdir)/gabber/*.css $(srcdir)/*.png; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $(srcdir)/$$file $(gabber_helpdir)/$$basefile; \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gabber_helpdir)/$$basefile; \
done
-for file in $(srcdir)/gabber/stylesheet-images/*.*; do \
basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $(srcdir)/$$file $(gabber_helpdir)/stylesheet-images/$$basefile; \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gabber_helpdir)/stylesheet-images/$$basefile; \
done
gabber.ps: $(SGML_FILES)

View File

@ -0,0 +1,21 @@
$RuOBSD: patch-omf-install_Makefile_in,v 1.1.1.1 2002/10/14 07:09:09 grange Exp $
$OpenBSD: patch-omf-install_Makefile_in,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
--- omf-install/Makefile.in.orig Mon Feb 18 02:19:08 2002
+++ omf-install/Makefile.in Sun Oct 13 22:31:29 2002
@@ -306,14 +306,14 @@ install-data-local:
-for file in $(srcdir)/*.omf; do \
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
done
- -scrollkeeper-update -p $(localstatedir)/scrollkeeper
+# -scrollkeeper-update -p $(localstatedir)/scrollkeeper
uninstall-local:
-for file in $(srcdir)/*.omf; do \
basefile=`basename $$file`; \
rm -f $(omf_dest_dir)/$$basefile; \
done
- -scrollkeeper-update -p $(localstatedir)/scrollkeeper
+# -scrollkeeper-update -p $(localstatedir)/scrollkeeper
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-pixmaps_Makefile_in,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
$RuOBSD: patch-pixmaps_Makefile_in,v 1.1.1.1 2002/10/14 07:09:09 grange Exp $
--- pixmaps/Makefile.in.orig Mon Feb 18 02:19:08 2002
+++ pixmaps/Makefile.in Sun Oct 13 21:55:36 2002
@@ -436,7 +436,7 @@ uninstall-am: uninstall-gladeDATA uninst
install-exec-hook:
- (cd $(datadir)/gabber; \
+ (cd $(DESTDIR)$(datadir)/gabber; \
ln -sf ../pixmaps/gnome-info.png gnome-info.png; \
ln -sf ../pixmaps/gnome-lockscreen.png gnome-locksreen.png; \
ln -sf ../pixmaps/gnome-globe.png gnome-globe.png; \

View File

@ -0,0 +1,175 @@
$OpenBSD: patch-src_TCPTransmitter_cc,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
$RuOBSD: patch-src_TCPTransmitter_cc,v 1.4 2002/10/26 12:04:30 grange Exp $
--- src/TCPTransmitter.cc.orig Mon Feb 18 01:29:51 2002
+++ src/TCPTransmitter.cc Sat Oct 26 15:51:24 2002
@@ -120,13 +120,15 @@ void TCPTransmitter::connect(const strin
// Set autoreconnect and use_ssl
_autoreconnect = autoreconnect;
_use_ssl = use_ssl;
-
+
+#if 0
#ifdef WITH_IPV6
if (inet_addr(chost.c_str()) != INADDR_NONE)
{ // IP address in IPv4 notation - convert
chost = "::ffff:" + chost;
}
#endif
+#endif
#ifdef TRANSMITTER_DEBUG
if (_proxy.type == none)
@@ -173,7 +175,7 @@ void TCPTransmitter::connect(const strin
_host_sockaddr.sin_port = g_htons(cport);
#endif
// resolve host
- _async_resolve(chost.c_str());
+ _async_resolve(chost.c_str(), cport);
}
else
{
@@ -944,15 +946,26 @@ const string TCPTransmitter::getSocketEr
return("Unknown error");
}
-void TCPTransmitter::_async_resolve(const gchar* hostname)
+void TCPTransmitter::_async_resolve(const gchar* hostname, guint port)
{
+ char p[6];
+ struct addrinfo hints;
+
g_assert(hostname != NULL);
// check if hostname is in dotted decimal notation
+#if 0
#ifdef WITH_IPV6
if (inet_pton(AF_INET6, hostname, &_host_sockaddr.sin6_addr) != 0)
#else
if (inet_aton(hostname, &_host_sockaddr.sin_addr) != 0)
#endif
+#endif
+ snprintf(p, 5, "%u", port);
+ p[5] = '\0';
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = PF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ if (getaddrinfo(hostname, p, &hints, &_res0) == 0)
{
// all done
_hostResolved = true;
@@ -1071,65 +1084,76 @@ void TCPTransmitter::_async_resolve(cons
void TCPTransmitter::_async_connect()
{
+ struct addrinfo *res;
+ char hbuf[MAXHOSTNAMELEN];
// connect non-blocking
// create socket
-#ifdef WITH_IPV6
- _socketfd = socket(PF_INET6, SOCK_STREAM, 0);
-#else
- _socketfd = socket(PF_INET, SOCK_STREAM, 0);
-#endif
- if (_socketfd < 0)
+ _socketfd = -1;
+ for (res = _res0; res; res = res->ai_next)
{
- // something nasty happened
+ _socketfd = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+ if (_socketfd < 0)
+ {
+ // something nasty happened
#ifdef TRANSMITTER_DEBUG
- cout << "socket() failed: " << strerror(errno) << endl;
+ cout << "socket() failed: " << strerror(errno) << endl;
#endif
- handleError(strerror(errno));
- return;
- }
- _socket_flags = fcntl(_socketfd, F_GETFL, 0);
- if (_socket_flags == -1)
- {
- // not good
+ handleError(strerror(errno));
+ continue;
+ }
+ _socket_flags = fcntl(_socketfd, F_GETFL, 0);
+ if (_socket_flags == -1)
+ {
+ // not good
#ifdef TRANSMITTER_DEBUG
- cout << "fcntl F_GETFL failed on socket: " << strerror(errno) << endl;
+ cout << "fcntl F_GETFL failed on socket: " << strerror(errno) << endl;
#endif
- handleError(errSocket);
- return;
- }
- if (fcntl(_socketfd, F_SETFL, _socket_flags | O_NONBLOCK) == -1)
- {
- // damn!
+ handleError(errSocket);
+ continue;
+ }
+ if (fcntl(_socketfd, F_SETFL, _socket_flags | O_NONBLOCK) == -1)
+ {
+ // damn!
#ifdef TRANSMITTER_DEBUG
- cout << "fcntl F_SETFL failed on socket: " << strerror(errno) << endl;
+ cout << "fcntl F_SETFL failed on socket: " << strerror(errno) << endl;
#endif
- handleError(strerror(errno));
- return;
- }
+ handleError(strerror(errno));
+ continue;
+ }
- int one = 1;
- if (setsockopt(_socketfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)) < 0)
- {
+ int one = 1;
+ if (setsockopt(_socketfd, SOL_SOCKET, SO_KEEPALIVE, &one, sizeof(one)) < 0)
+ {
#ifdef TRANSMITTER_DEBUG
- cout << "setsockopt failed: " << strerror(errno) << endl;
+ cout << "setsockopt failed: " << strerror(errno) << endl;
#endif
- }
+ }
- // try to connect non-blocking
- if (::connect(_socketfd, (struct sockaddr*) (&_host_sockaddr), sizeof(_host_sockaddr)) < 0)
- {
- if (errno != EINPROGRESS)
+ // try to connect non-blocking
+#ifdef TRANSMITTER_DEBUG
+ getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST);
+ cout << "Trying " << hbuf << endl;
+#endif
+ if (::connect(_socketfd, res->ai_addr, res->ai_addrlen) < 0)
{
- // Yikes!
+ if (errno != EINPROGRESS)
+ {
+ // Yikes!
#ifdef TRANSMITTER_DEBUG
- cout << "connect failed: " << strerror(errno) << endl;
+ cout << "connect failed: " << strerror(errno) << endl;
#endif
- handleError(strerror(errno));
- return;
+ handleError(strerror(errno));
+ close(_socketfd);
+ _socketfd = -1;
+ continue;
+ }
}
+ break;
}
-
+ if (_socketfd < 0)
+ return;
+
_IOChannel = g_io_channel_unix_new(_socketfd);
_socket_watchid = g_io_add_watch(_IOChannel,
GIOCondition(G_IO_IN | G_IO_OUT | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL),

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-src_TCPTransmitter_hh,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
$RuOBSD: patch-src_TCPTransmitter_hh,v 1.1 2002/10/25 23:10:42 grange Exp $
--- src/TCPTransmitter.hh.orig Mon Jan 28 08:43:18 2002
+++ src/TCPTransmitter.hh Sat Oct 26 02:39:35 2002
@@ -141,7 +141,7 @@ private:
static string encodeBase64(string text);
- void _async_resolve(const gchar* hostname);
+ void _async_resolve(const gchar* hostname, guint port);
void _async_connect();
#ifdef WITH_IPV6
bool _gethostbyname(const gchar* hostname, struct in6_addr* result);
@@ -182,7 +182,8 @@ private:
string response_line;
HandshakeState socks5_state;
} _proxy;
-
+
+ struct addrinfo *_res0;
#ifdef WITH_IPV6
struct sockaddr_in6 _host_sockaddr;
#else

5
net/gabber/pkg/DESCR Normal file
View File

@ -0,0 +1,5 @@
gabber is a complete GNOME jabber client. Jabber is an extensible,
open source Instant Messaging system that provides advanced IM
features in a completely distributed environment.
WWW: ${HOMEPAGE}

153
net/gabber/pkg/PLIST Normal file
View File

@ -0,0 +1,153 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2002/10/28 17:22:17 todd Exp $
@comment $RuOBSD: PLIST,v 1.2 2002/10/16 01:24:19 grange Exp $
bin/gabber
man/man1/gabber.1
share/gabber/AUDruid_win.glade
share/gabber/AgentBrowser_dlg.glade
share/gabber/Autoupdate_dlg.glade
share/gabber/ContactInfo_dlg.glade
share/gabber/ContactRecv_dlg.glade
share/gabber/ContactSend_dlg.glade
share/gabber/EditGroups_dlg.glade
share/gabber/FTRecv_dlg.glade
share/gabber/FTSend_dlg.glade
share/gabber/FTTransfer_dlg.glade
share/gabber/FilterList_dlg.glade
share/gabber/Filter_dlg.glade
share/gabber/GCIRecv_dlg.glade
share/gabber/GCI_dlg.glade
share/gabber/GCJoin_dlg.glade
share/gabber/GC_win.glade
share/gabber/GPGInfo_dlg.glade
share/gabber/GPGPass_dlg.glade
share/gabber/Gabber_win.glade
share/gabber/IgnoreAdd_dlg.glade
share/gabber/Ignore_dlg.glade
share/gabber/Login_dlg.glade
share/gabber/MessageRecv_win.glade
share/gabber/MessageSend_win.glade
share/gabber/MyContactInfo_win.glade
share/gabber/OOOChat_win.glade
share/gabber/Prefs_win.glade
share/gabber/RawXML_dlg.glade
share/gabber/RegDruid_win.glade
share/gabber/Status_dlg.glade
share/gabber/SubscriptionRequest_dlg.glade
share/gabber/TransInfo_dlg.glade
share/gabber/URLRecv_dlg.glade
share/gabber/Welcome_win.glade
share/gabber/connected-ssl.xpm
share/gabber/connected.xpm
share/gabber/disconnected.xpm
share/gabber/gabber-logs.css
share/gabber/glade-add-group-menu.xpm
share/gabber/glade-alert.xpm
share/gabber/glade-blank.xpm
share/gabber/glade-contact.xpm
share/gabber/glade-delete-user-menu.xpm
share/gabber/glade-delete-user.xpm
share/gabber/glade-edit-group-menu.xpm
share/gabber/glade-edit-user-menu.xpm
share/gabber/glade-edit-user.xpm
share/gabber/glade-file.xpm
share/gabber/glade-gabber-logo.png
share/gabber/glade-gabber-sideways.png
share/gabber/glade-gci.xpm
share/gabber/glade-group.xpm
share/gabber/glade-groupchat-menu.xpm
share/gabber/glade-groupchat.xpm
share/gabber/glade-message.xpm
share/gabber/glade-new-user-menu.xpm
share/gabber/glade-new-user.xpm
share/gabber/glade-noclose.xpm
share/gabber/glade-ooochat.xpm
share/gabber/glade-receive-file.xpm
share/gabber/glade-s10n.xpm
share/gabber/glade-send-contact-menu.xpm
share/gabber/glade-send-file-menu.xpm
share/gabber/glade-send-file.xpm
share/gabber/glade-send-gci.xpm
share/gabber/glade-sendasnormal.xpm
share/gabber/glade-sendasooo.xpm
share/gabber/glade-unlock-key.xpm
share/gabber/glade-users.xpm
share/gabber/gnome-globe.png
share/gabber/gnome-info.png
share/gabber/gnome-locksreen.png
share/gabber/gnome-modem.png
share/gabber/gnome-question.png
share/gabber/gpg-badsigned.xpm
share/gabber/gpg-encrypted.xpm
share/gabber/gpg-signed.xpm
share/gabber/gpg-unencrypted.xpm
share/gabber/gpg-unsigned.xpm
share/gabber/offline.xpm
share/gnome/apps/Internet/gabber.desktop
share/gnome/help/gabber/C/first.html
share/gnome/help/gabber/C/first.png
share/gnome/help/gabber/C/gabber.sgml
share/gnome/help/gabber/C/index.html
share/gnome/help/gabber/C/intro.html
share/gnome/help/gabber/C/legalnotice.html
share/gnome/help/gabber/C/login.png
share/gnome/help/gabber/C/main-menubar.html
share/gnome/help/gabber/C/main-status.html
share/gnome/help/gabber/C/main-toolbar.html
share/gnome/help/gabber/C/main.html
share/gnome/help/gabber/C/main.png
share/gnome/help/gabber/C/msg-normal.png
share/gnome/help/gabber/C/msg-ooo.png
share/gnome/help/gabber/C/stylesheet-images/caution.gif
share/gnome/help/gabber/C/stylesheet-images/home.gif
share/gnome/help/gabber/C/stylesheet-images/important.gif
share/gnome/help/gabber/C/stylesheet-images/next.gif
share/gnome/help/gabber/C/stylesheet-images/note.gif
share/gnome/help/gabber/C/stylesheet-images/prev.gif
share/gnome/help/gabber/C/stylesheet-images/tip.gif
share/gnome/help/gabber/C/stylesheet-images/toc-blank.gif
share/gnome/help/gabber/C/stylesheet-images/toc-minus.gif
share/gnome/help/gabber/C/stylesheet-images/toc-plus.gif
share/gnome/help/gabber/C/stylesheet-images/up.gif
share/gnome/help/gabber/C/stylesheet-images/warning.gif
share/gnome/help/gabber/C/topic.dat
share/omf/gabber/gabber-C.omf
share/pixmaps/gabber.png
share/pixmaps/gabber/away.xpm
share/pixmaps/gabber/chat.xpm
share/pixmaps/gabber/dnd.xpm
share/pixmaps/gabber/gabber-about.png
share/pixmaps/gabber/gnome-editgroups.xpm
share/pixmaps/gabber/gnome-gabber.xpm
share/pixmaps/gabber/gnome-gpg.xpm
share/pixmaps/gabber/gnome-groupchat.xpm
share/pixmaps/gabber/gnome-message.xpm
share/pixmaps/gabber/gnome-ooochat.xpm
share/pixmaps/gabber/gnome-s10n.xpm
share/pixmaps/gabber/gnome-userinfo.xpm
share/pixmaps/gabber/invisible.xpm
share/pixmaps/gabber/offline.xpm
share/pixmaps/gabber/online.xpm
share/pixmaps/gabber/stalker.xpm
share/pixmaps/gabber/xa.xpm
share/pixmaps/gabber/xmms.xpm
share/pixmaps/gabber/xmms_paused.xpm
share/pixmaps/gabber/xmms_stopped.xpm
share/sounds/gabber/gabber_connected.wav
share/sounds/gabber/gabber_encrypted.wav
share/sounds/gabber/gabber_message_queue.wav
share/sounds/gabber/gabber_message_recv.wav
share/sounds/gabber/gabber_offline.wav
share/sounds/gabber/gabber_online.wav
share/sounds/gabber/gabber_ooochat_queue.wav
share/sounds/gabber/gabber_ooochat_recv.wav
share/sounds/gabber/gabber_startup.wav
share/sounds/gabber/gabber_subrequest.wav
@dirrm share/sounds/gabber
@dirrm share/pixmaps/gabber
@dirrm share/omf/gabber
@dirrm share/gnome/help/gabber/C/stylesheet-images
@dirrm share/gnome/help/gabber/C
@dirrm share/gnome/help/gabber
@dirrm share/gabber
@exec %D/bin/scrollkeeper-update -p $(%D/bin/scrollkeeper-config --pkglocalstatedir)
@unexec %D/bin/scrollkeeper-update -p $(%D/bin/scrollkeeper-config --pkglocalstatedir)