[gentoo-commits] repo/gentoo:master commit in: sys-process/procenv/files/, sys-process/procenv/
commit: c2d834070ccb4ddc64f8e7af5e4bc092a384920c
Author: Brahmajit Das gmail com>
AuthorDate: Tue Jun 6 17:01:43 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Jul 15 06:24:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d83407
sys-process/procenv: Fix call to undeclared function makedev
Closes: https://bugs.gentoo.org/898856
Signed-off-by: Brahmajit Das gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31318
Signed-off-by: Joonas Niilola gentoo.org>
.../files/procenv-0.51-musl-sysmacros.patch| 53 ++
sys-process/procenv/procenv-0.51-r1.ebuild | 29
2 files changed, 82 insertions(+)
diff --git a/sys-process/procenv/files/procenv-0.51-musl-sysmacros.patch
b/sys-process/procenv/files/procenv-0.51-musl-sysmacros.patch
new file mode 100644
index ..cd93a1d359ac
--- /dev/null
+++ b/sys-process/procenv/files/procenv-0.51-musl-sysmacros.patch
@@ -0,0 +1,53 @@
+https://github.com/jamesodhunt/procenv/pull/27
+From: Brahmajit Das
+Date: Mon, 5 Jun 2023 14:10:48 +
+Subject: [PATCH] Fix build on musl libc
+
+On util.c the guard around #include sys/sysmacros.h prevents musl libc
+from including the file, even though musl provides the header file, thus
+failing with errors such as "call to undeclared function makedev".
+
+In procenv.c although the function makedev is used but the file
+sysmacros.h was never included, thus resulting in similar "call to
+undeclared function makedev" error hence moving inclusion sysmacros.h to
+source file from header file.
+
+Signed-off-by: Brahmajit Das
+--- a/src/procenv.c
b/src/procenv.c
+@@ -27,6 +27,8 @@
+ */
+
+ #include
++/* major(3) / minor(3) */
++#include
+
+ /**
+ * doc:
+--- a/src/procenv.h
b/src/procenv.h
+@@ -103,9 +103,6 @@
+ #define PACKAGE_STRING PACKAGE_NAME
+ #endif
+
+-/* major(3) / minor(3) */
+-#include
+-
+ #endif /* PROCENV_PLATFORM_ANDROID */
+
+ /*/
+--- a/src/util.c
b/src/util.c
+@@ -17,9 +17,7 @@
+ */
+
+ #include "util.h"
+-#if __GLIBC__
+ #include
+-#endif
+
+ // FIXME
+ extern struct procenv_user user;
+--
+2.40.1
+
diff --git a/sys-process/procenv/procenv-0.51-r1.ebuild
b/sys-process/procenv/procenv-0.51-r1.ebuild
new file mode 100644
index ..d59d5338b0af
--- /dev/null
+++ b/sys-process/procenv/procenv-0.51-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="command-line utility to show process environment"
+HOMEPAGE="https://github.com/jamesodhunt/procenv;
+SRC_URI="https://github.com/jamesodhunt/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-libs/check )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.45-flags.patch
+ "${FILESDIR}"/${PN}-0.51-musl-sysmacros.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
[gentoo-commits] repo/gentoo:master commit in: sys-process/procenv/files/, sys-process/procenv/
commit: 2d88373338bd3f8b1bbd673e28a8dbf73f4b186a
Author: Tim Harder gentoo org>
AuthorDate: Tue Apr 25 17:33:29 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Tue Apr 25 17:34:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d883733
sys-process/procenv: remove old
sys-process/procenv/Manifest | 3 ---
.../procenv/files/procenv-0.45-sysmacros.patch | 23 -
sys-process/procenv/procenv-0.45.ebuild| 28
sys-process/procenv/procenv-0.46.ebuild| 30 --
sys-process/procenv/procenv-0.47.ebuild| 30 --
5 files changed, 114 deletions(-)
diff --git a/sys-process/procenv/Manifest b/sys-process/procenv/Manifest
index 5929aa1b12f..3d7f4ddebc9 100644
--- a/sys-process/procenv/Manifest
+++ b/sys-process/procenv/Manifest
@@ -1,4 +1 @@
-DIST procenv-0.45.tar.gz 241046 SHA256
5fc3d650783f57fa8ba90c5e0cf0fc28f5e0bf22af38f2dbb9e8574d4e13fad3 SHA512
b9d5a9cda7ff2cc406555a2a82664e45172250af5943c882084fe0d6d067cc19cbc74b6cb9203d3be64a33797ad3c3afa8ad9d5414546ee8e047947790956ff1
WHIRLPOOL
786a80ca01569dca399436e47c335f65893cd4414eb5ef770b3100a2de5328f82792508137a3274c31932db4e81eabd1d8fd1cbcf13efe4acebfdeb9ce4359a8
-DIST procenv-0.46.tar.gz 243301 SHA256
5c8253e63c1f90e80bfdd2076b5cdf916513667453e165e0660afb68f60fb98b SHA512
3f6ff6ce0c4218f9eba6d8172fcd60e380eb1d555114c871be5e4f5815cc7dfcba5f3b2ddf731da0d250f1e8f9754d70805a479c3bf283c5e48e77b8cb91d7a1
WHIRLPOOL
ebddbe398bf8bdebae87bfc59cdc2e0fe57f804c7e34c7f18978c8bcbcbeb84ee7f406e8b7788f6ead64b292d244421b1cb48aa2fde49be9792ceaeb8885b63c
-DIST procenv-0.47.tar.gz 243872 SHA256
50c6e2d3a5afa1e8b0ee1166db409c161e832cb248aa2d284ca9265bb089fb5e SHA512
81f3019a5b379c1e7fa7819526823b732a7fc64d53cf828390995c3070bc9a27bee29e56d73dddff95c001e09548ae144b38ec4c259aab42e568e5257c1366ad
WHIRLPOOL
54307468fbd4d965d295d35e9274c09930184a46aeeb9c4503d6f84d3d9441fe8bd5d295c5d19f8f3a3dee19762c809533fd2eddf07a62aaf0d6a25058fe3abb
DIST procenv-0.49.tar.gz 243974 SHA256
0d3416f75e06cd0ca39d72c43eb98ffc53c482a0ec80c06b3467c18282713f2f SHA512
2845e34abcc3c7cc56947c1b4407e7d8366bbd40ba0144e16cecd41acb24773072f58f34b54eefbf334b30a1b97a23fe611368166da8d80162657613c287af99
WHIRLPOOL
562195f0c363712dba155f4ce72b68a26d62f7425b515678bd3dfe055f822fd482a15f8e467f653a4bc2c608a422c0b3107ff8cfc38049e415084262924b7168
diff --git a/sys-process/procenv/files/procenv-0.45-sysmacros.patch
b/sys-process/procenv/files/procenv-0.45-sysmacros.patch
deleted file mode 100644
index 5d7230c4bc4..000
--- a/sys-process/procenv/files/procenv-0.45-sysmacros.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Since glibc is moving away from implicitly including sys/sysmacros.h all the
-time via sys/types.h, include the header directly in more places.
-
procenv-0.45/src/procenv.h
-+++ procenv-0.45/src/procenv.h
-@@ -59,6 +59,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
procenv-0.45/src/util.h
-+++ procenv-0.45/src/util.h
-@@ -22,6 +22,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
diff --git a/sys-process/procenv/procenv-0.45.ebuild
b/sys-process/procenv/procenv-0.45.ebuild
deleted file mode 100644
index c33a0de850a..000
--- a/sys-process/procenv/procenv-0.45.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="command-line utility to show process environment"
-HOMEPAGE="https://github.com/jamesodhunt/procenv;
-SRC_URI="https://github.com/jamesodhunt/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
- virtual/pkgconfig
- test? ( dev-libs/check )
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-sysmacros.patch \
- "${FILESDIR}"/${P}-flags.patch
-
- eautoreconf
-}
diff --git a/sys-process/procenv/procenv-0.46.ebuild
b/sys-process/procenv/procenv-0.46.ebuild
deleted file mode 100644
index 8c7d553b9e2..000
--- a/sys-process/procenv/procenv-0.46.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="command-line utility to show process environment"
-HOMEPAGE="https://github.com/jamesodhunt/procenv;
-SRC_URI="https://github.com/jamesodhunt/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
-IUSE="test"
-
-DEPEND="
- virtual/pkgconfig
- test? ( dev-libs/check )
-"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/${PN}-0.45-sysmacros.patch
- "${FILESDIR}"/${PN}-0.45-flags.patch
- )
-
-
[gentoo-commits] repo/gentoo:master commit in: sys-process/procenv/files/, sys-process/procenv/
commit: 6ba532c9afb4c3cd21b599a1c4e53ab2098f0e75
Author: Jeroen Roovers gentoo org>
AuthorDate: Fri Apr 22 12:10:39 2016 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Fri Apr 22 12:10:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba532c9
sys-process/procenv: Drop -Werror and -fstack-protector (bug #580808).
Package-Manager: portage-2.2.28
sys-process/procenv/files/procenv-0.45-flags.patch | 18 ++
sys-process/procenv/procenv-0.45.ebuild| 8 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/sys-process/procenv/files/procenv-0.45-flags.patch
b/sys-process/procenv/files/procenv-0.45-flags.patch
new file mode 100644
index 000..a4c6be9
--- /dev/null
+++ b/sys-process/procenv/files/procenv-0.45-flags.patch
@@ -0,0 +1,18 @@
+--- a/src/Makefile.am
b/src/Makefile.am
+@@ -4,7 +4,6 @@
+ -pedantic \
+ -std=gnu99 \
+ -Wall -Wunused \
+- -fstack-protector \
+ -Wformat
+
+
+@@ -13,7 +12,6 @@
+ AM_CFLAGS += -fdata-sections -ffunction-sections
+
+ # keep it tight
+-AM_CFLAGS += -Werror
+
+ bin_PROGRAMS = procenv
+
diff --git a/sys-process/procenv/procenv-0.45.ebuild
b/sys-process/procenv/procenv-0.45.ebuild
index 3daf754..83e4156 100644
--- a/sys-process/procenv/procenv-0.45.ebuild
+++ b/sys-process/procenv/procenv-0.45.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils
+inherit autotools eutils
DESCRIPTION="command-line utility to show process environment"
HOMEPAGE="https://github.com/jamesodhunt/procenv;
@@ -21,5 +21,9 @@ DEPEND="
"
src_prepare() {
- epatch "${FILESDIR}"/${P}-sysmacros.patch
+ epatch \
+ "${FILESDIR}"/${P}-sysmacros.patch \
+ "${FILESDIR}"/${P}-flags.patch
+
+ eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: sys-process/procenv/files/, sys-process/procenv/
commit: 6b03f08744ea3c3c087c571e649d1f50ffdbbd1b
Author: Tim Harder gentoo org>
AuthorDate: Sat Apr 16 20:59:58 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Sat Apr 16 21:01:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b03f087
sys-process/procenv: explicitly include sysmacros header
.../procenv/files/procenv-0.45-sysmacros.patch | 23 ++
sys-process/procenv/procenv-0.45.ebuild| 6 ++
2 files changed, 29 insertions(+)
diff --git a/sys-process/procenv/files/procenv-0.45-sysmacros.patch
b/sys-process/procenv/files/procenv-0.45-sysmacros.patch
new file mode 100644
index 000..5d7230c
--- /dev/null
+++ b/sys-process/procenv/files/procenv-0.45-sysmacros.patch
@@ -0,0 +1,23 @@
+Since glibc is moving away from implicitly including sys/sysmacros.h all the
+time via sys/types.h, include the header directly in more places.
+
+--- procenv-0.45/src/procenv.h
procenv-0.45/src/procenv.h
+@@ -59,6 +59,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+--- procenv-0.45/src/util.h
procenv-0.45/src/util.h
+@@ -22,6 +22,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/sys-process/procenv/procenv-0.45.ebuild
b/sys-process/procenv/procenv-0.45.ebuild
index 32466f2..3daf754 100644
--- a/sys-process/procenv/procenv-0.45.ebuild
+++ b/sys-process/procenv/procenv-0.45.ebuild
@@ -4,6 +4,8 @@
EAPI=5
+inherit eutils
+
DESCRIPTION="command-line utility to show process environment"
HOMEPAGE="https://github.com/jamesodhunt/procenv;
SRC_URI="https://github.com/jamesodhunt/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
@@ -17,3 +19,7 @@ DEPEND="
virtual/pkgconfig
test? ( dev-libs/check )
"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-sysmacros.patch
+}
