From 8a1abbe80b748762d3e9d71befa9b574b553ba16 Mon Sep 17 00:00:00 2001
From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sun, 6 Jan 2008 14:19:32 +0000
Subject: [PATCH] * lib/Makefile.am: Do not link libshadow.la with the intl,
 crypt,   skey and md libraries... * src/Makefile.am: ...Specify for each
 binary which library is   required. skey and md are required for the binaries
 with   authentication of the user (chfn, chsh, login, passwd, su). intl   is
 required for all. mcrypt is required for user (chfn, chsh,   login, passwd,
 su, sulogin) and group (newgrp, gpasswd)   authentication and for the
 creation of passwords (chpasswd,   chgpasswd, gpasswd, newusers, passwd).

---
 ChangeLog       | 12 ++++++++++++
 lib/Makefile.am |  1 -
 src/Makefile.am | 26 ++++++++++++++------------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 415d8341..6a329d96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-01-06  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/Makefile.am: Do not link libshadow.la with the intl, crypt,
+	skey and md libraries...
+	* src/Makefile.am: ...Specify for each binary which library is
+	required. skey and md are required for the binaries with
+	authentication of the user (chfn, chsh, login, passwd, su). intl
+	is required for all. mcrypt is required for user (chfn, chsh,
+	login, passwd, su, sulogin) and group (newgrp, gpasswd)
+	authentication and for the creation of passwords (chpasswd,
+	chgpasswd, gpasswd, newusers, passwd).
+
 2008-01-06  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* lib/nscd.c, lib/nscd.h: Set the service parameter of
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bfdd52ef..c8adc921 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,6 @@ DEFS =
 noinst_LTLIBRARIES = libshadow.la
 
 libshadow_la_LDFLAGS = -version-info 0:0:0
-libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
 
 libshadow_la_SOURCES = \
 	commonio.c \
diff --git a/src/Makefile.am b/src/Makefile.am
index 76a99a01..e827fe09 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,16 +50,17 @@ noinst_PROGRAMS = id sulogin
 suidbins       = su
 suidubins      = chage chfn chsh expiry gpasswd newgrp passwd
 
-LDADD 	       = $(top_builddir)/libmisc/libmisc.a \
+LDADD          = $(INTLLIBS) \
+		 $(top_builddir)/libmisc/libmisc.a \
 		 $(top_builddir)/lib/libshadow.la
 AM_CPPFLAGS    = -DLOCALEDIR=\"$(datadir)/locale\"
 
 chage_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
-chfn_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
-gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX)
+chfn_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
+chgpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
+chsh_LDADD     = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
+chpasswd_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
+gpasswd_LDADD  = $(LDADD) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
 groupadd_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 groupdel_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 groupmems_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
@@ -67,21 +68,22 @@ groupmod_LDADD = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 grpck_LDADD    = $(LDADD) $(LIBSELINUX)
 grpconv_LDADD  = $(LDADD) $(LIBSELINUX)
 grpunconv_LDADD = $(LDADD) $(LIBSELINUX)
-login_SOURCES	= \
+login_SOURCES  = \
 	login.c \
 	login_nopam.c
-login_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT)
-newgrp_LDADD   = $(LDADD) $(LIBPAM) $(LIBAUDIT)
-newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX)
+login_LDADD    = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
+newgrp_LDADD   = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBCRYPT)
+newusers_LDADD = $(LDADD) $(LIBPAM) $(LIBSELINUX) $(LIBCRYPT)
 nologin_LDADD  =
-passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX)
+passwd_LDADD   = $(LDADD) $(LIBPAM) $(LIBCRACK) $(LIBAUDIT) $(LIBSELINUX) $(LIBCRYPT)
 pwck_LDADD     = $(LDADD) $(LIBSELINUX)
 pwconv_LDADD   = $(LDADD) $(LIBSELINUX)
 pwunconv_LDADD = $(LDADD) $(LIBSELINUX)
 su_SOURCES     = \
 	su.c \
 	suauth.c
-su_LDADD       = $(LDADD) $(LIBPAM)
+su_LDADD       = $(LDADD) $(LIBPAM) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
+sulogin_LDADD  = $(LDADD) $(LIBCRYPT)
 useradd_LDADD  = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 userdel_LDADD  = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)
 usermod_LDADD  = $(LDADD) $(LIBPAM) $(LIBAUDIT) $(LIBSELINUX)