Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libxml2] Update to 2.10.3. JB#59019 #2

Merged
merged 1 commit into from Jan 12, 2023
Merged

[libxml2] Update to 2.10.3. JB#59019 #2

merged 1 commit into from Jan 12, 2023

Conversation

pvuorela
Copy link
Contributor

CVE-2022-23308 CVE-2022-29824 CVE-2022-2309 CVE-2022-40303 CVE-2022-40304

Removed doc and python-build subpackages. Don't seem useful since we don't build neither docs nor python support. Python-build has been there since the beginning and looks like a Fedora thing, not spotting references on sailfish.

@mlehtima

CVE-2022-23308 CVE-2022-29824 CVE-2022-2309 CVE-2022-40303 CVE-2022-40304

Removed doc and python-build subpackages. Don't seem useful
since we don't build neither docs nor python support.
Python-build has been there since the beginning and looks like a Fedora
thing, not spotting references on sailfish.

-SUBDIRS = include . doc example fuzz xstc
+SUBDIRS = include . fuzz xstc
if WITH_PYTHON
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to patch this.
If you pass SUBDIR="include . fuzz xstc" to make it will override the default.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't change this more than rebasing the patch. SUBDIR sounds a bit arbitrary thing used externally so I'd rather not touch this now.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SUBDIRS is the standard variable for sub makefiles in Automake projects, I've tested this with guile already overriding it over the commant line is fine.
In any case it is just a smaller suggestion that avoids the patch.

%doc %{_docdir}/%{name}-%{version}/*
%doc %{_mandir}/man1/xml2-config.1*
%doc %{_mandir}/man3/libxml.3*
%exclude %{_libdir}/*.la
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the *.la file should be gone without this, that should be a bug in our rpm packaging.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean a bug? That hasn't been include in the main package earlier, the subpackage isn't afaik used by anything, and on many packages this just gets deleted.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The rpm packaging scripts that run after the package should cleanup the *.la files.


-DIST_SUBDIRS = include . doc example fuzz python xstc
+DIST_SUBDIRS = include . fuzz python xstc

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

-examples_DATA = xmllint.c
+#examplesdir = $(docdir)/examples
+#examples_DATA = xmllint.c

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleting that file later would be easier I than patching I think.

Copy link

@Thaodan Thaodan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some small comments except that LGTM.

@vigejolla
Copy link
Member

Have you tried building python3-lxml with the updated libxml2?

@pvuorela
Copy link
Contributor Author

Have you tried building python3-lxml with the updated libxml2?

Yes, building this in feature project to make sure all good. This is already built fine.

@pvuorela pvuorela merged commit 810106b into master Jan 12, 2023
@mlehtima mlehtima deleted the update_2103 branch February 4, 2023 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants