[svn-upgrade] Integrating new upstream version, shadow (19990827)

This commit is contained in:
nekral-guest
2007-10-07 11:44:08 +00:00
parent 45c6603cc8
commit 446e664caa
71 changed files with 12874 additions and 3576 deletions

10
debian/Makefile.am vendored
View File

@@ -1,9 +1,9 @@
# This is a dummy Makefile.am to get automake work flawlessly,
# and also cooperate to make a distribution for `make dist'
EXTRA_DIST = FILES changelog checksums control login.conffiles \
login.copyright login.postinst login.postrm login.preinst \
login.prerm logoutd passwd.conffiles passwd.copyright \
passwd.postinst porttime rules secure-su.README \
secure-su.conffiles secure-su.copyright secure-su.postrm \
EXTRA_DIST = FILES changelog checksums control control.gnu control.linux \
login.conffiles login.copyright login.postinst login.postrm login.preinst \
login.prerm logoutd.init passwd.conffiles passwd.copyright \
passwd.cron passwd.init passwd.postinst passwd.postrm porttime rules \
secure-su.README secure-su.conffiles secure-su.copyright secure-su.postrm \
secure-su.preinst securetty tar.c

107
debian/Makefile.in vendored
View File

@@ -1,6 +1,6 @@
# Makefile.in generated automatically by automake 1.3 from Makefile.am
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
# and also cooperate to make a distribution for `make dist'
SHELL = /bin/sh
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -35,7 +35,7 @@ mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DISTDIR =
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -49,7 +49,7 @@ AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
@@ -62,11 +62,13 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
AS = @AS@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
CC = @CC@
CPP = @CPP@
DATADIRNAME = @DATADIRNAME@
DLLTOOL = @DLLTOOL@
GENCAT = @GENCAT@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
@@ -90,6 +92,7 @@ MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
NM = @NM@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
POFILES = @POFILES@
POSUB = @POSUB@
@@ -101,12 +104,8 @@ VERSION = @VERSION@
YACC = @YACC@
l = @l@
EXTRA_DIST = FILES changelog checksums control login.conffiles \
login.copyright login.postinst login.postrm login.preinst \
login.prerm logoutd passwd.conffiles passwd.copyright \
passwd.postinst porttime rules secure-su.README \
secure-su.conffiles secure-su.copyright secure-su.postrm \
secure-su.preinst securetty tar.c
EXTRA_DIST = FILES changelog checksums control control.gnu control.linux login.conffiles login.copyright login.postinst login.postrm login.preinst login.prerm logoutd.init passwd.conffiles passwd.copyright passwd.cron passwd.init passwd.postinst passwd.postrm porttime rules secure-su.README secure-su.conffiles secure-su.copyright secure-su.postrm secure-su.preinst securetty tar.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
@@ -116,11 +115,10 @@ DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP = --best
all: Makefile
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps debian/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -138,61 +136,74 @@ subdir = debian
distdir: $(DISTFILES)
@for file in $(DISTFILES); do \
d=$(srcdir); \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file; \
if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info:
dvi:
check: all
$(MAKE)
installcheck:
install-exec:
@$(NORMAL_INSTALL)
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am:
install-exec: install-exec-am
install-data:
@$(NORMAL_INSTALL)
install: install-exec install-data all
@:
uninstall:
install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am:
uninstall: uninstall-am
all-am: Makefile
all-redirect: all-am
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
mostlyclean-generic:
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
-rm -f Makefile $(DISTCLEANFILES)
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
mostlyclean: mostlyclean-generic
mostlyclean-am: mostlyclean-generic
clean: clean-generic mostlyclean
mostlyclean: mostlyclean-am
distclean: distclean-generic clean
-rm -f config.status
clean-am: clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-generic clean-am
-rm -f libtool
maintainer-clean: maintainer-clean-generic distclean
distclean: distclean-am
maintainer-clean-am: maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
.PHONY: tags distdir info dvi installcheck install-exec install-data \
install uninstall all installdirs mostlyclean-generic distclean-generic \
clean-generic maintainer-clean-generic clean mostlyclean distclean \
maintainer-clean
maintainer-clean: maintainer-clean-am
.PHONY: tags distdir info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.

4
debian/changelog vendored
View File

@@ -1,4 +1,4 @@
shadow (19990709) unstable; urgency=low
shadow (19990827) unstable; urgency=low
* upstream upgrade, see CHANGES for more details. Note: this is
not the official Debian changelog entry - it is here only for
@@ -8,7 +8,7 @@ shadow (19990709) unstable; urgency=low
mine) in the debian/control Maintainer field. Thanks, and keep
up the good work!
-- Marek Michalkiewicz <marekm@linux.org.pl> Fri, 9 Jul 1999 19:40:00 +0200
-- Marek Michalkiewicz <marekm@linux.org.pl> Fri, 27 Aug 1999 21:00:00 +0200
shadow (980403-0.3.2) unstable; urgency=low

