1 files changed, 85 insertions, 0 deletions
diff --git a/packages.csv b/packages.csv
index 45a31a7..33c1fc9 100644
--- a/packages.csv
+++ b/packages.csv
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 acl,2.3.1,http://download.savannah.gnu.org/releases/acl/acl-@.tar.xz,95ce715fe09acca7c12d3306d0f076b2
 attr,2.5.1,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,ac1c5a7a084f0f83b8cace34211f64d8
 autoconf,2.71,http://ftp.gnu.org/gnu/autoconf/autoconf-@.tar.xz,12cfa1687ffa2606337efe1a64416106
@@ -80,3 +81,87 @@ xml-parser,2.46,https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-@.tar
 xz,5.2.5,https://tukaani.org/xz/xz-@.tar.xz,aa1621ec7013a19abab52a8aff04fe5b
 zlib,1.2.11,https://zlib.net/zlib-@.tar.xz,85adef240c5f370b308da8c938951a68
 zstd,1.4.9,https://github.com/facebook/zstd/releases/download/v@/zstd-@.tar.gz,eb718b8aae0302cabe20f968e500534d
+=======
+acl,2.3.1,http://download.savannah.gnu.org/releases/acl/acl-@.tar.xz,95ce715fe09acca7c12d3306d0f076b2
+attr,2.5.1,http://download.savannah.gnu.org/releases/attr/attr-@.tar.gz,ac1c5a7a084f0f83b8cace34211f64d8
+autoconf,2.71,http://ftp.gnu.org/gnu/autoconf/autoconf-@.tar.xz,12cfa1687ffa2606337efe1a64416106
+automake,1.16.3,http://ftp.gnu.org/gnu/automake/automake-@.tar.xz,c27f608a4e1f302ec7ce42f1251c184e
+bash,5.1,http://ftp.gnu.org/gnu/bash/bash-@.tar.gz,bb91a17fd6c9032c26d0b2b78b50aff5
+bc,4.0.2,https://github.com/gavinhoward/bc/releases/download/@/bc-@.tar.xz,230d780f978f1bc3f725bfbaf63c2b43
+binutils,2.36.1,http://ftp.gnu.org/gnu/binutils/binutils-@.tar.xz,628d490d976d8957279bbbff06cf29d4
+bison,3.7.6,http://ftp.gnu.org/gnu/bison/bison-@.tar.xz,d61aa92e3562cb7292b004ce96173cf7
+bzip2,1.0.8,https://www.sourceware.org/pub/bzip2/bzip2-@.tar.gz,67e051268d0c475ea773822f7500d0e5
+check,0.15.2,https://github.com/libcheck/check/releases/download/@/check-@.tar.gz,50fcafcecde5a380415b12e9c574e0b2
+coreutils,8.32,http://ftp.gnu.org/gnu/coreutils/coreutils-@.tar.xz,022042695b7d5bcf1a93559a9735e668
+dejagnu,1.6.2,http://ftp.gnu.org/gnu/dejagnu/dejagnu-@.tar.gz,e1b07516533f351b3aba3423fafeffd6
+diffutils,3.7,http://ftp.gnu.org/gnu/diffutils/diffutils-@.tar.xz,4824adc0e95dbbf11dfbdfaad6a1e461
+e2fsprogs,1.46.2,https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v@/e2fsprogs-@.tar.gz,e8ef5fa3b72557be5e9fe564a25da6eb
+libelf,0.185,https://sourceware.org/ftp/elfutils/@/elfutils-@.tar.bz2,2b6e94c2eebc1f2194173e31bca9396e
+eudev,3.2.10,https://dev.gentoo.org/~blueness/eudev/eudev-@.tar.gz,60b135a189523f333cea5f71a3345c8d
+expat,2.4.1,https://prdownloads.sourceforge.net/expat/expat-@.tar.xz,a4fb91a9441bcaec576d4c4a56fa3aa6
+expect,5.45.4,https://prdownloads.sourceforge.net/expect/expect@.tar.gz,00fce8de158422f5ccd2666512329bd2
+file,5.40,http://ftp.astron.com/pub/file/file-@.tar.gz,72540ea1cc8c6e1dee35d6100ec66589
+findutils,4.8.0,http://ftp.gnu.org/gnu/findutils/findutils-@.tar.xz,eeefe2e6380931a77dfa6d9350b43186
+flex,2.6.4,https://github.com/westes/flex/releases/download/v@/flex-@.tar.gz,2882e3179748cc9f9c23ec593d6adc8d
+gawk,5.1.0,http://ftp.gnu.org/gnu/gawk/gawk-@.tar.xz,8470c34eeecc41c1aa0c5d89e630df50
+gcc,10.3.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,443c15b92614a3ce8f22e3b24ca2226a
+gdbm,1.19,http://ftp.gnu.org/gnu/gdbm/gdbm-@.tar.gz,aeb29c6a90350a4c959cd1df38cd0a7e
+gettext,0.21,http://ftp.gnu.org/gnu/gettext/gettext-@.tar.xz,40996bbaf7d1356d3c22e33a8b255b31
+glibc,2.33,http://ftp.gnu.org/gnu/glibc/glibc-@.tar.xz,390bbd889c7e8e8a7041564cb6b27cca
+gmp,6.2.1,http://ftp.gnu.org/gnu/gmp/gmp-@.tar.xz,0b82665c4a92fd2ade7440c13fcaa42b
+gperf,3.1,http://ftp.gnu.org/gnu/gperf/gperf-@.tar.gz,9e251c0a618ad0824b51117d5d9db87e
+grep,3.6,http://ftp.gnu.org/gnu/grep/grep-@.tar.xz,f47fe27049510b2249dba7f862ac1b51
+groff,1.22.4,http://ftp.gnu.org/gnu/groff/groff-@.tar.gz,08fb04335e2f5e73f23ea4c3adbf0c5f
+grub,2.04,https://ftp.gnu.org/gnu/grub/grub-@.tar.xz,5aaca6713b47ca2456d8324a58755ac7
+gzip,1.10,http://ftp.gnu.org/gnu/gzip/gzip-@.tar.xz,691b1221694c3394f1c537df4eee39d3
+iana-etc,20210526,https://github.com/Mic92/iana-etc/releases/download/@/iana-etc-@.tar.gz,8442d67cc5f5b3616d128e25779a93c7
+inetutils,2.0,http://ftp.gnu.org/gnu/inetutils/inetutils-@.tar.xz,5e1018502cd131ed8e42339f6b5c98aa
+intltool,0.51.0,https://launchpad.net/intltool/trunk/@/+download/intltool-@.tar.gz,12e517cac2b57a0121cda351570f1e63
+iproute2,5.10.0,https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-@.tar.xz,19ffea480a21e600453776b7225f3319
+isl,0.23,http://isl.gforge.inria.fr/isl-@.tar.xz,cc8155dfe8550e59299a2368dbaa7d04
+kbd,2.4.0,https://www.kernel.org/pub/linux/utils/kbd/kbd-@.tar.xz,3cac5be0096fcf7b32dcbd3c53831380
+kmod,29,https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-@.tar.xz,e81e63acd80697d001c8d85c1acb38a0
+less,581,http://www.greenwoodsoftware.com/less/less-@.tar.gz,6201df5b9dae2af9767fc220471471b3
+lfs-bootscripts,20210201,http://www.linuxfromscratch.org/lfs/downloads/10.1/lfs-bootscripts-@.tar.xz,1fc441ef96c522974f7267dec8b40a47
+libcap,2.50,https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-@.tar.xz,66a561afa81666236ff973544ff4e864
+libffi,3.3,https://sourceware.org/pub/libffi/libffi-@.tar.gz,6313289e32f1d38a9df4770b014a2ca7
+libpipeline,1.5.3,http://download.savannah.gnu.org/releases/libpipeline/libpipeline-@.tar.gz,dad443d0911cf9f0f1bd90a334bc9004
+libstdc++,10.3.0,http://ftp.gnu.org/gnu/gcc/gcc-@/gcc-@.tar.xz,443c15b92614a3ce8f22e3b24ca2226a
+libtool,2.4.6,http://ftp.gnu.org/gnu/libtool/libtool-@.tar.xz,1bfb9b923f2c1339b4d2ce1807064aa5
+linux,5.10.41,https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,9c8b424c036f2985442c25dfe3305dd1
+linux-api-headers,5.10.41,cdn://www.kernel.org/pub/linux/kernel/v5.x/linux-@.tar.xz,9c8b424c036f2985442c25dfe3305dd1
+m4,1.4.18,http://ftp.gnu.org/gnu/m4/m4-@.tar.xz,730bb15d96fffe47e148d1e09235af82
+make,4.3,http://ftp.gnu.org/gnu/make/make-@.tar.gz,fc7a67ea86ace13195b0bce683fd4469
+man-db,2.9.4,http://download.savannah.gnu.org/releases/man-db/man-db-@.tar.xz,6e233a555f7b9ae91ce7cd0faa322bce
+man-pages,5.10,https://www.kernel.org/pub/linux/docs/man-pages/man-pages-@.tar.xz,4ae3f74a1beddd919936e1058642644c
+meson,0.58.0,https://github.com/mesonbuild/meson/releases/download/@/meson-@.tar.gz,18ac55e3d6a5acb17b5737eb2a15bb5b
+mpc,1.2.1,https://ftp.gnu.org/gnu/mpc/mpc-@.tar.gz,9f16c976c25bb0f76b50be749cd7a3a8
+mpfr,4.1.0,http://www.mpfr.org/mpfr-@/mpfr-@.tar.xz,bdd3d5efba9c17da8d83a35ec552baef
+ncurses,6.2,http://ftp.gnu.org/gnu/ncurses/ncurses-@.tar.gz,e812da327b1c2214ac1aed440ea3ae8d
+ninja,1.10.2,https://github.com/ninja-build/ninja/archive/v@/ninja-@.tar.gz,639f75bc2e3b19ab893eaf2c810d4eb4
+openssl,1.1.1k,https://www.openssl.org/source/openssl-@.tar.gz,c4e7d95f782b08116afa27b30393dd27
+patch,2.7.6,http://ftp.gnu.org/gnu/patch/patch-@.tar.xz,78ad9937e4caadcba1526ef1853730d5
+perl,5.34.0,https://www.cpan.org/src/5.0/perl-@.tar.xz,df7ecb0653440b26dc951ad9dbfab517
+pkg-config,0.29.2,https://pkg-config.freedesktop.org/releases/pkg-config-@.tar.gz,f6e931e319531b736fadc017f470e68a
+procps-ng,3.3.17,https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-@.tar.xz,d60613e88c2f442ebd462b5a75313d56
+psmisc,23.4,https://sourceforge.net/projects/psmisc/files/psmisc/psmisc-@.tar.xz,8114cd4489b95308efe2509c3a406bbf
+python,3.9.5,https://www.python.org/ftp/python/@/Python-@.tar.xz,71f7ada6bec9cdbf4538adc326120cfd
+python-doc,3.9.5,https://www.python.org/ftp/python/doc/@/python-@-docs-html.tar.bz2,c594916b00cbb9796fa001dd2764ab0f
+readline,8.1,http://ftp.gnu.org/gnu/readline/readline-@.tar.gz,e9557dd5b1409f5d7b37ef717c64518e
+sed,4.8,http://ftp.gnu.org/gnu/sed/sed-@.tar.xz,6d906edfdb3202304059233f51f9a71d
+shadow,4.8.1,https://github.com/shadow-maint/shadow/releases/download/@/shadow-@.tar.xz,4b05eff8a427cf50e615bda324b5bc45
+sysklogd,1.5.1,http://www.infodrom.org/projects/sysklogd/download/sysklogd-@.tar.gz,c70599ab0d037fde724f7210c2c8d7f8
+sysvinit,2.99,http://download.savannah.gnu.org/releases/sysvinit/sysvinit-@.tar.xz,6abc0ea61b8dd4a41b4e931a43b1bb90
+tar,1.34,http://ftp.gnu.org/gnu/tar/tar-@.tar.xz,9a08d29a9ac4727130b5708347c0f5cf
+tcl,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-src.tar.gz,8a4c004f48984a03a7747e9ba06e4da4
+tcl-doc,8.6.11,https://downloads.sourceforge.net/tcl/tcl@-html.tar.gz,e358a9140c3a171e42f18c8a7f6a36ea
+texinfo,6.7,http://ftp.gnu.org/gnu/texinfo/texinfo-@.tar.xz,d4c5d8cc84438c5993ec5163a59522a6
+time Zone Data,2021a,https://www.iana.org/time-zones/repository/releases/tzdata@.tar.gz,20eae7d1da671c6eac56339c8df85bbd
+udev-lfs Tarball,udev-lfs-20171102,http://anduin.linuxfromscratch.org/LFS/@.tar.xz,27cd82f9a61422e186b9d6759ddf1634
+util-linux,2.36.2,https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-@.tar.xz,f78419af679ac9678190ad961eb3cf27
+vim,8.2.2890,http://anduin.linuxfromscratch.org/LFS/vim-@.tar.gz,ec8a8ec5f67b0ad0edba82cad2354d33
+xml-parser,2.46,https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-@.tar.gz,80bb18a8e6240fcf7ec2f7b57601c170
+xz,5.2.5,https://tukaani.org/xz/xz-@.tar.xz,aa1621ec7013a19abab52a8aff04fe5b
+zlib,1.2.11,https://zlib.net/zlib-@.tar.xz,85adef240c5f370b308da8c938951a68
+zstd,1.5.0,https://github.com/facebook/zstd/releases/download/v@/zstd-@.tar.gz,a6eb7fb1f2c21fa80030a47993853e92
+>>>>>>> 6132c19762b7d74ba7ad06e291b6401c632bbc28