lib: Merge libmisc into libshadow

The separation was unnecessary, and caused build problems. Let's go wild and obliterate the library. The files are moved to libshadow. Scripted change: $ find libmisc/ -type f \ | grep '\.[chy]$' \ | xargs mv -t lib; Plus updating the Makefile and other references. While at it, I've sorted the sources lists. Link: <#792> Reported-by: David Seifert <soap@gentoo.org> Cc: Sam James <sam@gentoo.org> Cc: Christian Bricart <christian@bricart.de> Cc: Michael Vetter <jubalh@iodoru.org> Cc: Robert Förster <Dessa@gmake.de> [ soap tested the Gentoo package ] Tested-by: David Seifert <soap@gentoo.org> Acked-by: David Seifert <soap@gentoo.org> Cc: <lslebodn@fedoraproject.org> Acked-by: Serge Hallyn <serge@hallyn.com> Acked-by: Iker Pedrosa <ipedrosa@redhat.com> Signed-off-by: Alejandro Colomar <alx@kernel.org>
shadow-maint · Aug 30, 2023 · a286dea · a286dea
1 parent c34c260
commit a286dea
Show file tree

Hide file tree

Showing 91 changed files with 180 additions and 208 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,5 +47,5 @@ Makefile.in
 
 /shadow.spec
 /shadow-*.tar.*
-/libmisc/getdate.c
+/lib/getdate.c
 /libsubid/subid.h
diff --git a/Makefile.am b/Makefile.am
@@ -2,7 +2,7 @@
 
 EXTRA_DIST = NEWS README TODO shadow.spec.in
 
-SUBDIRS = libmisc lib
+SUBDIRS = lib
 
 if ENABLE_SUBIDS
 SUBDIRS += libsubid

diff --git a/TODO b/TODO
@@ -10,13 +10,13 @@
 
 Check when RLOGIN is enabled if ruserok() exists
 
-Move selinux_file_context out of libmisc/copydir.c
+Move selinux_file_context out of lib/copydir.c
 
 Review hardcoded root account?
 
 review all call to strto
 
-libmisc/cleanup_user.c
+lib/cleanup_user.c
 	cleanup needed (cleanup_report_add_user* not used)
 
 

