Hitchhiker/src
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Multiple version bumps

Browse Source
This commit is contained in:
Nathan Fisher 2022-08-22 09:50:00 -04:00
parent 2b8d1580e5
commit cd021883f5
16 changed files with 126 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -25,3 +25,6 @@ proctab.c
*.so *.so
*.so.* *.so.*
libbz2.so.* libbz2.so.*
tags
tags.temp
tags.lock

6
distfiles/Makefile
View File

@ -348,7 +348,7 @@ libelf-compat-${libelf-compat_version}.tar.xz:
libffi: libffi-${libffi_version}.tar.gz libffi: libffi-${libffi_version}.tar.gz
libffi-${libffi_version}.tar.gz: libffi-${libffi_version}.tar.gz:
wget -c ftp://sourceware.org/pub/libffi/$@ wget -c $(github)/libffi/libffi/releases/download/v$(libffi_version)/$@
libnl: libnl-${libnl_version}.tar.gz libnl: libnl-${libnl_version}.tar.gz
@ -519,7 +519,7 @@ sed-${sed_version}.tar.xz:
shadow: shadow-${shadow_version}.tar.xz shadow: shadow-${shadow_version}.tar.xz
shadow-${shadow_version}.tar.xz: shadow-${shadow_version}.tar.xz:
wget -c ${github}/shadow-maint/shadow/releases/download/${shadow_version}/$@ wget -c ${github}/shadow-maint/shadow/releases/download/v${shadow_version}/$@
skalibs: skalibs-${skalibs_version}.tar.gz skalibs: skalibs-${skalibs_version}.tar.gz
@ -599,7 +599,7 @@ zsh-${zsh_version}.tar.xz:
zsh-doc: zsh-${zsh_version}-doc.tar.xz zsh-doc: zsh-${zsh_version}-doc.tar.xz
zsh-${zsh_version}-doc.tar.xz: zsh-${zsh_version}-doc.tar.xz:
wget -c http://www.zsh.org/pub/$@ wget -c https://www.zsh.org/pub/$@
zstd: zstd-${zstd_version}.tar.gz zstd: zstd-${zstd_version}.tar.gz

36
include/mk/versions.mk
View File

