[gentoo-commits] gentoo-x86 commit in sys-block/parted/files: parted-2.3-git-version-gen.patch

[gentoo-commits] gentoo-x86 commit in sys-block/parted/files: parted-2.3-git-version-gen.patch

[Mike Frysinger (vapier)]

vapier      11/02/21 17:09:57

  Added:                parted-2.3-git-version-gen.patch
  Log:
  Fix from upstream gnulib for sandbox violations with git repos in higher dirs.
  
  (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-block/parted/files/parted-2.3-git-version-gen.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/parted/files/parted-2.3-git-version-gen.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/parted/files/parted-2.3-git-version-gen.patch?rev=1.1&content-type=text/plain

Index: parted-2.3-git-version-gen.patch
===================================================================
http://bugs.gentoo.org/355045

[PATCH] git-version-gen: skip "-dirty" check when appropriate

* build-aux/git-version-gen: Don't run any git commands
when the version comes from .tarball-version.  Prior to this,
we would run git update-index --refresh even from a just-unpacked
tarball directory, and that could affect a .git/ directory in a
parent of the build directory.  Reported by Mike Frysinger.

diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
index 68c7d64..686f703 100755
--- a/build-aux/git-version-gen
+++ b/build-aux/git-version-gen
@@ -124,13 +124,16 @@
     # Change the first '-' to a '.', so version-comparing tools work properly.
     # Remove the "g" in git describe's output string, to save a byte.
     v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
+    v_from_git=1
 else
     v=UNKNOWN
+    v_from_git=
 fi
 
 v=`echo "$v" |sed 's/^v//'`
 
 # Don't declare a version "dirty" merely because a time stamp has changed.
+if test -n "$v_from_git"; then
 git update-index --refresh > /dev/null 2>&1
 
 dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
@@ -142,6 +145,7 @@
 	  *) v="$v-dirty" ;;
 	esac ;;
 esac
+fi
 
 # Omit the trailing newline, so that m4_esyscmd can use the result directly.
 echo "$v" | tr -d "$nl"

[gentoo-commits] gentoo-x86 commit in sys-block/parted/files: parted-2.3-git-version-gen.patch

[Jeroen Roovers (jer)]

jer         13/09/29 15:24:08

  Removed:              parted-2.3-git-version-gen.patch
  Log:
  Old.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A792A613)