From a0ce545d52f231499bf9f3644493113d8af58ec9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 9 May 2024 00:01:03 +0100 Subject: gentoo auto-resync : 09:05:2024 - 00:01:03 --- sys-apps/Manifest.gz | Bin 51499 -> 51328 bytes sys-apps/intune-portal/Manifest | 4 +- .../intune-portal/intune-portal-1.2402.12.ebuild | 83 --------------------- .../intune-portal/intune-portal-1.2404.23.ebuild | 83 +++++++++++++++++++++ sys-apps/isapnptools/Manifest | 2 + ...apnptools-1.27-incompatible-pointer-types.patch | 20 +++++ sys-apps/isapnptools/isapnptools-1.27-r1.ebuild | 31 ++++++++ sys-apps/memtest86/Manifest | 10 --- sys-apps/memtest86/files/39_memtest86-r1 | 69 ----------------- .../files/memtest86-4.3.3-build-nopie.patch | 47 ------------ .../memtest86-4.3.7-binutils-2.41-textrels.patch | 31 -------- .../files/memtest86-4.3.7-io-extern-inline.patch | 29 ------- .../memtest86/files/memtest86-4.3.7-no-clean.patch | 16 ---- .../files/memtest86-4.3.7-reboot-def.patch | 13 ---- sys-apps/memtest86/memtest86-4.3.7-r3.ebuild | 76 ------------------- sys-apps/memtest86/memtest86-4.3.7-r4.ebuild | 76 ------------------- sys-apps/memtest86/metadata.xml | 11 --- 17 files changed, 138 insertions(+), 463 deletions(-) delete mode 100644 sys-apps/intune-portal/intune-portal-1.2402.12.ebuild create mode 100644 sys-apps/intune-portal/intune-portal-1.2404.23.ebuild create mode 100644 sys-apps/isapnptools/files/isapnptools-1.27-incompatible-pointer-types.patch create mode 100644 sys-apps/isapnptools/isapnptools-1.27-r1.ebuild delete mode 100644 sys-apps/memtest86/Manifest delete mode 100644 sys-apps/memtest86/files/39_memtest86-r1 delete mode 100644 sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch delete mode 100644 sys-apps/memtest86/files/memtest86-4.3.7-binutils-2.41-textrels.patch delete mode 100644 sys-apps/memtest86/files/memtest86-4.3.7-io-extern-inline.patch delete mode 100644 sys-apps/memtest86/files/memtest86-4.3.7-no-clean.patch delete mode 100644 sys-apps/memtest86/files/memtest86-4.3.7-reboot-def.patch delete mode 100644 sys-apps/memtest86/memtest86-4.3.7-r3.ebuild delete mode 100644 sys-apps/memtest86/memtest86-4.3.7-r4.ebuild delete mode 100644 sys-apps/memtest86/metadata.xml (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 38dd2517407f..f36ca1bbfff8 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/intune-portal/Manifest b/sys-apps/intune-portal/Manifest index d5af8473b074..2851378bae99 100644 --- a/sys-apps/intune-portal/Manifest +++ b/sys-apps/intune-portal/Manifest @@ -1,4 +1,4 @@ AUX wrapper 345 BLAKE2B 5540b50377a3593d1ff12670fa3596850083e19fbfeb508e529fa218be0bb66410ac6cce440aa1e12b4fb9b4113e895ee5943e302b8568f571f97f13faca5342 SHA512 e70deccdf3c00a139b6230c5fa59224bf9b29156f107b4ab494e9d8bee0c96f4e2bb33c595b17b4378dbd860c9a841264f8d782a563adeefbaba20b09d531542 -DIST intune-portal_1.2402.12-jammy_amd64.deb 6638942 BLAKE2B 2421961fb3df92aa3aaf36b4d49b1a77d895dd184bc09d8fd53f528f20791070d87f31bfa9c3cc4c205fabc8c8e3d0309fc15d2a763f75307fa4be94e277b11d SHA512 7730896d1c2a47354e3cb2aa881de3fab086415606fe0b09506c016db6bd1acd8d86c9be24984ccdb921b59fe1a6eb99bfd5c5087a7602deb1e2afb29ead3d44 -EBUILD intune-portal-1.2402.12.ebuild 1963 BLAKE2B 741d45a674383e1280d6c1d04b880275563833eacc8918498f7f23a8d4a244e592be6cb5efbb9711c7fd6beb620a0e33f7999d46d72af2f90285e144884d2df5 SHA512 62fa7582ef8c2c3d97480521c9114e89c4157af8727fb42cba67eeee8afec507522ff580de463fb4513816d558955e35cef37cb5a8535d1e18f8b35c5a710323 +DIST intune-portal_1.2404.23-jammy_amd64.deb 6666262 BLAKE2B 66e615fabcf1d307a8fc794fea03c842b3380d78f67c412acb673f185a04658427566c1f23a60b34a294462e782da46cf9004c4ef8aaf41eea67a42f671ae53c SHA512 8c344eb9b0edb4639bf2903a26c341eb0eefe15e4e663516dba9381d50cc6bc5b4868e71f85d9bb70e33b70db785eb47f74b136246b36f438d09aa7ac80e7119 +EBUILD intune-portal-1.2404.23.ebuild 1963 BLAKE2B 741d45a674383e1280d6c1d04b880275563833eacc8918498f7f23a8d4a244e592be6cb5efbb9711c7fd6beb620a0e33f7999d46d72af2f90285e144884d2df5 SHA512 62fa7582ef8c2c3d97480521c9114e89c4157af8727fb42cba67eeee8afec507522ff580de463fb4513816d558955e35cef37cb5a8535d1e18f8b35c5a710323 MISC metadata.xml 248 BLAKE2B 97ed0d2320e1aa2d1cca6b63b0cf9cb07669ea73ac0dad7a8f7db4f510d3b2dc28cbf5a7c019f15ac87c25c5e51e619386694b49d21fc19f4092047c8e382287 SHA512 23bb29604f7cc644073025158d751004189a85fe6be88a7817afebad685c3b73f21cdb3e5d05f16699baa5d6b52f1e3a1f365b1ad7ea09bfcd204182e646f203 diff --git a/sys-apps/intune-portal/intune-portal-1.2402.12.ebuild b/sys-apps/intune-portal/intune-portal-1.2402.12.ebuild deleted file mode 100644 index 47eb619b6b16..000000000000 --- a/sys-apps/intune-portal/intune-portal-1.2402.12.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop pam prefix systemd tmpfiles unpacker xdg - -DESCRIPTION="Microsoft Intune Company Portal to access a corporate environment" -HOMEPAGE="https://learn.microsoft.com/mem/intune/" -SRC_URI="https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-jammy_amd64.deb" -S="${WORKDIR}" -LICENSE="all-rights-reserved" -SLOT="0" -KEYWORDS="-* ~amd64" -RESTRICT="bindist mirror" - -RDEPEND=" - app-accessibility/at-spi2-core:2 - app-crypt/libsecret - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/openssl:0/3 - net-libs/libsoup:2.4 - net-libs/webkit-gtk:4/37 - net-misc/curl - sys-apps/bubblewrap - sys-apps/dbus - sys-apps/lsb-release - sys-apps/systemd - sys-apps/util-linux - sys-auth/microsoft-identity-broker - sys-auth/pambase[pwquality] - sys-auth/polkit - sys-libs/pam - sys-libs/zlib - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - - || ( - www-client/microsoft-edge - www-client/microsoft-edge-beta - www-client/microsoft-edge-dev - ) -" - -QA_PREBUILT="*" -DIR="/opt/microsoft/intune" - -src_unpack() { - unpack_deb ${A} -} - -src_install() { - exeinto "${DIR}"/bin - newexe $(prefixify_ro "${FILESDIR}"/wrapper) intune-portal - dosym intune-portal /opt/microsoft/intune/bin/intune-agent - dosym intune-portal /opt/microsoft/intune/bin/intune-daemon - - exeinto "${DIR}"/libexec - doexe "${DIR#/}"/bin/* - - insinto "${DIR}"/share - doins -r "${DIR#/}"/share/* - - insinto /usr/share/polkit-1/actions - doins usr/share/polkit-1/actions/com.microsoft.intune.policy - - systemd_dounit lib/systemd/system/* - systemd_douserunit lib/systemd/user/* - - dopammod usr/lib/x86_64-linux-gnu/security/pam_intune.so - dotmpfiles usr/lib/tmpfiles.d/intune.conf - - domenu usr/share/applications/*.desktop - doicon -s 48 usr/share/icons/hicolor/48x48/*/*.png -} - -pkg_postinst() { - touch "${EROOT}"/etc/pam.d/common-password || die - tmpfiles_process intune.conf - xdg_pkg_postinst -} diff --git a/sys-apps/intune-portal/intune-portal-1.2404.23.ebuild b/sys-apps/intune-portal/intune-portal-1.2404.23.ebuild new file mode 100644 index 000000000000..47eb619b6b16 --- /dev/null +++ b/sys-apps/intune-portal/intune-portal-1.2404.23.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop pam prefix systemd tmpfiles unpacker xdg + +DESCRIPTION="Microsoft Intune Company Portal to access a corporate environment" +HOMEPAGE="https://learn.microsoft.com/mem/intune/" +SRC_URI="https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-jammy_amd64.deb" +S="${WORKDIR}" +LICENSE="all-rights-reserved" +SLOT="0" +KEYWORDS="-* ~amd64" +RESTRICT="bindist mirror" + +RDEPEND=" + app-accessibility/at-spi2-core:2 + app-crypt/libsecret + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/openssl:0/3 + net-libs/libsoup:2.4 + net-libs/webkit-gtk:4/37 + net-misc/curl + sys-apps/bubblewrap + sys-apps/dbus + sys-apps/lsb-release + sys-apps/systemd + sys-apps/util-linux + sys-auth/microsoft-identity-broker + sys-auth/pambase[pwquality] + sys-auth/polkit + sys-libs/pam + sys-libs/zlib + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/pango + + || ( + www-client/microsoft-edge + www-client/microsoft-edge-beta + www-client/microsoft-edge-dev + ) +" + +QA_PREBUILT="*" +DIR="/opt/microsoft/intune" + +src_unpack() { + unpack_deb ${A} +} + +src_install() { + exeinto "${DIR}"/bin + newexe $(prefixify_ro "${FILESDIR}"/wrapper) intune-portal + dosym intune-portal /opt/microsoft/intune/bin/intune-agent + dosym intune-portal /opt/microsoft/intune/bin/intune-daemon + + exeinto "${DIR}"/libexec + doexe "${DIR#/}"/bin/* + + insinto "${DIR}"/share + doins -r "${DIR#/}"/share/* + + insinto /usr/share/polkit-1/actions + doins usr/share/polkit-1/actions/com.microsoft.intune.policy + + systemd_dounit lib/systemd/system/* + systemd_douserunit lib/systemd/user/* + + dopammod usr/lib/x86_64-linux-gnu/security/pam_intune.so + dotmpfiles usr/lib/tmpfiles.d/intune.conf + + domenu usr/share/applications/*.desktop + doicon -s 48 usr/share/icons/hicolor/48x48/*/*.png +} + +pkg_postinst() { + touch "${EROOT}"/etc/pam.d/common-password || die + tmpfiles_process intune.conf + xdg_pkg_postinst +} diff --git a/sys-apps/isapnptools/Manifest b/sys-apps/isapnptools/Manifest index 2375d17eaa68..9ea0ef2ec620 100644 --- a/sys-apps/isapnptools/Manifest +++ b/sys-apps/isapnptools/Manifest @@ -1,6 +1,8 @@ AUX isapnp.rc 545 BLAKE2B 45a2d468943fce175e1c2ff2a6666b31844493cf9dd00df8fc0b2c28d83f3e8cbe59984ae6c66853bce8b6ea1e84534e8db7ba28abef9a166b0add174bd67266 SHA512 9844f1d7a959e96750a8adb906f9c85d7ab693421d7ac51af08380ed6690c017d3f9a74694f2c5d7c7a3da8266f18f1f574095435aa6e9ec2ab9f7604ea470a7 AUX isapnptools-1.27-fno-common.patch 578 BLAKE2B aaa06b450b6698d3b0caa10dd2c50a150bff069ee231f46b0e74a1129cf64329ec828d9f7b33205bc409da119d37062f9cc8e96f115e46c6d1eb7feed61a2094 SHA512 202f955c3e4701b7af49ba99b117d1ac8f5dca2bf710fa5d7dc9b73d2988e22a8283900d87b85a500d6b20a4736cf78d5e751e0a9447574dd8d142d8e5f0feec AUX isapnptools-1.27-include.patch 241 BLAKE2B 838759903a4bf42b48da7dbd900f9fa360e3916068cfcc67d7803111d1c50358ec9bb1c9a20916064ecb05e347e026be5e97a8400bd6021a30bbc00e55d0b085 SHA512 8533282a59f4860fd16e9f76a2d7e55db0629ce754e94a17c9339e08b777253e936a4fe242db5d38f99283e474969c03726560b0f27243c898fd4881ad1920b7 +AUX isapnptools-1.27-incompatible-pointer-types.patch 708 BLAKE2B c116e15ddb60c49564fa25402627f4f020a76f6ed38383b9e2ae5b4700e1bd13d5de91af1adec2217d53764950391f7d46fa2d318ca1856175a0c2a5324a63f6 SHA512 2b240f750ea11fcd76558c6edf114c5a16a081db8bf203954add87bb1c3773b388b3d9daa0b6c831e5012911ec388f4ca1969b6d9ce8269d03f00f0ae058f9ee DIST isapnptools-1.27.tgz 499639 BLAKE2B 9da8968abeaf1fe2f39e3003cad32aecb546016d72489a9b4c84b8427acee7a54c2580d6536e2c39aa06a44cf363705af06968b71100c51663e928ffdbfa7353 SHA512 ccd1c8f7b66ba7f26d50fcfa64d0397dd1a09866c7c74226acbcb4e08be77717aaa4dde7eabcad5bac4e5f92774c40bca48dbf97069c62cc71355b768eca4d34 +EBUILD isapnptools-1.27-r1.ebuild 672 BLAKE2B 16b13f743cd4d16ae79e41b4a19e04767e506f28317ee33f291a8102744a758a78b87cdeb6c05381ced5e35dea673b2fb270ca51d47032ddf4b682888b8e1a0d SHA512 ca105ac5003530a58c468592dae62de82bd31cd38065d28e0bce9118f145c3def9ad75249c4e13c8d37a3920e057b9960016fcee267596906b776bca3f19b6c2 EBUILD isapnptools-1.27.ebuild 617 BLAKE2B 94f1138e597d4aa1f8a0a90274b0bdff452f161219656b4e76e7f3faffacf63dc842710999e5cb63addd2e5b5f98294118a14556eff4d525cbb2e4c4ebce0488 SHA512 c6c9de1ef886b48a8994c38a1075299e35c4a75bad7e00063e2f7214db5967c3cb974b3c26ba48cf159f3ecd4ff7fc8a67a8d8406c22188342939cdb6cf8b380 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/isapnptools/files/isapnptools-1.27-incompatible-pointer-types.patch b/sys-apps/isapnptools/files/isapnptools-1.27-incompatible-pointer-types.patch new file mode 100644 index 000000000000..6b7048d5053f --- /dev/null +++ b/sys-apps/isapnptools/files/isapnptools-1.27-incompatible-pointer-types.patch @@ -0,0 +1,20 @@ +--- a/src/resource.c 2024-04-27 08:02:26.232607532 -0000 ++++ b/src/resource.c 2024-04-27 08:04:14.600217480 -0000 +@@ -285,7 +285,7 @@ + void allocate_pci_resources( void ) + { + char *line = 0; +- int lineMax = 0; ++ size_t lineMax = 0; + + FILE *fp = fopen( "/proc/bus/pci/devices", "rt" ); + if( !fp ) +@@ -354,7 +354,7 @@ + int io_end; + /* Avoid allocating DMA channels used by other devices in /proc. */ + if ((input = fopen("/proc/interrupts", "r")) != NULL) { +- fscanf(input, "%*[^\n]\n"); /* skip first line */ ++ (void)fscanf(input, "%*[^\n]\n"); /* skip first line */ + while (fscanf (input, "%d%*[^\n]\n", &interrupt_num) == 1) { + #if 0 + snprintf(progress_report_buf, diff --git a/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild b/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild new file mode 100644 index 000000000000..056011e4bd02 --- /dev/null +++ b/sys-apps/isapnptools/isapnptools-1.27-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Tools for configuring ISA PnP devices" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/hardware/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" + +PATCHES=( + "${FILESDIR}"/${P}-include.patch + "${FILESDIR}"/${P}-fno-common.patch + "${FILESDIR}"/${P}-incompatible-pointer-types.patch +) + +src_install() { + default + + dodir /sbin + mv "${ED}"/{usr/sbin/isapnp,sbin/} || die + + docinto txt + dodoc doc/{README*,*.txt} test/*.txt + dodoc etc/isapnp.* + + newinitd "${FILESDIR}"/isapnp.rc isapnp +} diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest deleted file mode 100644 index 2e1bd6097a1a..000000000000 --- a/sys-apps/memtest86/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX 39_memtest86-r1 1692 BLAKE2B 8313d06cf43fb70deaec75fb0d875903fbd1ca0fe4b564db156a555ae5c5ee22b5e310201040e0f701d953961b496d763a4f33dcd93d09a6a74b16ccacec7d69 SHA512 5a43be9c5def7dc4cdb704281c13843a4a8c9b070f5018f95955e007485987d45da0c20015981d3e44fae2279cdc0d4cc819a7121e7028df4c29af249194e070 -AUX memtest86-4.3.3-build-nopie.patch 1727 BLAKE2B e49e3014b9f3eb1295bcc49d6bd1642bc6517ae73b8bd73e71ba2cd3effec7b43348c543e5ccd2b92aa37a410a24d97a490c8110fe9b4cd1015cb0eec9b704d2 SHA512 9aee733b27ce73243f14161606819f9161b9d1dee1bb34718b81ac4cd66238f904a2fc69be8a2a1bf13d3ba180257b130e2a7e708a295ad4300d0e869f76e8c8 -AUX memtest86-4.3.7-binutils-2.41-textrels.patch 1362 BLAKE2B 24f84031f8e1bc33a605931a00372d42362f2e4809870bfc199dcc6cad287d520d254889474629d68eb6f837f2572285142c1629057beee167000162480d0473 SHA512 9b74ab6b2b298cf8d4f61d8db6d7a66c20c4bdba0f6ec9903a8c79eae6f3b05ab13ad805d2cc2326f572d033bd6406720896813a1c04e8172670e0bc6efebde4 -AUX memtest86-4.3.7-io-extern-inline.patch 1128 BLAKE2B 9ee86f121772490fa1859568d78c156af44e961ae885ed2483245ee799779fbb3357236ce3ee6dbd712dd629ae3892096fb2405d229c99ee35cbc3380fa6beb1 SHA512 9ad8149bafee75aac120420838f20030d9e42fc60579f61114c76a5829e4c5197067e86dccea7c4cf306e62c43a1203028476fa9536e81f32d53c04e536e4f32 -AUX memtest86-4.3.7-no-clean.patch 636 BLAKE2B a7488c0f556929607a7d1a94de1f727cc00ac6c673b2b03fbbb5ea45a64accf5028df89ca56f49e9d9e97228a5129b8ed4673b287bff05c59249a5eea48d4ed3 SHA512 7bac031e907a10bf66d260d29ef209362395bce3c1a735abf77bebd9a8662f0ecfc3bd2ed33abbfaeebae77da4868b5c53f0814e82a0ac930b4a01fd25a6e8b1 -AUX memtest86-4.3.7-reboot-def.patch 253 BLAKE2B 8213b6deb590a23316fe560493ebb96b53944f368b5f7040d6988296d3bba432b4f070a44e034cf4b9e03dc502cfd9ae8129a4452c70e3f6a06874e6f09665a6 SHA512 0587d2b4de397813f5a2a95859c7a656b0c760653dd711ffe8bd0d0602a64c4ed340c494fbfe2de6825f89aa21021df6a92c4a9e030b72aedf70f83b483a1160 -DIST memtest86-4.3.7-src.tar.gz 125583 BLAKE2B ef74b599f5a0b3a550854c7aba12afcddd9e8115418d60e50aee2b1d83b5a838a7d747039cbdd542e1cc136dd5426e8e803f305147121d38edac1a3de814918f SHA512 f1cee9085e157b399869222310c65e8094c028565d2b21fe40fd485505b988d20cff49b2c56559181ac114c39089b60c6eacb9aa5d7652df78b3f8e7530cb644 -EBUILD memtest86-4.3.7-r3.ebuild 1928 BLAKE2B 3db97d5e207fb2557a11f8ceac99a859f5afa3fa7d81b8daa6e46622c724420939aa4b3bb762d1d2659430cb596817af5e367f94dd0cf596980e87fcee4714bd SHA512 c418e3f803101f7f2fa2d99506f3db0711b2ac16e7dc21e0bcf6c014bb1ce380b7d10dc783c805ae348ede37f274baa8de44106b1077be09118f0e436358078b -EBUILD memtest86-4.3.7-r4.ebuild 1980 BLAKE2B 9c9884c75b832f982203300fea2250b39f0312d6674295f8b26eabc295d718ba8013fc5045a30eec63445a5861333b0ecebaab2eec700e18d7c73703b6f279e0 SHA512 28239508b19e661086717cf7164944094b9175c17ec846603ba06a382d1b075895411824bff20d5f217f082441a872bc4879bbae7ef8da673246030e0fdbb327 -MISC metadata.xml 331 BLAKE2B b0a4c3f621f5aef821b2e318dc59461bc4659218a7a9c61fde44592e5a1c45b55d94fd6401ee08e51a31e90f4a1ed97d8ca51a200bb4b4680c9145563b87e516 SHA512 3c1fec8616b98333afc0b9e66f98a1995962ef5b4fb982b151d8763b29aa31be92a4ee44b9aff047defcfc61a5967a89350d1943139746d8af603d58896a8303 diff --git a/sys-apps/memtest86/files/39_memtest86-r1 b/sys-apps/memtest86/files/39_memtest86-r1 deleted file mode 100644 index dc630d594626..000000000000 --- a/sys-apps/memtest86/files/39_memtest86-r1 +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh - -. /usr/share/grub/grub-mkconfig_lib - -memtest=/boot/memtest86/memtest.bin - -memtestelf=/boot/memtest86/memtest - -if [ -f "${memtest}" ] && [ -f "${memtestelf}" ]; then - multiple_memtest=true -fi - -submenu_indentation="" -if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then - submenu_indentation="${grub_tab}" - cat <&2 - - device="$("${grub_probe}" --target=device "${memtest}")" - path="$(make_system_path_relative_to_its_root "${memtest}")" - cat <&2 - - device="$("${grub_probe}" --target=device "${memtestelf}")" - path="$(make_system_path_relative_to_its_root "${memtestelf}")" - cat < memtest.exe - -+head.o: head.s -+bootsect.o: bootsect.s -+setup.o: setup.s -+ diff --git a/sys-apps/memtest86/files/memtest86-4.3.7-binutils-2.41-textrels.patch b/sys-apps/memtest86/files/memtest86-4.3.7-binutils-2.41-textrels.patch deleted file mode 100644 index d95b96402be7..000000000000 --- a/sys-apps/memtest86/files/memtest86-4.3.7-binutils-2.41-textrels.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://bugs.gentoo.org/912343 ---- a/Makefile -+++ b/Makefile -@@ -21,15 +21,15 @@ all: memtest.bin memtest - # symbols and then link it dynamically so I have full - # relocation information - memtest_shared: $(OBJS) memtest_shared.lds Makefile -- $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds -m elf_i386 \ -+ $(LD) --warn-constructors --warn-common -static -z notext --no-warn-rwx-segments -T memtest_shared.lds -m elf_i386 \ - -o $@ $(OBJS) && \ -- $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS) -+ $(LD) -shared -Bsymbolic -z notext --no-warn-rwx-segments -T memtest_shared.lds -o $@ $(OBJS) - - memtest_shared.bin: memtest_shared - objcopy -O binary $< memtest_shared.bin - - memtest: memtest_shared.bin memtest.lds -- $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@ -+ $(LD) -s -z notext --no-warn-rwx-segments -T memtest.lds -b binary memtest_shared.bin -o $@ - - head.s: head.S config.h defs.h test.h - $(CC) -E -traditional $< -o $@ -@@ -41,7 +41,7 @@ setup.s: setup.S config.h defs.h - $(CC) -E -traditional $< -o $@ - - memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds -- $(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \ -+ $(LD) -z notext --no-warn-rwx-segments -T memtest.bin.lds bootsect.o setup.o -b binary \ - memtest_shared.bin -o memtest.bin - - reloc.o: reloc.c diff --git a/sys-apps/memtest86/files/memtest86-4.3.7-io-extern-inline.patch b/sys-apps/memtest86/files/memtest86-4.3.7-io-extern-inline.patch deleted file mode 100644 index 3e6754d112b3..000000000000 --- a/sys-apps/memtest86/files/memtest86-4.3.7-io-extern-inline.patch +++ /dev/null @@ -1,29 +0,0 @@ -the meaning of extern inline changed between standards. use static inline -for these tiny I/O functions everywhere to keep things simple. - ---- a/io.h -+++ b/io.h -@@ -31,6 +31,6 @@ - */ - - #define __OUT1(s,x) \ --extern inline void __out##s(unsigned x value, unsigned short port) { -+static inline void __out##s(unsigned x value, unsigned short port) { - - #define __OUT2(s,s1,s2) \ -@@ -43,6 +43,6 @@ - __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } - - #define __IN1(s) \ --extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; -+static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; - - #define __IN2(s,s1,s2) \ -@@ -55,6 +55,6 @@ - __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; } - - #define __OUTS(s) \ --extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ -+static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \ - { __asm__ __volatile__ ("cld ; rep ; outs" #s \ - : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); } diff --git a/sys-apps/memtest86/files/memtest86-4.3.7-no-clean.patch b/sys-apps/memtest86/files/memtest86-4.3.7-no-clean.patch deleted file mode 100644 index cd8fc66ba094..000000000000 --- a/sys-apps/memtest86/files/memtest86-4.3.7-no-clean.patch +++ /dev/null @@ -1,16 +0,0 @@ -don't run the clean target when building all as we run into parallel races: - - memtest kicks off building of a bunch of .o files - - clean runs in parallel which runs `rm` and deletes some of the new .o - - memtest goes to link and fails because objects are missing - ---- a/Makefile -+++ b/Makefile -@@ -19,7 +19,7 @@ - OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ - config.o memsize.o error.o smp.o cpuid.o vmem.o random.o - --all: clean memtest.bin memtest -+all: memtest.bin memtest - - # Link it statically once so I know I don't have undefined - # symbols and then link it dynamically so I have full diff --git a/sys-apps/memtest86/files/memtest86-4.3.7-reboot-def.patch b/sys-apps/memtest86/files/memtest86-4.3.7-reboot-def.patch deleted file mode 100644 index be9e35347fe7..000000000000 --- a/sys-apps/memtest86/files/memtest86-4.3.7-reboot-def.patch +++ /dev/null @@ -1,13 +0,0 @@ -the reboot func is used elsewhere, so don't mark it inline - ---- a/lib.c -+++ b/lib.c -@@ -33,7 +33,7 @@ struct ascii_map_str { - int keycode; - }; - --inline void reboot(void) -+void reboot(void) - { - - /* tell the BIOS to do a cold start */ diff --git a/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild b/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild deleted file mode 100644 index 58740a968ccc..000000000000 --- a/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit mount-boot toolchain-funcs - -DESCRIPTION="A stand alone memory test for x86 computers" -HOMEPAGE="https://www.memtest86.com/" -SRC_URI="https://www.memtest86.com/downloads/${P}-src.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="serial" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3.3-build-nopie.patch #66630 + #206726 - "${FILESDIR}"/${PN}-4.3.7-io-extern-inline.patch #548312 #568292 - "${FILESDIR}"/${PN}-4.3.7-reboot-def.patch #548312 #568292 - "${FILESDIR}"/${PN}-4.3.7-no-clean.patch #557890 - "${FILESDIR}"/${PN}-4.3.7-binutils-2.41-textrels.patch #912343 -) - -S="${WORKDIR}/src" - -BOOTDIR="/boot/memtest86" -QA_PRESTRIPPED="${BOOTDIR}/memtest" -QA_FLAGS_IGNORED="${BOOTDIR}/memtest" - -src_prepare() { - default - - sed -i -e 's,0x10000,0x100000,' memtest.lds || die - - if use serial ; then - sed -i \ - -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ - config.h \ - || die "sed failed" - fi -} - -src_configure() { - tc-export AS CC LD -} - -src_test() { :; } - -src_install() { - insinto "${BOOTDIR}" - doins memtest memtest.bin - - exeinto /etc/grub.d - newexe "${FILESDIR}"/39_${PN}-r1 39_${PN} - - dodoc README README.build-process README.background -} - -pkg_postinst() { - mount-boot_pkg_postinst - - elog "${PN} has been installed in ${BOOTDIR}/" - elog "You may wish to update your bootloader configs by adding these lines:" - elog " - For grub2 just run grub-mkconfig, a configuration file is installed" - elog " as /etc/grub.d/39_${PN}" - elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" - elog " > title=${PN}" - elog " > root (hd?,?)" - elog " > kernel ${BOOTDIR}/memtest.bin" - elog " - For lilo:" - elog " > image = ${BOOTDIR}/memtest.bin" - elog " > label = ${PN}" - elog "" - elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'." -} diff --git a/sys-apps/memtest86/memtest86-4.3.7-r4.ebuild b/sys-apps/memtest86/memtest86-4.3.7-r4.ebuild deleted file mode 100644 index d7c1a74ff476..000000000000 --- a/sys-apps/memtest86/memtest86-4.3.7-r4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit mount-boot toolchain-funcs - -DESCRIPTION="Stand alone memory test for x86 computers" -HOMEPAGE="https://www.memtest86.com/" -SRC_URI="https://www.memtest86.com/downloads/${P}-src.tar.gz" -S="${WORKDIR}/src" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="-* amd64 x86" -IUSE="serial" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3.3-build-nopie.patch #66630 + #206726 - "${FILESDIR}"/${PN}-4.3.7-io-extern-inline.patch #548312 #568292 - "${FILESDIR}"/${PN}-4.3.7-reboot-def.patch #548312 #568292 - "${FILESDIR}"/${PN}-4.3.7-no-clean.patch #557890 - "${FILESDIR}"/${PN}-4.3.7-binutils-2.41-textrels.patch #912343 -) - -BOOTDIR="/boot/memtest86" -QA_PRESTRIPPED="${BOOTDIR}/memtest" -QA_FLAGS_IGNORED="${BOOTDIR}/memtest" - -src_prepare() { - default - - sed -i -e 's,0x10000,0x100000,' memtest.lds || die - sed -i -e "s|objcopy|$(tc-getOBJCOPY)|" Makefile || die - - if use serial ; then - sed -i \ - -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ - config.h \ - || die "sed failed" - fi -} - -src_configure() { - tc-export AS CC LD -} - -src_test() { :; } - -src_install() { - insinto "${BOOTDIR}" - doins memtest memtest.bin - - exeinto /etc/grub.d - newexe "${FILESDIR}"/39_${PN}-r1 39_${PN} - - dodoc README README.build-process README.background -} - -pkg_postinst() { - mount-boot_pkg_postinst - - elog "${PN} has been installed in ${BOOTDIR}/" - elog "You may wish to update your bootloader configs by adding these lines:" - elog " - For grub2 just run grub-mkconfig, a configuration file is installed" - elog " as /etc/grub.d/39_${PN}" - elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" - elog " > title=${PN}" - elog " > root (hd?,?)" - elog " > kernel ${BOOTDIR}/memtest.bin" - elog " - For lilo:" - elog " > image = ${BOOTDIR}/memtest.bin" - elog " > label = ${PN}" - elog "" - elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'." -} diff --git a/sys-apps/memtest86/metadata.xml b/sys-apps/memtest86/metadata.xml deleted file mode 100644 index 94e9668ab203..000000000000 --- a/sys-apps/memtest86/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - base-system@gentoo.org - Gentoo Base System - - - Compile with serial console support - - -- cgit v1.2.3