@ -9,7 +9,7 @@ attr_version = 2.5.1
autoconf_version = 2.71 autoconf_version = 2.71
automake_version = 1.16.5 automake_version = 1.16.5
bc_version = 5.2.2 bc_version = 5.2.2
binutils_version = 2.38 binutils_version = 2.39
bison_version = 3.8.2 bison_version = 3.8.2
busybox_version = 1.31.1 busybox_version = 1.31.1
bzip2_version = 1.0.8 bzip2_version = 1.0.8
@ -29,11 +29,11 @@ file_version = 5.41
findutils_version = 4.9.0 findutils_version = 4.9.0
flex_version = 2.6.4 flex_version = 2.6.4
gawk_version = 5.1.1 gawk_version = 5.1.1
gcc_version = 12.1.0 gcc_version = 12.2.0
gdbm_version = 1.23 gdbm_version = 1.23
gettext_version = 0.21 gettext_version = 0.21
gettext-tiny_version = 0.3.2 gettext-tiny_version = 0.3.2
glibc_version = 2.35 glibc_version = 2.36
gmp_version = 6.2.1 gmp_version = 6.2.1
gperf_version = 3.1 gperf_version = 3.1
grep_version = 3.7 grep_version = 3.7
@ -47,57 +47,57 @@ intltool_version = 0.51.0
iproute2_version = 5.16.0 iproute2_version = 5.16.0
kbd_version = 2.4.0 kbd_version = 2.4.0
kmod_version = 29 kmod_version = 29
less_version = 563 less_version = 590
libcap_version = 2.47 libcap_version = 2.47
libedit_version = 20191231-3.1 libedit_version = 20191231-3.1
libelf-compat_version = 0.152 libelf-compat_version = 0.152
libffi_version = 3.3 libffi_version = 3.4.2
libnl_version = 3.5.0 libnl_version = 3.5.0
libressl_version = 3.0.2 libressl_version = 3.0.2
libtool_version = 2.4.6 libtool_version = 2.4.6
libz_version = 1.2.8.2015.12.26 libz_version = 1.2.8.2015.12.26
linux_version = 5.17.5 linux_version = 5.19.3
linux_rpi_version = 5.4.45 linux_rpi_version = 5.4.45
m4_version = 1.4.19 m4_version = 1.4.19
make_version = 4.3 make_version = 4.3
man-pages_version = 5.10 man-pages_version = 5.10
mandoc_version = 1.14.5 mandoc_version = 1.14.5
meson_version = 0.56.2 meson_version = 0.61.1
mpc_version = 1.2.1 mpc_version = 1.2.1
mpfr_version = 4.1.0 mpfr_version = 4.1.0
musl_version = 1.2.2 musl_version = 1.2.2
musl-fts_version = 1.2.7 musl-fts_version = 1.2.7
openssl_version = 3.0.1 ncurses_version = 6.3
ncurses_version = 6.2
netbsd-curses_version = 0.3.1 netbsd-curses_version = 0.3.1
ninja_version = 1.10.2 ninja_version = 1.10.2
openssl_version = 3.0.1
patch_version = 2.7.6 patch_version = 2.7.6
pcre_version = 8.45 pcre_version = 8.45
perl_version = 5.32.1 perl_version = 5.34.1
perl-cross_version = 1.3.5 perl-cross_version = 1.3.5
pkg-config_version = 0.29.2 pkg-config_version = 0.29.2
pkgsrc_version = 2020Q3 pkgsrc_version = 2020Q3
procps-ng_version = 3.3.16 procps-ng_version = 3.3.16
psmisc_version = 23.3 psmisc_version = 23.4
python_version = 3.9.1 python_version = 3.10.2
s6_version = 2.11.1.0 s6_version = 2.11.1.0
s6-linux-init_version = 1.0.7.3 s6-linux-init_version = 1.0.7.3
s6-rc_version = 0.5.3.1 s6-rc_version = 0.5.3.1
sed_version = 4.8 sed_version = 4.8
shadow_version = 4.8.1 shadow_version = 4.11.1
skalibs_version = 2.11.2.0 skalibs_version = 2.11.2.0
sysklogd_version = 1.5.1 sysklogd_version = 1.5.1
tar_version = 1.33 tar_version = 1.34
texinfo_version = 6.8 texinfo_version = 6.8
tzdata_version = 2021a tzdata_version = 2021e
u-boot_version = 2021.01 u-boot_version = 2021.01
udev-lfs_version = 20171102 udev-lfs_version = 20171102
util-linux_version = 2.36.1 util-linux_version = 2.36.1
vim_version = 8.2.2433 vim_version = 8.2.2433
wget_version = 1.21.2 wget_version = 1.21.3
wireless_tools_version = 29 wireless_tools_version = 29
wpa_supplicant_version = 2.9 wpa_supplicant_version = 2.9
XML-Parser_version = 2.46 XML-Parser_version = 2.46
xz_version = 5.2.5 xz_version = 5.2.5
zsh_version = 5.8 zsh_version = 5.8.1
zstd_version = 1.4.8 zstd_version = 1.5.2

0
kernel/config-aarch64-5.11.5.config → kernel/config-aarch64-5.19.3.config
View File

0
kernel/config-armv7l-5.11.5.config → kernel/config-armv7l-5.19.3.config
View File

0
kernel/config-i486-5.11.5.config → kernel/config-i486-5.19.3.config
View File

0
kernel/config-i686-5.11.5.config → kernel/config-i686-5.19.3.config
View File

0
kernel/config-i786-5.11.5.config → kernel/config-i786-5.19.3.config
View File

0
kernel/config-riscv64-5.11.5.config → kernel/config-riscv64-5.19.3.config
View File

0
kernel/config-x86_64-5.14.6.config → kernel/config-x86_64-5.19.3.config
View File

18
world/ncurses/ncurses-nostrip.patch
View File

