* [PR PATCH] Attempt to track private API
@ 2023-02-26 16:50 sgn
2023-02-27 6:46 ` [PR PATCH] [Updated] " sgn
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: sgn @ 2023-02-26 16:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 13178 bytes --]
From 0dc784539897ffc6dff65dc2b7459e9721072d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 1/5] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From 22fb2ba82d84cad5e9efeda0667ac1c68882ecbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 2/5] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From 2835ebe5ca252d56ba8cc388c4f593815509ccfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 3/5] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From 8db0d9f1212de66ebb349d3c04d79bd18b6652e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 4/5] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..b08b2f4bf560 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}: do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From 94bde55e854e2c849baf81dff4fc97bdbdc4253a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 5/5] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 36 +++++++++++++++++--
common/shlibs.private | 2 ++
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..1419a62a264e 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,22 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ msg_red_nochroot " Untracked Private API: $_rdep\n"
+ broken_shlibs=1
+ else
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..e64f4954c481
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,2 @@
+libQt5Core.so.5:5.15.7
+libQt6Core.so.6:6.4.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
@ 2023-02-27 6:46 ` sgn
2023-02-27 15:22 ` sgn
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2023-02-27 6:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 13178 bytes --]
From 3157d13497239b5b2ba80ab42860195cac99b9e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 1/5] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From 4762c28de78aa337a2d3eec1e79b30d2c2ca6c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 2/5] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From 5f6a72ccb9408af0c19b6a26f80450af1c2ac1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 3/5] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From bbf4c3977dcde7dfd29585b15489f0ceb0d752ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 4/5] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..ae2a02e9fd3f 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From cd111a1c311bb93312e80d55a687482f4ce2cfc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 5/5] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 36 +++++++++++++++++--
common/shlibs.private | 2 ++
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..1419a62a264e 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,22 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ msg_red_nochroot " Untracked Private API: $_rdep\n"
+ broken_shlibs=1
+ else
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..e64f4954c481
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,2 @@
+libQt5Core.so.5:5.15.7
+libQt6Core.so.6:6.4.2
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
2023-02-27 6:46 ` [PR PATCH] [Updated] " sgn
@ 2023-02-27 15:22 ` sgn
2023-03-05 8:23 ` classabbyamp
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2023-02-27 15:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 15921 bytes --]
From 58015a4d9ef31a7cf171a54a88a6b9d4e075393b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 1/7] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From 11ce869fe8eb11301f1c92b85d8ddba3a96701c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 2/7] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From d248b55029786113d1115cc72f7d9af9a9f45b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 3/7] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From 1de87e3ad352428f94fd5c98b988560db7496195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 4/7] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..ae2a02e9fd3f 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From 0d3082105b84d8550e9a3dcd79fb08b10badeb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 5/7] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 36 +++++++++++++++++--
common/shlibs.private | 2 ++
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..1419a62a264e 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,22 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ msg_red_nochroot " Untracked Private API: $_rdep\n"
+ broken_shlibs=1
+ else
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..e64f4954c481
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,2 @@
+libQt5Core.so.5:5.15.7
+libQt6Core.so.6:6.4.2
From 6a102f1a4e2500477eee8519900ce82e7edef988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 27 Feb 2023 11:55:25 +0700
Subject: [PATCH 6/7] qt5: provides private shlib
---
srcpkgs/qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..a1793c93323a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
@@ -13,7 +13,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxkbcommon-devel
+ libvpx-devel libwebp-devel libxkbcommon-devel libglvnd-devel
libxslt-devel libxml2-devel cups-devel minizip-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
protobuf-devel pulseaudio-devel tslib-devel openssl-devel
@@ -35,6 +35,7 @@ python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
+libprivate="${version%+*}"
CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
# Required for musl libc
From 74c860eebb58ee7eb5de4555262f4b21c73cd792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 24 Feb 2023 23:06:53 +0700
Subject: [PATCH 7/7] qt6-base: keep usr/lib/cmake/Qt6/
---
srcpkgs/qt6-base/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 024393134eef..833a8cf1f89e 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
@@ -291,7 +291,7 @@ qt6-base-devel_package() {
vmove usr/share/qt6/modules
for _f in ${DESTDIR}/usr/lib/cmake/*; do
case "$_f" in
- *Tools|*HostInfo) ;;
+ *Tools|*HostInfo|*/Qt6) ;;
*) vmove "usr/lib/cmake/${_f##*/}" ;;
esac
done
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
2023-02-27 6:46 ` [PR PATCH] [Updated] " sgn
2023-02-27 15:22 ` sgn
@ 2023-03-05 8:23 ` classabbyamp
2023-03-09 16:18 ` [PR PATCH] [Updated] " sgn
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2023-03-05 8:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42462#issuecomment-1455023257
Comment:
this seems reasonable to me, i think
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
` (2 preceding siblings ...)
2023-03-05 8:23 ` classabbyamp
@ 2023-03-09 16:18 ` sgn
2023-03-09 16:28 ` sgn
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2023-03-09 16:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 19114 bytes --]
From e5c17750f18107a9aff22e58cf87dde745ebf51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 1/8] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From a46c0f19aedbe817c14fcbc0b048d685d94b7c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 2/8] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From c405ca26b7091162326a5860f82e4887bedefdc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 3/8] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From 989b7f030fe88a00d9a0d86f81885668536ec675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 4/8] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..ae2a02e9fd3f 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From 95d6eb1e832e79b04df28792b2433ed7074516ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 5/8] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 36 +++++++++++++++++--
common/shlibs.private | 2 ++
2 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..79bad0c66dcb 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,22 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ else
+ msg_red_nochroot " Untracked Private API: $_rdep\n"
+ broken_shlibs=1
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..e64f4954c481
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,2 @@
+libQt5Core.so.5:5.15.7
+libQt6Core.so.6:6.4.2
From da0301158f6937894c2b0bf92b8dac09c86dbe54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 23:16:27 +0700
Subject: [PATCH 6/8] New package: md4c-0.4.8
---
common/shlibs | 2 ++
srcpkgs/libmd4c | 1 +
srcpkgs/libmd4c-devel | 1 +
srcpkgs/libmd4c-html | 1 +
srcpkgs/md4c/template | 36 ++++++++++++++++++++++++++++++++++++
5 files changed, 41 insertions(+)
create mode 120000 srcpkgs/libmd4c
create mode 120000 srcpkgs/libmd4c-devel
create mode 120000 srcpkgs/libmd4c-html
create mode 100644 srcpkgs/md4c/template
diff --git a/common/shlibs b/common/shlibs
index dd41d3665aee..6f3518b719c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2007,6 +2007,8 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
libfm-qt.so.12 libfm-qt-1.2.0_1
libqtermwidget5.so.1 qtermwidget-1.0.0_1
+libmd4c.so.0 libmd4c-0.4.8_1
+libmd4c-html.so.0 libmd4c-html-0.4.8_1
libQt6Core.so.6 qt6-core-6.0.0_1
libQt6OpenGL.so.6 qt6-gui-6.0.0_1
libQt6DBus.so.6 qt6-dbus-6.0.0_1
diff --git a/srcpkgs/libmd4c b/srcpkgs/libmd4c
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-devel b/srcpkgs/libmd4c-devel
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-devel
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-html b/srcpkgs/libmd4c-html
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-html
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/md4c/template b/srcpkgs/md4c/template
new file mode 100644
index 000000000000..69a0956116c5
--- /dev/null
+++ b/srcpkgs/md4c/template
@@ -0,0 +1,36 @@
+# Template file for 'md4c'
+pkgname=md4c
+version=0.4.8
+revision=1
+build_style=cmake
+short_desc="Markdown for C"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/mity/md4c/"
+distfiles="https://github.com/mity/md4c/archive/refs/tags/release-${version}.tar.gz"
+checksum=4a457df853425b6bb6e3457aa1d1a13bccec587a04c38c622b1013a0da41439f
+
+libmd4c-html_package() {
+ short_desc+=" - html - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c-html.so.*"
+ }
+}
+
+libmd4c_package() {
+ short_desc+=" - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c.so.*"
+ }
+}
+
+libmd4c-devel_package() {
+ depends="libmd4c>=${version}_${revision} libmd4c-html>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 473db81ce41eac9fed3053e652289f14850ff7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 27 Feb 2023 11:55:25 +0700
Subject: [PATCH 7/8] qt5: provides private shlib
---
srcpkgs/qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..a1793c93323a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
@@ -13,7 +13,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxkbcommon-devel
+ libvpx-devel libwebp-devel libxkbcommon-devel libglvnd-devel
libxslt-devel libxml2-devel cups-devel minizip-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
protobuf-devel pulseaudio-devel tslib-devel openssl-devel
@@ -35,6 +35,7 @@ python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
+libprivate="${version%+*}"
CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
# Required for musl libc
From 0329ab25f7f2aca8c01eb8b1b24f9a64fd3510d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 24 Feb 2023 23:06:53 +0700
Subject: [PATCH 8/8] qt6-base: keep usr/lib/cmake/Qt6/
---
srcpkgs/qt6-base/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 024393134eef..953cc0c2575c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
@@ -17,7 +17,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
-DQT_FEATURE_qmake=ON
-DBUILD_WITH_PCH=OFF"
hostmakedepends="perl pkg-config xmlstarlet"
-makedepends="zlib-devel libzstd-devel dbus-devel
+makedepends="zlib-devel libzstd-devel dbus-devel libmd4c-devel
double-conversion-devel glib-devel libxcb-devel
xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel
@@ -291,7 +291,7 @@ qt6-base-devel_package() {
vmove usr/share/qt6/modules
for _f in ${DESTDIR}/usr/lib/cmake/*; do
case "$_f" in
- *Tools|*HostInfo) ;;
+ *Tools|*HostInfo|*/Qt6) ;;
*) vmove "usr/lib/cmake/${_f##*/}" ;;
esac
done
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
` (3 preceding siblings ...)
2023-03-09 16:18 ` [PR PATCH] [Updated] " sgn
@ 2023-03-09 16:28 ` sgn
2023-03-09 16:55 ` sgn
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2023-03-09 16:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 19273 bytes --]
From e5c17750f18107a9aff22e58cf87dde745ebf51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 1/8] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From a46c0f19aedbe817c14fcbc0b048d685d94b7c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 2/8] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From c405ca26b7091162326a5860f82e4887bedefdc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 3/8] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From 989b7f030fe88a00d9a0d86f81885668536ec675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 4/8] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..ae2a02e9fd3f 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From e0ebb29b24ce24439370a1b95fbe220e59da0c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 5/8] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 36 +++++++++++++++++--
common/shlibs.private | 7 ++++
2 files changed, 41 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..0a06ed6727e9 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,22 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ else
+ msg_red_nochroot " Untracked Private API: ${x}\n"
+ broken_shlibs=1
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..6419789e5637
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,7 @@
+libQt5Core.so.5:5.15.7
+libQt6Core.so.6:6.4.2
+libQt6EglFSDeviceIntegration.so.6:6.4.2
+libQt6EglFsKmsGbmSupport.so.6:6.4.2
+libQt6EglFsKmsSupport.so.6:6.4.2
+libQt6Gui.so.6:6.4.2
+libQt6OpenGL.so.6:6.4.2
From 34fd05a64d13998e355568e1631a7f74ee2fe7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 23:16:27 +0700
Subject: [PATCH 6/8] New package: md4c-0.4.8
---
common/shlibs | 2 ++
srcpkgs/libmd4c | 1 +
srcpkgs/libmd4c-devel | 1 +
srcpkgs/libmd4c-html | 1 +
srcpkgs/md4c/template | 36 ++++++++++++++++++++++++++++++++++++
5 files changed, 41 insertions(+)
create mode 120000 srcpkgs/libmd4c
create mode 120000 srcpkgs/libmd4c-devel
create mode 120000 srcpkgs/libmd4c-html
create mode 100644 srcpkgs/md4c/template
diff --git a/common/shlibs b/common/shlibs
index dd41d3665aee..6f3518b719c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2007,6 +2007,8 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
libfm-qt.so.12 libfm-qt-1.2.0_1
libqtermwidget5.so.1 qtermwidget-1.0.0_1
+libmd4c.so.0 libmd4c-0.4.8_1
+libmd4c-html.so.0 libmd4c-html-0.4.8_1
libQt6Core.so.6 qt6-core-6.0.0_1
libQt6OpenGL.so.6 qt6-gui-6.0.0_1
libQt6DBus.so.6 qt6-dbus-6.0.0_1
diff --git a/srcpkgs/libmd4c b/srcpkgs/libmd4c
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-devel b/srcpkgs/libmd4c-devel
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-devel
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-html b/srcpkgs/libmd4c-html
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-html
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/md4c/template b/srcpkgs/md4c/template
new file mode 100644
index 000000000000..69a0956116c5
--- /dev/null
+++ b/srcpkgs/md4c/template
@@ -0,0 +1,36 @@
+# Template file for 'md4c'
+pkgname=md4c
+version=0.4.8
+revision=1
+build_style=cmake
+short_desc="Markdown for C"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/mity/md4c/"
+distfiles="https://github.com/mity/md4c/archive/refs/tags/release-${version}.tar.gz"
+checksum=4a457df853425b6bb6e3457aa1d1a13bccec587a04c38c622b1013a0da41439f
+
+libmd4c-html_package() {
+ short_desc+=" - html - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c-html.so.*"
+ }
+}
+
+libmd4c_package() {
+ short_desc+=" - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c.so.*"
+ }
+}
+
+libmd4c-devel_package() {
+ depends="libmd4c>=${version}_${revision} libmd4c-html>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 11ac6aa6463b4e1de38a8d6b3aaf54149048148c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 27 Feb 2023 11:55:25 +0700
Subject: [PATCH 7/8] qt5: provides private shlib
---
srcpkgs/qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..a1793c93323a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
@@ -13,7 +13,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxkbcommon-devel
+ libvpx-devel libwebp-devel libxkbcommon-devel libglvnd-devel
libxslt-devel libxml2-devel cups-devel minizip-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
protobuf-devel pulseaudio-devel tslib-devel openssl-devel
@@ -35,6 +35,7 @@ python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
+libprivate="${version%+*}"
CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
# Required for musl libc
From a6f6c9819745ff8f65fb14cf34a4e5e6da122797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 24 Feb 2023 23:06:53 +0700
Subject: [PATCH 8/8] qt6-base: keep usr/lib/cmake/Qt6/
---
srcpkgs/qt6-base/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 024393134eef..953cc0c2575c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
@@ -17,7 +17,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
-DQT_FEATURE_qmake=ON
-DBUILD_WITH_PCH=OFF"
hostmakedepends="perl pkg-config xmlstarlet"
-makedepends="zlib-devel libzstd-devel dbus-devel
+makedepends="zlib-devel libzstd-devel dbus-devel libmd4c-devel
double-conversion-devel glib-devel libxcb-devel
xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel
@@ -291,7 +291,7 @@ qt6-base-devel_package() {
vmove usr/share/qt6/modules
for _f in ${DESTDIR}/usr/lib/cmake/*; do
case "$_f" in
- *Tools|*HostInfo) ;;
+ *Tools|*HostInfo|*/Qt6) ;;
*) vmove "usr/lib/cmake/${_f##*/}" ;;
esac
done
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
` (4 preceding siblings ...)
2023-03-09 16:28 ` sgn
@ 2023-03-09 16:55 ` sgn
2023-03-12 12:28 ` sgn
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2023-03-09 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 19405 bytes --]
From e5c17750f18107a9aff22e58cf87dde745ebf51a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 1/8] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From a46c0f19aedbe817c14fcbc0b048d685d94b7c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 2/8] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From c405ca26b7091162326a5860f82e4887bedefdc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 3/8] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From 989b7f030fe88a00d9a0d86f81885668536ec675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 4/8] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..ae2a02e9fd3f 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From 545d5d92ddddae063295d924acab6286e6e10adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 5/8] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 36 +++++++++++++++++--
common/shlibs.private | 12 +++++++
2 files changed, 46 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..0a06ed6727e9 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,22 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ else
+ msg_red_nochroot " Untracked Private API: ${x}\n"
+ broken_shlibs=1
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..48892c0b3bec
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,12 @@
+libQt5Core.so.5:5.15.7
+libQt6Core.so.6:6.4.2
+libQt6EglFSDeviceIntegration.so.6:6.4.2
+libQt6EglFsKmsGbmSupport.so.6:6.4.2
+libQt6EglFsKmsSupport.so.6:6.4.2
+libQt6Gui.so.6:6.4.2
+libQt6OpenGL.so.6:6.4.2
+libQt6Widgets.so.6:6.4.2
+libQt6Sql.so.6:6.4.2
+libQt6Network.so.6:6.4.2
+libQt6PrintSupport.so.6:6.4.2
+libQt6DBus.so.6:6.4.2
From c92ab7c3404bd5c11991280aed49fec8fd79b32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 23:16:27 +0700
Subject: [PATCH 6/8] New package: md4c-0.4.8
---
common/shlibs | 2 ++
srcpkgs/libmd4c | 1 +
srcpkgs/libmd4c-devel | 1 +
srcpkgs/libmd4c-html | 1 +
srcpkgs/md4c/template | 36 ++++++++++++++++++++++++++++++++++++
5 files changed, 41 insertions(+)
create mode 120000 srcpkgs/libmd4c
create mode 120000 srcpkgs/libmd4c-devel
create mode 120000 srcpkgs/libmd4c-html
create mode 100644 srcpkgs/md4c/template
diff --git a/common/shlibs b/common/shlibs
index dd41d3665aee..6f3518b719c4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2007,6 +2007,8 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
libfm-qt.so.12 libfm-qt-1.2.0_1
libqtermwidget5.so.1 qtermwidget-1.0.0_1
+libmd4c.so.0 libmd4c-0.4.8_1
+libmd4c-html.so.0 libmd4c-html-0.4.8_1
libQt6Core.so.6 qt6-core-6.0.0_1
libQt6OpenGL.so.6 qt6-gui-6.0.0_1
libQt6DBus.so.6 qt6-dbus-6.0.0_1
diff --git a/srcpkgs/libmd4c b/srcpkgs/libmd4c
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-devel b/srcpkgs/libmd4c-devel
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-devel
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-html b/srcpkgs/libmd4c-html
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-html
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/md4c/template b/srcpkgs/md4c/template
new file mode 100644
index 000000000000..69a0956116c5
--- /dev/null
+++ b/srcpkgs/md4c/template
@@ -0,0 +1,36 @@
+# Template file for 'md4c'
+pkgname=md4c
+version=0.4.8
+revision=1
+build_style=cmake
+short_desc="Markdown for C"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/mity/md4c/"
+distfiles="https://github.com/mity/md4c/archive/refs/tags/release-${version}.tar.gz"
+checksum=4a457df853425b6bb6e3457aa1d1a13bccec587a04c38c622b1013a0da41439f
+
+libmd4c-html_package() {
+ short_desc+=" - html - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c-html.so.*"
+ }
+}
+
+libmd4c_package() {
+ short_desc+=" - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c.so.*"
+ }
+}
+
+libmd4c-devel_package() {
+ depends="libmd4c>=${version}_${revision} libmd4c-html>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 6eaf9dd72a2a2678932c0ee4c8c92c06f7c60d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 27 Feb 2023 11:55:25 +0700
Subject: [PATCH 7/8] qt5: provides private shlib
---
srcpkgs/qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..a1793c93323a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
@@ -13,7 +13,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxkbcommon-devel
+ libvpx-devel libwebp-devel libxkbcommon-devel libglvnd-devel
libxslt-devel libxml2-devel cups-devel minizip-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
protobuf-devel pulseaudio-devel tslib-devel openssl-devel
@@ -35,6 +35,7 @@ python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
+libprivate="${version%+*}"
CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
# Required for musl libc
From aa0b6cdd2132ce55ba8efd1664b583cd4cdb2d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 24 Feb 2023 23:06:53 +0700
Subject: [PATCH 8/8] qt6-base: keep usr/lib/cmake/Qt6/
---
srcpkgs/qt6-base/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 024393134eef..953cc0c2575c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
@@ -17,7 +17,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
-DQT_FEATURE_qmake=ON
-DBUILD_WITH_PCH=OFF"
hostmakedepends="perl pkg-config xmlstarlet"
-makedepends="zlib-devel libzstd-devel dbus-devel
+makedepends="zlib-devel libzstd-devel dbus-devel libmd4c-devel
double-conversion-devel glib-devel libxcb-devel
xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel
@@ -291,7 +291,7 @@ qt6-base-devel_package() {
vmove usr/share/qt6/modules
for _f in ${DESTDIR}/usr/lib/cmake/*; do
case "$_f" in
- *Tools|*HostInfo) ;;
+ *Tools|*HostInfo|*/Qt6) ;;
*) vmove "usr/lib/cmake/${_f##*/}" ;;
esac
done
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
` (5 preceding siblings ...)
2023-03-09 16:55 ` sgn
@ 2023-03-12 12:28 ` sgn
2023-03-16 11:25 ` sgn
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2023-03-12 12:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 19870 bytes --]
From 30e0de76ae36f78c85e4d2cfae4708ecc5357701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 1/8] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From 0691c1c862a6f8243f9b52de66ca19d536b7d7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 2/8] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From 93ea2fd93648a02e423bff8a8d92238bc5e39c33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 3/8] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From 6a2f46d532e4659f52d2861be3f314a2129f2f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 4/8] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..ae2a02e9fd3f 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From 75bdbba72ed0034b63a02cd030bbbf64a1813bbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 5/8] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 38 ++++++++++++++++++-
common/shlibs.private | 27 +++++++++++++
2 files changed, 63 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..fe1f1fafb2c9 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,24 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if [ "$(find ${PKGDESTDIR} -name "${x}")" ]; then
+ : "self-provided"
+ elif _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ else
+ msg_red_nochroot " Untracked Private API: ${x}\n"
+ broken_shlibs=1
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..00af96524b12
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,27 @@
+# qt5
+libQt5Core.so.5:5.15.7
+libQt5Gui.so.5:5.15.7
+libQt5Qml.so.5:5.15.7
+libQt5QmlModels.so.5:5.15.7
+libQt5Quick.so.5:5.15.7
+libQt5Widgets.so.5:5.15.7
+libQt5Test.so.5:5.15.7
+libQt5XcbQpa.so.5:5.15.7
+libQt5DBus.so.5:5.15.7
+libQt5Location.so.5:5.15.7
+libQt5Positioning.so.5:5.15.7
+libQt5Multimedia.so.5:5.15.7
+libQt5Network.so.5:5.15.7
+libQt5Sql.so.5:5.15.7
+# qt6-base
+libQt6Core.so.6:6.4.2
+libQt6DBus.so.6:6.4.2
+libQt6EglFSDeviceIntegration.so.6:6.4.2
+libQt6EglFsKmsGbmSupport.so.6:6.4.2
+libQt6EglFsKmsSupport.so.6:6.4.2
+libQt6Gui.so.6:6.4.2
+libQt6Network.so.6:6.4.2
+libQt6OpenGL.so.6:6.4.2
+libQt6PrintSupport.so.6:6.4.2
+libQt6Sql.so.6:6.4.2
+libQt6Widgets.so.6:6.4.2
From 517a624af89c8094775e643e59451ded3c4c484c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 23:16:27 +0700
Subject: [PATCH 6/8] New package: md4c-0.4.8
---
common/shlibs | 2 ++
srcpkgs/libmd4c | 1 +
srcpkgs/libmd4c-devel | 1 +
srcpkgs/libmd4c-html | 1 +
srcpkgs/md4c/template | 36 ++++++++++++++++++++++++++++++++++++
5 files changed, 41 insertions(+)
create mode 120000 srcpkgs/libmd4c
create mode 120000 srcpkgs/libmd4c-devel
create mode 120000 srcpkgs/libmd4c-html
create mode 100644 srcpkgs/md4c/template
diff --git a/common/shlibs b/common/shlibs
index 5cc81b9f90b2..8808511e5f36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2007,6 +2007,8 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
libfm-qt.so.12 libfm-qt-1.2.0_1
libqtermwidget5.so.1 qtermwidget-1.0.0_1
+libmd4c.so.0 libmd4c-0.4.8_1
+libmd4c-html.so.0 libmd4c-html-0.4.8_1
libQt6Core.so.6 qt6-core-6.0.0_1
libQt6OpenGL.so.6 qt6-gui-6.0.0_1
libQt6DBus.so.6 qt6-dbus-6.0.0_1
diff --git a/srcpkgs/libmd4c b/srcpkgs/libmd4c
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-devel b/srcpkgs/libmd4c-devel
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-devel
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-html b/srcpkgs/libmd4c-html
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-html
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/md4c/template b/srcpkgs/md4c/template
new file mode 100644
index 000000000000..69a0956116c5
--- /dev/null
+++ b/srcpkgs/md4c/template
@@ -0,0 +1,36 @@
+# Template file for 'md4c'
+pkgname=md4c
+version=0.4.8
+revision=1
+build_style=cmake
+short_desc="Markdown for C"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/mity/md4c/"
+distfiles="https://github.com/mity/md4c/archive/refs/tags/release-${version}.tar.gz"
+checksum=4a457df853425b6bb6e3457aa1d1a13bccec587a04c38c622b1013a0da41439f
+
+libmd4c-html_package() {
+ short_desc+=" - html - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c-html.so.*"
+ }
+}
+
+libmd4c_package() {
+ short_desc+=" - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c.so.*"
+ }
+}
+
+libmd4c-devel_package() {
+ depends="libmd4c>=${version}_${revision} libmd4c-html>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From 7080d7a2aefa936d48a149b2278cfb6eb343aed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 27 Feb 2023 11:55:25 +0700
Subject: [PATCH 7/8] qt5: provides private shlib
---
srcpkgs/qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..a1793c93323a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
@@ -13,7 +13,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxkbcommon-devel
+ libvpx-devel libwebp-devel libxkbcommon-devel libglvnd-devel
libxslt-devel libxml2-devel cups-devel minizip-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
protobuf-devel pulseaudio-devel tslib-devel openssl-devel
@@ -35,6 +35,7 @@ python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
+libprivate="${version%+*}"
CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
# Required for musl libc
From f5b27733427cb88b979d3a674e8c7ff67e7285a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 24 Feb 2023 23:06:53 +0700
Subject: [PATCH 8/8] qt6-base: keep usr/lib/cmake/Qt6/
---
srcpkgs/qt6-base/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 024393134eef..953cc0c2575c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
@@ -17,7 +17,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
-DQT_FEATURE_qmake=ON
-DBUILD_WITH_PCH=OFF"
hostmakedepends="perl pkg-config xmlstarlet"
-makedepends="zlib-devel libzstd-devel dbus-devel
+makedepends="zlib-devel libzstd-devel dbus-devel libmd4c-devel
double-conversion-devel glib-devel libxcb-devel
xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel
@@ -291,7 +291,7 @@ qt6-base-devel_package() {
vmove usr/share/qt6/modules
for _f in ${DESTDIR}/usr/lib/cmake/*; do
case "$_f" in
- *Tools|*HostInfo) ;;
+ *Tools|*HostInfo|*/Qt6) ;;
*) vmove "usr/lib/cmake/${_f##*/}" ;;
esac
done
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
` (6 preceding siblings ...)
2023-03-12 12:28 ` sgn
@ 2023-03-16 11:25 ` sgn
2023-06-15 1:58 ` github-actions
2023-06-29 2:04 ` [PR PATCH] [Closed]: " github-actions
9 siblings, 0 replies; 11+ messages in thread
From: sgn @ 2023-03-16 11:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages attempt-to-track-private-api
https://github.com/void-linux/void-packages/pull/42462
Attempt to track private API
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42462.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-attempt-to-track-private-api-42462.patch --]
[-- Type: text/x-diff, Size: 20997 bytes --]
From 42cb0f2bfcd3bb8737cf8d2716ed93607cee8b69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 13 Mar 2023 20:39:42 +0700
Subject: [PATCH 1/9] gnulib: update to 20230209+stable.
---
srcpkgs/gnulib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gnulib/template b/srcpkgs/gnulib/template
index da256f2adf09..510e290a3e64 100644
--- a/srcpkgs/gnulib/template
+++ b/srcpkgs/gnulib/template
@@ -1,6 +1,6 @@
# Template file for 'gnulib'
pkgname=gnulib
-version=20220829~828413b
+version=20230209+stable
revision=1
create_wrksrc=yes
build_style=gnu-configure
@@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later, GPL-2.0-or-later, FSFULLR"
homepage="https://www.gnu.org/software/gnulib/"
distfiles="${DEBIAN_SITE}/main/g/gnulib/gnulib_${version}.orig.tar.gz"
-checksum=8bf9ac42ebc7d6ec1afc9d50bfe823a212b06f0d40e738b0e9e468be60a858fe
+checksum=3d705dfeae9d4f17c3532e8663523206352b1f79c990b945bdcda2a847ba3546
post_extract() {
mv gnulib-* gnulib
From 3822a530824ad065a07b7cd5eb22d3cbf1a9c8f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 22:59:31 +0700
Subject: [PATCH 2/9] pre-pkg: shlib-provides virtual SONAME for private API
---
common/hooks/pre-pkg/06-shlib-provides.sh | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/06-shlib-provides.sh b/common/hooks/pre-pkg/06-shlib-provides.sh
index a09eb6f5c3b3..2b7e0d77af4c 100644
--- a/common/hooks/pre-pkg/06-shlib-provides.sh
+++ b/common/hooks/pre-pkg/06-shlib-provides.sh
@@ -1,6 +1,16 @@
# This hook executes the following tasks:
# - generates shlib-provides file for xbps-create(1)
+has_private_shlib() {
+ local f="$1" _soname="$2"
+ ${OBJDUMP} -p "$f" | awk '
+ /^Version definitions:/{v=1}
+ !v{next}
+ /_PRIVATE_API/{ print "yes"; exit}
+ /^$/{exit}
+ '
+}
+
collect_sonames() {
local _destdir="$1" f _soname _fname _pattern
local _pattern="^[[:alnum:]]+(.*)+\.so(\.[0-9]+)*$"
@@ -13,6 +23,7 @@ collect_sonames() {
fi
# real pkg
+ {
find ${_destdir} -type f -name "*.so*" | while read f; do
_fname="${f##*/}"
case "$(file -bi "$f")" in
@@ -25,19 +36,23 @@ collect_sonames() {
[[ ${_soname} =~ ${_pattern} &&
( -e ${_destdir}/usr/lib/${_fname} ||
-e ${_destdir}/usr/lib32/${_fname} ) ]]; then
- echo "${_soname}" >> ${_tmpfile}
+ echo "${_soname}" >&3
echo " SONAME ${_soname} from ${f##${_destdir}}"
+ if [ "$(has_private_shlib "$f")" ]; then
+ _private="private:$_soname:${libprivate:-${version}}"
+ echo "$_private" >&3
+ fi
fi
;;
esac
done
for f in ${shlib_provides}; do
- echo "$f" >> ${_tmpfile}
+ echo "$f" >&3
done
+ } 3>${_tmpfile}
if [ -s "${_tmpfile}" ]; then
- tr '\n' ' ' < "${_tmpfile}" > ${_destdir}/shlib-provides
- echo >> ${_destdir}/shlib-provides
+ sort <${_tmpfile} | xargs >${_destdir}/shlib-provides
fi
rm -f ${_tmpfile}
}
From 8fcea5501d7d57ee346810f512c1dc1364618ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:01:50 +0700
Subject: [PATCH 3/9] pre-pkg/gen-runtime-deps: change TAB to 4 spaces
---
common/hooks/pre-pkg/04-generate-runtime-deps.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index a291f2ccc872..1eb18d9a92e5 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -71,10 +71,10 @@ hook() {
exec < $depsftmp
while read f; do
lf=${f#${PKGDESTDIR}}
- if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
- msg_normal "Skipping dependency scan for ${lf}\n"
- continue
- fi
+ if [ "${skiprdeps/${lf}/}" != "${skiprdeps}" ]; then
+ msg_normal "Skipping dependency scan for ${lf}\n"
+ continue
+ fi
read -n4 elfmagic < "$f"
if [ "$elfmagic" = $'\177ELF' ]; then
for nlib in $($OBJDUMP -p "$f"|awk '/NEEDED/{print $2}'); do
From d3428929b185ff87c3ecfac0c6957e32815e261d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:28:12 +0700
Subject: [PATCH 4/9] pre-pkg/99-pkglint: factor out check_shlib function
---
common/hooks/pre-pkg/99-pkglint.sh | 106 ++++++++++++++++-------------
1 file changed, 57 insertions(+), 49 deletions(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index a3ed816ed6ec..5c228ff3a4d7 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,8 +1,63 @@
# This hook checks for common issues related to void.
+pkg_lint_check_shlib() {
+ local rev libname _shlib _pkgname _pattern
+ local filename="$1"
+ local mapshlibs=$XBPS_COMMONDIR/shlibs
+
+ rev=${filename#*.so.}
+ libname=${filename%.so*}
+ _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
+ _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
+ if [ "$rev" = "$filename" ]; then
+ _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ else
+ _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
+ fi
+ grep -E "${_pattern}" $mapshlibs | { \
+ while read conflictFile conflictPkg ignore; do
+ found=1
+ conflictRev=${conflictFile#*.so.}
+ if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
+ continue
+ elif [ "$rev" = "$conflictRev" ]; then
+ continue
+ elif [[ ${rev}.* =~ $conflictRev ]]; then
+ continue
+ fi
+ msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
+ msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
+ msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x%:}\n"
+ done
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ done
+ # Try to match provided shlibs in virtual packages.
+ for f in ${provides}; do
+ _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
+ _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
+ _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
+ if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
+ continue
+ fi
+ if [ "${_vpkgname}" = "${_libpkgname}" ]; then
+ found=1
+ break
+ fi
+ done;
+ if [ -z "$found" ]; then
+ _myshlib="${libname}.so"
+ [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
+ fi;
+ }
+}
+
hook() {
local error=0 filename= rev= libname= conflictPkg= conflictFile=
- local conflictRev= ignore= found= mapshlibs=$XBPS_COMMONDIR/shlibs
+ local conflictRev= ignore= found=
local emptypkg=yes
set +E
@@ -161,53 +216,6 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- rev=${filename#*.so.}
- libname=${filename%.so*}
- _shlib=$(echo "$libname"|sed -E 's|\+|\\+|g')
- _pkgname=$(echo "$pkgname"|sed -E 's|\+|\\+|g')
- if [ "$rev" = "$filename" ]; then
- _pattern="^${_shlib}\.so[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- else
- _pattern="^${_shlib}\.so\.[0-9]+(.*)[[:blank:]]+${_pkgname}-[^-]+_[0-9]+"
- fi
- grep -E "${_pattern}" $mapshlibs | { \
- while read conflictFile conflictPkg ignore; do
- found=1
- conflictRev=${conflictFile#*.so.}
- if [ -n "$ignore" -a "$ignore" != "$XBPS_TARGET_MACHINE" ]; then
- continue
- elif [ "$rev" = "$conflictRev" ]; then
- continue
- elif [[ ${rev}.* =~ $conflictRev ]]; then
- continue
- fi
- msg_red "${pkgver}: SONAME bump detected: ${libname}.so.${conflictRev} -> ${libname}.so.${rev}\n"
- msg_red "${pkgver}: please update common/shlibs with this line: \"${libname}.so.${rev} ${pkgver}\"\n"
- msg_red "${pkgver}: all reverse dependencies should also be revbumped to be rebuilt against ${libname}.so.${rev}:\n"
- _revdeps=$($XBPS_QUERY_XCMD -Rs ${libname}.so -p shlib-requires|cut -d ' ' -f1)
- for x in ${_revdeps}; do
- msg_red " ${x%:}\n"
- done
- msg_error "${pkgver}: cannot continue with installation!\n"
- done
- # Try to match provided shlibs in virtual packages.
- for f in ${provides}; do
- _vpkgname="$($XBPS_UHELPER_CMD getpkgname ${f} 2>/dev/null)"
- _spkgname="$(grep "^${filename}" $mapshlibs | cut -d ' ' -f2)"
- _libpkgname="$($XBPS_UHELPER_CMD getpkgname ${_spkgname} 2>/dev/null)"
- if [ -z "${_spkgname}" -o -z "${_libpkgname}" ]; then
- continue
- fi
- if [ "${_vpkgname}" = "${_libpkgname}" ]; then
- found=1
- break
- fi
- done;
- if [ -z "$found" ]; then
- _myshlib="${libname}.so"
- [ "${_myshlib}" != "${rev}" ] && _myshlib+=".${rev}"
- msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.\n"
- fi;
- }
+ pkg_lint_check_shlib "$filename"
done
}
From 23d2808bbfe6ee97a349cd126d325bbb39a3fafb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:44:45 +0700
Subject: [PATCH 5/9] pre-pkg/99-pkglint: check Private API changed
---
common/hooks/pre-pkg/99-pkglint.sh | 34 +++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/common/hooks/pre-pkg/99-pkglint.sh b/common/hooks/pre-pkg/99-pkglint.sh
index 5c228ff3a4d7..ae2a02e9fd3f 100644
--- a/common/hooks/pre-pkg/99-pkglint.sh
+++ b/common/hooks/pre-pkg/99-pkglint.sh
@@ -1,5 +1,32 @@
# This hook checks for common issues related to void.
+pkg_lint_check_private_shlib() {
+ local _prefix _myshlib filename libname _failure
+ local mapshlibs=$XBPS_COMMONDIR/shlibs.private
+ local _shlib="$1"
+
+ filename="${_shlib%:*}"
+ libname=${filename%.so*}
+ _myshlib=$(grep "^${filename}:" "$XBPS_COMMONDIR/shlibs.private")
+ if [ -z "$_myshlib" ]; then
+ msg_normal "${pkgver}: ${_myshlib} not found in common/shlibs.private.\n"
+ elif [ "$_shlib" != "$_myshlib" ]; then
+ _failure=yes
+ _prefix="private:${libname}.so"
+ msg_red "${pkgver}: Private API change detected.\n"
+ msg_red "${pkgver}: Please update common/shlibs.private with:\n"
+ msg_red "${pkgver}: ${filename}:${_shlib#*:}\n"
+ msg_red "${pkgver}: All reverse dependencies should also be revbumped to be rebuilt:\n"
+ _revdeps=$($XBPS_QUERY_XCMD -Rs ${_prefix} -p shlib-requires|cut -d: -f1)
+ for x in ${_revdeps}; do
+ msg_red " ${x}\n"
+ done
+ fi
+ if [ "$_failure" ]; then
+ msg_error "${pkgver}: cannot continue with installation!\n"
+ fi
+}
+
pkg_lint_check_shlib() {
local rev libname _shlib _pkgname _pattern
local filename="$1"
@@ -216,6 +243,11 @@ hook() {
fi
for filename in $(<${PKGDESTDIR}/shlib-provides); do
- pkg_lint_check_shlib "$filename"
+ case "$filename" in
+ private:*)
+ pkg_lint_check_private_shlib "${filename#private:}" ;;
+ *)
+ pkg_lint_check_shlib "$filename" ;;
+ esac
done
}
From 67de187ee18abd764610f60ee47958e2e0c05947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 26 Feb 2023 23:47:02 +0700
Subject: [PATCH 6/9] pre-pkg/gen-runtime-deps: generate private shlib requires
too
---
.../hooks/pre-pkg/04-generate-runtime-deps.sh | 38 ++++++++++++++++++-
common/shlibs.private | 27 +++++++++++++
2 files changed, 63 insertions(+), 2 deletions(-)
create mode 100644 common/shlibs.private
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index 1eb18d9a92e5..fe1f1fafb2c9 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -45,8 +45,21 @@ store_pkgdestdir_rundeps() {
fi
}
+get_private_shlib() {
+ local f="$1"
+ $OBJDUMP -p "$f" |
+ awk '
+ /^Version References:/{ vr=1; next }
+ !vr { next }
+ /required from/{ lname=substr($NF, 1, length($NF)-1) }
+ /_PRIVATE_API/{ print lname }
+ '
+}
+
hook() {
- local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps
+ local depsftmp f lf j mapshlibs sorequires _curdep elfmagic
+ local nlib broken_shlibs verify_deps
+ local napi private_deps
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hook returns
@@ -85,6 +98,10 @@ hook() {
done
[[ $found -eq 0 ]] && verify_deps="$verify_deps $nlib"
done
+ napi="$(get_private_shlib "$f")"
+ if [ "$napi" ]; then
+ private_deps="$private_deps $napi"
+ fi
fi
done
exec 0<&3 # restore stdin
@@ -165,7 +182,24 @@ hook() {
store_pkgdestdir_rundeps
+ if [ -n "${private_deps}" ]; then
+ for x in ${private_deps}; do
+ if [ "$(find ${PKGDESTDIR} -name "${x}")" ]; then
+ : "self-provided"
+ elif _rdep=$(grep "^${x}" "$XBPS_COMMONDIR/shlibs.private"); then
+ _rdep="private:$_rdep"
+ sorequires="$sorequires $_rdep"
+ else
+ msg_red_nochroot " Untracked Private API: ${x}\n"
+ broken_shlibs=1
+ fi
+ done
+ if [ -n "$broken_shlibs" ]; then
+ msg_error "$pkgver: uses unknown private API, aborting!\n"
+ fi
+ fi
if [ -n "${sorequires}" ]; then
- echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
+ echo "${sorequires}" |
+ xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi
}
diff --git a/common/shlibs.private b/common/shlibs.private
new file mode 100644
index 000000000000..00af96524b12
--- /dev/null
+++ b/common/shlibs.private
@@ -0,0 +1,27 @@
+# qt5
+libQt5Core.so.5:5.15.7
+libQt5Gui.so.5:5.15.7
+libQt5Qml.so.5:5.15.7
+libQt5QmlModels.so.5:5.15.7
+libQt5Quick.so.5:5.15.7
+libQt5Widgets.so.5:5.15.7
+libQt5Test.so.5:5.15.7
+libQt5XcbQpa.so.5:5.15.7
+libQt5DBus.so.5:5.15.7
+libQt5Location.so.5:5.15.7
+libQt5Positioning.so.5:5.15.7
+libQt5Multimedia.so.5:5.15.7
+libQt5Network.so.5:5.15.7
+libQt5Sql.so.5:5.15.7
+# qt6-base
+libQt6Core.so.6:6.4.2
+libQt6DBus.so.6:6.4.2
+libQt6EglFSDeviceIntegration.so.6:6.4.2
+libQt6EglFsKmsGbmSupport.so.6:6.4.2
+libQt6EglFsKmsSupport.so.6:6.4.2
+libQt6Gui.so.6:6.4.2
+libQt6Network.so.6:6.4.2
+libQt6OpenGL.so.6:6.4.2
+libQt6PrintSupport.so.6:6.4.2
+libQt6Sql.so.6:6.4.2
+libQt6Widgets.so.6:6.4.2
From f3cd30dd2b76c6b1a8c355f54aa4abf48d7032a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 9 Mar 2023 23:16:27 +0700
Subject: [PATCH 7/9] New package: md4c-0.4.8
---
common/shlibs | 2 ++
srcpkgs/libmd4c | 1 +
srcpkgs/libmd4c-devel | 1 +
srcpkgs/libmd4c-html | 1 +
srcpkgs/md4c/template | 36 ++++++++++++++++++++++++++++++++++++
5 files changed, 41 insertions(+)
create mode 120000 srcpkgs/libmd4c
create mode 120000 srcpkgs/libmd4c-devel
create mode 120000 srcpkgs/libmd4c-html
create mode 100644 srcpkgs/md4c/template
diff --git a/common/shlibs b/common/shlibs
index 5cc81b9f90b2..8808511e5f36 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2007,6 +2007,8 @@ libpolkit-qt5-gui-1.so.1 polkit-qt5-0.112.0_1
libpolkit-qt5-core-1.so.1 polkit-qt5-0.112.0_1
libfm-qt.so.12 libfm-qt-1.2.0_1
libqtermwidget5.so.1 qtermwidget-1.0.0_1
+libmd4c.so.0 libmd4c-0.4.8_1
+libmd4c-html.so.0 libmd4c-html-0.4.8_1
libQt6Core.so.6 qt6-core-6.0.0_1
libQt6OpenGL.so.6 qt6-gui-6.0.0_1
libQt6DBus.so.6 qt6-dbus-6.0.0_1
diff --git a/srcpkgs/libmd4c b/srcpkgs/libmd4c
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-devel b/srcpkgs/libmd4c-devel
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-devel
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/libmd4c-html b/srcpkgs/libmd4c-html
new file mode 120000
index 000000000000..adcb58a719b6
--- /dev/null
+++ b/srcpkgs/libmd4c-html
@@ -0,0 +1 @@
+md4c
\ No newline at end of file
diff --git a/srcpkgs/md4c/template b/srcpkgs/md4c/template
new file mode 100644
index 000000000000..69a0956116c5
--- /dev/null
+++ b/srcpkgs/md4c/template
@@ -0,0 +1,36 @@
+# Template file for 'md4c'
+pkgname=md4c
+version=0.4.8
+revision=1
+build_style=cmake
+short_desc="Markdown for C"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="MIT"
+homepage="https://github.com/mity/md4c/"
+distfiles="https://github.com/mity/md4c/archive/refs/tags/release-${version}.tar.gz"
+checksum=4a457df853425b6bb6e3457aa1d1a13bccec587a04c38c622b1013a0da41439f
+
+libmd4c-html_package() {
+ short_desc+=" - html - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c-html.so.*"
+ }
+}
+
+libmd4c_package() {
+ short_desc+=" - libraries"
+ pkg_install() {
+ vmove "usr/lib/libmd4c.so.*"
+ }
+}
+
+libmd4c-devel_package() {
+ depends="libmd4c>=${version}_${revision} libmd4c-html>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/cmake
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From bbd2d927d1913bf5dca5a12af9877096bffdfb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 27 Feb 2023 11:55:25 +0700
Subject: [PATCH 8/9] qt5: provides private shlib
---
srcpkgs/qt5/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..a1793c93323a 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
@@ -13,7 +13,7 @@ makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel
gtk+3-devel icu-devel libXv-devel libbluetooth-devel libcap-devel
libinput-devel libmng-devel libmariadbclient-devel libproxy-devel
- libvpx-devel libwebp-devel libxkbcommon-devel
+ libvpx-devel libwebp-devel libxkbcommon-devel libglvnd-devel
libxslt-devel libxml2-devel cups-devel minizip-devel
opus-devel pciutils-devel pcre2-devel postgresql-libs-devel
protobuf-devel pulseaudio-devel tslib-devel openssl-devel
@@ -35,6 +35,7 @@ python_version=2 #unverified
replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0
qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0"
lib32mode=full
+libprivate="${version%+*}"
CXXFLAGS="-Wno-deprecated-declarations -Wno-class-memaccess -Wno-packed-not-aligned"
# Required for musl libc
From 0aabffb278bf016d9a3d3f524fbeb7e5d4b9c3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 24 Feb 2023 23:06:53 +0700
Subject: [PATCH 9/9] qt6-base: keep usr/lib/cmake/Qt6/
---
srcpkgs/qt6-base/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index 024393134eef..953cc0c2575c 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
-DINSTALL_ARCHDATADIR=lib/qt6
@@ -17,7 +17,7 @@ configure_args="-DINSTALL_DATADIR=share/qt6
-DQT_FEATURE_qmake=ON
-DBUILD_WITH_PCH=OFF"
hostmakedepends="perl pkg-config xmlstarlet"
-makedepends="zlib-devel libzstd-devel dbus-devel
+makedepends="zlib-devel libzstd-devel dbus-devel libmd4c-devel
double-conversion-devel glib-devel libxcb-devel
xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel
@@ -291,7 +291,7 @@ qt6-base-devel_package() {
vmove usr/share/qt6/modules
for _f in ${DESTDIR}/usr/lib/cmake/*; do
case "$_f" in
- *Tools|*HostInfo) ;;
+ *Tools|*HostInfo|*/Qt6) ;;
*) vmove "usr/lib/cmake/${_f##*/}" ;;
esac
done
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
` (7 preceding siblings ...)
2023-03-16 11:25 ` sgn
@ 2023-06-15 1:58 ` github-actions
2023-06-29 2:04 ` [PR PATCH] [Closed]: " github-actions
9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2023-06-15 1:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/42462#issuecomment-1592226207
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Closed]: Attempt to track private API
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
` (8 preceding siblings ...)
2023-06-15 1:58 ` github-actions
@ 2023-06-29 2:04 ` github-actions
9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2023-06-29 2:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]
There's a closed pull request on the void-packages repository
Attempt to track private API
https://github.com/void-linux/void-packages/pull/42462
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-06-29 2:04 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-26 16:50 [PR PATCH] Attempt to track private API sgn
2023-02-27 6:46 ` [PR PATCH] [Updated] " sgn
2023-02-27 15:22 ` sgn
2023-03-05 8:23 ` classabbyamp
2023-03-09 16:18 ` [PR PATCH] [Updated] " sgn
2023-03-09 16:28 ` sgn
2023-03-09 16:55 ` sgn
2023-03-12 12:28 ` sgn
2023-03-16 11:25 ` sgn
2023-06-15 1:58 ` github-actions
2023-06-29 2:04 ` [PR PATCH] [Closed]: " github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).