From 7f4b508a2da3c371c7e770aa6ab83b0c4237cd1c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Dec 2024 02:07:18 +0000 Subject: gentoo auto-resync : 03:12:2024 - 02:07:18 --- app-crypt/Manifest.gz | Bin 25263 -> 25265 bytes app-crypt/libsecret/Manifest | 1 + app-crypt/libsecret/libsecret-0.21.4-r2.ebuild | 164 +++++++++++++++++++++ app-crypt/osslsigncode/Manifest | 2 - app-crypt/osslsigncode/osslsigncode-2.8.ebuild | 66 --------- app-crypt/pesign/Manifest | 5 - .../pesign/files/pesign-114-format-string.patch | 111 -------------- app-crypt/pesign/files/pesign-114-no-werror.patch | 13 -- .../files/pesign-114-wanalyzer-diagnostic.patch | 19 --- app-crypt/pesign/pesign-114.ebuild | 58 -------- 10 files changed, 165 insertions(+), 274 deletions(-) create mode 100644 app-crypt/libsecret/libsecret-0.21.4-r2.ebuild delete mode 100644 app-crypt/osslsigncode/osslsigncode-2.8.ebuild delete mode 100644 app-crypt/pesign/files/pesign-114-format-string.patch delete mode 100644 app-crypt/pesign/files/pesign-114-no-werror.patch delete mode 100644 app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch delete mode 100644 app-crypt/pesign/pesign-114.ebuild (limited to 'app-crypt') diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz index 1644b2856d41..09bdba02b6d1 100644 Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest index a81c4217eee3..baf844e9821e 100644 --- a/app-crypt/libsecret/Manifest +++ b/app-crypt/libsecret/Manifest @@ -2,4 +2,5 @@ DIST libsecret-0.21.1.tar.xz 190796 BLAKE2B 862c2aac0c519d2607c1c5b057d1e0d00d3d DIST libsecret-0.21.4.tar.xz 206636 BLAKE2B c2f938e667b229e3dbe05e4193459b24f79d874348fda39423712ef92fa0c056129eaf646fbcfab1d7a1ae40982909f4882b5e66c294a2ba648fdd07c88e5909 SHA512 4731d9b2809a867f59e0702a55d1577ee0a968826c3df40717b1a6f6ea3f9d94ed95457dd82070d2914f5b1911d49fd6ae340bec6f4bcf88b6c804782ae7a24e EBUILD libsecret-0.21.1.ebuild 3632 BLAKE2B 9ea840eb408ebac6ab30c2a2f33d51a888c04794b2b0b369b12b2e640ece9fd12942f1a7d42f4c9ca8667f004230f903003f7160b9d5c4ade7714a19267ce2a5 SHA512 52e39f15751e5b30166107a00bf63114091b6bc445d9a031b72ca33f700117fb915d0c581f6a2ab5c53c2ae6325ec6a384cdbaf17976c11306736355230c6607 EBUILD libsecret-0.21.4-r1.ebuild 3971 BLAKE2B 3260709583467ddca09d188531568cc415d5071f72031de0d06d30844bac125410015ac47cdd87ee9fce0ab024d35a58969b2400b0d21e79cb88ba8b5073d2a2 SHA512 5166a4f5299db595950f314b1fcfe15df572ad4efe5111372547676fedccb3da2f63f8c933fed80612a5324026b04136dc2305b76e0b22a697b6f31978b6bb7d +EBUILD libsecret-0.21.4-r2.ebuild 3977 BLAKE2B 519dda3370d205273b3e17a8434569a5b26f4d0b696f9a6cc9010e1c2ffea4b78fbfd49bd4fd1439516b96ed1aadfcd61b97dc4c781f6978e776d41c98922b70 SHA512 7d75da6482da9e23acf9bbb89112d1d53f0aa8674fd1ab889f585c69d66f4f3d2421ee085fe0c91f74ff399c05329307dd0713ed14d3b26dac085a44acf25a89 MISC metadata.xml 812 BLAKE2B d36ccd893f4781a8de0189c3afa0c6f4c5c4cc75bb8bf0ed15878a687313aa727973a3d223613064c0d174d24b9b644123b08b2639514f553392f0aa563e4e47 SHA512 7d688d62a72da7bdb98cdd60c16bee970510eba4e6e0a2234bfc7ab561738f35bb117dc9c0141c1966dec1653ca4227150b85bfb19e4387d7e9629c3e4a5804c diff --git a/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild b/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild new file mode 100644 index 000000000000..a74b9e31a5f4 --- /dev/null +++ b/app-crypt/libsecret/libsecret-0.21.4-r2.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{10..13} ) + +inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx + +DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API" +HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret" + +LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only +SLOT="0" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="+crypt +gcrypt gnutls gtk-doc +introspection pam test test-rust tpm +vala" + +RESTRICT="!test? ( test )" +REQUIRED_USE=" + vala? ( introspection ) + gtk-doc? ( crypt ) + crypt? ( || ( gcrypt gnutls ) ) +" + +DEPEND=" + >=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}] + gcrypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] ) + gnutls? ( >=net-libs/gnutls-3.8.2:0=[${MULTILIB_USEDEP}] ) + pam? ( sys-libs/pam ) + tpm? ( >=app-crypt/tpm2-tss-3.0.3:= ) + introspection? ( >=dev-libs/gobject-introspection-1.54:= ) +" +RDEPEND="${DEPEND}" +PDEPEND="virtual/secret-service" +BDEPEND=" + app-text/docbook-xml-dtd:4.2 + dev-libs/libxslt + dev-util/gdbus-codegen + dev-util/glib-utils + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + gtk-doc? ( + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/gi-docgen-2021.7 + ) + pam? ( sys-libs/pam_wrapper ) + test? ( + $(python_gen_any_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )') + test-rust? ( introspection? ( >=dev-libs/gjs-1.32 ) ) + tpm? ( + app-crypt/swtpm + app-crypt/tpm2-abrmd + >=app-crypt/tpm2-tss-3.2.0:= + ) + ) + vala? ( $(vala_depend) ) +" + +dbus_run() { + ( + # start isolated dbus session bus + dbus_data=$(dbus-launch --sh-syntax) || exit + eval "${dbus_data}" + + $@ + ret=${?} + + kill "${DBUS_SESSION_BUS_PID}" + exit "${ret}" + ) || die +} + +tpm2_run_with_emulator() { + export XDG_CONFIG_HOME=${T}/.config/swtpm + "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files --overwrite || die + + mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die + swtpm_setup_args=( + --tpm2 + --tpmstate ${XDG_CONFIG_HOME}/mytpm1 + --createek + --allow-signing + --decryption + --create-ek-cert + --create-platform-cert + --lock-nvram + --overwrite + --display + ) + swtpm_setup "${swtpm_setup_args[@]}" || die + + swtpm_socket_args=( + --tpm2 + --tpmstate dir=${XDG_CONFIG_HOME}/mytpm1 + --flags startup-clear + --ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl + --server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket + --pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid + --daemon + ) + swtpm socket "${swtpm_socket_args[@]}" || die + + tpm2_abrmd_args=( + --logger=stdout + --tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket + --session + --flush-all + ) + tpm2-abrmd "${tpm2_abrmd_args[@]}" & + export TCTI=tabrmd:bus_type=session + + $@ || die + + # When swtpm dies, tmp2-abrmd will exit + kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die +} + +python_check_deps() { + if use introspection; then + python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return + fi + python_has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + use vala && vala_setup + default +} + +multilib_src_configure() { + local emesonargs=( + $(meson_native_true manpage) + $(meson_native_use_bool vala vapi) + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_bool introspection) + -Dbashcompdir="$(get_bashcompdir)" + $(meson_native_enabled bash_completion) + $(meson_native_use_bool tpm tpm2) + $(meson_native_use_bool pam) + ) + + if use crypt ; then + use gcrypt && emesonargs+=( -Dcrypto=libgcrypt ) + use gnutls && emesonargs+=( -Dcrypto=gnutls ) + else + emesonargs+=( -Dcrypto=disabled ) + fi + + meson_src_configure +} + +multilib_src_test() { + if use tpm; then + dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}" + else + virtx dbus-run-session meson test -C "${BUILD_DIR}" + fi +} diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest index a627d795f343..d944a73688c4 100644 --- a/app-crypt/osslsigncode/Manifest +++ b/app-crypt/osslsigncode/Manifest @@ -1,6 +1,4 @@ AUX osslsigncode-2.9-missing-import.patch 995 BLAKE2B 390dc5ab00db721d3237dc5382abb21201a1c0290a4e3c14411fc18dc3cb1d7759d3fec9b2bf3b67c1d1a5ef3634f320998c1f1bae5ceab95be454aea35ad156 SHA512 6bc44fa87fbafefca70d96f1152e02f93ff417eb8ed8e46cb290f8e70699f325ac88deac7e3854e10a886e343cb94760fa25c470c9a37b3a2a698235fc369d41 -DIST osslsigncode-2.8.tar.gz 747274 BLAKE2B 62472d0830b53b2d182b37585a225f0699600bcc2bad5915a64a52b5b7c3fab6f7e936ba82e41907e41c9b0cc1f8ff5f47aa79feb8c5742b16d1fe101baf3db0 SHA512 dd7349e3a64c1d6f63379a14450c8e643c006d2824dc41ce9ecde64ba276466772c440e577aca4a805a49c7ba88aa0dcf5ea73c323abcc4945491407b20e8e96 DIST osslsigncode-2.9.tar.gz 1033420 BLAKE2B 63897907102f7e3ee241d4a0436ac2c217351cbdf330c302344ad648cc5d7962ea9936b1c1ccfe6072c3188f6e49f892b323eecc0c87476071effb6d02f9e0e0 SHA512 c88d3050b0f4af5cf4ec899ac1935cd04833ed8c7690298ab1bf0c00c4e53bf5a4f9ee31940d63e29350a6babf43f212e56aa480a67745b6d715a30a8093e3a6 -EBUILD osslsigncode-2.8.ebuild 1438 BLAKE2B cda3e11d0be1f239f0d3526aad9a06035e4270eb6aa5147a0eb45d735847c9272b6d5c6a3b5df36349214fa5aa3fc1f1cdae483f5cd0bdd633fa73183b551bbd SHA512 9f7344dcd025531943f4b8f885a3fa771b69bbebd4038f64542892dcb0bfb9abb1af43f1cbb705eee53dca0b8b8476d9c88a0eaffa77a899abafd2ae202bef7b EBUILD osslsigncode-2.9.ebuild 1039 BLAKE2B c5e0e79202f5dc663f1d9f398919f0cd5e4cde6c2300aef9d9621ad6db609dc6005860a6e1cbd91ed2fb3dc3f028035366e6cb612f593819a98fabc2dfd968a2 SHA512 ce2521f8fa9ada04a108c3e455875e180a48f2fe6a203ac4a87b593f314fd3355925aaa0466f1165416210114f6d77187b3b4cac5cd71acbc73c8864d3342c2a MISC metadata.xml 254 BLAKE2B d3f965a8685847a6c6207933c7b08a3fef2c01798fc4eeef77fe22bc83f52bba5762160fab942b7be6bd26f32d0f0cb96344edafb9d35bb326927e74ce9119f9 SHA512 4b6710c5c854b4a7c4c36de77cea55074b2a9fb023ebed212af1289458a2397974458608556e0fcd547a0a11a5b3fed75323323e707dfb46589340c25a2df95e diff --git a/app-crypt/osslsigncode/osslsigncode-2.8.ebuild b/app-crypt/osslsigncode/osslsigncode-2.8.ebuild deleted file mode 100644 index 9d9e80561854..000000000000 --- a/app-crypt/osslsigncode/osslsigncode-2.8.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -#OSSLSIGNCODE_TEST_FILES=( unsigned.{cat,ex_,exe,msi} ) -inherit cmake python-any-r1 - -DESCRIPTION="Platform-independent tool for Authenticode signing of EXE/CAB files" -HOMEPAGE="https://github.com/mtrojnar/osslsigncode" -SRC_URI="https://github.com/mtrojnar/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do - SRC_URI+=" test? ( https://github.com/mtrojnar/osslsigncode/raw/${PV}/tests/files/${test_file} -> ${PN}-test-${test_file} )" -done -unset test_file - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="curl test" -#RESTRICT="!test? ( test )" -# https://github.com/mtrojnar/osslsigncode/issues/140#issuecomment-1060636197 -RESTRICT="test" - -RDEPEND=" - dev-libs/openssl:= - sys-libs/zlib:= - curl? ( net-misc/curl ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - test? ( - ${PYTHON_DEPS} - sys-libs/libfaketime - ) -" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - if use test ; then - local test_file - for test_file in "${OSSLSIGNCODE_TEST_FILES[@]}" ; do - cp "${DISTDIR}"/${PN}-test-${test_file} tests/files/${test_file} || die - done - unset test_file - fi - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package curl CURL) - ) - - cmake_src_configure -} - -src_test() { - cmake_src_test -j1 -} diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest index 25917da3ccfd..0eb51e802157 100644 --- a/app-crypt/pesign/Manifest +++ b/app-crypt/pesign/Manifest @@ -1,9 +1,4 @@ -AUX pesign-114-format-string.patch 4359 BLAKE2B 12a7c43162d806050c2fe4c5cf8e289fe262a158ac8cefb60a26a3233831526cfe3e98bea956f7158ea648b22da6cd0cc36e807101485b299f8be6cb2bc93ec2 SHA512 133f452089ec6691d3b50ff7a73399382b5e300f1d1686e9e4f98ffcfa1fce824503c146589d249a67e28df5dfc7c737fb05ad67e2c707aa97fb1dfebb550993 -AUX pesign-114-no-werror.patch 537 BLAKE2B a92e320460d83a943f60ee2524344a24f907d5fa09416ecc1e5024941d7f4130afe339f508301594d7ff0e6f53166093086e64b774a8448c55a3fbb73e74568e SHA512 e64b2f3ebeabba2e74c281a2a8205faa0ba0fac91e9153a8979e3edbf695274d4e940502736db12ba6bcb19a70179c5529b262f6a8b23779f19a750ff810cda3 -AUX pesign-114-wanalyzer-diagnostic.patch 734 BLAKE2B dcfae1fb4bea691ffb2bbd3f2e4f40e1e21f16840f4dfcc9293f856fdf6f75913bf6c12f7739ffa0e453949a9aa0add9925e7a0ee4adea6452c1007c4a40e11b SHA512 21ef15d5d1358bb9ff92f337a1da149bf993f04a6c0cd391956ce7175ac15f83596a3601a68eb51a9f88eb76c69dba8a3f57b672d9e628d0f75e9678d819a593 AUX pesign-116-no-werror.patch 501 BLAKE2B 44e1fb6353ff374cc17ee495a0e5cc52ed0c537319f0ae05e917af183725ec5c3e7c9e179d9f33562d81bdead6fa188bc50fdcb090b1ceb10eb1ab94568666b7 SHA512 f3f3723fe595b7d3e4b4d76af8e0b4e7a263321588a9dd98905f0928e2c80f647bac78e2fab4bfe9c88b08e00c69c922b324eaf47707baed37ddc9dbf3803d0b -DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab DIST pesign-116.tar.bz2 120424 BLAKE2B a1bce804c13a0aba1eb5fdf0b3963d658011484d4708d58bd9265b6ad8a3d2d3e3156a49736e6fb029bd5d8cc175f6440e62dbc34722357888a239e4d7e7d9e2 SHA512 be3e1083f5e9f889cb8f7c50a8ebe723542fb2f6d1de8de9b04a9f21526ebaa8ab1efc7d4be11bcb0bc9862fa4bc6f78ee35e4d3496dd3b8927170b97795d25c -EBUILD pesign-114.ebuild 1233 BLAKE2B b61a091d19b2f6d58e697af779ca5032b44f29a89c97c42c5f1b4c64eb595ea616fe37dc2c7155ce4f3d1eff82ffcc326cd58448e1cbb05a079fec6d2d517f08 SHA512 0b7f43429fa81ebbe551044da0a737745891f2b2d8cd16bf71e8a88faef631151e32059e8f85c156160295f5577d151cca27a4b4061e4185febfaab2e152a8db EBUILD pesign-116.ebuild 1188 BLAKE2B 1cd68bc64c41a8fec7c9f38b1726acfa637fa482e1532fc289e0f0def50b643dfb9c894e252379e64a484a38478a016bde3d2c15733515e29263f086637ee47d SHA512 4ccc0fe428bb913e359ccba6efbfae2cd17c3c77e4cd288c52459b6830092b76e047d510693936caa1f8e2fda2e98af81ae89ce17ca0db8ce4d32bf8952e4d35 MISC metadata.xml 249 BLAKE2B 0928166bc28197e80603bef476a41c55e1e593a7e2636ecb634cecd26b5df5896667b06f049e1a2737f6da0330d243387068b6beededab2c3c8cab7208c1016d SHA512 dcbdae805ad96a8343af41708b249dfb119c7b18146279212b9747a91fbb64beb9e23b606151a77b42ea4f2fbbcf9f81d48067cd26122c61dee8b8178277d307 diff --git a/app-crypt/pesign/files/pesign-114-format-string.patch b/app-crypt/pesign/files/pesign-114-format-string.patch deleted file mode 100644 index 2361cb4a2660..000000000000 --- a/app-crypt/pesign/files/pesign-114-format-string.patch +++ /dev/null @@ -1,111 +0,0 @@ -https://github.com/rhboot/pesign/commit/df8783ed4ed87fef850268098690985049916ee9.patch - -From df8783ed4ed87fef850268098690985049916ee9 Mon Sep 17 00:00:00 2001 -From: Robbie Harwood -Date: Tue, 1 Feb 2022 17:37:14 -0500 -Subject: [PATCH] Fix format strings for 32-bit arches - -Sadly, in 2022, this remains a thing. - -Signed-off-by: Robbie Harwood ---- - src/cms_pe_common.c | 16 +++++++++------- - src/password.c | 7 ++++--- - 2 files changed, 13 insertions(+), 10 deletions(-) - -diff --git a/src/cms_pe_common.c b/src/cms_pe_common.c -index 964f0d9..3a3921b 100644 ---- a/src/cms_pe_common.c -+++ b/src/cms_pe_common.c -@@ -49,7 +49,7 @@ check_pointer_and_size(cms_context *cms, Pe *pe, void *ptr, size_t size) - - if (p + size > m + map_size) - cmsreterr(0, cms, -- "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %lu)", -+ "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %zu)", - (void *)((uintptr_t)p + size), - (void *)((uintptr_t)m + map_size), - p + size - m, -@@ -189,7 +189,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded) - if (!check_pointer_and_size(cms, pe, hash_base, hash_size)) - cmsgotoerr(error, cms, "PE header is invalid"); - dprintf("beginning of hash"); -- dprintf("digesting %lx + %lx", hash_base - map, hash_size); -+ dprintf("digesting %tx + %zx", hash_base - map, hash_size); - generate_digest_step(cms, hash_base, hash_size); - - /* 5. Skip over the image checksum -@@ -209,7 +209,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded) - cmsgotoerr(error, cms, "PE data directory is invalid"); - - generate_digest_step(cms, hash_base, hash_size); -- dprintf("digesting %lx + %lx", hash_base - map, hash_size); -+ dprintf("digesting %tx + %zx", hash_base - map, hash_size); - - /* 8. Skip over the crt dir - * 9. Hash everything up to the end of the image header. */ -@@ -222,7 +222,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded) - cmsgotoerr(error, cms, "PE relocations table is invalid"); - - generate_digest_step(cms, hash_base, hash_size); -- dprintf("digesting %lx + %lx", hash_base - map, hash_size); -+ dprintf("digesting %tx + %zx", hash_base - map, hash_size); - - /* 10. Set SUM_OF_BYTES_HASHED to the size of the header. */ - hashed_bytes = pe32opthdr ? pe32opthdr->header_size -@@ -265,7 +265,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded) - } - - generate_digest_step(cms, hash_base, hash_size); -- dprintf("digesting %lx + %lx", hash_base - map, hash_size); -+ dprintf("digesting %tx + %zx", hash_base - map, hash_size); - - hashed_bytes += hash_size; - } -@@ -285,10 +285,12 @@ generate_digest(cms_context *cms, Pe *pe, int padded) - memset(tmp_array, '\0', tmp_size); - memcpy(tmp_array, hash_base, hash_size); - generate_digest_step(cms, tmp_array, tmp_size); -- dprintf("digesting %lx + %lx", (unsigned long)tmp_array, tmp_size); -+ dprintf("digesting %tx + %zx", (ptrdiff_t)tmp_array, -+ tmp_size); - } else { - generate_digest_step(cms, hash_base, hash_size); -- dprintf("digesting %lx + %lx", hash_base - map, hash_size); -+ dprintf("digesting %tx + %zx", hash_base - map, -+ hash_size); - } - } - dprintf("end of hash"); -diff --git a/src/password.c b/src/password.c -index 644f362..05add9a 100644 ---- a/src/password.c -+++ b/src/password.c -@@ -213,7 +213,7 @@ parse_pwfile_line(char *start, struct token_pass *tp) - dprintf("non-whitespace span is %zd", span); - - if (line[span] == '\0') { -- dprintf("returning %ld", (line + span) - start); -+ dprintf("returning %td", (line + span) - start); - return (line + span) - start; - } - line[span] = '\0'; -@@ -241,7 +241,7 @@ parse_pwfile_line(char *start, struct token_pass *tp) - dprintf("Setting token pass %p to { %p, %p }", tp, tp->token, tp->pass); - dprintf("token:\"%s\"", tp->token); - dprintf("pass:\"%s\"", tp->pass); -- dprintf("returning %ld", (line + span) - start); -+ dprintf("returning %td", (line + span) - start); - return (line + span) - start; - } - -@@ -330,7 +330,8 @@ SECU_FilePasswd(PK11SlotInfo *slot, PRBool retry, void *arg) - if (c != '\0') - span++; - start += span; -- dprintf("start is file[%ld] == '\\x%02hhx'", start - file, start[0]); -+ dprintf("start is file[%td] == '\\x%02hhx'", start - file, -+ start[0]); - } - - qsort(phrases, nphrases, sizeof(struct token_pass), token_pass_cmp); diff --git a/app-crypt/pesign/files/pesign-114-no-werror.patch b/app-crypt/pesign/files/pesign-114-no-werror.patch deleted file mode 100644 index 3937873e80bd..000000000000 --- a/app-crypt/pesign/files/pesign-114-no-werror.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Make.defaults b/Make.defaults -index fdb961a..cdbb064 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -58,7 +58,7 @@ cflags = $(CFLAGS) $(ARCH3264) \ - -Wall -Wextra -Wsign-compare -Wno-unused-result \ - -Wno-unused-function -Wno-missing-field-initializers \ - -Wno-analyzer-malloc-leak \ -- -Werror -Wno-error=cpp -Wno-free-nonheap-object \ -+ -Wno-error=cpp -Wno-free-nonheap-object \ - -std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \ - -D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \ - '-DRUNDIR="$(rundir)"' \ diff --git a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch deleted file mode 100644 index 43bc0d84c44c..000000000000 --- a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/rhboot/pesign/issues/78 - -daemon.c:922:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas] - 922 | #pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value" - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -916,10 +916,6 @@ do_shutdown(context *ctx, int nsockets, struct pollfd *pollfds) - free(pollfds); - } - --/* GCC -fanalyzer has trouble with realloc -- * https://bugzilla.redhat.com/show_bug.cgi?id=2047926 */ --#pragma GCC diagnostic push --#pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value" - static int - handle_events(context *ctx) - { diff --git a/app-crypt/pesign/pesign-114.ebuild b/app-crypt/pesign/pesign-114.ebuild deleted file mode 100644 index bd65febf96c3..000000000000 --- a/app-crypt/pesign/pesign-114.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Tools for manipulating signed PE-COFF binaries" -HOMEPAGE="https://github.com/rhboot/pesign" -SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-libs/nspr - dev-libs/nss - dev-libs/openssl:= - dev-libs/popt - sys-apps/util-linux - >=sys-libs/efivar-38 -" -DEPEND="${RDEPEND} - sys-boot/gnu-efi -" -BDEPEND=" - sys-apps/help2man - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-114-wanalyzer-diagnostic.patch - "${FILESDIR}"/${PN}-114-no-werror.patch - - "${FILESDIR}"/${P}-format-string.patch -) - -src_compile() { - emake \ - AR="$(tc-getAR)" \ - ARFLAGS="-cvqs" \ - AS="$(tc-getAS)" \ - CC="$(tc-getCC)" \ - LD="$(tc-getLD)" \ - OBJCOPY="$(tc-getOBJCOPY)" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" \ - RANLIB="$(tc-getRANLIB)" \ - rundir="${EPREFIX}/var/run" -} - -src_install() { - emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install - einstalldocs - - # remove some files that don't make sense for Gentoo installs - rm -rf "${ED}/etc" "${ED}/var" "${ED}/usr/share/doc/${PF}/COPYING" || die -} -- cgit v1.2.3