diff options
| author | Peter Samuelson <peter@p12n.org> | 2009-03-02 22:57:36 +0000 |
|---|---|---|
| committer | Peter Samuelson <peter@p12n.org> | 2009-03-02 22:57:36 +0000 |
| commit | 4f6994f1f57d0e7dbcae5e68bb932699c2825fb3 (patch) | |
| tree | 5e67c57a5c49fcb9cd9f225bd0db61e4a48aace1 /debian/patches/repos-templates | |
| parent | cde89394d03df05249f8056903b669c89be64e01 (diff) | |
Upload sanitized 1.6.0-rc3 tarball, rediff patches.
I haven't attempted to build this yet - the patches apply but they may
or may not all work.
I also took the opportunity to change /usr/share/subversion/hook-scripts/
to $REPOS/hooks/ everywhere in the hook script .tmpl example files. I
want to encourage repository administrators to copy the hooks, not just
use them in place. Makes it easier to upgrade without breaking stuff.
Diffstat (limited to 'debian/patches/repos-templates')
| -rw-r--r-- | debian/patches/repos-templates | 62 |
1 files changed, 44 insertions, 18 deletions
diff --git a/debian/patches/repos-templates b/debian/patches/repos-templates index 995cd06..58e5bcc 100644 --- a/debian/patches/repos-templates +++ b/debian/patches/repos-templates @@ -5,56 +5,82 @@ @DPATCH@ --- a/subversion/libsvn_repos/repos.c +++ b/subversion/libsvn_repos/repos.c -@@ -427,8 +427,8 @@ +@@ -266,7 +266,7 @@ + + #define PREWRITTEN_HOOKS_TEXT \ + "# For more examples and pre-written hooks, see those in" NL \ +- "# the Subversion repository at" NL \ ++ "# /usr/share/subversion/hook-scripts, and in the repository at" NL \ + "# http://svn.collab.net/repos/svn/trunk/tools/hook-scripts/ and" NL \ + "# http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/" NL + +@@ -345,8 +345,11 @@ + "REPOS=\"$1\"" NL + "USER=\"$2\"" NL + "" NL +-"commit-allower.pl --repository \"$REPOS\" --user \"$USER\" || exit 1" NL +-"special-auth-check.py --user \"$USER\" --auth-level 3 || exit 1" NL ++"# Exit on all errors." NL ++"set -e" NL ++"" NL ++"\"$REPOS\"/hooks/commit-allower.pl --repository \"$REPOS\" --user \"$USER\"" NL ++"\"$REPOS\"/hooks/special-auth-check.py --user \"$USER\" --auth-level 3" NL "" NL + "# All checks passed, so allow the commit." NL + "exit 0" NL; +@@ -433,10 +436,13 @@ + "$SVNLOOK log -t \"$TXN\" \"$REPOS\" | \\" NL + " grep \"[a-zA-Z0-9]\" > /dev/null || exit 1" NL + "" NL ++"# Exit on all errors." NL ++"set -e" NL ++"" NL "# Check that the author of this commit has the rights to perform" NL "# the commit on the files and directories being modified." NL -"commit-access-control.pl \"$REPOS\" \"$TXN\" commit-access-control.cfg || exit 1" - NL -+"/usr/share/subversion/hook-scripts/commit-access-control.pl \\" NL -+" \"$REPOS\" \"$TXN\" \"$REPOS\"/commit-access-control.cfg || exit 1" NL ++"\"$REPOS\"/hooks/commit-access-control.pl \"$REPOS\" $TXN \\" NL ++" \"$REPOS\"/hooks/commit-access-control.cfg" NL "" NL "# All checks passed, so allow the commit." NL "exit 0" NL; -@@ -726,8 +726,8 @@ +@@ -743,7 +749,7 @@ "REPOS=\"$1\"" NL "REV=\"$2\"" NL NL --"commit-email.pl \"$REPOS\" \"$REV\" commit-watchers@example.org" NL --"log-commit.py --repository \"$REPOS\" --revision \"$REV\"" NL; -+"/usr/share/subversion/hook-scripts/commit-email.pl \\" NL -+" \"$REPOS\" \"$REV\" commit-watchers@example.org" NL; +-"mailer.py commit \"$REPOS\" \"$REV\" /path/to/mailer.conf" NL; ++"\"$REPOS\"/hooks/mailer.py commit \"$REPOS\" $REV \"$REPOS\"/mailer.conf" NL #undef SCRIPT_NAME -@@ -788,7 +788,8 @@ +@@ -804,7 +810,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was created:" NL -"mailer.py lock \"$REPOS\" \"$USER\" /path/to/mailer.conf" NL; -+"/usr/share/subversion/hook-scripts/mailer/mailer.py lock \\" NL ++"\"$REPOS\"/hooks/mailer.py lock \\" NL +" \"$REPOS\" \"$USER\" \"$REPOS\"/hooks/mailer.conf" NL; #undef SCRIPT_NAME -@@ -847,7 +848,8 @@ +@@ -863,7 +870,8 @@ "USER=\"$2\"" NL "" NL "# Send email to interested parties, let them know a lock was removed:" NL -"mailer.py unlock \"$REPOS\" \"$USER\" /path/to/mailer.conf" NL; -+"/usr/share/subversion/hook-scripts/mailer.py unlock \\" NL -+" \"$REPOS\" \"$USER\" \"$REPOS\"/mailer.conf" NL; ++"\"$REPOS\"/hooks/mailer.py unlock \\" NL ++" \"$REPOS\" \"$USER\" \"$REPOS\"/hooks/mailer.conf" NL; #undef SCRIPT_NAME -@@ -912,8 +914,8 @@ +@@ -928,8 +936,8 @@ "PROPNAME=\"$4\"" NL "ACTION=\"$5\"" NL "" NL --"commit-email.pl --revprop-change \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" " --"watchers@example.org" NL; -+"/usr/share/subversion/hook-scripts/commit-email.pl --revprop-change \\" NL -+" \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" watchers@example.org" NL; +-"mailer.py propchange2 \"$REPOS\" \"$REV\" \"$USER\" \"$PROPNAME\" " +-"\"$ACTION\" /path/to/mailer.conf" NL; ++"\"$REPOS\"/hooks/mailer.py propchange2 \"$REPOS\" $REV \\" NL ++" \"$USER\" \"$PROPNAME\" \"$ACTION\" \"$REPOS\"/hooks/mailer.conf" NL; #undef SCRIPT_NAME |