Skip to content

Commit 815cb4e

Browse files
krnowakkrnowak
authored
Merge pull request #2358 from flatcar/krnowak/expat-alpha
Backport dev-libs/expat 2.6.3 to alpha
2 parents e46e27e + 65508cf commit 815cb4e

File tree

8 files changed

+107
-4
lines changed

8 files changed

+107
-4
lines changed

‎changelog/security/2024-10-02-expat-backport.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- expat ([CVE-2024-45490](https://nvd.nist.gov/vuln/detail/CVE-2024-45490))

‎changelog/updates/2024-10-02-expat-backport.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- expat ([2.6.3](https://github.com/libexpat/libexpat/blob/R_2_6_3/expat/Changes))

‎sdk_container/src/third_party/portage-stable/dev-libs/expat/Manifest

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ DIST expat-2.5.0.tar.xz 460560 BLAKE2B 670298d076ff3b512a0212170d40cb04c601a11d6
22
DIST expat-2.6.0.tar.xz 483448 BLAKE2B 2f0117317bde4e03d8662bcac1ff6c2bbb1af694846b21a82ac12d11ccd43032b481af72fa35298c3cb19b7426dba6a67e703904ca7b05663ffd854a42348bd0 SHA512 d6f1c4a1a2ec8ffc04c04d6767cc8dd7dea3d132d10b8a2c45c5bfb405893c75db032b87a56cc88300b61c961dd7f9782b93aa74dddc7e66f25acb0c6c82b1fd
33
DIST expat-2.6.1.tar.xz 484000 BLAKE2B 21a177ae8d70ca1bf41cae75c299a3021a9fc1b9d5eb01eb2945b16d7b24dcbeabad855379bdd8a14de804e1a1648105ce03b505f68c2beb4096a81020e35848 SHA512 fcd7e04e9411799c48b7d08ea07808a0809d034453a0649d9a79ed09000f1a11e5082a034089fc0c0acd2789e85bdf1deb2a94d8e3e33791bbfed66ce7207bcc
44
DIST expat-2.6.2.tar.xz 485236 BLAKE2B aae019270e1ab233fe8480b7eaa77f648f23ef3383dc772dc946cb13163067431716dc5446862eb502315fd089f2f52f3d476589b74a97e462575cd54df44db4 SHA512 47b60967d6346d330dded87ea1a2957aa7d34dd825043386a89aa131054714f618ede57bfe97cf6caa40582a4bc67e198d2a915e7d8dbe8ee4f581857c2e3c2e
5+
DIST expat-2.6.3.tar.xz 485600 BLAKE2B b8e0a0e779f0f136eaca91115cbbcf5a5cca457cab1cca6f8d6141151d19f8ef2dccb41b0e9134459c1e7d99cb2e0b4ce3922d2bd9221002ec43fe9d53a0084a SHA512 e02c4ad88f9d539258aa1c1db71ded7770a8f12c77b5535e5b34f040ae5b1361ef23132f16d96bdb7c096a83acd637a7c907916bdfcc6d5cfb9e35d04020ca0b

‎sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.5.0.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
1212

1313
LICENSE="MIT"
1414
SLOT="0"
15-
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
15+
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
1616
IUSE="examples static-libs test unicode"
1717
RESTRICT="!test? ( test )"
1818
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"

‎sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.6.0.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
1212

1313
LICENSE="MIT"
1414
SLOT="0"
15-
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
15+
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
1616
IUSE="examples static-libs test unicode"
1717
RESTRICT="!test? ( test )"
1818
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"

‎sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.6.1.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
1212

1313
LICENSE="MIT"
1414
SLOT="0"
15-
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
15+
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
1616
IUSE="examples static-libs test unicode"
1717
RESTRICT="!test? ( test )"
1818
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"

‎sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.6.2.ebuild

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
1212

1313
LICENSE="MIT"
1414
SLOT="0"
15-
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
15+
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
1616
IUSE="examples static-libs test unicode"
1717
RESTRICT="!test? ( test )"
1818
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"

‎sdk_container/src/third_party/portage-stable/dev-libs/expat/expat-2.6.3.ebuild

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# Copyright 1999-2024 Gentoo Authors
2+
# Distributed under the terms of the GNU General Public License v2
3+
4+
EAPI=8
5+
AUTOTOOLS_AUTO_DEPEND=no
6+
inherit autotools multilib-minimal
7+
8+
DESCRIPTION="Stream-oriented XML parser library"
9+
HOMEPAGE="https://libexpat.github.io/"
10+
SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/expat-${PV}.tar.xz"
11+
12+
LICENSE="MIT"
13+
SLOT="0"
14+
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
15+
IUSE="examples static-libs test unicode"
16+
RESTRICT="!test? ( test )"
17+
BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
18+
19+
DOCS=( README.md )
20+
21+
QA_CONFIG_IMPL_DECL_SKIP=(
22+
# https://bugs.gentoo.org/906384
23+
arc4random
24+
arc4random_buf
25+
)
26+
27+
src_prepare() {
28+
default
29+
30+
# fix interpreter to be a recent/good shell
31+
sed -i -e "1s:/bin/sh:${BASH}:" conftools/get-version.sh || die
32+
if use unicode; then
33+
cp -R "${S}" "${S}"w || die
34+
pushd "${S}"w >/dev/null
35+
find -name Makefile.am \
36+
-exec sed \
37+
-e 's,libexpat\.la,libexpatw.la,' \
38+
-e 's,libexpat_la,libexpatw_la,' \
39+
-i {} + || die
40+
eautoreconf
41+
popd >/dev/null
42+
fi
43+
}
44+
45+
multilib_src_configure() {
46+
local myconf="$(use_with test tests) $(use_enable static-libs static) --without-docbook"
47+
48+
mkdir -p "${BUILD_DIR}"w || die
49+
50+
if use unicode; then
51+
pushd "${BUILD_DIR}"w >/dev/null
52+
CPPFLAGS="${CPPFLAGS} -DXML_UNICODE" ECONF_SOURCE="${S}"w econf ${myconf}
53+
popd >/dev/null
54+
fi
55+
56+
ECONF_SOURCE="${S}" econf ${myconf}
57+
}
58+
59+
multilib_src_compile() {
60+
emake
61+
62+
if use unicode; then
63+
pushd "${BUILD_DIR}"w >/dev/null
64+
emake -C lib
65+
popd >/dev/null
66+
fi
67+
}
68+
69+
multilib_src_install() {
70+
emake install DESTDIR="${D}"
71+
72+
if use unicode; then
73+
pushd "${BUILD_DIR}"w >/dev/null
74+
emake -C lib install DESTDIR="${D}"
75+
popd >/dev/null
76+
77+
pushd "${ED}"/usr/$(get_libdir)/pkgconfig >/dev/null
78+
cp expat.pc expatw.pc
79+
sed -i -e '/^Libs/s:-lexpat:&w:' expatw.pc || die
80+
popd >/dev/null
81+
fi
82+
}
83+
84+
multilib_src_install_all() {
85+
einstalldocs
86+
87+
doman doc/xmlwf.1
88+
89+
# Note: Use of HTML_DOCS would add unwanted "doc" subfolder
90+
docinto html
91+
dodoc doc/*.{css,html}
92+
93+
if use examples; then
94+
docinto examples
95+
dodoc examples/*.c
96+
docompress -x usr/share/doc/${PF}/examples
97+
fi
98+
99+
find "${D}" -name '*.la' -type f -delete || die
100+
}

0 commit comments

Comments
 (0)