Fix library versioning

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/libopenconnect.map.in b/libopenconnect.map.in
index cd4d87c86096813ef10c7581a618830d96710875..eae3e70677ba3772cc7ea867ce9ee6a5142c660a 100644 (file)
--- a/libopenconnect.map.in
+++ b/libopenconnect.map.in
@@ -1,14 +1,3 @@
-OPENCONNECT_2.2 {
- global:
-       openconnect_set_reported_os;
-};
-
-OPENCONNECT_2.1 {
- global:
-       openconnect_has_stoken_support;
-       openconnect_set_stoken_mode;
-};
-
 OPENCONNECT_2.0 {
  global:
        openconnect_clear_cookie;
@@ -41,6 +30,13 @@ OPENCONNECT_2.0 {
        openconnect_has_pkcs11_support;
 };
 
+OPENCONNECT_2.1 {
+ global:
+       openconnect_has_stoken_support;
+       openconnect_set_stoken_mode;
+       openconnect_set_reported_os;
+} OPENCONNECT_2.0;
+
 OPENCONNECT_PRIVATE {
  global: @SYMVER_TIME@ @SYMVER_ASPRINTF@ @SYMVER_GETLINE@ @SYMVER_PRINT_ERR@
        openconnect_SSL_gets;

diff --git a/openconnect.h b/openconnect.h
index 5a528c261cd7502fa7cc23ff7ad641b63beb2541..95cb6e84ab4a836ad2dce4eb6a900eff35575324 100644 (file)
--- a/openconnect.h
+++ b/openconnect.h
@@ -34,10 +34,8 @@
 #define OPENCONNECT_API_VERSION_MINOR 1
 
 /*
- * API version 2.2:
- *  - Add openconnect_set_reported_os()
- *
  * API version 2.1:
+ *  - Add openconnect_set_reported_os()
  *  - Add openconnect_set_stoken_mode(), openconnect_has_stoken_support()
  *
  * API version 2.0: