Do not compile ypmatch with ypclnt.c, use glibc's implementation instead of it

This commit is contained in:
Karel Klic 2010-11-23 13:59:42 +01:00
parent ecaa219e35
commit ec87306b29
2 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,11 @@
diff -up yp-tools-2.12/src/Makefile.am.noypclnt yp-tools-2.12/src/Makefile.am
--- yp-tools-2.12/src/Makefile.am.noypclnt 2010-11-23 13:32:54.328891585 +0100
+++ yp-tools-2.12/src/Makefile.am 2010-11-23 13:33:02.167767691 +0100
@@ -21,7 +21,6 @@ yppasswd_SOURCES = yppasswd.c yppasswd_x
yppasswd_LDADD = ${LDADD} @LIBCRYPT@ @LIBCRACK@
yppasswd_CFLAGS = -DPASSWD_PROG=\"${PASSWD_PROG}\" \
-DCHFN_PROG=\"${CHFN_PROG}\" -DCHSH_PROG=\"${CHSH_PROG}\"
-ypmatch_SOURCES = ypmatch.c ypclnt.c
install-exec-hook:
ln -f ${DESTDIR}${bindir}/yppasswd ${DESTDIR}${bindir}/ypchsh

View File

@ -1,13 +1,18 @@
Summary: NIS (or YP) client programs Summary: NIS (or YP) client programs
Name: yp-tools Name: yp-tools
Version: 2.12 Version: 2.12
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
# Not sent to upstream
Patch0: yp-tools-2.11-shadow.patch Patch0: yp-tools-2.11-shadow.patch
# Not sent to upstream
Patch1: yp-tools-2.12-noypclnt.patch
Url: http://www.linux-nis.org/nis/yp-tools/index.html Url: http://www.linux-nis.org/nis/yp-tools/index.html
Requires: ypbind Requires: ypbind
# We need autoreconf for Patch1.
BuildRequires: autoconf, automake
%description %description
The Network Information Service (NIS) is a system which provides The Network Information Service (NIS) is a system which provides
@ -32,8 +37,10 @@ you'll need to install the ypserv package on one machine on the network.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .shadow %patch0 -p1 -b .shadow
%patch1 -p1 -b .noypclnt
%build %build
autoreconf
%configure --disable-domainname %configure --disable-domainname
make make
@ -53,6 +60,10 @@ make DESTDIR="$RPM_BUILD_ROOT" INSTALL_PROGRAM=install install
/var/yp/nicknames /var/yp/nicknames
%changelog %changelog
* Tue Nov 23 2010 Karel Klic <kklic@redhat.com> - 2.12-2
- Added patch that removes ypclnt.c from being compiled into
ypmatch (rhbz#546149)
* Fri Nov 19 2010 Karel Klic <kklic@redhat.com> - 2.12-1 * Fri Nov 19 2010 Karel Klic <kklic@redhat.com> - 2.12-1
- New upstream version - New upstream version