webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 02:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pmueller/temp-c163-development' into next

Browse Source
This commit is contained in:
Arne Fitzenreiter
2022-01-02 10:13:14 +00:00
parent 050772b715 9946b6f0c2
commit da4d9c4774
250 changed files with 3304 additions and 65121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/initscripts/system/sysctl
View File

@@ -26,9 +26,8 @@ case "${1}" in
fi
arch=`uname -m`
case "${arch}" in
i?86 ) arch="i586";
;;
armv*) arch="armv6l":
armv*)
arch="armv6l":
;;
esac
if [ -f "/etc/sysctl-${arch}.conf" ]; then

3
src/installer/install-bootloader
View File

@@ -104,9 +104,6 @@ function grub_install() {
aarch64)
arches="arm64-efi"
;;
i?86)
arches="i386-pc"
;;
x86_64)
arches="i386-pc x86_64-efi"
;;

9
src/pakfire/lib/functions.pl
View File

@@ -977,10 +977,6 @@ sub get_arch() {
# We only support armv6l for 32 bit arm
if ($machine =~ m/armv[67]/) {
return "armv6l";
# We only support i586 for 32 bit x86
} elsif ($machine =~ m/i[0-9]86/) {
return "i586";
}
return $machine;
@@ -1015,10 +1011,7 @@ sub make_version() {
}
# Append architecture
my $arch = &get_arch();
if ($arch ne "i586") {
$version .= "-${arch}";
}
$version .= "-" . &get_arch();
return $version;
}

80
src/patches/bash/bash51-001
View File

