tag 398865 + patch
thanks
Forgot to attach the patch.
--
Anderson Lizardo
Index: pbuilder-0.160.1custom7/pbuilder-buildpackage
===================================================================
--- pbuilder-0.160.1custom7.orig/pbuilder-buildpackage 2006-11-15 22:46:55.000000000 -0400
+++ pbuilder-0.160.1custom7/pbuilder-buildpackage 2006-11-15 22:47:05.000000000 -0400
@@ -32,7 +32,7 @@
fi;
if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
- SUTOUSER="su -p $BUILDUSERNAME"
+ SUTOUSER="env LOGNAME=$BUILDUSERNAME su -p $BUILDUSERNAME"
DEBBUILDOPTS="$DEBBUILDOPTS -rfakeroot"
EXTRAPACKAGES="${EXTRAPACKAGES} fakeroot"
echo "I: using fakeroot in build."
Index: pbuilder-0.160.1custom7/pbuilder-buildpackage-funcs
===================================================================
--- pbuilder-0.160.1custom7.orig/pbuilder-buildpackage-funcs 2006-11-15 22:46:55.000000000 -0400
+++ pbuilder-0.160.1custom7/pbuilder-buildpackage-funcs 2006-11-15 22:49:47.000000000 -0400
@@ -82,13 +82,15 @@
function createbuilduser () {
# create the build user, if it is necessary and specified.
if [ -n "$BUILDUSERNAME" -a -n "$BUILDUSERID" ]; then
+ if [ -e $BUILDPLACE/etc/shadow ]; then p='x'; else p='*'; fi
+ if [ -e $BUILDPLACE/etc/gshadow ]; then g='x'; else g='*'; fi
if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/passwd; then
cowprotect $BUILDPLACE/etc/passwd
- echo "$BUILDUSERNAME:x:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd
+ echo "$BUILDUSERNAME:$p:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd
fi
if ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/group; then
cowprotect $BUILDPLACE/etc/group
- echo "$BUILDUSERNAME:*:$BUILDUSERID:" >> $BUILDPLACE/etc/group
+ echo "$BUILDUSERNAME:$g:$BUILDUSERID:" >> $BUILDPLACE/etc/group
fi
if [ -e $BUILDPLACE/etc/shadow ] && ! grep -q ^$BUILDUSERNAME: $BUILDPLACE/etc/shadow; then
cowprotect $BUILDPLACE/etc/shadow
