!54 [sync] PR-52: fix sw_64 build error

From: @openeuler-sync-bot Reviewed-by: @weidongkl Signed-off-by: @weidongkl
fix sw_64 build error
2025-03-21 08:26:09 +00:00 · 2025-03-21 16:25:47 +08:00 · 2024-02-06 02:49:50 +00:00 · 2024-02-06 10:14:10 +08:00 · 2023-09-08 09:35:05 +00:00 · 2023-09-07 09:03:17 +08:00
4 changed files with 104 additions and 17 deletions
--- a/CVE-2023-46045.patch
+++ b/CVE-2023-46045.patch
@ -0,0 +1,50 @@
+From 4becebe422e167358f4e57679d845932cc9f3a8a Mon Sep 17 00:00:00 2001
+From: starlet-dx <15929766099@163.com>
+Date: Fri, 2 Feb 2024 10:24:35 +0800
+Subject: [PATCH 1/1] Merge branch 'smattr/gitlab-2441' into 'main'
+
+gvc: detect plugin installation failure and display an error
+
+Closes #2441
+
+Origin:
+https://gitlab.com/graphviz/graphviz/-/commit/361f274ca901c3c476697a6404662d95f4dd43cb
+https://gitlab.com/graphviz/graphviz/-/commit/3f31704cafd7da3e86bb2861accf5e90c973e62a
+https://gitlab.com/graphviz/graphviz/-/commit/a95f977f5d809915ec4b14836d2b5b7f5e74881e
+---
+ lib/gvc/gvconfig.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/lib/gvc/gvconfig.c b/lib/gvc/gvconfig.c
+index d03de09..1eccc70 100644
+--- a/lib/gvc/gvconfig.c
+++ b/lib/gvc/gvconfig.c
+@@ -172,9 +172,8 @@ static char *token(int *nest, char **tokens)
+ 
+ static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
+ {
+-    char *package_path, *name, *api;
+    char *package_path, *name;
+     const char *type;
+-    api_t gv_api;
+     int quality;
+     int nest = 0;
+     gvplugin_package_t *package;
+@@ -188,8 +187,12 @@ static int gvconfig_plugin_install_from_config(GVC_t * gvc, char *s)
+ 	    name = "x";
+         package = gvplugin_package_record(gvc, package_path, name);
+ 	do {
+-	    api = token(&nest, &s);
+-	    gv_api = gvplugin_api(api);
+	    const char *api = token(&nest, &s);
+	    const api_t gv_api = gvplugin_api(api);
+	    if (gv_api == (api_t)-1) {
+		agerr(AGERR, "config error: %s %s not found\n", package_path, api);
+		return 0;
+	    }
+ 	    do {
+ 		if (nest == 2) {
+ 		    type = token(&nest, &s);
+-- 
+2.33.0
+
--- a/backport-graphviz-2.48.0-gvpack-neato-static.patch
+++ b/backport-graphviz-2.48.0-gvpack-neato-static.patch
@ -11,5 +11,5 @@ index 4978fea..9fbe2e2 100644
 +	$(top_builddir)/lib/pathplan/libpathplan_C.la \
 +		$(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
 
- # add a non-existent C++ source to force the C++ compiler to be used for
- # linking, so the C++ standard library is included for our C++ dependencies
+ if ENABLE_STATIC
+ gvpack_static_SOURCES = gvpack.cpp
--- a/graphviz-2.48.0.tar.gz
+++ b/graphviz-2.48.0.tar.gz
--- a/graphviz.spec
+++ b/graphviz.spec
@ -9,24 +9,35 @@
 %global pluginsver 6
 %global php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)

+%ifarch loongarch64
+%global OCAML 0
+%else
+%global OCAML 1
+%endif


 Name:               graphviz
-Version:            2.48.0
-Release:            2
+Version:            8.1.0
+Release:            3
 Summary:            Graph Visualization Tools
 License:            EPL-1.0
 URL:                http://www.graphviz.org/
 Source0:            https://gitlab.com/graphviz/graphviz/-/archive/%{version}/graphviz-%{version}.tar.gz

-Patch6000:          backport-graphviz-2.48.0-gvpack-neato-static.patch
+Patch6000:          backport-graphviz-4.0.0-gvpack-neato-static.patch
+# https://gitlab.com/graphviz/graphviz/-/commit/5d09f70d7f6b81eb891749895c2e6b81365ac234
+Patch6001:          CVE-2023-46045.patch

 BuildRequires:      gcc-g++
-BuildRequires:      ksh bison m4 flex ruby automake perl-Carp autoconf libtool qpdf ocaml urw-base35-fonts, perl-ExtUtils-Embed, perl-generators, librsvg2-devel swig >= 1.3.33
+BuildRequires:      ksh bison m4 flex ruby automake perl-Carp autoconf libtool qpdf urw-base35-fonts, perl-ExtUtils-Embed, perl-generators, librsvg2-devel swig >= 1.3.33
 BuildRequires:      zlib-devel libpng-devel libjpeg-devel expat-devel tk-devel fontconfig-devel libtool-ltdl-devel ruby-devel guile-devel freetype-devel >= 2 tcl-devel >= 8.3
 BuildRequires:      python3-devel libXaw-devel libSM-devel libXext-devel java-devel pango-devel gmp-devel lua-devel gtk2-devel cairo-devel >= 1.1.10
 BuildRequires:      ghostscript libgs-devel gd-devel perl-devel chrpath

+%if %{OCAML}
+BuildRequires: ocaml
+%endif
+
 %if %{with php}
 BuildRequires:      php-devel
 %endif
@ -92,12 +103,14 @@ Requires:            %{name} = %{version}-%{release} lua
 %description lua
 Lua extension for graphviz.

+%if %{OCAML}
 %package ocaml
 Summary:             Ocaml extension for graphviz
 Requires:            %{name} = %{version}-%{release} ocaml

 %description ocaml
 Ocaml extension for graphviz.
+%endif

 %package perl
 Summary:             Perl extension for graphviz
@ -111,11 +124,13 @@ Summary:             Ruby extension for graphviz
 Requires:            %{name} = %{version}-%{release} ruby
 %description ruby
 Ruby extension for graphviz.
+%ifnarch loongarch64 sw_64
 %package tcl
 Summary:             Tcl extension & tools for graphviz
 Requires:            %{name} = %{version}-%{release} tcl >= 8.3 tk
 %description tcl
 Various tcl packages (extensions) for the graphviz tools.
+%endif


 %if %{with php}
@ -152,6 +167,9 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon
        --without-mylibgd --with-ipsepcola --with-pangocairo \
        --with-gdk-pixbuf --with-visio --disable-silent-rules \
        --without-lasi --without-gts --disable-sharp --without-ming \
+%if !%{OCAML}
+        --disable-ocaml \
+%endif
        --disable-r  --without-devil  --without-qt

 # drop rpath
@ -165,12 +183,8 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fno-strict-ove

 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} \
-	docdir=%{buildroot}%{_docdir}/%{name} \
-	pkgconfigdir=%{_libdir}/pkgconfig \
-	PYTHON_LIBS=`python3-config --libs` \
-	PYTHON_INSTALL_DIR=%{python3_sitearch} \
-	install
+%make_install docdir=%{_docdir}/%{name} \
+	pkgconfigdir=%{_libdir}/pkgconfig

 %delete_la

@ -184,8 +198,6 @@ __EOF__

 find $RPM_BUILD_ROOT%{_datadir}/%{name}/demo -type f -exec chmod a-x {} ';'

-chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/*
-
 # python 3
 pushd tclpkg/gv
 install -pD .libs/libgv_python3.so $RPM_BUILD_ROOT%{python3_sitearch}/_gv.so
@ -199,6 +211,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
 echo "%{_libdir}/graphviz" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 touch $RPM_BUILD_ROOT%{_libdir}/graphviz/config%{pluginsver}

+%ifarch loongarch64 sw_64
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/lua/5.4/
+mv $RPM_BUILD_ROOT/usr/lib/lua/5.4/gv.so $RPM_BUILD_ROOT/usr/lib64/lua/5.4/gv.so
+%endif
+
 %check
 %if %{with php}
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} \
@ -218,7 +235,7 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/

 %files
 %defattr(-,root,root)
-%doc README
+%doc %{_docdir}/%{name}
 %{_bindir}/*
 %dir %{_libdir}/graphviz
 %{_libdir}/*.so.*
@ -240,18 +257,22 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/

 %exclude %{_libdir}/graphviz/*/*
 %exclude %{_libdir}/graphviz/libgvplugin_gd.*
+
 %files  devel
 %{_includedir}/graphviz
 %{_libdir}/*.so
 %{_libdir}/graphviz/*.so
 %{_libdir}/pkgconfig/*.pc
+
 %files docs
 %defattr(644,root,root)
-%doc %{_datadir}/%{name}/doc
+%doc %{_docdir}/%{name}/*.html
+%doc %{_docdir}/%{name}/*.pdf
 %doc %{_datadir}/%{name}/demo
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/man7/*
+
 %files gd
 %{_libdir}/graphviz/libgvplugin_gd.so.*

@ -269,8 +290,10 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/
 %{_libdir}/graphviz/lua/
 %{_libdir}/lua*/*

+%if %{OCAML}
 %files ocaml
 %{_libdir}/graphviz/ocaml/
+%endif

 %files perl
 %{_libdir}/graphviz/perl/
@ -284,12 +307,26 @@ php --no-php-ini --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/graphviz/php/
 %{_libdir}/graphviz/ruby/
 %{_libdir}/*ruby*/*

+%ifnarch loongarch64 sw_64
 %files tcl
 %{_libdir}/graphviz/tcl/
 %{_libdir}/tcl*/*
+%endif

 %changelog
-* Sat Jun 8 2022 wuchaochao <wuchaochao4@huawei.com> - 2.48.0-2
+* Tue Mar 11 2025 mahailiang <mahailiang@uniontech.com> - 8.1.0-3
+- fix sw_64 build error
+
+* Tue Feb 06 2024 yaoxin <yao_xin001@hoperun.com> - 8.1.0-2
+- Fix CVE-2023-46045
+
+* Thu Sep 07 2023 yaoxin <yao_xin001@hoperun.com> - 8.1.0-1
+- Update to 8.1.0
+
+* Mon Nov 21 2022 huajingyun <huajingyun@loongson.cn> - 2.48.0-3
+- add loongarch support
+
+* Sat Jan 8 2022 wuchaochao <wuchaochao4@huawei.com> - 2.48.0-2
 - delete redundant Provides and Obsoletes

 * Wed Dec 15 2021 wuchaochao <wuchaochao4@huawei.com> - 2.48.0-1
Author	SHA1	Message	Date
openeuler-ci-bot	0a7f6ebdd0	!54 [sync] PR-52: fix sw_64 build error From: @openeuler-sync-bot Reviewed-by: @weidongkl Signed-off-by: @weidongkl	2025-03-21 08:26:09 +00:00
Hailiang	ed726bb466	fix sw_64 build error (cherry picked from commit fe8ed1ba11376a3f504541ec161322452adeaf25)	2025-03-21 16:25:47 +08:00
openeuler-ci-bot	973802d1fb	!43 Fix CVE-2023-46045 From: @starlet-dx Reviewed-by: @lyn1001 Signed-off-by: @lyn1001	2024-02-06 02:49:50 +00:00
starlet-dx	b9a6561a2e	Fix CVE-2023-46045	2024-02-06 10:14:10 +08:00
openeuler-ci-bot	f84b9b3719	!33 Update to 8.1.0 From: @starlet-dx Reviewed-by: @lyn1001 Signed-off-by: @lyn1001	2023-09-08 09:35:05 +00:00
starlet-dx	c0237325ae	Update to 8.1.0	2023-09-07 09:03:17 +08:00
openeuler-ci-bot	eef54d9939	!28 add loongarch support From: @huajingyun Reviewed-by: @t_feng Signed-off-by: @t_feng	2022-11-30 06:09:36 +00:00
Jingyun Hua	1483613492	add loongarch support Signed-off-by: Jingyun Hua <huajingyun@loongson.cn>	2022-11-30 02:59:26 +00:00
openeuler-ci-bot	4bd105d43f	!26 Fix changelog error From: @fu-shanqing Reviewed-by: @dou33 Signed-off-by: @dou33	2022-06-10 01:22:56 +00:00
付善庆	709cda6127	Fix changelog error	2022-06-08 06:11:22 +00:00