From 071dab61ab25667bd2d9be535a1f75acad92ee015c9b33977c7de2ff6f7c032b Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Thu, 31 May 2012 08:51:29 +0000 Subject: [PATCH 1/4] Accepting request 122961 from home:rudi_m:branches:Base:System - remove useless automake dependency, it was needed for selinux.patch which has been removed since findutils 4.5.10 OBS-URL: https://build.opensuse.org/request/show/122961 OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=32 --- automake-1.12.patch | 13 ------------- findutils.changes | 6 ++++++ findutils.spec | 4 ---- 3 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 automake-1.12.patch diff --git a/automake-1.12.patch b/automake-1.12.patch deleted file mode 100644 index 04d4bff..0000000 --- a/automake-1.12.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: findutils-4.5.10/configure.ac -=================================================================== ---- findutils-4.5.10.orig/configure.ac -+++ findutils-4.5.10/configure.ac -@@ -77,8 +77,6 @@ AC_PROG_CPP - dnl for gnulib - gl_EARLY - --AM_C_PROTOTYPES -- - AC_PROG_INSTALL - AC_PROG_RANLIB - dnl AC_PROG_LIBTOOL diff --git a/findutils.changes b/findutils.changes index d54bdbb..8d0da0b 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 30 17:13:20 UTC 2012 - sweet_f_a@gmx.de + +- remove useless automake dependency, it was needed for selinux.patch + which has been removed since findutils 4.5.10 + ------------------------------------------------------------------- Tue May 29 11:29:27 UTC 2012 - puzel@suse.com diff --git a/findutils.spec b/findutils.spec index 387ac85..28eb240 100644 --- a/findutils.spec +++ b/findutils.spec @@ -35,9 +35,7 @@ Patch1: findutils-4.4.2-xautofs.patch Patch2: findutils-4.4.2-updatedb.patch Patch3: findutils-4.5.10-prune_unknown.patch Patch4: findutils-4.5.10-updatedb_ignore_nfsv4.patch -Patch5: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: automake %if 0%{?suse_version} > 1100 BuildRequires: libselinux-devel %endif @@ -83,10 +81,8 @@ switching on the computer. %patch2 %patch3 %patch4 -%patch5 -p1 %build -autoreconf %ifarch %arm armv5tel armv7l armv7el armv5el # this is a workaround for a qemu-user bug, we hit. A qemu patch is being discussed, but for now ... export DEFAULT_ARG_SIZE="(31u * 1024u)" From baaf485a941c63cba4e0a69d3371aac70a6a6c005d2b7235d35402fcbcc55607 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 31 May 2012 15:04:20 +0000 Subject: [PATCH 2/4] Updating link to change in openSUSE:Factory/findutils revision 35.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=b763eb1349cea3462cb9d0df4c1d8e81 --- automake-1.12.patch | 13 +++++++++++++ findutils.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 automake-1.12.patch diff --git a/automake-1.12.patch b/automake-1.12.patch new file mode 100644 index 0000000..04d4bff --- /dev/null +++ b/automake-1.12.patch @@ -0,0 +1,13 @@ +Index: findutils-4.5.10/configure.ac +=================================================================== +--- findutils-4.5.10.orig/configure.ac ++++ findutils-4.5.10/configure.ac +@@ -77,8 +77,6 @@ AC_PROG_CPP + dnl for gnulib + gl_EARLY + +-AM_C_PROTOTYPES +- + AC_PROG_INSTALL + AC_PROG_RANLIB + dnl AC_PROG_LIBTOOL diff --git a/findutils.spec b/findutils.spec index 28eb240..f4de866 100644 --- a/findutils.spec +++ b/findutils.spec @@ -35,6 +35,7 @@ Patch1: findutils-4.4.2-xautofs.patch Patch2: findutils-4.4.2-updatedb.patch Patch3: findutils-4.5.10-prune_unknown.patch Patch4: findutils-4.5.10-updatedb_ignore_nfsv4.patch +Patch5: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1100 BuildRequires: libselinux-devel @@ -81,6 +82,7 @@ switching on the computer. %patch2 %patch3 %patch4 +%patch5 -p1 %build %ifarch %arm armv5tel armv7l armv7el armv5el From 972977e6dee83b2c114c8666cce46af572bcb254ecbdd83369cb61f3650fae17 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 31 May 2012 15:04:23 +0000 Subject: [PATCH 3/4] Accepting request 122775 from Base:System baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/122775 OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=33 --- automake-1.12.patch | 13 ------------- findutils.spec | 2 -- 2 files changed, 15 deletions(-) delete mode 100644 automake-1.12.patch diff --git a/automake-1.12.patch b/automake-1.12.patch deleted file mode 100644 index 04d4bff..0000000 --- a/automake-1.12.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: findutils-4.5.10/configure.ac -=================================================================== ---- findutils-4.5.10.orig/configure.ac -+++ findutils-4.5.10/configure.ac -@@ -77,8 +77,6 @@ AC_PROG_CPP - dnl for gnulib - gl_EARLY - --AM_C_PROTOTYPES -- - AC_PROG_INSTALL - AC_PROG_RANLIB - dnl AC_PROG_LIBTOOL diff --git a/findutils.spec b/findutils.spec index f4de866..28eb240 100644 --- a/findutils.spec +++ b/findutils.spec @@ -35,7 +35,6 @@ Patch1: findutils-4.4.2-xautofs.patch Patch2: findutils-4.4.2-updatedb.patch Patch3: findutils-4.5.10-prune_unknown.patch Patch4: findutils-4.5.10-updatedb_ignore_nfsv4.patch -Patch5: automake-1.12.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1100 BuildRequires: libselinux-devel @@ -82,7 +81,6 @@ switching on the computer. %patch2 %patch3 %patch4 -%patch5 -p1 %build %ifarch %arm armv5tel armv7l armv7el armv5el From f51b865a448f86fa37fa95c0f4d83762d9f7bf4c22a5a77988a5976947ec82a2 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Thu, 26 Jul 2012 07:56:25 +0000 Subject: [PATCH 4/4] Accepting request 128958 from home:a_jaeger:FactoryFix Fix build with missing gets declaration (glibc 2.16) OBS-URL: https://build.opensuse.org/request/show/128958 OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=34 --- findutils-stdio.in.patch | 16 ++++++++++++++++ findutils.changes | 5 +++++ findutils.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 findutils-stdio.in.patch diff --git a/findutils-stdio.in.patch b/findutils-stdio.in.patch new file mode 100644 index 0000000..ffdd805 --- /dev/null +++ b/findutils-stdio.in.patch @@ -0,0 +1,16 @@ +Index: findutils-4.5.10/gnulib/lib/stdio.in.h +=================================================================== +--- findutils-4.5.10.orig/gnulib/lib/stdio.in.h ++++ findutils-4.5.10/gnulib/lib/stdio.in.h +@@ -178,9 +178,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not + /* 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. */ ++#if HAVE_RAW_DECL_GETS + #undef gets + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); +- ++#endif + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/findutils.changes b/findutils.changes index 8d0da0b..bbec9de 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 26 07:24:20 UTC 2012 - aj@suse.de + +- Fix build with missing gets declaration (glibc 2.16) + ------------------------------------------------------------------- Wed May 30 17:13:20 UTC 2012 - sweet_f_a@gmx.de diff --git a/findutils.spec b/findutils.spec index 28eb240..d73f161 100644 --- a/findutils.spec +++ b/findutils.spec @@ -35,6 +35,7 @@ Patch1: findutils-4.4.2-xautofs.patch Patch2: findutils-4.4.2-updatedb.patch Patch3: findutils-4.5.10-prune_unknown.patch Patch4: findutils-4.5.10-updatedb_ignore_nfsv4.patch +Patch5: findutils-stdio.in.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1100 BuildRequires: libselinux-devel @@ -81,6 +82,7 @@ switching on the computer. %patch2 %patch3 %patch4 +%patch5 -p1 %build %ifarch %arm armv5tel armv7l armv7el armv5el