git: 9567923e967f - main - net-im/telepathy-salut: Remove expired port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 22 Aug 2024 20:56:28 UTC
The branch main has been updated by rene:
URL: https://cgit.FreeBSD.org/ports/commit/?id=9567923e967fe2a66261ec224773fee5b484cce8
commit 9567923e967fe2a66261ec224773fee5b484cce8
Author: Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-08-22 20:56:19 +0000
Commit: Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-08-22 20:56:19 +0000
net-im/telepathy-salut: Remove expired port
2024-08-21 net-im/telepathy-salut: Fails to build with libxml2 2.13.2 (PR 279963)
---
MOVED | 1 +
net-im/Makefile | 1 -
net-im/telepathy-salut/Makefile | 36 -------
net-im/telepathy-salut/distinfo | 2 -
.../files/patch-lib_gibber_gibber-bytestream-oob.h | 10 --
.../files/patch-lib_gibber_gibber-muc-connection.c | 10 --
.../files/patch-lib_gibber_gibber-tcp-transport.c | 10 --
.../files/patch-lib_gibber_gibber-unix-transport.c | 118 ---------------------
.../patch-tools_glib-client-marshaller-gen.py | 35 ------
.../files/patch-tools_glib-ginterface-gen.py | 38 -------
.../files/patch-tools_glib-signals-marshal-gen.py | 16 ---
.../files/patch-tools_libglibcodegen.py | 32 ------
.../files/patch-tools_make-release-mail.py | 19 ----
net-im/telepathy-salut/pkg-descr | 2 -
net-im/telepathy-salut/pkg-plist | 10 --
15 files changed, 1 insertion(+), 339 deletions(-)
diff --git a/MOVED b/MOVED
index 5dd5a62150c7..91e5c519c655 100644
--- a/MOVED
+++ b/MOVED
@@ -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)
diff --git a/net-im/Makefile b/net-im/Makefile
index b44037c7d0b0..5c5dd6347bc2 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -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
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
deleted file mode 100644
index b7f53f2bd7ea..000000000000
--- a/net-im/telepathy-salut/Makefile
+++ /dev/null
@@ -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>
diff --git a/net-im/telepathy-salut/distinfo b/net-im/telepathy-salut/distinfo
deleted file mode 100644
index 4cd8d153fc8b..000000000000
--- a/net-im/telepathy-salut/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (telepathy-salut-0.8.1.tar.gz) = 70b9108ac8b511b7688e1b580de4ddb8981603c3cbde01f287ef8f9cb708618e
-SIZE (telepathy-salut-0.8.1.tar.gz) = 1823482
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
deleted file mode 100644
index d2f8cdb47b0f..000000000000
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
+++ /dev/null
@@ -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"
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c
deleted file mode 100644
index 978ca8f3e348..000000000000
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-muc-connection.c
+++ /dev/null
@@ -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>
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
deleted file mode 100644
index f51056643ee7..000000000000
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
+++ /dev/null
@@ -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>
-
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c
deleted file mode 100644
index 7845fd0cd6dc..000000000000
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-unix-transport.c
+++ /dev/null
@@ -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);
diff --git a/net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py b/net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py
deleted file mode 100644
index 69cfb895c0cb..000000000000
--- a/net-im/telepathy-salut/files/patch-tools_glib-client-marshaller-gen.py
+++ /dev/null
@@ -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):
diff --git a/net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py b/net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py
deleted file mode 100644
index 0ac13ef86397..000000000000
--- a/net-im/telepathy-salut/files/patch-tools_glib-ginterface-gen.py
+++ /dev/null
@@ -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)
-
-
diff --git a/net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py b/net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py
deleted file mode 100644
index 8030597fbaae..000000000000
--- a/net-im/telepathy-salut/files/patch-tools_glib-signals-marshal-gen.py
+++ /dev/null
@@ -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:]
diff --git a/net-im/telepathy-salut/files/patch-tools_libglibcodegen.py b/net-im/telepathy-salut/files/patch-tools_libglibcodegen.py
deleted file mode 100644
index 6d37d66dd906..000000000000
--- a/net-im/telepathy-salut/files/patch-tools_libglibcodegen.py
+++ /dev/null
@@ -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):
diff --git a/net-im/telepathy-salut/files/patch-tools_make-release-mail.py b/net-im/telepathy-salut/files/patch-tools_make-release-mail.py
deleted file mode 100644
index f6658b1f6b8f..000000000000
--- a/net-im/telepathy-salut/files/patch-tools_make-release-mail.py
+++ /dev/null
@@ -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,
diff --git a/net-im/telepathy-salut/pkg-descr b/net-im/telepathy-salut/pkg-descr
deleted file mode 100644
index d278d5cd64b3..000000000000
--- a/net-im/telepathy-salut/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Telepathy is a real time communications framework. Salut provides
-Link-local Jabber functionality for Telepathy.
diff --git a/net-im/telepathy-salut/pkg-plist b/net-im/telepathy-salut/pkg-plist
deleted file mode 100644
index 593c42fe5132..000000000000
--- a/net-im/telepathy-salut/pkg-plist
+++ /dev/null
@@ -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