- fix building with recent glibc

[packages/rpm.git] / rpm-glibc.patch

diff --git a/rpm-glibc.patch b/rpm-glibc.patch
new file mode 100644 (file)
index 0000000..ea8240b
--- /dev/null
+++ b/rpm-glibc.patch
@@ -0,0 +1,56 @@
+diff -urp rpm-4.5.orig/rpmio/rpmio.c rpm-4.5/rpmio/rpmio.c
+--- rpm-4.5.orig/rpmio/rpmio.c 2018-10-23 10:42:28.780416609 +0000
++++ rpm-4.5/rpmio/rpmio.c      2018-10-23 10:46:39.497416609 +0000
+@@ -422,7 +422,7 @@ static inline int fdSeek(void * cookie,
+       /*@modifies fileSystem, internalState @*/
+ {
+ #ifdef USE_COOKIE_SEEK_POINTER
+-    _IO_off64_t p = *pos;
++    off64_t p = *pos;
+ #else
+     off_t p = pos;
+ #endif
+@@ -2432,7 +2432,7 @@ static inline int gzdSeek(void * cookie,
+       /*@modifies fileSystem, internalState @*/
+ {
+ #ifdef USE_COOKIE_SEEK_POINTER
+-    _IO_off64_t p = *pos;
++    off64_t p = *pos;
+ #else
+     off_t p = pos;
+ #endif
+@@ -2804,7 +2804,7 @@ DBGIO(fd, (stderr, "==> Fwrite(%p,%u,%u,
+ int Fseek(FD_t fd, _libio_off_t offset, int whence) {
+     fdio_seek_function_t _seek;
+ #ifdef USE_COOKIE_SEEK_POINTER
+-    _IO_off64_t o64 = offset;
++    off64_t o64 = offset;
+     _libio_pos_t pos = &o64;
+ #else
+     _libio_pos_t pos = offset;
+@@ -2989,13 +2989,6 @@ static inline void cvtfmode (const char
+ }
+ /*@=boundswrite@*/
+ 
+-#if _USE_LIBIO
+-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
+-/* XXX retrofit glibc-2.1.x typedef on glibc-2.0.x systems */
+-typedef _IO_cookie_io_functions_t cookie_io_functions_t;
+-#endif
+-#endif
+-
+ /*@-boundswrite@*/
+ FD_t Fdopen(FD_t ofd, const char *fmode)
+ {
+diff -urp rpm-4.5.orig/rpmio/rpmio.h rpm-4.5/rpmio/rpmio.h
+--- rpm-4.5.orig/rpmio/rpmio.h 2018-10-23 10:42:28.788416609 +0000
++++ rpm-4.5/rpmio/rpmio.h      2018-10-23 10:43:19.413416609 +0000
+@@ -34,7 +34,7 @@ typedef /*@abstract@*/ struct pgpDigPara
+ #if !defined(__LCLINT__) && defined(__GLIBC__) && \
+       (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
+ #define USE_COOKIE_SEEK_POINTER 1
+-typedef _IO_off64_t   _libio_off_t;
++typedef off64_t       _libio_off_t;
+ typedef _libio_off_t *        _libio_pos_t;
+ #else
+ typedef off_t                 _libio_off_t;