чување c388687903f9201a3074bffbea53061a19b375c0
родитељ 243d05d2c2b02fac06f49c09f6fde588faee2d96
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Sun, 7 Aug 2022 20:22:40 +0200
MD5 -> SHA512; package database generation up to shadow
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 5, додавања: 62(+), брисања: 21(-)
diff --git a/01-cross.sh b/01-cross.sh
@@ -5,10 +5,10 @@
HOST_COREUTILS=1
HOST_FIND=1
-HOST_MD5SUM=1
+HOST_SHASUM=1
HOST_SED=1
HOST_TAR=1
-export HOST_COREUTILS HOST_FIND HOST_MD5SUM HOST_SED HOST_TAR
+export HOST_COREUTILS HOST_FIND HOST_SHASUM HOST_SED HOST_TAR
mkdir -p ${G_LOG}
:>${G_LOGFILE}
@@ -68,7 +68,7 @@ cp_or_fail -r ${WD}/${FLD}/* ${G_FIL}/
msg info "Copying patches to %s" ${G_PAT}
cp_or_fail -r ${WD}/${PTD}/* ${G_PAT}/
-msg info "Fetching packages and checking MD5 sums"
+msg info "Fetching packages and checking SHA sums"
lineno=0
totallines=$(wc -l ${WD}/lib/pkgs.tsv | cut -d ' ' -f1)
totallines=$((totallines - 1))
@@ -81,7 +81,7 @@ do
delay=2 # seconds between downloads; customize rate limiting
url=$(printf "${record}" | cut -d "$(printf '\t')" -f1)
dirtb=$(printf "${record}" | cut -sd "$(printf '\t')" -f2)
- md5=$(printf "${record}" | cut -sd "$(printf '\t')" -f3)
+ sha=$(printf "${record}" | cut -sd "$(printf '\t')" -f3)
tarball=${url##*/}
if [ -n "${dirtb}" ]; then
@@ -95,10 +95,10 @@ do
fetch_pkg ${url} "${dirtb}" ${delay};;
*) ;;
esac
- if [ -n "${md5}" ]; then
- if ! printf "%s %s" "${md5}" "${G_PKG}/${tarball}" | \
- md5sum -c - >/dev/null 2>&1; then
- msg err "MD5 check failed on %s" ${tarball}
+ if [ -n "${sha}" ]; then
+ if ! printf "%s %s" "${sha}" "${G_PKG}/${tarball}" | \
+ sha512sum -c - >/dev/null 2>&1; then
+ msg err "SHA512 check failed on %s" ${tarball}
exit 1
fi
fi
@@ -108,7 +108,7 @@ done <${WD}/lib/pkgs.tsv
echo
unset lineno totallines
-msg info "Regenerating MD5 sums"
+msg info "Regenerating SHA sums"
(cd ${WD}; ${WD}/lib/gensums)
begin_substep linux-5.17.13 "Linux headers"
@@ -1356,6 +1356,6 @@ msg info "Cleaning up environment"
export PATH=${OLDPATH}
unset OLDPATH CC CXX AR AS RANLIB LD STRIP
unset WD
-unset HOST_COREUTILS HOST_FIND HOST_MD5SUM HOST_SED HOST_TAR
+unset HOST_COREUTILS HOST_FIND HOST_SHASUM HOST_SED HOST_TAR
msg warn "Next run ./02-chroot.sh as root"
diff --git a/03-packages.sh b/03-packages.sh
@@ -89,6 +89,9 @@ do
:>/var/log/${log}
done
+msg info "Generating %s" "${G_PKGDB}"
+printf "Package\tVersion\tInstallation Timestamp\n" > ${G_PKGDB}
+
begin_substep linux-headers-5.17.13 "Linux headers"
if [ -e /include/linux/stddef.h ]; then
msg info "%s exists, skipping %s" \
@@ -106,6 +109,8 @@ else
#remove_dir ${G_SRC}/${pkg}
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" linux-headers 5.17.13 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep texinfo-6.8
@@ -128,6 +133,8 @@ else
remove_dir ${G_SRC}/${pkg}
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" texinfo 6.8 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep man-pages-5.13
@@ -135,6 +142,8 @@ if [ -e /share/man/man2/fork.2 ]; then
msg info "%s exists, skipping %s" /share/man/man2/fork.2 ${pkg}
elif [ -e ${G_SPKG}/${pkg}.tar.xz ]; then
unpack_pkg ${pkg} /
+ timestamp=$(date +'%Y-%m-%d %T')
+ printf "%s\t%s\t%s\n" texinfo 6.8 "${timestamp}" >>${G_PKGDB}
else
extract_pkg ${G_SRC} ${pkg} ${pkg}.tar.xz
(
@@ -155,6 +164,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" man-pages 5.13 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep musl-1.2.3
@@ -246,6 +257,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" musl 1.2.3 "${timestamp}" >>${G_PKGDB}
end_substep
msg info "Cleaning up environment"
@@ -310,6 +323,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" zlib-ng 2.0.6 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep file-5.41
@@ -342,6 +357,8 @@ mkpk_install()
) || exit 1
remove_dir ${G_SRC}/${pkg}
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" file 5.41 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep readline-8.1
@@ -378,6 +395,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" readline 8.1 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep m4-1.4.19
@@ -412,6 +431,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" m4 1.4.19 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep pkgconf-1.8.0
@@ -459,6 +480,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" pkgconf 1.8.0 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep tzutils-20220706
@@ -516,6 +539,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" tzutils 20220706 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep 9base-20220706
@@ -556,6 +581,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" 9base 20220706 "${timestamp}" >>${G_PKGDB}
end_substep
msg info "Adjusting specs"
@@ -647,6 +674,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" binutils 2.38 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep libgmp-6.2.1
@@ -685,6 +714,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" libgmp 6.21 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep libmpfr-4.1.0
@@ -725,6 +756,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" libmpfr 4.1.0 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep libmpc-1.2.1
@@ -763,6 +796,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" libmpc 1.2.1 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep libisl-0.24
@@ -804,6 +839,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" libisl 0.2.4 "${timestamp}" >>${G_PKGDB}
end_substep
begin_substep shadow-4.11.1
@@ -857,6 +894,8 @@ mkpk_install()
unpack_pkg ${pkg} /
) || exit 1
fi
+timestamp=$(date +'%Y-%m-%d %T')
+printf "%s\t%s\t%s\n" shadow 4.11.1 "${timestamp}" >>${G_PKGDB}
end_substep
msg info "Setting up /etc/default/useradd"
diff --git a/fil/rc.d/g_fun.sh b/fil/rc.d/g_fun.sh
@@ -83,7 +83,7 @@ parents()
ppid=$(ps -ef | awk '{if ($2=='$pid') print $3}')
echo $ppid
- if [ $ppid -ne 1 ]; then
+ if [ $ppid -gt 1 ]; then
parents $ppid
fi
}
@@ -92,14 +92,14 @@ intmux()
{
local intmux=0
for pid in $(parents); do
- line=$(ps -ef | awk '{if ($2=='$pid') print}')
- case $line in
+ line=$(ps -ef | awk '{if ($2=='$pid') print $0}')
+ case "$line" in
*intmux*) ;;
*tmux*) intmux=1;;
*) ;;
esac
done
- if [ ${intmux} -eq 1 ]; then
+ if [ "${intmux}" -eq 1 ]; then
return 0
else
return 1
diff --git a/lib/env.sh b/lib/env.sh
@@ -38,6 +38,8 @@ G_TARGET=x86_64-galeb-linux-musl
G_VER=2.0
JN=${JN:- -j$(($(grep ^processor /proc/cpuinfo | wc -l) * 3))}
+G_PKGDB=${G_SPKG}/pkgdb.tsv
+
export CT_TRI GR_TRI GHOME GUID GGID GR CTD FLD PTD TLD CT TL G_ARCH G_ARCH_EXT
export G_ARCH_EXT_ALT G_FIFO G_LGL G_LOG G_FIL G_LIB G_LOGFILE G_PAT G_PKG
export G_SHORTLOG G_SPKG G_SRC G_TARGET G_VER JN
diff --git a/lib/fun.sh b/lib/fun.sh
@@ -33,12 +33,12 @@ g_ln()
fi
}
-g_md5sum()
+g_shasum()
{
- if [ "${HOST_MD5SUM}" -eq 1 ]; then
- md5sum $*
+ if [ "${HOST_SHASUM}" -eq 1 ]; then
+ sha512sum $*
else
- /${TLD}/bin/md5sum $*
+ /${TLD}/bin/sha512sum $*
fi
}
@@ -430,7 +430,7 @@ mkpk()
-cnewer ../timestamp | sort | uniq) | \
xz -9 > ${G_SPKG}/$(mkpk_name).tar.xz && \
cd ${G_SPKG} && \
- g_md5sum $(mkpk_name).tar.xz >$(mkpk_name).md5 && \
+ g_shasum $(mkpk_name).tar.xz >$(mkpk_name).sha512 && \
{ cd - >/dev/null 2>&1; }
rm ../timestamp
fi
@@ -580,8 +580,8 @@ unpack_pkg()
*) ;;
esac
cd_or_fail ${dir}
- if ! g_md5sum -c ${pkg##*/}.md5 >/dev/null 2>&1; then
- msg err "md5sum -c %s failed" ${dir}/${pkg##*/}.tar.xz
+ if ! g_shasum -c ${pkg##*/}.sha512 >/dev/null 2>&1; then
+ msg err "sha512sum -c %s failed" ${dir}/${pkg##*/}.tar.xz
exit 1
fi
cd_or_fail $1
