[packages/rpm/dev-5.4.17] - rel 0.12; use types directly (fixes rpm build and header files when used on glibc 2.28)

[qboosh]

commit 9a45f5ec7593cc07e9b486a1725277a43f15e980
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Aug 11 12:44:58 2018 +0200

    - rel 0.12; use types directly (fixes rpm build and header files when used on glibc 2.28)

 glibc.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 rpm.spec    |  4 +++-
 2 files changed, 48 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index c71b48b..7e14101 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -58,7 +58,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.17
-Release:	0.11
+Release:	0.12
 License:	LGPL v2.1
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.17-0.20160512.src.rpm
@@ -187,6 +187,7 @@ Patch90:	%{name}-cppcompat.patch
 Patch91:	py-disable-fetch.patch
 Patch92:	fast_python_deps.patch
 Patch93:	python2_explicit.patch
+Patch97:	glibc.patch
 
 # Patches imported from Mandriva
 
@@ -1016,6 +1017,7 @@ cd -
 %patch83 -p1
 %patch92 -p1
 %patch93 -p1
+%patch97 -p1
 
 %patch1050 -p1
 
diff --git a/glibc.patch b/glibc.patch
new file mode 100644
index 0000000..4e0f552
--- /dev/null
+++ b/glibc.patch
@@ -0,0 +1,45 @@
+diff -upr rpm-5.4.15.org/rpmio/gzdio.c rpm-5.4.15/rpmio/gzdio.c
+--- rpm-5.4.15.org/rpmio/gzdio.c	2012-04-16 05:21:22.000000000 +0200
++++ rpm-5.4.15/rpmio/gzdio.c	2018-08-11 12:36:48.761296851 +0200
+@@ -380,7 +380,7 @@ static int gzdSeek(void * cookie, _libio
+     int rc;
+ #if defined(HAVE_GZSEEK)
+ #ifdef USE_COOKIE_SEEK_POINTER
+-    _IO_off64_t p = *pos;
++    off64_t p = *pos;
+ #else
+     off_t p = pos;
+ #endif
+diff -upr rpm-5.4.15.org/rpmio/rpmio.c rpm-5.4.15/rpmio/rpmio.c
+--- rpm-5.4.15.org/rpmio/rpmio.c	2014-08-05 00:47:16.000000000 +0200
++++ rpm-5.4.15/rpmio/rpmio.c	2018-08-11 12:36:48.757963417 +0200
+@@ -481,7 +481,7 @@ static int fdSeek(void * cookie, _libio_
+ 	/*@modifies fileSystem, internalState @*/
+ {
+ #ifdef USE_COOKIE_SEEK_POINTER
+-    _IO_off64_t p = *pos;
++    off64_t p = *pos;
+ #else
+     off_t p = pos;
+ #endif
+@@ -2458,7 +2458,7 @@ int Fseek(FD_t fd, _libio_off_t offset,
+ {
+     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;
+diff -upr rpm-5.4.15.org/rpmio/rpmio.h rpm-5.4.15/rpmio/rpmio.h
+--- rpm-5.4.15.org/rpmio/rpmio.h	2014-07-20 01:01:26.000000000 +0200
++++ rpm-5.4.15/rpmio/rpmio.h	2018-08-11 12:36:48.761296851 +0200
+@@ -25,7 +25,7 @@
+ #if !defined(__LCLINT__) && !defined(__UCLIBC__) && 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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/f25633723e26964d85da782bc33a019484e617e3