[Pkg-shadow-commits] r1676 - in upstream/trunk: . lib src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-06 14:19:32 +0000 (Sun, 06 Jan 2008)
New Revision: 1676

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/Makefile.am
   upstream/trunk/src/Makefile.am
Log:
* 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).


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-06 13:57:17 UTC (rev 1675)
+++ upstream/trunk/ChangeLog	2008-01-06 14:19:32 UTC (rev 1676)
@@ -1,5 +1,17 @@
 2008-01-06  Nicolas François  <nicolas.francois at 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 at centraliens.net>
+
 	* lib/nscd.c, lib/nscd.h: Set the service parameter of
 	nscd_flush_cache() to const. This avoids a lot of warnings.
 	* lib/nscd.c: Include "nscd.h" to avoid inconsistent prototypes.

Modified: upstream/trunk/lib/Makefile.am
===================================================================
--- upstream/trunk/lib/Makefile.am	2008-01-06 13:57:17 UTC (rev 1675)
+++ upstream/trunk/lib/Makefile.am	2008-01-06 14:19:32 UTC (rev 1676)
@@ -6,7 +6,6 @@
 noinst_LTLIBRARIES = libshadow.la
 
 libshadow_la_LDFLAGS = -version-info 0:0:0
-libshadow_la_LIBADD = $(INTLLIBS) $(LIBCRYPT) $(LIBSKEY) $(LIBMD)
 
 libshadow_la_SOURCES = \
 	commonio.c \

Modified: upstream/trunk/src/Makefile.am
===================================================================
--- upstream/trunk/src/Makefile.am	2008-01-06 13:57:17 UTC (rev 1675)
+++ upstream/trunk/src/Makefile.am	2008-01-06 14:19:32 UTC (rev 1676)
@@ -50,16 +50,17 @@
 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 @@
 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)