16
debian/control.gnu vendored Normal file
View File

@@ -0,0 +1,16 @@
Source: shadow
Section: base
Priority: required
Maintainer: Guy Maor <maor@debian.org>
Standards-Version: 2.3.0.0
Package: passwd
Architecture: any
Depends: ${shlibs:Depends}
Section: base
Priority: required
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/doc/passwd/README.Debian

41
debian/control.linux vendored Normal file
View File

@@ -0,0 +1,41 @@
Source: shadow
Section: base
Priority: required
Maintainer: Marek Michalkiewicz <marekm@linux.org.pl>
Standards-Version: 2.3.0.0
Package: login
Architecture: any
Pre-Depends: ${shlibs:Depends}
Conflicts: shadow-login
Replaces: shadow-login, shadow-passwd
Essential: yes
Section: base
Priority: required
Description: Sign on to the system.
login and newgrp change the user and group.
Package: passwd
Architecture: any
Depends: ${shlibs:Depends}, login (>= 970502-1)
Conflicts: shadow-passwd
Replaces: shadow-passwd
Replaces: manpages (<=1.15-2)
Section: base
Priority: required
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/doc/passwd/README.Debian
Package: secure-su
Architecture: any
Depends: ${shlibs:Depends}, login (>= 970502-1)
Conflicts: shadow-su
Replaces: shadow-su
Section: admin
Priority: optional
Description: su with more security options
secure-su offers more security options than the normal su, such as a
wheel group, and from-user and to-user specific restrictions.

2
debian/login.postrm vendored
View File

@@ -1,6 +1,6 @@
#!/bin/sh
set -e
if [ $1 = purge ]; then
if [ "$1" = "purge" ] ; then
update-rc.d logoutd remove >/dev/null
fi

View File

@@ -21,20 +21,14 @@ case "$1" in
start-stop-daemon --stop --quiet --exec $DAEMON
echo "."
;;
restart)
force-reload|restart)
$0 stop
$0 start
;;
reload)
echo -n "Reloading logoutd configuration..."
start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
echo "done."
;;
force-reload)
$0 reload
;;
*)
echo "Usage: /etc/init.d/logoutd start|stop"
echo "Usage: /etc/init.d/logoutd start|stop|restart"
exit 1
;;
esac

View File

@@ -1 +1,3 @@
/etc/cron.daily/passwd
/etc/init.d/passwd
/etc/shells

8
debian/passwd.cron vendored Normal file
View File

@@ -0,0 +1,8 @@
#!/bin/sh
#
# cron.daily script to check integrity of the password and group files
test -f /usr/sbin/pwck || exit 0
pwck -q -r
grpck -r

25
debian/passwd.init vendored Executable file
View File

@@ -0,0 +1,25 @@
#!/bin/sh
#
# /etc/init.d/passwd
# script to check integrity of the password and group files at system startup
#
set -e
test -f /usr/sbin/pwck || exit 0
case "$1" in
start)
echo -n 'Checking password and group files... '
pwck -q -r
grpck -r
echo "done."
;;
stop|restart|reload|force-reload)
;;
*)
echo "Usage: /etc/init.d/passwd start"
exit 1
;;
esac
exit 0

View File

