findutils-selinux 4.6.0-4 update

4 files changed, 136 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a8c8a833a54c..bdbdd316923a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = findutils-selinux
 	pkgdesc = GNU utilities to locate files with SELinux support
 	pkgver = 4.6.0
-	pkgrel = 2
-	url = http://www.gnu.org/software/findutils
-	arch = i686
+	pkgrel = 4
+	url = https://www.gnu.org/software/findutils
 	arch = x86_64
 	groups = selinux
 	license = GPL3
 	depends = glibc
 	depends = sh
 	depends = libselinux
-	provides = findutils=4.6.0-2
-	provides = selinux-findutils=4.6.0-2
+	provides = findutils=4.6.0-4
+	provides = selinux-findutils=4.6.0-4
 	conflicts = findutils
 	conflicts = selinux-findutils
 	source = https://ftp.gnu.org/pub/gnu/findutils/findutils-4.6.0.tar.gz
-	source = gnulib-glibc2.28-compatibility.patch
+	source = gnulib-fflush.patch
+	source = gnulib-makedev.patch
 	sha1sums = f18e8aaee3f3d4173a1f598001003be8706d28b0
-	sha1sums = 089b2f56a7c4b24e03184c158f1352ade2b5d050
+	sha1sums = 1bc1586f6a52083939c4cabc32f12e7aead97e61
+	sha1sums = 051382a2b0039438c2b143f2f9e5dc4bea130a09
 
 pkgname = findutils-selinux
 
diff --git a/PKGBUILD b/PKGBUILD
index ddb00ddd2011..6c1fe34577e9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer:
 # SELinux Maintainer: Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org)
 # SELinux Contributor: Timothée Ravier
@@ -9,25 +8,28 @@
 
 pkgname=findutils-selinux
 pkgver=4.6.0
-pkgrel=2
+pkgrel=4
 pkgdesc="GNU utilities to locate files with SELinux support"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL3')
 groups=('selinux')
 depends=('glibc' 'sh' 'libselinux')
 conflicts=("${pkgname/-selinux}" "selinux-${pkgname/-selinux}")
 provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}"
           "selinux-${pkgname/-selinux}=${pkgver}-${pkgrel}")
