[AUTOPATCHER-CORE] Upgrade ntp to 4.2.8p17 3.0 - Upgrade (#7584)

Co-authored-by: Karim Eldegwy <kimoantiqe@hotmail.com>
This commit is contained in:
CBL-Mariner-Bot 2024-02-02 15:47:21 -08:00 коммит произвёл GitHub
Родитель 4bc17f01e7
Коммит 892f6a0e77
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 20 добавлений и 32 удалений

Просмотреть файл

@ -1,14 +0,0 @@
diff -ru ntp-4.2.8p15-orig/libntp/work_thread.c ntp-4.2.8p15/libntp/work_thread.c
--- ntp-4.2.8p15-orig/libntp/work_thread.c 2018-08-14 04:51:06.000000000 -0700
+++ ntp-4.2.8p15/libntp/work_thread.c 2021-11-11 12:11:57.941827886 -0800
@@ -41,7 +41,8 @@
#ifndef THREAD_MINSTACKSIZE
# define THREAD_MINSTACKSIZE (64U * 1024)
#endif
-#ifndef __sun
+// with gcc 11.x / glibc 2.34 PTHREAD_STACK_MIN is no longer a pre-processor directive
+#if defined(__sun) && !defined(__GLIBC__)
#if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
# undef THREAD_MINSTACKSIZE
# define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN

Просмотреть файл

@ -1,13 +1,13 @@
{
"Signatures": {
"LICENSE.PTR": "22591c393c8f9d309234493b98ccddcf246cf5f843358b2bdb62d84e59780e02",
"ntp-4.2.8p15.tar.gz": "f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19",
"ntp.step-tickers": "8b4bc72cc4a0af1e855f8836de5ceaa15b29620b7d3147e8f05c73bac773bee8",
"ntp.sysconfig": "f2a0ab20767f2c1975cd56cc2b013070fc5b0fbc6a619a3fad05c16d5d0bd6ba",
"ntpd.service": "10636ab4e5d799c3071a08a961b2ed668309f70ebae9f46bf23f4079be60d431",
"ntpdate.service": "a75376fde5a9d0eb0237ef4a84bac3cdef4c6ecadeee0eb41c6c124cd857fa46",
"ntpdate.sysconfig": "7ce7b151ea02332800688c8cb0bafefd246c9c0037491686fd833b3baaeff419",
"ntpdate.wrapper": "f63c7828bd29379b88db578658528bbb7ff915cd0e56cf1fee0a77ff59c35f09",
"ntpstat-master.zip": "383871e655c38fa853a4d5935d4be4aba08842e73e51ed3daf824e6a333dadc6"
}
}
"Signatures": {
"LICENSE.PTR": "22591c393c8f9d309234493b98ccddcf246cf5f843358b2bdb62d84e59780e02",
"ntp.step-tickers": "8b4bc72cc4a0af1e855f8836de5ceaa15b29620b7d3147e8f05c73bac773bee8",
"ntp.sysconfig": "f2a0ab20767f2c1975cd56cc2b013070fc5b0fbc6a619a3fad05c16d5d0bd6ba",
"ntpd.service": "10636ab4e5d799c3071a08a961b2ed668309f70ebae9f46bf23f4079be60d431",
"ntpdate.service": "a75376fde5a9d0eb0237ef4a84bac3cdef4c6ecadeee0eb41c6c124cd857fa46",
"ntpdate.sysconfig": "7ce7b151ea02332800688c8cb0bafefd246c9c0037491686fd833b3baaeff419",
"ntpdate.wrapper": "f63c7828bd29379b88db578658528bbb7ff915cd0e56cf1fee0a77ff59c35f09",
"ntpstat-master.zip": "383871e655c38fa853a4d5935d4be4aba08842e73e51ed3daf824e6a333dadc6",
"ntp-4.2.8p17.tar.gz": "103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866"
}
}

Просмотреть файл

@ -1,7 +1,7 @@
Summary: Network Time Protocol reference implementation
Name: ntp
Version: 4.2.8p15
Release: 3%{?dist}
Version: 4.2.8p17
Release: 1%{?dist}
License: BSD AND GPLv2+ AND LGPLv2+ AND MIT AND OpenLDAP AND Public Domain
Vendor: Microsoft Corporation
Distribution: Mariner
@ -17,7 +17,6 @@ Source5: ntpdate.sysconfig
Source6: ntpdate.service
Source7: ntpd.service
Source8: LICENSE.PTR
Patch0: ntp-gcc11.patch
BuildRequires: gcc >= 11.2.0
BuildRequires: glibc >= 2.34
@ -63,7 +62,6 @@ state of the NTP daemon running on the local machine.
%prep
%setup -q -a 1
%patch0 -p1
%build
@ -199,6 +197,10 @@ fi
%{_mandir}/man8/ntpstat.8*
%changelog
* Wed Jan 31 2024 Karim Eldegwy <karimeldegwy@microsoft.com> - 4.2.8p17-1
- Auto-upgrade to 4.2.8p17 - 3.0 - Upgrade
- Remove not applicable patch
* Thu Dec 16 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 4.2.8p15-3
- Removing the explicit %%clean stage.

Просмотреть файл

@ -14193,8 +14193,8 @@
"type": "other",
"other": {
"name": "ntp",
"version": "4.2.8p15",
"downloadUrl": "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p15.tar.gz"
"version": "4.2.8p17",
"downloadUrl": "https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p17.tar.gz"
}
}
},