mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

net-im/telepathy-salut: Remove expired port

Browse Source 
2024-08-21 net-im/telepathy-salut: Fails to build with libxml2 2.13.2 (PR 279963)
This commit is contained in:
Rene Ladan 2024-08-22 22:56:19 +02:00
parent f1495ea199
commit 9567923e96
15 changed files with 1 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MOVED
View File

@ -3437,3 +3437,4 @@ databases/py-redis4|databases/py-redis|2024-08-15|Remove obsoleted port. Use dat
www/py-httpx-cache|devel/py-hishel|2024-08-15|Remove obsoleted port. Use devel/py-hishel instead
devel/p5-Test2-Suite|devel/p5-Test-Simple|2024-08-15|Remove obsoleted port. Use devel/p5-Test-Simple instead
sysutils/beadm-devel|sysutils/beadm|2024-08-17|Has expired: Outdated development port. Use sysutils/beadm instead
net-im/telepathy-salut||2024-08-22|Has expired: Fails to build with libxml2 2.13.2 (PR 279963)

1
net-im/Makefile
View File

@ -157,7 +157,6 @@
SUBDIR += telepathy-logger-qt5
SUBDIR += telepathy-mission-control
SUBDIR += telepathy-qt
SUBDIR += telepathy-salut
SUBDIR += telepathy-sofiasip
SUBDIR += tg_owt
SUBDIR += tkabber

36
net-im/telepathy-salut/Makefile
View File

@ -1,36 +0,0 @@
PORTNAME= telepathy-salut
PORTVERSION= 0.8.1
PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/
MAINTAINER= gnome@FreeBSD.org
COMMENT= Link-local Connection Manager for Telepathy Framework
WWW= https://telepathy.freedesktop.org/
LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
DEPRECATED= Fails to build with libxml2 2.13.2 (PR 279963)
EXPIRATION_DATE=2024-08-21
LIB_DEPENDS= libavahi-glib.so:net/avahi-app \
libtelepathy-glib.so:net-im/telepathy-glib \
libsoup-2.4.so:devel/libsoup
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
USES= gmake gnome libtool pathfix pkgconfig python:build sqlite ssl
USE_GNOME= glib20 libxslt:build
CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no
LDFLAGS+= -lpthread
INSTALL_TARGET= install-strip
PLIST_SUB+= VERSION=${PORTVERSION}
post-patch:
@${REINPLACE_CMD} -e 's|make -C|${GMAKE} -C|g' \
${WRKSRC}/src/Makefile.in \
${WRKSRC}/tests/Makefile.in
.include <bsd.port.mk>

2
net-im/telepathy-salut/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (telepathy-salut-0.8.1.tar.gz) = 70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e
SIZE (telepathy-salut-0.8.1.tar.gz) = 1823482

10
net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
View File

@ -1,10 +0,0 @@
--- lib/gibber/gibber-bytestream-oob.h.orig 2010-10-22 15:15:56 UTC
+++ lib/gibber/gibber-bytestream-oob.h
@@ -20,6 +20,7 @@
#ifndef __GIBBER_BYTESTREAM_OOB_H__
#define __GIBBER_BYTESTREAM_OOB_H__
+#include <netinet/in.h>
#include <glib-object.h>
#include "gibber-bytestream-iface.h"

10
net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c
View File

@ -1,10 +0,0 @@
--- lib/gibber/gibber-muc-connection.c.orig 2012-11-12 14:13:18 UTC
+++ lib/gibber/gibber-muc-connection.c
@@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>

10
net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
View File

@ -1,10 +0,0 @@
--- lib/gibber/gibber-tcp-transport.c.orig 2010-10-22 15:15:56 UTC
+++ lib/gibber/gibber-tcp-transport.c
@@ -20,6 +20,7 @@
#include <config.h>
+#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>

118
net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c
View File

