Giovanni Bechis wrote: > On Sat, Jan 25, 2020 at 09:38:23AM +0100, Stefan Hagen wrote: >> The BROKEN condition still applies. The code parse_tlo_file has not >> changed. >> > afaik this is BROKEN-sparc64 as well, otherwise ok giovanni@
Correct, it hits the same assertion on sparc64. http://build-failures.rhaalovely.net/sparc64/2020-01-23/net/telegram-purple.log Updated patch below. Ciao, Stefan Index: net/telegram-purple/Makefile =================================================================== RCS file: /cvs/ports/net/telegram-purple/Makefile,v retrieving revision 1.6 diff -u -p -u -p -r1.6 Makefile --- net/telegram-purple/Makefile 12 Jul 2019 20:48:50 -0000 1.6 +++ net/telegram-purple/Makefile 25 Jan 2020 20:22:45 -0000 @@ -1,9 +1,9 @@ # $OpenBSD: Makefile,v 1.6 2019/07/12 20:48:50 sthen Exp $ BROKEN-powerpc = assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 2831, function "parse_tlo_file" +BROKEN-sparc64 = assertion "get_int () == TLS_SCHEMA_V2" failed: file "generate.c", line 2831, function "parse_tlo_file" -V = 1.3.1 -REVISION = 2 +V = 1.4.2 COMMENT = Telegram support for Pidgin DISTNAME = telegram-purple_$V.orig PKGNAME = telegram-purple-$V Index: net/telegram-purple/distinfo =================================================================== RCS file: /cvs/ports/net/telegram-purple/distinfo,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 distinfo --- net/telegram-purple/distinfo 24 Jun 2017 00:20:17 -0000 1.1.1.1 +++ net/telegram-purple/distinfo 25 Jan 2020 20:22:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (telegram-purple_1.3.1.orig.tar.gz) = hpYnwitP1WyH1V0FQ1NTnzi4rhaSoBEebmaCr+ZUd9c= -SIZE (telegram-purple_1.3.1.orig.tar.gz) = 509083 +SHA256 (telegram-purple_1.4.2.orig.tar.gz) = vpkLXKwlzNpPuMBFotQjKW9K8Vhz9mwpk/uazz0eSWI= +SIZE (telegram-purple_1.4.2.orig.tar.gz) = 484790 Index: net/telegram-purple/patches/patch-Makefile_in =================================================================== RCS file: /cvs/ports/net/telegram-purple/patches/patch-Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-Makefile_in --- net/telegram-purple/patches/patch-Makefile_in 24 Jun 2017 00:20:17 -0000 1.1.1.1 +++ net/telegram-purple/patches/patch-Makefile_in 25 Jan 2020 20:22:45 -0000 @@ -3,18 +3,19 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20 Index: Makefile.in --- Makefile.in.orig +++ Makefile.in -@@ -22,8 +22,8 @@ datarootdir=@datarootdir@ - localedir=@localedir@ - gettext_package=@GETTEXT_PACKAGE@ +@@ -54,9 +54,9 @@ WIN32_CONTRIB_FILES=contrib/libgcrypt-20.dll contrib/l + CFLAGS_INTL=-DENABLE_NLS -DLOCALEDIR='"$(localedir)"' + CFLAGS_WARN=-Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter + CFLAGS_EXTRA=-I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2 +-CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} ${CFLAGS_WARN} ${CFLAGS_EXTRA} ++CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ ${CFLAGS_INTL} -fPIC --CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS -DLOCALEDIR='"$(localedir)"' -Wall -Wextra -Wno-deprecated-declarations -Wno-unused-parameter -I${srcdir} -I. -fno-strict-aliasing -fPIC -D_FORTIFY_SOURCE=2 --LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic -ggdb -+CFLAGS=@CFLAGS@ @PURPLE_CFLAGS@ @DEFS@ -DENABLE_NLS -DLOCALEDIR='"$(localedir)"' -I${srcdir} -I. -fno-strict-aliasing -fPIC -+LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ -rdynamic - DIR_PERM=0755 - FILE_PERM=0644 +-LDFLAGS_EXTRA=-rdynamic -ggdb ++LDFLAGS_EXTRA=-rdynamic + LDFLAGS=@LDFLAGS@ @OPENSSL_LIBS@ @PURPLE_LIBS@ @LIBS@ ${LDFLAGS_EXTRA} -@@ -81,7 +81,7 @@ tgl/Makefile.in: + DIR_PERM=0755 +@@ -116,7 +116,7 @@ tgl/Makefile.in: @echo "tgl/Makefile.in not found. Maybe you need to 'git submodule update --init --recursive' ?" && exit 1 tgl/Makefile: tgl/Makefile.in Makefile Index: net/telegram-purple/patches/patch-tgl_Makefile_in =================================================================== RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_Makefile_in,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-tgl_Makefile_in --- net/telegram-purple/patches/patch-tgl_Makefile_in 24 Jun 2017 00:20:17 -0000 1.1.1.1 +++ net/telegram-purple/patches/patch-tgl_Makefile_in 25 Jan 2020 20:22:45 -0000 @@ -7,7 +7,7 @@ Index: tgl/Makefile.in LDFLAGS=@LDFLAGS@ @OPENSSL_LDFLAGS@ CPPFLAGS=@CPPFLAGS@ @OPENSSL_INCLUDES@ DEFS=@DEFS@ --COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Werror -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2 +-COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -Wall -Wextra -Wno-deprecated-declarations -fno-strict-aliasing -fno-omit-frame-pointer -ggdb -Wno-unused-parameter -fPIC -D_FORTIFY_SOURCE=2 +COMPILE_FLAGS=${CFLAGS} ${CPFLAGS} ${CPPFLAGS} ${DEFS} -fno-strict-aliasing -fno-omit-frame-pointer -fPIC EXTRA_LIBS=@LIBS@ @EXTRA_LIBS@ @OPENSSL_LIBS@ Index: net/telegram-purple/patches/patch-tgl_configure =================================================================== RCS file: /cvs/ports/net/telegram-purple/patches/patch-tgl_configure,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-tgl_configure --- net/telegram-purple/patches/patch-tgl_configure 4 Sep 2018 10:01:05 -0000 1.1 +++ net/telegram-purple/patches/patch-tgl_configure 25 Jan 2020 20:22:45 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-tgl_configure,v 1.1 2018 Index: tgl/configure --- tgl/configure.orig +++ tgl/configure -@@ -4188,19 +4188,8 @@ fi +@@ -4281,19 +4281,8 @@ fi done Index: net/telegram-purple/pkg/PLIST =================================================================== RCS file: /cvs/ports/net/telegram-purple/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 PLIST --- net/telegram-purple/pkg/PLIST 24 Jun 2017 00:20:17 -0000 1.1.1.1 +++ net/telegram-purple/pkg/PLIST 25 Jan 2020 20:22:45 -0000 @@ -1,28 +1,22 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2017/06/24 00:20:17 czarkoff Exp $ -lib/purple-2/telegram-purple.so +@so lib/purple-2/telegram-purple.so share/appdata/ share/appdata/telegram-purple.metainfo.xml share/locale/bg/LC_MESSAGES/telegram-purple.mo share/locale/cs_CZ/ share/locale/cs_CZ/LC_MESSAGES/ share/locale/cs_CZ/LC_MESSAGES/telegram-purple.mo -share/locale/de_DE/ -share/locale/de_DE/LC_MESSAGES/ -share/locale/de_DE/LC_MESSAGES/telegram-purple.mo +share/locale/de/LC_MESSAGES/telegram-purple.mo +share/locale/es/LC_MESSAGES/telegram-purple.mo share/locale/es_AR/ share/locale/es_AR/LC_MESSAGES/ share/locale/es_AR/LC_MESSAGES/telegram-purple.mo share/locale/fr/LC_MESSAGES/telegram-purple.mo -share/locale/it_IT/ -share/locale/it_IT/LC_MESSAGES/ -share/locale/it_IT/LC_MESSAGES/telegram-purple.mo +share/locale/it/LC_MESSAGES/telegram-purple.mo share/locale/nl/LC_MESSAGES/telegram-purple.mo -share/locale/pl_PL/ -share/locale/pl_PL/LC_MESSAGES/ -share/locale/pl_PL/LC_MESSAGES/telegram-purple.mo -share/locale/ru_RU/ -share/locale/ru_RU/LC_MESSAGES/ -share/locale/ru_RU/LC_MESSAGES/telegram-purple.mo +share/locale/pl/LC_MESSAGES/telegram-purple.mo +share/locale/pt_BR/LC_MESSAGES/telegram-purple.mo +share/locale/ru/LC_MESSAGES/telegram-purple.mo share/locale/sq/LC_MESSAGES/telegram-purple.mo share/locale/uk/LC_MESSAGES/telegram-purple.mo share/pixmaps/ @@ -34,6 +28,4 @@ share/pixmaps/pidgin/protocols/22/ share/pixmaps/pidgin/protocols/22/telegram.png share/pixmaps/pidgin/protocols/48/ share/pixmaps/pidgin/protocols/48/telegram.png -share/purple/server.tglpub @sample ${SYSCONFDIR}/telegram-purple/ -@sample ${SYSCONFDIR}/telegram-purple/server.tglpub
