January 2023 - crux-commits

ports/contrib (3.7): rasqal: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 93f962cb985ddbaba13a55ad207ea68bad927189 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:19:39 2023 +0100 rasqal: pulled patches from libreoffice diff --git a/rasqal/.footprint b/rasqal/.footprint index 7ffe9a4a3..9dbcef4c8 100644 --- a/rasqal/.footprint +++ b/rasqal/.footprint @@ -1,22 +1,20 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/rasqal-config --rwxr-xr-x root/root usr/bin/roqet drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/rasqal/ -rw-r--r-- root/root usr/include/rasqal/rasqal.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/librasqal-lo.so.3 -> librasqal-lo.so.3.0.0 +-rwxr-xr-x root/root usr/lib/librasqal-lo.so.3.0.0 -rw-r--r-- root/root usr/lib/librasqal.a -rwxr-xr-x root/root usr/lib/librasqal.la -lrwxrwxrwx root/root usr/lib/librasqal.so -> librasqal.so.3.0.0 -lrwxrwxrwx root/root usr/lib/librasqal.so.3 -> librasqal.so.3.0.0 --rwxr-xr-x root/root usr/lib/librasqal.so.3.0.0 +lrwxrwxrwx root/root usr/lib/librasqal.so -> librasqal-lo.so.3.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/rasqal.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/rasqal-config.1.gz --rw-r--r-- root/root usr/share/man/man1/roqet.1.gz drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/librasqal.3.gz diff --git a/rasqal/.signature b/rasqal/.signature index c1698d02f..2ea8fe3ac 100644 --- a/rasqal/.signature +++ b/rasqal/.signature @@ -1,5 +1,10 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wTS1bQVYRl+5M5K1VqvrffqvybTcq7MZN6lQXTBclNjJrqk68Co79Kimwxr186esXJ4Lm1xqWm+iyC8tg93sQg= -SHA256 (Pkgfile) = 712c8285cc7be90475602cc817e5a4662d2f529c12b7e2d8646f3cf212c96320 -SHA256 (.footprint) = dadbb856226835ee48f72a8dde14b13c1076ada2ac112dfa742f9c46d9b3023d +RWSagIOpLGJF38FVLqXQzTcFHtUo6MGNKfQd1I0nQgePHzRC0asu5JREH3L0gAVD0v/uyhFUngIaVQcasyG/tyAiKeAe2n0f5Aw= +SHA256 (Pkgfile) = c1932c5262f3fab5f611072edcbb1fd5ae5f7808dcc205bcc43d20bd214cfa46 +SHA256 (.footprint) = ec47b218f0058c44f9a9184ce0bf161f7a69d2c922dee3282324e3178f93e395 SHA256 (rasqal-0.9.33.tar.gz) = 6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c +SHA256 (libtool.patch) = 6234df68001f6b8df208f1c8604a5521515396dfc9da6a554e8bfacf8b4b002b +SHA256 (rasqal-bundled-soname.patch.1) = cd0a1cb8c59c269aef4440c3a3dc9377aca42a96d641d1debdc08108d6b79452 +SHA256 (rasqal-pkgconfig.patch.1) = 32bec67772c9cfa157ae00491a04300a40f8ff98a8ac1624a312daa3373564fb +SHA256 (rasqal-xcompile.patch.1) = 96efd4610d1a369a950bc84e0da7bb593466a838df1271082f143f0b951be5d3 +SHA256 (rpath.patch) = 6e65e8a2ef126bd5a1321164f28d02c0fe45464bc6ea8b66b7419206d66d2ce1 diff --git a/rasqal/Pkgfile b/rasqal/Pkgfile index 045a599fe..66efcb65a 100644 --- a/rasqal/Pkgfile +++ b/rasqal/Pkgfile @@ -5,14 +5,27 @@ name=rasqal version=0.9.33 -release=2 -source=(http://download.librdf.org/source/$name-$version.tar.gz) +release=3 +source=(http://download.librdf.org/source/$name-$version.tar.gz + libtool.patch + rasqal-bundled-soname.patch.1 + rasqal-pkgconfig.patch.1 + rasqal-xcompile.patch.1 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/libtool.patch + patch -Np1 -i $SRC/rasqal-bundled-soname.patch.1 + patch -Np1 -i $SRC/rasqal-pkgconfig.patch.1 + patch -Np1 -i $SRC/rasqal-xcompile.patch.1 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr \ --enable-release make make DESTDIR=$PKG install + rm -r $PKG/usr/share/gtk-doc } diff --git a/rasqal/libtool.patch b/rasqal/libtool.patch new file mode 100644 index 000000000..b0baae661 --- /dev/null +++ b/rasqal/libtool.patch @@ -0,0 +1,27 @@ +--- build/ltmain.sh ++++ build/ltmain.sh +@@ -5301,6 +5301,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -5639,6 +5645,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/rasqal/rasqal-bundled-soname.patch.1 b/rasqal/rasqal-bundled-soname.patch.1 new file mode 100644 index 000000000..2c674516d --- /dev/null +++ b/rasqal/rasqal-bundled-soname.patch.1 @@ -0,0 +1,13 @@ +rhbz#809466 change soname of bundled redland libs + +--- a/src/Makefile.in 2013-03-29 21:44:58.115840724 +0100 ++++ b/src/Makefile.in 2013-03-29 21:45:01.252840697 +0100 +@@ -621,7 +621,7 @@ + $(am__append_2) $(am__append_3) $(am__append_4) \ + $(am__append_5) $(am__append_6) $(am__append_7) + nodist_librasqal_la_SOURCES = $(am__append_8) +-librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ ++librasqal_la_LDFLAGS = -version-info @RASQAL_LIBTOOL_VERSION@ -release lo + librasqal_la_LIBADD = @LTLIBOBJS@ @RASQAL_INTERNAL_LIBS@ \ + @RASQAL_EXTERNAL_LIBS@ $(MEM_LIBS) \ + $(top_builddir)/libsv/libsv.la $(am__append_10) diff --git a/rasqal/rasqal-pkgconfig.patch.1 b/rasqal/rasqal-pkgconfig.patch.1 new file mode 100644 index 000000000..ac3eab07c --- /dev/null +++ b/rasqal/rasqal-pkgconfig.patch.1 @@ -0,0 +1,14 @@ +Let the pkg-config stuff be overridden by variables + +--- a/configure ++++ b/configure +@@ -14119,7 +14119,7 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + +- RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null` ++ RAPTOR_VERSION=2.0.15 + raptor_too_old=0 + as_arg_v1=$RAPTOR_VERSION + as_arg_v2=$RAPTOR_MIN_VERSION + diff --git a/rasqal/rasqal-xcompile.patch.1 b/rasqal/rasqal-xcompile.patch.1 new file mode 100644 index 000000000..65efc3047 --- /dev/null +++ b/rasqal/rasqal-xcompile.patch.1 @@ -0,0 +1,16 @@ +No point in creating util or test executables when cross-compiling. +(Especially as doing it anyway wouldn't work without tweaks to have it find +libxml2 and libm, at least for Android.) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -358,7 +358,7 @@ + top_srcdir = @top_srcdir@ + noinst_SCRIPTS = rasqal-src-config + ACLOCAL_AMFLAGS = -I build +-SUBDIRS = libsv $(am__append_1) $(am__append_2) src utils tests docs \ ++SUBDIRS = libsv $(am__append_1) $(am__append_2) src docs \ + data win32 scripts + DIST_SUBDIRS = libsv libmtwist getopt src utils tests docs data win32 scripts + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = rasqal.pc diff --git a/rasqal/rpath.patch b/rasqal/rpath.patch new file mode 100644 index 000000000..c0eed7725 --- /dev/null +++ b/rasqal/rpath.patch @@ -0,0 +1,21 @@ +--- configure ++++ configure +@@ -9843,6 +9843,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd* | netbsdelf*-gnu) +--- utils/Makefile.in ++++ utils/Makefile.in +@@ -373,7 +373,7 @@ + $(man_MANS) \ + roqet.html + +-all: all-am ++all: + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj

1 0

ports/contrib (3.7): raptor: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 20ccc8455866790ed52ba918a1fa4586266c32bb Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:18:48 2023 +0100 raptor: pulled patches from libreoffice diff --git a/raptor/.footprint b/raptor/.footprint index b488d7e35..8a0ac5385 100644 --- a/raptor/.footprint +++ b/raptor/.footprint @@ -6,11 +6,11 @@ drwxr-xr-x root/root usr/include/raptor2/ -rw-r--r-- root/root usr/include/raptor2/raptor.h -rw-r--r-- root/root usr/include/raptor2/raptor2.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libraptor2-lo.so.0 -> libraptor2-lo.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libraptor2-lo.so.0.0.0 -rw-r--r-- root/root usr/lib/libraptor2.a -rwxr-xr-x root/root usr/lib/libraptor2.la -lrwxrwxrwx root/root usr/lib/libraptor2.so -> libraptor2.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libraptor2.so.0 -> libraptor2.so.0.0.0 --rwxr-xr-x root/root usr/lib/libraptor2.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libraptor2.so -> libraptor2-lo.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/raptor2.pc drwxr-xr-x root/root usr/share/ diff --git a/raptor/.signature b/raptor/.signature index 0a9868b62..4f4f5fff3 100644 --- a/raptor/.signature +++ b/raptor/.signature @@ -1,5 +1,14 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3++adVXk8IVDGZCW/5nslJ7XkMlseswB2AvzG6nHS8hiXE+3OkkSqGBLie2OR/e1RIC+EjkszD+MNbXkoNqxMQA= -SHA256 (Pkgfile) = 166cd355163491ed7c0e0599336158b763c75b0044c81828ec6529b2e8ba07bc -SHA256 (.footprint) = d17fbcd4efd58f95fa79560a96ec64dbbe01e47357edea3749b83357ad0d5c34 +RWSagIOpLGJF3/gBDtymhWE2UhGKfbMUphBMo0enOMwdGqMyS8MmV67+Tgm6YZBrfvK/9HDFjyXSAs9iWOrsBrlMeNu3UqX43Qg= +SHA256 (Pkgfile) = d26de493e5cf26475fd0112a66dd2a591fd2fa5955d52e8728f122cab82845f9 +SHA256 (.footprint) = b57eb80a13e1c67b1d19c498a2cc3f34ecd87e8e582ccb8ed31990bda098ad99 SHA256 (raptor2-2.0.15.tar.gz) = ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed +SHA256 (0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1) = 043ac881307a39f5cd9b338dadeb46251f77b209f8745bee4c5a5cd23f27e5be +SHA256 (0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1) = b5be11eb023aa8499b12d9a18bc5c96aab21dadf2e50dc4be5850ea21d4e1d5f +SHA256 (Wint-conversion.patch) = 6813a4ee6e2b0723c7a90601ffa07fa5a6f2f92bd01e9b42adfbb3930602382a +SHA256 (libtool.patch) = 6234df68001f6b8df208f1c8604a5521515396dfc9da6a554e8bfacf8b4b002b +SHA256 (raptor-bundled-soname.patch.1) = d8fc57db15dde1abcca157cf8cf90a4296c3627b115d84a3d6f39fcb6e9b363e +SHA256 (raptor-emscripten.patch.1) = f338f7eb5ef5d8146a5ffc6fd25227f5cee0999b9086c13f205aa015ceb12308 +SHA256 (rpath.patch) = ec14f0dea02f29f36e77e7da5d3eb780466bece2f2937cef82713e011758eb53 +SHA256 (ubsan.patch) = 4e56d1ba2c6c942ebfbb962f53666b0dc3253eccfa5cf9a4b2411f1acfa3998b +SHA256 (xml2-config.patch) = 7a9384a15a837f6b839cbb8a8e5054db2ef61b76adcdcbc521b6b651d6aa4cfb diff --git a/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 b/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 new file mode 100644 index 000000000..1fb279df3 --- /dev/null +++ b/raptor/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 @@ -0,0 +1,33 @@ +From a549457461874157c8c8e8e8a6e0eec06da4fbd0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm(a)redhat.com> +Date: Tue, 24 Nov 2020 10:30:20 +0000 +Subject: [PATCH] CVE-2020-25713 raptor2: malformed input file can lead to a + segfault + +due to an out of bounds array access in +raptor_xml_writer_start_element_common + +See: +https://bugs.mageia.org/show_bug.cgi?id=27605 +https://www.openwall.com/lists/oss-security/2020/11/13/1 +https://gerrit.libreoffice.org/c/core/+/106249 +--- + src/raptor_xml_writer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 56993dc3..4426d38c 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -227,7 +227,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + + /* check it wasn't an earlier declaration too */ + for(j = 0; j < nspace_declarations_count; j++) +- if(nspace_declarations[j].nspace == element->attributes[j]->nspace) { ++ if(nspace_declarations[j].nspace == element->attributes[i]->nspace) { + declare_me = 0; + break; + } +-- +2.28.0 + diff --git a/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 b/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 new file mode 100644 index 000000000..6fa726cae --- /dev/null +++ b/raptor/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 @@ -0,0 +1,43 @@ +From 590681e546cd9aa18d57dc2ea1858cb734a3863f Mon Sep 17 00:00:00 2001 +From: Dave Beckett <dave(a)dajobe.org> +Date: Sun, 16 Apr 2017 23:15:12 +0100 +Subject: [PATCH] Calcualte max nspace declarations correctly for XML writer + +(raptor_xml_writer_start_element_common): Calculate max including for +each attribute a potential name and value. + +Fixes Issues #0000617 http://bugs.librdf.org/mantis/view.php?id=617 +and #0000618 http://bugs.librdf.org/mantis/view.php?id=618 +--- + src/raptor_xml_writer.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/raptor_xml_writer.c b/src/raptor_xml_writer.c +index 693b946..0d3a36a 100644 +--- a/src/raptor_xml_writer.c ++++ b/src/raptor_xml_writer.c +@@ -181,9 +181,10 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + size_t nspace_declarations_count = 0; + unsigned int i; + +- /* max is 1 per element and 1 for each attribute + size of declared */ + if(nstack) { +- int nspace_max_count = element->attribute_count+1; ++ int nspace_max_count = element->attribute_count * 2; /* attr and value */ ++ if(element->name->nspace) ++ nspace_max_count++; + if(element->declared_nspaces) + nspace_max_count += raptor_sequence_size(element->declared_nspaces); + if(element->xml_language) +@@ -237,7 +238,7 @@ raptor_xml_writer_start_element_common(raptor_xml_writer* xml_writer, + } + } + +- /* Add the attribute + value */ ++ /* Add the attribute's value */ + nspace_declarations[nspace_declarations_count].declaration= + raptor_qname_format_as_xml(element->attributes[i], + &nspace_declarations[nspace_declarations_count].length); +-- +2.9.3 + diff --git a/raptor/Pkgfile b/raptor/Pkgfile index 287ae1ba3..721a3ce75 100644 --- a/raptor/Pkgfile +++ b/raptor/Pkgfile @@ -5,15 +5,36 @@ name=raptor version=2.0.15 -release=2 -source=(http://librdf.org/dist/source/raptor2-$version.tar.gz) +release=3 +source=(http://librdf.org/dist/source/raptor2-$version.tar.gz + 0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 + 0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 + Wint-conversion.patch + libtool.patch + raptor-bundled-soname.patch.1 + raptor-emscripten.patch.1 + rpath.patch + ubsan.patch + xml2-config.patch) build() { cd "$name"2-$version + + patch -Np1 -i $SRC/0001-CVE-2020-25713-raptor2-malformed-input-file-can-lead.patch.1 + patch -Np1 -i $SRC/0001-Calcualte-max-nspace-declarations-correctly-for-XML-.patch.1 + patch -Np0 -i $SRC/Wint-conversion.patch + patch -Np0 -i $SRC/libtool.patch + patch -Np1 -i $SRC/raptor-bundled-soname.patch.1 + patch -Np1 -i $SRC/raptor-emscripten.patch.1 + patch -Np0 -i $SRC/rpath.patch + patch -Np0 -i $SRC/ubsan.patch + patch -Np0 -i $SRC/xml2-config.patch + ./configure --prefix=/usr \ --with-yajl=no \ --with-icu-config=/usr/bin/icu-config make make prefix="$PKG"/usr install + rm -r $PKG/usr/share/gtk-doc } diff --git a/raptor/Wint-conversion.patch b/raptor/Wint-conversion.patch new file mode 100644 index 000000000..fb85f4f13 --- /dev/null +++ b/raptor/Wint-conversion.patch @@ -0,0 +1,22 @@ +--- src/raptor_parse.c ++++ src/raptor_parse.c +@@ -257,7 +257,7 @@ + int + raptor_world_get_parsers_count(raptor_world* world) + { +- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); ++ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0); + + raptor_world_open(world); + +--- src/raptor_serialize.c ++++ src/raptor_serialize.c +@@ -240,7 +240,7 @@ + int + raptor_world_get_serializers_count(raptor_world* world) + { +- RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, NULL); ++ RAPTOR_ASSERT_OBJECT_POINTER_RETURN_VALUE(world, raptor_world, 0); + + raptor_world_open(world); + diff --git a/raptor/libtool.patch b/raptor/libtool.patch new file mode 100644 index 000000000..b0baae661 --- /dev/null +++ b/raptor/libtool.patch @@ -0,0 +1,27 @@ +--- build/ltmain.sh ++++ build/ltmain.sh +@@ -5301,6 +5301,12 @@ + prev= + continue + ;; ++ mllvm) ++ # Clang does not use LLVM to link, so we can simply discard any ++ # '-mllvm $arg' options when doing the link step. ++ prev= ++ continue ++ ;; + objectlist) + if test -f "$arg"; then + save_arg=$arg +@@ -5639,6 +5645,11 @@ + continue + ;; + ++ -mllvm) ++ prev=mllvm ++ continue ++ ;; ++ + -module) + module=yes + continue diff --git a/raptor/raptor-bundled-soname.patch.1 b/raptor/raptor-bundled-soname.patch.1 new file mode 100644 index 000000000..cce2482d1 --- /dev/null +++ b/raptor/raptor-bundled-soname.patch.1 @@ -0,0 +1,13 @@ +rhbz#809466 change soname of bundled redland libs + +--- a/src/Makefile.in 2013-03-29 19:11:27.944919859 +0100 ++++ b/src/Makefile.in 2013-03-29 19:17:42.173916644 +0100 +@@ -507,7 +507,7 @@ + $(am__append_21) $(am__append_22) $(am__append_23) \ + $(am__append_24) $(am__append_25) $(am__append_26) + libraptor2_la_LIBADD = $(am__append_29) @LTLIBOBJS@ +-libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \ ++libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ -release lo \ + @RAPTOR_LDFLAGS@ $(MEM_LIBS) + + EXTRA_DIST = \ diff --git a/raptor/raptor-emscripten.patch.1 b/raptor/raptor-emscripten.patch.1 new file mode 100644 index 000000000..e3c53b35b --- /dev/null +++ b/raptor/raptor-emscripten.patch.1 @@ -0,0 +1,12 @@ +-*- Mode: Diff -*- +--- raptor/src/sort_r.h ++++ raptor/src/sort_r.h +@@ -27,7 +27,7 @@ + defined AMIGA) + # define _SORT_R_BSD + #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \ +- defined __linux__ || defined __MINGW32__ || defined __GLIBC__) ++ defined __linux__ || defined __MINGW32__ || defined __GLIBC__ || defined __EMSCRIPTEN__) + # define _SORT_R_LINUX + #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) + # define _SORT_R_WINDOWS diff --git a/raptor/rpath.patch b/raptor/rpath.patch new file mode 100644 index 000000000..7863f61cd --- /dev/null +++ b/raptor/rpath.patch @@ -0,0 +1,21 @@ +--- configure ++++ configure +@@ -9892,6 +9892,7 @@ + else + ld_shlibs=no + fi ++hardcode_libdir_flag_spec= + ;; + + netbsd* | netbsdelf*-gnu) +--- utils/Makefile.in ++++ utils/Makefile.in +@@ -343,7 +343,7 @@ + rapper_LDADD = $(top_builddir)/src/libraptor2.la + rdfdiff_SOURCES = rdfdiff.c $(am__append_2) + rdfdiff_LDADD = $(top_builddir)/src/libraptor2.la +-all: all-am ++all: + + .SUFFIXES: + .SUFFIXES: .c .lo .o .obj diff --git a/raptor/ubsan.patch b/raptor/ubsan.patch new file mode 100644 index 000000000..641d60bb7 --- /dev/null +++ b/raptor/ubsan.patch @@ -0,0 +1,25 @@ +--- src/raptor_rfc2396.c ++++ src/raptor_rfc2396.c +@@ -386,7 +386,7 @@ + } + + +- if(prev && s == (cur+2) && cur[0] == '.' && cur[1] == '.') { ++ if(prev && cur && s == (cur+2) && cur[0] == '.' && cur[1] == '.') { + /* Remove <component>/.. at the end of the path */ + *prev = '\0'; + path_len -= (s-prev); +--- src/raptor_uri.c ++++ src/raptor_uri.c +@@ -1336,9 +1336,9 @@ + !strncmp((const char*)base_detail->scheme, + (const char*)reference_detail->scheme, + base_detail->scheme_len) && +- !strncmp((const char*)base_detail->authority, ++ (base_detail->authority_len == 0 || !strncmp((const char*)base_detail->authority, + (const char*)reference_detail->authority, +- base_detail->authority_len)) { ++ base_detail->authority_len))) { + + if(!base_detail->path) { + if(reference_detail->path) { diff --git a/raptor/xml2-config.patch b/raptor/xml2-config.patch new file mode 100644 index 000000000..2550acee0 --- /dev/null +++ b/raptor/xml2-config.patch @@ -0,0 +1,22 @@ +--- configure ++++ configure +@@ -14197,6 +14197,11 @@ + test -n "$XML_CONFIG" && break + done + ++ if test -n "$XML_CONFIG"; then ++ if ! "$XML_CONFIG" --version; then ++ XML_CONFIG= ++ fi ++ fi + fi + fi + +@@ -14481,6 +14481,7 @@ + + LIBXML_VERSION=`$PKG_CONFIG libxml-2.0 --modversion` + libxml_source="pkg-config" ++ XML_CONFIG="$PKG_CONFIG libxml-2.0" + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml via pkg-config" >&5

1 0

ports/contrib (3.7): libqxp: pulled patch from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 759fe5534e18827d009a5c5a87fce12d2da63f8a Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:04:16 2023 +0100 libqxp: pulled patch from libreoffice diff --git a/libqxp/.signature b/libqxp/.signature index 990191b21..74a8793db 100644 --- a/libqxp/.signature +++ b/libqxp/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30Rcbl6MyiLLYDF5Wpxlo46ceLgrlOOW6JmmQ77e5dR5IEWTekrnnMa6OiEWrVRw9CdaDqOEjjzBvLInh/0lOQo= -SHA256 (Pkgfile) = d928e6d2f4e74ba942228e2db2672a7f9a09896dbb7633cc8f298bcbd75e62d1 +RWSagIOpLGJF3xmcso50W82+ZIjIEAQGhZbwKLiKys56RvtbESZjwDNCIRbqLRz7qj9tpNuzbk+xwt3F14brA0L32OLxOeb0YQc= +SHA256 (Pkgfile) = 97ad21007b1340528b1f05ee6de84a9b539bf60da04c488bf8416ea0f234e226 SHA256 (.footprint) = 7d4afec9ac0f4d1cbcbc333485cf173f915c5ee53bec70407e153443b2913c08 SHA256 (libqxp-0.0.2.tar.xz) = e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c +SHA256 (ax_gcc_func_attribute.m4.patch) = 3b981e8acd7db18985e490d130ac2a032870a7e52a3a458933d8b221366c4e89 diff --git a/libqxp/Pkgfile b/libqxp/Pkgfile index e39c04146..28ab2aadb 100644 --- a/libqxp/Pkgfile +++ b/libqxp/Pkgfile @@ -5,11 +5,15 @@ name=libqxp version=0.0.2 -release=1 -source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz) +release=2 +source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz + ax_gcc_func_attribute.m4.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/ax_gcc_func_attribute.m4.patch + ./configure --prefix=/usr \ --without-docs make diff --git a/libqxp/ax_gcc_func_attribute.m4.patch b/libqxp/ax_gcc_func_attribute.m4.patch new file mode 100644 index 000000000..8f7457816 --- /dev/null +++ b/libqxp/ax_gcc_func_attribute.m4.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -18136,7 +18136,7 @@ + + _ACEOF + if ac_fn_cxx_try_link "$LINENO"; then : +- if test -s conftest.err; then : ++ if grep -- -Wattributes conftest.err; then : + ax_cv_have_func_attribute_visibility=no + else + ax_cv_have_func_attribute_visibility=yes

