Imported recent changes in Maneage, minor conflicts fixed

A few small conflicts showed up here and there. They are fixed with this
merge.

2 files changed, 23 insertions, 25 deletions

diff --git a/reproduce/software/config/checksums.conf b/reproduce/software/config/checksums.conf
index 37fe64d..b173589 100644
--- a/reproduce/software/config/checksums.conf
+++ b/reproduce/software/config/checksums.conf
@@ -2,18 +2,15 @@
 #
 # Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 #
-# This Makefile 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 Makefile is part of Maneage. Maneage 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 Makefile 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.
-#
-# A copy of the GNU General Public License is available at
-# <http://www.gnu.org/licenses/>.
+# Maneage 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. See <http://www.gnu.org/licenses/>.
 
 
 
diff --git a/reproduce/software/config/versions.conf b/reproduce/software/config/versions.conf
index 0c2cd0b..d19f095 100644
--- a/reproduce/software/config/versions.conf
+++ b/reproduce/software/config/versions.conf
@@ -3,18 +3,15 @@
 # Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
 # Copyright (C) 2019-2020 Raul Infante-Sainz <infantesainz@gmail.com>
 #
-# This Makefile 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 Makefile is part of Maneage. Maneage 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 Makefile 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.
-#
-# A copy of the GNU General Public License is available at
-# <http://www.gnu.org/licenses/>.
+# Maneage 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. See <http://www.gnu.org/licenses/>.
 
 
 
@@ -46,7 +43,6 @@ metastore-version = 1.1.2-23-fa9170b
 mpc-version = 1.1.0
 mpfr-version = 4.0.2
 ncurses-version = 6.1
-openssl-version = 1.1.1a
 patchelf-version = 0.10
 perl-version = 5.30.0
 pkgconfig-version = 0.29.2
@@ -216,6 +212,11 @@ libgit2-version = 0.28.2
 netpbm-version = 10.86.99
 wcslib-version = 6.4
 
-# Minizip is installed as a part of `zlib', and they have the same version.
-zlib-version = 1.2.11
+# Minizip is installed with the same `zlib' tarball, and they have the same
+# version.
 minizip-version = $(zlib-version)
+
+# From version 1.2 OpenSSL may not need a manual addition, as described in
+# its comments and `https://savannah.nongnu.org/bugs/?58263'. If it doesn't
+# cause problems, put it back in the list of "Basic/low-level" tools.
+openssl-version = 1.1.1a
\ No newline at end of file