Compare commits

..

No commits in common. "829d85b360abd44c157fd7a473ee73804f11980d" and "d549475dca773d8636b95f797b03402e3e690654" have entirely different histories.

4 changed files with 46 additions and 24 deletions

BIN
0.11.3.tar.gz Normal file

Binary file not shown.

View File

@ -0,0 +1,34 @@
From f1b416400479d861deffb4c5a40422dcdf190e85 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Fri, 23 Oct 2020 14:58:50 +0200
Recent glibc deprecated/dropped the `__xstat*()` family from the header
files, so the build started to fail on "no previous prototype". However,
umockdev still needs needs to keep the wrappers to run programs that got
built against an earlier glibc.
Thus declare the prototype explicitly. It should still fail to build if
glibc defines it differently.
Fixes #108
---
src/libumockdev-preload.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/libumockdev-preload.c b/src/libumockdev-preload.c
index 9328dc1..9bbec62 100644
--- a/src/libumockdev-preload.c
+++ b/src/libumockdev-preload.c
@@ -1215,8 +1215,11 @@ int prefix ## stat ## suffix (const char *path, struct stat ## suffix *st) \
/* wrapper template for __xstat family; note that we abuse the sticky bit in
* the emulated /dev to indicate a block device (the sticky bit has no
- * real functionality for device nodes) */
+ * real functionality for device nodes)
+ * This family got deprecated/dropped in glibc 2.32.9000, but we still need
+ * to keep it for a while for programs that were built against previous versions */
#define WRAP_VERSTAT(prefix, suffix) \
+int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st); \
int prefix ## stat ## suffix (int ver, const char *path, struct stat ## suffix *st) \
{ \
const char *p; \

Binary file not shown.

View File

@ -1,14 +1,14 @@
Name: umockdev Name: umockdev
Version: 0.17.18 Version: 0.11.3
Release: 1 Release: 4
Summary: Mock hardware devices Summary: Mock hardware devices
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/martinpitt/%{name} URL: https://github.com/martinpitt/%{name}
Source0: https://github.com/martinpitt/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source0: https://github.com/martinpitt/%{name}/archive/%{version}.tar.gz
Patch0000: fix-glibc-update-error.patch
BuildRequires: autoconf automake libtool gtk-doc gobject-introspection-devel glib2-devel BuildRequires: autoconf automake libtool gtk-doc gobject-introspection-devel glib2-devel
BuildRequires: libgudev1-devel systemd-devel vala chrpath python3 BuildRequires: libgudev1-devel systemd-devel vala chrpath python3 gphoto2
BuildRequires: meson libpcap-devel systemd-udev
%description %description
umockdev mocks Linux devices for creating integration tests for hardware related libraries and programs. umockdev mocks Linux devices for creating integration tests for hardware related libraries and programs.
@ -26,11 +26,12 @@ The umockdev-devel package contains umockdev development library.
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
%meson -Dgtk_doc=true NOCONFIGURE=1 ./autogen.sh
%meson_build %configure --disable-static --enable-gtk-doc
%make_build
%install %install
%meson_install %make_install
%delete_la %delete_la
@ -45,10 +46,9 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/umockdev
%files %files
%license COPYING %license COPYING
%doc README.md %doc README.rst
%{_bindir}/umockdev-* %{_bindir}/umockdev-*
%{_libdir}/libumockdev.so.* %{_libdir}/*.so.*
%{_libdir}/libumockdev-preload.so*
%{_libdir}/girepository-1.0/UMockdev-1.0.typelib %{_libdir}/girepository-1.0/UMockdev-1.0.typelib
%files devel %files devel
@ -61,20 +61,8 @@ rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/umockdev
%{_datadir}/vala/vapi/umockdev-1.0.vapi %{_datadir}/vala/vapi/umockdev-1.0.vapi
%changelog %changelog
* Wed Aug 23 2023 yaoxin <yao_xin001@hoperun.com> - 0.17.18-1
- Update to 0.17.18
* Mon Jul 17 2023 chenchen <chen_aka_jan@163.com> - 0.17.17-1
- update to 0.17.17
* Mon Apr 25 2022 caodongxia <caodongxia@h-partners.com> - 0.17.9-1
- update to 0.17.9
* Wed Aug 4 2021 wutao <tushenmei@huawei.com> - 0.11.3-5
- bugfix-of-gcc10.patch
* Sat Jun 26 2021 wutao <wutao61@huawei.com> - 0.11.3-4 * Sat Jun 26 2021 wutao <wutao61@huawei.com> - 0.11.3-4
- fix build error due to glibc update - fix build error due to glibc update
* Mon Jan 07 2019 yangjian<yangjian79@huawei.com> - 0.11.3-3 * Tue Jan 07 2019 yangjian<yangjian79@huawei.com> - 0.11.3-3
- Package init - Package init