@ -1,11 +1,11 @@
diff -Naur ncurses-6.2.orig/configure ncurses-6.2/configure diff -Naur ncurses-6.3.orig/configure ncurses-6.3/configure
--- ncurses-6.2.orig/configure 2020-02-08 16:06:19.000000000 -0500 --- ncurses-6.3.orig/configure 2021-10-17 11:12:23.000000000 -0400
+++ ncurses-6.2/configure 2021-02-02 23:19:21.212696811 -0500 +++ ncurses-6.3/configure 2022-05-10 13:31:50.225046310 -0400
@@ -15348,12 +15348,7 @@ @@ -16501,12 +16501,7 @@
echo "$as_me:15348: result: $with_stripping" >&5 echo "$as_me:16501: result: $enable_stripping" >&5
echo "${ECHO_T}$with_stripping" >&6 echo "${ECHO_T}$enable_stripping" >&6
-if test "$with_stripping" = yes -if test "$enable_stripping" = yes
-then -then
- INSTALL_OPT_S="-s" - INSTALL_OPT_S="-s"
-else -else
@ -13,5 +13,5 @@ diff -Naur ncurses-6.2.orig/configure ncurses-6.2/configure
-fi -fi
+INSTALL_OPT_S= +INSTALL_OPT_S=
: ${INSTALL:=install} : "${INSTALL:=install}"
echo "$as_me:15359: checking if install accepts -p option" >&5 echo "$as_me:16512: checking if install accepts -p option" >&5

1
world/shadow/Makefile
View File

@ -3,7 +3,6 @@
# #
distname = shadow distname = shadow
patches += shadow-fixes-consolidated.patch patches += shadow-fixes-consolidated.patch
patches += shadow-default-shell.patch
post_install = rm -rf $(DESTDIR)/sbin/nologin $(DESTDIR)/usr/share/man/man8/nologin.8 post_install = rm -rf $(DESTDIR)/sbin/nologin $(DESTDIR)/usr/share/man/man8/nologin.8

11
world/shadow/shadow-default-shell.patch
View File

@ -1,11 +0,0 @@
diff -Naur shadow-4.8.1.orig/etc/useradd shadow-4.8.1/etc/useradd
--- shadow-4.8.1.orig/etc/useradd 2019-07-23 11:26:08.000000000 -0400
+++ shadow-4.8.1/etc/useradd 2020-09-11 07:30:55.851727165 -0400
@@ -3,6 +3,6 @@
HOME=/home
INACTIVE=-1
EXPIRE=
-SHELL=/bin/bash
+SHELL=/bin/zsh
SKEL=/etc/skel
CREATE_MAIL_SPOOL=yes

177
world/shadow/shadow-fixes-consolidated.patch
View File