@@ -1,80 +0,0 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-001
Bug-Reported-by: Fazal Majid <fazal@majid.org>
Bug-Reference-ID: <DEAB7D2C-C626-450C-B2E5-281AFF2D26D4@majid.org>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00000.html
Bug-Description:
There is a missing dependency on a constructed file, which can cause highly
parellel builds to fail.
Patch (apply with `patch -p0'):
*** ../bash-5.1-patched/Makefile.in 2020-12-04 09:51:19.000000000 -0500
--- Makefile.in 2020-12-16 11:28:36.000000000 -0500
***************
*** 1316,1319 ****
--- 1316,1320 ----
bashline.o: pcomplete.h ${BASHINCDIR}/chartypes.h input.h
bashline.o: ${BASHINCDIR}/shmbutil.h ${BASHINCDIR}/shmbchar.h
+ bashline.o: ${DEFDIR}/builtext.h
bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h
***************
*** 1436,1439 ****
--- 1437,1441 ----
builtins/evalstring.o: jobs.h builtins.h flags.h input.h execute_cmd.h
builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h pathnames.h
+ builtins/evalstring.o: ${DEFDIR}/builtext.h
builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h
builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h xmalloc.h error.h
*** ../bash-5.1-patched/builtins/Makefile.in 2019-07-25 08:03:45.000000000 -0400
--- builtins/Makefile.in 2020-12-16 11:29:29.000000000 -0500
***************
*** 362,366 ****
evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h
evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h
! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h
#evalstring.o: $(topdir)/y.tab.h
getopt.o: ../config.h $(BASHINCDIR)/memalloc.h
--- 362,366 ----
evalstring.o: $(topdir)/flags.h $(topdir)/input.h $(topdir)/execute_cmd.h
evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h
! evalstring.o: $(topdir)/trap.h $(topdir)/redir.h ../pathnames.h ./builtext.h
#evalstring.o: $(topdir)/y.tab.h
getopt.o: ../config.h $(BASHINCDIR)/memalloc.h
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 1,5 ****
/* patchlevel.h -- current bash patch level */
! /* Copyright (C) 2001-2016 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
--- 1,5 ----
/* patchlevel.h -- current bash patch level */
! /* Copyright (C) 2001-2020 Free Software Foundation, Inc.
This file is part of GNU Bash, the Bourne Again SHell.
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 0
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 1
#endif /* _PATCHLEVEL_H_ */

57
src/patches/bash/bash51-002
View File

@@ -1,57 +0,0 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-002
Bug-Reported-by: oguzismailuysal@gmail.com
Bug-Reference-ID: <CAH7i3LoHFUa4aSF5-AD2r80HG-p-YzD_9ZxomarZkhP8NMq63g@mail.gmail.com>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00037.html
Bug-Description:
If there are no jobs, and the `-n' and `-p' options are both supplied to
`wait', bash can assign a value to the variable name specified with `-p'
instead of leaving it unset.
Patch (apply with `patch -p0'):
*** ../bash-5.1-patched/builtins/wait.def 2020-04-09 15:13:57.000000000 -0400
--- builtins/wait.def 2020-12-11 09:46:49.000000000 -0500
***************
*** 214,222 ****
status = wait_for_any_job (wflags, &pstat);
- if (status < 0)
- status = 127;
-
if (vname && status >= 0)
bind_var_to_int (vname, pstat.pid);
if (list)
unset_waitlist ();
--- 214,222 ----
status = wait_for_any_job (wflags, &pstat);
if (vname && status >= 0)
bind_var_to_int (vname, pstat.pid);
+
+ if (status < 0)
+ status = 127;
if (list)
unset_waitlist ();
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 1
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 2
#endif /* _PATCHLEVEL_H_ */

53
src/patches/bash/bash51-003
View File

@@ -1,53 +0,0 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-003
Bug-Reported-by: oguzismailuysal@gmail.com
Bug-Reference-ID: <CAH7i3LpG91BnNcDtaTUm2Ph7a+PnJkuh6nAc87cVL7_38tOaMQ@mail.gmail.com>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00050.html
Bug-Description:
Bash does not put a command substitution process that is started to perform an
expansion in a child process into the right process group where it can receive
keyboard-generated signals.
Patch (apply with `patch -p0'):
*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500
--- subst.c 2020-12-12 13:50:11.000000000 -0500
***************
*** 6357,6362 ****
#if defined (JOB_CONTROL)
old_pipeline_pgrp = pipeline_pgrp;
! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline. */
! if ((subshell_environment & SUBSHELL_PIPE) == 0)
pipeline_pgrp = shell_pgrp;
cleanup_the_pipeline ();
--- 6357,6364 ----
#if defined (JOB_CONTROL)
old_pipeline_pgrp = pipeline_pgrp;
! /* Don't reset the pipeline pgrp if we're already a subshell in a pipeline or
! we've already forked to run a disk command (and are expanding redirections,
! for example). */
! if ((subshell_environment & (SUBSHELL_FORK|SUBSHELL_PIPE)) == 0)
pipeline_pgrp = shell_pgrp;
cleanup_the_pipeline ();
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 2
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 3
#endif /* _PATCHLEVEL_H_ */

126
src/patches/bash/bash51-004
View File

@@ -1,126 +0,0 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-004
Bug-Reported-by: oguzismailuysal@gmail.com
Bug-Reference-ID: <CAH7i3LoHGmwaghDpCWRUfcY04gQmeDTH3RiG=bf2b=KbU=gyhw@mail.gmail.com>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-12/msg00039.html
Bug-Description:
If a key-value compound array assignment to an associative array is supplied
as an assignment statement argument to the `declare' command that declares the
array, the assignment doesn't perform the correct word expansions.
This patch makes key-value assignment and subscript assignment perform the
same expansions when they're supplied as an argument to `declare'.
Patch (apply with `patch -p0'):
*** ../bash-5.1-patched/arrayfunc.c 2020-10-09 11:38:58.000000000 -0400
--- arrayfunc.c 2020-12-11 15:12:22.000000000 -0500
***************
*** 598,601 ****
--- 598,622 ----
}
}
+
+ /* Return non-zero if L appears to be a key-value pair associative array
+ compound assignment. */
+ int
+ kvpair_assignment_p (l)
+ WORD_LIST *l;
+ {
+ return (l && (l->word->flags & W_ASSIGNMENT) == 0 && l->word->word[0] != '['); /*]*/
+ }
+
+ char *
+ expand_and_quote_kvpair_word (w)
+ char *w;
+ {
+ char *t, *r;
+
+ t = w ? expand_assignment_string_to_string (w, 0) : 0;
+ r = sh_single_quote (t ? t : "");
+ free (t);
+ return r;
+ }
#endif
***************
*** 641,645 ****
#if ASSOC_KVPAIR_ASSIGNMENT
! if (assoc_p (var) && nlist && (nlist->word->flags & W_ASSIGNMENT) == 0 && nlist->word->word[0] != '[') /*]*/
{
iflags = flags & ~ASS_APPEND;
--- 662,666 ----
#if ASSOC_KVPAIR_ASSIGNMENT
! if (assoc_p (var) && kvpair_assignment_p (nlist))
{
iflags = flags & ~ASS_APPEND;
*** ../bash-5.1-patched/arrayfunc.h 2020-04-29 17:24:15.000000000 -0400
--- arrayfunc.h 2020-12-11 14:23:50.000000000 -0500
***************
*** 68,71 ****
--- 68,74 ----
extern void quote_compound_array_list PARAMS((WORD_LIST *, int));
+ extern int kvpair_assignment_p PARAMS((WORD_LIST *));
+ extern char *expand_and_quote_kvpair_word PARAMS((char *));
+
extern int unbind_array_element PARAMS((SHELL_VAR *, char *, int));
extern int skipsubscript PARAMS((const char *, int, int));
*** ../bash-5.1-patched/subst.c 2020-11-16 10:33:15.000000000 -0500
--- subst.c 2020-12-11 15:11:10.000000000 -0500
***************
*** 11605,11608 ****
--- 11605,11609 ----
WORD_LIST *l, *nl;
char *t;
+ int kvpair;
if (flags == 0)
***************
*** 11619,11622 ****
--- 11620,11627 ----
/* Associative array */
l = parse_string_to_word_list (value, 1, "array assign");
+ #if ASSOC_KVPAIR_ASSIGNMENT
+ kvpair = kvpair_assignment_p (l);
+ #endif
+
/* For associative arrays, with their arbitrary subscripts, we have to
expand and quote in one step so we don't have to search for the
***************
*** 11624,11627 ****
--- 11629,11638 ----
for (nl = l; nl; nl = nl->next)
{
+ #if ASSOC_KVPAIR_ASSIGNMENT
+ if (kvpair)
+ /* keys and values undergo the same set of expansions */
+ t = expand_and_quote_kvpair_word (nl->word->word);
+ else
+ #endif
if ((nl->word->flags & W_ASSIGNMENT) == 0)
t = sh_single_quote (nl->word->word ? nl->word->word : "");
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 3
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 4
#endif /* _PATCHLEVEL_H_ */

59
src/patches/bash/bash51-009 Normal file
View File

@@ -0,0 +1,59 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-009
Bug-Reported-by: Julien Moutinho <julm+bash@sourcephile.fr>
Bug-Reference-ID: <20211004035906.5kiobuzkpeckmvwg@sourcephile.fr>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2021-10/msg00022.html
Bug-Description:
The bash malloc implementation of malloc_usable_size() does not follow the
specification. This can cause library functions that use it to overwrite
memory bounds checking.
Patch (apply with `patch -p0'):
*** ../bash-5.1-patched/lib/malloc/malloc.c 2020-07-08 10:19:30.000000000 -0400
--- lib/malloc/malloc.c 2021-10-05 16:10:55.000000000 -0400
***************
*** 1287,1297 ****
}
! /* XXX - should we return 0 if ISFREE? */
! maxbytes = binsize(p->mh_index);
!
! /* So the usable size is the maximum number of bytes in the bin less the
! malloc overhead */
! maxbytes -= MOVERHEAD + MSLOP;
! return (maxbytes);
}
--- 1358,1367 ----
}
! /* return 0 if ISFREE */
! if (p->mh_alloc == ISFREE)
! return 0;
!
! /* Since we use bounds checking, the usable size is the last requested size. */
! return (p->mh_nbytes);
}
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 8
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 9
#endif /* _PATCHLEVEL_H_ */

