From 7077ce777964f931008c8e02979f19a609770110 Mon Sep 17 00:00:00 2001 From: Ali Mohammad Pur Date: Mon, 16 May 2022 19:21:55 +0430 Subject: [PATCH] Ports: Update oksh's patches to use git patches --- ...Add-some-compat-macros-for-serenity.patch} | 12 ++++++++ ...pconfig.patch => 0002-Add-pconfig.h.patch} | 16 ++++++++-- ...e_flock.patch => 0003-Disable-flock.patch} | 13 +++++++++ ...rlimit.patch => 0004-Disable-rlimit.patch} | 13 +++++++++ ...05-Don-t-emit-the-default-pconfig.h.patch} | 12 ++++++++ Ports/oksh/patches/ReadMe.md | 29 +++++++++++++++++++ 6 files changed, 93 insertions(+), 2 deletions(-) rename Ports/oksh/patches/{add_compat_macros.patch => 0001-Add-some-compat-macros-for-serenity.patch} (72%) rename Ports/oksh/patches/{add_pconfig.patch => 0002-Add-pconfig.h.patch} (71%) rename Ports/oksh/patches/{disable_flock.patch => 0003-Disable-flock.patch} (61%) rename Ports/oksh/patches/{disable_rlimit.patch => 0004-Disable-rlimit.patch} (85%) rename Ports/oksh/patches/{no_default_pconfig.patch => 0005-Don-t-emit-the-default-pconfig.h.patch} (79%) create mode 100644 Ports/oksh/patches/ReadMe.md diff --git a/Ports/oksh/patches/add_compat_macros.patch b/Ports/oksh/patches/0001-Add-some-compat-macros-for-serenity.patch similarity index 72% rename from Ports/oksh/patches/add_compat_macros.patch rename to Ports/oksh/patches/0001-Add-some-compat-macros-for-serenity.patch index f50285fdbb..fa93c69ef7 100644 --- a/Ports/oksh/patches/add_compat_macros.patch +++ b/Ports/oksh/patches/0001-Add-some-compat-macros-for-serenity.patch @@ -1,3 +1,12 @@ +From bfc602df4e7eedd1cdc54dc5664ff1ff453fef1b Mon Sep 17 00:00:00 2001 +From: Daniel Bertalan +Date: Fri, 5 Nov 2021 22:32:10 +0100 +Subject: [PATCH 1/5] Add some compat macros for serenity + +--- + portable.h | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + diff --git a/portable.h b/portable.h index 5c86edd..6ccf7f6 100644 --- a/portable.h @@ -27,3 +36,6 @@ index 5c86edd..6ccf7f6 100644 #ifndef HAVE_SETRESGID #define setresgid(x, y, z) setgid(x); setegid(y); setgid(z) #endif /* !HAVE_SETRESGID */ +-- +2.36.1 + diff --git a/Ports/oksh/patches/add_pconfig.patch b/Ports/oksh/patches/0002-Add-pconfig.h.patch similarity index 71% rename from Ports/oksh/patches/add_pconfig.patch rename to Ports/oksh/patches/0002-Add-pconfig.h.patch index c198d16b3f..75348ac8ca 100644 --- a/Ports/oksh/patches/add_pconfig.patch +++ b/Ports/oksh/patches/0002-Add-pconfig.h.patch @@ -1,6 +1,16 @@ +From 83b82de3eed21eda75179417c1c234b5a56a52d6 Mon Sep 17 00:00:00 2001 +From: Daniel Bertalan +Date: Fri, 5 Nov 2021 22:32:10 +0100 +Subject: [PATCH 2/5] Add pconfig.h + +--- + pconfig.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + create mode 100644 pconfig.h + diff --git a/pconfig.h b/pconfig.h new file mode 100644 -index 0000000..2dd229b +index 0000000..3274014 --- /dev/null +++ b/pconfig.h @@ -0,0 +1,30 @@ @@ -34,4 +44,6 @@ index 0000000..2dd229b +#define HAVE_SIGNAME +#define HAVE_TIMERADD +#define HAVE_TIMERCLEAR -+#define HAVE_TIMERSUB +-- +2.36.1 + diff --git a/Ports/oksh/patches/disable_flock.patch b/Ports/oksh/patches/0003-Disable-flock.patch similarity index 61% rename from Ports/oksh/patches/disable_flock.patch rename to Ports/oksh/patches/0003-Disable-flock.patch index 814919b3b4..71ec82d673 100644 --- a/Ports/oksh/patches/disable_flock.patch +++ b/Ports/oksh/patches/0003-Disable-flock.patch @@ -1,3 +1,13 @@ +From eed1007382d7ce6593ec55512bb21ed69343e9cc Mon Sep 17 00:00:00 2001 +From: Manuel Palenzuela +Date: Mon, 5 Apr 2021 22:58:01 +0200 +Subject: [PATCH 3/5] Disable flock + +Serenity does not support flock. +--- + history.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + diff --git a/history.c b/history.c index 59876da..b03cc7a 100644 --- a/history.c @@ -26,3 +36,6 @@ index 59876da..b03cc7a 100644 } /* +-- +2.36.1 + diff --git a/Ports/oksh/patches/disable_rlimit.patch b/Ports/oksh/patches/0004-Disable-rlimit.patch similarity index 85% rename from Ports/oksh/patches/disable_rlimit.patch rename to Ports/oksh/patches/0004-Disable-rlimit.patch index bc8aa79ef4..ce480cbdc0 100644 --- a/Ports/oksh/patches/disable_rlimit.patch +++ b/Ports/oksh/patches/0004-Disable-rlimit.patch @@ -1,3 +1,13 @@ +From 072da9d917bd529cf55973de264c1d288cbf7138 Mon Sep 17 00:00:00 2001 +From: Manuel Palenzuela +Date: Mon, 5 Apr 2021 22:58:01 +0200 +Subject: [PATCH 4/5] Disable rlimit + +Serenity does not have rlimit support. +--- + c_ulimit.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + diff --git a/c_ulimit.c b/c_ulimit.c index 65e0cca..587f08a 100644 --- a/c_ulimit.c @@ -68,3 +78,6 @@ index 65e0cca..587f08a 100644 - } + }*/ } +-- +2.36.1 + diff --git a/Ports/oksh/patches/no_default_pconfig.patch b/Ports/oksh/patches/0005-Don-t-emit-the-default-pconfig.h.patch similarity index 79% rename from Ports/oksh/patches/no_default_pconfig.patch rename to Ports/oksh/patches/0005-Don-t-emit-the-default-pconfig.h.patch index 1dedac841a..73739ba7d1 100644 --- a/Ports/oksh/patches/no_default_pconfig.patch +++ b/Ports/oksh/patches/0005-Don-t-emit-the-default-pconfig.h.patch @@ -1,3 +1,12 @@ +From 126df60a9ec402c3a87710500d44b647615c0d8d Mon Sep 17 00:00:00 2001 +From: Daniel Bertalan +Date: Fri, 5 Nov 2021 22:32:10 +0100 +Subject: [PATCH 5/5] Don't emit the default pconfig.h + +--- + configure | 35 ----------------------------------- + 1 file changed, 35 deletions(-) + diff --git a/configure b/configure index 710dc3b..0625338 100755 --- a/configure @@ -45,3 +54,6 @@ index 710dc3b..0625338 100755 Makefile exit 0 +-- +2.36.1 + diff --git a/Ports/oksh/patches/ReadMe.md b/Ports/oksh/patches/ReadMe.md new file mode 100644 index 0000000000..0791a55bd4 --- /dev/null +++ b/Ports/oksh/patches/ReadMe.md @@ -0,0 +1,29 @@ +# Patches for oksh on SerenityOS + +## `0001-Add-some-compat-macros-for-serenity.patch` + +Add some compat macros for serenity + + +## `0002-Add-pconfig.h.patch` + +Add pconfig.h + + +## `0003-Disable-flock.patch` + +Disable flock + +Serenity does not support flock. + +## `0004-Disable-rlimit.patch` + +Disable rlimit + +Serenity does not have rlimit support. + +## `0005-Don-t-emit-the-default-pconfig.h.patch` + +Don't emit the default pconfig.h + +