]> git.pld-linux.org Git - packages/autofs.git/blobdiff - autofs.spec
- updated to 5.0.8
[packages/autofs.git] / autofs.spec
index 6caff4b6a409588e98ad94d4e6c56b848884cdaa..51a5c1235fd9ea859b323b07afb8351f2004a851 100644 (file)
@@ -1,6 +1,8 @@
 # TODO:
 # - change /net to something FHS-compliant ?
-# - fix ac/am regeneration
+#
+# Conditional build:
+%bcond_without ldap    # don't build LDAP extension module
 #
 Summary:       autofs daemon
 Summary(de.UTF-8):     autofs daemon
@@ -10,95 +12,49 @@ Summary(pl.UTF-8):  Demon autofs
 Summary(pt_BR.UTF-8):  Servidor autofs
 Summary(tr.UTF-8):     autofs sunucu süreci
 Name:          autofs
-Version:       5.0.2
-Release:       2
+Version:       5.0.8
+Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         Daemons
-Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2
-# Source0-md5: fd56817cba70814753bc98f5fb7f23ec
+Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.xz
+# Source0-md5: 4ed5271598fb1a76475364a4879c7578
 Source1:       %{name}.init
 Source2:       %{name}-auto.master
 Source3:       %{name}-auto.media
 Source4:       %{name}-auto.net
 Source5:       %{name}.sysconfig
 Patch0:                %{name}-open_max.patch
-Patch1:                %{name}-hesiod-includes.patch
-## Official patches:
-Patch10:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-krb5-include.patch
-Patch11:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-bad-proto-init.patch
-Patch12:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-missing-multi-support.patch
-Patch13:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-multi-nsswitch-lookup.patch
-Patch14:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-consistent-random-selection-option-name.patch
-Patch15:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-fix-offset-dir-create.patch
-Patch16:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-quote-exports.patch
-Patch17:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-hi-res-time.patch
-Patch18:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-quoted-slash-alone.patch
-Patch19:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-fix-dnattr-parse.patch
-Patch20:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-fix-nfs-version-in-get-supported-ver-and-cost.patch
-Patch21:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-instance-stale-mark.patch
-Patch22:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-fix-largefile-dumbness.patch
-Patch23:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-dont-fail-on-empty-master.patch
-Patch24:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-ldap-percent-hack.patch
-Patch25:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-fix-mount-nfs-nosymlink.patch
-Patch26:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-dont-fail-on-empty-master-fix.patch
-Patch27:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-default-nsswitch.patch
-Patch28:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-ldap-schema-discovery.patch
-Patch29:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-random-selection-fix.patch
-Patch30:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-timeout-option-parse-fix.patch
-Patch31:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-ldap-check-star.patch
-Patch32:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-ldap-schema-discovery-fix.patch
-Patch33:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-ldap-schema-discovery-config-update.patch
-Patch34:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-ldap-search-basedn-list.patch
-Patch35:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-libxml2-workaround.patch
-Patch36:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-reread-config-on-hup.patch
-Patch37:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-multiple-server-selection-option.patch
-Patch38:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-foreground-logging.patch
-Patch39:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-cleanup-krb5-comment.patch
-Patch40:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-submount-deadlock.patch
-Patch41:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-ferror-check.patch
-Patch42:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-autofs-5-typo.patch
-Patch43:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-swallow-null-macro.patch
-Patch44:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-remove-unsed-export-validation-code.patch
-Patch45:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-dynamic-logging.patch
-Patch46:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-fix-recursive-loopback-mounts.patch
-Patch47:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-log-map-reload.patch
-Patch48:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-basedn-with-spaces.patch
-Patch49:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-dynamic-logging-fixes.patch
-Patch50:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-basedn-with-spaces-fix.patch
-Patch51:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-check-mtab-updated.patch
-Patch52:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-basedn-with-spaces-fix-2.patch
-Patch53:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-check-auto_master.patch
-Patch54:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-ldap-schema-discovery-fix-2.patch
-Patch55:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-negative-timeout-update.patch
-Patch56:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-large-groups.patch
-Patch57:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-report-failed-lookups.patch
-Patch58:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-dynamic-logging-non-sasl.patch
-Patch59:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-check-mtab-updated-fix.patch
-Patch60:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-singleton-host-list.patch
-Patch61:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-start-pipe-buff-size.patch
-Patch62:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-fix-off-by-one-lookup.patch
-Patch63:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-improve-server-unavail.patch
-Patch64:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-add-multiple-server-selection-option-fix.patch
-Patch65:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-external-cred-cache.patch
-Patch66:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-percent-hack-fix.patch
-Patch67:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-quote-exports-fix.patch
-Patch68:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-hosts-nosuid-default.patch
-Patch69:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-quote-exports-fix-fix.patch
-Patch70:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-quell-mount-module-message.patch
-Patch71:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-5.0.2-improve-server-unavail-fix.patch
+Patch1:                %{name}-makefile.patch
+Patch100:      autofs-5.0.8-fix-undefined-authtype_requires_creds-err-if-ldap-en.patch
+Patch101:      autofs-5.0.8-fix-master-map-type-check.patch
+Patch102:      autofs-5.0.8-fix-task-manager-not-getting-signaled.patch
+Patch103:      autofs-5.0.8-allow-with-systemd-to-take-a-path-arg.patch
+Patch104:      autofs-5.0.8-fix-WITH_LIBTIRPC-function-name.patch
+Patch105:      autofs-5.0.8-fix-ipv6-libtirpc-getport.patch
+Patch106:      autofs-5.0.8-fix-allow-with-systemd-to-take-a-path-arg.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bind-devel
-BuildRequires: krb5-devel
-BuildRequires: openldap-devel >= 2.4.6
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: bison
+BuildRequires: e2fsprogs
+BuildRequires: flex
+BuildRequires: heimdal-devel
+BuildRequires: hesiod-devel
+BuildRequires: libtirpc-devel
+BuildRequires: libxml2-devel
+BuildRequires: mount
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
+BuildRequires: rpmbuild(macros) >= 1.647
 Requires(post,preun):  /sbin/chkconfig