-url="http://www.gnu.org/software/findutils"
-source=(https://ftp.gnu.org/pub/gnu/findutils/${pkgname/-selinux}-${pkgver}.tar.gz
-        gnulib-glibc2.28-compatibility.patch)
+url='https://www.gnu.org/software/findutils'
+source=("https://ftp.gnu.org/pub/gnu/findutils/${pkgname/-selinux}-${pkgver}.tar.gz"
+        "gnulib-fflush.patch"
+        "gnulib-makedev.patch")
 sha1sums=('f18e8aaee3f3d4173a1f598001003be8706d28b0'
-          '089b2f56a7c4b24e03184c158f1352ade2b5d050')
-#validpgpkeys=('A15B725964A95EE5') # James Youngman <james@youngman.org>
+          '1bc1586f6a52083939c4cabc32f12e7aead97e61'
+          '051382a2b0039438c2b143f2f9e5dc4bea130a09')
+#validpgpkeys=('A15B725964A95EE5') # James Youngman <james@youngman.org>  - NOTE: PGP-2 key
 
 prepare() {
   cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
-  patch -Np1 -i ../gnulib-glibc2.28-compatibility.patch
+  patch -p1 -i "$srcdir"/gnulib-fflush.patch
+  patch -p1 -i "$srcdir"/gnulib-makedev.patch
 }
 
 build() {
@@ -37,6 +39,7 @@ build() {
   # which is a secure version of locate.
   sed -i '/^SUBDIRS/s/locate//' Makefile.in
 
+  autoreconf
   ./configure --prefix=/usr
   # don't build locate, but the docs want a file in there.
   make -C locate dblocation.texi
diff --git a/gnulib-glibc2.28-compatibility.patch b/gnulib-fflush.patch
index 14447e730a98..47ac93bb94fd 100644
--- a/gnulib-glibc2.28-compatibility.patch
+++ b/gnulib-fflush.patch
@@ -1,10 +1,35 @@
-Backport gnulib commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e to fix
-compatibility with glibc 2.28.
+From 80cdfba079627e15129a926a133825b961d41e36 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e;hp=0404c9ae2845cbf93d71b295b67d6c8bd39382d8
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpurge.c (fpurge):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/fseeko.c (fseeko):
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
 
+Upstream-commit: 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ gl/lib/fflush.c     | 6 +++---
+ gl/lib/fpurge.c     | 2 +-
+ gl/lib/freadahead.c | 2 +-
+ gl/lib/freading.c   | 2 +-
+ gl/lib/fseeko.c     | 4 ++--
+ gl/lib/stdio-impl.h | 6 ++++++
+ 6 files changed, 14 insertions(+), 8 deletions(-)
 
 diff --git a/gl/lib/fflush.c b/gl/lib/fflush.c
+index 5ae3e41..7a82470 100644
 --- a/gl/lib/fflush.c
 +++ b/gl/lib/fflush.c
 @@ -33,7 +33,7 @@
@@ -35,6 +60,7 @@ diff --git a/gl/lib/fflush.c b/gl/lib/fflush.c
    clear_ungetc_buffer_preserving_position (stream);
  
 diff --git a/gl/lib/fpurge.c b/gl/lib/fpurge.c
+index f313b22..ecdf82d 100644
 --- a/gl/lib/fpurge.c
 +++ b/gl/lib/fpurge.c
 @@ -62,7 +62,7 @@ fpurge (FILE *fp)
@@ -47,6 +73,7 @@ diff --git a/gl/lib/fpurge.c b/gl/lib/fpurge.c
    fp->_IO_write_ptr = fp->_IO_write_base;
    /* Avoid memory leak when there is an active ungetc buffer.  */
 diff --git a/gl/lib/freadahead.c b/gl/lib/freadahead.c
+index 094daab..3f8101e 100644
 --- a/gl/lib/freadahead.c
 +++ b/gl/lib/freadahead.c
 @@ -25,7 +25,7 @@
@@ -59,6 +86,7 @@ diff --git a/gl/lib/freadahead.c b/gl/lib/freadahead.c
      return 0;
    return (fp->_IO_read_end - fp->_IO_read_ptr)
 diff --git a/gl/lib/freading.c b/gl/lib/freading.c
+index 0512b19..8c48fe4 100644
 --- a/gl/lib/freading.c
 +++ b/gl/lib/freading.c
 @@ -31,7 +31,7 @@ freading (FILE *fp)
@@ -71,6 +99,7 @@ diff --git a/gl/lib/freading.c b/gl/lib/freading.c
            || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
                && fp->_IO_read_base != NULL));
 diff --git a/gl/lib/fseeko.c b/gl/lib/fseeko.c
+index 1c65d2a..9026408 100644
 --- a/gl/lib/fseeko.c
 +++ b/gl/lib/fseeko.c
 @@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
@@ -91,23 +120,8 @@ diff --git a/gl/lib/fseeko.c b/gl/lib/fseeko.c
        fp->_flags &= ~_IO_EOF_SEEN;
        fp->_offset = pos;
  #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-diff --git a/gl/lib/mountlist.c b/gl/lib/mountlist.c
---- a/gl/lib/mountlist.c
-+++ b/gl/lib/mountlist.c
-@@ -37,6 +37,12 @@
- # include <sys/param.h>
- #endif
- 
-+#if MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #if defined MOUNTED_GETFSSTAT   /* OSF_1 and Darwin1.3.x */
- # if HAVE_SYS_UCRED_H
- #  include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,
 diff --git a/gl/lib/stdio-impl.h b/gl/lib/stdio-impl.h
