main/shadow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

The following changes were made:

Browse Source 
* Added REPO to Makefile
  * usher now uses /bin/sh
  * Removed TARGET from usher
This commit is contained in:
Jay Larson
2018-03-29 12:56:55 -05:00
parent 585826bc5f
commit 0864a18ac2
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -11,11 +11,12 @@
DEPENDS = glibc,libacl,libattr DEPENDS = glibc,libacl,libattr
ARCH = x86_64 ARCH = x86_64
URL = http://pkg-shadow.alioth.debian.org/ URL = http://pkg-shadow.alioth.debian.org/
REPO = core
BRIEF = Shadow password utilities BRIEF = Shadow password utilities
DESC = This package includes the programs necessary to convert traditional \ DESC = This package includes the programs necessary to convert traditional \
V7 UNIX password files to the SVR4 shadow password format and additional \ V7 UNIX password files to the SVR4 shadow password format and additional \
tools to work with shadow passwords. tools to work with shadow passwords.
SNAPVER = 9 SNAPVER = 10
ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')

32
SNAP/usher
View File

@@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh
set -e set -e
@@ -7,32 +7,19 @@ case $1 in
exit 0 exit 0
;; ;;
postinst) postinst)
if [ ! -f ${TARGET}/etc/login.defs ]; then if [ ! -f /etc/login.defs ]; then
cp ${TARGET}/usr/share/shadow/login.defs ${TARGET}/etc/login.defs cp /usr/share/shadow/login.defs /etc/login.defs
fi fi
if [ ! -f ${TARGET}/etc/login.access ]; then if [ ! -f /etc/login.access ]; then
cp ${TARGET}/usr/share/shadow/login.access \ cp /usr/share/shadow/login.access /etc/login.access
${TARGET}/etc/login.access
fi fi
if [ ! -f ${TARGET}/etc/limits ]; then if [ ! -f /etc/limits ]; then
cp ${TARGET}/usr/share/shadow/limits ${TARGET}/etc/limits cp /usr/share/shadow/limits /etc/limits
fi fi
if [ ! -f ${TARGET}/etc/default/useradd ]; then if [ ! -f /etc/default/useradd ]; then
cp ${TARGET}/usr/share/shadow/useradd.default \ cp /usr/share/shadow/useradd.default /etc/default/useradd
${TARGET}/etc/default/useradd
fi fi
if [[ ${TARGET} ]]; then
if [ ! -f ${TARGET}/etc/shadow ]; then
echo "Converting /etc/passwd to shadow for ${TARGET}"
chroot ${TARGET} pwconv
fi
if [ ! -f ${TARGET}/etc/gshadow ]; then
echo "Converting /etc/group to gshadow for ${TARGET}"
chroot ${TARGET} grpconv
fi
else
if [ ! -f /etc/shadow ]; then if [ ! -f /etc/shadow ]; then
echo "Converting /etc/passwd to shadow" echo "Converting /etc/passwd to shadow"
pwconv pwconv
@@ -42,7 +29,6 @@ case $1 in
echo "Converting /etc/group to gshadow" echo "Converting /etc/group to gshadow"
grpconv grpconv
fi fi
fi
;; ;;
prerm) prerm)
exit 0 exit 0