Commit 13ef389f authored by Mohammad Akhlaghi's avatar Mohammad Akhlaghi
Browse files

NOT COMPLETE: First set of software built by Maneage updated

With this commit, this first set of software are now updated and build
successfully on my Arch GNU/Linux OS. It goes until Tar, but currently
stops before writing its final target (so we can go step by step to the
next software).

Following the discussion in Task #15699 [1], all software that come into
Maneage will be archived in a unified format. To do this, the downloaded
tarball from each software's webpage (or the version we already had) was
put in an 'orig' directory, then the following two commands were run (for
example for xz version 5.2.5):

    $ name=xz-5.2.5
    $ tar xf orig/$name.tar.gz \
      && tar -c -Hustar --owner=root --group=root \
             -f $name.tar $name/ \
      && lzip $name.tar \
      && rm -r $name/

But besides the formatting, the top directory within the tarballs is now
always just the name of the tarball without the 'tar.lz'. While most
software already follow that convention, some (like Zip or Unzip)
didn't. So they have also been corrected.

As one exception, for now, Make has not been updated because it would have
the same file name as before and we don't want to break any dependencies
(by modifying it, and thus its checksum). I tried bootstrapping Make's
latest commit (so the version identifier can be different), but there was a
bug when building the latest version on my computer and it has been
reported to its developers [2].