1 0

ports/contrib (3.7): libvisio: pulled patch from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit f278caaa42b1dddbee8056b655cf785ac1a4e5b2 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 15:02:31 2023 +0100 libvisio: pulled patch from libreoffice diff --git a/libvisio/.signature b/libvisio/.signature index 0a9004f87..14e6648ec 100644 --- a/libvisio/.signature +++ b/libvisio/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38xAoCr3M4kLPeMqcY3qks5C4mlYHI4ZMKg4Hz8HSjBl7PaxGUhWtzQPAsW9WKEp0qU+ljmP2KnVTlfhEIOyVwE= -SHA256 (Pkgfile) = d73dcad5613deeed2ecf53f1aa4b42449f7bc97bc6f679657580e6d509aaacee +RWSagIOpLGJF38HfaFmOJ6GJcnXJ7EPU/FNxFq/vkb2e3ZItBV8JxLg0VdDCMR2k8fgwCjv2FhkjXHR8c5CBk7l3RIoORL+K0gE= +SHA256 (Pkgfile) = 96a9181edb74c738e876238557dc807919f443a565d1d6e31ab84f5b0d6ca909 SHA256 (.footprint) = e13f1879f10c08a937d39005070957ecad750fb8ea4ac435d1cc3f4c1062f2b1 SHA256 (libvisio-0.1.7.tar.xz) = 8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c +SHA256 (ubsan.patch) = 8205a3c2157a1eaeb6bb17d813333142c84229e17efd006222a7be74a2d26aae diff --git a/libvisio/Pkgfile b/libvisio/Pkgfile index 353826b2e..6ac58bb3e 100644 --- a/libvisio/Pkgfile +++ b/libvisio/Pkgfile @@ -5,11 +5,15 @@ name=libvisio version=0.1.7 -release=2 -source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz) +release=3 +source=(https://dev-www.libreoffice.org/src/$name/$name-$version.tar.xz + ubsan.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/ubsan.patch + ./configure --prefix=/usr \ --without-docs make diff --git a/libvisio/ubsan.patch b/libvisio/ubsan.patch new file mode 100644 index 000000000..c9ffbd98f --- /dev/null +++ b/libvisio/ubsan.patch @@ -0,0 +1,11 @@ +--- src/lib/VSDContentCollector.cpp ++++ src/lib/VSDContentCollector.cpp +@@ -3220,7 +3220,7 @@ + } + if (U_SUCCESS(status) && conv) + { +- const auto *src = (const char *)&characters[0]; ++ const auto *src = (const char *)characters.data(); + const char *srcLimit = (const char *)src + characters.size(); + while (src < srcLimit) + {

1 0

ports/contrib (3.7): libwpd: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit cbe5e44c0cf0939cfddae17ec4b063c0554e4c9e Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:59:36 2023 +0100 libwpd: pulled patches from libreoffice diff --git a/libwpd/.footprint b/libwpd/.footprint index ab34925e6..ace6da018 100644 --- a/libwpd/.footprint +++ b/libwpd/.footprint @@ -9,9 +9,9 @@ drwxr-xr-x root/root usr/include/libwpd-0.10/libwpd/ -rw-r--r-- root/root usr/include/libwpd-0.10/libwpd/WPDocument.h -rw-r--r-- root/root usr/include/libwpd-0.10/libwpd/libwpd.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libwpd-0.10-lo.so.10 -> libwpd-0.10-lo.so.10.0.3 +-rwxr-xr-x root/root usr/lib/libwpd-0.10-lo.so.10.0.3 -rwxr-xr-x root/root usr/lib/libwpd-0.10.la -lrwxrwxrwx root/root usr/lib/libwpd-0.10.so -> libwpd-0.10.so.10.0.3 -lrwxrwxrwx root/root usr/lib/libwpd-0.10.so.10 -> libwpd-0.10.so.10.0.3 --rwxr-xr-x root/root usr/lib/libwpd-0.10.so.10.0.3 +lrwxrwxrwx root/root usr/lib/libwpd-0.10.so -> libwpd-0.10-lo.so.10.0.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libwpd-0.10.pc diff --git a/libwpd/.signature b/libwpd/.signature index 531811901..a2e5e4f66 100644 --- a/libwpd/.signature +++ b/libwpd/.signature @@ -1,6 +1,9 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36gvZOaQ8VzgKoTeRblbHtU85tMkouznqdkkI7OqgVEtWUGiwWkt+tUXS5CKTDtQntLr3Q1kFKIBUzQGnBEhcAI= -SHA256 (Pkgfile) = 01efaad6072f7870b6c64a6f3eed65859a3412355a0bca1ec31a22044cefeb29 -SHA256 (.footprint) = f618b3f2517df0f6b5ea1affa828d4a7491ef95541fa3eb7a6e5c8c60e348952 +RWSagIOpLGJF3zb8zqfgnpNj+eJqSgZPwriYeETLqfJx6lamiPOhaZwRoKjSF4wNUFRqQM8kRYN5jBl78ElBERBItmdIaUrZnA8= +SHA256 (Pkgfile) = 66ee26188371f589d2203781286ee90849640c57fbc5a8be1f30bc95d4046ae3 +SHA256 (.footprint) = 1d6410b90c76d957843dffb60847ff00da5a64c9f1e54340d2dfbfa925cbe5a5 SHA256 (libwpd-0.10.3.tar.xz) = 2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09 SHA256 (gcc11.patch) = 7612c36e5e16df2b786fc4c905f096a6e7d600aade292e91950607bfbfba6c32 +SHA256 (include.patch) = 6aaf775b160e05bcb6ff9d0f6c1dc05ccb337d49efe76ec4078b8acfc207fa42 +SHA256 (libwpd-bundled-soname.patch.0) = 22589eecd0e6128f03dc3650baee2bd4dddb93cadcc52da9a9192dcdc353cdf0 +SHA256 (rpath.patch) = 9a6fe23afbc0453ce920335ed680320c6d6436a887a2a486c3cdd688311687fb diff --git a/libwpd/Pkgfile b/libwpd/Pkgfile index 908870b84..d2492e724 100644 --- a/libwpd/Pkgfile +++ b/libwpd/Pkgfile @@ -5,14 +5,20 @@ name=libwpd version=0.10.3 -release=1 +release=2 source=(https://downloads.sourceforge.net/project/libwpd/libwpd/$name-$vers… - gcc11.patch) + gcc11.patch + include.patch + libwpd-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version patch -Np1 -i $SRC/gcc11.patch + patch -Np0 -i $SRC/include.patch + patch -Np0 -i $SRC/libwpd-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch ./configure --prefix=/usr \ --without-docs diff --git a/libwpd/include.patch b/libwpd/include.patch new file mode 100644 index 000000000..57f52b4b0 --- /dev/null +++ b/libwpd/include.patch @@ -0,0 +1,10 @@ +--- src/lib/WPXTable.h ++++ src/lib/WPXTable.h +@@ -36,6 +36,7 @@ + #ifndef _WPXTABLE_H + #define _WPXTABLE_H + ++#include <stddef.h> + #include <vector> + + struct WPXTableCell diff --git a/libwpd/libwpd-bundled-soname.patch.0 b/libwpd/libwpd-bundled-soname.patch.0 new file mode 100644 index 000000000..ad7cc3fb4 --- /dev/null +++ b/libwpd/libwpd-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:41:41.073622494 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:42:09.377622009 +0200 +@@ -429,7 +429,7 @@ + -DLIBWPD_BUILD=1 $(am__append_1) + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPD_WIN32_RESOURCE@ + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPD_WIN32_RESOURCE@ +-libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + libwpd_@WPD_MAJOR_VERSION@_@WPD_MINOR_VERSION@_la_SOURCES = \ + libwpd_internal.cpp \ + libwpd_math.cpp \ diff --git a/libwpd/rpath.patch b/libwpd/rpath.patch new file mode 100644 index 000000000..fb3deaa81 --- /dev/null +++ b/libwpd/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13850,6 +13850,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)

1 0

ports/contrib (3.7): libwpg: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 32a43e35a21c8925d82269ab674b485de7f353ce Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:57:21 2023 +0100 libwpg: pulled patches from libreoffice diff --git a/libwpg/.footprint b/libwpg/.footprint index 18275cd33..b407b0bf7 100644 --- a/libwpg/.footprint +++ b/libwpg/.footprint @@ -9,9 +9,9 @@ drwxr-xr-x root/root usr/include/libwpg-0.3/libwpg/ -rw-r--r-- root/root usr/include/libwpg-0.3/libwpg/WPGraphics.h -rw-r--r-- root/root usr/include/libwpg-0.3/libwpg/libwpg.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libwpg-0.3-lo.so.3 -> libwpg-0.3-lo.so.3.0.3 +-rwxr-xr-x root/root usr/lib/libwpg-0.3-lo.so.3.0.3 -rwxr-xr-x root/root usr/lib/libwpg-0.3.la -lrwxrwxrwx root/root usr/lib/libwpg-0.3.so -> libwpg-0.3.so.3.0.3 -lrwxrwxrwx root/root usr/lib/libwpg-0.3.so.3 -> libwpg-0.3.so.3.0.3 --rwxr-xr-x root/root usr/lib/libwpg-0.3.so.3.0.3 +lrwxrwxrwx root/root usr/lib/libwpg-0.3.so -> libwpg-0.3-lo.so.3.0.3 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libwpg-0.3.pc diff --git a/libwpg/.signature b/libwpg/.signature index 981a7b46f..bd20aae1c 100644 --- a/libwpg/.signature +++ b/libwpg/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+hde5VKtyz+W0DOr1/fIe+WdD7WhUL/EhcaVDzd2RSLLKMMeXUFfczcIMLIQPTkbUhv76VLG/FeoFNzl0/z/QI= -SHA256 (Pkgfile) = 3c4e67b90b18c3f580ed908284f75b4989fdb492e175256c1c16be71aee78809 -SHA256 (.footprint) = 946dbbdf181b254a718be204d6738d9441f15e8d55615dbcfe2c65b14a2100a3 +RWSagIOpLGJF3yQ2Fhn8652PfHEayEdes8e9JCqdjSemO/JhzmTUbZJyye2O/zLpLi977RsIRNICn2J34up29bBxywk/DlgH/g0= +SHA256 (Pkgfile) = a17404ccf9de119ef37a56dddb2bfa7e276c2c3949f31b7cb8390132e97189e9 +SHA256 (.footprint) = ebc54bd460c72c4707c302eee0f8ca75c813a7615f9ccb51b6245ee275bece53 SHA256 (libwpg-0.3.3.tar.xz) = 99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c +SHA256 (libwpg-bundled-soname.patch.0) = b04c5ec409cee6d4c7eedf53ee51861a125215047657c0693d56af120821e28d +SHA256 (rpath.patch) = 767e75eaaf26439a8685f8ef97083a09aec22d53c15279714329d28233ae65ef diff --git a/libwpg/Pkgfile b/libwpg/Pkgfile index b6920ee5c..7c6274541 100644 --- a/libwpg/Pkgfile +++ b/libwpg/Pkgfile @@ -1,15 +1,21 @@ # Description: Library for importing and converting Corel WordPerfect(tm) Graphics images # URL: http://libwpg.sourceforge.net/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: libwpd zlib +# Depends on: libwpd name=libwpg version=0.3.3 -release=1 -source=(https://downloads.sourceforge.net/project/libwpg/libwpg/$name-$version/$name-$version.tar.xz) +release=2 +source=(https://downloads.sourceforge.net/project/libwpg/libwpg/$name-$version/$name-$version.tar.xz + libwpg-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/libwpg-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/libwpg/libwpg-bundled-soname.patch.0 b/libwpg/libwpg-bundled-soname.patch.0 new file mode 100644 index 000000000..e0bfc5980 --- /dev/null +++ b/libwpg/libwpg-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 21:30:41.615633795 +0200 ++++ src/lib/Makefile.in 2015-08-06 21:31:03.764633415 +0200 +@@ -357,7 +357,7 @@ + $(DEBUG_CXXFLAGS) -DLIBWPG_BUILD=1 $(am__append_1) + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(REVENGE_LIBS) @LIBWPG_WIN32_RESOURCE@ + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPG_WIN32_RESOURCE@ +-libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libwpg_@WPG_MAJOR_VERSION@_@WPG_MINOR_VERSION@_la_SOURCES = \ + WPG1Parser.cpp \ + WPG1Parser.h \ diff --git a/libwpg/rpath.patch b/libwpg/rpath.patch new file mode 100644 index 000000000..5a8f56105 --- /dev/null +++ b/libwpg/rpath.patch @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -13858,6 +13858,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)

1 0

ports/contrib (3.7): librevenge: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 5efe55eb3fb65260f7fce25c2d2479097c29170d Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:55:17 2023 +0100 librevenge: pulled patches from libreoffice diff --git a/librevenge/.footprint b/librevenge/.footprint index d9886dcc8..000cb44e3 100644 --- a/librevenge/.footprint +++ b/librevenge/.footprint @@ -36,10 +36,10 @@ drwxr-xr-x root/root usr/include/librevenge-0.0/librevenge/ -rw-r--r-- root/root usr/include/librevenge-0.0/librevenge/librevenge-api.h -rw-r--r-- root/root usr/include/librevenge-0.0/librevenge/librevenge.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/librevenge-0.0-lo.so.0 -> librevenge-0.0-lo.so.0.0.5 +-rwxr-xr-x root/root usr/lib/librevenge-0.0-lo.so.0.0.5 -rwxr-xr-x root/root usr/lib/librevenge-0.0.la -lrwxrwxrwx root/root usr/lib/librevenge-0.0.so -> librevenge-0.0.so.0.0.5 -lrwxrwxrwx root/root usr/lib/librevenge-0.0.so.0 -> librevenge-0.0.so.0.0.5 --rwxr-xr-x root/root usr/lib/librevenge-0.0.so.0.0.5 +lrwxrwxrwx root/root usr/lib/librevenge-0.0.so -> librevenge-0.0-lo.so.0.0.5 -rwxr-xr-x root/root usr/lib/librevenge-generators-0.0.la lrwxrwxrwx root/root usr/lib/librevenge-generators-0.0.so -> librevenge-generators-0.0.so.0.0.5 lrwxrwxrwx root/root usr/lib/librevenge-generators-0.0.so.0 -> librevenge-generators-0.0.so.0.0.5 diff --git a/librevenge/.signature b/librevenge/.signature index 153b58f9f..655256d81 100644 --- a/librevenge/.signature +++ b/librevenge/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF39AF7yZfx6liW5hLVFxnQ+Giuz8rc1GeA3EzJniZYbp5XQwt1LjP+vlUGuf26JmhSHRweUD8XMqLd2nRoHwlLwM= -SHA256 (Pkgfile) = 84bd69a5c94fa4e4f10649c4fb775cf68562572203ef43f3b9ae1c76d41e6416 -SHA256 (.footprint) = b120627ab72bb11b1d1ded1680c0a57ba80bb3dfc650662c4cc9e4e268b87b9c +RWSagIOpLGJF3xVDtNK3MLykrh9uYxheN87ikXik3C9Vay+tRo8ofXQCc8u1R2juyz2ldwjFCze4RcVjVW2rZvQbR/tVELvMYgE= +SHA256 (Pkgfile) = 21a158426cb7d10501dc670482236833c8b905f8e45349c08770123c0f2d3d5e +SHA256 (.footprint) = 0fa56bbfe9eb2fb0927003ff137826452deff632e517a5c59c823cdd02fff8d4 SHA256 (librevenge-0.0.5.tar.gz) = 04fd10d3eea39644c0d7231be9c6c174f3955c51a710266935e8c147e7045d9e +SHA256 (librevenge-bundled-soname.patch.0) = 0241ac930ebda70d845a89a4097de27d3821000e71df2f2d376f31e564750aa0 +SHA256 (rpath.patch) = d1493f120d14afcd6957491c01c97e1b381892ff77a523ac415bd2bdf2d10914 diff --git a/librevenge/Pkgfile b/librevenge/Pkgfile index e0cf57929..15b4a99e7 100644 --- a/librevenge/Pkgfile +++ b/librevenge/Pkgfile @@ -5,11 +5,17 @@ name=librevenge version=0.0.5 -release=1 -source=(https://sourceforge.net/projects/libwpd/files/librevenge/$name-$version/$name-$version.tar.gz) +release=2 +source=(https://sourceforge.net/projects/libwpd/files/librevenge/$name-$version/$name-$version.tar.gz + librevenge-bundled-soname.patch.0 + rpath.patch) build() { cd $name-$version + + patch -Np0 -i $SRC/librevenge-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch + ./configure --prefix=/usr \ --disable-werror \ --without-docs diff --git a/librevenge/librevenge-bundled-soname.patch.0 b/librevenge/librevenge-bundled-soname.patch.0 new file mode 100644 index 000000000..d98630f0c --- /dev/null +++ b/librevenge/librevenge-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-07 11:57:42.256742305 +0200 ++++ src/lib/Makefile.in 2015-08-07 11:58:11.818741799 +0200 +@@ -470,7 +470,7 @@ + $(am__append_2) + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LIBADD = @LIBREVENGE_WIN32_RESOURCE@ + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_DEPENDENCIES = @LIBREVENGE_WIN32_RESOURCE@ +-librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) ++librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined) -release lo + librevenge_@RVNG_MAJOR_VERSION@_@RVNG_MINOR_VERSION@_la_SOURCES = \ + RVNGBinaryData.cpp \ + RVNGMemoryStream.cpp \ diff --git a/librevenge/rpath.patch b/librevenge/rpath.patch new file mode 100644 index 000000000..c7d210080 --- /dev/null +++ b/librevenge/rpath.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -14983,6 +14983,8 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= ++runpath_var= + ;; + + lynxos*)

1 0

ports/contrib (3.7): libwps: pulled patches from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit f61538656ca978047b6b8ca74389a40a446aa73a Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:53:25 2023 +0100 libwps: pulled patches from libreoffice diff --git a/libwps/.footprint b/libwps/.footprint index 3b1976f1b..3c99014c8 100644 --- a/libwps/.footprint +++ b/libwps/.footprint @@ -12,9 +12,9 @@ drwxr-xr-x root/root usr/include/libwps-0.4/libwps/ -rw-r--r-- root/root usr/include/libwps-0.4/libwps/WPSDocument.h -rw-r--r-- root/root usr/include/libwps-0.4/libwps/libwps.h drwxr-xr-x root/root usr/lib/ +lrwxrwxrwx root/root usr/lib/libwps-0.4-lo.so.4 -> libwps-0.4-lo.so.4.0.13 +-rwxr-xr-x root/root usr/lib/libwps-0.4-lo.so.4.0.13 -rwxr-xr-x root/root usr/lib/libwps-0.4.la -lrwxrwxrwx root/root usr/lib/libwps-0.4.so -> libwps-0.4.so.4.0.13 -lrwxrwxrwx root/root usr/lib/libwps-0.4.so.4 -> libwps-0.4.so.4.0.13 --rwxr-xr-x root/root usr/lib/libwps-0.4.so.4.0.13 +lrwxrwxrwx root/root usr/lib/libwps-0.4.so -> libwps-0.4-lo.so.4.0.13 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libwps-0.4.pc diff --git a/libwps/.signature b/libwps/.signature index bc92e306e..b5b1227be 100644 --- a/libwps/.signature +++ b/libwps/.signature @@ -1,5 +1,8 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36RpObJxvDzhdiG+YVCT4Js4bsHJNZGNaUizTsLg5hc8lgCz5aUpKBQ/nPQ3diamrKGhM0HYVuXyTGvm4LzyQgo= -SHA256 (Pkgfile) = 3245dcc596d32d9ae599bc198edaa502d9e3b8c3710f77d6eac6abf1f2bf8ddb -SHA256 (.footprint) = 48ab225a738d7cc7470b4cfbabec6769285daeffb6799f4fc13336646967e2de +RWSagIOpLGJF31SC2k3R9PbtK3oxOt6IWUZqn+afP+H2RyuwYBXo3i5UpvZG4Ko+UEU7ap4VKuU+Q5c3TqVlkJE5zOVRHZGlaQw= +SHA256 (Pkgfile) = fbcb09d936561187a3525a77a9f9592ccefee923fbf8b3353df94811f8273b2f +SHA256 (.footprint) = 331c42de76a77efc26363081131d82dbb05ece3d6f0a2b53d706626428a72531 SHA256 (libwps-0.4.13.tar.xz) = ce95afe6c030689779a2543a4834827666eee27c10d8a74860d8d172a956c40f +SHA256 (libtool.patch.0) = a190c0e5d642ebc16688dd433a3556b635f8dd3b15b330e37b62b2d84a8a44da +SHA256 (libwps-bundled-soname.patch.0) = 36f3058e6e60b5e85ed0f1cfc937d9580a9a29186fd27cf1a388adbab96a0f92 +SHA256 (rpath.patch.0) = 20fe1c9b4ccb08a65711ee6fcd3bb5110d622a629cd9d4cde11ec2c0ab5ea3ad diff --git a/libwps/Pkgfile b/libwps/Pkgfile index 16540538f..2c0055c99 100644 --- a/libwps/Pkgfile +++ b/libwps/Pkgfile @@ -5,11 +5,19 @@ name=libwps version=0.4.13 -release=1 -source=(https://downloads.sourceforge.net/project/libwps/$name/$name-$version/$name-$version.tar.xz) +release=2 +source=(https://downloads.sourceforge.net/project/libwps/$name/$name-$version/$name-$version.tar.xz + libtool.patch.0 + libwps-bundled-soname.patch.0 + rpath.patch.0) build() { cd $name-$version + + patch -Np0 -i $SRC/libtool.patch.0 + patch -Np0 -i $SRC/libwps-bundled-soname.patch.0 + patch -Np0 -i $SRC/rpath.patch.0 + ./configure --prefix=/usr \ --without-docs make diff --git a/libwps/libtool.patch.0 b/libwps/libtool.patch.0 new file mode 100644 index 000000000..cc4b08ba2 --- /dev/null +++ b/libwps/libtool.patch.0 @@ -0,0 +1,12 @@ +--- ltmain.sh.sav 2018-08-02 14:21:34.000000000 +0200 ++++ ltmain.sh 2019-05-05 22:04:15.433588776 +0200 +@@ -7277,7 +7277,8 @@ func_mode_link () + # -stdlib=* select c++ std lib with clang + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ ++ -fuse-ld=*|--ld-path=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" diff --git a/libwps/libwps-bundled-soname.patch.0 b/libwps/libwps-bundled-soname.patch.0 new file mode 100644 index 000000000..013ba7a88 --- /dev/null +++ b/libwps/libwps-bundled-soname.patch.0 @@ -0,0 +1,11 @@ +--- src/lib/Makefile.in.orig 2015-08-06 11:41:55.081239194 +0200 ++++ src/lib/Makefile.in 2015-08-06 11:42:16.903238820 +0200 +@@ -369,7 +369,7 @@ + AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(DEBUG_CXXFLAGS) -DBUILD_WPS=1 + libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LIBADD = $(REVENGE_LIBS) @LIBWPS_WIN32_RESOURCE@ + libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_DEPENDENCIES = @LIBWPS_WIN32_RESOURCE@ +-libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined ++libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo + libwps_@WPS_MAJOR_VERSION@_@WPS_MINOR_VERSION@_la_SOURCES = \ + libwps_internal.cpp \ + libwps_tools_win.h \ diff --git a/libwps/rpath.patch.0 b/libwps/rpath.patch.0 new file mode 100644 index 000000000..600cc3d34 --- /dev/null +++ b/libwps/rpath.patch.0 @@ -0,0 +1,10 @@ +--- configure ++++ configure +@@ -14306,6 +14306,7 @@ + esac + ;; + esac ++hardcode_libdir_flag_spec_CXX= + ;; + + lynxos*)

1 0

ports/contrib (3.7): libnumbertext: pulled patch from libreoffice
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit f0106ca641b536b39e24accf3eed1f84e6c5fc5e Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 14:51:33 2023 +0100 libnumbertext: pulled patch from libreoffice diff --git a/libnumbertext/.signature b/libnumbertext/.signature index 16b97f11b..a7ae44458 100644 --- a/libnumbertext/.signature +++ b/libnumbertext/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3/WeGVJjvzOhuONsgUuUl0ZdDAwZSMEj9OTLtTucp0uyVXRFbJtm5d7lrjH1msBNCvj6+wNli5FcnLB9GX1+iQ8= -SHA256 (Pkgfile) = 07d087d9067c503c3a1e5c039f7f1ccb3726bfc5e462d5299d9923f6f40b1dec +RWSagIOpLGJF3xESMp/r5ZBzsxD9k1uC2Lv1mJTInwSaGQxapr+yhLbdbdNxHgjePC05o1/54MUuNYRaOtL2x3Z593yOH1y6/go= +SHA256 (Pkgfile) = 02f9eaeeaac372a73271c99171ba333810eadaa37e6b3057ba3cccaa4179f573 SHA256 (.footprint) = 7d4cf92a7158c7daf1b93badaf7c79fb7fcff7767d5a7ab7d54a46aaed1871ab SHA256 (libnumbertext-1.0.11.tar.gz) = 80aad7cab123edc614f904d9f145d1d15cf465084a1a15fca2117525dc746034 SHA256 (libnumbertext-updateautotools.patch) = 4c1be70cbb6c7b5e2f9d3842ad83ea95971d99663768e5df2ac74956fc4555bd +SHA256 (deprecated.patch.0) = 520cbcc0fc285524a3e45c182d121c8e5c1965d28197bf389c7095da5e8fff96 diff --git a/libnumbertext/Pkgfile b/libnumbertext/Pkgfile index 240b318a4..2c9ba2295 100644 --- a/libnumbertext/Pkgfile +++ b/libnumbertext/Pkgfile @@ -4,12 +4,15 @@ name=libnumbertext version=1.0.11 -release=1 -source=(https://github.com/Numbertext/libnumbertext/archive/$version/$name-$version.tar.gz libnumbertext-updateautotools.patch) +release=2 +source=(https://github.com/Numbertext/libnumbertext/archive/$version/$name-$version.tar.gz + libnumbertext-updateautotools.patch + deprecated.patch.0) build() { cd $name-$version + patch -Np0 -i $SRC/deprecated.patch.0 patch -Np1 -i $SRC/libnumbertext-updateautotools.patch autoreconf -vfi diff --git a/libnumbertext/deprecated.patch.0 b/libnumbertext/deprecated.patch.0 new file mode 100644 index 000000000..81e854273 --- /dev/null +++ b/libnumbertext/deprecated.patch.0 @@ -0,0 +1,17 @@ +--- src/Numbertext.cxx ++++ src/Numbertext.cxx +@@ -41,7 +41,14 @@ + std::wifstream wif(filename); + if (wif.fail()) + return false; ++#if defined __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif + wif.imbue(std::locale(std::locale(), new std::codecvt_utf8<wchar_t>)); ++#if defined __GNUC__ ++#pragma GCC diagnostic pop ++#endif + std::wstringstream wss; + wss << wif.rdbuf(); + result = wss.str();

1 0

ports/contrib (3.7): libreoffice: rebuild against various changes in dependency
by crux＠crux.nu 28 Jan '23

28 Jan '23

commit 249ec391706aca79cf0f00b6695b958c7c8a8c8e Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Jan 28 19:35:23 2023 +0100 libreoffice: rebuild against various changes in dependency diff --git a/libreoffice/.signature b/libreoffice/.signature index 92d1dd3cd..ca5b8cd3a 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36fbGqybciOFnEQjXMeQGyTsx866wfcnCKHd0ftYv9SXmHf58/E3d5U5jZFqG3PMexy9UcTW5T76MQc5W/7oww8= -SHA256 (Pkgfile) = f262b0fec9a1c2acf393b7153591635c5060c77492a3638235668293e324bc4e +RWSagIOpLGJF3+OId1y6YTSdSGCOwPbqVJ0XeoK19m359NbVWN2y/+89Ym2zyPdgBGBiudDR/xdHEE4si3QzSlLUjCsKYz+IUgI= +SHA256 (Pkgfile) = 5bb824b325aa85f17569e6552605d7ba25dbc864978965ad5211a7e7696c9f5b SHA256 (.footprint) = 3e6ae8e1792f59bd1f8ab29f6acb9df338de87141411f2db0d6374050a7f1057 SHA256 (libreoffice-7.5.0.3.tar.xz) = f5120fa3ae80a7deb08150038a6e78335bcab578bd7c41ddc733c2057977003b SHA256 (libreoffice-dictionaries-7.5.0.3.tar.xz) = a8eb1e2df14e504d43a43ac8ee0f436361f065fb5e359f9fb58125275ea41242 diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index 25fd184ff..55d034ad3 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -6,7 +6,7 @@ name=libreoffice version=7.5.0.3 -release=1 +release=2 pdfiumversion=5408 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$ver… https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src…

1 0