import oath-toolkit-2.6.11-5.el10

7 changed files with 44 additions and 31 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-/oath-toolkit-*.tar.gz
-/oath-toolkit-*.tar.gz.sig
+SOURCES/oath-toolkit-2.6.11.tar.gz
--- a/.oath-toolkit.metadata
+++ b/.oath-toolkit.metadata
@ -0,0 +1 @@
+7e365d0fa892c4d1493585751adaec0ebd07d66e  SOURCES/oath-toolkit-2.6.11.tar.gz
--- a/SOURCES/keyring.asc
+++ b/SOURCES/keyring.asc
@ -0,0 +1,23 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEXJLOtBYJKwYBBAHaRw8BAQdACIcrZIvhrxDBkK9fV+QlTmXxo2naObDuGtw5
+8YaxlOu0JVNpbW9uIEpvc2Vmc3NvbiA8c2ltb25Aam9zZWZzc29uLm9yZz6IlgQT
+FggAPgIbAwULCQgHAgYVCAkKCwIEFgIDAQIeAQIXgBYhBLHSvRN1vst4TPT4xNc8
+9jjFPAa+BQJl/YgIBQkLehFUAAoJENc89jjFPAa+CboA+wUa06RD5e5VTCxvSWtP
+S75Wq2qBeYGZnf0jvUMxa2n4AP4xkUeAPPnNuMsTm2fsFCDIGaEM2Yn6Vb2huzzT
+1Fw/BLg4BFySz2oSCisGAQQBl1UBBQEBB0AxlRumDW6nZY7A+VCfek9VpEx6PJmd
+JyYPt3lNHMd6HAMBCAeIfgQYFggAJgIbDBYhBLHSvRN1vst4TPT4xNc89jjFPAa+
+BQJl/YgwBQkLehDGAAoJENc89jjFPAa+phoA/jrDqIrl/55vUMBhIQv+TP635d2i
+CTEnyFmbUcP9+gh6APoDsXalVd2cOGxQtSC+TF8PkZMn1TLkJKAjVxr+xx40Argz
+BFySz4EWCSsGAQQB2kcPAQEHQOxTCIOaeXAxI2hIX4HK9bQTpNVei708oNr1Klm8
+qCGKiPUEGBYIACYCGwIWIQSx0r0Tdb7LeEz0+MTXPPY4xTwGvgUCZf2IKwUJC3oQ
+qgCBdiAEGRYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCXJLPgQAKCRBRcisI
+/kdFoqdMAQCgH45aseZgIrwKOvUOA9QfsmeE8GZHYNuFHmM9FEQS6AD6A4x5aYvo
+Y6lo98pgtw2HPDhmcCXFItjXCrV4A0GmJA4JENc89jjFPAa+GcYA/26YQY05bLtn
+XiIjTiAzrGQrRXxTHPA8Av7TDFHvIetWAP9sHSoU8OfTwmTiEnGwLlsV7QJclZg3
+YNz/Ypcp9TqQBrgzBFySz3UWCSsGAQQB2kcPAQEHQLzCFcHHrKzVSPDDarZPYqn8
+9H5TPaxwcORgRg+4DagEiH4EGBYIACYCGyAWIQSx0r0Tdb7LeEz0+MTXPPY4xTwG
+vgUCZf2IJAUJC3oQrwAKCRDXPPY4xTwGvoxCAQCe/iMQZvHZmSQef5RnL1HOWy03
+OHtsZyhGLnQjsx7PhAEA3O2K0dNbPW2iZMcn9MXAOdmff3zkfNrWEWkZR/x5Xgw=
+=2aFT
+-----END PGP PUBLIC KEY BLOCK-----
--- a/SOURCES/oath-toolkit-2.6.11.tar.gz.sig
+++ b/SOURCES/oath-toolkit-2.6.11.tar.gz.sig
--- a/SOURCES/oath-toolkit-2.6.9-lockfile.patch
+++ b/SOURCES/oath-toolkit-2.6.9-lockfile.patch
@ -1,5 +1,5 @@
 diff --git a/liboath/global.c b/liboath/global.c
-index d1a0e4d..4c6e5ca 100644
+index 8c60c20..acaa3eb 100644
 --- a/liboath/global.c
 +++ b/liboath/global.c
@@ -25,9 +25,12 @@
@ -61,7 +61,7 @@ index d1a0e4d..4c6e5ca 100644
 +  return OATH_OK;
 +}
 diff --git a/liboath/liboath.map b/liboath/liboath.map
-index d980107..a001f6d 100644
+index 5493358..a1be2fb 100644
 --- a/liboath/liboath.map
 +++ b/liboath/liboath.map
@@ -75,6 +75,7 @@ LIBOATH_2.2.0
@ -73,7 +73,7 @@ index d980107..a001f6d 100644
 
 LIBOATH_2.6.0
 diff --git a/liboath/oath.h b/liboath/oath.h
-index 01b7a3c..a5d7787 100644
+index 3a4077f..bd592c8 100644
 --- a/liboath/oath.h
 +++ b/liboath/oath.h
@@ -159,11 +159,15 @@ extern "C"
@ -93,7 +93,7 @@ index 01b7a3c..a5d7787 100644
 
   extern OATHAPI const char *oath_strerror (int err);
 diff --git a/liboath/oath.h.in b/liboath/oath.h.in
-index b8b4fbd..99e5fd0 100644
+index b14df98..2bc89de 100644
 --- a/liboath/oath.h.in
 +++ b/liboath/oath.h.in
