summaryrefslogtreecommitdiff
path: root/databases/redis-devel/files/patch-src-mkreleasehdr.sh
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2013-03-12 18:31:48 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2013-03-12 18:31:48 +0000
commitd5fd5772717a6a16a5b0f1d5d84203a4c4ab9e0b (patch)
tree4132f3a531dc01b2dc02e806f42b3cd314a0de62 /databases/redis-devel/files/patch-src-mkreleasehdr.sh
parent- Update to 5.2.1 (diff)
Update from 2.6.10 to 2.6.11.
<ChangeLog> UPGRADE URGENCY: LOW, however updating is encouraged if you have many instances per server and you want to lower the CPU / energy usage. * [BUGFIX] Replication: more strict error checking for master PING reply. * [BUGFIX] redis-cli: use keepalive socket option for improved reliability. * [BUGFIX] Allow AUTH while loading the DB in memory. * [BUGFIX] Don't segfault on unbalanced quotes while parsing config file. * [IMPROVED] serverCron() frequency is now a runtime parameter (was REDIS_HZ). * [IMPROVED] Use a lot less CPU when idle, even with many configured DBs. </ChangeLog>
Notes
Notes: svn path=/head/; revision=313995
Diffstat (limited to 'databases/redis-devel/files/patch-src-mkreleasehdr.sh')
-rw-r--r--databases/redis-devel/files/patch-src-mkreleasehdr.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/redis-devel/files/patch-src-mkreleasehdr.sh b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
index 2d818f69198b..41eac24ceca2 100644
--- a/databases/redis-devel/files/patch-src-mkreleasehdr.sh
+++ b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
@@ -1,11 +1,11 @@
---- src/mkreleasehdr.sh.orig 2010-12-24 09:37:11.000000000 +0300
-+++ src/mkreleasehdr.sh 2010-12-24 09:37:16.000000000 +0300
+--- src/mkreleasehdr.sh.orig 2013-03-12 22:27:27.000000000 +0400
++++ src/mkreleasehdr.sh 2013-03-12 22:27:37.000000000 +0400
@@ -1,6 +1,6 @@
#!/bin/sh
-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
--GIT_DIRTY=`git diff 2> /dev/null | wc -l`
+-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
+GIT_SHA1="00000000"
+GIT_DIRTY="0"
test -f release.h || touch release.h
(cat release.h | grep SHA1 | grep $GIT_SHA1) && \
- (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already uptodate
+ (cat release.h | grep DIRTY | grep $GIT_DIRTY) && exit 0 # Already up-to-date