[1] https://savannah.nongnu.org/task/?15699
[2] https://lists.gnu.org/archive/html/bug-make/2021-10/msg00002.html
parent 775fc036
......@@ -16,22 +16,22 @@
# --------------------------------------------------------------
bash-checksum = e210cd63ce1241636fbb14d1a105c83e9481a0312026f746f76f7115b777707170ddfe1840fb4d3a4093613048e2d1eedf926e843ad15ffc8d66f08525e8b04b
binutils-checksum = 5ad795fab0803be83b53aa955fd5414c8408b4cf2a66eba2f8688298312934b4b1b0cbe9cf887d86de77f88adf1333d85fc9f6ab4a530e85a09b9b2dbf6aaf3f
bzip2-checksum = 00ace5438cfa0c577e5f578d8a808613187eff5217c35164ffe044fbafdfec9e98f4192c02a7d67e01e5a5ccced630583ad1003c37697219b0f147343a3fdd12
bzip2-checksum = 9a6334a286246ff1e00575dfdf67702537b6b9af941a082a39460dc3eb1058dc10362c151a7dec69956150e770c995090e0207e90ea57ecf75fa2d15b5b66d72
cert-checksum = a81dfa59c70788126a395c576e54cb8f61c1ea34da69b5cd42e2d83ee6426c2a26941360c7302793774ea98ca16846deb6e683144cc7fb6da6ef87b70447e4c8
coreutils-checksum = 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
curl-checksum = 614f8d67e6ee942cb5e57f2da1a3faaf84ebff549ffe383aaf3751a4de3c8874ff482076afa27a52e910a137dec9b0f6e98265dc7d4ad7c95845b63f39236fd4
dash-checksum = 9d55090115ac04f505d70e6790179331178950f96fe713b33fd698fa8bfa60d4eff1b68cb7b8a2f099d29c587d36034a17dccd6658ba1623ff0a625ac1fb9620
dash-checksum = dfc7fdd9a5d611f73572d923cc2995314af81edb15db5f5dc6b5349b3a7ab6331073d3fc2bb003a66a93db966be2589853247b083ee63706fdcae139be42e644
diffutils-checksum = 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
file-checksum = 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
findutils-checksum = 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
flock-checksum = ddb997174c0653bc3d29410a5a16b6290e737aa40fbf4b746e2d1db1e88e5acb08ec11a25c27c8a5a5fbf5a00fcac17abeaa245e7df27bd975ae86364d400b86
flock-checksum = 623890c9e82ada3a746824bf7987a75890883a547f561bbefea0c0fc93a86e338dd253d3ab9aee434e77f4c75e2761f17ad1c40efee7c20846b3a5320725c085
gawk-checksum = 682fadd3630d51d13d19443a9a93d4cba1bd6802dd078f1366f17f39d3fa5800f47037b103d742be9254475fdc251d90626f95a2e04b5ace117cfaecebca2281
gcc-checksum = 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e
gettext-checksum = f3083af79341bfdc849118333c1598812c12bc225d998181694648187088050160deb4777c252f72a7158e914c2967416489bc6167ef8505664497f2fb94ecbf
git-checksum = a6159c0a15e3c5f9603157d4010664a6d74e7d65b9fe97a03b36fac12607248ed57980d96565841e88eae343001c167222232737d3af812608c8db011941df1a
gmp-checksum = 9975e8766e62a1d48c0b6d7bbdd2fccb5b22243819102ca6c8d91f0edd2d3a1cef21c526d647c2159bb29dd2a7dcbd0d621391b2e4b48662cf63a8e6749561cd
grep-checksum = 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
gzip-checksum = 753fbcf5eb104bfc8a8eb81b69b8701f757b5158e6333b17438574169a4662642a122e1fdbd920a536edbcb77253d65fa571e4f507dbe72a70fee5eb161d6324
gzip-checksum = a29f5bd46b5d6671070f7c05e24b136cc12773defde7b099327c4936c1a6941684e7e197e0f6924b1d9adbd6ada43bc23c0de35e25f14e16c5b2f150173d2f43
isl-checksum = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
less-checksum = 79384ff3faa33aeb86da6027c8b264df78f9f8c799af43dc5340e2ca3d86053c9be168140bfa05734a4217e65ef9939652b004d6a536f64b2e0ef3b74b07f535
libbsd-checksum = b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9
......@@ -39,7 +39,7 @@ libiconv-checksum = 365dac0b34b4255a0066e8033a8b3db4bdb94b9b57a9dca17ebf2d779139
libtool-checksum = a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
libunistring-checksum = 01dcab6e05ea4c33572bf96cc0558bcffbfc0e62fc86410cef06c1597a0073d5750525fe2dee4fdb39c9bd704557fcbab864f9645958108a2e07950bc539fe54
libxml2-checksum = cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810
lzip-checksum = e2e229899002072322a5bf7fb7ef37ff7cc2d0ded7d6525679ac29cec5c1534de89f76bc01e15c3d76584099957d596b9e5b32d3f9cbfc6bc8d6370fc67d7d96
lzip-checksum = 8d063a5f0609caa4d568f7bad4c67fcdee70a16c37e67b9d3cccbae53f09c14fa8590816aeb37a3fe0bc71a642c55e9fb4b371c0f68585be9564af22584d5c99
m4-checksum = a92cad4441b3fd7c033837389ca3499494523d364a5fda043d92c517051510f1758b3b837f0477f42d2258a179ab79a4993e5d1694ef2673db6d96d1faff84fe
make-checksum = ddf0fdcb9ee1b182ef294c5da70c1275288c99bef60e63a25c0abed2ddd44aba1770be4aab1db8cac81e5f624576f2127c5d825a1824e1c7a49df4f16445526b
metastore-checksum = b2a5fdde9de5ddc1e6c368d5da1b2e97e4fdbaa138a7be281ccb40a81dd4a9bb1849d36b2d5d3f01205079bace60441f82a7002097ff3a7037340a35b0f1574a
......@@ -53,15 +53,15 @@ perl-checksum = b00f3482f6961be043349a09445227e99472a8ae804919bfa0641de5bbd68324
pkgconfig-checksum = 4861ec6428fead416f5cbbbb0bbad10b9152967e481d4b0ff2eb396a9f297f552984c9bb72f6864a37dcd8fca1d9ccceda3ef18d8f121938dbe4fdf2b870fe75
readline-checksum = 41759d27bc3a258fefd7f4ff3277fa6ab9c21abb7b160e1a75aa8eba547bd90b288514e76264bd94fb0172da8a4faa54aab2c07b68a0356918ecf7f1969e866f
sed-checksum = 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
tar-checksum = 4be18afeac54aec4af074cf2358cfade5aaebe2041c5075c5764a81114df4d002e90b28f4444bd1430783e7d6bed82abd0440ef5cb244695f2e56a9a41b42fbc
tar-checksum = a52778ce654274c7dbbcfcd52ea6d08089654efb144fdd13017dc14d7bd81074941f120796e6ead8e88a7ba5d0159b9ad2b741ae4b5f55aa484aaf202a32f8e8
texinfo-checksum = da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7
unzip-checksum = 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
unzip-checksum = 1e3275bd8e45951565527e05b43ef7b4bec1a1c35cc1f6df5e941b463489d9de45e737da40ac845af2422f655bf078afcb8a1b9ce2ed1eefb4eff559cb46956b
valgrind-checksum = 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
wget-checksum = 95fb064f0d79b0a3178a83322f58a85a3a036fb300ed759eb67a538f0bbacdd552f6cbeb60d63b4f0113e8467d923a5ce7ac5570b7a4ce1733b3dfd559bb33b2
which-checksum = d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
xz-checksum = 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
zip-checksum = c1c3d62bf1426476c0f9919b568013d6d7b03514912035f09ee283226d94c978791ad2af5310021e96c4c2bf320bfc9d0b8f4045c48e4667e034d98197e1a9b3
zlib-checksum = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
xz-checksum = bb05eec717a3bb6f5da2839ebf39c9ba05fb9d0b2039bc4d716470ffe41bff25f3ad48ee2852a075f7bdf64263c20870f0b7a516d6efce3e58128b4ea365367f
zip-checksum = a5c0ee7405ff0a473192ab5a0809e39a501abe37aa959d49e2afcff29556c416366bd51b1a2604cd1e3c3917e52a1579e95c4482d47651d522bd876a6f229f6c
zlib-checksum = dcfe1bed89526fc0c3fcf7aa4a37e34a725bcb470002e221d2e2b663f0f46847ce05292d6cd1dfab28a88ce79db2e0a5043b4a713f4739ec0331e772ee784ead
......@@ -137,7 +137,6 @@ vim-checksum = 06ba43386fcf308520d88d7a68e9bc1fabd824b05078b8f9112500a2ad4e50a91
wcslib-checksum = 8c98c4b575056e2d966b77a4bc951256d02ecee3a11847e140fd38d93afd0f76b3e906d590c952dc9fc58ceeb1ba062b19d8e1e676ee0032f5b7ed13a9dfa892
xlsxio-checksum = 22870fda7bd4eefd5fea2a9ad7530c9049135129d9b69805091777e6b54b2fc6c3f0e69c6954f36bce54eebbfeccaf637cce9e271a593221a4296d6632470a6c
yaml-checksum = dadd7d8e0d88b5ebab005e5d521d56d541580198aa497370966b98c904586e642a1cd4f3881094eb57624f218d50db77417bbfd0ffdce50340f011e35e8c4c02
zlib-checksum = 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
# Xorg related packages
util-macros-checksum = 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
......
......@@ -19,15 +19,15 @@
# -------------------------------------------------------------
#bash-url = http://akhlaghi.org/src
#binutils-url = http://ftp.gnu.org/gnu/binutils
#bzip2-url = http://akhlaghi.org/maneage-software
#bzip2-url = https://sourceware.org/pub/bzip2
#cert-url = http://akhlaghi.org/maneage-software
#coreutils-url = http://ftp.gnu.org/gnu/coreutils
#curl-url = https://curl.haxx.se/download
#dash-url = http://akhlaghi.org/maneage-software
#dash-url = http://gondor.apana.org.au/~herbert/dash/files
#diffutils-url = http://ftp.gnu.org/gnu/diffutils
#file-url = ftp://ftp.astron.com/pub/file
#findutils-url = http://ftp.gnu.org/gnu/findutils
#flock-url = http://akhlaghi.org/src
#flock-url = https://github.com/discoteq/flock/releases
#gawk-url = http://ftp.gnu.org/gnu/gawk
#gcc-url = http://ftp.gnu.org/gnu/gcc/gcc-$(gcc-version)
#gettext-url = https://ftp.gnu.org/gnu/gettext
......
......@@ -20,18 +20,18 @@ bash-version = 5.0.18
binutils-version = 2.35
coreutils-version = 8.32
curl-version = 7.71.1
dash-version = 0.5.10.2
dash-version = 0.5.11.5
diffutils-version = 3.7
file-version = 5.39
findutils-version = 4.7.0
flock-version = 0.2.3
flock-version = 0.4.0
gawk-version = 5.1.0
gcc-version = 10.2.0
gettext-version = 0.21
git-version = 2.28.0
gmp-version = 6.2.0
grep-version = 3.4
gzip-version = 1.10
gzip-version = 1.11
isl-version = 0.18
less-version = 563
libbsd-version = 0.10.0
......@@ -39,7 +39,7 @@ libiconv-version = 1.16
libtool-version = 2.4.6
libunistring-version = 0.9.10
libxml2-version = 2.9.9
lzip-version = 1.22-rc2
lzip-version = 1.22
m4-version = 1.4.18-patched
make-version = 4.3
metastore-version = 1.1.2-23-fa9170b
......@@ -52,7 +52,7 @@ perl-version = 5.32.0
pkgconfig-version = 0.29.2
readline-version = 8.0
sed-version = 4.8
tar-version = 1.32
tar-version = 1.34
texinfo-version = 6.7
unzip-version = 6.0
wget-version = 1.20.3
......@@ -67,7 +67,7 @@ zlib-version = 1.2.11
# When updating the version of these programs/libraries, please look into
# the build rule first: In one way or another, the version string becomes
# necessary during their build and must be accounted for.
bzip2-version = 1.0.6
bzip2-version = 1.0.8
......
......@@ -249,7 +249,7 @@ $(ibidir)/gzip-$(gzip-version): | $(ibdir) $(ildir) $(lockdir)
echo "GNU Gzip $(gzip-version)" > $@
$(ibidir)/xz-$(xz-version): $(ibidir)/gzip-$(gzip-version)
tarball=xz-$(xz-version).tar.gz
tarball=xz-$(xz-version).tar.lz
$(call import-source, $(xz-url), $(xz-checksum))
$(call gbuild, xz-$(xz-version), static)
echo "XZ Utils $(xz-version)" > $@
......@@ -257,7 +257,7 @@ $(ibidir)/xz-$(xz-version): $(ibidir)/gzip-$(gzip-version)
$(ibidir)/bzip2-$(bzip2-version): $(ibidir)/gzip-$(gzip-version)
# Download the tarball.
tarball=bzip2-$(bzip2-version).tar.gz
tarball=bzip2-$(bzip2-version).tar.lz
$(call import-source, $(bzip2-url), $(bzip2-checksum))
# Bzip2 doesn't have a `./configure' script, and its Makefile
......@@ -296,14 +296,13 @@ $(ibidir)/bzip2-$(bzip2-version): $(ibidir)/gzip-$(gzip-version)
cd ..
rm -rf $$tdir
cd $(ildir)
ln -fs libbz2.so.1.0 libbz2.so
ln -fs libbz2.so.$(bzip2-version) libbz2.so
echo "Bzip2 $(bzip2-version)" > $@
$(ibidir)/unzip-$(unzip-version): $(ibidir)/gzip-$(gzip-version)
tarball=unzip-$(unzip-version).tar.gz
v=$$(echo $(unzip-version) | sed -e's/\.//')
tarball=unzip-$(unzip-version).tar.lz
$(call import-source, $(unzip-url), $(unzip-checksum))
$(call gbuild, unzip$$v, static,, \
$(call gbuild, unzip-$(unzip-version), static,, \
-f unix/Makefile generic \
CFLAGS="-DBIG_MEM -DMMAP",,pwd, \
-f unix/Makefile generic \
......@@ -311,10 +310,9 @@ $(ibidir)/unzip-$(unzip-version): $(ibidir)/gzip-$(gzip-version)
echo "Unzip $(unzip-version)" > $@
$(ibidir)/zip-$(zip-version): $(ibidir)/gzip-$(gzip-version)
tarball=zip-$(zip-version).tar.gz
v=$$(echo $(zip-version) | sed -e's/\.//')
tarball=zip-$(zip-version).tar.lz
$(call import-source, $(zip-url), $(zip-checksum))
$(call gbuild, zip$$v, static,, \
$(call gbuild, zip-$(zip-version), static,, \
-f unix/Makefile generic \
CFLAGS="-DBIG_MEM -DMMAP",,pwd, \
-f unix/Makefile generic \
......@@ -327,7 +325,7 @@ $(ibidir)/zip-$(zip-version): $(ibidir)/gzip-$(gzip-version)
# Note for a static-only build: Zlib's `./configure' doesn't use Autoconf's
# configure script, it just accepts a direct `--static' option.
$(ibidir)/zlib-$(zlib-version): $(ibidir)/gzip-$(gzip-version)
tarball=zlib-$(zlib-version).tar.gz
tarball=zlib-$(zlib-version).tar.lz
$(call import-source, $(zlib-url), $(zlib-checksum))
$(call gbuild, zlib-$(zlib-version))
echo "Zlib $(zlib-version)" > $@
......@@ -344,13 +342,15 @@ $(ibidir)/tar-$(tar-version): \
$(ibidir)/zlib-$(zlib-version) \
$(ibidir)/bzip2-$(bzip2-version) \
$(ibidir)/unzip-$(unzip-version)
# Since all later programs depend on Tar, the configuration will be
# stuck here, only making Tar. So its more efficient to built it on
# multiple threads (when the user's Make doesn't pass down the
# number of threads).
tarball=tar-$(tar-version).tar.gz
# Since all later programs depend on Tar, the configuration will
# hit a bottleneck here: only making Tar. So its more efficient to
# built it on multiple threads (even when the user's Make doesn't
# pass down the number of threads).
tarball=tar-$(tar-version).tar.lz
$(call import-source, $(tar-url), $(tar-checksum))
$(call gbuild, tar-$(tar-version), , , -j$(numthreads) V=1)
echo; echo "GOOD"; echo; exit 1;
echo "GNU Tar $(tar-version)" > $@
......
......@@ -1506,16 +1506,16 @@ fi
zenodourl=""
user_backup_urls=""
zenodocheck=.build/software/zenodo-check.html
if [ x$debug = x ]; then
if $downloader $zenodocheck https://doi.org/10.5281/zenodo.3883409; then
zenodourl=$(sed -n -e'/coreutils/p' $zenodocheck \
| sed -n -e'/http/p' \
| tr ' ' '\n' \
| grep http \
| sed -e 's/href="//' -e 's|/coreutils| |' \
| awk 'NR==1{print $1}')
fi
fi
#if [ x$debug = x ]; then
# if $downloader $zenodocheck https://doi.org/10.5281/zenodo.3883409; then
# zenodourl=$(sed -n -e'/coreutils/p' $zenodocheck \
# | sed -n -e'/http/p' \
# | tr ' ' '\n' \
# | grep http \
# | sed -e 's/href="//' -e 's|/coreutils| |' \
# | awk 'NR==1{print $1}')
# fi
#fi
rm -f $zenodocheck
# Add the Zenodo URL to the user's given back software URLs. Since the user
......
......@@ -185,6 +185,14 @@ build_program() {
# All others accept the configure script.
./configure --prefix="$instdir" $configoptions
# In Flock 0.4.0 there is a crash that can be fixed by simply
# replacing '%1u' --> '%1lu'. This has been reported to flock
# maintainers: https://github.com/discoteq/flock/issues/33
if [ x$progname = xflock ]; then
sed -e's/\%1u/\%1lu/' src/flock.c > src/flock-new.c
mv src/flock-new.c src/flock.c
fi
# To build GNU Make, we don't want to assume the existance of a
# Make program, so we use its 'build.sh' script and its own built
# 'make' program to install itself.
......@@ -192,7 +200,7 @@ build_program() {
/bin/sh build.sh
./make install
else
make
make V=1
make install
fi
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment