RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 18:57:35 +00:00
Code Issues Activity Actions

Ports/cpio: Update to version 2.14

Browse source 
We can also remove a patch that is no longer needed.
This commit is contained in:
Liav A 2023-08-12 02:58:46 +03:00 • committed by Tim Schumacher
parent 0787241cdc
commit 184056cf6a
4 changed files with 3 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -44,7 +44,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`composer`](composer/) | Composer | 2.4.3 | https://getcomposer.org/ | | [`composer`](composer/) | Composer | 2.4.3 | https://getcomposer.org/ |
| [`coreutils`](coreutils/) | GNU core utilities | 9.1 | https://www.gnu.org/software/coreutils/ | | [`coreutils`](coreutils/) | GNU core utilities | 9.1 | https://www.gnu.org/software/coreutils/ |
| [`cowsay`](cowsay/) | cowsay | 3.04 | https://github.com/tnalpgge/rank-amateur-cowsay | | [`cowsay`](cowsay/) | cowsay | 3.04 | https://github.com/tnalpgge/rank-amateur-cowsay |
| [`cpio`](cpio/) | GNU cpio archive utility | 2.13 | https://www.gnu.org/software/cpio/ | | [`cpio`](cpio/) | GNU cpio archive utility | 2.14 | https://www.gnu.org/software/cpio/ |
| [`curl`](curl/) | curl | 8.2.0 | https://curl.se/ | | [`curl`](curl/) | curl | 8.2.0 | https://curl.se/ |
| [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash | | [`dash`](dash/) | DASH | 0.5.10.2 | http://gondor.apana.org.au/~herbert/dash |
| [`deutex`](deutex/) | DeuTex | 5.2.2 | https://github.com/Doom-Utils/deutex | | [`deutex`](deutex/) | DeuTex | 5.2.2 | https://github.com/Doom-Utils/deutex |

4
Ports/cpio/package.sh
View file

@ -1,9 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh #!/usr/bin/env -S bash ../.port_include.sh
port='cpio' port='cpio'
version='2.13' version='2.14'
useconfigure='true' useconfigure='true'
use_fresh_config_sub='true' use_fresh_config_sub='true'
config_sub_paths=('build-aux/config.sub') config_sub_paths=('build-aux/config.sub')
files=( files=(
"https://ftpmirror.gnu.org/gnu/cpio/cpio-${version}.tar.gz e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88" "https://ftpmirror.gnu.org/gnu/cpio/cpio-${version}.tar.gz 145a340fd9d55f0b84779a44a12d5f79d77c99663967f8cfa168d7905ca52454"
) )

34
Ports/cpio/patches/0001-Use-global-program_name-variable-from-gnu-dir.patch
View file

@ -1,34 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Sat, 25 Jun 2022 05:45:29 +0300
Subject: [PATCH] Use global program_name variable from gnu dir
Without this patch being applied, there would be a conflict between the
variables between the 2 locations, so it will not compile otherwise.
---
src/global.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/global.c b/src/global.c
index fb3abe9..9ea63aa 100644
--- a/src/global.c
+++ b/src/global.c
@@ -20,6 +20,7 @@
#include <system.h>
#include <sys/types.h>
+#include "gnu/progname.h"
#include "cpiohdr.h"
#include "dstring.h"
#include "extern.h"
@@ -184,9 +185,6 @@ unsigned int warn_option = 0;
/* Extract to standard output? */
bool to_stdout_option = false;
-/* The name this program was run with. */
-char *program_name;
-
/* A pointer to either lstat or stat, depending on whether
dereferencing of symlinks is done for input files. */
int (*xstat) ();

8
Ports/cpio/patches/ReadMe.md
View file

@ -1,8 +0,0 @@
# Patches for cpio on SerenityOS
## `0001-Use-global-program_name-variable-from-gnu-dir.patch`
Use global program_name variable from gnu dir
Without this patch being applied, there would be a conflict between the
variables between the 2 locations, so it will not compile otherwise.