shadow: use default login.defs from upstream
This commit is contained in:
parent
27e9ecb6f5
commit
44d8cc0e7f
|
|
@ -1,10 +1,9 @@
|
|||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqghRmnn6d1mKk7J8nLFJQaE6PIod0M4r3+dSulVC33aR2z7B5rCAGVJFKiQ4fmBIeVUbWf3rhiKHRzaOHNDf6wg=
|
||||
SHA256 (Pkgfile) = 118b9b3c9d8eba995bbafba6811ab4ab5741bea5ef55562ab6f14dd604cb24da
|
||||
RWRJc1FUaeVeqgf9aDrJY/RaqufrT0MwmuwXMJ0GpPpHGcgZpBaBdC4fOSCBG6nJkSVsToDsYvsg2i/wFA8tKtmqegrtILLcOgk=
|
||||
SHA256 (Pkgfile) = c4639c151f151ffb786b1d0db6358a12db0833b42c35d46c13441a43efcac343
|
||||
SHA256 (.footprint) = 64614a7fcc7b8c2330824675ccbe9a7601cff4f12fe6d87ac9d9a10d11471d3e
|
||||
SHA256 (shadow-4.12.3.tar.xz) = 3d3ec447cfdd11ab5f0486ebc47d15718349d13fea41fc8584568bc118083ccd
|
||||
SHA256 (pwck) = c62f1bf5785c2bb93bb269156bfa02b06728a01ff5d6c2e09cf6285701a1fda0
|
||||
SHA256 (login.defs) = def991c4bc012834d726a4010783634a930558b91650bc4cba5fe822064c3535
|
||||
SHA256 (chfn) = b31ef7a14f747e114c970027a57acb5dcefffee439ce0b4a7d55cc2f6b632fcf
|
||||
SHA256 (chsh) = 20e39e9c738599272a10f46a11338d62d755df32a26db27ce0b5c04a71d66460
|
||||
SHA256 (login) = ae3f6b4ddfc86f30f864e3e9cb514964bb323a9e59840624672f412005c64285
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
name=shadow
|
||||
version=4.12.3
|
||||
release=1
|
||||
release=2
|
||||
source=(https://github.com/shadow-maint/$name/releases/download/$version/$name-$version.tar.xz \
|
||||
pwck login.defs chfn chsh login groupadd groupdel \
|
||||
pwck chfn chsh login groupadd groupdel \
|
||||
groupmems groupmod passwd su useradd userdel usermod)
|
||||
|
||||
build() {
|
||||
|
|
@ -34,7 +34,7 @@ build() {
|
|||
chmod -s $PKG/usr/sbin/*
|
||||
|
||||
install -d $PKG/etc/cron/daily $PKG/var/log
|
||||
install -m 644 $SRC/login.defs $PKG/etc
|
||||
install -m 644 etc/login.defs $PKG/etc
|
||||
install -m 755 $SRC/pwck $PKG/etc/cron/daily
|
||||
touch $PKG/var/log/{lastlog,faillog}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,123 +0,0 @@
|
|||
Fix build fails for libsubid (libtool: error: cannot find name of link library for '../libsubid/libsubid.la').
|
||||
Consisting of following upstream commits:
|
||||
* f4a84efb468b8be21be124700ce35159c444e9d6
|
||||
* 537b8cd90be7b47b45c45cfd27765ef85eb0ebf1
|
||||
* fa986b1d73605ecca54a4f19249227aeab827bf6
|
||||
Index: shadow-4.9/configure.ac
|
||||
===================================================================
|
||||
--- shadow-4.9.orig/configure.ac
|
||||
+++ shadow-4.9/configure.ac
|
||||
@@ -321,6 +321,8 @@ if test "$with_sha_crypt" = "yes"; then
|
||||
AC_DEFINE(USE_SHA_CRYPT, 1, [Define to allow the SHA256 and SHA512 password encryption algorithms])
|
||||
fi
|
||||
|
||||
+AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes")
|
||||
+
|
||||
AM_CONDITIONAL(USE_BCRYPT, test "x$with_bcrypt" = "xyes")
|
||||
if test "$with_bcrypt" = "yes"; then
|
||||
AC_DEFINE(USE_BCRYPT, 1, [Define to allow the bcrypt password encryption algorithm])
|
||||
Index: shadow-4.9/lib/Makefile.am
|
||||
===================================================================
|
||||
--- shadow-4.9.orig/lib/Makefile.am
|
||||
+++ shadow-4.9/lib/Makefile.am
|
||||
@@ -10,6 +10,8 @@ if HAVE_VENDORDIR
|
||||
libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
|
||||
endif
|
||||
|
||||
+libshadow_la_CPPFLAGS += -I$(top_srcdir)
|
||||
+
|
||||
libshadow_la_SOURCES = \
|
||||
commonio.c \
|
||||
commonio.h \
|
||||
Index: shadow-4.9/libmisc/Makefile.am
|
||||
===================================================================
|
||||
--- shadow-4.9.orig/libmisc/Makefile.am
|
||||
+++ shadow-4.9/libmisc/Makefile.am
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
EXTRA_DIST = .indent.pro xgetXXbyYY.c
|
||||
|
||||
-AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS)
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
|
||||
|
||||
noinst_LTLIBRARIES = libmisc.la
|
||||
|
||||
Index: shadow-4.9/libsubid/Makefile.am
|
||||
===================================================================
|
||||
--- shadow-4.9.orig/libsubid/Makefile.am
|
||||
+++ shadow-4.9/libsubid/Makefile.am
|
||||
@@ -1,6 +1,8 @@
|
||||
lib_LTLIBRARIES = libsubid.la
|
||||
+if ENABLE_SHARED
|
||||
libsubid_la_LDFLAGS = -Wl,-soname,libsubid.so.@LIBSUBID_ABI@ \
|
||||
-shared -version-info @LIBSUBID_ABI_MAJOR@
|
||||
+endif
|
||||
libsubid_la_SOURCES = api.c
|
||||
|
||||
pkginclude_HEADERS = subid.h
|
||||
@@ -16,11 +18,12 @@ MISCLIBS = \
|
||||
$(LIBCRYPT) \
|
||||
$(LIBACL) \
|
||||
$(LIBATTR) \
|
||||
- $(LIBTCB)
|
||||
+ $(LIBTCB) \
|
||||
+ $(LIBPAM)
|
||||
|
||||
libsubid_la_LIBADD = \
|
||||
- $(top_srcdir)/lib/libshadow.la \
|
||||
- $(top_srcdir)/libmisc/libmisc.la \
|
||||
+ $(top_builddir)/lib/libshadow.la \
|
||||
+ $(top_builddir)/libmisc/libmisc.la \
|
||||
$(MISCLIBS) -ldl
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
Index: shadow-4.9/src/Makefile.am
|
||||
===================================================================
|
||||
--- shadow-4.9.orig/src/Makefile.am
|
||||
+++ shadow-4.9/src/Makefile.am
|
||||
@@ -10,6 +10,7 @@ sgidperms = 2755
|
||||
AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/lib \
|
||||
-I$(top_srcdir)/libmisc \
|
||||
+ -I$(top_srcdir) \
|
||||
-DLOCALEDIR=\"$(datadir)/locale\"
|
||||
|
||||
# XXX why are login and su in /bin anyway (other than for
|
||||
@@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \
|
||||
list_subid_ranges_CPPFLAGS = \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/libmisc \
|
||||
+ -I$(top_srcdir) \
|
||||
-I$(top_srcdir)/libsubid
|
||||
|
||||
get_subid_owners_LDADD = \
|
||||
@@ -194,11 +196,13 @@ get_subid_owners_LDADD = \
|
||||
get_subid_owners_CPPFLAGS = \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/libmisc \
|
||||
+ -I$(top_srcdir) \
|
||||
-I$(top_srcdir)/libsubid
|
||||
|
||||
new_subid_range_CPPFLAGS = \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/libmisc \
|
||||
+ -I$(top_srcdir) \
|
||||
-I$(top_srcdir)/libsubid
|
||||
|
||||
new_subid_range_LDADD = \
|
||||
@@ -210,6 +214,7 @@ new_subid_range_LDADD = \
|
||||
free_subid_range_CPPFLAGS = \
|
||||
-I$(top_srcdir)/lib \
|
||||
-I$(top_srcdir)/libmisc \
|
||||
+ -I$(top_srcdir) \
|
||||
-I$(top_srcdir)/libsubid
|
||||
|
||||
free_subid_range_LDADD = \
|
||||
@@ -220,6 +225,7 @@ free_subid_range_LDADD = \
|
||||
|
||||
check_subid_range_CPPFLAGS = \
|
||||
-I$(top_srcdir)/lib \
|
||||
+ -I$(top_srcdir) \
|
||||
-I$(top_srcdir)/libmisc
|
||||
|
||||
check_subid_range_LDADD = \
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
#
|
||||
# /etc/login.defs: login configuration, see login.defs(5)
|
||||
#
|
||||
|
||||
FAIL_DELAY 0
|
||||
LOG_UNKFAIL_ENAB no
|
||||
LOG_OK_LOGINS no
|
||||
SYSLOG_SU_ENAB yes
|
||||
SYSLOG_SG_ENAB yes
|
||||
CONSOLE /etc/securetty
|
||||
SU_NAME su
|
||||
MAIL_DIR /var/spool/mail
|
||||
HUSHLOGIN_FILE .hushlogin
|
||||
ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||
ENV_PATH PATH=/bin:/usr/bin
|
||||
TTYGROUP tty
|
||||
TTYPERM 0600
|
||||
ERASECHAR 0177
|
||||
KILLCHAR 025
|
||||
UMASK 022
|
||||
PASS_MAX_DAYS 99999
|
||||
PASS_MIN_DAYS 0
|
||||
PASS_WARN_AGE 7
|
||||
UID_MIN 100
|
||||
UID_MAX 60000
|
||||
GID_MIN 100
|
||||
GID_MAX 60000
|
||||
SYS_UID_MIN 25
|
||||
SYS_UID_MAX 99
|
||||
SYS_GID_MIN 25
|
||||
SYS_GID_MAX 99
|
||||
LOGIN_RETRIES 5
|
||||
LOGIN_TIMEOUT 60
|
||||
CHFN_RESTRICT rwh
|
||||
ENCRYPT_METHOD SHA512
|
||||
DEFAULT_HOME yes
|
||||
USERGROUPS_ENAB no
|
||||
|
||||
# End of file
|
||||
Loading…
Reference in New Issue
Block a user