Re: pkg/49051 (Unbreak devel/git-base on Mac OS X Tiger)

[venture37 <venture37%geeklan.co.uk@localhost>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

This fixed the initial build issue, what follows is the install stage
breaking when running a pbulk as an unprivileged user as tar tries to
set ownership information of files.

(cd blt && /usr/bin/tar cf - .) | \
(cd
'/tmp/devel/git-base/work/.destdir/usr/pkg/share/git-core/templates'
&& umask 022 && /usr/bin/tar xof -)
/usr/bin/tar: ./branches: Cannot change ownership to uid 503, gid 0:
Operation not permitted
/usr/bin/tar: ./description: Cannot change ownership to uid 503, gid
0: Operation not permitted
/usr/bin/tar: ./hooks/applypatch-msg.sample: Cannot change ownership
to uid 503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/commit-msg.sample: Cannot change ownership to
uid 503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/post-update.sample: Cannot change ownership to
uid 503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/pre-applypatch.sample: Cannot change ownership
to uid 503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/pre-commit.sample: Cannot change ownership to
uid 503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/pre-push.sample: Cannot change ownership to uid
503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/pre-rebase.sample: Cannot change ownership to
uid 503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/prepare-commit-msg.sample: Cannot change
ownership to uid 503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks/update.sample: Cannot change ownership to uid
503, gid 0: Operation not permitted
/usr/bin/tar: ./hooks: Cannot change ownership to uid 503, gid 0:
Operation not permitted
/usr/bin/tar: ./info/exclude: Cannot change ownership to uid 503, gid
0: Operation not permitted
/usr/bin/tar: ./info: Cannot change ownership to uid 503, gid 0:
Operation not permitted
/usr/bin/tar: Error exit delayed from previous errors
Makefile:64: recipe for target 'install' failed
gmake[1]: *** [install] Error 2
gmake[1]: Leaving directory
'/private/tmp/devel/git-base/work/git-1.9.4/templates'
Makefile:2335: recipe for target 'install' failed
gmake: *** [install] Error 2
*** Error code 2





Patch below fixes this


cvs diff: Diffing patches
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git-base/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
- --- distinfo    1 Aug 2014 19:18:39 -0000       1.15
+++ distinfo    2 Aug 2014 00:58:27 -0000
@@ -3,7 +3,7 @@
 SHA1 (git-1.9.4.tar.xz) = a91059d0065d82c6c2db6d69b56033a01b10eac8
 RMD160 (git-1.9.4.tar.xz) = 742b8d73fa205b34b2c2843260d94787099b6030
 Size (git-1.9.4.tar.xz) = 3387180 bytes
- -SHA1 (patch-aa) = 62170081fcf3831ba7316b5914657063c668a80b
+SHA1 (patch-aa) = db795ad7258bd47ce26a4dc8d18a9886d74f3f5c
 SHA1 (patch-ac) = 376cdd1c58b143c820ff6395987a8a77cf9b52ba
 SHA1 (patch-ae) = 9bc2e6c7f0a8fbc385b6ffda638d3245a62dc5ca
 SHA1 (patch-af) = d1aae6d9b15f7932912a97457d8a95364b685b07
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/devel/git-base/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
- --- patches/patch-aa    1 Aug 2014 19:18:39 -0000       1.3
+++ patches/patch-aa    2 Aug 2014 00:58:27 -0000
@@ -36,7 +36,12 @@

  export DIFF TAR INSTALL DESTDIR SHELL_PATH

- -@@ -2353,7 +2347,6 @@ ifndef NO_GETTEXT
+@@ -2349,11 +2343,10 @@ install: all
+ ifndef NO_GETTEXT
+       $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(localedir_SQ)'
+       (cd po/build/locale && $(TAR) cf - .) | \
+-      (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xof -)
++      (cd '$(DESTDIR_SQ)$(localedir_SQ)' && umask 022 && $(TAR) xf -)
  endif
  ifndef NO_PERL
        $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)'
install
-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJT3DmwAAoJENE/+DdOy3tCAtkP/jCfRVahg5hu8djJA897pYWg
xSbR6bnGy4GdZTk0uXyDrqxL+iWxpcpGwHLeKRSCSXQmmEA6jqEnM5V2+19WrM/Q
+TQcegdUrw+HuJ/rQuVdzpSrybQd0/UYNKmYcngctrFCmHfUFXaOId3wCwNbsCUq
uEJEYHpezdhLFsBrwa3XQNMrmHcVgGRSO/PAoGJl0qnEspu3m6ueese9yFXtAotg
DprVTcmPPOMwUA4CEHhWCoFgdpUmFX5Kk2nUFDXePtBdiIiNg/lb4Dc8RjxavfVA
UhqQWlRpPoxQyRdSB2zmqryP1mYjQcgGPNApqJRo1n15DXTJAL8u9/5aBKchOTIJ
CU2j+MiecTBsrGXYvxsUVVex0l8d05kaCWDJSvQXm8fvSh8AKn8UIEFMlHPO1I7S
FkOhibm6HeabcrMmA5gFispp9tCAilIg+P6GeEWTZD8d3RCRu+V36pjcQoXuCUb9
4xBnalLfFsji3VRrUi5IXFfr9mIyLzvlG30CZJLuRSJJkrniiDvyEdRWWQ/EMe0d
Dob09hzpqCHyX3nJREO3YASZRlmlTSdw61zlSD/VHFhv9X7BVxfK32WTLEZIomQ8
GeJPYAtyf+ZPIQiqG8Qn1143Q0ZhHu/cjFQ1Yp1X41ki+28b0oq8xYqDVBhKyHUL
vfS8mQGhVRMZ4YZvdMEq
=73Sn
-----END PGP SIGNATURE-----