- updated to 5.0.8

[packages/autofs.git] / autofs.spec

diff --git a/autofs.spec b/autofs.spec
index 2e7b4b3eca07b5a86365fc851f881e2db91bbcd3..51a5c1235fd9ea859b323b07afb8351f2004a851 100644 (file)
--- a/autofs.spec
+++ b/autofs.spec
@@ -1,89 +1,103 @@
 # TODO:
 # TODO:

-# What about unpacked files:
-#  /etc/auto.master
-#  /etc/auto.misc
-#  /etc/auto.net
-# Probably Source{2,3,5} are obsolete.
+# - change /net to something FHS-compliant ?
+#
+# Conditional build:
+%bcond_without ldap    # don't build LDAP extension module
+#

 Summary:       autofs daemon
 Summary:       autofs daemon

-Summary(de):   autofs daemon
-Summary(es):   Servidor autofs
-Summary(fr):   démon autofs
-Summary(pl):   Demon autofs
-Summary(pt_BR):        Servidor autofs
-Summary(tr):   autofs sunucu süreci
+Summary(de.UTF-8):     autofs daemon
+Summary(es.UTF-8):     Servidor autofs
+Summary(fr.UTF-8):     démon autofs
+Summary(pl.UTF-8):     Demon autofs
+Summary(pt_BR.UTF-8):  Servidor autofs
+Summary(tr.UTF-8):     autofs sunucu süreci

 Name:          autofs
 Name:          autofs

-Version:       4.1.4
-Release:       2
+Version:       5.0.8
+Release:       1

 Epoch:         1
 Epoch:         1

-License:       GPL
+License:       GPL v2+

 Group:         Daemons
 Group:         Daemons

-Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/%{name}-%{version}.tar.bz2
-# Source0-md5: 7e3949114c00665b4636f0c318179657
+Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.xz
+# Source0-md5: 4ed5271598fb1a76475364a4879c7578

 Source1:       %{name}.init
 Source2:       %{name}-auto.master
 Source1:       %{name}.init
 Source2:       %{name}-auto.master

-Source3:       %{name}-auto.misc
-Source4:       %{name}-auto.mnt
-Source5:       %{name}-auto.net
-Source6:       %{name}.sysconfig
+Source3:       %{name}-auto.media
+Source4:       %{name}-auto.net
+Source5:       %{name}.sysconfig

 Patch0:                %{name}-open_max.patch
 Patch0:                %{name}-open_max.patch

-Patch1:                %{name}-hesiod-includes.patch
-Patch2:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-%{version}-misc-fixes.patch
-Patch3:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-%{version}-multi-parse-fix.patch   
-Patch4:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-%{version}-no-unlink-upstream.patch
-Patch5:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-%{version}-non-replicated-ping.patch 
-BuildRequires: automake
+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: autoconf

+BuildRequires: automake

 BuildRequires: bind-devel
 BuildRequires: bind-devel

-BuildRequires: openldap-devel >= 2.3.0
-PreReq:                rc-scripts
+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):  /sbin/chkconfig

+Requires(post,preun,postun):   systemd-units >= 38

 Requires:      mktemp
 Requires:      mktemp

+Requires:      rc-scripts
+Requires:      systemd-units >= 0.38

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/autofs
 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
 them, and unmounts them later when you are not using them. This can
 include network filesystems, CD-ROMs, floppies, and so forth.
 
 
 %description
 autofs is a daemon which automatically mounts filesystems when you use
 them, and unmounts them later when you are not using them. This can
 include network filesystems, CD-ROMs, floppies, and so forth.
 

-%description -l de
-autofs ist ein Dämon, der Dateisysteme automatisch montiert, wenn sie
-benutzt werden, und sie später bei Nichtbenutzung wieder demontiert.
-Dies kann Netz-Dateisysteme, CD-ROMs, Disketten und ähnliches
-einschließen.
+%description -l de.UTF-8
+autofs ist ein Dämon, der Dateisysteme automatisch montiert, wenn sie
+benutzt werden, und sie später bei Nichtbenutzung wieder demontiert.
+Dies kann Netz-Dateisysteme, CD-ROMs, Disketten und ähnliches
+einschließen.

 
 

