commit 36a5fbe51835b6b7acabde1c2e35afc8ef311cf8 Author: Marcin Krol <h...@tld-linux.org> Date: Mon Apr 16 16:55:16 2018 +0000
- package mkpasswd as mkpwdhash to avoid conflict with expect Note: whois mkpasswd is very usefull hash generator using crypt(3) while expect mkpasswd is just simple random password generator whois-mkpwdhash.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ whois.spec | 10 +++++++--- 2 files changed, 60 insertions(+), 3 deletions(-) --- diff --git a/whois.spec b/whois.spec index 789cd89..0a67e5a 100644 --- a/whois.spec +++ b/whois.spec @@ -4,13 +4,14 @@ Summary(ru.UTF-8): Улучшенный клиент WHOIS Summary(uk.UTF-8): Покращений клієнт WHOIS Name: whois Version: 5.3.0 -Release: 1 +Release: 2 License: GPL v2+ Group: Networking/Utilities Source0: http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz # Source0-md5: 2355e5f4d9b91d4ec5ab608c1ea37a9e Patch0: %{name}-idn.patch Patch1: %{name}-config.patch +Patch2: %{name}-mkpwdhash.patch URL: https://github.com/rfc1036/whois BuildRequires: gettext-tools BuildRequires: libidn2-devel @@ -46,6 +47,7 @@ większosci zapytań. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 # Makefile vs po/Makefile mismatch echo 'install-pos: install' >> po/Makefile @@ -61,11 +63,11 @@ echo 'install-pos: install' >> po/Makefile %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1} -%{__make} install-whois install-pos \ +%{__make} install install-pos \ BASEDIR=$RPM_BUILD_ROOT \ prefix=%{_prefix} -cp -p whois.conf $RPM_BUILD_ROOT%{_sysconfdir} +%{__cp} -p whois.conf $RPM_BUILD_ROOT%{_sysconfdir} %find_lang %{name} @@ -75,7 +77,9 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) %doc README debian/changelog +%attr(755,root,root) %{_bindir}/mkpwdhash %attr(755,root,root) %{_bindir}/whois %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/whois.conf +%{_mandir}/man1/mkpwdhash.1* %{_mandir}/man1/whois.1* %{_mandir}/man5/whois.conf.5* diff --git a/whois-mkpwdhash.patch b/whois-mkpwdhash.patch new file mode 100644 index 0000000..e7d9087 --- /dev/null +++ b/whois-mkpwdhash.patch @@ -0,0 +1,53 @@ +diff -ur whois-5.3.0.orig/Makefile whois-5.3.0/Makefile +--- whois-5.3.0.orig/Makefile 2018-01-21 00:23:45.000000000 +0000 ++++ whois-5.3.0/Makefile 2018-04-16 16:50:58.932233643 +0000 +@@ -127,8 +127,8 @@ + install-mkpasswd: mkpasswd + $(INSTALL) -d $(BASEDIR)$(prefix)/bin/ + $(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/ +- $(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/ +- $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/ ++ $(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/mkpwdhash ++ $(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/mkpwdhash.1 + + install-pos: + cd po && $(MAKE) install +diff -ur whois-5.3.0.orig/mkpasswd.1 whois-5.3.0/mkpasswd.1 +--- whois-5.3.0.orig/mkpasswd.1 2013-03-30 01:31:39.000000000 +0000 ++++ whois-5.3.0/mkpasswd.1 2018-04-16 16:51:17.853233430 +0000 +@@ -1,13 +1,13 @@ +-.TH MKPASSWD 1 "21 March 2008" "Marco d'Itri" "Debian GNU/Linux" ++.TH mkpwdhash 1 "21 March 2008" "Marco d'Itri" "Debian GNU/Linux" + .SH NAME +-mkpasswd \- Overfeatured front end to crypt(3) ++mkpwdhash \- Overfeatured front end to crypt(3) + .SH SYNOPSIS +-.B mkpasswd ++.B mkpwdhash + .BR PASSWORD + .BR SALT + .PP + .SH DESCRIPTION +-.B mkpasswd ++.B mkpwdhash + encrypts the given password with the + .BR crypt(3) + libc function using the given salt. +@@ -37,7 +37,7 @@ + .B -s, --stdin + Like \fI--password-fd=0\fP. + .SH "ENVIRONMENT" +-.IP "MKPASSWD_OPTIONS" ++.IP "mkpwdhash_OPTIONS" + A list of options which will be evalued before the ones specified on the + command line. + .SH BUGS +@@ -51,7 +51,7 @@ + .IR crypt(3), + .IR getpass(3) + .SH AUTHOR +-.B mkpasswd ++.B mkpwdhash + and this man page were written by Marco d'Itri <\f...@linux.it\fP> + and are licensed under the terms of the GNU General Public License, + version 2 or higher. ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/whois.git/commitdiff/36a5fbe51835b6b7acabde1c2e35afc8ef311cf8 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit