* [gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
@ 2020-03-10 19:35 Sergei Trofimovich
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Trofimovich @ 2020-03-10 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 18402f2ef1d009c5141c7dd628ab1cc7edea2d91
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Tue Feb 18 15:31:45 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar 10 19:35:44 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18402f2e
sys-apps/heirloom-tools: fix building with glibc 2.30
While at it, fix patching with fuzz.
Closes: https://bugs.gentoo.org/692770
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/14693
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../files/heirloom-tools-070715-glibc-2.30.patch | 13 ++++
.../files/heirloom-tools-070715-major.patch | 70 +++++++++++++++++++++-
.../heirloom-tools/heirloom-tools-070715-r1.ebuild | 8 +--
3 files changed, 82 insertions(+), 9 deletions(-)
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch
new file mode 100644
index 00000000000..19b90cea6d2
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch
@@ -0,0 +1,13 @@
+diff --git a/shl/shl.c b/shl/shl.c
+index 6f5c2df..30d296c 100644
+--- a/shl/shl.c
++++ b/shl/shl.c
+@@ -86,7 +86,7 @@ extern int sysv3;
+ #include <libgen.h>
+ #include <limits.h>
+ #include <stdarg.h>
+-#if !defined (__dietlibc__) && !defined (__UCLIBC__)
++#if !defined (__dietlibc__) && !defined (__UCLIBC__) && !defined(__linux__)
+ #include <stropts.h>
+ #endif
+ #include <poll.h>
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
index 82d32315d81..81e6755e7e3 100644
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
@@ -1,6 +1,8 @@
+diff --git a/cpio/cpio.c b/cpio/cpio.c
+index 89c5cbc..210287b 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
-@@ -91,9 +91,9 @@
+@@ -91,11 +91,12 @@
#include <sfile.h>
#include <atoll.h>
@@ -10,11 +12,45 @@
-#endif /* _AIX */
+#endif /* _AIX || __GLIBC__ */
- #ifndef major
+-#ifndef major
++#include <sys/sysmacros.h>
++#if 0
#include <sys/mkdev.h>
+ #endif /* !major */
+
+diff --git a/file/file.c b/file/file.c
+index 6609734..d90af86 100644
+--- a/file/file.c
++++ b/file/file.c
+@@ -66,7 +66,8 @@ static const char sccsid[] USED = "@(#)file.sl 1.33 (gritter) 4/14/06";
+ #include <fcntl.h>
+ #include <libgen.h>
+ #include <inttypes.h>
+-#ifndef major
++#include <sys/sysmacros.h>
++#if 0
+ #include <sys/mkdev.h>
+ #endif
+ #include "iblok.h"
+diff --git a/find/find.c b/find/find.c
+index fac70f0..28e1b7f 100644
+--- a/find/find.c
++++ b/find/find.c
+@@ -83,7 +83,8 @@ static const char sccsid[] USED = "@(#)find.sl 1.45 (gritter) 5/8/06";
+ #ifdef _AIX
+ #include <sys/sysmacros.h>
+ #endif
+-#ifndef major
++#include <sys/sysmacros.h>
++#if 0
+ #include <sys/mkdev.h>
+ #endif
+ #if __NetBSD_Version__>= 300000000
+diff --git a/ls/ls.c b/ls/ls.c
+index e4480d0..17186ba 100644
--- a/ls/ls.c
+++ b/ls/ls.c
-@@ -119,7 +119,7 @@
+@@ -119,7 +119,7 @@ static char ifmt_c[] = "-pc-d-b--nl-SD--";
#include <termcap.h>
#endif /* USE_TERMCAP */
@@ -23,3 +59,31 @@
#include <sys/sysmacros.h>
#endif
+diff --git a/mknod/mknod.c b/mknod/mknod.c
+index b772b88..f465883 100644
+--- a/mknod/mknod.c
++++ b/mknod/mknod.c
+@@ -45,7 +45,8 @@ static const char sccsid[] USED = "@(#)mknod.sl 1.8 (gritter) 5/29/05";
+ #include <string.h>
+ #include <limits.h>
+ #include <unistd.h>
+-#ifndef major
++#include <sys/sysmacros.h>
++#if 0
+ #include <sys/mkdev.h>
+ #endif /* !major */
+
+diff --git a/tar/tar.c b/tar/tar.c
+index 2d3dada..a8f1ccb 100644
+--- a/tar/tar.c
++++ b/tar/tar.c
+@@ -98,7 +98,8 @@ static const char sccsid[] USED = "@(#)tar.sl 1.177 (gritter) 4/14/07";
+ #include <sys/sysmacros.h>
+ #endif
+
+-#ifndef major
++#include <sys/sysmacros.h>
++#if 0
+ #include <sys/mkdev.h>
+ #endif /* !major */
+
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
index 9d55edab0b4..80d2232221a 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,16 +23,12 @@ DEPEND="
S="${WORKDIR}/heirloom-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-major.patch
+ "${FILESDIR}"/${P}-glibc-2.30.patch
)
# slightly broken
RESTRICT="test"
-src_prepare() {
- find . -name '*.c' -exec sed -i -e 's|#ifndef[[:space:]]*major|#include <sys/sysmacros.h>\n#if 0|g' {} + || die
-
- default
-}
src_compile() {
append-cppflags -D_GNU_SOURCE
emake -j1 \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
@ 2020-03-26 9:22 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-03-26 9:22 UTC (permalink / raw
To: gentoo-commits
commit: fc98ef6d53fe28b690ca2b67d96cde766d1432c6
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Mar 26 09:21:53 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 09:21:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc98ef6d
sys-apps/heirloom-tools: fix build with glibc 2.31
Closes: https://bugs.gentoo.org/709410
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/heirloom-tools-070715-glibc-2.31.patch | 41 ++++++++++++++++++++++
.../heirloom-tools/heirloom-tools-070715-r1.ebuild | 1 +
2 files changed, 42 insertions(+)
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch
new file mode 100644
index 00000000000..5186aa1cc2e
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch
@@ -0,0 +1,41 @@
+--- a/date/date.c
++++ b/date/date.c
+@@ -134,26 +134,13 @@ badtime:
+ return (time_t)-1;
+ }
+
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || \
+- defined (__DragonFly__) || defined (__APPLE__)
+-static int
+-stime(time_t *t)
+-{
+- struct timeval tv;
+-
+- tv.tv_sec = *t;
+- tv.tv_usec = 0;
+-
+- return settimeofday(&tv, NULL);
+-}
+-#endif /* __FreeBSD__, __NetBSD__, __OpenBSD__, __DragonFly__, __APPLE__ */
+-
+ static void
+ settime(char *op)
+ {
+ struct utmpx before, after;
+ const char wtmpxfile[] = "/var/log/wtmp";
+ time_t newtime;
++ struct timeval tv;
+
+ memset(&before, 0, sizeof before);
+ memset(&after, 0, sizeof after);
+@@ -164,7 +151,9 @@ settime(char *op)
+ if ((newtime = timeop(op)) == (time_t)-1)
+ badconv();
+ gettimeofday(&before.ut_tv, NULL);
+- if (stime(&newtime) < 0) {
++ tv.tv_sec = newtime;
++ tv.tv_usec = 0;
++ if (settimeofday(&tv, NULL) < 0) {
+ fprintf(stderr, "%s: no permission\n", progname);
+ exit(1);
+ }
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
index 80d2232221a..26da82f5c8b 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
@@ -24,6 +24,7 @@ S="${WORKDIR}/heirloom-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-major.patch
"${FILESDIR}"/${P}-glibc-2.30.patch
+ "${FILESDIR}"/${P}-glibc-2.31.patch
)
# slightly broken
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
@ 2020-03-26 17:46 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2020-03-26 17:46 UTC (permalink / raw
To: gentoo-commits
commit: f13ea5002842f34785a6a9d4938d6b3001d3002b
Author: Stephan Hartmann <stha09 <AT> googlemail <DOT> com>
AuthorDate: Thu Mar 26 15:34:52 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 26 17:46:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13ea500
sys-apps/heirloom-tools: fix some QA issues, EAPI 7
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Stephan Hartmann <stha09 <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/15127
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/heirloom-tools-070715-makefile.patch | 16 ++++++++++
...5-r2.ebuild => heirloom-tools-070715-r3.ebuild} | 35 ++++++++++++++++++----
2 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
new file mode 100644
index 00000000000..a4ce2970589
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.mk b/Makefile.mk
+index 28a20f1..1cf36b8 100644
+--- a/Makefile.mk
++++ b/Makefile.mk
+@@ -73,11 +73,6 @@ links:
+ sh build/crossln $(ROOT)$(SV3BIN)/more $(ROOT)$(UCBBIN)/more $(ROOT)
+ rm -f $(ROOT)$(UCBBIN)/catman
+ sh build/crossln $(ROOT)$(DEFSBIN)/catman $(ROOT)$(UCBBIN)/catman $(ROOT)
+- for i in sccs prt; \
+- do \
+- rm -f $(ROOT)$(UCBBIN)/$$i; \
+- sh build/crossln $(ROOT)$(CCSBIN)/$$i $(ROOT)$(UCBBIN)/$$i $(ROOT); \
+- done
+ rm -f $(ROOT)$(SV3BIN)/awk
+ sh build/crossln $(ROOT)$(DEFBIN)/oawk $(ROOT)$(SV3BIN)/awk $(ROOT)
+ rm -f $(ROOT)$(S42BIN)/awk
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
similarity index 57%
rename from sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild
rename to sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index f45cc2e1c88..34e2e70756e 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r2.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic toolchain-funcs
DESCRIPTION="Heirloom toolchest - original Unix tools"
@@ -15,8 +15,8 @@ KEYWORDS="~amd64 ~x86"
RDEPEND="
sys-libs/zlib
"
-DEPEND="
- ${RDEPEND}
+DEPEND=${RDEPEND}
+BDEPEND="
sys-apps/ed
sys-devel/bc
virtual/pkgconfig
@@ -24,6 +24,7 @@ DEPEND="
S="${WORKDIR}/heirloom-${PV}"
PATCHES=(
"${FILESDIR}"/${P}-major.patch
+ "${FILESDIR}"/${P}-makefile.patch
"${FILESDIR}"/${P}-glibc-2.30.patch
"${FILESDIR}"/${P}-glibc-2.31.patch
"${FILESDIR}"/${P}-gcc-10.patch
@@ -43,17 +44,39 @@ src_compile() {
CPPFLAGS="${CPPFLAGS}" \
LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
LDFLAGS="${LDFLAGS}" \
+ ROOT="${ED}" \
+ DEFBIN="/usr/bin/${PN}/5bin" \
+ DEFSBIN="/usr/bin/${PN}/5bin" \
+ SV3BIN="/usr/bin/${PN}/5bin" \
+ S42BIN="/usr/bin/${PN}/5bin/s42" \
+ SUSBIN="/usr/bin/${PN}/5bin/posix" \
+ UCBBIN="/usr/bin/${PN}/ucb" \
+ CCSBIN="/usr/bin/${PN}/ccs/bin" \
+ SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
+ DEFLIB="/usr/bin/${PN}/5lib" \
LIBZ=-lz
}
src_install() {
# we don't want to strip here, so use "true" as noop
- emake STRIP="true" ROOT="${D}" -j1 install
+ emake -j1 \
+ STRIP="true" \
+ ROOT="${ED}" \
+ DEFBIN="/usr/bin/${PN}/5bin" \
+ DEFSBIN="/usr/bin/${PN}/5bin" \
+ SV3BIN="/usr/bin/${PN}/5bin" \
+ S42BIN="/usr/bin/${PN}/5bin/s42" \
+ SUSBIN="/usr/bin/${PN}/5bin/posix" \
+ UCBBIN="/usr/bin/${PN}/ucb" \
+ CCSBIN="/usr/bin/${PN}/ccs/bin" \
+ SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
+ DEFLIB="/usr/bin/${PN}/5lib" \
+ install
}
pkg_postinst() {
- elog "You may want to add /usr/5bin or /usr/ucb to \$PATH"
- elog "to enable using the apps of heirloom toolchest by default."
+ elog "You may want to adjust your \$PATH, to enable "
+ elog "using the apps of heirloom toolchest by default."
elog "Man pages are installed in /usr/share/man/5man/"
elog "You may need to set \$MANPATH to access them."
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/
@ 2020-09-12 15:13 Stephan Hartmann
0 siblings, 0 replies; 4+ messages in thread
From: Stephan Hartmann @ 2020-09-12 15:13 UTC (permalink / raw
To: gentoo-commits
commit: ab8cd0d32bfb1548eefa27b8567b27e84a1a31d3
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 12 15:11:39 2020 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Sat Sep 12 15:12:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab8cd0d3
sys-apps/heirloom-tools: fix building with clang
Closes: https://bugs.gentoo.org/741819
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
.../heirloom-tools/files/heirloom-tools-070715-clang.patch | 13 +++++++++++++
sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
new file mode 100644
index 00000000000..54831eef080
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/nawk/main.c b/nawk/main.c
+index 9666638..b50b283 100644
+--- a/nawk/main.c
++++ b/nawk/main.c
+@@ -66,7 +66,7 @@ int mb_cur_max; /* MB_CUR_MAX, for acceleration */
+
+ extern const char badopen[];
+
+-int main(int argc, unsigned char *argv[], unsigned char *envp[])
++int main(int argc, char *argv[], char *envp[])
+ {
+ unsigned char *fs = NULL;
+ char label[MAXLABEL+1]; /* Space for the catalogue label */
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index 34e2e70756e..2c6c2ef1876 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
"${FILESDIR}"/${P}-glibc-2.30.patch
"${FILESDIR}"/${P}-glibc-2.31.patch
"${FILESDIR}"/${P}-gcc-10.patch
+ "${FILESDIR}"/${P}-clang.patch
)
# slightly broken
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-12 15:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-26 9:22 [gentoo-commits] repo/gentoo:master commit in: sys-apps/heirloom-tools/files/, sys-apps/heirloom-tools/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-09-12 15:13 Stephan Hartmann
2020-03-26 17:46 Joonas Niilola
2020-03-10 19:35 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox