- update to 1.24:

* Fix FTBFS on hurd-i386: Necessary functions disabled 
  * Fix FTBFS with glibc 2.31 (conflicting gettimeofday prototype) 
- remove glibc-2.31-fix.patch (upstream)

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/datefudge?expand=0&rev=8
This commit is contained in:
Dirk Mueller 2020-09-02 16:37:13 +00:00 committed by Git OBS Bridge
parent ea64cfb239
commit 2f34e91752
6 changed files with 36 additions and 60 deletions

View File

@ -5,36 +5,36 @@ Format: 3.0 (native)
Source: datefudge
Binary: datefudge
Architecture: any
Version: 1.23
Version: 1.24
Maintainer: Robert Luberda <robert@debian.org>
Standards-Version: 4.4.0
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/debian/datefudge
Vcs-Git: https://salsa.debian.org/debian/datefudge.git
Testsuite: autopkgtest
Testsuite-Triggers: coreutils, perl
Build-Depends: debhelper (>= 12)
Build-Depends: debhelper-compat (= 13)
Package-List:
datefudge deb devel optional arch=any
Checksums-Sha1:
66deb945ea979e707091dcc3020e58a3f7ffb806 13952 datefudge_1.23.tar.xz
40a47b67a116cb886755536d05374e7c963b616f 14152 datefudge_1.24.tar.xz
Checksums-Sha256:
3b7668a107145e9d3d47b10520ce623c1b6dc15f571050d6140c2356c1a2d645 13952 datefudge_1.23.tar.xz
80efab249232deeb142bf8a0ec66f2cf596c45560e4fdd28f3b5bdd290ac0385 14152 datefudge_1.24.tar.xz
Files:
a8da2bf4a7fb29f213b9b44a2a740d2e 13952 datefudge_1.23.tar.xz
b8c03f4b0c0b7efab35c46e71ef6de4e 14152 datefudge_1.24.tar.xz
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEENeh2+rTTcy6TtNI3Yx3nVTvor9QFAl1EfRcACgkQYx3nVTvo
r9Tk0w//ReZzXJi3i2Z17gkjFpPpZ7fJfIdrBvsi+qjW6YbdCAw2dG+XKcqxkDlE
mKfxvBBrbtAQV5bW42RH+INgapo+YjbLVliXXNgqcvvuY0RMctiGlKv/BZHqf4Q4
t6KVGQCbgHYbWOap2thzIuaLHDPnBUgzBZ64rZW2+1lgyie97NPkR22h1o5wWCgq
wliISY1F7KmLqkpnk89Haap1gV4mfx9sBcw01HrOXfca/+oZA3cG0K3dST/L/tWf
Ir0DeNnBqCwxo7aI1kDQPQ6mfS2ir9bwPpads2YIC1F+/L7e2KDzT/6otnFEVmcz
bmEFBQNPzzRPVDGRQhF2/ApmC2DMfRTG7UNNL862iGnoUTrRm9NrHz0vaf/urmc4
4WuIFO3mi6p2qOLiI4lv5O5UTqG+7/fboevSFoJhirbk6BJ6zvaw1W3asmy/OepI
v2iyoyquFqtKXFC7fC0Gj+mcWZ6uVWN5RteC62Ij99klkpBQ74JgT21v3Kl/ji4M
Id1pf5GSUdeOdycKWNabulPhYifq7A/tcT5SgT5ZcX+RnBpCKqN+lQJSWb+ID4Y7
gUKn0efWgizyZMG/dTg1n84d5tNGAjJJbE2THxYcdEjqwE256FDoQPapUhcTZqrR
xlAf5W/TTDa5VjL6mFKLdMiAXQEDFFZ4D1LsVz/GxuJVUdeUM8U=
=uqq1
iQIzBAEBCAAdFiEENeh2+rTTcy6TtNI3Yx3nVTvor9QFAl8NdwsACgkQYx3nVTvo
r9TJmA//RgClObQQ/rYYZ5sZj8xPZcixNgmiiYitfDHUG5zJGZqW9AOyN8OhMQYg
IZ7Pn7QhLDjG7ROWfxOXGdALQC+ioQxbVqWnEnPFVq+3LuSp87BwKKCYpfAdUJ2+
XaiZh5kz4ibziO8DDC567Dx4LlINZ11xgRqc/LZBUpQAGcp9ac3cwLygcA+wKr6C
lgsFY3JhefKOyAwZoC0umLpcVEppJEMZCO5WDEfuEKAcf0877NGmXhFNdh9xn7dd
R28QzDis/2dJOrar9EVs8QLgX2sesmnt/PqIdoWE0C22B8lUfIekxUCwkW065/c4
waUFr9YMddmIWd2R5TbslvK/veTAFAWhhjMBWa3oRHzR0fsfCpl0TCqgvsxv4M7m
qHnxqUPqfijUEsqaCNaPx5TXAyKD/enIgDLFj+qnO3rLubqKXrk8572L/PWtUf52
GhdaGRSUxclUVkvCRcZLTAYK55cPC/wQvzCMDwytNBS0+nyZzMQqEHWVl4AgKmsM
blER1bZls8/FBkG8ZR8qBuTKiIvCSmC76o7UyAMbRdvxhms178LrhC4/gsrh6/l1
0F0ogw97Il593vscXsDzZJFdmAScOxee42mbW4MPDC4KuvZ38bEy/fFb6+q0pomZ
Q1BHp/FvbUuxU0rDD/C6swxAxmtDmffSxB+p0SwCKxNuEBo+P+s=
=NQWZ
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 2 16:36:27 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to 1.24:
* Fix FTBFS on hurd-i386: Necessary functions disabled
* Fix FTBFS with glibc 2.31 (conflicting gettimeofday prototype)
- remove glibc-2.31-fix.patch (upstream)
-------------------------------------------------------------------
Wed Feb 12 09:00:14 UTC 2020 - Martin Liška <mliska@suse.cz>