@ -1,6 +1,6 @@
diff -Naur shadow-4.8.1.orig/etc/login.defs shadow-4.8.1/etc/login.defs diff -Naur shadow-4.11.1.orig/etc/login.defs shadow-4.11.1/etc/login.defs
--- shadow-4.8.1.orig/etc/login.defs 2020-01-17 10:47:56.000000000 -0500 --- shadow-4.11.1.orig/etc/login.defs 2021-12-24 11:31:16.000000000 -0500
+++ shadow-4.8.1/etc/login.defs 2020-05-25 11:06:19.067206935 -0400 +++ shadow-4.11.1/etc/login.defs 2022-05-10 16:20:28.972005919 -0400
@@ -127,7 +127,7 @@ @@ -127,7 +127,7 @@
# Directory where mailboxes reside, _or_ name of file, relative to the # Directory where mailboxes reside, _or_ name of file, relative to the
# home directory. If you _do_ define both, MAIL_DIR takes precedence. # home directory. If you _do_ define both, MAIL_DIR takes precedence.
@ -10,7 +10,18 @@ diff -Naur shadow-4.8.1.orig/etc/login.defs shadow-4.8.1/etc/login.defs
#MAIL_FILE .mail #MAIL_FILE .mail
# #
@@ -332,7 +332,7 @@ @@ -158,8 +158,8 @@
# *REQUIRED* The default PATH settings, for superuser and normal users.
#
# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH PATH=/bin:/usr/bin
+ENV_SUPATH PATH=/usr/sbin:/usr/bin
+ENV_PATH PATH=/usr/bin
#
# Terminal permissions
@@ -334,7 +334,7 @@
# Note: If you use PAM, it is recommended to use a value consistent with # Note: If you use PAM, it is recommended to use a value consistent with
# the PAM modules configuration. # the PAM modules configuration.
# #
@ -19,20 +30,10 @@ diff -Naur shadow-4.8.1.orig/etc/login.defs shadow-4.8.1/etc/login.defs
# #
# Only works if ENCRYPT_METHOD is set to SHA256 or SHA512. # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
diff -Naur shadow-4.8.1.orig/etc/useradd shadow-4.8.1/etc/useradd diff -Naur shadow-4.11.1.orig/man/cs/Makefile.in shadow-4.11.1/man/cs/Makefile.in
--- shadow-4.8.1.orig/etc/useradd 2019-07-23 11:26:08.000000000 -0400 --- shadow-4.11.1.orig/man/cs/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/etc/useradd 2020-05-25 11:06:30.814296977 -0400 +++ shadow-4.11.1/man/cs/Makefile.in 2022-05-10 16:19:44.511739589 -0400
@@ -1,5 +1,5 @@ @@ -326,12 +326,12 @@
# useradd defaults file
-GROUP=1000
+GROUP=999
HOME=/home
INACTIVE=-1
EXPIRE=
diff -Naur shadow-4.8.1.orig/man/cs/Makefile.in shadow-4.8.1/man/cs/Makefile.in
--- shadow-4.8.1.orig/man/cs/Makefile.in 2020-01-23 15:57:50.000000000 -0500
+++ shadow-4.8.1/man/cs/Makefile.in 2020-05-25 11:04:37.318638289 -0400
@@ -317,12 +317,12 @@
man8/groupadd.8 \ man8/groupadd.8 \
man8/groupdel.8 \ man8/groupdel.8 \
man8/groupmod.8 \ man8/groupmod.8 \
@ -47,10 +48,10 @@ diff -Naur shadow-4.8.1.orig/man/cs/Makefile.in shadow-4.8.1/man/cs/Makefile.in
man5/shadow.5 \ man5/shadow.5 \
man1/su.1 \ man1/su.1 \
man8/vipw.8 man8/vipw.8
diff -Naur shadow-4.8.1.orig/man/da/Makefile.in shadow-4.8.1/man/da/Makefile.in diff -Naur shadow-4.11.1.orig/man/da/Makefile.in shadow-4.11.1/man/da/Makefile.in
--- shadow-4.8.1.orig/man/da/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/da/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/da/Makefile.in 2020-05-25 11:04:37.331971292 -0400 +++ shadow-4.11.1/man/da/Makefile.in 2022-05-10 16:19:44.525073004 -0400
@@ -314,7 +314,7 @@ @@ -323,7 +323,7 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
# 2012.01.28 - activate manpages with more than 50% translated messages # 2012.01.28 - activate manpages with more than 50% translated messages
@ -59,10 +60,10 @@ diff -Naur shadow-4.8.1.orig/man/da/Makefile.in shadow-4.8.1/man/da/Makefile.in
man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \ man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
man8/vigr.8 man8/vipw.8 $(am__append_1) man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam = man_nopam =
diff -Naur shadow-4.8.1.orig/man/de/Makefile.in shadow-4.8.1/man/de/Makefile.in diff -Naur shadow-4.11.1.orig/man/de/Makefile.in shadow-4.11.1/man/de/Makefile.in
--- shadow-4.8.1.orig/man/de/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/de/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/de/Makefile.in 2020-05-25 11:04:37.305305285 -0400 +++ shadow-4.11.1/man/de/Makefile.in 2022-05-10 16:19:44.501739529 -0400
@@ -315,11 +315,11 @@ @@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ 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 \ man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
@ -77,10 +78,10 @@ diff -Naur shadow-4.8.1.orig/man/de/Makefile.in shadow-4.8.1/man/de/Makefile.in
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.8.1.orig/man/es/Makefile.in shadow-4.8.1/man/es/Makefile.in diff -Naur shadow-4.11.1.orig/man/es/Makefile.in shadow-4.11.1/man/es/Makefile.in
--- shadow-4.8.1.orig/man/es/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/es/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/es/Makefile.in 2020-05-25 11:04:37.311971787 -0400 +++ shadow-4.11.1/man/es/Makefile.in 2022-05-10 16:19:44.508406236 -0400
@@ -283,7 +283,7 @@ @@ -292,7 +292,7 @@
# man1/login.1 \ # man1/login.1 \
# man1/newgrp.1 \ # man1/newgrp.1 \
# man1/passwd.1 \ # man1/passwd.1 \
@ -89,10 +90,10 @@ diff -Naur shadow-4.8.1.orig/man/es/Makefile.in shadow-4.8.1/man/es/Makefile.in
# man1/su.1 \ # man1/su.1 \
# man8/vigr.8 \ # man8/vigr.8 \
# man8/vipw.8 # man8/vipw.8
diff -Naur shadow-4.8.1.orig/man/fr/Makefile.in shadow-4.8.1/man/fr/Makefile.in diff -Naur shadow-4.11.1.orig/man/fr/Makefile.in shadow-4.11.1/man/fr/Makefile.in
--- shadow-4.8.1.orig/man/fr/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/fr/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/fr/Makefile.in 2020-05-25 11:04:37.335304543 -0400 +++ shadow-4.11.1/man/fr/Makefile.in 2022-05-10 16:19:44.531739711 -0400
@@ -317,11 +317,11 @@ @@ -326,11 +326,11 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ 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 \ man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
@ -107,10 +108,10 @@ diff -Naur shadow-4.8.1.orig/man/fr/Makefile.in shadow-4.8.1/man/fr/Makefile.in
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.8.1.orig/man/hu/Makefile.in shadow-4.8.1/man/hu/Makefile.in diff -Naur shadow-4.11.1.orig/man/hu/Makefile.in shadow-4.11.1/man/hu/Makefile.in
--- shadow-4.8.1.orig/man/hu/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/hu/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/hu/Makefile.in 2020-05-25 11:04:37.335304543 -0400 +++ shadow-4.11.1/man/hu/Makefile.in 2022-05-10 16:19:44.528406357 -0400
@@ -312,12 +312,12 @@ @@ -321,12 +321,12 @@
man_MANS = \ man_MANS = \
man1/chsh.1 \ man1/chsh.1 \
man1/gpasswd.1 \ man1/gpasswd.1 \
@ -125,10 +126,10 @@ diff -Naur shadow-4.8.1.orig/man/hu/Makefile.in shadow-4.8.1/man/hu/Makefile.in
man1/sg.1 \ man1/sg.1 \
man1/su.1 man1/su.1
diff -Naur shadow-4.8.1.orig/man/it/Makefile.in shadow-4.8.1/man/it/Makefile.in diff -Naur shadow-4.11.1.orig/man/it/Makefile.in shadow-4.11.1/man/it/Makefile.in
--- shadow-4.8.1.orig/man/it/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/it/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/it/Makefile.in 2020-05-25 11:04:37.338637794 -0400 +++ shadow-4.11.1/man/it/Makefile.in 2022-05-10 16:19:44.531739711 -0400
@@ -315,11 +315,11 @@ @@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ 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 \ man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
@ -143,10 +144,10 @@ diff -Naur shadow-4.8.1.orig/man/it/Makefile.in shadow-4.8.1/man/it/Makefile.in
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.8.1.orig/man/ja/Makefile.in shadow-4.8.1/man/ja/Makefile.in diff -Naur shadow-4.11.1.orig/man/ja/Makefile.in shadow-4.11.1/man/ja/Makefile.in
--- shadow-4.8.1.orig/man/ja/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/ja/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/ja/Makefile.in 2020-05-25 11:04:37.298638783 -0400 +++ shadow-4.11.1/man/ja/Makefile.in 2022-05-10 16:19:44.495072821 -0400
@@ -313,10 +313,10 @@ @@ -322,10 +322,10 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \ 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 \ man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
@ -159,10 +160,10 @@ diff -Naur shadow-4.8.1.orig/man/ja/Makefile.in shadow-4.8.1/man/ja/Makefile.in
man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \ man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \ man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1) man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
diff -Naur shadow-4.8.1.orig/man/ko/Makefile.in shadow-4.8.1/man/ko/Makefile.in diff -Naur shadow-4.11.1.orig/man/ko/Makefile.in shadow-4.11.1/man/ko/Makefile.in
--- shadow-4.8.1.orig/man/ko/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/ko/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/ko/Makefile.in 2020-05-25 11:04:37.321971539 -0400 +++ shadow-4.11.1/man/ko/Makefile.in 2022-05-10 16:19:44.518406297 -0400
@@ -312,9 +312,9 @@ @@ -321,9 +321,9 @@
man_MANS = \ man_MANS = \
man1/chfn.1 \ man1/chfn.1 \
man1/chsh.1 \ man1/chsh.1 \
@ -174,10 +175,10 @@ diff -Naur shadow-4.8.1.orig/man/ko/Makefile.in shadow-4.8.1/man/ko/Makefile.in
man1/su.1 \ man1/su.1 \
man8/vigr.8 \ man8/vigr.8 \
man8/vipw.8 man8/vipw.8
diff -Naur shadow-4.8.1.orig/man/Makefile.in shadow-4.8.1/man/Makefile.in diff -Naur shadow-4.11.1.orig/man/Makefile.in shadow-4.11.1/man/Makefile.in
--- shadow-4.8.1.orig/man/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/Makefile.in 2020-05-25 11:04:37.305305285 -0400 +++ shadow-4.11.1/man/Makefile.in 2022-05-10 16:19:44.498406175 -0400
@@ -383,11 +383,11 @@ @@ -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 @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 \ 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 \ man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
@ -192,10 +193,10 @@ diff -Naur shadow-4.8.1.orig/man/Makefile.in shadow-4.8.1/man/Makefile.in
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man5/suauth.5 man8/useradd.8 \ man3/shadow.3 man5/shadow.5 man5/suauth.5 man8/useradd.8 \
man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \ man8/userdel.8 man8/usermod.8 man8/vigr.8 man8/vipw.8 \
diff -Naur shadow-4.8.1.orig/man/pl/Makefile.in shadow-4.8.1/man/pl/Makefile.in diff -Naur shadow-4.11.1.orig/man/pl/Makefile.in shadow-4.11.1/man/pl/Makefile.in
--- shadow-4.8.1.orig/man/pl/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/pl/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/pl/Makefile.in 2020-05-25 11:04:37.308638536 -0400 +++ shadow-4.11.1/man/pl/Makefile.in 2022-05-10 16:19:44.501739529 -0400
@@ -316,8 +316,8 @@ @@ -325,8 +325,8 @@
# 2012.01.28 - activate manpages with more than 50% translated messages # 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 \ man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
@ -206,10 +207,10 @@ diff -Naur shadow-4.8.1.orig/man/pl/Makefile.in shadow-4.8.1/man/pl/Makefile.in
man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \ man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
man8/vipw.8 $(am__append_1) man8/vipw.8 $(am__append_1)
diff -Naur shadow-4.8.1.orig/man/pt_BR/Makefile.in shadow-4.8.1/man/pt_BR/Makefile.in diff -Naur shadow-4.11.1.orig/man/pt_BR/Makefile.in shadow-4.11.1/man/pt_BR/Makefile.in
--- shadow-4.8.1.orig/man/pt_BR/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/pt_BR/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/pt_BR/Makefile.in 2020-05-25 11:04:37.298638783 -0400 +++ shadow-4.11.1/man/pt_BR/Makefile.in 2022-05-10 16:19:44.491739468 -0400
@@ -314,7 +314,7 @@ @@ -323,7 +323,7 @@
man8/groupadd.8 \ man8/groupadd.8 \
man8/groupdel.8 \ man8/groupdel.8 \
man8/groupmod.8 \ man8/groupmod.8 \
@ -218,10 +219,10 @@ diff -Naur shadow-4.8.1.orig/man/pt_BR/Makefile.in shadow-4.8.1/man/pt_BR/Makefi
man5/shadow.5 man5/shadow.5
EXTRA_DIST = $(man_MANS) EXTRA_DIST = $(man_MANS)
diff -Naur shadow-4.8.1.orig/man/ru/Makefile.in shadow-4.8.1/man/ru/Makefile.in diff -Naur shadow-4.11.1.orig/man/ru/Makefile.in shadow-4.11.1/man/ru/Makefile.in
--- shadow-4.8.1.orig/man/ru/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/ru/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/ru/Makefile.in 2020-05-25 11:04:37.315305037 -0400 +++ shadow-4.11.1/man/ru/Makefile.in 2022-05-10 16:19:44.511739589 -0400
@@ -315,11 +315,11 @@ @@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ 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 \ man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
@ -236,10 +237,10 @@ diff -Naur shadow-4.8.1.orig/man/ru/Makefile.in shadow-4.8.1/man/ru/Makefile.in
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.8.1.orig/man/sv/Makefile.in shadow-4.8.1/man/sv/Makefile.in diff -Naur shadow-4.11.1.orig/man/sv/Makefile.in shadow-4.11.1/man/sv/Makefile.in
--- shadow-4.8.1.orig/man/sv/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/sv/Makefile.in 2022-01-02 22:09:23.000000000 -0500
+++ shadow-4.8.1/man/sv/Makefile.in 2020-05-25 11:04:37.325304790 -0400 +++ shadow-4.11.1/man/sv/Makefile.in 2022-05-10 16:19:44.518406297 -0400
@@ -316,10 +316,10 @@ @@ -325,10 +325,10 @@
# 2012.01.28 - activate manpages with more than 50% translated messages # 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 \ man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
@ -253,10 +254,10 @@ diff -Naur shadow-4.8.1.orig/man/sv/Makefile.in shadow-4.8.1/man/sv/Makefile.in
man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \ man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
man8/vigr.8 man8/vipw.8 $(am__append_1) man8/vigr.8 man8/vipw.8 $(am__append_1)
man_nopam = \ man_nopam = \
diff -Naur shadow-4.8.1.orig/man/tr/Makefile.in shadow-4.8.1/man/tr/Makefile.in diff -Naur shadow-4.11.1.orig/man/tr/Makefile.in shadow-4.11.1/man/tr/Makefile.in
--- shadow-4.8.1.orig/man/tr/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/tr/Makefile.in 2022-01-02 22:09:24.000000000 -0500
+++ shadow-4.8.1/man/tr/Makefile.in 2020-05-25 11:04:37.328638041 -0400 +++ shadow-4.11.1/man/tr/Makefile.in 2022-05-10 16:19:44.521739650 -0400
@@ -317,7 +317,7 @@ @@ -326,7 +326,7 @@
man8/groupmod.8 \ man8/groupmod.8 \
man1/login.1 \ man1/login.1 \
man1/passwd.1 \ man1/passwd.1 \
@ -265,10 +266,10 @@ diff -Naur shadow-4.8.1.orig/man/tr/Makefile.in shadow-4.8.1/man/tr/Makefile.in
man5/shadow.5 \ man5/shadow.5 \
man1/su.1 \ man1/su.1 \
man8/useradd.8 \ man8/useradd.8 \
diff -Naur shadow-4.8.1.orig/man/zh_CN/Makefile.in shadow-4.8.1/man/zh_CN/Makefile.in diff -Naur shadow-4.11.1.orig/man/zh_CN/Makefile.in shadow-4.11.1/man/zh_CN/Makefile.in
--- shadow-4.8.1.orig/man/zh_CN/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/zh_CN/Makefile.in 2022-01-02 22:09:24.000000000 -0500
+++ shadow-4.8.1/man/zh_CN/Makefile.in 2020-05-25 11:04:37.295305532 -0400 +++ shadow-4.11.1/man/zh_CN/Makefile.in 2022-05-10 16:19:44.488406114 -0400
@@ -315,11 +315,11 @@ @@ -324,11 +324,11 @@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \ 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 \ man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
@ -283,10 +284,10 @@ diff -Naur shadow-4.8.1.orig/man/zh_CN/Makefile.in shadow-4.8.1/man/zh_CN/Makefi
man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \ man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \ man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \ man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
diff -Naur shadow-4.8.1.orig/man/zh_TW/Makefile.in shadow-4.8.1/man/zh_TW/Makefile.in diff -Naur shadow-4.11.1.orig/man/zh_TW/Makefile.in shadow-4.11.1/man/zh_TW/Makefile.in
--- shadow-4.8.1.orig/man/zh_TW/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/man/zh_TW/Makefile.in 2022-01-02 22:09:24.000000000 -0500
+++ shadow-4.8.1/man/zh_TW/Makefile.in 2020-05-25 11:04:37.321971539 -0400 +++ shadow-4.11.1/man/zh_TW/Makefile.in 2022-05-10 16:19:44.515072943 -0400
@@ -319,7 +319,7 @@ @@ -328,7 +328,7 @@
man8/groupadd.8 \ man8/groupadd.8 \
man8/groupdel.8 \ man8/groupdel.8 \
man8/groupmod.8 \ man8/groupmod.8 \
@ -295,15 +296,15 @@ diff -Naur shadow-4.8.1.orig/man/zh_TW/Makefile.in shadow-4.8.1/man/zh_TW/Makefi
man1/su.1 \ man1/su.1 \
man8/useradd.8 \ man8/useradd.8 \
man8/userdel.8 \ man8/userdel.8 \
diff -Naur shadow-4.8.1.orig/src/Makefile.in shadow-4.8.1/src/Makefile.in diff -Naur shadow-4.11.1.orig/src/Makefile.in shadow-4.11.1/src/Makefile.in
--- shadow-4.8.1.orig/src/Makefile.in 2020-01-23 15:57:50.000000000 -0500 --- shadow-4.11.1.orig/src/Makefile.in 2022-01-02 22:09:24.000000000 -0500
+++ shadow-4.8.1/src/Makefile.in 2020-05-25 11:04:37.138644519 -0400 +++ shadow-4.11.1/src/Makefile.in 2022-05-10 16:19:44.248404656 -0400
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
POST_UNINSTALL = : POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
-bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) $(am__EXEEXT_1) -bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) $(am__EXEEXT_1) \
+bin_PROGRAMS = login$(EXEEXT) $(am__EXEEXT_1) +bin_PROGRAMS = login$(EXEEXT) $(am__EXEEXT_1) \
$(am__EXEEXT_2)
sbin_PROGRAMS = nologin$(EXEEXT) sbin_PROGRAMS = nologin$(EXEEXT)
ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \ ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \

10
world/usr.bin/42/src/42.c
View File

@ -44,19 +44,15 @@ int main(int argc, char *argv[]) {
// Determine the number of files // Determine the number of files
while ((dir = readdir(d)) != NULL) { while ((dir = readdir(d)) != NULL) {
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) { n++;
} else {
n++;
}
} }
rewinddir(d); rewinddir(d);
char *filesList[n]; char *filesList[n - 2]; // subtract two because of . and ..
// Put file names into the array // Put file names into the array
while ((dir = readdir(d)) != NULL) { while ((dir = readdir(d)) != NULL) {
if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) { if (strcmp(dir->d_name, ".") && strcmp(dir->d_name, "..")) {
} else {
filesList[i] = strdup(dir->d_name); filesList[i] = strdup(dir->d_name);
i++; i++;
} }

1
world/wget/Makefile
View File

@ -11,5 +11,6 @@ config_opts += --sysconfdir=/etc
config_opts += --with-ssl=openssl config_opts += --with-ssl=openssl
config_opts += --without-libpsl config_opts += --without-libpsl
config_opts += --disable-pcre2 config_opts += --disable-pcre2
config_opts += --disable-iri
include targets.mk include targets.mk