@ -1,118 +0,0 @@
--- lib/gibber/gibber-unix-transport.c.orig 2010-10-22 15:15:56 UTC
+++ lib/gibber/gibber-unix-transport.c
@@ -217,11 +217,12 @@ gibber_unix_transport_send_credentials (GibberUnixTran
gsize size)
{
int fd, ret;
- struct ucred *cred;
struct msghdr msg;
- struct cmsghdr *ch;
struct iovec iov;
- char buffer[CMSG_SPACE (sizeof (struct ucred))];
+ union {
+ struct cmsghdr hdr;
+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } buffer;
DEBUG ("send credentials");
fd = GIBBER_FD_TRANSPORT (transport)->fd;
@@ -234,21 +235,15 @@ gibber_unix_transport_send_credentials (GibberUnixTran
memset (&msg, 0, sizeof (msg));
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
- msg.msg_control = buffer;
- msg.msg_controllen = sizeof (buffer);
+ msg.msg_control = (caddr_t) &buffer;
+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
memset (buffer, 0, sizeof (buffer));
/* Set the credentials */
- ch = CMSG_FIRSTHDR (&msg);
- ch->cmsg_len = CMSG_LEN (sizeof (struct ucred));
- ch->cmsg_level = SOL_SOCKET;
- ch->cmsg_type = SCM_CREDENTIALS;
+ buffer.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
+ buffer.hdr.cmsg_level = SOL_SOCKET;
+ buffer.hdr.cmsg_type = SCM_CREDS;
- cred = (struct ucred *) CMSG_DATA (ch);
- cred->pid = getpid ();
- cred->uid = getuid ();
- cred->gid = getgid ();
-
ret = sendmsg (fd, &msg, 0);
if (ret == -1)
{
@@ -274,10 +269,10 @@ gibber_unix_transport_read (GibberFdTransport *transpo
GibberBuffer buf;
struct iovec iov;
struct msghdr msg;
- char control[CMSG_SPACE (sizeof (struct ucred))];
- struct cmsghdr *ch;
- struct ucred *cred;
- int opt;
+ union {
+ struct cmsghdr hdr;
+ char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
+ } control;
if (priv->recv_creds_cb == NULL)
return gibber_fd_transport_read (transport, channel, error);
@@ -285,10 +280,6 @@ gibber_unix_transport_read (GibberFdTransport *transpo
/* We are waiting for credentials */
fd = transport->fd;
- /* set SO_PASSCRED flag */
- opt = 1;
- setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
-
memset (buffer, 0, sizeof (buffer));
memset (&iov, 0, sizeof (iov));
iov.iov_base = buffer;
@@ -297,8 +288,9 @@ gibber_unix_transport_read (GibberFdTransport *transpo
memset (&msg, 0, sizeof (msg));
msg.msg_iov = &iov;
msg.msg_iovlen = 1;
- msg.msg_control = control;
- msg.msg_controllen = sizeof (control);
+ memset (&control, 0, sizeof (control));
+ msg.msg_control = (caddr_t) &control;
+ msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
bytes_read = recvmsg (fd, &msg, 0);
@@ -317,16 +309,11 @@ gibber_unix_transport_read (GibberFdTransport *transpo
return GIBBER_FD_IO_RESULT_ERROR;
}
- /* unset SO_PASSCRED flag */
- opt = 0;
- setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
-
buf.data = buffer;
buf.length = bytes_read;
/* extract the credentials */
- ch = CMSG_FIRSTHDR (&msg);
- if (ch == NULL)
+ if (control.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred)) || control.hdr.cmsg_type != SCM_CREDS)
{
GError *err = NULL;
@@ -342,11 +329,12 @@ gibber_unix_transport_read (GibberFdTransport *transpo
else
{
GibberCredentials credentials;
+ struct cmsgcred *cred;
- cred = (struct ucred *) CMSG_DATA (ch);
- credentials.pid = cred->pid;
- credentials.uid = cred->uid;
- credentials.gid = cred->gid;
+ cred = (struct cmsgcred *) CMSG_DATA (&control);
+ credentials.pid = cred->cmcred_pid;
+ credentials.uid = cred->cmcred_uid;
+ credentials.gid = cred->cmcred_gid;
priv->recv_creds_cb (self, &buf, &credentials, NULL,
priv->recv_creds_data);

35
net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py
View File

@ -1,35 +0,0 @@
--- tools/glib-client-marshaller-gen.py.orig 2011-08-16 11:04:41 UTC
+++ tools/glib-client-marshaller-gen.py
@@ -31,22 +31,22 @@ class Generator(object):
for signal in signals:
self.do_signal(signal)
- print 'void'
- print '%s_register_dbus_glib_marshallers (void)' % self.prefix
- print '{'
+ print('void')
+ print('%s_register_dbus_glib_marshallers (void)' % self.prefix)
+ print('{')
- all = self.marshallers.keys()
- all.sort()
+ all = list(self.marshallers.keys())
+ sorted(all)
for marshaller in all:
rhs = self.marshallers[marshaller]
- print ' dbus_g_object_register_marshaller (%s,' % marshaller
- print ' G_TYPE_NONE, /* return */'
+ print(' dbus_g_object_register_marshaller (%s,' % marshaller)
+ print(' G_TYPE_NONE, /* return */')
for type in rhs:
- print ' G_TYPE_%s,' % type.replace('VOID', 'NONE')
- print ' G_TYPE_INVALID);'
+ print(' G_TYPE_%s,' % type.replace('VOID', 'NONE'))
+ print(' G_TYPE_INVALID);')
- print '}'
+ print('}')
def types_to_gtypes(types):

38
net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py
View File

@ -1,38 +0,0 @@
--- tools/glib-ginterface-gen.py.orig 2011-08-16 11:04:41 UTC
+++ tools/glib-ginterface-gen.py
@@ -26,7 +26,7 @@ import sys
import os.path
import xml.dom.minidom
-from libglibcodegen import Signature, type_to_gtype, cmp_by_name, \
+from libglibcodegen import Signature, type_to_gtype, \
camelcase_to_lower, NS_TP, dbus_gutils_wincaps_to_uscore, \
signal_to_marshal_name, method_to_glue_marshal_name
@@ -620,7 +620,7 @@ class Generator(object):
self.b('')
nodes = self.dom.getElementsByTagName('node')
- nodes.sort(cmp_by_name)
+ nodes.sort(key=lambda node : node.getAttributeNode('name').nodeValue)
for node in nodes:
self.do_node(node)
@@ -639,7 +639,7 @@ class Generator(object):
def cmdline_error():
- print """\
+ print("""\
usage:
gen-ginterface [OPTIONS] xmlfile Prefix_
options:
@@ -659,7 +659,7 @@ options:
void symbol (DBusGMethodInvocation *context)
and return some sort of "not implemented" error via
dbus_g_method_return_error (context, ...)
-"""
+""")
sys.exit(1)

16
net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py
View File

@ -1,16 +0,0 @@
--- tools/glib-signals-marshal-gen.py.orig 2011-08-16 11:04:41 UTC
+++ tools/glib-signals-marshal-gen.py
@@ -42,11 +42,11 @@ class Generator(object):
self.do_signal(signal)
all = self.marshallers.keys()
- all.sort()
+ sorted(all)
for marshaller in all:
rhs = self.marshallers[marshaller]
if not marshaller.startswith('g_cclosure'):
- print 'VOID:' + ','.join(rhs)
+ print('VOID:' + ','.join(rhs))
if __name__ == '__main__':
argv = sys.argv[1:]

32
net-im/telepathy-salut/files/patch-tools_libglibcodegen.py
View File

@ -1,32 +0,0 @@
--- tools/libglibcodegen.py.orig 2011-07-07 15:24:48 UTC
+++ tools/libglibcodegen.py
@@ -191,7 +191,10 @@ class _SignatureIter:
def __init__(self, string):
self.remaining = string
- def next(self):
+ def __iter__(self):
+ self
+
+ def __next__(self):
if self.remaining == '':
raise StopIteration
@@ -297,7 +300,7 @@ def type_to_gtype(s):
return ("GHashTable *", "DBUS_TYPE_G_STRING_STRING_HASHTABLE", "BOXED", False)
elif s[:2] == 'a{': #some arbitrary hash tables
if s[2] not in ('y', 'b', 'n', 'q', 'i', 'u', 's', 'o', 'g'):
- raise Exception, "can't index a hashtable off non-basic type " + s
+ raise Exception("can't index a hashtable off non-basic type " + s)
first = type_to_gtype(s[2])
second = type_to_gtype(s[3:-1])
return ("GHashTable *", "(dbus_g_type_get_map (\"GHashTable\", " + first[1] + ", " + second[1] + "))", "BOXED", False)
@@ -312,7 +315,7 @@ def type_to_gtype(s):
return ("GValueArray *", gtype, "BOXED", True)
# we just don't know ..
- raise Exception, "don't know the GType for " + s
+ raise Exception("don't know the GType for " + s)
def xml_escape(s):

19
net-im/telepathy-salut/files/patch-tools_make-release-mail.py
View File

@ -1,19 +0,0 @@
--- tools/make-release-mail.py.orig 2012-11-12 14:13:18 UTC
+++ tools/make-release-mail.py
@@ -50,14 +50,14 @@ GIT_URL = 'http://cgit.freedesktop.org/telepathy'
def main(package, version, news_path):
release_name, details = extract_description(package, version, news_path)
- print """
+ print("""
%(release_name)s
tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz
signature: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz.asc
git: %(git_url)s/%(package)s
-%(details)s""".strip().rstrip() % {
+%(details)s""").strip().rstrip() % {
'base_url': BASE_URL,
'git_url': GIT_URL,
'package': package,

2
net-im/telepathy-salut/pkg-descr
View File

@ -1,2 +0,0 @@
Telepathy is a real time communications framework. Salut provides
Link-local Jabber functionality for Telepathy.

10
net-im/telepathy-salut/pkg-plist
View File

@ -1,10 +0,0 @@
lib/telepathy/salut-0/lib/libsalut-plugins-%%VERSION%%.so
lib/telepathy/salut-0/lib/libsalut-plugins.so
lib/telepathy/salut-0/lib/libwocky-telepathy-salut-%%VERSION%%.so
lib/telepathy/salut-0/lib/libwocky.a
lib/telepathy/salut-0/lib/libwocky.so
libexec/telepathy-salut
share/man/man8/telepathy-salut.8.gz
share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service
%%DOCSDIR%%/clique.html
share/telepathy/managers/salut.manager