From 0a3feeaba4dbc58966dccdbbfcd7fb14deef0831 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Jun 2024 00:09:44 +0100 Subject: gentoo auto-resync : 16:06:2024 - 00:09:44 --- net-mail/safecat/Manifest | 5 +- .../files/safecat-1.13-dup-obj-makefile.patch | 39 +++++++++ net-mail/safecat/files/safecat-1.13-include.patch | 97 ++++++++++++++++++++++ net-mail/safecat/safecat-1.13-r1.ebuild | 51 ++++++++++++ net-mail/safecat/safecat-1.13.ebuild | 7 +- 5 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 net-mail/safecat/files/safecat-1.13-dup-obj-makefile.patch create mode 100644 net-mail/safecat/files/safecat-1.13-include.patch create mode 100644 net-mail/safecat/safecat-1.13-r1.ebuild (limited to 'net-mail/safecat') diff --git a/net-mail/safecat/Manifest b/net-mail/safecat/Manifest index a1ce850034fe..f4b4dfff6ef1 100644 --- a/net-mail/safecat/Manifest +++ b/net-mail/safecat/Manifest @@ -1,6 +1,9 @@ AUX safecat-1.11-gentoo.patch 355 BLAKE2B e294d2d2f0a9d47a0fab6a831dedeb4e96ec6f76da2641e5e2c1989b14a3618127e475e3042d7a98bb57d6f1b1f738427e1cbb1daf34b558a059052da5c68a41 SHA512 6c2f94a5ad25c20639986e8ac1865242a32c716f117f4b5077ffe802e67e1798a5b9b76b30b5551234d34b14ef6139f070b6496b9e029407000555917f6d36a9 +AUX safecat-1.13-dup-obj-makefile.patch 1804 BLAKE2B b7800003ce95f3ebb76964ee73e0e9c39be3d98d3dafd46a6cd8e1cf0548389ee1077ee4a910d3921d4019b113dfd555e5984a9997cabe0ac0247e1ff29795b1 SHA512 4639a94fa7032996af80c9a6c4eebe824ccb914fa6a8c250a9ac14bc17b9abaac92b2e9e6888f01f178e033bb90364878233ca79e324afc19b283cf6fcc22b5a AUX safecat-1.13-head-tail-POSIX.patch 1183 BLAKE2B 846a9f99b40417524d62adf0b0fde934e348d3129a7932625f0355f5a2da2ee8d8f71d3c3ce4095a58c85c1455dde95dd4c60e85602a8dac5fd8eacfd6d2e69a SHA512 717666c93dac34af2a20aacfd03c59324027cd797504da72b2f01210f2d127b815890f87192427b7684cd3c72bc3a34b289608266927e9e31d53af503d1f5de9 +AUX safecat-1.13-include.patch 3173 BLAKE2B 9dbe53e62a3daa8da5460337ef1a56a42f9d829f70cb34445a14ee2e7f5efea182881143ab5c6891c0dace8ffce50c25071286e44f12faccf9153fdce38eae32 SHA512 8336b875df38470a5fe41fb7fb51c67ac35c0ced8af857b1cd023ee4cfbe95e5fc35b49480fe46e0ae0ca81d754713b58495b09f11baeaf9c3e284ab09381157 AUX safecat-1.13-makefile.patch 562 BLAKE2B b80bc02df3244a922d831d10417c2e973778ac737d4a52ecfbdfebcfd51c1571c2dc8229bfd4e35faa7c23d2f58c2f788200977a8c2b5fe93f67de79325846fa SHA512 d48a33ce9e68ce8a27d77968040a146b975986b85e3ef534bde6a015b8179fc563f341be1ab7e74afe3e260ad267c99e18aab027d2f63125f76c071e15867050 DIST safecat-1.13.tar.gz 33953 BLAKE2B d8b4132b530f975fb5629bc591e3b332cd6c8c29684a8848e76b7a660a6ea683adc8b89b92fbe37cf5c1236bca597d9ec6e44bfb5b35076a98d6590f355a40ae SHA512 e6f7401b55a61f70715b3d222c8286c0125c5e7b3b132e5e8d3c8573a6c45dba75b29a459c7e93d7c0760300f0a62635d8ea4eacde9b0b1ff7637b3f6c63e210 -EBUILD safecat-1.13.ebuild 1099 BLAKE2B a942608e3ec6a8e0d033cbb594cd0f00d77d021a1af449dfc8a32c4221fe83f2df4b883eeb98d9ac61dd97e229504a38fa8fe9fcf237e20fd4a64c1c0f850829 SHA512 5e8b96db8c2aa068c7406bbf47357086944ac4c57365902663e97afc84f3176f8bb17e2cde11181acbba03ad564c3806195cf4775908de5446d14b96baad67c4 +EBUILD safecat-1.13-r1.ebuild 1195 BLAKE2B 2a4ff3115bc3a856cbcec9d9c40b940a6b1e18d3d2cbafc534c6759b84354621b84d4673a511612422ee97245c3b4dda917b1f351d155e6bbeb1516826ae9ace SHA512 0f77f8cc2b0b593e9c16de86d19d0d286f9a8e0ed983e488142c5fac0269c47689077ec0efd404d8468dfb9fddf4888616b8744169c5fa4893bfb91c856cda2a +EBUILD safecat-1.13.ebuild 1109 BLAKE2B 23ec534b2f05e2e86500e391c5532c68552aae696ce3601211e982af3696878e1cb9405d5ec5f847a6c05c28c4f189a894ee07542dcd7e01b863a69635706bda SHA512 1a1f654de2b3a2d6debc25e9d7b53219c0602bf5dd4ba89c1f3c005b0f98d646c4f97c6aea8022ca53370118b37d9500c8ab03c113344dc2d08efe974e78222a MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb diff --git a/net-mail/safecat/files/safecat-1.13-dup-obj-makefile.patch b/net-mail/safecat/files/safecat-1.13-dup-obj-makefile.patch new file mode 100644 index 000000000000..b276bb7ff709 --- /dev/null +++ b/net-mail/safecat/files/safecat-1.13-dup-obj-makefile.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/740798 +https://cgit.freebsd.org/ports/plain/sysutils/safecat/files/patch-Makefile + + sysutils/safecat: avoid duplicating object files in library + + Previously byte_copy.o and str_len.o were added to str.a, and then + specified as objects on the safecat link command line along with str. + When linking with lld this produces duplicate symbol errors like: + + /usr/bin/ld: error: duplicate symbol: byte_copy + >>> defined at byte_copy.c + >>> byte_copy.o:(byte_copy) in archive str.a + >>> defined at byte_copy.c + >>> byte_copy.o(.text+0x0) + + As these symbols are provided by str.a just avoid listing the object + files as well. +--- safecat-1.13/Makefile.orig 2004-08-16 20:50:09.000000000 -0400 ++++ safecat-1.13/Makefile 2017-11-23 16:49:00.505811000 -0500 +@@ -219,14 +219,14 @@ + + safecat: \ + load safecat.o getln.a str.a stralloc.a strerr.a substdio.a alloc.o \ +-alloc_re.o byte_copy.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ +-hostname.o sig.o stat_dir.o str_diffn.o str_len.o substdio_copy.o \ ++alloc_re.o byte_cr.o envread.o error.o error_str.o fmt_uint64.o \ ++hostname.o sig.o stat_dir.o str_diffn.o substdio_copy.o \ + substdi.o substdio.o taia_fmtfrac.o taia_now.o taia_tai.o tempfile.o \ + writefile.o +- ./load safecat getln.a str.a stralloc.a strerr.a substdio.a \ +- alloc.o alloc_re.o byte_copy.o byte_cr.o envread.o error.o \ ++ ./load safecat getln.a stralloc.a strerr.a substdio.a str.a \ ++ alloc.o alloc_re.o byte_cr.o envread.o error.o \ + error_str.o fmt_uint64.o hostname.o sig.o stat_dir.o str_diffn.o \ +- str_len.o substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ ++ substdi.o substdio.o substdio_copy.o taia_fmtfrac.o \ + taia_now.o taia_tai.o tempfile.o writefile.o + + safecat.0: \ diff --git a/net-mail/safecat/files/safecat-1.13-include.patch b/net-mail/safecat/files/safecat-1.13-include.patch new file mode 100644 index 000000000000..f59f2a45d230 --- /dev/null +++ b/net-mail/safecat/files/safecat-1.13-include.patch @@ -0,0 +1,97 @@ +diff '--color=auto' -Nuar safecat-1.13.orig/install.c safecat-1.13/install.c +--- safecat-1.13.orig/install.c 2000-02-28 20:10:12.000000000 -0800 ++++ safecat-1.13/install.c 2024-06-15 14:40:24.142699634 -0700 +@@ -1,3 +1,10 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #include "substdio.h" + #include "strerr.h" + #include "error.h" +diff '--color=auto' -Nuar safecat-1.13.orig/instcheck.c safecat-1.13/instcheck.c +--- safecat-1.13.orig/instcheck.c 2000-02-28 20:10:12.000000000 -0800 ++++ safecat-1.13/instcheck.c 2024-06-15 14:40:27.502696776 -0700 +@@ -1,5 +1,12 @@ + #include + #include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #include "strerr.h" + #include "error.h" + #include "readwrite.h" +diff '--color=auto' -Nuar safecat-1.13.orig/safecat.c safecat-1.13/safecat.c +--- safecat-1.13.orig/safecat.c 2004-08-16 18:14:34.000000000 -0700 ++++ safecat-1.13/safecat.c 2024-06-15 14:40:17.246038832 -0700 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + /* Support for large files (on Linux systems, if the appropriate +--- safecat-1.13.orig/alloc.c 2000-02-28 20:10:12.000000000 -0800 ++++ safecat-1.13/alloc.c 2024-06-15 14:41:26.985979033 -0700 +@@ -1,7 +1,6 @@ ++#include + #include "alloc.h" + #include "error.h" +-extern char *malloc(); +-extern void free(); + + #define ALIGNMENT 16 /* XXX: assuming that this alignment is enough */ + #define SPACE 4096 /* must be multiple of ALIGNMENT */ +@@ -18,7 +17,7 @@ + char *x; + n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */ + if (n <= avail) { avail -= n; return space + avail; } +- x = malloc(n); ++ x = (char*)malloc(n); + if (!x) errno = error_nomem; + return x; + } +--- safecat-1.13.orig/readwrite.h 2024-06-15 14:46:41.472362482 -0700 ++++ safecat-1.13/readwrite.h 2024-06-15 14:46:21.755714187 -0700 +@@ -1,7 +1,8 @@ + #ifndef READWRITE_H + #define READWRITE_H + +-extern int read(); +-extern int write(); ++#include ++//extern int read(); ++//extern int write(); + + #endif +--- safecat-1.13/stralloc.h 2000-02-28 20:10:12.000000000 -0800 ++++ safecat-1.13/stralloc.h 2024-06-15 14:55:46.678492988 -0700 +@@ -7,14 +7,14 @@ + + extern int stralloc_ready(); + extern int stralloc_readyplus(); +-extern int stralloc_copy(); +-extern int stralloc_cat(); ++extern int stralloc_copy(stralloc *sato, stralloc *safrom); ++extern int stralloc_cat(stralloc *sato, stralloc *safrom); + extern int stralloc_copys(); +-extern int stralloc_cats(); +-extern int stralloc_copyb(); +-extern int stralloc_catb(); ++extern int stralloc_cats(stralloc *sa, char *s); ++extern int stralloc_copyb(stralloc *sa, char *s, unsigned int n); ++extern int stralloc_catb(stralloc *sa, char *s, unsigned int n); + extern int stralloc_append(); /* beware: this takes a pointer to 1 char */ +-extern int stralloc_starts(); ++extern int stralloc_starts(stralloc *sa, char *s); + + #define stralloc_0(sa) stralloc_append(sa,"") + diff --git a/net-mail/safecat/safecat-1.13-r1.ebuild b/net-mail/safecat/safecat-1.13-r1.ebuild new file mode 100644 index 000000000000..5ceefb07bb67 --- /dev/null +++ b/net-mail/safecat/safecat-1.13-r1.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Safecat implements qmail's maildir algorithm, safely copying standard input" +HOMEPAGE="http://www.jeenyus.net/linux/software/safecat.html" +SRC_URI="http://www.jeenyus.net/linux/software/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86" +RESTRICT="test" + +DEPEND="sys-apps/groff" + +PATCHES=( + # applying maildir-patch + "${FILESDIR}"/safecat-1.11-gentoo.patch + # Fix parallel make errors + "${FILESDIR}"/${P}-makefile.patch + # Fix POSIX head/tail syntax + "${FILESDIR}"/${P}-head-tail-POSIX.patch + # Fix dup objects + "${FILESDIR}"/${P}-dup-obj-makefile.patch + # Headers + "${FILESDIR}"/${P}-include.patch +) + +src_prepare() { + default + + sed -ni '/man\|doc/!p' hier.c || die +} + +src_configure() { + echo "/usr" > conf-root || die + echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die + echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die + echo "$(tc-getAR)" > conf-ar || die +} + +src_install() { + # ${D} is not valid in src_configure + echo "${D}/usr" > conf-root || die + emake setup check + einstalldocs + doman maildir.1 safecat.1 +} diff --git a/net-mail/safecat/safecat-1.13.ebuild b/net-mail/safecat/safecat-1.13.ebuild index 7dbf9cc60c48..f8fa413f269e 100644 --- a/net-mail/safecat/safecat-1.13.ebuild +++ b/net-mail/safecat/safecat-1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,11 +12,9 @@ SRC_URI="http://www.jeenyus.net/linux/software/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~hppa ~mips ppc ~sparc x86" -IUSE="" RESTRICT="test" DEPEND="sys-apps/groff" -RDEPEND="" PATCHES=( # applying maildir-patch @@ -37,12 +35,13 @@ src_prepare() { } src_configure() { - echo "${D}/usr" > conf-root || die + echo "/usr" > conf-root || die echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die } src_install() { + echo "${D}/usr" > conf-root || die emake setup check einstalldocs doman maildir.1 safecat.1 -- cgit v1.2.3