+index 502d891..ea38ee2 100644
 --- a/gl/lib/stdio-impl.h
 +++ b/gl/lib/stdio-impl.h
 @@ -18,6 +18,12 @@
@@ -123,3 +137,6 @@ diff --git a/gl/lib/stdio-impl.h b/gl/lib/stdio-impl.h
  
  /* BSD stdio derived implementations.  */
  
+-- 
+2.16.2
+
diff --git a/gnulib-makedev.patch b/gnulib-makedev.patch
new file mode 100644
index 000000000000..5ed4b48037df
--- /dev/null
+++ b/gnulib-makedev.patch
@@ -0,0 +1,80 @@
+From 80628047a6cc83f82e0c410a82b8f7facd9d50f2 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Wed, 14 Sep 2016 19:21:42 -0500
+Subject: [PATCH] mountlist: include sysmacros.h for glibc
+
+On Fedora rawhide (glibc 2.25), './gnulib-tool --test mountlist'
+reports:
+../../gllib/mountlist.c: In function 'read_file_system_list':
+../../gllib/mountlist.c:534:13: warning: '__makedev_from_sys_types' is deprecated:
+  In the GNU C Library, `makedev' is defined by <sys/sysmacros.h>.
+  For historical compatibility, it is currently defined by
+  <sys/types.h> as well, but we plan to remove this soon.
+  To use `makedev', include <sys/sysmacros.h> directly.
+  If you did not intend to use a system-defined macro `makedev',
+  you should #undef it after including <sys/types.h>.
+  [-Wdeprecated-declarations]
+             me->me_dev = makedev (devmaj, devmin);
+             ^~
+In file included from /usr/include/features.h:397:0,
+                 from /usr/include/sys/types.h:25,
+                 from ./sys/types.h:28,
+                 from ../../gllib/mountlist.h:23,
+                 from ../../gllib/mountlist.c:20:
+/usr/include/sys/sysmacros.h:89:1: note: declared here
+ __SYSMACROS_DEFINE_MAKEDEV (__SYSMACROS_FST_IMPL_TEMPL)
+ ^
+
+Fix it by including the right headers.  We also need a fix to
+autoconf's AC_HEADER_MAJOR, but that's a separate patch.
+
+* m4/mountlist.m4 (gl_PREREQ_MOUTLIST_EXTRA): Include
+AC_HEADER_MAJOR.
+* lib/mountlist.c (includes): Use correct headers.
+
+Signed-off-by: Eric Blake <eblake@redhat.com>
+
+Upstream-commit: 4da63c5881f60f71999a943612da9112232b9161
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ gl/lib/mountlist.c | 6 ++++++
+ gl/m4/mountlist.m4 | 3 ++-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/gl/lib/mountlist.c b/gl/lib/mountlist.c
+index c3d2852..0b6f92e 100644
+--- a/gl/lib/mountlist.c
++++ b/gl/lib/mountlist.c
+@@ -37,6 +37,12 @@
+ # include <sys/param.h>
+ #endif
+ 
++#if MAJOR_IN_MKDEV
++# include <sys/mkdev.h>
++#elif MAJOR_IN_SYSMACROS
++# include <sys/sysmacros.h>
++#endif
++
+ #if defined MOUNTED_GETFSSTAT   /* OSF_1 and Darwin1.3.x */
+ # if HAVE_SYS_UCRED_H
+ #  include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,
+diff --git a/gl/m4/mountlist.m4 b/gl/m4/mountlist.m4
+index ec58dc8..82b2dcb 100644
+--- a/gl/m4/mountlist.m4
++++ b/gl/m4/mountlist.m4
+@@ -1,4 +1,4 @@
+-# serial 11
++# serial 12
+ dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+@@ -15,5 +15,6 @@ AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA],
+ [
+   dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h.
+   AC_CHECK_HEADERS([sys/mntent.h])
++  AC_HEADER_MAJOR()dnl for use of makedev ()
+   gl_FSTYPENAME
+ ])
+-- 
+2.16.2
+