@@ -15,6 +15,9 @@ permfix () {
permfix /sbin/sulogin
permfix /usr/X11R6/bin/xdm-shadow
# check password and group files at boot time
update-rc.d passwd start 60 S . >/dev/null
grep -q '^shadow:[^:]*:42' /etc/group && exit 0
groupadd -g 42 shadow || (
cat <<EOF

6
debian/passwd.postrm vendored Normal file
View File

@@ -0,0 +1,6 @@
#!/bin/sh
set -e
if [ "$1" = "purge" ] ; then
update-rc.d passwd remove >/dev/null
fi

45
debian/rules vendored
View File

@@ -2,8 +2,29 @@
package = shadow
# see dpkg-architecture(8)
DEB_BUILD_ARCH := $(shell dpkg --print-installation-architecture)
DEB_BUILD_GNU_CPU := $(patsubst hurd-%,%,$(DEB_BUILD_ARCH))
ifeq ($(filter-out hurd-%,$(DEB_BUILD_ARCH)),)
DEB_BUILD_GNU_SYSTEM := gnu
else
DEB_BUILD_GNU_SYSTEM := linux
endif
DEB_BUILD_GNU_TYPE=$(DEB_BUILD_GNU_CPU)-$(DEB_BUILD_GNU_SYSTEM)
DEB_HOST_GNU_SYSTEM=$(DEB_BUILD_GNU_SYSTEM)
DEB_HOST_GNU_TYPE=$(DEB_BUILD_GNU_TYPE)
ifeq ($(DEB_HOST_GNU_SYSTEM),linux)
package-list = binary-login binary-passwd binary-su
else
package-list = binary-passwd
endif
# set up environment so that dpkg --build runs our tar wrapper
TAR_WRAPPER_SETUP = REAL_TAR=`command -p -v tar` PATH=`cd debian && pwd`:$$PATH
# (XXX this is no longer needed, and will be removed soon - install
# libtricks and use "dpkg-buildpackage -rfakeroot" instead)
#TAR_WRAPPER_SETUP = REAL_TAR=`command -p -v tar` PATH=`cd debian && pwd`:$$PATH
# for "exec login" to work for ordinary users, /bin/login needs to be setuid
# but very few people use this feature, so we make it non-setuid by default
@@ -11,10 +32,14 @@ LOGIN_PERM = 0755
build:
$(checkdir)
cp -a debian/control.$(DEB_HOST_GNU_SYSTEM) debian/control
# shared lib support is untested, so...
./configure --disable-shared --disable-desrpc # --without-libcrack
./configure --disable-shared --disable-desrpc \
--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
$(MAKE)
gcc -O2 -Wall -o debian/tar debian/tar.c
if [ -n "$(TAR_WRAPPER_SETUP)" ] ; then \
gcc -O2 -Wall -o debian/tar debian/tar.c ; \
fi
touch build
clean:
@@ -23,12 +48,13 @@ clean:
-$(MAKE) -i distclean
rm -rf {libmisc,lib,src}/.deps
rm -rf debian/tmp{-l,-p,-s} debian/{files*,substvars}
cp -a debian/control.linux debian/control
find . -name '*~' -print0 | xargs -0 rm -f
binary-indep: checkroot build
$(checkdir)
binary-arch: binary-login binary-passwd binary-su
binary-arch: $(package-list)
binary-login: checkroot build
$(checkdir)
@@ -45,7 +71,7 @@ binary-login: checkroot build
ln -s newgrp.1.gz debian/tmp-l/usr/man/man1/sg.1.gz
install -m600 etc/login.defs.linux debian/tmp-l/etc/login.defs
install -m600 etc/{login.access,limits} debian/{securetty,porttime} debian/tmp-l/etc/
install debian/logoutd debian/tmp-l/etc/init.d/
install debian/logoutd.init debian/tmp-l/etc/init.d/logoutd
install -m644 debian/changelog debian/tmp-l/usr/doc/login/changelog.Debian
install -m644 doc/CHANGES debian/tmp-l/usr/doc/login/changelog
find debian/tmp-l/usr/{doc,man} -type f | xargs gzip -9
@@ -63,8 +89,10 @@ binary-login: checkroot build
binary-passwd: checkroot build
$(checkdir)
-rm -rf debian/tmp-p
install -d debian/tmp-p/{DEBIAN,etc,usr/{sbin,bin,man/{man1,man5,man8},doc/passwd}}
install -d debian/tmp-p/{DEBIAN,etc/{cron.daily,init.d},usr/{sbin,bin,man/{man1,man5,man8},doc/passwd}}
install -m644 etc/shells debian/tmp-p/etc/
install debian/passwd.cron debian/tmp-p/etc/cron.daily/passwd
install debian/passwd.init debian/tmp-p/etc/init.d/passwd
install -s -m4755 src/{chage,chfn,chsh,expiry,gpasswd,passwd} debian/tmp-p/usr/bin/
install -s src/{chpasswd,groupadd,groupdel,groupmod,grpck,grpconv,grpunconv} \
src/{newusers,pwck,pwconv,pwunconv,useradd,userdel} \
@@ -87,10 +115,15 @@ binary-passwd: checkroot build
install -m644 debian/passwd.copyright debian/tmp-p/usr/doc/passwd/copyright
install debian/login.preinst debian/tmp-p/DEBIAN/preinst
install debian/passwd.postinst debian/tmp-p/DEBIAN/postinst
install debian/passwd.postrm debian/tmp-p/DEBIAN/postrm
install -m644 debian/passwd.conffiles debian/tmp-p/DEBIAN/conffiles
dpkg-shlibdeps debian/tmp-p/usr/{bin/*,sbin/*}
# dpkg-shlibdeps fails on scripts, so install them now...
install src/shadowconfig.sh debian/tmp-p/usr/sbin/shadowconfig
ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
install etc/login.defs.hurd debian/tmp-p/etc/login.defs
echo "/etc/login.defs" >> debian/tmp-p/DEBIAN/conffiles
endif
dpkg-gencontrol -isp -ppasswd -Pdebian/tmp-p
./debian/checksums debian/tmp-p
$(TAR_WRAPPER_SETUP) dpkg --build debian/tmp-p ..