@@ -159,11 +159,15 @@ extern "C"
@ -113,7 +113,7 @@ index b8b4fbd..99e5fd0 100644
 
   extern OATHAPI const char *oath_strerror (int err);
 diff --git a/liboath/usersfile.c b/liboath/usersfile.c
-index 68268a2..eb78fe0 100644
+index 582c657..f8f6446 100644
 --- a/liboath/usersfile.c
 +++ b/liboath/usersfile.c
@@ -325,9 +325,18 @@ update_usersfile (const char *usersfile,
@ -136,13 +136,13 @@ index 68268a2..eb78fe0 100644
 +        return OATH_PRINTF_ERROR;
 +    }
 
-     lockfh = fopen (lockfile, "wx");
+     lockfh = fopen (lockfile, "w");
     if (!lockfh)
 diff --git a/pam_oath/pam_oath.c b/pam_oath/pam_oath.c
-index 2a85030..6a83195 100644
+index 0a88a1c..28afd9b 100644
 --- a/pam_oath/pam_oath.c
 +++ b/pam_oath/pam_oath.c
-@@ -75,6 +75,7 @@ struct cfg
+@@ -73,6 +73,7 @@ struct cfg
   int try_first_pass;
   int use_first_pass;
   char *usersfile;
@ -150,7 +150,7 @@ index 2a85030..6a83195 100644
   unsigned digits;
   unsigned window;
 };
-@@ -89,6 +90,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
+@@ -87,6 +88,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
   cfg->try_first_pass = 0;
   cfg->use_first_pass = 0;
   cfg->usersfile = NULL;
@ -158,7 +158,7 @@ index 2a85030..6a83195 100644
   cfg->digits = -1;
   cfg->window = 5;
 
-@@ -104,6 +106,8 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
+@@ -102,6 +104,8 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
 	cfg->use_first_pass = 1;
       if (strncmp (argv[i], "usersfile=", 10) == 0)
 	cfg->usersfile = (char *) argv[i] + 10;
@ -167,7 +167,7 @@ index 2a85030..6a83195 100644
       if (strncmp (argv[i], "digits=", 7) == 0)
 	cfg->digits = atoi (argv[i] + 7);
       if (strncmp (argv[i], "window=", 7) == 0)
-@@ -129,6 +133,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
+@@ -127,6 +131,7 @@ parse_cfg (int flags, int argc, const char **argv, struct cfg *cfg)
       D (("try_first_pass=%d", cfg->try_first_pass));
       D (("use_first_pass=%d", cfg->use_first_pass));
       D (("usersfile=%s", cfg->usersfile ? cfg->usersfile : "(null)"));
@ -175,7 +175,7 @@ index 2a85030..6a83195 100644
       D (("digits=%d", cfg->digits));
       D (("window=%d", cfg->window));
     }
-@@ -369,6 +374,17 @@ pam_sm_authenticate (pam_handle_t *pamh,
+@@ -337,6 +342,17 @@ pam_sm_authenticate (pam_handle_t * pamh,
       goto done;
     }
 
--- a/SPECS/oath-toolkit.spec
+++ b/SPECS/oath-toolkit.spec
@ -1,8 +1,7 @@
 Name:          oath-toolkit
-Version:       2.6.12
-Release:       1%{?dist}
-# Automatically converted from old format: GPLv3+ - review is highly recommended.
-License:       GPL-3.0-or-later
+Version:       2.6.11
+Release:       5%{?dist}
+License:       GPLv3+
 Summary:       One-time password components
 BuildRequires: make
 BuildRequires: pam-devel
@ -20,7 +19,7 @@ Source1:       https://download.savannah.nongnu.org/releases/%{name}/%{name}-%{v
 # gpg2 --armor --export D73CF638C53C06BE > keyring.asc
 Source2:       keyring.asc
 URL:           https://www.nongnu.org/oath-toolkit/
-Patch0:        oath-toolkit-2.6.12-lockfile.patch
+Patch0:        oath-toolkit-2.6.9-lockfile.patch

 %description
 The OATH Toolkit provide components for building one-time password
@ -91,8 +90,7 @@ Documentation files for libpskc.

 %package -n oathtool
 Summary:  A command line tool for generating and validating OTPs
-# Automatically converted from old format: GPLv3+ - review is highly recommended.
-License:  GPL-3.0-or-later
+License:  GPLv3+
 # https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib)

@ -189,14 +187,8 @@ mkdir -p -m 0600 %{buildroot}%{_sysconfdir}/liboath
 %{_libdir}/security/pam_oath.so

 %changelog
-* Thu Oct 10 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 2.6.12-1
- New version
-  Resolves: rhbz#2316447
- Dropped privileges when operating on user files
-  Resolves: CVE-2024-47191
-
-* Thu Jul  25 2024 Miroslav Suchý <msuchy@redhat.com> - 2.6.11-6
- convert license to SPDX
+* Mon Dec 30 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2.6.11-5
+- Rebuilt for MSVSphere 10

 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6.11-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-SHA512 (oath-toolkit-2.6.12.tar.gz) = f82967e4b86bac57bec4b048fedd351ca7ae6f368f4b3a61135057c28c531a2c9845b51660dee2a6f5db66d5065619d22921b94229c672d1889077a710a0f0ce
-SHA512 (oath-toolkit-2.6.12.tar.gz.sig) = 1596132d6e88f3c0f4af8b8ac57815d448d05af51f3f276b9dd3ba4d41d1a95f2d6ba726f1963e63d4d2aa967cfc0d08983b61ff62454f1355e5e67206a09f82
				`@ -0,0 +1 @@`
				`7e365d0fa892c4d1493585751adaec0ebd07d66e SOURCES/oath-toolkit-2.6.11.tar.gz`