From 0e6d8bda792101b54a83e63d708e8314b8629f9d Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 03:20:15 +0000 Subject: auto-import changelog data from autofs-3.1.7-14.src.rpm Fri Mar 02 2001 Nalin Dahyabhai - rebuild in new environment Tue Feb 27 2001 Preston Brown - noreplace the auto.misc file Mon Feb 26 2001 Nalin Dahyabhai - require /etc/redhat-release, which the init script uses to figure out that we're running under Red Hat Linux Tue Feb 20 2001 Nalin Dahyabhai - fix init script after i18n changes Fri Feb 16 2001 Nalin Dahyabhai - more init script i18n changes (#26520) Tue Feb 06 2001 Nalin Dahyabhai - use a helper binary to look up LDAP auto.master information (the script can't parse base64) Fri Feb 02 2001 Nalin Dahyabhai - remove the gprintf calls in the init script Tue Jan 23 2001 Nalin Dahyabhai - gettextize the init script Sat Jan 20 2001 Nalin Dahyabhai - tweak the files list (input from katzj@linuxpower.org) Thu Jan 18 2001 Nalin Dahyabhai - handle multiple return values correctly in the LDAP lookup module - start by default again Wed Jan 17 2001 Nalin Dahyabhai - change start priority to match amd to work on NFS-mounted /usr (#23522) - don't start by default unless the admin switches us on - use -fPIC instead of -fpic for modules and honor other RPM_OPT_FLAGS - gettextize the init script Tue Jan 09 2001 Nalin Dahyabhai - fix option parsing in lookup_multi (I think) - fix multi option handling in our hacked-up init script (reported by Thiago Bartolomei on the autofs mailing list) Wed Dec 06 2000 Nalin Dahyabhai - update to 3.1.7 - add the man pages back in (fell out in 3.1.6) Tue Nov 28 2000 Nalin Dahyabhai - don't require /etc/auto.master to be there to start Mon Nov 27 2000 Nalin Dahyabhai - update to 3.1.6 - disable hesiod support because the new bind-devel doesn't include it - try to use nsswitch.conf for getting the contents of auto.master - only convert YP map names auto_home and auto_mnt Fri Sep 08 2000 Nalin Dahyabhai - add -lresolv to build properly with OpenLDAP 2 --- diff --git a/.cvsignore b/.cvsignore index ce6b735..6915d6c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -autofs-3.1.5.tar.bz2 -autofs-3.1.6-pre2.patch.bz2 +autofs-3.1.7.tar.bz2 diff --git a/autofs.spec b/autofs.spec index f3ddce3..93a7176 100644 --- a/autofs.spec +++ b/autofs.spec @@ -1,26 +1,28 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs -Version: 3.1.5 -Release: 5 +Version: 3.1.7 +Release: 14 Epoch: 1 Copyright: GPL Group: System Environment/Daemons Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/autofs-%{version}.tar.bz2 +Source1: autofs-ldap-auto-master.c Patch0: autofs-3.1.6-doc.patch Patch1: autofs-3.1.4-loop.patch Patch2: autofs-3.1.4-modules.patch -Patch3: autofs-3.1.5-hesiod-bind.patch -Patch4: autofs-3.1.5-init.patch -Patch5: autofs-3.1.4-linux-2.3.patch -Patch6: autofs-4.0.0-ldap.patch -Patch7: autofs-4.0.0-open_max.patch -Patch8: autofs-4.0.0-clean.patch -Patch9: autofs-4.0.0-initialize.patch -Patch10: ftp://ftp.kernel.org/pub/linux/daemons/autofs/testing-v3/autofs-3.1.6-pre2.patch.bz2 +Patch3: autofs-3.1.7-init.patch +Patch4: autofs-3.1.4-linux-2.3.patch +Patch5: autofs-4.0.0-open_max.patch +Patch6: autofs-3.1.5-openldap2.patch +Patch7: autofs-3.1.5-hesiod-bind.patch +Patch8: autofs-3.1.7-multiargs.patch +Patch9: autofs-3.1.7-fpic.patch +Patch10: autofs-3.1.7-multiple.patch Buildroot: %{_tmppath}/%{name}-tmp -BuildPrereq: bind-devel, openldap-devel -Prereq: /sbin/chkconfig, /etc/init.d -Requires: /bin/bash, mktemp, sed, textutils, sh-utils, grep, /bin/ps +BuildPrereq: openldap-devel, perl +Prereq: /sbin/chkconfig +Requires: /bin/bash, mktemp, sed, gawk, textutils, sh-utils, grep, /bin/ps +Requires: /etc/redhat-release Obsoletes: autofs-ldap %description @@ -35,31 +37,37 @@ network, you should install autofs. %prep %setup -q -%patch10 -p1 -b .pre1 %patch0 -p1 -b .doc %patch1 -p1 -b .loop %patch2 -p1 -b .modules -%patch3 -p1 -b .hesiod-bind -%patch4 -p1 -b .init -%patch5 -p1 -b .linux-2.3 -#%patch6 -p1 -b .ldap -%patch7 -p1 -b .open_max -#%patch8 -p1 -b .clean -#%patch9 -p1 -b .initialize +%patch3 -p1 -b .init +%patch4 -p1 -b .linux-2.3 +%patch5 -p1 -b .open_max +%patch6 -p1 -b .openldap2 +#Aaargh! BIND 9 doesn't include a hesiod implementation! +#%patch7 -p1 -b .hesiod-bind +%patch8 -p1 -b .multiargs +%patch9 -p1 -b .fpic +%patch10 -p1 -b .multiple chmod u+w configure autoconf +env LANG=C perl -pi -e 's|^CFLAGS =.*|CFLAGS = \$\(RPM_OPT_FLAGS\)|g' Makefile.rules %build -CFLAGS=-ggdb; export CFLAGS -%configure --with-hesiod=/usr/lib/bind --with-openldap=/usr +%configure --without-hesiod --with-openldap=/usr make +%{__cc} \ + -o autofs-ldap-auto-master \ + $RPM_OPT_FLAGS \ + $RPM_SOURCE_DIR/autofs-ldap-auto-master.c \ + -lldap -llber %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -mkdir -p $RPM_BUILD_ROOT%{_libdir}/autofs -mkdir -p $RPM_BUILD_ROOT%{_mandir}/{man5,man8} -mkdir -p $RPM_BUILD_ROOT%{_sbindir} +mkdir -p -m755 $RPM_BUILD_ROOT/etc/rc.d/init.d +mkdir -p -m755 $RPM_BUILD_ROOT%{_libdir}/autofs +mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/{man5,man8} +mkdir -p -m755 $RPM_BUILD_ROOT%{_sbindir} %{makeinstall} autofslibdir=$RPM_BUILD_ROOT%{_libdir}/autofs install -m 755 samples/rc.autofs $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs @@ -68,6 +76,7 @@ install -m 644 samples/auto.misc $RPM_BUILD_ROOT/etc #install -m 755 samples/auto.net $RPM_BUILD_ROOT/etc/auto.net install -m 755 -d $RPM_BUILD_ROOT/misc #install -m 755 -d $RPM_BUILD_ROOT/net +install -m 755 autofs-ldap-auto-master $RPM_BUILD_ROOT%{_libdir}/autofs/ %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -85,26 +94,33 @@ if [ "$1" = 0 ] ; then /sbin/service autofs stop > /dev/null 2>&1 chkconfig --del autofs fi -exit 0 %files %defattr(-,root,root) %doc COPYING COPYRIGHT NEWS README* TODO %config /etc/rc.d/init.d/autofs %config(noreplace) /etc/auto.master -%config(missingok) /etc/auto.misc +%config(noreplace,missingok) /etc/auto.misc %{_sbindir}/automount %dir %{_libdir}/autofs +%{_libdir}/autofs/autofs-ldap-auto-master %{_libdir}/autofs/lookup_file.so -%{_libdir}/autofs/lookup_hesiod.so +#%{_libdir}/autofs/lookup_hesiod.so +%{_libdir}/autofs/lookup_ldap.so %{_libdir}/autofs/lookup_multi.so %{_libdir}/autofs/lookup_nisplus.so -%{_libdir}/autofs/lookup_ldap.so %{_libdir}/autofs/lookup_program.so %{_libdir}/autofs/lookup_userhome.so %{_libdir}/autofs/lookup_yp.so -%{_libdir}/autofs/mount* -%{_libdir}/autofs/parse* +%{_libdir}/autofs/mount_afs.so +%{_libdir}/autofs/mount_autofs.so +%{_libdir}/autofs/mount_bind.so +%{_libdir}/autofs/mount_changer.so +%{_libdir}/autofs/mount_ext2.so +%{_libdir}/autofs/mount_generic.so +%{_libdir}/autofs/mount_nfs.so +#%{_libdir}/autofs/parse_hesiod.so +%{_libdir}/autofs/parse_sun.so %{_mandir}/*/* %dir /misc @@ -112,6 +128,66 @@ exit 0 #%dir /net %changelog +* Fri Mar 2 2001 Nalin Dahyabhai +- rebuild in new environment + +* Tue Feb 27 2001 Preston Brown +- noreplace the auto.misc file + +* Mon Feb 26 2001 Nalin Dahyabhai +- require /etc/redhat-release, which the init script uses to figure out + that we're running under Red Hat Linux + +* Tue Feb 20 2001 Nalin Dahyabhai +- fix init script after i18n changes + +* Fri Feb 16 2001 Nalin Dahyabhai +- more init script i18n changes (#26520) + +* Tue Feb 6 2001 Nalin Dahyabhai +- use a helper binary to look up LDAP auto.master information (the script + can't parse base64) + +* Fri Feb 2 2001 Nalin Dahyabhai +- remove the gprintf calls in the init script + +* Mon Jan 23 2001 Nalin Dahyabhai +- gettextize the init script + +* Sat Jan 20 2001 Nalin Dahyabhai +- tweak the files list (input from katzj@linuxpower.org) + +* Thu Jan 18 2001 Nalin Dahyabhai +- handle multiple return values correctly in the LDAP lookup module +- start by default again + +* Wed Jan 17 2001 Nalin Dahyabhai +- change start priority to match amd to work on NFS-mounted /usr (#23522) +- don't start by default unless the admin switches us on +- use -fPIC instead of -fpic for modules and honor other RPM_OPT_FLAGS +- gettextize the init script + +* Tue Jan 9 2001 Nalin Dahyabhai +- fix option parsing in lookup_multi (I think) +- fix multi option handling in our hacked-up init script (reported by Thiago + Bartolomei on the autofs mailing list) + +* Wed Dec 6 2000 Nalin Dahyabhai +- update to 3.1.7 +- add the man pages back in (fell out in 3.1.6) + +* Tue Nov 28 2000 Nalin Dahyabhai +- don't require /etc/auto.master to be there to start + +* Mon Nov 27 2000 Nalin Dahyabhai +- update to 3.1.6 +- disable hesiod support because the new bind-devel doesn't include it +- try to use nsswitch.conf for getting the contents of auto.master +- only convert YP map names auto_home and auto_mnt + +* Fri Sep 8 2000 Nalin Dahyabhai +- add -lresolv to build properly with OpenLDAP 2 + * Wed Aug 23 2000 Nalin Dahyabhai - convert YP map names that start with "auto_" to "auto." (#16753) diff --git a/sources b/sources index 39bbb10..f778733 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ece68e3632584ae308bb4204574596c1 autofs-3.1.5.tar.bz2 -f47b303d67c7a7fae5f0edf26156efb3 autofs-3.1.6-pre2.patch.bz2 +4f602f82442b48ce9c2e0005d59c3408 autofs-3.1.7.tar.bz2