View File

@ -17,17 +17,15 @@
Name: datefudge
Version: 1.23
Version: 1.24
Release: 0
Summary: A preload library to fake system time
# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
License: GPL-2.0-or-later
Group: Development/Tools
URL: http://packages.qa.debian.org/d/datefudge.html
Group: Development/Tools/Other
URL: https://packages.qa.debian.org/d/datefudge.html
Source: http://cdn.debian.net/debian/pool/main/d/datefudge/%{name}_%{version}.tar.xz
Source2: http://cdn.debian.net/debian/pool/main/d/datefudge/%{name}_%{version}.dsc#/%{name}.asc
Source3: https://db.debian.org/fetchkey.cgi?fingerprint=35E876FAB4D3732E93B4D237631DE7553BE8AFD4#/%{name}.keyring
Patch0: glibc-2.31-fix.patch
%description
This program fakes the system date so that programs think the
@ -40,7 +38,6 @@ echo "`grep -A1 "Files:" %{SOURCE2} | grep %{name}_%{version}.tar.xz | cut -d\
echo "`grep -A1 "Checksums-Sha1" %{SOURCE2} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{SOURCE0}" | sha1sum -c
echo "`grep -A1 "Checksums-Sha256" %{SOURCE2} | grep %{name}_%{version}.tar.xz | cut -d\ -f2` %{SOURCE0}" | sha256sum -c
%setup -q
%patch0 -p1
sed "s/VERSION := \$\(.*\)/VERSION := %{version}/g" -i Makefile
sed 's/-o root -g root/-p/g' -i Makefile
@ -51,8 +48,9 @@ CFLAGS="%{optflags}" make libdir=%{_libdir} %{?_smp_mflags}
make install libdir=%{_libdir} DESTDIR=%{buildroot} %{?_smp_mflags}
%files
%doc README COPYING
%{_mandir}/man1/datefudge.1%{ext_man}
%license COPYING
%doc README
%{_mandir}/man1/datefudge.1%{?ext_man}
%{_bindir}/datefudge
%{_libdir}/datefudge/datefudge.so
%dir %{_libdir}/datefudge

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b7668a107145e9d3d47b10520ce623c1b6dc15f571050d6140c2356c1a2d645
size 13952

BIN
datefudge_1.24.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,30 +0,0 @@
diff --git a/datefudge.c b/datefudge.c
index fe93ef8..3785563 100644
--- a/datefudge.c
+++ b/datefudge.c
@@ -66,8 +66,13 @@ time_t time(time_t *x) {
#endif
+#if __GLIBC_PREREQ (2, 31)
+int __gettimeofday(struct timeval *x, void *y) {
+ static int (*libc_gettimeofday)(struct timeval *, void *) = NULL;
+#else
int __gettimeofday(struct timeval *x, struct timezone *y) {
static int (*libc_gettimeofday)(struct timeval *, struct timezone *) = NULL;
+#endif
int res;
if(!libc_gettimeofday)
@@ -78,7 +83,11 @@ int __gettimeofday(struct timeval *x, struct timezone *y) {
return 0;
}
+#if __GLIBC_PREREQ (2, 31)
+int gettimeofday(struct timeval *x, void *y) {
+#else
int gettimeofday(struct timeval *x, struct timezone *y) {
+#endif
return __gettimeofday(x,y);
}