From 6603f8b156b0f5c7a1632d54ffd0e077ba92f59b Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Tue, 29 Nov 2005 04:38:04 +0000 Subject: [PATCH] Standardized the Linux-PAM package and entity names git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5319 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- basicnet/netlibs/wvstreams.xml | 2 +- basicnet/netprogs/inetutils.xml | 2 +- basicnet/netprogs/ncpfs.xml | 2 +- general.ent | 2 +- general/genutils/screen.xml | 2 +- general/genutils/xscreensaver.xml | 2 +- general/sysutils/fcron.xml | 3 +- gnome/add/gdm.xml | 2 +- gnome/add/gnome-utils.xml | 2 +- introduction/welcome/credits.xml | 2 +- kde/add/kdeadmin.xml | 2 +- kde/core/kdebase.xml | 2 +- postlfs/security/cyrus-sasl.xml | 2 +- postlfs/security/heimdal.xml | 2 +- postlfs/security/linux_pam.xml | 64 +++++++++++++++---------------- postlfs/security/mitkrb.xml | 2 +- postlfs/security/shadow.xml | 4 +- pst/printing/cups.xml | 2 +- server/databases/postgresql.xml | 2 +- server/mail/courier.xml | 2 +- server/mail/exim.xml | 2 +- server/mail/qpopper.xml | 2 +- server/major/openssh.xml | 2 +- server/major/proftpd.xml | 2 +- server/major/samba3.xml | 2 +- server/major/vsftpd.xml | 2 +- x/installing/xfree86.xml | 2 +- x/installing/xorg.xml | 2 +- xsoft/suites/openoffice.xml | 4 +- 29 files changed, 62 insertions(+), 63 deletions(-) diff --git a/basicnet/netlibs/wvstreams.xml b/basicnet/netlibs/wvstreams.xml index f13dc8e123..99a248b45a 100644 --- a/basicnet/netlibs/wvstreams.xml +++ b/basicnet/netlibs/wvstreams.xml @@ -72,7 +72,7 @@ , , , - , + , , , , diff --git a/basicnet/netprogs/inetutils.xml b/basicnet/netprogs/inetutils.xml index 25e1a16a0c..8d52a80710 100644 --- a/basicnet/netprogs/inetutils.xml +++ b/basicnet/netprogs/inetutils.xml @@ -69,7 +69,7 @@ Inetutils Dependencies Optional - , + , , krb4, and or diff --git a/basicnet/netprogs/ncpfs.xml b/basicnet/netprogs/ncpfs.xml index c8ec784f80..896b2b1f3f 100644 --- a/basicnet/netprogs/ncpfs.xml +++ b/basicnet/netprogs/ncpfs.xml @@ -58,7 +58,7 @@ NCPFS Dependencies Optional - and + and diff --git a/general.ent b/general.ent index ee4003ac64..74df873ce5 100644 --- a/general.ent +++ b/general.ent @@ -36,7 +36,7 @@ - + diff --git a/general/genutils/screen.xml b/general/genutils/screen.xml index e7237dcc9f..9039ae69db 100644 --- a/general/genutils/screen.xml +++ b/general/genutils/screen.xml @@ -63,7 +63,7 @@ Screen Dependencies Optional - + diff --git a/general/genutils/xscreensaver.xml b/general/genutils/xscreensaver.xml index 75d1ce1a50..cc3486b95f 100644 --- a/general/genutils/xscreensaver.xml +++ b/general/genutils/xscreensaver.xml @@ -73,7 +73,7 @@ GLE, Netpbm, XDaliClock, - , + , krb4, and or diff --git a/general/sysutils/fcron.xml b/general/sysutils/fcron.xml index 76153d4abd..d8be0979e1 100644 --- a/general/sysutils/fcron.xml +++ b/general/sysutils/fcron.xml @@ -61,8 +61,7 @@ MTA, text editor (default is vi from the package), - , - SELinux, + , diff --git a/gnome/add/gdm.xml b/gnome/add/gdm.xml index 8de9b13bf9..646c6ac65d 100644 --- a/gnome/add/gdm.xml +++ b/gnome/add/gdm.xml @@ -63,7 +63,7 @@ Optional - and + and diff --git a/gnome/add/gnome-utils.xml b/gnome/add/gnome-utils.xml index 7f78cabb9e..b79821ec48 100644 --- a/gnome/add/gnome-utils.xml +++ b/gnome/add/gnome-utils.xml @@ -62,7 +62,7 @@ Optional - (only if consolehelper is also installed) + (only if consolehelper is also installed) and diff --git a/introduction/welcome/credits.xml b/introduction/welcome/credits.xml index b032275bb2..2025f05508 100644 --- a/introduction/welcome/credits.xml +++ b/introduction/welcome/credits.xml @@ -162,7 +162,7 @@ eel, imlib, intltool, lame, libao, libart_lgpl, libbonobo, libbonoboui, libgail-gnome, libglade2, libgnome, libgnomecanvas, libgnomeprint, libgnomeprintui, libgnomeui, libgsf, libgtkhtml, libgtop, libIDL, libogg, - librep, librsvg, libvorbis, libwnck, libxml2, libxslt, LPRng, Linux_PAM, + librep, librsvg, libvorbis, libwnck, libxml2, libxslt, LPRng, Linux-PAM, metacity, MIT Kerberos 5, MPlayer, mutt, nautilus, oaf, OpenJade, OpenSP, OpenSSH, ORBit, ORBit2, pan, Pango, pcre, pkgconfig, postfix, procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, sgml-common, diff --git a/kde/add/kdeadmin.xml b/kde/add/kdeadmin.xml index 6ad51ca86c..407d533d8a 100644 --- a/kde/add/kdeadmin.xml +++ b/kde/add/kdeadmin.xml @@ -60,7 +60,7 @@ and Optional - and + and LILO diff --git a/kde/core/kdebase.xml b/kde/core/kdebase.xml index 335bd14f49..cb7f446aaf 100644 --- a/kde/core/kdebase.xml +++ b/kde/core/kdebase.xml @@ -70,7 +70,7 @@ Optional , , - , + , , , , diff --git a/postlfs/security/cyrus-sasl.xml b/postlfs/security/cyrus-sasl.xml index 7da14e9baa..4ba371c6d7 100644 --- a/postlfs/security/cyrus-sasl.xml +++ b/postlfs/security/cyrus-sasl.xml @@ -73,7 +73,7 @@ Optional - , + , , or , , diff --git a/postlfs/security/heimdal.xml b/postlfs/security/heimdal.xml index 653a1fbffb..ff1ba7f1e1 100644 --- a/postlfs/security/heimdal.xml +++ b/postlfs/security/heimdal.xml @@ -84,7 +84,7 @@ Optional - , + , , X ( or ), (compiled with the heimdal diff --git a/postlfs/security/linux_pam.xml b/postlfs/security/linux_pam.xml index f871ca13ea..8deb69d13a 100644 --- a/postlfs/security/linux_pam.xml +++ b/postlfs/security/linux_pam.xml @@ -4,26 +4,26 @@ %general-entities; - - - - - - + + + + + + ]> - - + + $LastChangedBy$ $Date$ - Linux-PAM-&Linux_PAM-version; + Linux-PAM-&linux-pam-version; - - PAM(Linux) + + Linux-PAM @@ -37,22 +37,22 @@ Package Information - Download (HTTP): + Download (HTTP): - Download (FTP): + Download (FTP): - Download MD5 sum: &Linux_PAM-md5sum; + Download MD5 sum: &linux-pam-md5sum; - Download size: &Linux_PAM-size; + Download size: &linux-pam-size; - Estimated disk space required: &Linux_PAM-buildsize; + Estimated disk space required: &linux-pam-buildsize; - Estimated build time: &Linux_PAM-time; + Estimated build time: &linux-pam-time; @@ -61,7 +61,7 @@ Documentation Optional documentation: + url="http://www.kernel.org/pub/linux/libs/pam/pre/library/Linux-PAM-&linux-pam-version;-docs.tar.bz2"/> @@ -70,7 +70,7 @@ Patches Required patch: + url="&patch-root;/Linux-PAM-&linux-pam-version;-gcc4-1.patch"/> @@ -94,7 +94,7 @@ sed -i 's|DICT_DIR_CANDIDATES="|&/lib /lib/cracklib |' \ configure && -patch -Np1 -i ../Linux-PAM-&Linux_PAM-version;-gcc4-1.patch && +patch -Np1 -i ../Linux-PAM-&linux-pam-version;-gcc4-1.patch && ./configure --enable-static-libpam --with-mailspool=/var/mail \ --enable-read-both-confs --sysconfdir=/etc \ --mandir=/usr/share/man && @@ -103,23 +103,23 @@ make If you downloaded the documentation and wish to install it, unpack the tarball into the doc directory: -tar -xf ../Linux-PAM-&Linux_PAM-version;-docs.tar.bz2 -C doc +tar -xf ../Linux-PAM-&linux-pam-version;-docs.tar.bz2 -C doc Now, as the root user: make install && mv -v /lib/libpam.a /lib/libpam_misc.a /lib/libpamc.a /usr/lib && rm -v /lib/libpam{,c,_misc}.so && -ln -v -sf ../../lib/libpam.so.&Linux_PAM-version; /usr/lib/libpam.so && -ln -v -sf ../../lib/libpam_misc.so.&Linux_PAM-version; /usr/lib/libpam_misc.so && -ln -v -sf ../../lib/libpamc.so.&Linux_PAM-version; /usr/lib/libpamc.so +ln -v -sf ../../lib/libpam.so.&linux-pam-version; /usr/lib/libpam.so && +ln -v -sf ../../lib/libpam_misc.so.&linux-pam-version; /usr/lib/libpam_misc.so && +ln -v -sf ../../lib/libpamc.so.&linux-pam-version; /usr/lib/libpamc.so Install the documentation using the following commands: -install -v -d -m755 /usr/share/doc/Linux-PAM-&Linux_PAM-version; && +install -v -d -m755 /usr/share/doc/Linux-PAM-&linux-pam-version; && for DOCTYPE in html ps specs txts do - cp -v -R doc/$DOCTYPE /usr/share/doc/Linux-PAM-&Linux_PAM-version; + cp -v -R doc/$DOCTYPE /usr/share/doc/Linux-PAM-&linux-pam-version; done @@ -164,15 +164,15 @@ done /etc/pam.d/* or /etc/pam.conf - + /etc/security/* - + /etc/pam.d/* - + /etc/pam.conf @@ -250,7 +250,7 @@ other password required pam_unix.so nullok checks user passwords that are stored in read protected databases. - + unix_chkpwd @@ -261,7 +261,7 @@ other password required pam_unix.so nullok is used to view or manipulate the faillog file. - + pam_tally @@ -272,7 +272,7 @@ other password required pam_unix.so nullok provides the interfaces between applications and the PAM modules. - + libpam.[so,a] diff --git a/postlfs/security/mitkrb.xml b/postlfs/security/mitkrb.xml index ecc542deb2..38822b056b 100644 --- a/postlfs/security/mitkrb.xml +++ b/postlfs/security/mitkrb.xml @@ -62,7 +62,7 @@ Optional (services servers only), - (for xdm based logins) and + (for xdm based logins) and (alternative for krb5kdc password database) diff --git a/postlfs/security/shadow.xml b/postlfs/security/shadow.xml index 935e3d33ff..0dc8131468 100644 --- a/postlfs/security/shadow.xml +++ b/postlfs/security/shadow.xml @@ -62,7 +62,7 @@ Patch to fix several invalid warning messages when used with - Linux_PAM: Linux-PAM: @@ -71,7 +71,7 @@ Shadow Dependencies Required - + diff --git a/pst/printing/cups.xml b/pst/printing/cups.xml index 9719171edc..ca171a6a88 100644 --- a/pst/printing/cups.xml +++ b/pst/printing/cups.xml @@ -79,7 +79,7 @@ libgcrypt and opencdk, in that order), - , + , , , , diff --git a/server/databases/postgresql.xml b/server/databases/postgresql.xml index 099782c835..1440160764 100644 --- a/server/databases/postgresql.xml +++ b/server/databases/postgresql.xml @@ -70,7 +70,7 @@ url="&patch-root;/postgresql-&postgresql-version;-dsssl_fix-1.patch"/> , , , - , + , , , , diff --git a/server/mail/courier.xml b/server/mail/courier.xml index 7337b3877c..53b08ffd37 100644 --- a/server/mail/courier.xml +++ b/server/mail/courier.xml @@ -65,7 +65,7 @@ Optional or , - , + , , , , diff --git a/server/mail/exim.xml b/server/mail/exim.xml index aefe59a2c2..da759687dd 100644 --- a/server/mail/exim.xml +++ b/server/mail/exim.xml @@ -79,7 +79,7 @@ , , and - + diff --git a/server/mail/qpopper.xml b/server/mail/qpopper.xml index 2464a0c849..54ff698c23 100644 --- a/server/mail/qpopper.xml +++ b/server/mail/qpopper.xml @@ -62,7 +62,7 @@ Optional , , - , and + , and or diff --git a/server/major/openssh.xml b/server/major/openssh.xml index 082222b449..d6c67e186c 100644 --- a/server/major/openssh.xml +++ b/server/major/openssh.xml @@ -62,7 +62,7 @@ Optional - , + , , X ( or ), or , diff --git a/server/major/proftpd.xml b/server/major/proftpd.xml index 505b4997f1..76c742e540 100644 --- a/server/major/proftpd.xml +++ b/server/major/proftpd.xml @@ -58,7 +58,7 @@ ProFTPD Dependencies Optional - + diff --git a/server/major/samba3.xml b/server/major/samba3.xml index 1b44bdb7e5..7b9d71741e 100644 --- a/server/major/samba3.xml +++ b/server/major/samba3.xml @@ -72,7 +72,7 @@ Optional , - , + , , , or , diff --git a/server/major/vsftpd.xml b/server/major/vsftpd.xml index b6e3f4df45..73f5831796 100644 --- a/server/major/vsftpd.xml +++ b/server/major/vsftpd.xml @@ -58,7 +58,7 @@ vsFTPD Dependencies Optional - , + , , and diff --git a/x/installing/xfree86.xml b/x/installing/xfree86.xml index 3d0ca7ff3f..f8dfd3e5c1 100644 --- a/x/installing/xfree86.xml +++ b/x/installing/xfree86.xml @@ -74,7 +74,7 @@ Optional - ; the + ; the following packages are included in the XFree86 package, however they are updated more often than the XFree86 package and are highly recommended: diff --git a/x/installing/xorg.xml b/x/installing/xorg.xml index fe5057de2e..11c0726b7b 100644 --- a/x/installing/xorg.xml +++ b/x/installing/xorg.xml @@ -101,7 +101,7 @@ Optional - + Download Instructions diff --git a/xsoft/suites/openoffice.xml b/xsoft/suites/openoffice.xml index aa0e0e21f5..3a46de994b 100644 --- a/xsoft/suites/openoffice.xml +++ b/xsoft/suites/openoffice.xml @@ -79,7 +79,7 @@ Optional patch if - Linux-PAM-&Linux_PAM-version; is not + Linux-PAM-&linux-pam-version; is not installed: @@ -132,7 +132,7 @@ Optional , - , + , ,