- Import 4.1.4 and merge.

This commit is contained in:
Jeffrey E. Moyer 2005-04-13 23:34:44 +00:00
parent af24566659
commit 7469c35bcf
3 changed files with 24 additions and 111 deletions

View File

@ -1 +1 @@
autofs-4.1.3.tar.bz2
autofs-4.1.4.tar.bz2

View File

@ -3,66 +3,22 @@
#
Summary: A tool for automatically mounting and unmounting filesystems.
Name: autofs
%define version 4.1.3
%define release 123
%define version 4.1.4
%define release 2
Version: %{version}
Release: %{release}
Epoch: 1
License: GPL
Group: System Environment/Daemons
Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2
Source1: autofs.sysconfig
Patch1: autofs-4.1.0-hesiod-bind.patch
Patch2: autofs-4.1.0-loop.patch
Patch3: autofs-4.1.0-auto-master.patch
Patch4: autofs-4.1.2-init-redhat-only.patch
Patch5: autofs-4.1.3-non-strict-loop-fix.patch
Patch12: autofs-4.1.2-option-parsing.patch
Patch14: autofs-4.1.3-underlinei18n.patch
Patch15: autofs-4.1.3-rpc-ping.patch
Patch16: autofs-4.1.3-bad_chdir.patch
Patch17: autofs-4.1.3-mtab_lock.patch
Patch18: autofs-4.1.3-ian-map-expiry-1.patch
Patch19: autofs-4.1.3-disable-direct.patch
Patch21: autofs-4.1.3-signal-race-fix.patch
Patch22: autofs-4.1.3-sock-leak-fix.patch
Patch24: autofs-4.1.3-umount-loopback.patch
Patch25: autofs-4.1.3-close-fix.patch
Patch26: autofs-4.1.3-intl-status.patch
Patch27: autofs-4.1.3-localopts-multi.patch
Patch28: autofs-4.1.2-init-duplicate-map.patch
Patch29: autofs-4.1.3-filemap-etc-append.patch
Patch30: autofs-4.1.3-init-duplicate-map2.patch
Patch31: autofs-4.1.3-plus-map-ordering.patch
Patch32: autofs-4.1.3-ldap-search-limit.patch
Patch33: autofs-4.1.3-browse.patch
Patch35: autofs-4.1.3-large-program-map.patch
Patch36: autofs-4.1.3-user-message-typo.patch
Patch37: autofs-4.1.3-no-reserved-ports.patch
Patch38: autofs-4.1.3-init-cwd-map.patch
Patch39: autofs-4.1.3-init-lc-all.patch
Patch40: autofs-4.1.3-ldap-multiple-map.patch
Patch41: autofs-4.1.3-replicated-server-select.patch
Patch42: autofs-4.1.3-ian-map-expiry-multimount-fix.patch
Patch43: autofs-4.1.3-yp-direct-lookup.patch
Patch44: autofs-4.1.3-filestream-leak.patch
Patch45: autofs-4.1.3-no-rmdir.patch
Patch46: autofs-4.1.3-replicated-server-doc.patch
Patch47: autofs-4.1.3-cache-release.patch
Patch48: autofs-4.1.3-non-replicated-ping.patch
Patch49: autofs-4.1.3-program-map-extra-char-fix.patch
Patch50: autofs-4.1.3-duplicate-map-entry-order.patch
Patch51: autofs-4.1.3-submount-variable-propagation.patch
Patch52: autofs-4.1.3-one-auto-master.patch
Patch53: autofs-4.1.3-nsswitch-comment.patch
Patch54: autofs-4.1.3-alt-master-ldap.patch
Patch55: autofs-4.1.3-auto-smb-mount-fix.patch
Patch56: autofs-4.1.3-check-nsswitch-submount.patch
Patch57: autofs-4.1.3-init-script-browse.patch
Patch58: autofs-4.1.3-local-mount.patch
Patch59: autofs-4.1.3-indirect-wildcard.patch
Patch60: autofs-4.1.3-multi-over-redhat.patch
Patch61: autofs-4.1.3-auto.net-414b2.patch
Patch1: autofs-4.1.4-init-redhat-only.patch
Patch2: autofs-4.1.4-init-nsswitch-comment.patch
Patch3: autofs-4.1.4-init-one-auto-master.patch
Patch4: autofs-4.1.4-init-browse-as-non-first-option.patch
Patch5: autofs-4.1.4-hesiod-bind.patch
Patch6: autofs-4.1.4-non-replicated-ping.patch
Patch7: autofs-4.1.4-check-nsswitch-submount.patch
Patch8: autofs-4.1.3-alt-master-ldap.patch
Buildroot: /var/tmp/autofs-tmp
BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl
@ -102,59 +58,12 @@ inkludera nätfilsystem, CD-ROM, floppydiskar, och så vidare.
%prep
%setup -q
echo %{version}-%{release} > .version
%patch1 -p1 -b .hesiod-bind
%patch2 -p1 -b .loop
%patch3 -p1 -b .auto-master
%patch4 -p1 -b .init-redhat-only
%patch5 -p1 -b .non-strict-loop-fix
%patch12 -p1 -b .option-parsing
%patch14 -p1 -b .i18n
%patch15 -p1 -b .rpc-ping
%patch16 -p1 -b .bad-chdir
%patch17 -p1 -b .mtab-lock
%patch18 -p1 -b .map-expiry
%patch19 -p1 -b .disable-direct
%patch21 -p1 -b .signal-race-fix
%patch22 -p1 -b .sock-leak-fix-2
%patch24 -p1 -b .umount-loopback
%patch25 -p1 -b .close-fix
%patch26 -p1 -b .intl-status
%patch27 -p1 -b .localopts-multi
%patch28 -p1 -b .init-duplicate-map
%patch29 -p1 -b .filemap-etc-append
%patch30 -p1 -b .init-duplicate-map2
%patch31 -p1 -b .plus-map-ordering.patch
%patch32 -p1 -b .ldap-search-limit.patch
%patch33 -p1 -b .browse
%patch35 -p1 -b .large-program-map
%patch36 -p1 -b .user-message-typo
%patch37 -p1 -b .no-reserved-ports
%patch38 -p1 -b .init-cwd
%patch39 -p1 -b .init-lc-all
%patch40 -p1 -b .ldap-multiple-map
%patch41 -p1 -b .replicated-server-select
%patch42 -p1 -b .expire-multi
%patch43 -p1 -b .yp-direct-lookup
%patch44 -p1 -b .filestream-leak
%patch45 -p1 -b .no-rmdir
%patch46 -p1
%patch47 -p1 -b .cache-release
%patch48 -p1 -b .non-replicated-ping
%patch49 -p1 -b .program-map-extra-char
%patch50 -p1 -b .duplicate-entry-order
%patch51 -p1 -b .submount-variable-prop
%patch52 -p1 -b .one-auto-master
%patch53 -p1 -b .nsswitch-comment
%patch54 -p1 -b .alt-master-ldap
%patch55 -p1 -b .auto-smb-mount
%patch56 -p1 -b .check-nsswitch-submount
%patch57 -p1 -b .init-script-browse
%patch58 -p1 -b .local-mount
%patch59 -p1 -b .indirect-wildcard
%patch60 -p1 -b .multi-over
%patch61 -p1 -b .auto.net
cp $RPM_SOURCE_DIR/autofs.sysconfig .
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
#CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@ -171,7 +80,7 @@ mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
make install mandir=%{_mandir} initdir=/etc/rc.d/init.d INSTALLROOT=$RPM_BUILD_ROOT
install -m 755 -d $RPM_BUILD_ROOT/misc
install -m 644 autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs
install -m 644 redhat/autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@ -193,12 +102,13 @@ exit 0
%files
%defattr(-,root,root)
%doc CREDITS COPY* README* TODO multiserver_mount.patch patches/* samples/ldap* samples/autofs.schema
%doc CREDITS COPY* README* patches/* samples/ldap* samples/autofs.schema
%doc
%config /etc/rc.d/init.d/autofs
%config(noreplace,missingok) /etc/auto.master
%config(noreplace,missingok) /etc/auto.misc
%config(noreplace,missingok) /etc/auto.net
%config(noreplace,missingok) /etc/auto.smb
%config(noreplace) /etc/sysconfig/autofs
%dir /misc
%dir %{_libdir}/autofs
@ -207,6 +117,9 @@ exit 0
%{_libdir}/autofs/*
%changelog
* Wed Apr 13 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.4-2
- Import 4.1.4 and merge.
* Mon Apr 4 2005 Jeff Moyer <jmoyer@redhat.com> - 1:4.1.3-123
- Add in an error case that was omitted in the multi-over patch.
- Update our auto.net to reflect the changes that went into 4.1.4_beta2.

View File

@ -1 +1 @@
f43a09e94c4bd512ec58ac06e9d42c60 autofs-4.1.3.tar.bz2
7e3949114c00665b4636f0c318179657 autofs-4.1.4.tar.bz2