Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
findutils
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
findutils
Commits
3b781f20
Commit
3b781f20
authored
May 26, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgraded findutils to 4.7.0
parent
c822d44f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
119 deletions
+11
-119
Makefile
Makefile
+9
-8
build.xml
build.xml
+2
-5
findutils-4.6.0-glibc_fix.patch
findutils-4.6.0-glibc_fix.patch
+0
-106
findutils-4.6.0.tar.gz
findutils-4.6.0.tar.gz
+0
-0
findutils-4.7.0.tar.xz
findutils-4.7.0.tar.xz
+0
-0
No files found.
Makefile
View file @
3b781f20
all
:
tar
xf findutils-4.6.0.tar.gz
patch
-Np1
-d
findutils-4.6.0 < findutils-4.6.0-glibc_fix.patch
cd
findutils-4.6.0
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
--localstatedir
=
/var/lib/locate
$(MAKE)
-C
findutils-4.6.0
tar
xf findutils-4.7.0.tar.xz
cd
findutils-4.7.0
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
--localstatedir
=
/var/lib/locate
$(MAKE)
-C
findutils-4.7.0
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
$(MAKE)
-C
findutils-4.6.0 check
;
\
cd
findutils-4.7.0
;
\
chown
-Rv
nobody
.
;
\
su nobody
-s
/bin/bash
-c
"PATH=
$$
PATH make check"
;
\
fi
$(MAKE)
-C
findutils-4.
6
.0
install
$(MAKE)
-C
findutils-4.
7
.0
install
mv
-v
/usr/bin/find /bin
cd
findutils-4.
6
.0
&&
sed
-i
's|find:=$
${BINDIR}
|find:=/bin|'
/usr/bin/updatedb
rm
-rf
findutils-4.
6
.0
cd
findutils-4.
7
.0
&&
sed
-i
's|find:=$
${BINDIR}
|find:=/bin|'
/usr/bin/updatedb
rm
-rf
findutils-4.
7
.0
build.xml
View file @
3b781f20
<project
name=
"findutils"
>
<target
name=
"temporary-findutils"
>
<property
name=
"makedir"
value=
"${builddir}/findutils-4.
6
.0"
/>
<property
name=
"makedir"
value=
"${builddir}/findutils-4.
7
.0"
/>
<exec
executable=
"tar"
failonerror=
"true"
>
<arg
line=
"xf packages/findutils/findutils-4.6.0.tar.gz -C ${builddir}"
/>
</exec>
<exec
executable=
"patch"
dir=
"${builddir}/findutils-4.6.0"
failonerror=
"true"
>
<arg
line=
"-Np1 -i ${basedir}/packages/findutils/findutils-4.6.0-glibc_fix.patch"
/>
<arg
line=
"xf packages/findutils/findutils-4.7.0.tar.xz -C ${builddir}"
/>
</exec>
<exec
executable=
"./configure"
dir=
"${makedir}"
failonerror=
"true"
>
<env
key=
"PATH"
path=
"${PATH}"
/>
...
...
findutils-4.6.0-glibc_fix.patch
deleted
100644 → 0
View file @
c822d44f
diff -uNr findutils-4.6.0/gl/lib/fflush.c findutils-4.6.0-glibc_fix/gl/lib/fflush.c
--- findutils-4.6.0/gl/lib/fflush.c 2015-12-25 03:11:42.000000000 +1030
+++ findutils-4.6.0-glibc_fix/gl/lib/fflush.c 2019-09-02 01:00:16.246442287 +0930
@@ -33,7 +33,7 @@
#undef fflush
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
/* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
static void
@@ -72,7 +72,7 @@
#endif
-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
# if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
@@ -148,7 +148,7 @@
if (stream == NULL || ! freading (stream))
return fflush (stream);
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
clear_ungetc_buffer_preserving_position (stream);
diff -uNr findutils-4.6.0/gl/lib/fpurge.c findutils-4.6.0-glibc_fix/gl/lib/fpurge.c
--- findutils-4.6.0/gl/lib/fpurge.c 2015-12-25 03:11:42.000000000 +1030
+++ findutils-4.6.0-glibc_fix/gl/lib/fpurge.c 2019-09-02 01:00:16.315442431 +0930
@@ -62,7 +62,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_IO_read_end = fp->_IO_read_ptr;
fp->_IO_write_ptr = fp->_IO_write_base;
/* Avoid memory leak when there is an active ungetc buffer. */
diff -uNr findutils-4.6.0/gl/lib/freadahead.c findutils-4.6.0-glibc_fix/gl/lib/freadahead.c
--- findutils-4.6.0/gl/lib/freadahead.c 2015-12-25 03:11:42.000000000 +1030
+++ findutils-4.6.0-glibc_fix/gl/lib/freadahead.c 2019-09-02 01:00:16.315442431 +0930
@@ -25,7 +25,7 @@
size_t
freadahead (FILE *fp)
{
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_write_ptr > fp->_IO_write_base)
return 0;
return (fp->_IO_read_end - fp->_IO_read_ptr)
diff -uNr findutils-4.6.0/gl/lib/freading.c findutils-4.6.0-glibc_fix/gl/lib/freading.c
--- findutils-4.6.0/gl/lib/freading.c 2015-12-25 03:11:42.000000000 +1030
+++ findutils-4.6.0-glibc_fix/gl/lib/freading.c 2019-09-02 01:00:16.315442431 +0930
@@ -31,7 +31,7 @@
/* Most systems provide FILE as a struct and the necessary bitmask in
<stdio.h>, because they need it for implementing getc() and putc() as
fast macros. */
-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
return ((fp->_flags & _IO_NO_WRITES) != 0
|| ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
&& fp->_IO_read_base != NULL));
diff -uNr findutils-4.6.0/gl/lib/fseeko.c findutils-4.6.0-glibc_fix/gl/lib/fseeko.c
--- findutils-4.6.0/gl/lib/fseeko.c 2015-12-25 03:11:42.000000000 +1030
+++ findutils-4.6.0-glibc_fix/gl/lib/fseeko.c 2019-09-02 01:00:16.316442433 +0930
@@ -47,7 +47,7 @@
#endif
/* These tests are based on fpurge.c. */
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
if (fp->_IO_read_end == fp->_IO_read_ptr
&& fp->_IO_write_ptr == fp->_IO_write_base
&& fp->_IO_save_base == NULL)
@@ -123,7 +123,7 @@
return -1;
}
-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
fp->_flags &= ~_IO_EOF_SEEN;
fp->_offset = pos;
#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
diff -uNr findutils-4.6.0/gl/lib/mountlist.c findutils-4.6.0-glibc_fix/gl/lib/mountlist.c
--- findutils-4.6.0/gl/lib/mountlist.c 2015-12-25 03:11:44.000000000 +1030
+++ findutils-4.6.0-glibc_fix/gl/lib/mountlist.c 2019-09-02 01:00:26.236463030 +0930
@@ -32,6 +32,7 @@
#include <fcntl.h>
#include <unistd.h>
+#include <sys/sysmacros.h>
#if HAVE_SYS_PARAM_H
# include <sys/param.h>
diff -uNr findutils-4.6.0/gl/lib/stdio-impl.h findutils-4.6.0-glibc_fix/gl/lib/stdio-impl.h
--- findutils-4.6.0/gl/lib/stdio-impl.h 2015-12-25 03:11:45.000000000 +1030
+++ findutils-4.6.0-glibc_fix/gl/lib/stdio-impl.h 2019-09-02 01:00:37.439486293 +0930
@@ -111,3 +111,4 @@
# endif
#endif
+#define _IO_IN_BACKUP 0x100
findutils-4.6.0.tar.gz
deleted
100644 → 0
View file @
c822d44f
File deleted
findutils-4.7.0.tar.xz
0 → 100644
View file @
3b781f20
File added
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment