X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=autofs.spec;h=6bf7b9f17d579048f1f966e0f80623de77e6416d;hb=6ba35e064e0df5744b6a6a8bfe5819ad6748683c;hp=1a264e7373ff027aa7c2710865a8d8e1fb841e21;hpb=256c27a4fbdd84509efaeb0a9d6e6863477d87fe;p=packages%2Fautofs.git

diff --git a/autofs.spec b/autofs.spec
index 1a264e7..6bf7b9f 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -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,38 +12,45 @@ 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.3
-Release:	0.1
+Version:	5.1.4
+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:	27839fe6fa8105b2b7d31bc922fd7cf6
+Source0:	https://www.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.xz
+# Source0-md5:	5d35e3282e7a47ec1a5acaeebcc51db2
 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}-%{version}-ldap-page-control-configure-fix.patch
-Patch11:	ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-xfn-not-supported.patch
-Patch12:	ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-basedn-with-spaces-fix-3.patch
-Patch13:	ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-nfs4-tcp-only.patch
-Patch14:	ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-correct-ldap-lib.patch
-BuildRequires:	autoconf
+Patch1:		%{name}-makefile.patch
+Patch2:		%{name}-systemd-service.patch
+URL:		http://www.autofs.org/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	bind-devel
-BuildRequires:	krb5-devel
-BuildRequires:	openldap-devel >= 2.4.6
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	bison
+BuildRequires:	cyrus-sasl-devel >= 2
+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:	pkgconfig
+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
@@ -94,31 +103,35 @@ maps stored on an LDAP server.
 
 %description ldap -l pl.UTF-8
 Ten pakiet zawiera moduł autofs potrzebny do używania map automounta
-trzymanych na serwerze LDAP.
+przechowywanych na serwerze LDAP.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-
-#Official patches:
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
+%patch2 -p1
 
 %build
-#%{__aclocal}
-#%{__autoconf}
+%{__autoconf}
+
 export initdir=/etc/rc.d/init.d
+export piddir=/var/run
+export fifodir=/var/run
+export flagdir=/var/run
+export sssldir=%{_libdir}/sssd/modules
+export HAVE_SSS_AUTOFS=1
 %configure \
-	--with-confdir=%{_sysconfdir}
-
-%{__make} \
+	--enable-force-shutdown \
+	--with-confdir=%{_sysconfdir} \
+	--with-libtirpc \
+	--with-mapdir=%{_sysconfdir} \
+	--with-openldap%{!?with_ldap:=no} \
+	--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
@@ -132,14 +145,13 @@ 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.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}
+install %{SOURCE4}	$RPM_BUILD_ROOT%{_sysconfdir}/auto.net
+install %{SOURCE5}	$RPM_BUILD_ROOT/etc/sysconfig/autofs
 
 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
@@ -151,18 +163,28 @@ 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*
+%doc CHANGELOG COPYRIGHT 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}/autofs.conf
 %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
@@ -170,17 +192,47 @@ 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]*
-%{_mandir}/man[58]/*
-
+%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_sss.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_amd.so
+%attr(755,root,root) %{_libdir}/autofs/parse_hesiod.so
+%attr(755,root,root) %{_libdir}/autofs/parse_sun.so
+%{_mandir}/man5/auto.master.5*
+%{_mandir}/man5/autofs.5*
+%{_mandir}/man5/autofs.conf.5*
+%{_mandir}/man8/autofs.8*
+%{_mandir}/man8/automount.8*
+
+%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
+%{_mandir}/man5/autofs_ldap_auth.conf.5*
+%endif