From 8818108236335a8b9fd358be4aa81c056400b880 Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Fri, 19 Nov 2021 12:36:00 +0100 Subject: [PATCH 1/3] Bumpd to 2.1.2 --- configure | 18 +++++++++--------- configure.ac | 2 +- opam-client.opam | 2 +- opam-core.opam | 2 +- opam-devel.opam | 2 +- opam-format.opam | 2 +- opam-installer.opam | 2 +- opam-repository.opam | 2 +- opam-solver.opam | 2 +- opam-state.opam | 2 +- opam.opam | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 4099e544dfe..c9c09cfc38a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for opam 2.1.1. +# Generated by GNU Autoconf 2.69 for opam 2.1.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='opam' PACKAGE_TARNAME='opam' -PACKAGE_VERSION='2.1.1' -PACKAGE_STRING='opam 2.1.1' +PACKAGE_VERSION='2.1.2' +PACKAGE_STRING='opam 2.1.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1310,7 +1310,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures opam 2.1.1 to adapt to many kinds of systems. +\`configure' configures opam 2.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1372,7 +1372,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opam 2.1.1:";; + short | recursive ) echo "Configuration of opam 2.1.2:";; esac cat <<\_ACEOF @@ -1482,7 +1482,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opam configure 2.1.1 +opam configure 2.1.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1820,7 +1820,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by opam $as_me 2.1.1, which was +It was created by opam $as_me 2.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -6984,7 +6984,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by opam $as_me 2.1.1, which was +This file was extended by opam $as_me 2.1.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7037,7 +7037,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -opam config.status 2.1.1 +opam config.status 2.1.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9ac97e6c68f..401ced11b0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl The line below must be formatted AC_INIT(opam,VERSION) with no extra spaces -AC_INIT(opam,2.1.1) +AC_INIT(opam,2.1.2) AC_COPYRIGHT(Copyright 2012-2019 OcamlPro SAS) AC_CONFIG_MACRO_DIR([m4]) diff --git a/opam-client.opam b/opam-client.opam index 62a2b43bf86..65262eeaeef 100644 --- a/opam-client.opam +++ b/opam-client.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Client library for opam 2.1" description: """ Actions on the opam root, switches, installations, and front-end. diff --git a/opam-core.opam b/opam-core.opam index b00308ef069..f4d2829754f 100644 --- a/opam-core.opam +++ b/opam-core.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Core library for opam 2.1" description: """ Small standard library extensions, and generic system interaction modules used by opam. diff --git a/opam-devel.opam b/opam-devel.opam index ec7d69e68b8..fb73b2d2ee5 100644 --- a/opam-devel.opam +++ b/opam-devel.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Bootstrapped development binary for opam 2.1" description: """ This package compiles (bootstraps) opam. For consistency and safety of the installation, the binaries are not installed into the PATH, but into lib/opam-devel, from where the user can manually install them system-wide. diff --git a/opam-format.opam b/opam-format.opam index 0fa513cc480..3913e7956c4 100644 --- a/opam-format.opam +++ b/opam-format.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Format library for opam 2.1" description: """ Definition of opam datastructures and its file interface. diff --git a/opam-installer.opam b/opam-installer.opam index 79501e4a4e3..f14d2ce00de 100644 --- a/opam-installer.opam +++ b/opam-installer.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Installation of files to a prefix, following opam conventions" description: """ opam-installer is a small tool that can read *.install files, as defined by opam [1], and execute them to install or remove package files without going through opam. diff --git a/opam-repository.opam b/opam-repository.opam index 45fbd7e2fc7..a521abc25ed 100644 --- a/opam-repository.opam +++ b/opam-repository.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Repository library for opam 2.1" description: """ This library includes repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends. diff --git a/opam-solver.opam b/opam-solver.opam index 8583f2c7fbc..72fb6243176 100644 --- a/opam-solver.opam +++ b/opam-solver.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Solver library for opam 2.1" description: """ Solver and Cudf interaction. This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam. diff --git a/opam-state.opam b/opam-state.opam index 6b338663b0f..6c46c01de7d 100644 --- a/opam-state.opam +++ b/opam-state.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "State library for opam 2.1" description: """ Handling of the ~/.opam hierarchy, repository and switch states. diff --git a/opam.opam b/opam.opam index 1d623e684c6..6f74c6d4772 100644 --- a/opam.opam +++ b/opam.opam @@ -1,5 +1,5 @@ opam-version: "2.0" -version: "2.1.1" +version: "2.1.2" synopsis: "Meta-package for Dune" maintainer: "opam-devel@lists.ocaml.org" authors: [ From 9f64f42553a98fff7be5a1b432fd10dc6a5d8a9d Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Fri, 19 Nov 2021 12:37:22 +0100 Subject: [PATCH 2/3] Updace changes --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index eb28da9e53e..b4e5d78e32e 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,9 @@ repositories (changes that are automatically handled by the format upgrade tools are not marked). Those prefixed with "(+)" are new command/option (since 2.1.0~alpha2). +2.1.2: +* Fallback on dnf if yum does not exist on RHEL-based systems [#4825 @kit-ty-kate] + 2.1.1: * Fix typo in error message for opam var [#4786 @kit-ty-kate - fix #4785] * Run the sandbox check in the temporary directory [#4787 @dra27 - fix #4783] From c555c6d5ea84228904dda1af8cb99c662db69d5a Mon Sep 17 00:00:00 2001 From: Kate Date: Tue, 7 Dec 2021 15:19:34 +0000 Subject: [PATCH 3/3] Update the changelog for opam 2.1.2 --- CHANGES | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES b/CHANGES index b4e5d78e32e..dc0a49e4548 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,8 @@ are not marked). Those prefixed with "(+)" are new command/option (since 2.1.2: * Fallback on dnf if yum does not exist on RHEL-based systems [#4825 @kit-ty-kate] +* Use --no-depexts in CLI 2.0 mode [#4908 @dra27] +* bootstrap: update ocaml version (fixes the compilation of opam with mingw) [#4927 @kit-ty-kate] 2.1.1: * Fix typo in error message for opam var [#4786 @kit-ty-kate - fix #4785]