+Requires(post,preun,postun):   systemd-units >= 38
 Requires:      mktemp
 Requires:      rc-scripts
+Requires:      systemd-units >= 0.38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/autofs
+%define                filterout_ld    -Wl,--as-needed
 
 %description
 autofs is a daemon which automatically mounts filesystems when you use
@@ -157,82 +113,30 @@ trzymanych na serwerze LDAP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
-#Official patches:
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
-%patch69 -p1
-%patch70 -p1
-%patch71 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
 
 %build
-#%{__aclocal}
-#%{__autoconf}
+%{__autoconf}
+
 export initdir=/etc/rc.d/init.d
 %configure \
-       --with-confdir=%{_sysconfdir}
-
-%{__make} \
+       --with-openldap=%{?with_ldap:yes}%{!?with_ldap:no} \
+       --enable-force-shutdown=yes \
+       --with-confdir=%{_sysconfdir} \
+       --with-mapdir=%{_sysconfdir} \
+       --with-libtirpc \
+       --with-systemd=%{systemdunitdir}
+
+%{__make} -j1 \
        initdir=/etc/rc.d/init.d \
        CC="%{__cc}" \
-       DAEMON_CFLAGS="%{rpmcflags}"
+       DAEMON_CFLAGS="-fPIE %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -248,12 +152,11 @@ install %{SOURCE2}        $RPM_BUILD_ROOT%{_sysconfdir}/auto.master
 install %{SOURCE3}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.media
 install %{SOURCE4}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.net
 install %{SOURCE5}     $RPM_BUILD_ROOT/etc/sysconfig/autofs
-mv $RPM_BUILD_ROOT/etc/auto.smb $RPM_BUILD_ROOT%{_sysconfdir}
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/auto.{home,var,tmp}
 
-# Do some cleanups:
-rm -f $RPM_BUILD_ROOT/etc/auto.{master,misc,net}
+# replaced in PLD by auto.media
+rm $RPM_BUILD_ROOT%{_sysconfdir}/auto.misc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -265,18 +168,27 @@ if [ -f /var/lock/subsys/automount ]; then
        mv /var/lock/subsys/{automount,autofs}
 fi
 %service autofs restart "autofs daemon"
+%systemd_post autofs.service
 
 %preun
 if [ "$1" = "0" ]; then
        %service autofs stop
        /sbin/chkconfig --del autofs
 fi
+%systemd_preun autofs.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- autofs < 5.0.8-1
+%systemd_trigger autofs.service
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG CREDITS README*
 %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/autofs
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/autofs
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.home
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.master
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.media
@@ -284,17 +196,40 @@ fi
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.smb
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.tmp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.var
-%attr(754,root,root) %config /etc/rc.d/init.d/autofs
+%attr(754,root,root) /etc/rc.d/init.d/autofs
+%{systemdunitdir}/autofs.service
 %attr(755,root,root) %{_sbindir}/automount
 %dir /net
 %dir %{_libdir}/autofs
-%attr(755,root,root) %{_libdir}/autofs/mount_*
-%attr(755,root,root) %{_libdir}/autofs/parse_*
-%attr(755,root,root) %{_libdir}/autofs/lookup_[!l]*
+%attr(755,root,root) %{_libdir}/autofs/lookup_dir.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_file.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_files.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_hesiod.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_hosts.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_multi.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_nis.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_nisplus.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_program.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_userhome.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_yp.so
+%attr(755,root,root) %{_libdir}/autofs/mount_afs.so
+%attr(755,root,root) %{_libdir}/autofs/mount_autofs.so
+%attr(755,root,root) %{_libdir}/autofs/mount_bind.so
+%attr(755,root,root) %{_libdir}/autofs/mount_changer.so
+%attr(755,root,root) %{_libdir}/autofs/mount_ext2.so
+%attr(755,root,root) %{_libdir}/autofs/mount_ext3.so
+%attr(755,root,root) %{_libdir}/autofs/mount_ext4.so
+%attr(755,root,root) %{_libdir}/autofs/mount_generic.so
+%attr(755,root,root) %{_libdir}/autofs/mount_nfs.so
+%attr(755,root,root) %{_libdir}/autofs/mount_nfs4.so
+%attr(755,root,root) %{_libdir}/autofs/parse_hesiod.so
+%attr(755,root,root) %{_libdir}/autofs/parse_sun.so
 %{_mandir}/man[58]/*
 
+%if %{with ldap}
 %files ldap
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/autofs_ldap_auth.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/autofs_ldap_auth.conf
 %attr(755,root,root) %{_libdir}/autofs/lookup_ldap.so
 %attr(755,root,root) %{_libdir}/autofs/lookup_ldaps.so
+%endif
This page took 0.061828 seconds and 4 git commands to generate.