Re: [ptxdist] [PATCH v2] attr/acl: fix installation when user or group name contains a space

2019-08-15 Thread Michael Olbrich 
Or maybe a version bump? Both have a new version that seems to be mostly
buildsystem cleanup and a few bugfixes.

Michael

On Thu, Aug 15, 2019 at 02:50:42PM +0200, Marc Kleine-Budde wrote:
> Signed-off-by: Marc Kleine-Budde 
> ---
>  ...install-with-domain-user-or-domain-u.patch | 229 ++
>  ...dmacros-fix-install-with-user-domain.patch |  27 ---
>  patches/acl-2.2.52/series |   4 +-
>  ...tall-with-domain-user-or-domain-user.patch | 229 ++
>  .../0001-fix-install-with-domain-user.patch   |  27 ---
>  ...nslations-only-if-gettext-is-enabled.patch |   4 -
>  patches/attr-2.4.47/series|   5 +-
>  7 files changed, 464 insertions(+), 61 deletions(-)
>  create mode 100644 
> patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
>  delete mode 100644 
> patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch
>  create mode 100644 
> patches/attr-2.4.47/0001-fix-install-with-domain-user-or-domain-user.patch
>  delete mode 100644 
> patches/attr-2.4.47/0001-fix-install-with-domain-user.patch
> 
> diff --git 
> a/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
>  
> b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
> new file mode 100644
> index ..cec5eb2f62f2
> --- /dev/null
> +++ 
> b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
> @@ -0,0 +1,229 @@
> +From: Jon Ringle 
> +Date: Mon, 23 May 2011 10:30:59 -0400
> +Subject: [PATCH] buildmacros: fix install with domain\user or "domain user"
> +
> +If current user is domain\user the \ gets interpreted as an escape char
> +resulting in user not found. This also breaks if the user or group contains a
> +space.
> +
> +Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix.
> +
> +Signed-off-by: Jon Ringle 
> +Signed-off-by: Marc Kleine-Budde 
> +---
> + include/buildmacros |  2 +-
> + include/install-sh  | 26 +-
> + install-sh  | 26 +-
> + 3 files changed, 27 insertions(+), 27 deletions(-)
> +
> +diff --git a/include/buildmacros b/include/buildmacros
> +index 805ef64d8d57..29e937e077c8 100644
> +--- a/include/buildmacros
>  b/include/buildmacros
> +@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
> +   $(LFILES:.l=.o) \
> +   $(YFILES:%.y=%.tab.o)
> + 
> +-INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
> ++INSTALL = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g 
> "$(PKG_GROUP)"
> + 
> + IMAGES_DIR = $(TOPDIR)/all-images
> + DIST_DIR = $(TOPDIR)/dist
> +diff --git a/include/install-sh b/include/install-sh
> +index 3c9d49be8c68..5fdeb525aab0 100755
> +--- a/include/install-sh
>  b/include/install-sh
> +@@ -56,7 +56,7 @@ _chown ()
> + {
> + _st=255
> + if [ $# -eq 3 ] ; then
> +-chown $1:$2 $3
> ++chown "$1":"$2" $3
> + _st=$?
> + if [ $_st -ne 0 ] ; then
> + if [ $REAL_UID != '0' ] ; then
> +@@ -115,7 +115,7 @@ fi
> + 
> + [ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true
> + 
> +-while getopts "Dcm:d:S:o:g:T:" c $*
> ++while getopts "Dcm:d:S:o:g:T:" c "$@"
> + do
> +case $c in
> +c)
> +@@ -168,10 +168,10 @@ then
> + fi
> + if [ $status -eq 0 ]
> + then
> +-$CHOWN $OWNER $GROUP $dir
> ++$CHOWN "$OWNER" "$GROUP" $dir
> + status=$?
> + fi
> +-$MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT}
> ++$MANIFEST d $DIRMODE "$OWNER" "$GROUP" ${dir#$DIST_ROOT}
> + elif $Sflag
> + then
> + #
> +@@ -217,7 +217,7 @@ then
> + install_name=$target/$solib
> + $CP $solib $install_name
> + status=$?
> +-$MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib 
> ${install_name#$DIST_ROOT}
> ++$MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$solib 
> ${install_name#$DIST_ROOT}
> + break
> + fi
> + done
> +@@ -268,7 +268,7 @@ then
> + install_name=$target/$old_library
> + $CP $old_library $install_name
> + status=$?
> +-$MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library 
> ${install_name#$DIST_ROOT}
> ++$MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$old_library 
> ${install_name#$DIST_ROOT}
> + ;;
> + *)
> + echo "$prog: -T $lt_install invalid"
> +@@ -281,7 +281,7 @@ then
> + if [ $status -eq 0 ]
> + then
> + $CHMOD $FILEMODE $install_name
> +-$CHOWN $OWNER $GROUP $install_name
> ++$CHOWN "$OWNER" "$GROUP" $install_name
> + fi
> + ;;
> + esac
> +@@ -310,19 +310,19 @@ else
> + status=$?
> + if [ $status -eq 0 ]
> + then
> +-$CHOWN $OWNER $GROUP $dir/$f
> ++$CHOWN "$OWNER" "$GROUP" $dir/$f
> + status=$?
> + fi
> +-$MANIFEST f $FILEMODE $OWNER $GROUP $HER

[ptxdist] [PATCH v2] attr/acl: fix installation when user or group name contains a space

2019-08-15 Thread Marc Kleine-Budde 
Signed-off-by: Marc Kleine-Budde 
---
 ...install-with-domain-user-or-domain-u.patch | 229 ++
 ...dmacros-fix-install-with-user-domain.patch |  27 ---
 patches/acl-2.2.52/series |   4 +-
 ...tall-with-domain-user-or-domain-user.patch | 229 ++
 .../0001-fix-install-with-domain-user.patch   |  27 ---
 ...nslations-only-if-gettext-is-enabled.patch |   4 -
 patches/attr-2.4.47/series|   5 +-
 7 files changed, 464 insertions(+), 61 deletions(-)
 create mode 100644 
patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
 delete mode 100644 
patches/acl-2.2.52/0003-buildmacros-fix-install-with-user-domain.patch
 create mode 100644 
patches/attr-2.4.47/0001-fix-install-with-domain-user-or-domain-user.patch
 delete mode 100644 patches/attr-2.4.47/0001-fix-install-with-domain-user.patch

diff --git 
a/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
 
b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
new file mode 100644
index ..cec5eb2f62f2
--- /dev/null
+++ 
b/patches/acl-2.2.52/0003-buildmacros-fix-install-with-domain-user-or-domain-u.patch
@@ -0,0 +1,229 @@
+From: Jon Ringle 
+Date: Mon, 23 May 2011 10:30:59 -0400
+Subject: [PATCH] buildmacros: fix install with domain\user or "domain user"
+
+If current user is domain\user the \ gets interpreted as an escape char
+resulting in user not found. This also breaks if the user or group contains a
+space.
+
+Enclose "$(PKG_USER)" and "$(PKG_GROUP)" in quotes to fix.
+
+Signed-off-by: Jon Ringle 
+Signed-off-by: Marc Kleine-Budde 
+---
+ include/buildmacros |  2 +-
+ include/install-sh  | 26 +-
+ install-sh  | 26 +-
+ 3 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/include/buildmacros b/include/buildmacros
+index 805ef64d8d57..29e937e077c8 100644
+--- a/include/buildmacros
 b/include/buildmacros
+@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
+ $(LFILES:.l=.o) \
+ $(YFILES:%.y=%.tab.o)
+ 
+-INSTALL   = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
++INSTALL   = $(TOPDIR)/include/install-sh -o "$(PKG_USER)" -g 
"$(PKG_GROUP)"
+ 
+ IMAGES_DIR = $(TOPDIR)/all-images
+ DIST_DIR = $(TOPDIR)/dist
+diff --git a/include/install-sh b/include/install-sh
+index 3c9d49be8c68..5fdeb525aab0 100755
+--- a/include/install-sh
 b/include/install-sh
+@@ -56,7 +56,7 @@ _chown ()
+ {
+ _st=255
+ if [ $# -eq 3 ] ; then
+-  chown $1:$2 $3
++  chown "$1":"$2" $3
+   _st=$?
+   if [ $_st -ne 0 ] ; then
+   if [ $REAL_UID != '0' ] ; then
+@@ -115,7 +115,7 @@ fi
+ 
+ [ -n "$DIST_ROOT" -a $REAL_UID -ne 0 ] && CHOWN=true
+ 
+-while getopts "Dcm:d:S:o:g:T:" c $*
++while getopts "Dcm:d:S:o:g:T:" c "$@"
+ do
+case $c in
+c)
+@@ -168,10 +168,10 @@ then
+ fi
+ if [ $status -eq 0 ]
+ then
+-  $CHOWN $OWNER $GROUP $dir
++  $CHOWN "$OWNER" "$GROUP" $dir
+   status=$?
+ fi
+-$MANIFEST d $DIRMODE $OWNER $GROUP ${dir#$DIST_ROOT}
++$MANIFEST d $DIRMODE "$OWNER" "$GROUP" ${dir#$DIST_ROOT}
+ elif $Sflag
+ then
+ #
+@@ -217,7 +217,7 @@ then
+   install_name=$target/$solib
+   $CP $solib $install_name
+   status=$?
+-  $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$solib 
${install_name#$DIST_ROOT}
++  $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$solib 
${install_name#$DIST_ROOT}
+   break
+   fi
+   done
+@@ -268,7 +268,7 @@ then
+   install_name=$target/$old_library
+   $CP $old_library $install_name
+   status=$?
+-  $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$old_library 
${install_name#$DIST_ROOT}
++  $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$old_library 
${install_name#$DIST_ROOT}
+   ;;
+ *)
+   echo "$prog: -T $lt_install invalid"
+@@ -281,7 +281,7 @@ then
+   if [ $status -eq 0 ]
+   then
+   $CHMOD $FILEMODE $install_name
+-  $CHOWN $OWNER $GROUP $install_name
++  $CHOWN "$OWNER" "$GROUP" $install_name
+   fi
+   ;;
+ esac
+@@ -310,19 +310,19 @@ else
+   status=$?
+   if [ $status -eq 0 ]
+   then
+-  $CHOWN $OWNER $GROUP $dir/$f
++  $CHOWN "$OWNER" "$GROUP" $dir/$f
+   status=$?
+   fi
+-  $MANIFEST f $FILEMODE $OWNER $GROUP $HERE/$f 
${dir#$DIST_ROOT}/$f
++  $MANIFEST f $FILEMODE "$OWNER" "$GROUP" $HERE/$f 
${dir#$DIST_ROOT}/$f
+   else
+   $CHMOD $FILEMODE $dir
+   status=$?
+   if [ $status -eq 0 ]
+   then
+-  $CHOWN $OWNER $GROUP $dir
++  $CHOWN "$OWNER" "$GROUP" $dir
+   status=$?