X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=branch.sh;h=3587b2f672201777824091b2e120ac8db675a4db;hb=0df6ab5;hp=50fd80754a01e6d90acb1aa26af61e7e6346983e;hpb=cc37bbfb7095c9610d1754476eac01a5eae78664;p=packages%2Flighttpd.git

diff --git a/branch.sh b/branch.sh
old mode 100644
new mode 100755
index 50fd807..3587b2f
--- a/branch.sh
+++ b/branch.sh
@@ -1,18 +1,59 @@
 #!/bin/sh
 set -e
 svn=svn://svn.lighttpd.net/lighttpd
-tag=lighttpd-1.4.23
-branch=lighttpd-1.4.x
+url=https://git.lighttpd.net/lighttpd/lighttpd1.4.git
+package=lighttpd
+tag=lighttpd-1.4.45
+branch=master
+out=$package-branch.diff
+repo=$package.git
 
-old=$svn/tags/$tag
-new=$svn/branches/$branch
-echo "Running diff: $old -> $new"
-LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff.tmp
+# old version of this code used to create tarball.
+# leave it around
+if [ "$1" = "tarball" ]; then
+	v=1.5
+	svn co $svn/trunk $package-$v
+	r=$(svnversion $package-$v)
+	t=$package-r$r.tar.bz2
+	tar -cjf $t --exclude-vcs $package-$v
+	../dropin $t &
+	exit 0
+fi
 
-echo "Excluding files which change version or were not in dist tarball"
-filterdiff -x tests/mod-extforward.conf -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' lighttpd-branch.diff.tmp > lighttpd-branch.diff.tmp2
-mv -f lighttpd-branch.diff.tmp2 lighttpd-branch.diff
-rm -f lighttpd-branch.diff.tmp
+d=$-
+filter() {
+	set -$d
+	# Excluding files which change version or were not in dist tarball
+	filterdiff -p1 \
+		-x '.gitignore' \
+		-x 'CMakeLists.txt' \
+		-x 'SConstruct' \
+		-x 'configure.ac' \
+		-x 'packdist.sh' \
+	| cat
+}
 
-# remove revno's for smaller diffs
-sed -i -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,' lighttpd-branch.diff
+if [ ! -d $repo ]; then
+	git clone --bare $url -b $branch $repo
+fi
+
+cd $repo
+	git fetch origin +$branch:$branch +refs/tags/$tag:refs/tags/$tag
+	git log -p --reverse $tag..$branch | filter > ../$out.tmp
+cd ..
+
+if ! test -s $out.tmp; then
+	echo >&2 "No diffs..."
+	rm -f $out.tmp
+	exit 0
+fi
+
+if cmp -s $out{,.tmp}; then
+	echo >&2 "No new diffs..."
+	rm -f $out.tmp
+	exit 0
+fi
+mv -f $out{.tmp,}
+
+../md5 $package.spec
+../dropin $out