diff --git a/debian/control b/debian/control index bf2f46a3..df80107f 100644 --- a/debian/control +++ b/debian/control @@ -44,33 +44,14 @@ Depends: login.defs Recommends: sensible-utils +Replaces: + login (<< 1:4.16.0-2~) Description: change and administer password and group data This package includes passwd, chsh, chfn, and many other programs to maintain password and group data. . Shadow passwords are supported. See /usr/share/doc/passwd/README.Debian -Package: login -Architecture: any -Multi-Arch: foreign -Protected: yes -Depends: - libpam-modules, - libpam-runtime -Breaks: - hurd (<< 20140206~) [hurd-any] -Conflicts: - python-4suite (<< 0.99cvs20060405-1) -Replaces: - hurd (<< 20140206~) [hurd-any] -Pre-Depends: - login.defs (>= 1:4.16.0-1~) -Description: system login tools - This package provides support for console-based logins and for - changing effective user or group IDs, including: - * login, the program that invokes a user shell on a virtual terminal; - * nologin, a dummy shell for disabled user accounts; - Package: login.defs Architecture: all Multi-Arch: foreign diff --git a/debian/debputy.manifest b/debian/debputy.manifest index d4e1ef70..a25f640e 100644 --- a/debian/debputy.manifest +++ b/debian/debputy.manifest @@ -22,11 +22,6 @@ packages: path: usr/bin/expiry group: "shadow" mode: "u=rwx,go=rxs" - login: - transformations: - - path-metadata: - path: usr/bin/newgrp - mode: "u=rwxs,go=rx" uidmap: transformations: - path-metadata: diff --git a/debian/login.install b/debian/login.install deleted file mode 100644 index 925fe2cd..00000000 --- a/debian/login.install +++ /dev/null @@ -1,4 +0,0 @@ -bin/login usr/bin -sbin/nologin usr/sbin -usr/bin/newgrp -usr/share/locale/*/LC_MESSAGES/shadow.mo diff --git a/debian/login.links b/debian/login.links deleted file mode 100644 index 3886f8f2..00000000 --- a/debian/login.links +++ /dev/null @@ -1 +0,0 @@ -usr/bin/newgrp usr/bin/sg diff --git a/debian/login.lintian-overrides b/debian/login.lintian-overrides deleted file mode 100644 index 7d01e406..00000000 --- a/debian/login.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -login: elevated-privileges 4755 root/root [usr/bin/newgrp] diff --git a/debian/login.maintscript b/debian/login.maintscript deleted file mode 100644 index 2791fb79..00000000 --- a/debian/login.maintscript +++ /dev/null @@ -1,2 +0,0 @@ -rm_conffile /etc/securetty 1:4.7-1~ -rm_conffile /etc/login.defs 1:4.16.0-1~ diff --git a/debian/login.manpages b/debian/login.manpages deleted file mode 100644 index 11839427..00000000 --- a/debian/login.manpages +++ /dev/null @@ -1,10 +0,0 @@ -usr/share/man/*/man1/login.1 -usr/share/man/*/man1/newgrp.1 -usr/share/man/*/man1/sg.1 -usr/share/man/*/man5/login.defs.5 -usr/share/man/*/man8/nologin.8 -usr/share/man/man1/login.1 -usr/share/man/man1/newgrp.1 -usr/share/man/man1/sg.1 -usr/share/man/man5/login.defs.5 -usr/share/man/man8/nologin.8 diff --git a/debian/login.pam b/debian/login.pam deleted file mode 100644 index f79f8405..00000000 --- a/debian/login.pam +++ /dev/null @@ -1,96 +0,0 @@ -# -# The PAM configuration file for the Shadow `login' service -# - -# Enforce a minimal delay in case of failure (in microseconds). -# (Replaces the `FAIL_DELAY' setting from login.defs) -# Note that other modules may require another minimal delay. (for example, -# to disable any delay, you should add the nodelay option to pam_unix) -auth optional pam_faildelay.so delay=3000000 - -# Outputs an issue file prior to each login prompt (Replaces the -# ISSUE_FILE option from login.defs). Uncomment for use -# auth required pam_issue.so issue=/etc/issue - -# Disallows other than root logins when /etc/nologin exists -# (Replaces the `NOLOGINS_FILE' option from login.defs) -auth requisite pam_nologin.so - -# SELinux needs to be the first session rule. This ensures that any -# lingering context has been cleared. Without this it is possible -# that a module could execute code in the wrong domain. -# When the module is present, "required" would be sufficient (When SELinux -# is disabled, this returns success.) -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close - -# Sets the loginuid process attribute -session required pam_loginuid.so - -# Prints the message of the day upon successful login. -# (Replaces the `MOTD_FILE' option in login.defs) -# This includes a dynamically generated part from /run/motd.dynamic -# and a static (admin-editable) part from /etc/motd. -session optional pam_motd.so motd=/run/motd.dynamic -session optional pam_motd.so noupdate - -# SELinux needs to intervene at login time to ensure that the process -# starts in the proper default security context. Only sessions which are -# intended to run in the user's context should be run after this. -# pam_selinux.so changes the SELinux context of the used TTY and configures -# SELinux in order to transition to the user context with the next execve() -# call. -session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open -# When the module is present, "required" would be sufficient (When SELinux -# is disabled, this returns success.) - -# This module parses environment configuration file(s) -# and also allows you to use an extended config -# file /etc/security/pam_env.conf. -# -# parsing /etc/environment needs "readenv=1" -session required pam_env.so readenv=1 -# locale variables can also be set in /etc/default/locale -# reading this file *in addition to /etc/environment* does not hurt -session required pam_env.so readenv=1 envfile=/etc/default/locale - -# Standard Un*x authentication. -@include common-auth - -# This allows certain extra groups to be granted to a user -# based on things like time of day, tty, service, and user. -# Please edit /etc/security/group.conf to fit your needs -# (Replaces the `CONSOLE_GROUPS' option in login.defs) -auth optional pam_group.so - -# Uncomment and edit /etc/security/time.conf if you need to set -# time restraint on logins. -# (Replaces the `PORTTIME_CHECKS_ENAB' option from login.defs -# as well as /etc/porttime) -# account requisite pam_time.so - -# Uncomment and edit /etc/security/access.conf if you need to -# set access limits. -# (Replaces /etc/login.access file) -# account required pam_access.so - -# Sets up user limits according to /etc/security/limits.conf -# (Replaces the use of /etc/limits in old login) -session required pam_limits.so - -# Prints the status of the user's mailbox upon successful login -# (Replaces the `MAIL_CHECK_ENAB' option from login.defs). -# -# This also defines the MAIL environment variable -# However, userdel also needs MAIL_DIR and MAIL_FILE variables -# in /etc/login.defs to make sure that removing a user -# also removes the user's mail spool file. -# See comments in /etc/login.defs -session optional pam_mail.so standard - -# Create a new session keyring. -session optional pam_keyinit.so force revoke - -# Standard Un*x account and session -@include common-account -@include common-session -@include common-password diff --git a/debian/not-installed b/debian/not-installed index 4e77a4ad..fa0ab5e9 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,4 +1,5 @@ bin/groups +bin/login # Workaround debhelper complaining about login.defs, although we install it. etc/login.defs etc/pam.d/chfn @@ -15,6 +16,8 @@ etc/pam.d/passwd etc/pam.d/useradd etc/pam.d/userdel etc/pam.d/usermod +sbin/nologin +usr/bin/newgrp usr/bin/faillog usr/bin/sg usr/lib/*/libsubid.la @@ -22,7 +25,10 @@ usr/sbin/groupmems usr/sbin/logoutd usr/sbin/vigr usr/share/man/*/man1/groups.1 +usr/share/man/*/man1/login.1 usr/share/man/*/man1/logoutd.1 +usr/share/man/*/man1/newgrp.1 +usr/share/man/*/man1/sg.1 usr/share/man/*/man1/su.1 usr/share/man/*/man3/getspnam.3 usr/share/man/*/man3/shadow.3 @@ -31,14 +37,18 @@ usr/share/man/*/man5/suauth.5 usr/share/man/*/man8/faillog.8 usr/share/man/*/man8/groupmems.8 usr/share/man/*/man8/logoutd.8 -usr/share/man/man8/groupmems.8 +usr/share/man/*/man8/nologin.8 usr/share/man/man1/groups.1 +usr/share/man/man1/login.1 usr/share/man/man1/logoutd.1 +usr/share/man/man1/newgrp.1 +usr/share/man/man1/sg.1 usr/share/man/man1/su.1 usr/share/man/man3/getspnam.3 usr/share/man/man3/shadow.3 usr/share/man/man5/faillog.5 usr/share/man/man5/suauth.5 usr/share/man/man8/faillog.8 +usr/share/man/man8/groupmems.8 usr/share/man/man8/logoutd.8 - +usr/share/man/man8/nologin.8 diff --git a/debian/passwd.install b/debian/passwd.install index 455552de..b90a4392 100644 --- a/debian/passwd.install +++ b/debian/passwd.install @@ -23,3 +23,4 @@ usr/sbin/useradd usr/sbin/userdel usr/sbin/usermod usr/sbin/vipw +usr/share/locale/*/LC_MESSAGES/shadow.mo diff --git a/debian/rules b/debian/rules index 1bed6380..37a18e1c 100755 --- a/debian/rules +++ b/debian/rules @@ -44,26 +44,12 @@ CFLAGS += -DDEFAULT_EDITOR="\"sensible-editor\"" override_dh_auto_configure: dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS) -override_dh_install-arch: -ifneq ($(DEB_HOST_ARCH_OS),linux) - sed -i 's/session optional pam_keyinit.so/# Linux only # session optional pam_keyinit.so/' debian/login.pam -endif - dh_install -a -ifeq ($(DEB_HOST_ARCH_OS),hurd) - # /bin/login is provided by the hurd package. - rm -f debian/login/usr/bin/login -endif - override_dh_installpam: # Distribute the pam.d files; unless for the commands with disabled PAM # support - dh_installpam -p login dh_installpam -p passwd --name=passwd dh_installpam -p passwd --name=chfn dh_installpam -p passwd --name=chsh dh_installpam -p passwd --name=chpasswd dh_installpam -p passwd --name=newusers -override_dh_auto_clean: - sed -i 's/# Linux only # //' debian/login.pam - dh_auto_clean