diff --git a/configure.ac b/configure.ac
@@ -753,7 +753,6 @@ AC_CONFIG_FILES([
 	man/uk/Makefile
 	man/zh_CN/Makefile
 	man/zh_TW/Makefile
-	libmisc/Makefile
 	lib/Makefile
 	libsubid/Makefile
 	libsubid/subid.h

diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -5,64 +5,117 @@ DEFS =
 
 noinst_LTLIBRARIES = libshadow.la
 
+if USE_PAM
+LIBCRYPT_PAM = $(LIBCRYPT)
+else
+LIBCRYPT_PAM =
+endif
+
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
+
 libshadow_la_CPPFLAGS = $(ECONF_CPPFLAGS)
 if HAVE_VENDORDIR
 libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
 endif
 
 libshadow_la_CPPFLAGS += -I$(top_srcdir)
-libshadow_la_CFLAGS = $(LIBBSD_CFLAGS)
+libshadow_la_CFLAGS = $(LIBBSD_CFLAGS) $(LIBCRYPT_PAM) $(LIBSYSTEMD)
 
 libshadow_la_SOURCES = \
+	addgrps.c \
+	age.c \
+	agetpass.c \
 	alloc.c \
 	alloc.h \
+	audit_help.c \
+	basename.c \
 	bit.c \
 	bit.h \
+	chkname.c \
+	chkname.h \
+	chowndir.c \
+	chowntty.c \
+	cleanup.c \
+	cleanup_group.c \
+	cleanup_user.c \
 	commonio.c \
 	commonio.h \
+	console.c \
+	copydir.c \
+	csrand.c \
+	date_to_str.c \
 	defines.h \
 	encrypt.c \
+	entry.c \
+	env.c \
 	exitcodes.h \
 	faillog.h \
+	failure.c \
+	failure.h \
 	fields.c \
+	find_new_gid.c \
+	find_new_uid.c \
+	find_new_sub_gids.c \
+	find_new_sub_uids.c \
 	fputsx.c \
-	getdef.c \
-	getdef.h \
 	get_gid.c \
-	getlong.c \
 	get_pid.c \
 	get_uid.c \
+	getdate.h \
+	getdate.y \
+	getdef.c \
+	getdef.h \
+	getlong.c \
+	getgr_nam_gid.c \
+	getrange.c \
+	gettime.c \
 	getulong.c \
 	groupio.c \
 	groupmem.c \
 	groupio.h \
 	gshadow.c \
+	hushed.c \
+	idmapping.h \
+	idmapping.c \
+	isexpired.c \
+	limits.c \
+	list.c \
 	lockpw.c \
+	loginprompt.c \
+	mail.c \
 	mempcpy.c \
 	mempcpy.h \
+	motd.c \
+	myname.c \
 	nss.c \
 	nscd.c \
 	nscd.h \
-	shadowlog.c \
-	shadowlog.h \
-	shadowlog_internal.h \
-	sssd.c \
-	sssd.h \
+	obscure.c \
 	pam_defs.h \
+	pam_pass.c \
+	pam_pass_non_interactive.c \
 	port.c \
 	port.h \
+	prefix_flag.c \
 	prototypes.h \
 	pwauth.c \
 	pwauth.h \
 	pwio.c \
 	pwio.h \
+	pwd_init.c \
+	pwd2spwd.c \
+	pwdcheck.c \
 	pwmem.c \
+	remove_tree.c \
+	rlogin.c \
+	root_flag.c \
 	run_part.h \
 	run_part.c \
-	subordinateio.h \
-	subordinateio.c \
+	salt.c \
 	selinux.c \
 	semanage.c \
+	setugid.c \
+	setupenv.c \
 	sgetgrent.c \
 	sgetpwent.c \
 	sgetspent.c \
@@ -71,23 +124,69 @@ libshadow_la_SOURCES = \
 	shadow.c \
 	shadowio.c \
 	shadowio.h \
+	shadowlog.c \
+	shadowlog.h \
+	shadowlog_internal.h \
 	shadowmem.c \
+	shell.c \
 	spawn.c \
+	sssd.c \
+	sssd.h \
 	stpecpy.c \
 	stpecpy.h \
 	stpeprintf.c \
 	stpeprintf.h \
-	write_full.c
+	strtoday.c \
+	sub.c \
+	subordinateio.h \
+	subordinateio.c \
+	sulog.c \
+	ttytype.c \
+	tz.c \
+	ulimit.c \
+	user_busy.c \
+	valid.c \
+	write_full.c \
+	xgetpwnam.c \
+	xprefix_getpwnam.c \
+	xgetpwuid.c \
+	xgetgrnam.c \
+	xgetgrgid.c \
+	xgetspnam.c \
+	yesno.c
 
 if WITH_TCB
 libshadow_la_SOURCES += tcbfuncs.c tcbfuncs.h
 endif
 
+if WITH_BTRFS
+libshadow_la_SOURCES += btrfs.c
+endif
+
+if ENABLE_LASTLOG
+libshadow_la_SOURCES += log.c
+endif
+
+if ENABLE_LOGIND
+libshadow_la_SOURCES += logind.c
+else
+libshadow_la_SOURCES += utmp.c
+endif
+
+if !WITH_LIBBSD
+libshadow_la_SOURCES += \
+	freezero.h \
+	freezero.c \
+	readpassphrase.h \
+	readpassphrase.c
+endif
+
 # These files are unneeded for some reason, listed in
 # order of appearance:
 #
 # sources for dbm support (not yet used)
 
 EXTRA_DIST = \
 	.indent.pro \
-	gshadow_.h
+	gshadow_.h \
+	xgetXXbyYY.c
diff --git a/libmisc/addgrps.c → lib/addgrps.c b/libmisc/addgrps.c → lib/addgrps.c
diff --git a/libmisc/age.c → lib/age.c b/libmisc/age.c → lib/age.c
diff --git a/libmisc/agetpass.c → lib/agetpass.c b/libmisc/agetpass.c → lib/agetpass.c
diff --git a/libmisc/audit_help.c → lib/audit_help.c b/libmisc/audit_help.c → lib/audit_help.c
diff --git a/libmisc/basename.c → lib/basename.c b/libmisc/basename.c → lib/basename.c
diff --git a/libmisc/btrfs.c → lib/btrfs.c b/libmisc/btrfs.c → lib/btrfs.c
diff --git a/libmisc/chkname.c → lib/chkname.c b/libmisc/chkname.c → lib/chkname.c
diff --git a/libmisc/chkname.h → lib/chkname.h b/libmisc/chkname.h → lib/chkname.h
diff --git a/libmisc/chowndir.c → lib/chowndir.c b/libmisc/chowndir.c → lib/chowndir.c
diff --git a/libmisc/chowntty.c → lib/chowntty.c b/libmisc/chowntty.c → lib/chowntty.c
diff --git a/libmisc/cleanup.c → lib/cleanup.c b/libmisc/cleanup.c → lib/cleanup.c
diff --git a/libmisc/cleanup_group.c → lib/cleanup_group.c b/libmisc/cleanup_group.c → lib/cleanup_group.c
diff --git a/libmisc/cleanup_user.c → lib/cleanup_user.c b/libmisc/cleanup_user.c → lib/cleanup_user.c
diff --git a/libmisc/console.c → lib/console.c b/libmisc/console.c → lib/console.c
diff --git a/libmisc/copydir.c → lib/copydir.c b/libmisc/copydir.c → lib/copydir.c
diff --git a/libmisc/csrand.c → lib/csrand.c b/libmisc/csrand.c → lib/csrand.c
diff --git a/libmisc/date_to_str.c → lib/date_to_str.c b/libmisc/date_to_str.c → lib/date_to_str.c
diff --git a/libmisc/entry.c → lib/entry.c b/libmisc/entry.c → lib/entry.c
diff --git a/libmisc/env.c → lib/env.c b/libmisc/env.c → lib/env.c
diff --git a/libmisc/failure.c → lib/failure.c b/libmisc/failure.c → lib/failure.c
diff --git a/libmisc/failure.h → lib/failure.h b/libmisc/failure.h → lib/failure.h
diff --git a/libmisc/find_new_gid.c → lib/find_new_gid.c b/libmisc/find_new_gid.c → lib/find_new_gid.c
diff --git a/libmisc/find_new_sub_gids.c → lib/find_new_sub_gids.c b/libmisc/find_new_sub_gids.c → lib/find_new_sub_gids.c
diff --git a/libmisc/find_new_sub_uids.c → lib/find_new_sub_uids.c b/libmisc/find_new_sub_uids.c → lib/find_new_sub_uids.c
diff --git a/libmisc/find_new_uid.c → lib/find_new_uid.c b/libmisc/find_new_uid.c → lib/find_new_uid.c
diff --git a/libmisc/freezero.c → lib/freezero.c b/libmisc/freezero.c → lib/freezero.c
diff --git a/libmisc/freezero.h → lib/freezero.h b/libmisc/freezero.h → lib/freezero.h
diff --git a/libmisc/getdate.h → lib/getdate.h b/libmisc/getdate.h → lib/getdate.h
diff --git a/libmisc/getdate.y → lib/getdate.y b/libmisc/getdate.y → lib/getdate.y
diff --git a/libmisc/getgr_nam_gid.c → lib/getgr_nam_gid.c b/libmisc/getgr_nam_gid.c → lib/getgr_nam_gid.c
diff --git a/libmisc/getrange.c → lib/getrange.c b/libmisc/getrange.c → lib/getrange.c
diff --git a/libmisc/gettime.c → lib/gettime.c b/libmisc/gettime.c → lib/gettime.c
diff --git a/libmisc/hushed.c → lib/hushed.c b/libmisc/hushed.c → lib/hushed.c
diff --git a/libmisc/idmapping.c → lib/idmapping.c b/libmisc/idmapping.c → lib/idmapping.c
diff --git a/libmisc/idmapping.h → lib/idmapping.h b/libmisc/idmapping.h → lib/idmapping.h
diff --git a/libmisc/isexpired.c → lib/isexpired.c b/libmisc/isexpired.c → lib/isexpired.c
diff --git a/libmisc/limits.c → lib/limits.c b/libmisc/limits.c → lib/limits.c
diff --git a/libmisc/list.c → lib/list.c b/libmisc/list.c → lib/list.c
diff --git a/libmisc/log.c → lib/log.c b/libmisc/log.c → lib/log.c
diff --git a/libmisc/logind.c → lib/logind.c b/libmisc/logind.c → lib/logind.c
diff --git a/libmisc/loginprompt.c → lib/loginprompt.c b/libmisc/loginprompt.c → lib/loginprompt.c
diff --git a/libmisc/mail.c → lib/mail.c b/libmisc/mail.c → lib/mail.c
diff --git a/libmisc/motd.c → lib/motd.c b/libmisc/motd.c → lib/motd.c
diff --git a/libmisc/myname.c → lib/myname.c b/libmisc/myname.c → lib/myname.c
diff --git a/libmisc/obscure.c → lib/obscure.c b/libmisc/obscure.c → lib/obscure.c
diff --git a/libmisc/pam_pass.c → lib/pam_pass.c b/libmisc/pam_pass.c → lib/pam_pass.c
diff --git a/libmisc/pam_pass_non_interactive.c → lib/pam_pass_non_interactive.c b/libmisc/pam_pass_non_interactive.c → lib/pam_pass_non_interactive.c
diff --git a/libmisc/prefix_flag.c → lib/prefix_flag.c b/libmisc/prefix_flag.c → lib/prefix_flag.c
diff --git a/lib/prototypes.h b/lib/prototypes.h
@@ -10,7 +10,7 @@
 /*
  * prototypes.h
  *
- * prototypes of libmisc functions, and private lib functions.
+ * prototypes of some lib functions, and private lib functions.
  *
  * $Id$
  *

diff --git a/libmisc/pwd2spwd.c → lib/pwd2spwd.c b/libmisc/pwd2spwd.c → lib/pwd2spwd.c
diff --git a/libmisc/pwd_init.c → lib/pwd_init.c b/libmisc/pwd_init.c → lib/pwd_init.c
diff --git a/libmisc/pwdcheck.c → lib/pwdcheck.c b/libmisc/pwdcheck.c → lib/pwdcheck.c
diff --git a/libmisc/readpassphrase.c → lib/readpassphrase.c b/libmisc/readpassphrase.c → lib/readpassphrase.c
diff --git a/libmisc/readpassphrase.h → lib/readpassphrase.h b/libmisc/readpassphrase.h → lib/readpassphrase.h
diff --git a/libmisc/remove_tree.c → lib/remove_tree.c b/libmisc/remove_tree.c → lib/remove_tree.c
diff --git a/libmisc/rlogin.c → lib/rlogin.c b/libmisc/rlogin.c → lib/rlogin.c
diff --git a/libmisc/root_flag.c → lib/root_flag.c b/libmisc/root_flag.c → lib/root_flag.c
diff --git a/libmisc/salt.c → lib/salt.c b/libmisc/salt.c → lib/salt.c
diff --git a/libmisc/setugid.c → lib/setugid.c b/libmisc/setugid.c → lib/setugid.c
diff --git a/libmisc/setupenv.c → lib/setupenv.c b/libmisc/setupenv.c → lib/setupenv.c
diff --git a/libmisc/shell.c → lib/shell.c b/libmisc/shell.c → lib/shell.c
diff --git a/libmisc/strtoday.c → lib/strtoday.c b/libmisc/strtoday.c → lib/strtoday.c
diff --git a/libmisc/sub.c → lib/sub.c b/libmisc/sub.c → lib/sub.c
diff --git a/libmisc/sulog.c → lib/sulog.c b/libmisc/sulog.c → lib/sulog.c
diff --git a/libmisc/ttytype.c → lib/ttytype.c b/libmisc/ttytype.c → lib/ttytype.c
diff --git a/libmisc/tz.c → lib/tz.c b/libmisc/tz.c → lib/tz.c
diff --git a/libmisc/ulimit.c → lib/ulimit.c b/libmisc/ulimit.c → lib/ulimit.c
diff --git a/libmisc/user_busy.c → lib/user_busy.c b/libmisc/user_busy.c → lib/user_busy.c
diff --git a/libmisc/utmp.c → lib/utmp.c b/libmisc/utmp.c → lib/utmp.c
diff --git a/libmisc/valid.c → lib/valid.c b/libmisc/valid.c → lib/valid.c
diff --git a/libmisc/xgetXXbyYY.c → lib/xgetXXbyYY.c b/libmisc/xgetXXbyYY.c → lib/xgetXXbyYY.c
diff --git a/libmisc/xgetgrgid.c → lib/xgetgrgid.c b/libmisc/xgetgrgid.c → lib/xgetgrgid.c
diff --git a/libmisc/xgetgrnam.c → lib/xgetgrnam.c b/libmisc/xgetgrnam.c → lib/xgetgrnam.c
diff --git a/libmisc/xgetpwnam.c → lib/xgetpwnam.c b/libmisc/xgetpwnam.c → lib/xgetpwnam.c
diff --git a/libmisc/xgetpwuid.c → lib/xgetpwuid.c b/libmisc/xgetpwuid.c → lib/xgetpwuid.c
diff --git a/libmisc/xgetspnam.c → lib/xgetspnam.c b/libmisc/xgetspnam.c → lib/xgetspnam.c
diff --git a/libmisc/xprefix_getpwnam.c → lib/xprefix_getpwnam.c b/libmisc/xprefix_getpwnam.c → lib/xprefix_getpwnam.c
diff --git a/libmisc/yesno.c → lib/yesno.c b/libmisc/yesno.c → lib/yesno.c
diff --git a/libmisc/.indent.pro b/libmisc/.indent.pro
diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
@@ -21,10 +21,8 @@ MISCLIBS = \
 
 libsubid_la_LIBADD = \
 	$(top_builddir)/lib/libshadow.la \
-	$(top_builddir)/libmisc/libmisc.la \
 	$(MISCLIBS) -ldl
 
 AM_CPPFLAGS = \
 	-I${top_srcdir}/lib \
-	-I${top_srcdir}/libmisc \
 	-DLOCALEDIR=\"$(datadir)/locale\"