diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-05-05 03:31:05 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-05-05 03:31:05 +0000 |
| commit | 5fb8228fc2a207f2ff6ae3ad98328a7664da0480 (patch) | |
| tree | 18465a76a63599a5c9edf78383aed30cf8c5f7c4 /user/libslirp/git-describe.patch | |
| parent | 9680fd28fc8dd8ff8abcb504a0f820ad655d5dfb (diff) | |
| parent | 5df19234b438dd8d1d876033a8987e563c033c1a (diff) | |
| download | packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.tar.gz packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.tar.bz2 packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.tar.xz packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.zip | |
Merge branch 'sec/2020.04.20' into 'master'
Security updates for 2020.04.20
See merge request adelie/packages!441
Diffstat (limited to 'user/libslirp/git-describe.patch')
| -rw-r--r-- | user/libslirp/git-describe.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/user/libslirp/git-describe.patch b/user/libslirp/git-describe.patch new file mode 100644 index 000000000..9cc66bbad --- /dev/null +++ b/user/libslirp/git-describe.patch @@ -0,0 +1,24 @@ +Otherwise you might get "-dirty" in the pc: version + +--- libslirp-4.3.0/build-aux/git-version-gen 2020-04-23 06:09:44.166262600 -0500 ++++ libslirp-4.3.0/build-aux/git-version-gen 2020-04-24 15:08:09.450004079 -0500 +@@ -133,19 +133,6 @@ fi + + v=`echo "$v" |sed 's/^v//'` + +-# Don't declare a version "dirty" merely because a time stamp has changed. +-git update-index --refresh > /dev/null 2>&1 +- +-dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= +-case "$dirty" in +- '') ;; +- *) # Append the suffix only if there isn't one already. +- case $v in +- *-dirty) ;; +- *) v="$v-dirty" ;; +- esac ;; +-esac +- + # Omit the trailing newline, so that m4_esyscmd can use the result directly. + echo "$v" | tr -d "$nl" + |