[Git][debian-gis-team/ogdi-dfsg][master] 3 commits: Add patch to fix FTBFS on 32-bit systems with 64-bit time_t.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / ogdi-dfsg


Commits:
47e4bf1e by Bas Couwenberg at 2024-10-30T10:38:39+01:00
Add patch to fix FTBFS on 32-bit systems with 64-bit time_t.

- - - - -
3105bb42 by Bas Couwenberg at 2024-10-30T10:40:32+01:00
Update lintian overrides.

- - - - -
48c6c684 by Bas Couwenberg at 2024-10-30T10:40:54+01:00
Set distribution to unstable.

- - - - -


5 changed files:

- debian/changelog
- + debian/libogdi-dev.lintian-overrides
- + debian/ogdi-bin.lintian-overrides
- + debian/patches/64bit-time_t.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,12 @@
-ogdi-dfsg (4.1.1+ds-5) UNRELEASED; urgency=medium
+ogdi-dfsg (4.1.1+ds-5) unstable; urgency=medium
 
+  * Team upload.
   * Add autopkgtest to verify that ogdi_info works.
   * Bump Standards-Version to 4.7.0, no changes.
+  * Add patch to fix FTBFS on 32-bit systems with 64-bit time_t.
+  * Update lintian overrides.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sun, 28 Apr 2024 09:08:07 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 30 Oct 2024 10:40:33 +0100
 
 ogdi-dfsg (4.1.1+ds-4) unstable; urgency=medium
 


=====================================
debian/libogdi-dev.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Not worth the effort
+no-manual-page *
+


=====================================
debian/ogdi-bin.lintian-overrides
=====================================
@@ -0,0 +1,3 @@
+# Not worth the effort
+no-manual-page *
+


=====================================
debian/patches/64bit-time_t.patch
=====================================
@@ -0,0 +1,49 @@
+Description: Use time_t instead of long for variables passed to time().
+ Fixes FTBFS with 64-bit time_t:
+ .
+ ../asyncsvr.c: In function ‘gltpd_svc_run’:
+ ../asyncsvr.c:553:14: error: passing argument 1 of ‘time’ from incompatible pointer type [-Wincompatible-pointer-types]
+   553 |         time(&currenttime);
+       |              ^~~~~~~~~~~~
+       |              |
+       |              long int *
+ In file included from /usr/include/features.h:510,
+                  from /usr/include/powerpc-linux-gnu/sys/types.h:25,
+                  from /usr/include/tirpc/rpc/types.h:41,
+                  from /usr/include/tirpc/rpc/rpc.h:38,
+                  from /<<PKGBUILDDIR>>/ogdi/include/ecs.h:9,
+                  from ../asyncsvr.c:51:
+ /usr/include/time.h:85:15: note: expected ‘time_t *’ {aka ‘long long int *’} but argument is of type ‘long int *’
+    85 | extern time_t __REDIRECT_NTH (time, (time_t *__timer), __time64);
+       |               ^~~~~~~~~~~~~~
+ ../asyncsvr.c:574:12: error: passing argument 1 of ‘time’ from incompatible pointer type [-Wincompatible-pointer-types]
+   574 |       time(&timecount);
+       |            ^~~~~~~~~~
+       |            |
+       |            long int *
+ /usr/include/time.h:85:15: note: expected ‘time_t *’ {aka ‘long long int *’} but argument is of type ‘long int *’
+    85 | extern time_t __REDIRECT_NTH (time, (time_t *__timer), __time64);
+       |               ^~~~~~~~~~~~~~
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/libogdi/ogdi/pull/29
+
+--- a/ogdi/gltpd/asyncsvr.c
++++ b/ogdi/gltpd/asyncsvr.c
+@@ -80,7 +80,7 @@ ECS_CVSID("$Id$");
+ 
+ #define COMTIMEOUT 900
+ 
+-long timecount;
++time_t timecount;
+ 
+ static void dispatchno_1();
+ extern void ecsprog_1();
+@@ -533,7 +533,7 @@ void gltpd_svc_run()
+   struct timeval timeout;
+   xdrproc_t xdr_argument;
+   /*xdrproc_t xdr_result;*/
+-  long currenttime;
++  time_t currenttime;
+   
+   timeout.tv_sec = COMTIMEOUT;
+   timeout.tv_usec = 0;


=====================================
debian/patches/series
=====================================
@@ -4,3 +4,4 @@ endianess
 install-so-link
 modules_path.patch
 libm.patch
+64bit-time_t.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/ogdi-dfsg/-/compare/182a3635559ceaa5bd3dd467988f40c27be98f31...48c6c6843e391a83430b51d2eb343aca7a115495

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/ogdi-dfsg/-/compare/182a3635559ceaa5bd3dd467988f40c27be98f31...48c6c6843e391a83430b51d2eb343aca7a115495
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20241030/04f86a07/attachment-0001.htm>