Update to 1.16.0 release
This commit is contained in:
parent
b19e5ac269
commit
746be5eb7f
1
.gitignore
vendored
1
.gitignore
vendored
@ -353,3 +353,4 @@ network-manager-applet-0.8.1.tar.bz2
|
|||||||
/NetworkManager-1.14.4.tar.xz
|
/NetworkManager-1.14.4.tar.xz
|
||||||
/NetworkManager-1.15.90.tar.xz
|
/NetworkManager-1.15.90.tar.xz
|
||||||
/NetworkManager-1.15.91.tar.xz
|
/NetworkManager-1.15.91.tar.xz
|
||||||
|
/NetworkManager-1.16.0.tar.xz
|
||||||
|
@ -1,53 +0,0 @@
|
|||||||
From cff233001de6fe9f53cff3f7e7cb9f3ea21c6b15 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Thomas Haller <thaller@redhat.com>
|
|
||||||
Date: Mon, 11 Mar 2019 18:11:13 +0100
|
|
||||||
Subject: [PATCH 1/1] shared/systemd: fix gettid() compat implementation
|
|
||||||
shadowing function from glibc
|
|
||||||
|
|
||||||
On Fedora rawhide we get the following build failure:
|
|
||||||
|
|
||||||
In file included from shared/systemd/src/basic/alloc-util.c:3:
|
|
||||||
./shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h:114:21: error: static declaration of 'gettid' follows non-static declaration
|
|
||||||
114 | static inline pid_t gettid(void) {
|
|
||||||
| ^~~~~~
|
|
||||||
In file included from /usr/include/unistd.h:1170,
|
|
||||||
from /usr/include/glib-2.0/gio/gcredentials.h:32,
|
|
||||||
from /usr/include/glib-2.0/gio/gio.h:46,
|
|
||||||
from ./shared/nm-utils/nm-macros-internal.h:31,
|
|
||||||
from ./shared/nm-default.h:293,
|
|
||||||
from ./shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h:22,
|
|
||||||
from shared/systemd/src/basic/alloc-util.c:3:
|
|
||||||
/usr/include/bits/unistd_ext.h:34:16: note: previous declaration of 'gettid' was here
|
|
||||||
34 | extern __pid_t gettid (void) __THROW;
|
|
||||||
| ^~~~~~
|
|
||||||
|
|
||||||
glibc supports now gettid() call ([1]) which conflicts with our compat
|
|
||||||
implementation. Rename it.
|
|
||||||
|
|
||||||
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92
|
|
||||||
|
|
||||||
(cherry picked from commit 10276322bde8f015e48ac06f6a7509f514eb46f0)
|
|
||||||
(cherry picked from commit cfb970b2778d7bde97fea4f5718d4a2a9a9d68f5)
|
|
||||||
---
|
|
||||||
shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
|
|
||||||
index 06008ce86..b10722d71 100644
|
|
||||||
--- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
|
|
||||||
+++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h
|
|
||||||
@@ -111,9 +111,10 @@ raw_getpid (void) {
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
-static inline pid_t gettid(void) {
|
|
||||||
+static inline pid_t _nm_gettid(void) {
|
|
||||||
return (pid_t) syscall(SYS_gettid);
|
|
||||||
}
|
|
||||||
+#define gettid() _nm_gettid ()
|
|
||||||
|
|
||||||
/* we build with C11 and thus <uchar.h> provides char32_t,char16_t. */
|
|
||||||
#define HAVE_CHAR32_T 1
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
@ -9,8 +9,8 @@
|
|||||||
|
|
||||||
%global epoch_version 1
|
%global epoch_version 1
|
||||||
%global rpm_version 1.16.0
|
%global rpm_version 1.16.0
|
||||||
%global real_version 1.15.91
|
%global real_version 1.16.0
|
||||||
%global release_version 0.3
|
%global release_version 1
|
||||||
%global snapshot %{nil}
|
%global snapshot %{nil}
|
||||||
%global git_sha %{nil}
|
%global git_sha %{nil}
|
||||||
|
|
||||||
@ -112,7 +112,6 @@ Source4: 20-connectivity-fedora.conf
|
|||||||
Source5: 20-connectivity-redhat.conf
|
Source5: 20-connectivity-redhat.conf
|
||||||
|
|
||||||
#Patch1: 0001-some.patch
|
#Patch1: 0001-some.patch
|
||||||
Patch1: 0001-shared-systemd-fix-gettid-compat-implementation-shad.patch
|
|
||||||
|
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(post): /usr/sbin/update-alternatives
|
Requires(post): /usr/sbin/update-alternatives
|
||||||
@ -1004,6 +1003,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 15 2019 Thomas Haller <thaller@redhat.com> - 1:1.16.0-1
|
||||||
|
- Update to 1.16.0 release
|
||||||
|
|
||||||
* Mon Mar 11 2019 Thomas Haller <thaller@redhat.com> - 1:1.16.0-0.3
|
* Mon Mar 11 2019 Thomas Haller <thaller@redhat.com> - 1:1.16.0-0.3
|
||||||
- Fix compilation error on rawhide for gettid() compat implementation
|
- Fix compilation error on rawhide for gettid() compat implementation
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (NetworkManager-1.15.91.tar.xz) = bf1a2b44760d7262bf3c51a408ed39298bf6ce0d839c19ac576273107d32b5d1d04cfc92db7bcd148c71e16c1925e0401dd2ddc8cf341ff4ee5307596c692505
|
SHA512 (NetworkManager-1.16.0.tar.xz) = e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
|
||||||
|
Loading…
Reference in New Issue
Block a user