From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C54A158451 for ; Sun, 14 Jan 2024 03:40:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C606E29F8; Sun, 14 Jan 2024 03:40:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3580AE29F9 for ; Sun, 14 Jan 2024 03:40:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2454B3431DB for ; Sun, 14 Jan 2024 03:40:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 417FF1494 for ; Sun, 14 Jan 2024 03:40:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1705202891.d24bc32440ff3efadf9f424e5a8106e820b97639.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/atop/files/, sys-process/atop/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/atop/atop-2.10.0.ebuild sys-process/atop/files/atop-2.10.0-ldflags.patch sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch sys-process/atop/files/atop-2.10.0-respect-opt.patch X-VCS-Directories: sys-process/atop/ sys-process/atop/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d24bc32440ff3efadf9f424e5a8106e820b97639 X-VCS-Branch: master Date: Sun, 14 Jan 2024 03:40:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1fe3a439-3655-4cde-94b2-85a091177f42 X-Archives-Hash: 7d293decead883fc52f90f42b2574dc9 commit: d24bc32440ff3efadf9f424e5a8106e820b97639 Author: Sam James gentoo org> AuthorDate: Sun Jan 14 03:28:07 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jan 14 03:28:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d24bc324 sys-process/atop: respect LDFLAGS, PKG_CONFIG, opt Signed-off-by: Sam James gentoo.org> sys-process/atop/atop-2.10.0.ebuild | 5 ++++- sys-process/atop/files/atop-2.10.0-ldflags.patch | 20 ++++++++++++++++++++ .../atop/files/atop-2.10.0-respect-PKG_CONFIG.patch | 14 ++++++++++++++ sys-process/atop/files/atop-2.10.0-respect-opt.patch | 12 ++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/sys-process/atop/atop-2.10.0.ebuild b/sys-process/atop/atop-2.10.0.ebuild index 9bd1a191304c..01c0dfa1ff44 100644 --- a/sys-process/atop/atop-2.10.0.ebuild +++ b/sys-process/atop/atop-2.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -34,6 +34,9 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-2.6.0-build.patch + "${FILESDIR}"/${PN}-2.10.0-ldflags.patch + "${FILESDIR}"/${PN}-2.10.0-respect-PKG_CONFIG.patch + "${FILESDIR}"/${PN}-2.10.0-respect-opt.patch ) pkg_pretend() { diff --git a/sys-process/atop/files/atop-2.10.0-ldflags.patch b/sys-process/atop/files/atop-2.10.0-ldflags.patch new file mode 100644 index 000000000000..5b2924ef3864 --- /dev/null +++ b/sys-process/atop/files/atop-2.10.0-ldflags.patch @@ -0,0 +1,20 @@ +https://github.com/Atoptool/atop/pull/289 + +From 8411f81a202c9c39aebcc637ef94cc3d454cbaaf Mon Sep 17 00:00:00 2001 +From: Marc 'Zugschlus' Haber +Date: Sat, 6 Jan 2024 07:03:53 +0100 +Subject: [PATCH] set LDFLAGS with +=, not overwriting existing variable + +this allows the Debian build process to set hardening flags +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,7 @@ PMPATH2 = /usr/lib64/pm-utils/sleep.d + PMPATHD = /usr/lib/systemd/system-sleep + + CFLAGS += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS +-LDFLAGS = $(shell pkg-config --libs glib-2.0) ++LDFLAGS += $(shell pkg-config --libs glib-2.0) + OBJMOD0 = version.o + OBJMOD1 = various.o deviate.o procdbase.o + OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o + diff --git a/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch new file mode 100644 index 000000000000..483506043490 --- /dev/null +++ b/sys-process/atop/files/atop-2.10.0-respect-PKG_CONFIG.patch @@ -0,0 +1,14 @@ +--- a/Makefile ++++ b/Makefile +@@ -20,8 +20,9 @@ PMPATH1 = /usr/lib/pm-utils/sleep.d + PMPATH2 = /usr/lib64/pm-utils/sleep.d + PMPATHD = /usr/lib/systemd/system-sleep + +-CFLAGS += -O2 -I. -Wall $(shell pkg-config --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS +-LDFLAGS += $(shell pkg-config --libs glib-2.0) ++PKG_CONFIG ?= pkg-config ++CFLAGS += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS ++LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0) + OBJMOD0 = version.o + OBJMOD1 = various.o deviate.o procdbase.o + OBJMOD2 = acctproc.o photoproc.o photosyst.o rawlog.o ifprop.o parseable.o diff --git a/sys-process/atop/files/atop-2.10.0-respect-opt.patch b/sys-process/atop/files/atop-2.10.0-respect-opt.patch new file mode 100644 index 000000000000..5a55e6f2f835 --- /dev/null +++ b/sys-process/atop/files/atop-2.10.0-respect-opt.patch @@ -0,0 +1,12 @@ +Don't force -O2. +--- a/Makefile ++++ b/Makefile +@@ -21,7 +21,7 @@ PMPATH2 = /usr/lib64/pm-utils/sleep.d + PMPATHD = /usr/lib/systemd/system-sleep + + PKG_CONFIG ?= pkg-config +-CFLAGS += -O2 -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS ++CFLAGS += -I. -Wall $(shell ${PKG_CONFIG} --cflags glib-2.0) -Wno-stringop-truncation -Wmissing-prototypes -Wmissing-declarations -Wformat-security # -DNOPERFEVENT # -DHTTPSTATS + LDFLAGS += $(shell ${PKG_CONFIG} --libs glib-2.0) + OBJMOD0 = version.o + OBJMOD1 = various.o deviate.o procdbase.o