-%description -l es
-Autofs es un servidor que monta automáticamente sistemas de archivos
-cuando los usa, y los desmonta, más tarde, al terminar de usarlos.
+%description -l es.UTF-8
+Autofs es un servidor que monta automáticamente sistemas de archivos
+cuando los usa, y los desmonta, más tarde, al terminar de usarlos.

 Incluyendo sistemas de archivo en red, CD-ROMS, disquetes, etc.
 
 Incluyendo sistemas de archivo en red, CD-ROMS, disquetes, etc.
 

-%description -l fr
-autofs est un démon qui monte automatiquement les systèmes de fichiers
-lorsqu'on les utilise et les démonte lorsqu'on ne les utilise plus.
-Cela inclus les systèmes de fichiers réseau, les CD-ROMs, les
+%description -l fr.UTF-8
+autofs est un démon qui monte automatiquement les systèmes de fichiers
+lorsqu'on les utilise et les démonte lorsqu'on ne les utilise plus.
+Cela inclus les systèmes de fichiers réseau, les CD-ROMs, les

 disquettes, etc.
 
 disquettes, etc.
 

-%description -l pl
-Autofs jest demonem, który montuje automatycznie systemy plików je¿eli
-je u¿ywasz i odmontowuje pó¼niej, je¿eli ich nie u¿ywasz. Mo¿e
-montowaæ sieciowy system plików, CD-romy, stacje dyskietek i inne.
+%description -l pl.UTF-8
+Autofs jest demonem, który montuje automatycznie systemy plików jeżeli
+je używasz i odmontowuje później, jeżeli ich nie używasz. Może
+montować sieciowy system plików, CD-romy, stacje dyskietek i inne.

 
 

-%description -l pt_BR
-O autofs é um servidor que monta automaticamente sistemas de arquivos
-quando estes forem usados, desmontando-os mais tarde quando não
+%description -l pt_BR.UTF-8
+O autofs é um servidor que monta automaticamente sistemas de arquivos
+quando estes forem usados, desmontando-os mais tarde quando não

 estiverem mais em uso. Incluindo sistemas de arquivo em rede, CD-ROMS,
 disquetes, etc.
 
 estiverem mais em uso. Incluindo sistemas de arquivo em rede, CD-ROMS,
 disquetes, etc.
 

-%description -l tr
-autofs, kullanýlan dosya sistemlerini gerek olunca kendiliðinden
-baðlar ve kullanýmlarý sona erince yine kendiliðinden çözer. Bu iþlem,
-að dosya sistemleri, CD-ROM'lar ve disketler üzerinde yapýlabilir.
+%description -l tr.UTF-8
+autofs, kullanılan dosya sistemlerini gerek olunca kendiliğinden
+bağlar ve kullanımları sona erince yine kendiliğinden çözer. Bu işlem,
+ağ dosya sistemleri, CD-ROM'lar ve disketler üzerinde yapılabilir.

 
 %package ldap
 Summary:       LDAP lookup module for autofs
 
 %package ldap
 Summary:       LDAP lookup module for autofs

-Summary(pl):   Modu³ LDAP dla autofs
-Summary(pt_BR):        Suporte a mapas LDAP para o pacote autofs
+Summary(pl.UTF-8):     Moduł LDAP dla autofs
+Summary(pt_BR.UTF-8):  Suporte a mapas LDAP para o pacote autofs

 Group:         Daemons
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 Group:         Daemons
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 


@@ -91,26 +105,38 @@ Requires:  %{name} = %{epoch}:%{version}-%{release}
 This package contains the autofs module necessary to use automount
 maps stored on an LDAP server.
 
 This package contains the autofs module necessary to use automount
 maps stored on an LDAP server.
 

