[packages/lighttpd] update branch.sh to pull diff from github
glen
glen at pld-linux.org
Wed Jul 27 08:36:59 CEST 2016
commit e76124500fb1321c27003b3e365165fdeac1f657
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Jul 27 09:36:43 2016 +0300
update branch.sh to pull diff from github
branch.sh | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/branch.sh b/branch.sh
index ce27a45..05e89e5 100755
--- a/branch.sh
+++ b/branch.sh
@@ -1,9 +1,10 @@
#!/bin/sh
set -e
svn=svn://svn.lighttpd.net/lighttpd
+url=https://github.com/lighttpd/lighttpd1.4
package=lighttpd
-tag=lighttpd-1.4.36
-branch=lighttpd-1.4.x
+tag=lighttpd-1.4.40
+branch=master
out=lighttpd-branch.diff
# old version of this code used to create tarball.
@@ -26,20 +27,12 @@ filter() {
-x 'CMakeLists.txt' \
-x 'configure.ac' \
-x 'SConstruct' \
- | \
- # remove revno's for smaller diffs
- sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
+ | cat
}
-old=$svn/tags/$tag
-new=$svn/branches/$branch
-echo >&2 "Running diff: $old -> $new"
-LC_ALL=C svn diff --old=$old --new=$new > $out.tmp
-revno=$(sed -ne 's,^[-+]\{3\} .*\t(revision \([0-9]\+\))$,\1,p' $out.tmp | sort -urn | head -n1)
-echo >&2 "Revision $revno"
-[ "$revno" -gt 0 ] || exit 1
+echo >&2 "Running diff: $tag...$branch"
+LC_ALL=C curl -Ss $url/compare/$tag...$branch.patch > $out.tmp
-sed -i -e "1i# Revision $revno" $out.tmp
filter < $out.tmp > $out.tmp2 && mv -f $out.{tmp2,tmp}
if cmp -s $out{,.tmp}; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lighttpd.git/commitdiff/e76124500fb1321c27003b3e365165fdeac1f657
More information about the pld-cvs-commit
mailing list