Compare commits

...

6 Commits
rawhide ... f21

Author SHA1 Message Date
Jaromir Capik e7c818db3d Adding STAGE1 bootstrap recipe 2015-06-11 15:34:25 +02:00
Kamil Dudka 619ad1aa6f Related: #1188498 - fixup the previous commit
... pushed too early by mistake
2015-02-16 14:42:46 +01:00
Kamil Dudka 5fb1704fa9 Resolve: #1188498 - fix a crash triggered by recursive bind mount 2015-02-11 16:09:14 +01:00
Peter Robinson 14b3b8baad - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 12:26:25 +00:00
Kamil Dudka 078307fcf6 remove left over files from the repository 2014-07-16 12:20:25 +02:00
Tom Callaway 3361f626e0 fix license handling 2014-07-12 10:50:31 -04:00
6 changed files with 70 additions and 57 deletions

9
STAGE1-findutils Normal file
View File

@ -0,0 +1,9 @@
srpm $1
mcd $BUILDDIR/$1
sed -i~ -e "s,locate/Makefile locate/testsuite/Makefile ,," $SRC/${1}-*/configure
FINDLIBS="-lselinux -ldl" $SRC/${1}-*/configure $TCONFIGARGS
sed -i~ -e "s/ locate / /" Makefile
notparallel
test -d tools/gnulib/lib && make $J V=1 -C tools/gnulib/lib
make $J V=1
make $J install DESTDIR=${ROOTFS}

View File

@ -1,26 +0,0 @@
From 4a848a5e9bda989f9fd31ab4b388e6849ea6381e Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 28 Aug 2012 16:54:15 +0200
Subject: [PATCH] configure.ac: do not use the AM_C_PROTOTYPES macro
It was removed in Automake 1.12.
---
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
index 704b5ea..038a3d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,7 @@ AC_PROG_CPP
dnl for gnulib
gl_EARLY
-AM_C_PROTOTYPES
+dnl AM_C_PROTOTYPES
AC_PROG_INSTALL
AC_PROG_RANLIB
--
1.7.1

View File

@ -1,29 +0,0 @@
From fe7079ab7e5794b9222af5e56c6f25b424ca72f3 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 28 Aug 2012 17:24:21 +0200
Subject: [PATCH] gnulib: do not require gets() to be declared
---
gnulib/lib/stdio.in.h | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/gnulib/lib/stdio.in.h b/gnulib/lib/stdio.in.h
index 57e93ba..b1e5bb6 100644
--- a/gnulib/lib/stdio.in.h
+++ b/gnulib/lib/stdio.in.h
@@ -175,12 +175,6 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
"use gnulib module fflush for portable POSIX compliance");
#endif
-/* It is very rare that the developer ever has full control of stdin,
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
-#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--
1.7.1

View File

@ -0,0 +1,44 @@
From bf4d8abd7ae3624a13967275dcbaea19f6b6ceb5 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Wed, 11 Feb 2015 13:48:12 +0100
Subject: [PATCH] fts: avoid crash when a cycle is added while traversing
This could be triggered by auto-mounting a recursive bind mount.
Reported by Michael Chapman in: https://bugzilla.redhat.com/1188498
* lib/fts.c (fts_read): Avoid removing the original hash table item
when leaving a directory that caused a cycle, and preserve the FTS_DC
flag.
Bug: https://bugzilla.redhat.com/1188498
Bug: http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/34867
---
gl/lib/fts.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gl/lib/fts.c b/gl/lib/fts.c
index 500e92c..f76c015 100644
--- a/gl/lib/fts.c
+++ b/gl/lib/fts.c
@@ -1091,9 +1091,16 @@ cd_dot_dot:
p->fts_errno = errno;
SET(FTS_STOP);
}
- p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
- if (p->fts_errno == 0)
- LEAVE_DIR (sp, p, "3");
+
+ /* If the directory causes a cycle, preserve the FTS_DC flag and keep
+ * the corresponding dev/ino pair in the hash table. It is going to be
+ * removed when leaving the original directory.
+ */
+ if (p->fts_info != FTS_DC) {
+ p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
+ if (p->fts_errno == 0)
+ LEAVE_DIR (sp, p, "3");
+ }
return ISSET(FTS_STOP) ? NULL : p;
}
--
2.1.0

Binary file not shown.

View File

@ -1,7 +1,7 @@
Summary: The GNU versions of find utilities (find and xargs)
Name: findutils
Version: 4.5.12
Release: 5%{?dist}
Release: 8%{?dist}
Epoch: 1
License: GPLv3+
Group: Applications/File
@ -11,6 +11,9 @@ Source0: ftp://alpha.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz
# do not build locate
Patch1: findutils-4.4.0-no-locate.patch
# fix a crash triggered by recursive bind mount (#1188498)
Patch2: findutils-4.5.14-fts-cycle.patch
# add a new option -xautofs to find to not descend into directories on autofs
# file systems
Patch3: findutils-4.4.2-xautofs.patch
@ -49,6 +52,7 @@ useful for finding things on your system.
%setup -q
rm -rf locate
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@ -87,7 +91,9 @@ if [ $1 = 0 ]; then
fi
%files -f %{name}.lang
%doc AUTHORS COPYING NEWS README THANKS TODO
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc AUTHORS NEWS README THANKS TODO
%{_bindir}/find
%{_bindir}/oldfind
%{_bindir}/xargs
@ -98,6 +104,15 @@ fi
%{_infodir}/find-maint.info.gz
%changelog
* Mon Feb 16 2015 Kamil Dudka <kdudka@redhat.com> - 1:4.5.12-8
- fix a crash triggered by recursive bind mount (#1188498)
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.5.12-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jul 12 2014 Tom Callaway <spot@fedoraproject.org> - 1:4.5.12-6
- fix license handling
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:4.5.12-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild