| 1 |
commit: e82bc24b4218388567c4f6d021fbac70891a3290 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 8 21:13:39 2021 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 8 21:20:28 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e82bc24b |
| 7 |
|
| 8 |
Bump xfsprogs to v5.10.0 |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
|
| 12 |
.../5.10.0/xfsprogs-5.10.0-remove-inih-dep.patch | 127 +++++++++++++++++++++ |
| 13 |
1 file changed, 127 insertions(+) |
| 14 |
|
| 15 |
diff --git a/patches/xfsprogs/5.10.0/xfsprogs-5.10.0-remove-inih-dep.patch b/patches/xfsprogs/5.10.0/xfsprogs-5.10.0-remove-inih-dep.patch |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..6b93552 |
| 18 |
--- /dev/null |
| 19 |
+++ b/patches/xfsprogs/5.10.0/xfsprogs-5.10.0-remove-inih-dep.patch |
| 20 |
@@ -0,0 +1,127 @@ |
| 21 |
+--- a/configure |
| 22 |
++++ b/configure |
| 23 |
+@@ -13779,83 +13779,6 @@ fi |
| 24 |
+ librt="" |
| 25 |
+ fi |
| 26 |
+ |
| 27 |
+- |
| 28 |
+- |
| 29 |
+- for ac_header in ini.h |
| 30 |
+-do : |
| 31 |
+- ac_fn_c_check_header_mongrel "$LINENO" "ini.h" "ac_cv_header_ini_h" "$ac_includes_default" |
| 32 |
+-if test "x$ac_cv_header_ini_h" = xyes; then : |
| 33 |
+- cat >>confdefs.h <<_ACEOF |
| 34 |
+-#define HAVE_INI_H 1 |
| 35 |
+-_ACEOF |
| 36 |
+- |
| 37 |
+-fi |
| 38 |
+- |
| 39 |
+-done |
| 40 |
+- |
| 41 |
+- if test $ac_cv_header_ini_h = no; then |
| 42 |
+- echo |
| 43 |
+- echo 'FATAL ERROR: could not find a valid ini.h header.' |
| 44 |
+- echo 'Install the libinih development package.' |
| 45 |
+- exit 1 |
| 46 |
+- fi |
| 47 |
+- |
| 48 |
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ini_parse in -linih" >&5 |
| 49 |
+-$as_echo_n "checking for ini_parse in -linih... " >&6; } |
| 50 |
+-if ${ac_cv_lib_inih_ini_parse+:} false; then : |
| 51 |
+- $as_echo_n "(cached) " >&6 |
| 52 |
+-else |
| 53 |
+- ac_check_lib_save_LIBS=$LIBS |
| 54 |
+-LIBS="-linih $LIBS" |
| 55 |
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
| 56 |
+-/* end confdefs.h. */ |
| 57 |
+- |
| 58 |
+-/* Override any GCC internal prototype to avoid an error. |
| 59 |
+- Use char because int might match the return type of a GCC |
| 60 |
+- builtin and then its argument prototype would still apply. */ |
| 61 |
+-#ifdef __cplusplus |
| 62 |
+-extern "C" |
| 63 |
+-#endif |
| 64 |
+-char ini_parse (); |
| 65 |
+-int |
| 66 |
+-main () |
| 67 |
+-{ |
| 68 |
+-return ini_parse (); |
| 69 |
+- ; |
| 70 |
+- return 0; |
| 71 |
+-} |
| 72 |
+-_ACEOF |
| 73 |
+-if ac_fn_c_try_link "$LINENO"; then : |
| 74 |
+- ac_cv_lib_inih_ini_parse=yes |
| 75 |
+-else |
| 76 |
+- ac_cv_lib_inih_ini_parse=no |
| 77 |
+-fi |
| 78 |
+-rm -f core conftest.err conftest.$ac_objext \ |
| 79 |
+- conftest$ac_exeext conftest.$ac_ext |
| 80 |
+-LIBS=$ac_check_lib_save_LIBS |
| 81 |
+-fi |
| 82 |
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inih_ini_parse" >&5 |
| 83 |
+-$as_echo "$ac_cv_lib_inih_ini_parse" >&6; } |
| 84 |
+-if test "x$ac_cv_lib_inih_ini_parse" = xyes; then : |
| 85 |
+- cat >>confdefs.h <<_ACEOF |
| 86 |
+-#define HAVE_LIBINIH 1 |
| 87 |
+-_ACEOF |
| 88 |
+- |
| 89 |
+- LIBS="-linih $LIBS" |
| 90 |
+- |
| 91 |
+-else |
| 92 |
+- |
| 93 |
+- echo |
| 94 |
+- echo 'FATAL ERROR: could not find a valid inih library.' |
| 95 |
+- echo 'Install the libinih library package.' |
| 96 |
+- exit 1 |
| 97 |
+- |
| 98 |
+-fi |
| 99 |
+- |
| 100 |
+- libinih=-linih |
| 101 |
+- |
| 102 |
+- |
| 103 |
+- |
| 104 |
+ for ac_header in uuid.h sys/uuid.h uuid/uuid.h |
| 105 |
+ do : |
| 106 |
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` |
| 107 |
+--- a/include/builddefs.in |
| 108 |
++++ b/include/builddefs.in |
| 109 |
+@@ -27,7 +27,6 @@ LIBTERMCAP = @libtermcap@ |
| 110 |
+ LIBEDITLINE = @libeditline@ |
| 111 |
+ LIBBLKID = @libblkid@ |
| 112 |
+ LIBDEVMAPPER = @libdevmapper@ |
| 113 |
+-LIBINIH = @libinih@ |
| 114 |
+ LIBXFS = $(TOPDIR)/libxfs/libxfs.la |
| 115 |
+ LIBFROG = $(TOPDIR)/libfrog/libfrog.la |
| 116 |
+ LIBXCMD = $(TOPDIR)/libxcmd/libxcmd.la |
| 117 |
+--- a/mkfs/xfs_mkfs.c |
| 118 |
++++ b/mkfs/xfs_mkfs.c |
| 119 |
+@@ -11,7 +11,6 @@ |
| 120 |
+ #include "libfrog/fsgeom.h" |
| 121 |
+ #include "libfrog/topology.h" |
| 122 |
+ #include "libfrog/convert.h" |
| 123 |
+-#include <ini.h> |
| 124 |
+ |
| 125 |
+ #define TERABYTES(count, blog) ((uint64_t)(count) << (40 - (blog))) |
| 126 |
+ #define GIGABYTES(count, blog) ((uint64_t)(count) << (30 - (blog))) |
| 127 |
+@@ -3769,7 +3768,7 @@ cfgfile_parse( |
| 128 |
+ if (!cli->cfgfile) |
| 129 |
+ return; |
| 130 |
+ |
| 131 |
+- error = ini_parse(cli->cfgfile, cfgfile_parse_ini, cli); |
| 132 |
++ error = -3; |
| 133 |
+ if (error) { |
| 134 |
+ if (error > 0) { |
| 135 |
+ fprintf(stderr, |
| 136 |
+@@ -3783,6 +3782,10 @@ cfgfile_parse( |
| 137 |
+ fprintf(stderr, |
| 138 |
+ _("Memory allocation failure parsing %s. Aborting.\n"), |
| 139 |
+ cli->cfgfile); |
| 140 |
++ } else if (error == -3) { |
| 141 |
++ fprintf(stderr, |
| 142 |
++ _("Unable to open config file %s. xfsprogs was built without cfg file support.\n"), |
| 143 |
++ cli->cfgfile); |
| 144 |
+ } else { |
| 145 |
+ fprintf(stderr, |
| 146 |
+ _("Unknown error %d opening config file %s. Aborting.\n"), |
| 147 |
+ |
Archives