[am-utils] - Update am-utils to current git to get needed NFSv3 functionality.
Ian Kent
iankent at fedoraproject.org
Tue Oct 21 10:23:15 UTC 2014
commit 14a4da86dd3f731c40c927f0dac10ee9d0a89f0d
Author: Ian Kent <ikent at redhat.com>
Date: Tue Oct 21 18:23:01 2014 +0800
- Update am-utils to current git to get needed NFSv3 functionality.
.gitignore | 1 +
am-utils-6.1.5-UTS_RELEASE.patch | 17 ---
am-utils-6.1.5-buildsys.patch | 123 ----------------
am-utils-6.1.5-check-fh-on-umount-succeeded.patch | 24 ---
am-utils-6.1.5-dont-background-autofs-umount.patch | 35 -----
am-utils-6.1.5-expn-temp.patch | 26 ----
...ils-6.1.5-fix-autofs-proto-version-define.patch | 28 ----
...le-ENOENT-umount-return-for-autofs-mounts.patch | 33 -----
am-utils-6.1.5-libwarp.patch | 69 ---------
am-utils-6.1.5-nfs-version.patch | 27 ----
am-utils-6.1.5-nolock-toplvl.patch | 64 --------
am-utils-6.1.5-rmtab-temp.patch | 15 --
...s-6.1.5-texinfo-documentation-build-fixes.patch | 12 --
am-utils-6.1.5-use-_hardened_build-flag.patch | 103 -------------
...9b652fb4-fix-handle-failed-umount-on-exit.patch | 13 --
...0.git.9b652fb4-linux-umount-wait-on-ebusy.patch | 50 -------
...6.2-1.git.e03592f0-fix-debug-log-deadlock.patch | 82 -----------
....git.e03592f0-fix-get_nfs_version-message.patch | 22 ---
...nodes-in-the-proper-order-when-going-down.patch | 152 --------------------
am-utils-6.2.0-1.git.bb13dea6-ylwrap.patch | 36 +++++
am-utils.conf | 2 +
am-utils.spec | 76 +++--------
sources | 2 +-
23 files changed, 59 insertions(+), 953 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 278b5d9..9ee960c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ am-utils-6.1.5.tar.gz
*~
*.log
*.rpm
+/am-utils-6.2.0-1.git.bb13dea6.tar.gz
diff --git a/am-utils-6.2.0-1.git.bb13dea6-ylwrap.patch b/am-utils-6.2.0-1.git.bb13dea6-ylwrap.patch
new file mode 100644
index 0000000..641822d
--- /dev/null
+++ b/am-utils-6.2.0-1.git.bb13dea6-ylwrap.patch
@@ -0,0 +1,36 @@
+diff -up am-utils-6.2.0-1.git.bb13dea6/bootstrap.orig am-utils-6.2.0-1.git.bb13dea6/bootstrap
+--- am-utils-6.2.0-1.git.bb13dea6/bootstrap.orig 2014-10-21 05:42:37.128509523 -0400
++++ am-utils-6.2.0-1.git.bb13dea6/bootstrap 2014-10-21 05:51:38.044996707 -0400
+@@ -59,13 +59,13 @@ fi
+
+ echo "AMU: Fixing ylwrap..."
+ patch << \EOF
+---- ylwrap.orig 2014-05-08 21:18:30.000000000 -0400
+-+++ ylwrap 2014-05-09 22:25:54.900240000 -0400
+-@@ -153,6 +153,22 @@
+- *[\\/]*) prog="`pwd`/$prog" ;;
++--- ylwrap.orig 2014-10-21 05:38:42.210204684 -0400
+++++ ylwrap 2014-10-21 05:44:45.602138698 -0400
++@@ -161,6 +161,22 @@
++ *[\\/]*) prog=`pwd`/$prog ;;
+ esac
+
+-+prefix=`echo $input | sed \
+++prefix=`echo $input | sed \
+ + -e 's,^.*/,,g' \
+ + -e 's/_gram.[yl]$/_/g' \
+ + -e 's/_lex.[yl]$/_/g' \
+@@ -81,10 +81,10 @@ patch << \EOF
+ + flags="-p $prefix";;
+ +esac
+ +
+- # FIXME: add hostname here for parallel makes that run commands on
+- # other machines. But that might take us over the 14-char limit.
+ dirname=ylwrap$$
+-@@ -166,10 +182,13 @@
++ do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
++ trap "ret=129; $do_exit" 1
++@@ -172,10 +188,13 @@
+ cd $dirname
+
+ case $# in
diff --git a/am-utils.conf b/am-utils.conf
index a97d980..388e673 100644
--- a/am-utils.conf
+++ b/am-utils.conf
@@ -26,6 +26,8 @@ browsable_dirs = yes
show_statfs_entries = no
fully_qualified_hosts = no
cache_duration = 300
+# Fedora doesn't support NFSv2, use the amd NFSv3 server.
+auto_nfs_version = 3
# DEFINE AN AMD MOUNT POINT
[ /net ]
diff --git a/am-utils.spec b/am-utils.spec
index 2a94084..958693c 100644
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,13 +1,17 @@
Summary: Automount utilities including an updated version of Amd
Name: am-utils
-Version: 6.1.5
-Release: 32%{?dist}
+Version: 6.2.0
+%define githash bb13dea6d0bf378f38a2a009a9802577f5399673
+%define shorthash %(echo "%{githash}" | cut -c -8)
+%define gitdate 20140906
+%define revision 1
+Release: %{revision}.%{gitdate}git%{shorthash}%{?dist}
License: BSD
Epoch: 5
Group: System Environment/Daemons
URL: http://am-utils.org
-
-Source: ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
+# Git repository git://git.fsl.cs.sunysb.edu/am-utils-6.2.git
+Source: am-utils-%{version}-%{revision}.git.%{shorthash}.tar.gz
Source1: amd.service
Source2: am-utils.conf
Source3: am-utils.sysconf
@@ -38,39 +42,13 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(preun): /sbin/install-info
-# 203193 - tmpfile usage
-Patch1: am-utils-6.1.5-rmtab-temp.patch
-# 202180 - amd service doesn't work
-Patch2: am-utils-6.1.5-nfs-version.patch
-# UTS_RELEASE macro has been removed from the latest kernel
-Patch3: am-utils-6.1.5-UTS_RELEASE.patch
-# Build system bugfixes
-Patch4: am-utils-6.1.5-buildsys.patch
-# 435420 - CVE-2008-1078 am-utils: insecure usage of temporary files
-Patch5: am-utils-6.1.5-expn-temp.patch
-# 450754 - Amd does not work with 2.6.25
-# 602938 - am-utils fails on f13 with amfs_toplvl_mount
-# 640383 - am-utils doesn't work in Fedora 13
-Patch6: am-utils-6.1.5-nolock-toplvl.patch
-# 566711 - am-utils: incorrect use of tcp_wrapper
-Patch7: am-utils-6.1.5-libwarp.patch
-# 955445 - am-utils package should be built with PIE flags
-Patch8: am-utils-6.1.5-use-_hardened_build-flag.patch
-# Fix documentation build fails.
-Patch9: am-utils-6.1.5-texinfo-documentation-build-fixes.patch
-
-Patch10: am-utils-6.1.5-dont-background-autofs-umount.patch
-Patch11: am-utils-6.1.5-check-fh-on-umount-succeeded.patch
-Patch12: am-utils-6.1.5-handle-ENOENT-umount-return-for-autofs-mounts.patch
-Patch13: am-utils-6.2-1.git.e03592f0-fix-get_nfs_version-message.patch
-Patch14: am-utils-6.2-1.git.e03592f0-fix-debug-log-deadlock.patch
-Patch15: am-utils-6.2-0.git.9b652fb4-linux-umount-wait-on-ebusy.patch
-Patch16: am-utils-6.2-make-sure-to-remove-nodes-in-the-proper-order-when-going-down.patch
-Patch17: am-utils-6.2-0.git.9b652fb4-fix-handle-failed-umount-on-exit.patch
-# Don't attempt to use v5 protocol
-Patch18: am-utils-6.1.5-fix-autofs-proto-version-define.patch
-
-%global _hardened_build 1
+# automake ylwrap has changed, fix inline patch in bootstrap.
+Patch1: am-utils-6.2.0-1.git.bb13dea6-ylwrap.patch
+
+# Not needed since autoreconf/libtool appear to do this automatically
+# Leaving it set doesn't appear to be a problem so leave it set in
+# case this changes.
+%global _hardened_build 1
# We need to filter out some perl requirements for now.
%define _use_internal_dependency_generator 0
@@ -88,26 +66,9 @@ You should install am-utils if you need a program for automatically
mounting and unmounting filesystems.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{revision}.git.%{shorthash}
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
find_requires=%{old_find_requires}
echo "$find_requires | grep -v lostaltmail.conf" > find-requires
@@ -205,11 +166,9 @@ fi
%files
%doc doc/*.ps AUTHORS BUGS ChangeLog NEWS README* scripts/*-sample
%dir /.automount
-%{_bindir}/expn
%{_bindir}/pawd
%{_sbindir}/*
%{_mandir}/man[58]/*
-%{_mandir}/man1/expn.1*
%{_mandir}/man1/pawd.1*
%config(noreplace) %{_sysconfdir}/amd.net
%config(noreplace) %{_sysconfdir}/amd.conf
@@ -219,6 +178,9 @@ fi
%{_libdir}/libamu.so*
%changelog
+* Tue Oct 21 2014 Ian Kent <ikent at redhat.com> - 5:6.2.0-1.20140906gitbb13dea6
+- Update am-utils to current git to get needed NFSv3 functionality.
+
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5:6.1.5-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
diff --git a/sources b/sources
index 3f481c7..ebfe662 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc07514f4316511ace5087b9e6dc3771 am-utils-6.1.5.tar.gz
+6f631a68f7d98eca36feb5d675ff2296 am-utils-6.2.0-1.git.bb13dea6.tar.gz
More information about the scm-commits
mailing list