59
src/patches/bash/bash51-010 Normal file
View File

@@ -0,0 +1,59 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-010
Bug-Reported-by: Jonas Alfredsson <jonas.alfredsson@protonmail.com>
Bug-Reference-ID: <LjAfZaEuZncr2RaqhSSfcaiXdkuK6kdEYxshP3LApXbgMVQzggMGyWHO9knVkXicW2fP-ibsipJ_GZ-YaJRm96Rsozf6PgFmPsljRCtflls=@protonmail.com>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2021-05/msg00059.html
Bug-Description:
If `wait -n' is interrupted by a trapped signal other than SIGINT, it does
not completely clean up state, and that can prevent subsequent calls to
`wait -n' from working correctly.
Patch (apply with `patch -p0'):
*** ../bash-5.1-patched/builtins/wait.def 2020-12-16 17:13:12.000000000 -0500
--- builtins/wait.def 2021-11-17 10:25:15.000000000 -0500
***************
*** 112,116 ****
WORD_LIST *list;
{
! int status, code, opt, nflag, wflags;
char *vname;
SHELL_VAR *pidvar;
--- 112,117 ----
WORD_LIST *list;
{
! int status, code, opt, nflag;
! volatile int wflags;
char *vname;
SHELL_VAR *pidvar;
***************
*** 181,184 ****
--- 188,193 ----
status = 128 + wait_signal_received;
wait_sigint_cleanup ();
+ if (wflags & JWAIT_WAITING)
+ unset_waitlist ();
WAIT_RETURN (status);
}
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 9
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 10
#endif /* _PATCHLEVEL_H_ */

81
src/patches/bash/bash51-011 Normal file
View File

@@ -0,0 +1,81 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-011
Bug-Reported-by: Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com>
Bug-Reference-ID: <CAALKErFrm+yuwy=ioK+RmjCiwxTDmzeMFWqLF2BEWYtkGS5UFQ@mail.gmail.com>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-11/msg00064.html
Bug-Description:
When reading a compound assignment, and running it through the parser to
split it into words, we need to save and restore any alias we're currently
expanding.
Patch (apply with `patch -p0'):
*** ../bash-5.1-patched/parse.y 2020-11-28 12:10:06.000000000 -0500
--- parse.y 2021-10-13 11:04:27.000000000 -0400
***************
*** 6494,6501 ****
push_stream (1);
- #if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
if (ea = expanding_alias ())
parser_save_alias ();
- #endif
last_read_token = WORD; /* WORD to allow reserved words here */
current_command_line_count = 0;
--- 6494,6499 ----
***************
*** 6532,6539 ****
pop_stream ();
- #if 0 /* TAG: bash-5.2 */
if (ea)
parser_restore_alias ();
- #endif
#if defined (HISTORY)
--- 6530,6535 ----
*** ../bash-5.1-patched/y.tab.c 2020-11-28 12:17:19.000000000 -0500
--- y.tab.c 2021-11-17 10:47:35.000000000 -0500
***************
*** 8788,8795 ****
push_stream (1);
- #if 0 /* TAG: bash-5.2 Alex fxmbsw7 Ratchev <fxmbsw7@gmail.com> 11/17/2020 */
if (ea = expanding_alias ())
parser_save_alias ();
- #endif
last_read_token = WORD; /* WORD to allow reserved words here */
current_command_line_count = 0;
--- 8777,8782 ----
***************
*** 8826,8833 ****
pop_stream ();
- #if 0 /* TAG: bash-5.2 */
if (ea)
parser_restore_alias ();
- #endif
#if defined (HISTORY)
--- 8813,8818 ----
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 10
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 11
#endif /* _PATCHLEVEL_H_ */

198
src/patches/bash/bash51-012 Normal file
View File

@@ -0,0 +1,198 @@
BASH PATCH REPORT
=================
Bash-Release: 5.1
Patch-ID: bash51-012
Bug-Reported-by: Nikolay Borisov <nborisov@suse.com>
Bug-Reference-ID: <1a715205-06ce-413b-c1c0-2f5639ce06c0@suse.com>
Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-bash/2020-11/msg00091.html
Bug-Description:
There is a possible race condition that arises when a child process receives
a signal trapped by the parent before it can reset the signal dispositions.
The child process is not supposed to trap the signal in this circumstance.
Patch (apply with `patch -p0'):
*** ../bash-20201118/command.h 2020-08-14 15:04:39.000000000 -0400
--- command.h 2020-11-27 15:18:02.000000000 -0500
***************
*** 125,128 ****
--- 125,129 ----
#define SUBSHELL_COPROC 0x40 /* subshell from a coproc pipeline */
#define SUBSHELL_RESETTRAP 0x80 /* subshell needs to reset trap strings on first call to trap */
+ #define SUBSHELL_IGNTRAP 0x100 /* subshell should reset trapped signals from trap_handler */
/* A structure which represents a word. */
*** ../bash-20201118/execute_cmd.c 2020-11-23 14:16:48.000000000 -0500
--- execute_cmd.c 2020-11-27 16:43:25.000000000 -0500
***************
*** 1548,1551 ****
--- 1548,1554 ----
reset_signal_handlers ();
subshell_environment |= SUBSHELL_RESETTRAP;
+ /* Note that signal handlers have been reset, so we should no longer
+ reset the handler and resend trapped signals to ourselves. */
+ subshell_environment &= ~SUBSHELL_IGNTRAP;
/* We are in a subshell, so forget that we are running a trap handler or
***************
*** 4321,4325 ****
cmdflags |= CMD_NO_FORK;
! subshell_environment = SUBSHELL_FORK; /* XXX */
if (pipe_in != NO_PIPE || pipe_out != NO_PIPE)
subshell_environment |= SUBSHELL_PIPE;
--- 4324,4329 ----
cmdflags |= CMD_NO_FORK;
! /* We redo some of what make_child() does with SUBSHELL_IGNTRAP */
! subshell_environment = SUBSHELL_FORK|SUBSHELL_IGNTRAP; /* XXX */
if (pipe_in != NO_PIPE || pipe_out != NO_PIPE)
subshell_environment |= SUBSHELL_PIPE;
***************
*** 4575,4578 ****
--- 4580,4584 ----
reset_signal_handlers ();
subshell_environment |= SUBSHELL_RESETTRAP;
+ subshell_environment &= ~SUBSHELL_IGNTRAP;
if (async)
***************
*** 5515,5518 ****
--- 5521,5525 ----
/* Cancel traps, in trap.c. */
restore_original_signals ();
+ subshell_environment &= ~SUBSHELL_IGNTRAP;
#if defined (JOB_CONTROL)
*** ../bash-20201118/jobs.c 2020-08-04 10:17:39.000000000 -0400
--- jobs.c 2020-11-27 16:39:56.000000000 -0500
***************
*** 2218,2221 ****
--- 2218,2223 ----
pid_t mypid;
+ subshell_environment |= SUBSHELL_IGNTRAP;
+
/* If this ends up being changed to modify or use `command' in the
child process, go back and change callers who free `command' in
diff -rC 2 ../bash-20201118/nojobs.c nojobs.c
*** ../bash-20201118/nojobs.c 2020-07-08 10:11:25.000000000 -0400
--- nojobs.c 2020-11-27 16:38:36.000000000 -0500
***************
*** 576,579 ****
--- 576,581 ----
#endif
+ subshell_environment |= SUBSHELL_IGNTRAP;
+
default_tty_job_signals ();
}
*** ../bash-20201118/sig.c 2020-11-23 13:22:17.000000000 -0500
--- sig.c 2020-11-28 10:21:43.000000000 -0500
***************
*** 56,60 ****
#endif
! extern void initialize_siglist ();
#if !defined (JOB_CONTROL)
--- 56,61 ----
#endif
! extern void initialize_siglist PARAMS((void));
! extern void set_original_signal PARAMS((int, SigHandler *));
#if !defined (JOB_CONTROL)
***************
*** 256,259 ****
--- 257,267 ----
XHANDLER(i) = oact.sa_handler;
XSAFLAGS(i) = oact.sa_flags;
+
+ #if 0
+ set_original_signal (XSIG(i), XHANDLER(i)); /* optimization */
+ #else
+ set_original_signal (XSIG(i), act.sa_handler); /* optimization */
+ #endif
+
/* Don't do anything with signals that are ignored at shell entry
if the shell is not interactive. */
*** ../bash-20201118/subst.c 2020-11-16 10:33:15.000000000 -0500
--- subst.c 2020-11-27 16:07:00.000000000 -0500
***************
*** 5952,5955 ****
--- 5952,5956 ----
/* Cancel traps, in trap.c. */
restore_original_signals (); /* XXX - what about special builtins? bash-4.2 */
+ subshell_environment &= ~SUBSHELL_IGNTRAP;
QUIT; /* catch any interrupts we got post-fork */
setup_async_signals ();
***************
*** 6383,6386 ****
--- 6384,6388 ----
QUIT; /* catch any interrupts we got post-fork */
subshell_environment |= SUBSHELL_RESETTRAP;
+ subshell_environment &= ~SUBSHELL_IGNTRAP;
}
diff -rC 2 ../bash-20201118/trap.c trap.c
*** ../bash-20201118/trap.c 2020-11-28 12:04:07.000000000 -0500
--- trap.c 2020-11-28 10:22:10.000000000 -0500
***************
*** 482,485 ****
--- 482,511 ----
}
+ /* This means we're in a subshell, but have not yet reset the handler for
+ trapped signals. We're not supposed to execute the trap in this situation;
+ we should restore the original signal and resend the signal to ourselves
+ to preserve the Posix "signal traps that are not being ignored shall be
+ set to the default action" semantics. */
+ if ((subshell_environment & SUBSHELL_IGNTRAP) && trap_list[sig] != (char *)IGNORE_SIG)
+ {
+ sigset_t mask;
+
+ /* Paranoia */
+ if (original_signals[sig] == IMPOSSIBLE_TRAP_HANDLER)
+ original_signals[sig] = SIG_DFL;
+
+ restore_signal (sig);
+
+ /* Make sure we let the signal we just caught through */
+ sigemptyset (&mask);
+ sigprocmask (SIG_SETMASK, (sigset_t *)NULL, &mask);
+ sigdelset (&mask, sig);
+ sigprocmask (SIG_SETMASK, &mask, (sigset_t *)NULL);
+
+ kill (getpid (), sig);
+
+ SIGRETURN (0);
+ }
+
if ((sig >= NSIG) ||
(trap_list[sig] == (char *)DEFAULT_SIG) ||
*** ../bash-5.1/patchlevel.h 2020-06-22 14:51:03.000000000 -0400
--- patchlevel.h 2020-10-01 11:01:28.000000000 -0400
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 11
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 12
#endif /* _PATCHLEVEL_H_ */

12
src/patches/libloc/libloc-0.9.3-perl-i586-regular-stack-protector.patch
View File

@@ -1,12 +0,0 @@
diff --git a/src/perl/Makefile.PL b/src/perl/Makefile.PL
index 38d5390..62016ca 100644
--- a/src/perl/Makefile.PL
+++ b/src/perl/Makefile.PL
@@ -11,6 +11,7 @@ WriteMakefile(
LIBS => ['-lloc'],
DEFINE => '', # e.g., '-DHAVE_SOMETHING'
INC => '-I. -I../../',
+ CCFLAGS => '-D_REENTRANT -D_GNU_SOURCE -O2 -pipe -Wall -fexceptions -fPIC -march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector -fwrapv -fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64',
# Un-comment this if you add C files to link with later:
# OBJECT => '$(O_FILES)', # link all the C files too
);

115
src/patches/m4-1.4.18-glibc-change-work-around.patch
View File

@@ -1,115 +0,0 @@
diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c
--- m4-1.4.18/lib/fflush.c.orig 2018-05-02 12:35:59.536851666 +0200
+++ m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200
@@ -33,7 +33,7 @@
#undef fflush
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
static void
@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
#endif
-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
if (stream == NULL || ! freading (stream))
return fflush (stream);
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
clear_ungetc_buffer_preserving_position (stream);
diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c
--- m4-1.4.18/lib/fpending.c.orig 2018-05-02 12:35:32.305806774 +0200
+++ m4-1.4.18/lib/fpending.c 2018-05-02 12:35:44.944827347 +0200
@@ -32,7 +32,7 @@ __fpending (FILE *fp)
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
return fp->_IO_write_ptr - fp->_IO_write_base;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c
--- m4-1.4.18/lib/fpurge.c.orig 2018-05-02 12:38:13.586078669 +0200
+++ m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200
@@ -62,7 +62,7 @@ fpurge (FILE *fp)
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_end = fp->_IO_read_ptr;
fp->_IO_write_ptr = fp->_IO_write_base;
/* Avoid memory leak when there is an active ungetc buffer. */
diff -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c
--- m4-1.4.18/lib/freadahead.c.orig 2016-12-31 14:54:41.000000000 +0100
+++ m4-1.4.18/lib/freadahead.c 2018-05-02 11:43:19.570336724 +0200
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c
--- m4-1.4.18/lib/freading.c.orig 2018-05-02 12:37:33.970011368 +0200
+++ m4-1.4.18/lib/freading.c 2018-05-02 12:37:59.393054359 +0200
@@ -31,7 +31,7 @@ freading (FILE *fp)
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
return ((fp->_flags & _IO_NO_WRITES) != 0
|| ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
&& fp->_IO_read_base != NULL));
diff -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c
--- m4-1.4.18/lib/fseeko.c.orig 2018-05-02 11:44:17.947460233 +0200
+++ m4-1.4.18/lib/fseeko.c 2018-05-02 12:39:49.537216897 +0200
@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
diff -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h
--- m4-1.4.18/lib/stdio-impl.h.orig 2016-12-31 14:54:42.000000000 +0100
+++ m4-1.4.18/lib/stdio-impl.h 2018-05-02 11:43:19.570336724 +0200
@@ -18,6 +18,12 @@
the same implementation of stdio extension API, except that some fields
have different naming conventions, or their access requires some casts. */
+/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
+ problem by defining it ourselves. FIXME: Do not rely on glibc
+ internals. */
+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
+# define _IO_IN_BACKUP 0x100
+#endif
/* BSD stdio derived implementations. */

67
src/patches/qemu-5.2.0-no-pie.patch
View File

@@ -1,67 +0,0 @@
Recent binutils changes dropping unsupported options [1] caused a build
issue in regard to the optionroms.
ld -m elf_i386 -T /<<PKGBUILDDIR>>/pc-bios/optionrom//flat.lds -no-pie \
-s -o multiboot.img multiboot.o
ld.bfd: Error: unable to disambiguate: -no-pie (did you mean --no-pie ?)
This isn't really a regression in ld.bfd, filing the bug upstream
revealed that this never worked as a ld flag [2] - in fact it seems we
were by accident setting --nmagic).
Since it never had the wanted effect this usage of LDFLAGS_NOPIE, should be
droppable without any effect. This also is the only use-case of LDFLAGS_NOPIE
in .mak, therefore we can also remove it from being added there.
[1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=983d925d
[2]: https://sourceware.org/bugzilla/show_bug.cgi?id=27050#c5
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
configure | 3 ---
pc-bios/optionrom/Makefile | 1 -
2 files changed, 4 deletions(-)
diff --git a/configure b/configure
index 3f823ed163..61c17c2dde 100755
--- a/configure
+++ b/configure
@@ -2133,7 +2133,6 @@ EOF
# Check we support --no-pie first; we will need this for building ROMs.
if compile_prog "-Werror -fno-pie" "-no-pie"; then
CFLAGS_NOPIE="-fno-pie"
- LDFLAGS_NOPIE="-no-pie"
fi
if test "$static" = "yes"; then
@@ -2149,7 +2148,6 @@ if test "$static" = "yes"; then
fi
elif test "$pie" = "no"; then
CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS"
- CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS"
elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS"
CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS"
@@ -6768,7 +6766,6 @@ echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
-echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
echo "HOST_DSOSUF=$HOST_DSOSUF" >> $config_host_mak
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 084fc10f05..30771f8d17 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -41,7 +41,6 @@ override CFLAGS += $(call cc-option, $(Wa)-32)
LD_I386_EMULATION ?= elf_i386
override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
-override LDFLAGS += $(LDFLAGS_NOPIE)
all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin
--
2.29.2

35
src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch
View File

@@ -1,35 +0,0 @@
From 1f023b49959aa58246e6bb7091ba7710116f6915 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 Sep 2018 17:29:15 +0100
Subject: [PATCH] Enable RDRAND for i586, too
IPFire is being compiled for i586 omitting some instructions
for i686. However, RDRAND is available on some systems and
can of course be used.
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Pull request sent: https://github.com/nhorman/rng-tools/pull/31
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index faba7cc9857e..716175328ff6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,8 +53,8 @@ AC_CHECK_TOOLS([AR], [ar gar], :)
AX_PTHREAD
-AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
-AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
+AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586])
+AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686 -o $target_cpu = i586], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
AM_CONDITIONAL([DARN], [test $target_cpu = powerpc64le])
AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
--
2.17.1

446
src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
View File

@@ -1,446 +0,0 @@
diff -crB shadow-4.2.1-a/man/cs/Makefile.in shadow-4.2.1-b/man/cs/Makefile.in
*** shadow-4.2.1-a/man/cs/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/cs/Makefile.in 2016-03-13 10:47:55.924166976 +0000
***************
*** 300,311 ****
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man1/groups.1 \
man8/grpck.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man8/nologin.8 \
! man5/passwd.5 \
man5/shadow.5 \
man1/su.1 \
man8/vipw.8
--- 300,311 ----
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man1/ \
man8/grpck.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man8/nologin.8 \
! man5/ \
man5/shadow.5 \
man1/su.1 \
man8/vipw.8
diff -crB shadow-4.2.1-a/man/da/Makefile.in shadow-4.2.1-b/man/da/Makefile.in
*** shadow-4.2.1-a/man/da/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/da/Makefile.in 2016-03-13 10:47:55.928166977 +0000
***************
*** 298,304 ****
top_srcdir = @top_srcdir@
# 2012.01.28 - activate manpages with more than 50% translated messages
! man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam =
--- 298,304 ----
top_srcdir = @top_srcdir@
# 2012.01.28 - activate manpages with more than 50% translated messages
! man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \
man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam =
diff -crB shadow-4.2.1-a/man/de/Makefile.in shadow-4.2.1-b/man/de/Makefile.in
*** shadow-4.2.1-a/man/de/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/de/Makefile.in 2016-03-13 10:47:55.916166976 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/es/Makefile.in shadow-4.2.1-b/man/es/Makefile.in
*** shadow-4.2.1-a/man/es/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/es/Makefile.in 2016-03-13 10:47:55.872166975 +0000
***************
*** 266,272 ****
# man1/login.1 \
# man1/newgrp.1 \
# man1/passwd.1 \
! # man5/passwd.5 \
# man1/su.1 \
# man8/vigr.8 \
# man8/vipw.8
--- 266,272 ----
# man1/login.1 \
# man1/newgrp.1 \
# man1/passwd.1 \
! # man5/ \
# man1/su.1 \
# man8/vigr.8 \
# man8/vipw.8
diff -crB shadow-4.2.1-a/man/fr/Makefile.in shadow-4.2.1-b/man/fr/Makefile.in
*** shadow-4.2.1-a/man/fr/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/fr/Makefile.in 2016-03-13 10:47:55.984166978 +0000
***************
*** 301,311 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 301,311 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/hu/Makefile.in shadow-4.2.1-b/man/hu/Makefile.in
*** shadow-4.2.1-a/man/hu/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/hu/Makefile.in 2016-03-13 10:47:55.972166978 +0000
***************
*** 295,306 ****
man_MANS = \
man1/chsh.1 \
man1/gpasswd.1 \
! man1/groups.1 \
man8/lastlog.8 \
man1/login.1 \
man1/newgrp.1 \
man1/passwd.1 \
! man5/passwd.5 \
man1/sg.1 \
man1/su.1
--- 295,306 ----
man_MANS = \
man1/chsh.1 \
man1/gpasswd.1 \
! man1/ \
man8/lastlog.8 \
man1/login.1 \
man1/newgrp.1 \
man1/passwd.1 \
! man5/ \
man1/sg.1 \
man1/su.1
diff -crB shadow-4.2.1-a/man/it/Makefile.in shadow-4.2.1-b/man/it/Makefile.in
*** shadow-4.2.1-a/man/it/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/it/Makefile.in 2016-03-13 10:47:55.896166976 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/ja/Makefile.in shadow-4.2.1-b/man/ja/Makefile.in
*** shadow-4.2.1-a/man/ja/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/ja/Makefile.in 2016-03-13 10:47:55.932166977 +0000
***************
*** 296,305 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
--- 296,305 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
! man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \
man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man1/passwd.1 man5/ man8/pwck.8 \
man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
diff -crB shadow-4.2.1-a/man/ko/Makefile.in shadow-4.2.1-b/man/ko/Makefile.in
*** shadow-4.2.1-a/man/ko/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/ko/Makefile.in 2016-03-13 10:47:55.940166977 +0000
***************
*** 295,303 ****
man_MANS = \
man1/chfn.1 \
man1/chsh.1 \
! man1/groups.1 \
man1/login.1 \
! man5/passwd.5 \
man1/su.1 \
man8/vigr.8 \
man8/vipw.8
--- 295,303 ----
man_MANS = \
man1/chfn.1 \
man1/chsh.1 \
! man1/ \
man1/login.1 \
! man5/ \
man1/su.1 \
man8/vigr.8 \
man8/vipw.8
diff -crB shadow-4.2.1-a/man/Makefile.in shadow-4.2.1-b/man/Makefile.in
*** shadow-4.2.1-a/man/Makefile.in 2014-05-09 16:49:46.000000000 +0000
--- shadow-4.2.1-b/man/Makefile.in 2016-03-13 10:47:55.880166976 +0000
***************
*** 365,375 ****
@USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 365,375 ----
@USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/pl/Makefile.in shadow-4.2.1-b/man/pl/Makefile.in
*** shadow-4.2.1-a/man/pl/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/pl/Makefile.in 2016-03-13 10:47:55.912166976 +0000
***************
*** 300,307 ****
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
man8/vipw.8 $(am__append_1)
--- 300,307 ----
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
man8/vipw.8 $(am__append_1)
diff -crB shadow-4.2.1-a/man/pt_BR/Makefile.in shadow-4.2.1-b/man/pt_BR/Makefile.in
*** shadow-4.2.1-a/man/pt_BR/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/pt_BR/Makefile.in 2016-03-13 10:47:55.904166976 +0000
***************
*** 297,303 ****
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/passwd.5 \
man5/shadow.5
EXTRA_DIST = $(man_MANS)
--- 297,303 ----
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/ \
man5/shadow.5
EXTRA_DIST = $(man_MANS)
diff -crB shadow-4.2.1-a/man/ru/Makefile.in shadow-4.2.1-b/man/ru/Makefile.in
*** shadow-4.2.1-a/man/ru/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/ru/Makefile.in 2016-03-13 10:47:55.944166977 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/sv/Makefile.in shadow-4.2.1-b/man/sv/Makefile.in
*** shadow-4.2.1-a/man/sv/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/sv/Makefile.in 2016-03-13 10:47:55.988166978 +0000
***************
*** 300,309 ****
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
! man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam = \
--- 300,309 ----
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
! man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
! man8/nologin.8 man1/passwd.1 man5/ man8/pwck.8 \
man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam = \
diff -crB shadow-4.2.1-a/man/tr/Makefile.in shadow-4.2.1-b/man/tr/Makefile.in
*** shadow-4.2.1-a/man/tr/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/tr/Makefile.in 2016-03-13 10:47:55.964166977 +0000
***************
*** 300,306 ****
man8/groupmod.8 \
man1/login.1 \
man1/passwd.1 \
! man5/passwd.5 \
man5/shadow.5 \
man1/su.1 \
man8/useradd.8 \
--- 300,306 ----
man8/groupmod.8 \
man1/login.1 \
man1/passwd.1 \
! man5/ \
man5/shadow.5 \
man1/su.1 \
man8/useradd.8 \
diff -crB shadow-4.2.1-a/man/zh_CN/Makefile.in shadow-4.2.1-b/man/zh_CN/Makefile.in
*** shadow-4.2.1-a/man/zh_CN/Makefile.in 2014-05-09 16:49:47.000000000 +0000
--- shadow-4.2.1-b/man/zh_CN/Makefile.in 2016-03-13 10:47:55.952166977 +0000
***************
*** 299,309 ****
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
--- 299,309 ----
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
! man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
! man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
! man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -crB shadow-4.2.1-a/man/zh_TW/Makefile.in shadow-4.2.1-b/man/zh_TW/Makefile.in
*** shadow-4.2.1-a/man/zh_TW/Makefile.in 2014-05-09 16:49:48.000000000 +0000
--- shadow-4.2.1-b/man/zh_TW/Makefile.in 2016-03-13 10:47:55.956166977 +0000
***************
*** 302,308 ****
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/passwd.5 \
man1/su.1 \
man8/useradd.8 \
man8/userdel.8 \
--- 302,308 ----
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
! man5/ \
man1/su.1 \
man8/useradd.8 \
man8/userdel.8 \
diff -crB shadow-4.2.1-a/src/Makefile.in shadow-4.2.1-b/src/Makefile.in
*** shadow-4.2.1-a/src/Makefile.in 2014-05-09 16:49:48.000000000 +0000
--- shadow-4.2.1-b/src/Makefile.in 2016-03-13 10:47:38.824166600 +0000
***************
*** 78,84 ****
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
! bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT)
sbin_PROGRAMS = nologin$(EXEEXT)
ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \
--- 78,84 ----
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
! bin_PROGRAMS = login$(EXEEXT) su$(EXEEXT)
sbin_PROGRAMS = nologin$(EXEEXT)
ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \

278
src/patches/shadow-4.9-suppress_installation_of_groups.patch Normal file
View File

@@ -0,0 +1,278 @@
diff -Naur shadow-4.9-orig/man/cs/Makefile.in shadow-4.9/man/cs/Makefile.in
--- shadow-4.9-orig/man/cs/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/cs/Makefile.in 2021-09-28 10:02:20.088234227 +0200
@@ -326,12 +326,12 @@
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
- man1/groups.1 \
+ man1/ \
man8/grpck.8 \
man5/gshadow.5 \
man8/lastlog.8 \
man8/nologin.8 \
- man5/passwd.5 \
+ man5/ \
man5/shadow.5 \
man1/su.1 \
man8/vipw.8
diff -Naur shadow-4.9-orig/man/da/Makefile.in shadow-4.9/man/da/Makefile.in
--- shadow-4.9-orig/man/da/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/da/Makefile.in 2021-09-28 10:03:35.455124215 +0200
@@ -323,7 +323,7 @@
top_srcdir = @top_srcdir@
# 2012.01.28 - activate manpages with more than 50% translated messages
-man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
+man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \
man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam =
diff -Naur shadow-4.9-orig/man/de/Makefile.in shadow-4.9/man/de/Makefile.in
--- shadow-4.9-orig/man/de/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/de/Makefile.in 2021-09-28 10:06:00.828982852 +0200
@@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
- man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
- man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+ man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.9-orig/man/es/Makefile.in shadow-4.9/man/es/Makefile.in
--- shadow-4.9-orig/man/es/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/es/Makefile.in 2021-09-28 10:06:40.528417341 +0200
@@ -292,7 +292,7 @@
# man1/login.1 \
# man1/newgrp.1 \
# man1/passwd.1 \
-# man5/passwd.5 \
+# man5/ \
# man1/su.1 \
# man8/vigr.8 \
# man8/vipw.8
diff -Naur shadow-4.9-orig/man/fr/Makefile.in shadow-4.9/man/fr/Makefile.in
--- shadow-4.9-orig/man/fr/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/fr/Makefile.in 2021-09-28 12:11:23.391355328 +0200
@@ -326,11 +326,11 @@
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
- man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
- man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+ man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.9-orig/man/hu/Makefile.in shadow-4.9/man/hu/Makefile.in
--- shadow-4.9-orig/man/hu/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/hu/Makefile.in 2021-09-28 12:12:10.834664816 +0200
@@ -321,12 +321,12 @@
man_MANS = \
man1/chsh.1 \
man1/gpasswd.1 \
- man1/groups.1 \
+ man1/ \
man8/lastlog.8 \
man1/login.1 \
man1/newgrp.1 \
man1/passwd.1 \
- man5/passwd.5 \
+ man5/ \
man1/sg.1 \
man1/su.1
diff -Naur shadow-4.9-orig/man/it/Makefile.in shadow-4.9/man/it/Makefile.in
--- shadow-4.9-orig/man/it/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/it/Makefile.in 2021-09-28 12:13:14.321740885 +0200
@@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
- man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
- man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+ man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.9-orig/man/ja/Makefile.in shadow-4.9/man/ja/Makefile.in
--- shadow-4.9-orig/man/ja/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/ja/Makefile.in 2021-09-28 12:14:06.920974945 +0200
@@ -322,10 +322,10 @@
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
- man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
+ man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \
man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
- man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
+ man8/newusers.8 man1/passwd.1 man5/ man8/pwck.8 \
man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
diff -Naur shadow-4.9-orig/man/ko/Makefile.in shadow-4.9/man/ko/Makefile.in
--- shadow-4.9-orig/man/ko/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/ko/Makefile.in 2021-09-28 12:14:40.432487050 +0200
@@ -321,9 +321,9 @@
man_MANS = \
man1/chfn.1 \
man1/chsh.1 \
- man1/groups.1 \
+ man1/ \
man1/login.1 \
- man5/passwd.5 \
+ man5/ \
man1/su.1 \
man8/vigr.8 \
man8/vipw.8
diff -Naur shadow-4.9-orig/man/Makefile.in shadow-4.9/man/Makefile.in
--- shadow-4.9-orig/man/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/Makefile.in 2021-09-28 12:15:46.395526512 +0200
@@ -392,11 +392,11 @@
@USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
- man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
- man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+ man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man5/suauth.5 man8/useradd.8 \
man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
diff -Naur shadow-4.9-orig/man/pl/Makefile.in shadow-4.9/man/pl/Makefile.in
--- shadow-4.9-orig/man/pl/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/pl/Makefile.in 2021-09-28 12:16:46.974644527 +0200
@@ -325,8 +325,8 @@
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
- man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
man8/vipw.8 $(am__append_1)
diff -Naur shadow-4.9-orig/man/pt_BR/Makefile.in shadow-4.9/man/pt_BR/Makefile.in
--- shadow-4.9-orig/man/pt_BR/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/pt_BR/Makefile.in 2021-09-28 12:17:15.610227402 +0200
@@ -323,7 +323,7 @@
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
- man5/passwd.5 \
+ man5/ \
man5/shadow.5
EXTRA_DIST = $(man_MANS)
diff -Naur shadow-4.9-orig/man/ru/Makefile.in shadow-4.9/man/ru/Makefile.in
--- shadow-4.9-orig/man/ru/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/ru/Makefile.in 2021-09-28 12:18:14.697366956 +0200
@@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
- man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
- man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+ man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.9-orig/man/sv/Makefile.in shadow-4.9/man/sv/Makefile.in
--- shadow-4.9-orig/man/sv/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/sv/Makefile.in 2021-09-28 12:19:19.328425616 +0200
@@ -325,10 +325,10 @@
# 2012.01.28 - activate manpages with more than 50% translated messages
man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
- man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
- man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
+ man8/nologin.8 man1/passwd.1 man5/ man8/pwck.8 \
man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam = \
diff -Naur shadow-4.9-orig/man/tr/Makefile.in shadow-4.9/man/tr/Makefile.in
--- shadow-4.9-orig/man/tr/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/tr/Makefile.in 2021-09-28 12:19:52.315944994 +0200
@@ -326,7 +326,7 @@
man8/groupmod.8 \
man1/login.1 \
man1/passwd.1 \
- man5/passwd.5 \
+ man5/ \
man5/shadow.5 \
man1/su.1 \
man8/useradd.8 \
diff -Naur shadow-4.9-orig/man/zh_CN/Makefile.in shadow-4.9/man/zh_CN/Makefile.in
--- shadow-4.9-orig/man/zh_CN/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/zh_CN/Makefile.in 2021-09-28 12:20:58.358982917 +0200
@@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
- man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
- man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+ man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+ man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
- man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+ man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.9-orig/man/zh_TW/Makefile.in shadow-4.9/man/zh_TW/Makefile.in
--- shadow-4.9-orig/man/zh_TW/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/man/zh_TW/Makefile.in 2021-09-28 12:21:26.770569070 +0200
@@ -328,7 +328,7 @@
man8/groupadd.8 \
man8/groupdel.8 \
man8/groupmod.8 \
- man5/passwd.5 \
+ man5/ \
man1/su.1 \
man8/useradd.8 \
man8/userdel.8 \
diff -Naur shadow-4.9-orig/src/Makefile.in shadow-4.9/src/Makefile.in
--- shadow-4.9-orig/src/Makefile.in 2021-07-22 23:56:58.000000000 +0200
+++ shadow-4.9/src/Makefile.in 2021-09-28 12:25:18.743217348 +0200
@@ -88,7 +88,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) $(am__EXEEXT_1)
+bin_PROGRAMS = login$(EXEEXT) $(am__EXEEXT_1)
sbin_PROGRAMS = nologin$(EXEEXT)
ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \

3
src/scripts/backupiso
View File

@@ -9,9 +9,6 @@ arch=$(uname -m)
case "${arch}" in
aarch64|x86_64)
;;
i?86)
arch="i586"
;;
*)
echo "Arch is not supported" >&2
exit 1