Added hhl.cargo.mk; Replace su with Rust rewrite; Add jah sudo
replacement; Rewrite `42` in Rust; Update kernel config; Create target for upgrade archives; Various other small bugfixes;
This commit is contained in:
Nathan Fisher
parent
d80003ff1d
commit
08734804d6
3
Makefile
3
Makefile
@ -141,9 +141,6 @@ toolchain-hhl-$(os_version)-$(arch).tbz: $(tooldir)/.built smalltools
|
|||||||
toolchain-hhl-$(os_version)-$(arch).txz: $(tooldir)/.built smalltools
|
toolchain-hhl-$(os_version)-$(arch).txz: $(tooldir)/.built smalltools
|
||||||
cd build && paxtar -M uidgid -cJf $(basedir)/$@ toolchain-$(arch)
|
cd build && paxtar -M uidgid -cJf $(basedir)/$@ toolchain-$(arch)
|
||||||
|
|
||||||
rootfs-hhl-update-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped
|
|
||||||
cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(basedirs)
|
|
||||||
|
|
||||||
rootfs-hhl-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped
|
rootfs-hhl-$(os_version)-$(arch).tgz: $(plists) $(build)/.stripped
|
||||||
cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(alldirs)
|
cd $(build) && paxtar -M uidgid -czf $(basedir)/$@ $(alldirs)
|
||||||
|
|
||||||
|
|||||||
38
config.mk
Normal file
38
config.mk
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
# Target architecture, IE the machine that the newly built system will run on. Supported targets are: i486
|
||||||
|
# i586
|
||||||
|
# i686
|
||||||
|
# x86_64 (most modern Intel and AMD based systems)
|
||||||
|
# armv7l (earlier Arm SBC's such as RPI and RPI2)
|
||||||
|
# aarch64 (later Arm SBC's such as RPI3 and RPI4)
|
||||||
|
# riscv64 (SiFive Unmatched, BeagleV)
|
||||||
|
arch = aarch64
|
||||||
|
|
||||||
|
# If building for rpi3/4 we can automatically configure and build u-boot
|
||||||
|
# by setting rpi to 1
|
||||||
|
# rpi = 1
|
||||||
|
|
||||||
|
# Maximum make threads to run concurrently. For some packages on some
|
||||||
|
# architectures this will be automatically overridden.
|
||||||
|
makeflags = -j8
|
||||||
|
|
||||||
|
# Optional bootstrap packages. HitchHiker ships with BSD paxtar, and it's syntax
|
||||||
|
# is used rather than GNU tar in certain places. To bootstrap on systems other
|
||||||
|
# than HitchHiker it is a good idea to set build_pax to 1.
|
||||||
|
build_pax = 0
|
||||||
|
|
||||||
|
# If building on HitchHiker, Perl will need to be built as it is used repeatedly
|
||||||
|
# during the build of other packages. If perl is installed via pkgsrc this can
|
||||||
|
# be skipped.
|
||||||
|
build_perl = 0
|
||||||
|
|
||||||
|
# If building on HitchHiker, intltool is not part of the base system as it
|
||||||
|
# depends on the XML::Parser perl module.
|
||||||
|
build_intltool = 0
|
||||||
|
|
||||||
|
# Again, if building on HitchHiker, Python must be built either here or via
|
||||||
|
# pkgsrc.
|
||||||
|
build_python = 0
|
||||||
|
|
||||||
|
# If the version of `file` installed on the host differs from the one supplied
|
||||||
|
# by HitchHiker, it may be necessary to build `file` as well
|
||||||
|
build_file = 1
|
||||||
39
include/mk/hhl.cargo.mk
Normal file
39
include/mk/hhl.cargo.mk
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
# hhl.cargo.mk
|
||||||
|
# Copyright 2023 Nathan Fisher <nfisher.sr@gmail.com>
|
||||||
|
#
|
||||||
|
include world.mk
|
||||||
|
include hhl.doc.mk
|
||||||
|
include hhl.locale.mk
|
||||||
|
include hhl.colors.mk
|
||||||
|
|
||||||
|
ifeq ($(arch), riscv64)
|
||||||
|
rust_tgt = riscv64gc-unknown-linux-musl
|
||||||
|
CARGO = cargo +nightly
|
||||||
|
BUILD_STD = -Zbuild-std=std,panic_abort
|
||||||
|
else
|
||||||
|
rust_tgt = $(arch)-unknown-linux-musl
|
||||||
|
CARGO = cargo
|
||||||
|
endif
|
||||||
|
|
||||||
|
tgt_dir = $(global_objdir)/$(progname)/target
|
||||||
|
export CARGO_TARGET_DIR = $(tgt_dir)
|
||||||
|
|
||||||
|
cargo_out = $(patsubst %,$(tgt_dir)/$(rust_tgt)/release/%,$(bins))
|
||||||
|
|
||||||
|
install: $(cargo_out) $(docs) $(locales) | $(bindir)
|
||||||
|
install $(perms) $(cargo_out) $(bindir)/
|
||||||
|
$(info $(grn)=== Finished building $(progname) ===$(reset))
|
||||||
|
|
||||||
|
$(bindir):
|
||||||
|
install -d $@
|
||||||
|
|
||||||
|
$(cargo_out):
|
||||||
|
$(info $(grn)=== Building for ${progname} ===$(reset))
|
||||||
|
${pre_build}
|
||||||
|
$(CARGO) build $(BUILD_STD) --target=$(rust_tgt) --release
|
||||||
|
${post_build}
|
||||||
|
|
||||||
|
clean:
|
||||||
|
cargo clean
|
||||||
|
|
||||||
|
.PHONY: install clean
|
||||||
@ -3,10 +3,10 @@
|
|||||||
#
|
#
|
||||||
internal = true
|
internal = true
|
||||||
src ?= ./src
|
src ?= ./src
|
||||||
objdir ?= ${global_objdir}/${progname}
|
objdir ?= $(global_objdir)/$(progname)
|
||||||
srcs ?= $(wildcard ${src}/*.c)
|
srcs ?= $(wildcard $(src)/*.c)
|
||||||
objs ?= $(patsubst ${src}/%.c,${objdir}/%.o,${srcs})
|
objs ?= $(patsubst $(src)/%.c,$(objdir)/%.o,$(srcs))
|
||||||
hdrs ?= $(wildcard ${src}/*.h)
|
hdrs ?= $(wildcard $(src)/*.h)
|
||||||
o_lvl ?= -O2
|
o_lvl ?= -O2
|
||||||
include world.mk
|
include world.mk
|
||||||
include hhl.doc.mk
|
include hhl.doc.mk
|
||||||
@ -17,26 +17,26 @@ AR = $(tgt)-ar
|
|||||||
RANLIB = $(tgt)-ranlib
|
RANLIB = $(tgt)-ranlib
|
||||||
BLD_CC ?= cc
|
BLD_CC ?= cc
|
||||||
|
|
||||||
ifeq (${sbin},1)
|
ifeq ($(sbin),1)
|
||||||
bindir = ${sbindir}
|
bindir = $(sbindir)
|
||||||
binprog = ${sbindir}/${progname}
|
binprog = $(sbindir)/$(progname)
|
||||||
else
|
else
|
||||||
binprog = ${bindir}/${progname}
|
binprog = $(bindir)/$(progname)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ldflags += -I${src}
|
ldflags += -I$(src)
|
||||||
cflags += ${o_lvl}
|
cflags += $(o_lvl)
|
||||||
cflags += --sysroot=$(DESTDIR)
|
cflags += --sysroot=$(DESTDIR)
|
||||||
|
|
||||||
ifeq (${hhl_source},1)
|
ifeq ($(hhl_source),1)
|
||||||
cflags += -std=c99
|
cflags += -std=c99
|
||||||
cflags += -Wall
|
cflags += -Wall
|
||||||
cflags += -pedantic
|
cflags += -pedantic
|
||||||
endif
|
endif
|
||||||
|
|
||||||
VPATH += ${src}
|
VPATH += $(src)
|
||||||
|
|
||||||
install: ${binprog} ${docs} ${locales} | ${binlinks} ${manlinks}
|
install: $(binprog) $(docs) $(locales) | $(binlinks) $(manlinks)
|
||||||
$(info $(grn)=== Finished building $(progname) ===$(reset))
|
$(info $(grn)=== Finished building $(progname) ===$(reset))
|
||||||
|
|
||||||
ifeq (${onestage},true)
|
ifeq (${onestage},true)
|
||||||
@ -59,10 +59,10 @@ ${objdir}/%.o: ${src}/%.c ${hdrs} | ${objdir}
|
|||||||
$(CC) ${cppflags} ${cflags} ${ldflags} -o $@ -c $<
|
$(CC) ${cppflags} ${cflags} ${ldflags} -o $@ -c $<
|
||||||
endif
|
endif
|
||||||
|
|
||||||
${binlinks}: ${binprog}
|
$(binlinks): $(binprog)
|
||||||
ln -sf ${progname} $@
|
ln -sf $(progname) $@
|
||||||
|
|
||||||
${bindir}:
|
$(bindir):
|
||||||
install -d $@
|
install -d $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|||||||
@ -15,17 +15,6 @@ ifndef colormk
|
|||||||
include hhl.colors.mk
|
include hhl.colors.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(filter armv6 armv7l aarch64, $(arch)), $(arch))
|
|
||||||
tgt = $(arch)-unknown-linux-gnueabi
|
|
||||||
else
|
|
||||||
tgt = $(arch)-unknown-linux-gnu
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(filter armv7l aarch64, $(bld_arch)), $(bld_arch))
|
|
||||||
bld = $(bld_arch)-unknown-linux-gnueabi
|
|
||||||
else
|
|
||||||
bld = $(bld_arch)-unknown-linux-gnu
|
|
||||||
endif
|
|
||||||
ifeq ($(filter armv6 armv7l aarch64, $(arch)), $(arch))
|
ifeq ($(filter armv6 armv7l aarch64, $(arch)), $(arch))
|
||||||
tgt = $(arch)-hitchhiker-linux-musleabihf
|
tgt = $(arch)-hitchhiker-linux-musleabihf
|
||||||
else
|
else
|
||||||
|
|||||||
@ -56,7 +56,7 @@ libnl_version = 3.5.0
|
|||||||
libressl_version = 3.0.2
|
libressl_version = 3.0.2
|
||||||
libtool_version = 2.4.7
|
libtool_version = 2.4.7
|
||||||
libz_version = 1.2.8.2015.12.26
|
libz_version = 1.2.8.2015.12.26
|
||||||
linux_version = 6.1.7
|
linux_version = 6.1.12
|
||||||
linux-firmware_version = 20220815
|
linux-firmware_version = 20220815
|
||||||
linux_rpi_version = 5.4.45
|
linux_rpi_version = 5.4.45
|
||||||
m4_version = 1.4.19
|
m4_version = 1.4.19
|
||||||
|
|||||||
10788
kernel/config-x86_64-6.1.12.config
Normal file
10788
kernel/config-x86_64-6.1.12.config
Normal file
File diff suppressed because it is too large
Load Diff
@ -4,9 +4,6 @@
|
|||||||
|
|
||||||
include toolchain.mk
|
include toolchain.mk
|
||||||
|
|
||||||
ifeq ($(build_gawk), 1)
|
|
||||||
subdirs += gawk
|
|
||||||
endif
|
|
||||||
ifeq ($(build_pax), 1)
|
ifeq ($(build_pax), 1)
|
||||||
subdirs += pax
|
subdirs += pax
|
||||||
endif
|
endif
|
||||||
|
|||||||
@ -3,19 +3,13 @@
|
|||||||
#
|
#
|
||||||
distname = gcc
|
distname = gcc
|
||||||
include toolchain.mk
|
include toolchain.mk
|
||||||
ifeq ($(build_fortran), 1)
|
|
||||||
fortran = ',fortran'
|
|
||||||
endif
|
|
||||||
objdir = $(global_objdir)/gcc-pass2
|
objdir = $(global_objdir)/gcc-pass2
|
||||||
config_opts += --target=$(tgt)
|
config_opts += --target=$(tgt)
|
||||||
config_opts += --with-sysroot=$(build)
|
config_opts += --with-sysroot=$(build)
|
||||||
config_opts += --enable-languages=c,c++${fortran}
|
config_opts += --enable-languages=c,c++,fortran
|
||||||
config_opts += --disable-multilib
|
config_opts += --disable-multilib
|
||||||
config_opts += --disable-bootstrap
|
config_opts += --disable-bootstrap
|
||||||
# For musl
|
# For musl
|
||||||
#config_opts += --disable-libsanitizer
|
|
||||||
ifneq ($(filter i686 x86_64, $(arch)), $(arch))
|
|
||||||
config_opts += --disable-libsanitizer
|
config_opts += --disable-libsanitizer
|
||||||
endif
|
|
||||||
|
|
||||||
include targets.mk
|
include targets.mk
|
||||||
|
|||||||
@ -32,16 +32,13 @@ subdirs += bison
|
|||||||
subdirs += flex
|
subdirs += flex
|
||||||
subdirs += libtool
|
subdirs += libtool
|
||||||
subdirs += gdbm
|
subdirs += gdbm
|
||||||
subdirs += pcre
|
#subdirs += pcre
|
||||||
subdirs += zsh
|
#subdirs += zsh
|
||||||
subdirs += inetutils
|
subdirs += inetutils
|
||||||
#subdirs += perl
|
|
||||||
subdirs += autoconf
|
subdirs += autoconf
|
||||||
subdirs += automake
|
subdirs += automake
|
||||||
subdirs += gperf
|
#subdirs += gperf
|
||||||
subdirs += expat
|
subdirs += expat
|
||||||
#subdirs += xml-parser
|
|
||||||
#subdirs += intltool
|
|
||||||
subdirs += kmod
|
subdirs += kmod
|
||||||
subdirs += gettext
|
subdirs += gettext
|
||||||
# for musl
|
# for musl
|
||||||
@ -53,12 +50,8 @@ subdirs += musl-obstack
|
|||||||
subdirs += elfutils
|
subdirs += elfutils
|
||||||
subdirs += libffi
|
subdirs += libffi
|
||||||
subdirs += gawk
|
subdirs += gawk
|
||||||
#subdirs += libressl
|
|
||||||
subdirs += openssl
|
subdirs += openssl
|
||||||
subdirs += wget
|
subdirs += wget
|
||||||
#subdirs += python
|
|
||||||
#subdirs += ninja
|
|
||||||
#subdirs += meson
|
|
||||||
subdirs += findutils
|
subdirs += findutils
|
||||||
subdirs += groff
|
subdirs += groff
|
||||||
subdirs += gzip
|
subdirs += gzip
|
||||||
@ -74,7 +67,6 @@ subdirs += e2fsprogs
|
|||||||
subdirs += util-linux
|
subdirs += util-linux
|
||||||
subdirs += grep
|
subdirs += grep
|
||||||
subdirs += sed
|
subdirs += sed
|
||||||
#subdirs += haveged
|
|
||||||
subdirs += eudev
|
subdirs += eudev
|
||||||
subdirs += skalibs
|
subdirs += skalibs
|
||||||
subdirs += execline
|
subdirs += execline
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Makefile - hhl - /usr/src/world/mksh
|
# Makefile - hhl - /usr/src/world/mksh
|
||||||
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
||||||
#
|
#
|
||||||
include ../../../config.mk
|
include ../../../config.mk
|
||||||
progname = mksh
|
progname = mksh
|
||||||
skeldir = ${confdir}/skel
|
skeldir = ${confdir}/skel
|
||||||
@ -17,6 +17,6 @@ ifeq (${arch},x86_64)
|
|||||||
cflags += -malign-data=abi
|
cflags += -malign-data=abi
|
||||||
endif
|
endif
|
||||||
|
|
||||||
post_build = install -Dm644 dot.mkshrc ${DESTDIR}/etc/skel
|
post_build = install -Dm644 dot.mkshrc ${DESTDIR}/etc/skel/.mkshrc
|
||||||
|
|
||||||
include hhl.cprog.mk
|
include hhl.cprog.mk
|
||||||
|
|||||||
@ -58,7 +58,7 @@ smores() (
|
|||||||
)
|
)
|
||||||
|
|
||||||
# customise your favourite editor here; the first one found is used
|
# customise your favourite editor here; the first one found is used
|
||||||
for EDITOR in "${EDITOR:-}" jupp jstar mcedit ed vi; do
|
for EDITOR in "${EDITOR:-}" xvi kilo nano vim neovim emacs; do
|
||||||
EDITOR=$(\\builtin whence -p "$EDITOR") || EDITOR=
|
EDITOR=$(\\builtin whence -p "$EDITOR") || EDITOR=
|
||||||
[[ -n $EDITOR && -x $EDITOR ]] && break
|
[[ -n $EDITOR && -x $EDITOR ]] && break
|
||||||
EDITOR=
|
EDITOR=
|
||||||
|
|||||||
18
world/bin/su/.cargo/config.toml
Normal file
18
world/bin/su/.cargo/config.toml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
[target.aarch64-unknown-linux-musl]
|
||||||
|
linker = "aarch64-hitchhiker-linux-musleabihf-gcc"
|
||||||
|
|
||||||
|
[target.riscv64gc-unknown-linux-musl]
|
||||||
|
rustflags = [
|
||||||
|
"-C", "target-feature=-crt-static"
|
||||||
|
]
|
||||||
|
linker = "riscv64-hitchhiker-linux-musl-gcc"
|
||||||
|
ar = "riscv64-hitchhiker-linux-musl-ar"
|
||||||
|
|
||||||
|
[target.i686-unknown-linux-musl]
|
||||||
|
linker = "i686-hitchhiker-linux-musl-gcc"
|
||||||
|
|
||||||
|
[target.i586-unknown-linux-musl]
|
||||||
|
linker = "i586-hitchhiker-linux-musl-gcc"
|
||||||
|
|
||||||
|
[target.x86_64-unknown-linux-musl]
|
||||||
|
linker = "x86_64-hitchhiker-linux-musl-gcc"
|
||||||
99
world/bin/su/Cargo.lock
generated
Normal file
99
world/bin/su/Cargo.lock
generated
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
# This file is automatically @generated by Cargo.
|
||||||
|
# It is not intended for manual editing.
|
||||||
|
version = 3
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bitflags"
|
||||||
|
version = "1.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap"
|
||||||
|
version = "4.1.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"clap_lex",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap_lex"
|
||||||
|
version = "0.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
|
||||||
|
dependencies = [
|
||||||
|
"os_str_bytes",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libc"
|
||||||
|
version = "0.2.139"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libcrypt-rs"
|
||||||
|
version = "0.1.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "39b3d7c612f85d15ec030b01eb7e6e89cee1dfe04ce9ba7c09f01958f54489ac"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "os_str_bytes"
|
||||||
|
version = "6.4.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rpassword"
|
||||||
|
version = "7.2.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"rtoolbox",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rtoolbox"
|
||||||
|
version = "0.0.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"winapi",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "su"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"clap",
|
||||||
|
"libc",
|
||||||
|
"libcrypt-rs",
|
||||||
|
"rpassword",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi"
|
||||||
|
version = "0.3.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||||
|
dependencies = [
|
||||||
|
"winapi-i686-pc-windows-gnu",
|
||||||
|
"winapi-x86_64-pc-windows-gnu",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-i686-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-x86_64-pc-windows-gnu"
|
||||||
|
version = "0.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
22
world/bin/su/Cargo.toml
Normal file
22
world/bin/su/Cargo.toml
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
[package]
|
||||||
|
name = "su"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
libc = "0.2"
|
||||||
|
libcrypt-rs = "0.1"
|
||||||
|
rpassword = "7.2"
|
||||||
|
|
||||||
|
[dependencies.clap]
|
||||||
|
version = "4.1"
|
||||||
|
default_features = false
|
||||||
|
features = ["std", "help", "usage", "error-context"]
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
codegen-units = 1
|
||||||
|
strip = true
|
||||||
|
lto = true
|
||||||
|
panic = "abort"
|
||||||
675
world/bin/su/LICENSE
Normal file
675
world/bin/su/LICENSE
Normal file
@ -0,0 +1,675 @@
|
|||||||
|
### GNU GENERAL PUBLIC LICENSE
|
||||||
|
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc.
|
||||||
|
<https://fsf.org/>
|
||||||
|
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies of this
|
||||||
|
license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
### Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom
|
||||||
|
to share and change all versions of a program--to make sure it remains
|
||||||
|
free software for all its users. We, the Free Software Foundation, use
|
||||||
|
the GNU General Public License for most of our software; it applies
|
||||||
|
also to any other work released this way by its authors. You can apply
|
||||||
|
it to your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you
|
||||||
|
have certain responsibilities if you distribute copies of the
|
||||||
|
software, or if you modify it: responsibilities to respect the freedom
|
||||||
|
of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the
|
||||||
|
manufacturer can do so. This is fundamentally incompatible with the
|
||||||
|
aim of protecting users' freedom to change the software. The
|
||||||
|
systematic pattern of such abuse occurs in the area of products for
|
||||||
|
individuals to use, which is precisely where it is most unacceptable.
|
||||||
|
Therefore, we have designed this version of the GPL to prohibit the
|
||||||
|
practice for those products. If such problems arise substantially in
|
||||||
|
other domains, we stand ready to extend this provision to those
|
||||||
|
domains in future versions of the GPL, as needed to protect the
|
||||||
|
freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish
|
||||||
|
to avoid the special danger that patents applied to a free program
|
||||||
|
could make it effectively proprietary. To prevent this, the GPL
|
||||||
|
assures that patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
### TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
#### 0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds
|
||||||
|
of works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of
|
||||||
|
an exact copy. The resulting work is called a "modified version" of
|
||||||
|
the earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user
|
||||||
|
through a computer network, with no transfer of a copy, is not
|
||||||
|
conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices" to
|
||||||
|
the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
#### 1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. "Object code" means any non-source form of
|
||||||
|
a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users can
|
||||||
|
regenerate automatically from other parts of the Corresponding Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that same
|
||||||
|
work.
|
||||||
|
|
||||||
|
#### 2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not convey,
|
||||||
|
without conditions so long as your license otherwise remains in force.
|
||||||
|
You may convey covered works to others for the sole purpose of having
|
||||||
|
them make modifications exclusively for you, or provide you with
|
||||||
|
facilities for running those works, provided that you comply with the
|
||||||
|
terms of this License in conveying all material for which you do not
|
||||||
|
control copyright. Those thus making or running the covered works for
|
||||||
|
you must do so exclusively on your behalf, under your direction and
|
||||||
|
control, on terms that prohibit them from making any copies of your
|
||||||
|
copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under the
|
||||||
|
conditions stated below. Sublicensing is not allowed; section 10 makes
|
||||||
|
it unnecessary.
|
||||||
|
|
||||||
|
#### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such
|
||||||
|
circumvention is effected by exercising rights under this License with
|
||||||
|
respect to the covered work, and you disclaim any intention to limit
|
||||||
|
operation or modification of the work as a means of enforcing, against
|
||||||
|
the work's users, your or third parties' legal rights to forbid
|
||||||
|
circumvention of technological measures.
|
||||||
|
|
||||||
|
#### 4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
#### 5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
- a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
- b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under
|
||||||
|
section 7. This requirement modifies the requirement in section 4
|
||||||
|
to "keep intact all notices".
|
||||||
|
- c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
- d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
#### 6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms of
|
||||||
|
sections 4 and 5, provided that you also convey the machine-readable
|
||||||
|
Corresponding Source under the terms of this License, in one of these
|
||||||
|
ways:
|
||||||
|
|
||||||
|
- a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
- b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the Corresponding
|
||||||
|
Source from a network server at no charge.
|
||||||
|
- c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
- d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
- e) Convey the object code using peer-to-peer transmission,
|
||||||
|
provided you inform other peers where the object code and
|
||||||
|
Corresponding Source of the work are being offered to the general
|
||||||
|
public at no charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal,
|
||||||
|
family, or household purposes, or (2) anything designed or sold for
|
||||||
|
incorporation into a dwelling. In determining whether a product is a
|
||||||
|
consumer product, doubtful cases shall be resolved in favor of
|
||||||
|
coverage. For a particular product received by a particular user,
|
||||||
|
"normally used" refers to a typical or common use of that class of
|
||||||
|
product, regardless of the status of the particular user or of the way
|
||||||
|
in which the particular user actually uses, or expects or is expected
|
||||||
|
to use, the product. A product is a consumer product regardless of
|
||||||
|
whether the product has substantial commercial, industrial or
|
||||||
|
non-consumer uses, unless such uses represent the only significant
|
||||||
|
mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to
|
||||||
|
install and execute modified versions of a covered work in that User
|
||||||
|
Product from a modified version of its Corresponding Source. The
|
||||||
|
information must suffice to ensure that the continued functioning of
|
||||||
|
the modified object code is in no case prevented or interfered with
|
||||||
|
solely because modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or
|
||||||
|
updates for a work that has been modified or installed by the
|
||||||
|
recipient, or for the User Product in which it has been modified or
|
||||||
|
installed. Access to a network may be denied when the modification
|
||||||
|
itself materially and adversely affects the operation of the network
|
||||||
|
or violates the rules and protocols for communication across the
|
||||||
|
network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
#### 7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders
|
||||||
|
of that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
- a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
- b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
- c) Prohibiting misrepresentation of the origin of that material,
|
||||||
|
or requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
- d) Limiting the use for publicity purposes of names of licensors
|
||||||
|
or authors of the material; or
|
||||||
|
- e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
- f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions
|
||||||
|
of it) with contractual assumptions of liability to the recipient,
|
||||||
|
for any liability that these contractual assumptions directly
|
||||||
|
impose on those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions; the
|
||||||
|
above requirements apply either way.
|
||||||
|
|
||||||
|
#### 8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your license
|
||||||
|
from a particular copyright holder is reinstated (a) provisionally,
|
||||||
|
unless and until the copyright holder explicitly and finally
|
||||||
|
terminates your license, and (b) permanently, if the copyright holder
|
||||||
|
fails to notify you of the violation by some reasonable means prior to
|
||||||
|
60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
#### 9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or run
|
||||||
|
a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
#### 10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
#### 11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims owned
|
||||||
|
or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within the
|
||||||
|
scope of its coverage, prohibits the exercise of, or is conditioned on
|
||||||
|
the non-exercise of one or more of the rights that are specifically
|
||||||
|
granted under this License. You may not convey a covered work if you
|
||||||
|
are a party to an arrangement with a third party that is in the
|
||||||
|
business of distributing software, under which you make payment to the
|
||||||
|
third party based on the extent of your activity of conveying the
|
||||||
|
work, and under which the third party grants, to any of the parties
|
||||||
|
who would receive the covered work from you, a discriminatory patent
|
||||||
|
license (a) in connection with copies of the covered work conveyed by
|
||||||
|
you (or copies made from those copies), or (b) primarily for and in
|
||||||
|
connection with specific products or compilations that contain the
|
||||||
|
covered work, unless you entered into that arrangement, or that patent
|
||||||
|
license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
#### 12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under
|
||||||
|
this License and any other pertinent obligations, then as a
|
||||||
|
consequence you may not convey it at all. For example, if you agree to
|
||||||
|
terms that obligate you to collect a royalty for further conveying
|
||||||
|
from those to whom you convey the Program, the only way you could
|
||||||
|
satisfy both those terms and this License would be to refrain entirely
|
||||||
|
from conveying the Program.
|
||||||
|
|
||||||
|
#### 13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
#### 14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in
|
||||||
|
detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies that a certain numbered version of the GNU General Public
|
||||||
|
License "or any later version" applies to it, you have the option of
|
||||||
|
following the terms and conditions either of that numbered version or
|
||||||
|
of any later version published by the Free Software Foundation. If the
|
||||||
|
Program does not specify a version number of the GNU General Public
|
||||||
|
License, you may choose any version ever published by the Free
|
||||||
|
Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future versions
|
||||||
|
of the GNU General Public License can be used, that proxy's public
|
||||||
|
statement of acceptance of a version permanently authorizes you to
|
||||||
|
choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
#### 15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
|
||||||
|
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
|
||||||
|
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
|
||||||
|
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
|
||||||
|
CORRECTION.
|
||||||
|
|
||||||
|
#### 16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
|
||||||
|
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
|
||||||
|
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
|
||||||
|
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
|
||||||
|
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
|
||||||
|
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
|
||||||
|
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
#### 17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
### How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these
|
||||||
|
terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest to
|
||||||
|
attach them to the start of each source file to most effectively state
|
||||||
|
the exclusion of warranty; and each file should have at least the
|
||||||
|
"copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper
|
||||||
|
mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands \`show w' and \`show c' should show the
|
||||||
|
appropriate parts of the General Public License. Of course, your
|
||||||
|
program's commands might be different; for a GUI interface, you would
|
||||||
|
use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. For more information on this, and how to apply and follow
|
||||||
|
the GNU GPL, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your
|
||||||
|
program into proprietary programs. If your program is a subroutine
|
||||||
|
library, you may consider it more useful to permit linking proprietary
|
||||||
|
applications with the library. If this is what you want to do, use the
|
||||||
|
GNU Lesser General Public License instead of this License. But first,
|
||||||
|
please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
14
world/bin/su/Makefile
Normal file
14
world/bin/su/Makefile
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# Makefile - hhl - /usr/src/world/bin/su
|
||||||
|
# Copyright 2023 Nathan Fisher <nfisher.sr@gmail.com>
|
||||||
|
#
|
||||||
|
progname = su
|
||||||
|
bins += su
|
||||||
|
bins += jah
|
||||||
|
VPATH += src
|
||||||
|
VPATH += src/bin
|
||||||
|
perms += -m4755
|
||||||
|
include hhl.cargo.mk
|
||||||
|
|
||||||
|
target/$(rust_tgt)/release/su: su.rs lib.rs
|
||||||
|
|
||||||
|
target/$(rust_tgt)/release/jah: jah.rs lib.rs
|
||||||
1
world/bin/su/README.md
Normal file
1
world/bin/su/README.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
An implementation of the `su` program for HitchHiker linux written in Rust.
|
||||||
56
world/bin/su/man/su.1
Normal file
56
world/bin/su/man/su.1
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
.Dd 2020-10-06
|
||||||
|
.Dt SU 1
|
||||||
|
.Os HitchHiker linux
|
||||||
|
.Sh NAME
|
||||||
|
.Nm su
|
||||||
|
.Nd run a command with a substitute user and group ID
|
||||||
|
.Sh DESCRIPTION
|
||||||
|
.Nm
|
||||||
|
allows commands to be run with a substitute user and group ID. When called without
|
||||||
|
arguments,
|
||||||
|
.Nm
|
||||||
|
defaults to running and interactive shell as root.
|
||||||
|
.Sh OPTIONS
|
||||||
|
\fB\-l\fP, \fB\-\-login\fP
|
||||||
|
.RS 4
|
||||||
|
Starts the shell as a login shell with an environment similar to a real login
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
\fB\-p\fP, \fB\-\-preserve\fP
|
||||||
|
.RS 4
|
||||||
|
Preserves the whole environment
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
\fB\-c\fP, \fB\-\-command\fP=\fIcommand\fP
|
||||||
|
.RS 4
|
||||||
|
Pass \fIcommand\fP to the shell
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
\fB\-s\fP, \fB\-\-shell\fP=\fIshell\fP
|
||||||
|
.RS 4
|
||||||
|
Run the specified shell instead of the default.
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
\fB\-h\fP, \fB\-\-help\fP
|
||||||
|
.RS 4
|
||||||
|
Print help
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
\fB\-V\fP, \fB\-\-version\fP
|
||||||
|
.RS 4
|
||||||
|
Print version
|
||||||
|
.RE
|
||||||
|
.sp
|
||||||
|
.Sh EXIT STATUS
|
||||||
|
.Ex -std su
|
||||||
|
.Sh AUTHOR
|
||||||
|
Written by Nathan Fisher for HitchHiker Linux.
|
||||||
|
.Sh SEE ALSO
|
||||||
|
.Xr login 1
|
||||||
|
.Xr passwd 5
|
||||||
|
.Xr jah 1
|
||||||
|
.Sh HISTORY
|
||||||
|
The
|
||||||
|
.Nm
|
||||||
|
utility appeared in
|
||||||
|
.At v1
|
||||||
236
world/bin/su/src/bin/jah.rs
Normal file
236
world/bin/su/src/bin/jah.rs
Normal file
@ -0,0 +1,236 @@
|
|||||||
|
#![warn(clippy::all, clippy::pedantic)]
|
||||||
|
use clap::{Arg, ValueHint};
|
||||||
|
use libcrypt_rs::Crypt;
|
||||||
|
use su::Error;
|
||||||
|
use std::{
|
||||||
|
ffi::{CStr, CString},
|
||||||
|
fs::{DirBuilder, File, OpenOptions},
|
||||||
|
io::{self, Write},
|
||||||
|
os::unix::{
|
||||||
|
fs::DirBuilderExt,
|
||||||
|
prelude::{CommandExt, OpenOptionsExt},
|
||||||
|
},
|
||||||
|
path::PathBuf,
|
||||||
|
process::Command,
|
||||||
|
};
|
||||||
|
|
||||||
|
static PROGNAME: &str = "jah";
|
||||||
|
|
||||||
|
#[allow(clippy::similar_names)]
|
||||||
|
fn main() -> Result<(), Error> {
|
||||||
|
// Put the entire command into a let binding to a code block, ensuring that
|
||||||
|
// any values we create on the way to the final Command struct are freed
|
||||||
|
// before wee exec into the final command.
|
||||||
|
let mut cmd = {
|
||||||
|
// get_group_names internally creates a libc::pw struct. At least on some
|
||||||
|
// architectures with musl, this memory location gets re-used when we create
|
||||||
|
// another pw struct, this time for the target user. We can either use all
|
||||||
|
// owned variables or else just move this block to the beginning of the
|
||||||
|
// program in which case the borrows will all be valid.
|
||||||
|
let grnames = get_group_names()?;
|
||||||
|
// if we have a group named for this program and the user is a member
|
||||||
|
// of it, we'll skip validation
|
||||||
|
if !grnames.contains(&PROGNAME.to_string()) {
|
||||||
|
// members of "wheel" are always allowed with a password
|
||||||
|
if grnames.contains(&"wheel".to_string()) {
|
||||||
|
validate_pw()?;
|
||||||
|
} else {
|
||||||
|
// nobody else can use the program
|
||||||
|
return Err(Error::PermissionDenied);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let matches = cli().get_matches();
|
||||||
|
// theoretically this can never fail since we have a default value, but
|
||||||
|
// I'm not a fan of `unwrap()`
|
||||||
|
let Some(user) = matches.get_one::<String>("user") else {
|
||||||
|
return Err("no user given".into());
|
||||||
|
};
|
||||||
|
let Some(group) = matches.get_one::<String>("group") else {
|
||||||
|
return Err("no group given".into());
|
||||||
|
};
|
||||||
|
let pw = unsafe {
|
||||||
|
let pw = libc::getpwnam(CString::new(user.as_str())?.as_ptr());
|
||||||
|
if pw.is_null() {
|
||||||
|
return Err(Error::Other("getpwnam: null pointer".to_string()));
|
||||||
|
}
|
||||||
|
*pw
|
||||||
|
};
|
||||||
|
let gr = unsafe {
|
||||||
|
let gr = libc::getgrnam(CString::new(group.as_str())?.as_ptr());
|
||||||
|
if gr.is_null() {
|
||||||
|
return Err(Error::Other("getgrnam: null pointer".to_string()));
|
||||||
|
}
|
||||||
|
*gr
|
||||||
|
};
|
||||||
|
let home = unsafe { CStr::from_ptr(pw.pw_dir).to_str()? };
|
||||||
|
let uid = pw.pw_uid;
|
||||||
|
let gid = gr.gr_gid;
|
||||||
|
let Some(mut command) = matches.get_many::<String>("command") else {
|
||||||
|
return Err("no command given".into());
|
||||||
|
};
|
||||||
|
let Some(cmd) = command.next() else {
|
||||||
|
return Err("no command given".into());
|
||||||
|
};
|
||||||
|
let mut cmd = Command::new(cmd);
|
||||||
|
cmd.uid(uid).gid(gid).env("HOME", home);
|
||||||
|
command.for_each(|arg| {
|
||||||
|
cmd.arg(arg);
|
||||||
|
});
|
||||||
|
cmd
|
||||||
|
};
|
||||||
|
Err(cmd.exec().into())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_group_names() -> Result<Vec<String>, Error> {
|
||||||
|
let mut gids: Vec<libc::gid_t> = vec![0; 1];
|
||||||
|
unsafe {
|
||||||
|
let num = libc::getgroups(0, gids.as_mut_ptr());
|
||||||
|
gids = vec![0; num.try_into()?];
|
||||||
|
libc::getgroups(num, gids.as_mut_ptr());
|
||||||
|
}
|
||||||
|
let mut names = vec![];
|
||||||
|
for id in gids {
|
||||||
|
let name = unsafe {
|
||||||
|
let gr = libc::getgrgid(id);
|
||||||
|
if gr.is_null() {
|
||||||
|
id.to_string()
|
||||||
|
} else {
|
||||||
|
let name = (*gr).gr_name;
|
||||||
|
// if we don't take ownership here the OS can (and will)
|
||||||
|
// reuse the memory
|
||||||
|
CStr::from_ptr(name).to_str()?.to_string()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
names.push(name);
|
||||||
|
}
|
||||||
|
Ok(names)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate_pw() -> Result<(), Error> {
|
||||||
|
// return a tuple from this unsafe block in order to group as much unsafe
|
||||||
|
// into a single block as possible
|
||||||
|
let (name, oldpass) = unsafe {
|
||||||
|
let uid = libc::getuid();
|
||||||
|
let pw = libc::getpwuid(uid);
|
||||||
|
if pw.is_null() {
|
||||||
|
return Err(Error::Other("null pointer".to_string()));
|
||||||
|
}
|
||||||
|
let name = (*pw).pw_name;
|
||||||
|
let spw = libc::getspnam(name);
|
||||||
|
if spw.is_null() {
|
||||||
|
return Err(Error::Other("null pointer".to_string()));
|
||||||
|
}
|
||||||
|
(
|
||||||
|
CStr::from_ptr(name).to_str()?,
|
||||||
|
CStr::from_ptr((*spw).sp_pwdp).to_str()?,
|
||||||
|
)
|
||||||
|
};
|
||||||
|
// If we've already validated the password in the past five minutes, skip
|
||||||
|
// doing it again
|
||||||
|
if check_ts(name) {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let pass = rpassword::prompt_password(format!("[{PROGNAME}] password for {name}: "))?;
|
||||||
|
// deny empty passwords
|
||||||
|
if oldpass.starts_with('\0') {
|
||||||
|
return Err(Error::InvalidPassword);
|
||||||
|
}
|
||||||
|
let mut engine = Crypt::new();
|
||||||
|
// libcrypt gets the encryption salt from the old hashed password
|
||||||
|
engine.set_salt(oldpass.to_string())?;
|
||||||
|
engine.encrypt(pass)?;
|
||||||
|
if oldpass == engine.encrypted.as_str() {
|
||||||
|
set_ts(name)?;
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Error::IncorrectPassword)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// uses a timestamp file to see if we've authenticated in the past five minutes
|
||||||
|
// and if so skip re-authenticating
|
||||||
|
fn check_ts(name: &str) -> bool {
|
||||||
|
let ts_file: PathBuf = ["/run/jah/ts", name].iter().collect();
|
||||||
|
if ts_file.exists() {
|
||||||
|
// We'll go ahead and throw out any errors here using `ok()` and fall
|
||||||
|
// back to validating via password
|
||||||
|
if let Some(elapsed) = File::open(&ts_file)
|
||||||
|
.and_then(|x| x.metadata())
|
||||||
|
.and_then(|x| x.modified())
|
||||||
|
.ok()
|
||||||
|
.and_then(|x| x.elapsed().ok())
|
||||||
|
{
|
||||||
|
if elapsed.as_secs() < 300 {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
// creates (if it doesn't exist) and sets a timestamp file to see if we've
|
||||||
|
// authenticated in the past five minutes
|
||||||
|
fn set_ts(name: &str) -> Result<(), io::Error> {
|
||||||
|
let mut ts_file = PathBuf::from("/run/jah/ts");
|
||||||
|
if !ts_file.exists() {
|
||||||
|
DirBuilder::new()
|
||||||
|
.recursive(true)
|
||||||
|
// deny access for all but root
|
||||||
|
.mode(0o700)
|
||||||
|
.create(&ts_file)?;
|
||||||
|
}
|
||||||
|
ts_file.push(name);
|
||||||
|
let mut fd = OpenOptions::new()
|
||||||
|
.write(true)
|
||||||
|
.truncate(true)
|
||||||
|
.create(true)
|
||||||
|
// deny access for all but root
|
||||||
|
.mode(0o600)
|
||||||
|
.open(&ts_file)?;
|
||||||
|
let _n = fd.write(&[])?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn cli() -> clap::Command {
|
||||||
|
clap::Command::new(PROGNAME)
|
||||||
|
.about("Run COMMAND as another user")
|
||||||
|
.author("Nathan Fisher")
|
||||||
|
.version(env!("CARGO_PKG_VERSION"))
|
||||||
|
.before_long_help(format!(
|
||||||
|
"The {PROGNAME} program allows to run a command as another user (default root). \
|
||||||
|
This command is kept intentionally simple for the sake of security and \
|
||||||
|
has no configuration file. Members of the group \"wheel\" (if it exists) \
|
||||||
|
can run any command after giving their password. Members of the special \
|
||||||
|
group \"{PROGNAME}\" (if it exists) can run any command without a password, \
|
||||||
|
provided they also belong to the \"wheel\" group."
|
||||||
|
))
|
||||||
|
.args([
|
||||||
|
Arg::new("user")
|
||||||
|
.help("The user that the command will run as")
|
||||||
|
.short('u')
|
||||||
|
.long("user")
|
||||||
|
.default_value("root")
|
||||||
|
.num_args(1),
|
||||||
|
Arg::new("group")
|
||||||
|
.help("The group that the command will run as")
|
||||||
|
.short('g')
|
||||||
|
.long("group")
|
||||||
|
.default_value("wheel")
|
||||||
|
.num_args(1),
|
||||||
|
// Waiting on https://github.com/rust-lang/rust/issues/90747
|
||||||
|
//Arg::new("groups")
|
||||||
|
// .help("A comma delimited list of supplementary groups to add to the process")
|
||||||
|
// .short('G')
|
||||||
|
// .long("groups")
|
||||||
|
// .value_delimiter(',')
|
||||||
|
// .num_args(1..)
|
||||||
|
// .required(false),
|
||||||
|
Arg::new("command")
|
||||||
|
.value_name("COMMAND")
|
||||||
|
.value_hint(ValueHint::CommandWithArguments)
|
||||||
|
.allow_hyphen_values(true)
|
||||||
|
.trailing_var_arg(true)
|
||||||
|
.num_args(1..)
|
||||||
|
.required(true),
|
||||||
|
])
|
||||||
|
}
|
||||||
182
world/bin/su/src/bin/su.rs
Normal file
182
world/bin/su/src/bin/su.rs
Normal file
@ -0,0 +1,182 @@
|
|||||||
|
#![warn(clippy::all, clippy::pedantic)]
|
||||||
|
use clap::{Arg, ArgAction, Command};
|
||||||
|
use libcrypt_rs::Crypt;
|
||||||
|
use std::{
|
||||||
|
env,
|
||||||
|
ffi::{CStr, CString},
|
||||||
|
os::unix::process::CommandExt,
|
||||||
|
path::Path,
|
||||||
|
process, str,
|
||||||
|
};
|
||||||
|
|
||||||
|
use su::Error;
|
||||||
|
|
||||||
|
fn cli() -> Command {
|
||||||
|
clap::Command::new("su")
|
||||||
|
.about("run a command with a substitute user and group ID")
|
||||||
|
.author("Nathan Fisher")
|
||||||
|
.version(env!("CARGO_PKG_VERSION"))
|
||||||
|
.before_long_help(
|
||||||
|
"su allows to run commands with a substitute user and group ID. When \
|
||||||
|
called without arguments, su defaults to running an interactive shell as \
|
||||||
|
root. For backward compatibility su defaults to not change the current \
|
||||||
|
directory and to only set the environment variables HOME and SHELL (plus \
|
||||||
|
USER and LOGNAME if the target username is not root).",
|
||||||
|
)
|
||||||
|
.args([
|
||||||
|
Arg::new("login")
|
||||||
|
.short('l')
|
||||||
|
.long("login")
|
||||||
|
.help(
|
||||||
|
"Starts the shell as login shell with an environment similar to a real login.",
|
||||||
|
)
|
||||||
|
.action(ArgAction::SetTrue),
|
||||||
|
Arg::new("preserve")
|
||||||
|
.short('p')
|
||||||
|
.long("preserve")
|
||||||
|
.visible_short_alias('m')
|
||||||
|
.help("Preserves the whole environment.")
|
||||||
|
.conflicts_with("login")
|
||||||
|
.action(ArgAction::SetTrue),
|
||||||
|
Arg::new("command")
|
||||||
|
.short('c')
|
||||||
|
.long("command")
|
||||||
|
.help("Pass command to the shell")
|
||||||
|
.num_args(1),
|
||||||
|
Arg::new("shell")
|
||||||
|
.short('s')
|
||||||
|
.long("shell")
|
||||||
|
.help("Run the specified shell instead of the default.")
|
||||||
|
.long_help(
|
||||||
|
"Run the specified shell instead of the default. The shell to
|
||||||
|
run is selected according to the following rules, in order:
|
||||||
|
• the shell specified with --shell
|
||||||
|
• the shell specified in the environment variable SHELL,
|
||||||
|
if the --preserve-environment option is used
|
||||||
|
• the shell listed in the passwd entry of the target user
|
||||||
|
• /bin/sh"
|
||||||
|
)
|
||||||
|
.num_args(1),
|
||||||
|
Arg::new("user").default_value("root").num_args(1),
|
||||||
|
])
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::similar_names)]
|
||||||
|
fn main() -> Result<(), Error> {
|
||||||
|
let mut cmd = {
|
||||||
|
let matches = cli().get_matches();
|
||||||
|
// theoretically this can never fail since we have a default value, but
|
||||||
|
// I'm not a fan of `unwrap()`
|
||||||
|
let Some(user) = matches.get_one::<String>("user") else {
|
||||||
|
return Err("no user given".into());
|
||||||
|
};
|
||||||
|
'check_user: {
|
||||||
|
let uid = unsafe { libc::getuid() };
|
||||||
|
if uid == 0 {
|
||||||
|
break 'check_user;
|
||||||
|
}
|
||||||
|
if let Ok(groups) = su::get_group_names() {
|
||||||
|
if groups.contains(&"wheel".to_string()) {
|
||||||
|
validate_pw(user)?;
|
||||||
|
break 'check_user;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Err(Error::PermissionDenied);
|
||||||
|
}
|
||||||
|
let pw = unsafe {
|
||||||
|
let pw = libc::getpwnam(CString::new(user.as_str())?.as_ptr());
|
||||||
|
if pw.is_null() {
|
||||||
|
return Err(Error::Other("getpwnam: null pointer".to_string()));
|
||||||
|
}
|
||||||
|
*pw
|
||||||
|
};
|
||||||
|
let uid = pw.pw_uid;
|
||||||
|
let gid = pw.pw_gid;
|
||||||
|
let (shell, args) = if let Some(s) = matches.get_one::<String>("command") {
|
||||||
|
let mut it = s.split_whitespace();
|
||||||
|
(it.next().unwrap().to_string(), Some(it))
|
||||||
|
} else if let Some(s) = matches.get_one::<String>("shell") {
|
||||||
|
(s.to_string(), None)
|
||||||
|
} else if matches.get_flag("preserve") {
|
||||||
|
if let Ok(s) = env::var("SHELL") {
|
||||||
|
(s, None)
|
||||||
|
} else {
|
||||||
|
(get_user_shell(&pw).unwrap_or("/bin/sh").to_string(), None)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
(get_user_shell(&pw).unwrap_or("/bin/sh").to_string(), None)
|
||||||
|
};
|
||||||
|
let mut cmd = process::Command::new(&shell);
|
||||||
|
cmd.uid(uid).gid(gid);
|
||||||
|
if let Some(args) = args {
|
||||||
|
cmd.args(&args.collect::<Vec<&str>>());
|
||||||
|
}
|
||||||
|
if matches.get_flag("login") {
|
||||||
|
let home = unsafe { CStr::from_ptr(pw.pw_dir).to_str()? };
|
||||||
|
let path = if uid == 0 {
|
||||||
|
"/usr/bin:/usr/sbin:/bin:/sbin"
|
||||||
|
} else {
|
||||||
|
"/usr/bin:/bin"
|
||||||
|
};
|
||||||
|
cmd.env_clear();
|
||||||
|
cmd.envs([
|
||||||
|
("SHELL", shell.as_str()),
|
||||||
|
("USER", user),
|
||||||
|
("LOGNAME", user),
|
||||||
|
("HOME", home),
|
||||||
|
("PATH", path),
|
||||||
|
]);
|
||||||
|
if let Ok(term) = env::var("TERM") {
|
||||||
|
cmd.env("TERM", term);
|
||||||
|
}
|
||||||
|
cmd.current_dir(home);
|
||||||
|
let shellpath = Path::new(&shell);
|
||||||
|
let shellname = shellpath
|
||||||
|
.file_name()
|
||||||
|
.ok_or(Error::Other("Unknown shell name".to_string()))?
|
||||||
|
.to_str()
|
||||||
|
.ok_or(Error::Other("Unknown shell name".to_string()))?;
|
||||||
|
match shellname {
|
||||||
|
"bash" | "zsh" | "ash" | "mksh" | "fish" | "csh" | "tcsh" | "ksh" | "pdksh"
|
||||||
|
| "rc" | "nu" => {
|
||||||
|
cmd.arg("-l");
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
cmd
|
||||||
|
};
|
||||||
|
Err(cmd.exec().into())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_user_shell(pw: &libc::passwd) -> Result<&str, str::Utf8Error> {
|
||||||
|
if pw.pw_shell.is_null() {
|
||||||
|
Ok("/bin/sh")
|
||||||
|
} else {
|
||||||
|
unsafe { CStr::from_ptr(pw.pw_shell).to_str() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn validate_pw(user: &str) -> Result<(), Error> {
|
||||||
|
let oldpass = unsafe {
|
||||||
|
let spw = libc::getspnam(CString::new(user)?.as_ptr());
|
||||||
|
if spw.is_null() {
|
||||||
|
return Err(Error::Other("null pointer".to_string()));
|
||||||
|
}
|
||||||
|
CStr::from_ptr((*spw).sp_pwdp).to_str()?
|
||||||
|
};
|
||||||
|
// deny empty passwords
|
||||||
|
if oldpass.starts_with('\0') {
|
||||||
|
return Err(Error::InvalidPassword);
|
||||||
|
}
|
||||||
|
let pass = rpassword::prompt_password("Password: ")?;
|
||||||
|
let mut engine = Crypt::new();
|
||||||
|
// libcrypt gets the encryption salt from the old hashed password
|
||||||
|
engine.set_salt(oldpass.to_string())?;
|
||||||
|
engine.encrypt(pass)?;
|
||||||
|
if oldpass == engine.encrypted.as_str() {
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Error::IncorrectPassword)
|
||||||
|
}
|
||||||
|
}
|
||||||
100
world/bin/su/src/lib.rs
Normal file
100
world/bin/su/src/lib.rs
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
use std::{error, ffi::{self, CStr}, fmt, io, num::TryFromIntError, str};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum Error {
|
||||||
|
Io(io::Error),
|
||||||
|
IncorrectPassword,
|
||||||
|
InvalidPassword,
|
||||||
|
IntCast,
|
||||||
|
PermissionDenied,
|
||||||
|
Nul(ffi::NulError),
|
||||||
|
Utf8(str::Utf8Error),
|
||||||
|
Other(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for Error {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
Self::Io(e) => write!(f, "{e}"),
|
||||||
|
Self::IncorrectPassword => write!(f, "incorrect password"),
|
||||||
|
Self::InvalidPassword => write!(f, "invalid password"),
|
||||||
|
Self::IntCast => write!(f, "integer cast error"),
|
||||||
|
Self::PermissionDenied => write!(f, "permission denied"),
|
||||||
|
Self::Nul(e) => write!(f, "{e}"),
|
||||||
|
Self::Utf8(e) => write!(f, "{e}"),
|
||||||
|
Self::Other(e) => write!(f, "{e}"),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl error::Error for Error {
|
||||||
|
fn source(&self) -> Option<&(dyn error::Error + 'static)> {
|
||||||
|
match self {
|
||||||
|
Self::Io(e) => Some(e),
|
||||||
|
Self::Nul(e) => Some(e),
|
||||||
|
Self::Utf8(e) => Some(e),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<TryFromIntError> for Error {
|
||||||
|
fn from(_value: TryFromIntError) -> Self {
|
||||||
|
Self::IntCast
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<io::Error> for Error {
|
||||||
|
fn from(value: io::Error) -> Self {
|
||||||
|
Self::Io(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<ffi::NulError> for Error {
|
||||||
|
fn from(value: ffi::NulError) -> Self {
|
||||||
|
Self::Nul(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<str::Utf8Error> for Error {
|
||||||
|
fn from(value: str::Utf8Error) -> Self {
|
||||||
|
Self::Utf8(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<&str> for Error {
|
||||||
|
fn from(value: &str) -> Self {
|
||||||
|
Self::Other(value.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<String> for Error {
|
||||||
|
fn from(value: String) -> Self {
|
||||||
|
Self::Other(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_group_names() -> Result<Vec<String>, Error> {
|
||||||
|
let mut gids: Vec<libc::gid_t> = vec![0; 1];
|
||||||
|
unsafe {
|
||||||
|
let num = libc::getgroups(0, gids.as_mut_ptr());
|
||||||
|
gids = vec![0; num.try_into()?];
|
||||||
|
libc::getgroups(num, gids.as_mut_ptr());
|
||||||
|
}
|
||||||
|
let mut names = vec![];
|
||||||
|
for id in gids {
|
||||||
|
let name = unsafe {
|
||||||
|
let gr = libc::getgrgid(id);
|
||||||
|
if gr.is_null() {
|
||||||
|
id.to_string()
|
||||||
|
} else {
|
||||||
|
let name = (*gr).gr_name;
|
||||||
|
// if we don't take ownership here the OS can (and will)
|
||||||
|
// reuse the memory
|
||||||
|
CStr::from_ptr(name).to_str()?.to_string()
|
||||||
|
}
|
||||||
|
};
|
||||||
|
names.push(name);
|
||||||
|
}
|
||||||
|
Ok(names)
|
||||||
|
}
|
||||||
@ -5,28 +5,6 @@ distname = gcc
|
|||||||
patches = gcc-nostdinc.patch
|
patches = gcc-nostdinc.patch
|
||||||
include world.mk
|
include world.mk
|
||||||
|
|
||||||
ifeq ($(arch),x86_64)
|
|
||||||
ifeq ($(build_fortran),1)
|
|
||||||
fortran = ,fortran
|
|
||||||
endif
|
|
||||||
ifeq ($(build_go),1)
|
|
||||||
go = ,go
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(build_d),1)
|
|
||||||
dlang = ,d
|
|
||||||
endif
|
|
||||||
ifeq ($(build_ada),1)
|
|
||||||
ada = ,ada
|
|
||||||
endif
|
|
||||||
ifeq ($(build_objc),1)
|
|
||||||
objc = ,objc
|
|
||||||
endif
|
|
||||||
ifeq ($(build_objcxx),1)
|
|
||||||
objcxx = ,obj-c++
|
|
||||||
endif
|
|
||||||
|
|
||||||
define pre_configure
|
define pre_configure
|
||||||
[ -d $(srcdir)/gmp ] && rm -rf $(srcdir)/gmp || true
|
[ -d $(srcdir)/gmp ] && rm -rf $(srcdir)/gmp || true
|
||||||
[ -d $(srcdir)/mpc ] && rm -rf $(srcdir)/mpc || true
|
[ -d $(srcdir)/mpc ] && rm -rf $(srcdir)/mpc || true
|
||||||
@ -37,7 +15,7 @@ config_opts += --host=$(tgt)
|
|||||||
config_opts += --target=$(tgt)
|
config_opts += --target=$(tgt)
|
||||||
config_opts += --with-build-sysroot=$(DESTDIR)
|
config_opts += --with-build-sysroot=$(DESTDIR)
|
||||||
config_opts += --with-sysroot=
|
config_opts += --with-sysroot=
|
||||||
config_opts += --enable-languages=c,c++$(fortran)$(go)$(dlang)$(ada)$(objc)$(objcxx)
|
config_opts += --enable-languages=c,c++,fortran
|
||||||
config_opts += --disable-multilib
|
config_opts += --disable-multilib
|
||||||
config_opts += --disable-bootstrap
|
config_opts += --disable-bootstrap
|
||||||
config_opts += --with-system-zlib
|
config_opts += --with-system-zlib
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
# Makefile - hhl - /usr/src/world/shadow
|
# Makefile - hhl - /usr/src/world/shadow
|
||||||
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
||||||
#
|
#
|
||||||
distname = shadow
|
distname = shadow
|
||||||
patches += shadow-fixes-consolidated.patch
|
patches += shadow-fixes-consolidated.patch
|
||||||
|
|
||||||
@ -12,6 +12,7 @@ config_opts += --host=$(tgt)
|
|||||||
config_opts += --with-sysroot=$(DESTDIR)
|
config_opts += --with-sysroot=$(DESTDIR)
|
||||||
config_opts += --sysconfdir=/etc
|
config_opts += --sysconfdir=/etc
|
||||||
config_opts += --with-group-name-max-length=32
|
config_opts += --with-group-name-max-length=32
|
||||||
|
config_opts += --without-su
|
||||||
|
|
||||||
include targets.mk
|
include targets.mk
|
||||||
|
|
||||||
|
|||||||
18
world/usr.bin/42/.cargo/config.toml
Normal file
18
world/usr.bin/42/.cargo/config.toml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
[target.aarch64-unknown-linux-musl]
|
||||||
|
linker = "aarch64-hitchhiker-linux-musleabihf-gcc"
|
||||||
|
|
||||||
|
[target.riscv64gc-unknown-linux-musl]
|
||||||
|
rustflags = [
|
||||||
|
"-C", "target-feature=-crt-static"
|
||||||
|
]
|
||||||
|
linker = "riscv64-hitchhiker-linux-musl-gcc"
|
||||||
|
ar = "riscv64-hitchhiker-linux-musl-ar"
|
||||||
|
|
||||||
|
[target.i686-unknown-linux-musl]
|
||||||
|
linker = "i686-hitchhiker-linux-musl-gcc"
|
||||||
|
|
||||||
|
[target.i586-unknown-linux-musl]
|
||||||
|
linker = "i586-hitchhiker-linux-musl-gcc"
|
||||||
|
|
||||||
|
[target.x86_64-unknown-linux-musl]
|
||||||
|
linker = "x86_64-hitchhiker-linux-musl-gcc"
|
||||||
75
world/usr.bin/42/Cargo.lock
generated
Normal file
75
world/usr.bin/42/Cargo.lock
generated
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
# This file is automatically @generated by Cargo.
|
||||||
|
# It is not intended for manual editing.
|
||||||
|
version = 3
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cfg-if"
|
||||||
|
version = "1.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "getrandom"
|
||||||
|
version = "0.2.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"libc",
|
||||||
|
"wasi",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "libc"
|
||||||
|
version = "0.2.140"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "liff"
|
||||||
|
version = "1.0.0"
|
||||||
|
dependencies = [
|
||||||
|
"rand",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ppv-lite86"
|
||||||
|
version = "0.2.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand"
|
||||||
|
version = "0.8.5"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"rand_chacha",
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_chacha"
|
||||||
|
version = "0.3.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
||||||
|
dependencies = [
|
||||||
|
"ppv-lite86",
|
||||||
|
"rand_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rand_core"
|
||||||
|
version = "0.6.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasi"
|
||||||
|
version = "0.11.0+wasi-snapshot-preview1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||||
19
world/usr.bin/42/Cargo.toml
Normal file
19
world/usr.bin/42/Cargo.toml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
[package]
|
||||||
|
name = "liff"
|
||||||
|
version = "1.0.0"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[[bin]]
|
||||||
|
name = "42"
|
||||||
|
path = "src/main.rs"
|
||||||
|
|
||||||
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
rand = "0.8"
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
codegen-units = 1
|
||||||
|
strip = true
|
||||||
|
lto = true
|
||||||
|
panic = "abort"
|
||||||
@ -1,9 +1,10 @@
|
|||||||
# Makefile - hhl - /usr/src/world/usr.bin/42
|
# Makefile - hhl - /usr/src/world/usr.bin/42
|
||||||
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
# Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
|
||||||
#
|
#
|
||||||
progname = 42
|
progname = 42
|
||||||
hhl_source = 1
|
bins += 42
|
||||||
onestage = true
|
VPATH += src
|
||||||
|
include hhl.cargo.mk
|
||||||
42datadir = ${DESTDIR}/usr/share/42
|
42datadir = ${DESTDIR}/usr/share/42
|
||||||
|
|
||||||
define post_build
|
define post_build
|
||||||
@ -11,4 +12,4 @@ define post_build
|
|||||||
install -m644 data/* ${42datadir}
|
install -m644 data/* ${42datadir}
|
||||||
endef
|
endef
|
||||||
|
|
||||||
include hhl.cprog.mk
|
target/$(rust_tgt)/release/42: src/main.rs Cargo.toml Cargo.lock
|
||||||
|
|||||||
@ -1,88 +0,0 @@
|
|||||||
/*
|
|
||||||
*----------------------------------------------------------------------
|
|
||||||
* "THE BEER-WARE LICENSE" (Revision 42):
|
|
||||||
* <jeang3nie@HitchHiker-Linux.org> wrote this file. As long as you
|
|
||||||
* retain this notice you can do whatever you want with this stuff. If
|
|
||||||
* we meet some day, and you think this stuff is worth it, you can buy
|
|
||||||
* me a beer in return.
|
|
||||||
* ---------------------------------------------------------------------
|
|
||||||
* ______ _______ _ _________
|
|
||||||
* ( __ \ ( ___ )( ( /|( )\__ __/
|
|
||||||
* | ( \ )| ( ) || \ ( ||/ ) (
|
|
||||||
* | | ) || | | || \ | | | |
|
|
||||||
* | | | || | | || (\ \) | | |
|
|
||||||
* | | ) || | | || | \ | | |
|
|
||||||
* | (__/ )| (___) || ) \ | | |
|
|
||||||
* (______/ (_______)|/ )_) )_(
|
|
||||||
*
|
|
||||||
* _______ _______ _ _________ _______
|
|
||||||
* ( ____ )( ___ )( \ /|\__ __/( ____ \
|
|
||||||
* | ( )|| ( ) || \ ( | ) ( | ( |/
|
|
||||||
* | (____)|| (___) || \ | | | | | |
|
|
||||||
* | _____)| ___ || (\ \) | | | | |
|
|
||||||
* | ( | ( ) || | \ | | | | |
|
|
||||||
* | ) | ) ( || ) \ |___) (___| (____|\
|
|
||||||
* |/ |/ \||/ \_)\_______/(_______/
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define _GNU_SOURCE
|
|
||||||
|
|
||||||
#include <dirent.h> // opendir, rewinddir, readdir
|
|
||||||
#include <stdio.h> // fopen, fclose, fwrite
|
|
||||||
#include <stdlib.h> // exit, srand
|
|
||||||
#include <string.h> // strncat, strcmp, strdup
|
|
||||||
#include <time.h> // time
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
|
||||||
int n = 0, i = 0;
|
|
||||||
DIR *d;
|
|
||||||
struct dirent *dir;
|
|
||||||
d = opendir(datadir);
|
|
||||||
|
|
||||||
// Determine the number of files
|
|
||||||
while ((dir = readdir(d)) != NULL) {
|
|
||||||
n++;
|
|
||||||
}
|
|
||||||
rewinddir(d);
|
|
||||||
|
|
||||||
char *filesList[n - 2]; // subtract two because of . and ..
|
|
||||||
|
|
||||||
// Put file names into the array
|
|
||||||
while ((dir = readdir(d)) != NULL) {
|
|
||||||
if (strcmp(dir->d_name, ".") && strcmp(dir->d_name, "..")) {
|
|
||||||
filesList[i] = strdup(dir->d_name);
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rewinddir(d);
|
|
||||||
|
|
||||||
char *data = strdup(datadir);
|
|
||||||
|
|
||||||
srand((unsigned)time(NULL));
|
|
||||||
|
|
||||||
int m = rand() % (n - 1);
|
|
||||||
strncat(data, filesList[m], 4);
|
|
||||||
FILE *fp;
|
|
||||||
char *line = NULL;
|
|
||||||
size_t len = 0;
|
|
||||||
ssize_t nread;
|
|
||||||
// Open file
|
|
||||||
fp = fopen(data, "r");
|
|
||||||
if (fp == NULL) {
|
|
||||||
perror("fopen");
|
|
||||||
exit(EXIT_FAILURE);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read contents from file
|
|
||||||
while ((nread = getline(&line, &len, fp)) != -1) {
|
|
||||||
fwrite(line, nread, 1, stdout);
|
|
||||||
}
|
|
||||||
|
|
||||||
free(line);
|
|
||||||
|
|
||||||
fclose(fp);
|
|
||||||
return 0; // I am still considering changing this to 42
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
/*
|
|
||||||
*----------------------------------------------------------------------
|
|
||||||
* "THE BEER-WARE LICENSE" (Revision 42):
|
|
||||||
* <jeang3nie@HitchHiker-Linux.org> wrote this file. As long as you
|
|
||||||
* retain this notice you can do whatever you want with this stuff. If
|
|
||||||
* we meet some day, and you think this stuff is worth it, you can buy
|
|
||||||
* me a beer in return.
|
|
||||||
* ---------------------------------------------------------------------
|
|
||||||
* ______ _______ _ _________
|
|
||||||
* ( __ \ ( ___ )( ( /|( )\__ __/
|
|
||||||
* | ( \ )| ( ) || \ ( ||/ ) (
|
|
||||||
* | | ) || | | || \ | | | |
|
|
||||||
* | | | || | | || (\ \) | | |
|
|
||||||
* | | ) || | | || | \ | | |
|
|
||||||
* | (__/ )| (___) || ) \ | | |
|
|
||||||
* (______/ (_______)|/ )_) )_(
|
|
||||||
*
|
|
||||||
* _______ _______ _ _________ _______
|
|
||||||
* ( ____ )( ___ )( \ /|\__ __/( ____ \
|
|
||||||
* | ( )|| ( ) || \ ( | ) ( | ( |/
|
|
||||||
* | (____)|| (___) || \ | | | | | |
|
|
||||||
* | _____)| ___ || (\ \) | | | | |
|
|
||||||
* | ( | ( ) || | \ | | | | |
|
|
||||||
* | ) | ) ( || ) \ |___) (___| (____|\
|
|
||||||
* |/ |/ \||/ \_)\_______/(_______/
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
const char * datadir = "/usr/share/42/";
|
|
||||||
67
world/usr.bin/42/src/main.rs
Normal file
67
world/usr.bin/42/src/main.rs
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
use {
|
||||||
|
rand::Rng,
|
||||||
|
std::{
|
||||||
|
env,
|
||||||
|
fs::{self, DirEntry},
|
||||||
|
io::{self, Write},
|
||||||
|
path::PathBuf,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
fn get_datadirs() -> Vec<PathBuf> {
|
||||||
|
let mut dirs = match env::var("XDG_DATA_DIRS") {
|
||||||
|
Ok(dirs) => dirs
|
||||||
|
.split(':')
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.map(|mut p| {
|
||||||
|
p.push("42");
|
||||||
|
p
|
||||||
|
})
|
||||||
|
.collect(),
|
||||||
|
Err(_) => vec![
|
||||||
|
PathBuf::from("/usr/local/share/42"),
|
||||||
|
PathBuf::from("/usr/share/42"),
|
||||||
|
],
|
||||||
|
};
|
||||||
|
if let Ok(home) = env::var("HOME") {
|
||||||
|
let hddir = [&home, ".local", "share", "42"].iter().collect();
|
||||||
|
dirs.push(hddir);
|
||||||
|
}
|
||||||
|
dirs
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_file(entry: &DirEntry) -> bool {
|
||||||
|
if let Ok(t) = entry.file_type() {
|
||||||
|
if t.is_file() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_files() -> Vec<PathBuf> {
|
||||||
|
let mut files = vec![];
|
||||||
|
get_datadirs().iter().for_each(|d| {
|
||||||
|
if d.exists() {
|
||||||
|
if let Ok(dir) = fs::read_dir(&d) {
|
||||||
|
dir.filter(|e| e.is_ok())
|
||||||
|
.filter(|e| is_file(e.as_ref().unwrap()))
|
||||||
|
.map(|e| e.unwrap().path())
|
||||||
|
.for_each(|f| files.push(f));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
files
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() -> Result<(), io::Error> {
|
||||||
|
let files = get_files();
|
||||||
|
let len = files.len();
|
||||||
|
let mut rng = rand::thread_rng();
|
||||||
|
let idx = rng.gen_range(0..len);
|
||||||
|
if let Some(path) = files.get(idx) {
|
||||||
|
let contents = fs::read(path)?;
|
||||||
|
io::stdout().write_all(&contents)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user