Skip to content

Commit

Permalink
Add moreutils package to mariner (#7017)
Browse files Browse the repository at this point in the history
  • Loading branch information
sindhu-karri authored and Henry Li committed Jan 10, 2024
1 parent d9ee114 commit 2708716
Show file tree
Hide file tree
Showing 7 changed files with 468 additions and 1 deletion.
2 changes: 1 addition & 1 deletion SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions SPECS/LICENSES-AND-NOTICES/data/licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -907,6 +907,7 @@
"mod_security_crs",
"mod_wsgi",
"mokutil",
"moreutils",
"mpage",
"mrtg",
"mstflint",
Expand Down
14 changes: 14 additions & 0 deletions SPECS/moreutils/0001-dont-overwrite-docbooxsl-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- Makefile 2019-01-09 10:14:34.000000000 -0500
+++ Makefile 2019-08-27 09:36:49.465727725 -0400
@@ -5,11 +5,7 @@
INSTALL_BIN?=install -s
PREFIX?=/usr

-ifneq (,$(findstring CYGWIN,$(shell uname)))
DOCBOOKXSL?=/usr/share/sgml/docbook/xsl-stylesheets
-else
- DOCBOOKXSL?=/usr/share/xml/docbook/stylesheet/docbook-xsl
-endif

DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 $(DOCBOOKXSL)/manpages/docbook.xsl

43 changes: 43 additions & 0 deletions SPECS/moreutils/0002-Use-pclose-instead-of-fclose.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 40881e1cedb564b643b2b0cd0c5d21fe3327082d Mon Sep 17 00:00:00 2001
From: Mikel Olasagasti Uranga <[email protected]>
Date: Tue, 17 May 2022 12:52:08 +0200
Subject: [PATCH] Use pclose() instead of fclose()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The return value from popen() is a normal standard I/O stream in all
respects save that it must be closed with pclose() rather than
fclose(3).

Solves the following warning when compiled with -Wmismatched-dealloc:

errno.c: In function ‘search_all’:
errno.c:126:5: warning: ‘fclose’ called on pointer returned from a
mismatched allocation function
[-Wmismatched-dealloc]
126 | fclose(f);
| ^~~~~~~~~
errno.c:113:9: note: returned from ‘popen’
113 | f = popen("locale -a", "r");
| ^~~~~~~~~~~~~~~~~~~~~~~
---
errno.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/errno.c b/errno.c
index d2f68a1..fcf3dee 100644
--- a/errno.c
+++ b/errno.c
@@ -123,7 +123,7 @@ search_all(int num_words, char **words)
search(num_words, words);
}

- fclose(f);
+ pclose(f);
}


--
2.36.1

5 changes: 5 additions & 0 deletions SPECS/moreutils/moreutils.signatures.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"Signatures": {
"moreutils_0.67.orig.tar.gz": "03872f42c22943b21c62f711b693c422a4b8df9d1b8b2872ef9a34bd5d13ad10"
}
}
Loading

0 comments on commit 2708716

Please sign in to comment.