-%description ldap -l pl
-Ten pakiet zawiera modu³ autofs potrzebny do u¿ywania map automounta
+%description ldap -l pl.UTF-8
+Ten pakiet zawiera moduł autofs potrzebny do używania map automounta

 trzymanych na serwerze LDAP.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 trzymanych na serwerze LDAP.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1

-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1

 
 %build
 
 %build

-chmod a+w configure
-%{__aclocal}

 %{__autoconf}
 %{__autoconf}

-%configure

 
 

-%{__make}
+export initdir=/etc/rc.d/init.d
+%configure \
+       --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="-fPIE %{rpmcflags}"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -123,64 +149,87 @@ install -d $RPM_BUILD_ROOT{/misc,/net,%{_sbindir},%{_libdir}/autofs,%{_mandir}/m
 install %{SOURCE1}     $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs
 
 install %{SOURCE2}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.master
 install %{SOURCE1}     $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs
 
 install %{SOURCE2}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.master

-install %{SOURCE3}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.misc
-install %{SOURCE4}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.mnt
-install %{SOURCE5}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.net
-install %{SOURCE6}     $RPM_BUILD_ROOT/etc/sysconfig/autofs
-mv $RPM_BUILD_ROOT/etc/auto.smb $RPM_BUILD_ROOT%{_sysconfdir}
+install %{SOURCE3}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.media
+install %{SOURCE4}     $RPM_BUILD_ROOT%{_sysconfdir}/auto.net
+install %{SOURCE5}     $RPM_BUILD_ROOT/etc/sysconfig/autofs

 
 

-touch $RPM_BUILD_ROOT%{_sysconfdir}/auto.{home,misc,var,tmp}
+touch $RPM_BUILD_ROOT%{_sysconfdir}/auto.{home,var,tmp}
+
+# replaced in PLD by auto.media
+rm $RPM_BUILD_ROOT%{_sysconfdir}/auto.misc

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add autofs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add autofs

-# triggerpostun would get called after %post
+# triggerpostun would get called after %%post

 if [ -f /var/lock/subsys/automount ]; then
 if [ -f /var/lock/subsys/automount ]; then

-       mv /var/lock/subsys/automount /var/lock/subsys/autofs
-fi
-if test -r /var/lock/subsys/autofs; then
-       /etc/rc.d/init.d/autofs restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/autofs start\" to start autofs daemon."
+       mv /var/lock/subsys/{automount,autofs}

 fi
 fi

+%service autofs restart "autofs daemon"
+%systemd_post autofs.service

 
 %preun
 if [ "$1" = "0" ]; then
 
 %preun
 if [ "$1" = "0" ]; then

+       %service autofs stop

        /sbin/chkconfig --del autofs
        /sbin/chkconfig --del autofs

-       if [ -f /var/lock/subsys/autofs ]; then
-               /etc/rc.d/init.d/autofs stop 1>&2
-       fi

 fi
 fi

+%systemd_preun autofs.service
+
+%postun
+%systemd_reload
+
+%triggerpostun -- autofs < 5.0.8-1
+%systemd_trigger autofs.service

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc README* CHANGELOG
-
-%attr(754,root,root) %config /etc/rc.d/init.d/autofs
+%doc CHANGELOG CREDITS README*

 %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/autofs
 %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.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.misc
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.mnt
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.media

 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.net
 %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(750,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/auto.net
 %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) /etc/rc.d/init.d/autofs
+%{systemdunitdir}/autofs.service

 %attr(755,root,root) %{_sbindir}/automount
 %attr(755,root,root) %{_sbindir}/automount

-
-%dir /misc

 %dir /net
 %dir /net

-

 %dir %{_libdir}/autofs
 %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]/*
 
 %{_mandir}/man[58]/*
 

+%if %{with ldap}

 %files ldap
 %defattr(644,root,root,755)
 %files ldap
 %defattr(644,root,root,755)

+%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_ldap.so

+%attr(755,root,root) %{_libdir}/autofs/lookup_ldaps.so
+%endif