diff --git a/orangefs-autotools-2.71.patch b/orangefs-autotools-2.71.patch index 5336080..ededc33 100644 --- a/orangefs-autotools-2.71.patch +++ b/orangefs-autotools-2.71.patch @@ -1,11 +1,11 @@ ---- org/orangefs-v.2.9.8/configure.ac 2021-04-17 12:15:47.765105608 +0000 -+++ orangefs-v.2.9.8/configure.ac 2021-04-17 12:09:10.411971556 +0000 -@@ -295,7 +295,7 @@ - AX_OPENSSL - - dnl check to see if the "fast" getgrouplist function is available --AX_GETGROUPLIST -+dnl AX_GETGROUPLIST - - dnl check for key-based security - AC_ARG_ENABLE(security-key, +diff --git a/maint/config/getgrouplist.m4 b/maint/config/getgrouplist.m4 +index 3e52c3001..ca97e2085 100644 +--- a/maint/config/getgrouplist.m4 ++++ b/maint/config/getgrouplist.m4 +@@ -1,5 +1,6 @@ + AC_DEFUN([AX_GETGROUPLIST], + [ ++ AC_REQUIRE([AC_EGREP_HEADER]) + AC_MSG_CHECKING(for getgrouplist in distro) + dnl if this test passes, the distro does have it + dnl if this test fails, the distro does not have it diff --git a/orangefs-genconfig.patch b/orangefs-genconfig.patch index d8e0af7..bc97f60 100644 --- a/orangefs-genconfig.patch +++ b/orangefs-genconfig.patch @@ -1,7 +1,8 @@ -diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/Makefile.in ./Makefile.in ---- /home/fedora/packaging-work/orangefs/orangefs-2.9.6/Makefile.in 2017-08-28 16:49:41.769131000 +0000 -+++ ./Makefile.in 2017-09-15 17:02:45.526366949 +0000 -@@ -1393,7 +1393,7 @@ +diff --git a/Makefile.in b/Makefile.in +index 2ee369e27..02490f628 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1393,7 +1393,7 @@ endif src/server/simple.conf: src/apps/admin/pvfs2-genconfig $(Q) " GENCONFIG $@" $(E)$(srcdir)/src/apps/admin/pvfs2-genconfig --protocol tcp --port 3334 \ @@ -10,7 +11,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/Makefile.in ./Makef --storage $(prefix)/storage/data --metadata $(prefix)/storage/meta \ --logging "server,network,storage,flow" --quiet src/server/simple.conf -@@ -1404,7 +1404,7 @@ +@@ -1404,7 +1404,7 @@ all:: examples/fs.conf examples/fs.conf: src/apps/admin/pvfs2-genconfig $(Q) " GENCONFIG $@" $(E)$(srcdir)/src/apps/admin/pvfs2-genconfig --protocol tcp --port 3334 \ @@ -19,10 +20,11 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/Makefile.in ./Makef --storage $(prefix)/storage/data --metadata $(prefix)/storage/meta \ --quiet examples/fs.conf endif -diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs2-genconfig ./src/apps/admin/pvfs2-genconfig ---- /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs2-genconfig 2017-08-15 16:14:22.880025000 +0000 -+++ ./src/apps/admin/pvfs2-genconfig 2017-09-15 16:15:38.642709285 +0000 -@@ -28,7 +28,6 @@ +diff --git a/src/apps/admin/pvfs2-genconfig b/src/apps/admin/pvfs2-genconfig +index da1cb945e..209b9f356 100755 +--- a/src/apps/admin/pvfs2-genconfig ++++ b/src/apps/admin/pvfs2-genconfig +@@ -28,7 +28,6 @@ my $opt_ibport = ''; my $opt_portal = ''; my $opt_ioservers = ''; my $opt_metaservers = ''; @@ -30,7 +32,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs my $opt_storage = ''; my $opt_metadata = ''; my $opt_trovesync = '1'; -@@ -67,9 +66,8 @@ +@@ -67,9 +66,8 @@ my $opt_metaspec = undef; my %all_endpoints = (); @@ -42,7 +44,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs my $bmi_module = undef; -@@ -389,7 +387,7 @@ +@@ -394,7 +392,7 @@ sub emit_security sub emit_defaults { @@ -51,7 +53,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs $logging, $tracing, $logstamp, $server_job_timeout, $client_job_timeout) = @_; print $target "\n"; -@@ -419,10 +417,7 @@ +@@ -424,10 +422,7 @@ sub emit_defaults print $target "\tMetadataStorageSpace " . $default_meta_storage . "\n\n"; } @@ -63,7 +65,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs if($opt_tcpbindspecific) { -@@ -664,7 +659,6 @@ +@@ -699,7 +694,6 @@ sub emit_serveropts print $target "\tServer $alias\n"; print $target "\tDataStorageSpace $endpoint->{STORAGE}\n"; print $target "\tMetadataStorageSpace $endpoint->{METASTORAGE}\n"; @@ -71,7 +73,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs if ($opt_server_dbmaxsize) { -@@ -680,12 +674,11 @@ +@@ -715,12 +709,11 @@ sub emit_serveropts sub emit_server_conf { @@ -85,7 +87,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } sub emit_fs_key -@@ -835,7 +828,6 @@ +@@ -870,7 +863,6 @@ Usage: pvfs2-genconfig [OPTIONS] ('none','usec', or 'datetime' are valid) --storage path to OrangeFS storage (data) directory. --metadata path to OrangeFS metadata directory. @@ -93,7 +95,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs --dbmaxsize LMDB specific; size of storage_attributes and collections databases. If not specified, default is 512MB. --server-dbmaxsize LMDB specific; size of storage_attributes and collections databases -@@ -1159,33 +1151,21 @@ +@@ -1197,33 +1189,21 @@ sub get_client_job_timeout return $client_job_timeout; } @@ -130,7 +132,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs if ($opt_metadata) { $metastorage = $opt_metadata; } elsif ($opt_storage) { -@@ -1193,7 +1173,7 @@ +@@ -1231,7 +1211,7 @@ sub get_meta_storage $metastorage = $opt_storage; } elsif (!$opt_quiet) { print $OUT "Choose a directory for each server to store metadata in.\n"; @@ -139,7 +141,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } return $metastorage; } -@@ -1303,7 +1283,6 @@ +@@ -1341,7 +1321,6 @@ sub get_ionames my $portmap = shift; my $storage = shift; my $metastorage = shift; @@ -147,7 +149,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs my $ioline = ''; if ($opt_ioservers) { $ioline = $opt_ioservers; -@@ -1332,8 +1311,7 @@ +@@ -1370,8 +1349,7 @@ sub get_ionames HOSTNAME => $io_host, PORTMAP => $portmap, STORAGE => $storage, @@ -157,7 +159,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } } } -@@ -1343,7 +1321,6 @@ +@@ -1381,7 +1359,6 @@ sub get_metanames my $portmap = shift; my $storage = shift; my $metastorage = shift; @@ -165,7 +167,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs my $metaline = ''; my @meta_hosts; if ($opt_metaservers) { -@@ -1389,8 +1366,7 @@ +@@ -1427,8 +1404,7 @@ sub get_metanames HOSTNAME => $meta_host, PORTMAP => $portmap, STORAGE => $storage, @@ -175,7 +177,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } } } -@@ -1488,8 +1464,7 @@ +@@ -1526,8 +1502,7 @@ sub get_specs HOSTNAME => $hostname, PORTMAP => \%port, STORAGE => $stor, @@ -185,7 +187,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } else { -@@ -1584,8 +1559,7 @@ +@@ -1622,8 +1597,7 @@ sub get_specs HOSTNAME => $hostname, PORTMAP => $portmap, STORAGE => $stor, @@ -195,7 +197,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } } else -@@ -1606,8 +1580,7 @@ +@@ -1644,8 +1618,7 @@ sub get_specs HOSTNAME => $hostname, PORTMAP => $portmap, STORAGE => $stor, @@ -205,7 +207,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } } -@@ -1645,8 +1618,7 @@ +@@ -1683,8 +1656,7 @@ sub get_specs HOSTNAME => $hostname, PORTMAP => $portmap, STORAGE => $stor, @@ -215,7 +217,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } } } -@@ -1938,7 +1910,6 @@ +@@ -1976,7 +1948,6 @@ GetOptions('protocol=s' => \$opt_protocol, 'portal=i' => \$opt_portal, 'ioservers=s' => \$opt_ioservers, 'metaservers=s' => \$opt_metaservers, @@ -223,7 +225,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs 'dbmaxsize=i' => \$opt_default_dbmaxsize, 'logging=s' => \$opt_logging, 'tracing' => \$opt_tracing, -@@ -2089,10 +2060,9 @@ +@@ -2151,10 +2122,9 @@ else $default_storage = get_storage(); $default_meta_storage = get_meta_storage(); @@ -236,7 +238,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs } # find out if any of the storage or logfile entries in the endpoints -@@ -2118,17 +2088,6 @@ +@@ -2180,17 +2150,6 @@ if(needs_default_value(METASTORAGE)) set_default_value(METASTORAGE, $default_meta_storage); } @@ -254,7 +256,7 @@ diff -ur /home/fedora/packaging-work/orangefs/orangefs-2.9.6/src/apps/admin/pvfs my $count = scalar(keys %all_endpoints); my $io_count = scalar(get_aliases($IO_ENDPOINT)); my $meta_count = scalar(get_aliases($META_ENDPOINT)); -@@ -2214,7 +2173,7 @@ +@@ -2276,7 +2235,7 @@ if (!$opt_quiet) { } emit_defaults($output_target, $num_unexp_reqs, diff --git a/orangefs-lmdb.patch b/orangefs-lmdb.patch index 3cfd865..df574e6 100644 --- a/orangefs-lmdb.patch +++ b/orangefs-lmdb.patch @@ -1,7 +1,8 @@ -diff -Naur orangefs-2.9.6/configure.ac orangefs-2.9.6-patch/configure.ac ---- orangefs-2.9.6/configure.ac 2017-08-28 19:51:02.633385000 +0000 -+++ orangefs-2.9.6-patch/configure.ac 2017-09-27 20:27:14.606000000 +0000 -@@ -1890,7 +1890,6 @@ +diff --git a/configure.ac b/configure.ac +index dba6523fd..a506588fa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1894,7 +1894,6 @@ Makefile src/apps/admin/module.mk src/apps/admin/pvfs2-config src/apps/devel/module.mk @@ -9,7 +10,7 @@ diff -Naur orangefs-2.9.6/configure.ac orangefs-2.9.6-patch/configure.ac src/apps/karma/module.mk src/apps/vis/module.mk src/apps/fuse/module.mk -@@ -1914,7 +1913,6 @@ +@@ -1918,7 +1917,6 @@ src/common/mgmt/module.mk src/common/security/module.mk src/common/hash/module.mk src/common/token-utils/module.mk diff --git a/orangefs-no-start-stop.patch b/orangefs-no-start-stop.patch index 89fb5f0..ecab662 100644 --- a/orangefs-no-start-stop.patch +++ b/orangefs-no-start-stop.patch @@ -1,7 +1,8 @@ -diff -Naur orangefs-2.9.6/Makefile.in orangefs-2.9.6-patch/Makefile.in ---- orangefs-2.9.6/Makefile.in 2017-10-02 19:13:02.032536000 +0000 -+++ orangefs-2.9.6-patch/Makefile.in 2017-10-09 15:10:47.033497486 +0000 -@@ -1512,8 +1512,6 @@ +diff --git a/Makefile.in b/Makefile.in +index 02490f628..5b14a6c04 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1512,8 +1512,6 @@ endif done install -d $(sbindir) diff --git a/orangefs.spec b/orangefs.spec index ad01238..99db8d6 100644 --- a/orangefs.spec +++ b/orangefs.spec @@ -43,6 +43,8 @@ Patch1: orangefs-lmdb.patch # the server. They would require editing and don't work with systemd, # so this removes them. Patch2: orangefs-no-start-stop.patch +# Autoconf 2.71 fix, https://github.com/waltligon/orangefs/pull/87 +Patch3: orangefs-autotools-2.71.patch %global _hardened_build 1 @@ -68,6 +70,7 @@ the kernel module. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 rm -r src/apps/devel/lmdb rm -r src/common/lmdb @@ -76,7 +79,8 @@ rm src/client/webpack/ltmain.sh mv doc/man/pvfs2.conf.5 doc/man/orangefs.conf.5 -./prepare +autoupdate -I maint/config +autoreconf -vif -I maint/config %build export LDFLAGS="%{optflags} -Wl,--as-needed"