Author: djrzulf Date: Fri Mar 4 10:06:00 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - NFY,
---- Files affected: SPECS: apache1.spec (1.78 -> 1.79) ---- Diffs: ================================================================ Index: SPECS/apache1.spec diff -u SPECS/apache1.spec:1.78 SPECS/apache1.spec:1.79 --- SPECS/apache1.spec:1.78 Tue Mar 1 00:00:44 2005 +++ SPECS/apache1.spec Fri Mar 4 11:05:54 2005 @@ -1,7 +1,7 @@ # $Revision$, $Date$ # TODO # - split *all* modules to subpackages? -# +# - polish description and summary at package htpasswd # Conditional build: %bcond_with rewrite_ldap # enable ldap map support for mod_rewrite (alpha) %bcond_without ipv6 # disable IPv6 support @@ -30,7 +30,7 @@ Summary(zh_CN): Internet ÉĎÓŚÓĂ×îšăˇşľÄ Web ˇţÎńłĚĐňĄŁ Name: apache1 Version: 1.3.33 -Release: 3.2 +Release: 3.3 License: Apache Group Group: Networking/Daemons Source0: http://www.apache.org/dist/httpd/apache_%{version}.tar.gz @@ -411,6 +411,7 @@ Summary(pl): Moduł autentykacji użytkownika przy użyciu plików tekstowych dla Apache Group: Networking/Daemons Requires: %{name}(EAPI) = %{version}-%{release} +Requires: htpasswd Provides: apache(mod_auth) = %{version}-%{release} Obsoletes: apache-mod_auth < 2.0.0 @@ -766,6 +767,31 @@ Moduł umożliwia na dynamiczne konfigurowanie masowej ilości serwerów wirtualnych. +%package -n htpasswd-%{name} +Summary: Apache1 htpasswd utility +Group: Networking/Utilities +Provides: htpasswd +Obsoletes: htpasswd-apache2 +Obsoletes: htpasswd-thttpd + +%description -n htpasswd-%{name} +htpasswd from Apache1 + +Usage: + htpasswd [-cmdpsD] passwordfile username + htpasswd -b[cmdpsD] passwordfile username password + + htpasswd -n[mdps] username + htpasswd -nb[mdps] username password + -c Create a new file. + -n Don't update file; display results on stdout. + -m Force MD5 encryption of the password. + -d Force CRYPT encryption of the password (default). + -p Do not encrypt the password (plaintext). + -s Force SHA encryption of the password. + -b Use the password from the command line rather than prompting for it. + -D Delete the specified user. + %prep %setup -q -n apache_%{version} -a3 %patch0 -p1 @@ -918,6 +944,9 @@ ln -s %{_libexecdir} $RPM_BUILD_ROOT%{_sysconfdir}/modules ln -s /var/log/apache $RPM_BUILD_ROOT%{_sysconfdir}/logs +#htpasswd +ln -sf ln -sf %{_bindir}/htpasswd $RPM_BUILD_ROOT%{_sbindir}/ + %clean rm -rf $RPM_BUILD_ROOT @@ -1738,8 +1767,10 @@ %defattr(644,root,root,755) %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/conf.d/*_mod_auth.conf %attr(755,root,root) %{_libexecdir}/mod_auth.so -# FIXME apache2 puts in sbin + +%files -n htpasswd-%{name} %attr(755,root,root) %{_bindir}/htpasswd +%{_sbindir}/htpasswd %{_mandir}/man1/htpasswd.1* %files mod_auth_anon @@ -1846,6 +1877,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.79 2005/03/04 10:05:54 djrzulf +- NFY, + Revision 1.78 2005/02/28 23:00:44 glen - make -j1 (on install stage) for distcc run ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/apache1.spec?r1=1.78&r2=1.79&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
