[scponly] svn_compat patch and how to f*cking regenrate the
configure script?
Sven Hoexter
sven at timegate.de
Sun Oct 10 10:56:23 EDT 2004
Hi Guys,
this mail should have a patch attached that makes svn_compat mode for
subversion usage with svnserver avaible. A friend tested it by hand eg he
added the lines to config.h and scponly.c and it worked. I hope that the
patch is ok but I cannot proof it cause I'm unable to regenerate the configure
script.
I tried
$ aclocal
$ autoconf
$ autoheader
$ automake
but most of them give me some wiered errors I'm unable to deal with and
create a non working configure script.
Can anyone explain to me how to properly regenerate the configure script?
I'm running Debian/testing.
Thanks to onkelchen from irc.german-elite.net #linux for testing.
Sven
--
It ain't so bad bein' alone if you know it'll never last nothing lasts forever
'cept the certainly of change and love's the same It's a game with simple rules
If you think it's forever then you're nothing but a fool
[Venerea - Love Is A Battlefield Of Wounded Hearts]
-------------- next part --------------
diff -ur scponly-3.11-orig/config.h.in scponly-3.11/config.h.in
--- scponly-3.11-orig/config.h.in 2004-03-22 06:29:48.000000000 +0100
+++ scponly-3.11/config.h.in 2004-10-10 16:48:57.000000000 +0200
@@ -8,6 +8,7 @@
#undef WINSCP_COMPAT
#undef GFTP_COMPAT
#undef RSYNC_COMPAT
+#undef SVN_COMPAT
#undef UNISON_COMPAT
#undef ENABLE_SCP2
#undef ENABLE_SFTP
@@ -55,4 +56,9 @@
#undef PROG_UNISON
#endif
+/* Subversion compatability mode */
+#ifdef SVN_COMPAT
+#undef PROG_SVN
+#endif
+
diff -ur scponly-3.11-orig/configure.in scponly-3.11/configure.in
--- scponly-3.11-orig/configure.in 2004-03-22 09:00:38.000000000 +0100
+++ scponly-3.11/configure.in 2004-10-10 16:48:57.000000000 +0200
@@ -154,6 +154,16 @@
echo -n dnl Defaults to off, must be turned on explicitly
])
+AC_ARG_ENABLE([svn-compat]),
+ AC_HELP_STRING([--enable-svn-compat], [enable subversion compatibility]),
+ [
+ if test "x$enableval" != "xno"; then
+ AC_DEFINE([SVN_COMPAT])
+ fi
+ ],[
+ echo -n dnl Defaults to off, must be turned on explicitly
+ ])
+
AC_ARG_ENABLE([chrooted-binary],
AC_HELP_STRING([--enable-chrooted-binary], [install chrooted binary 'scponlyc']),
[
@@ -201,6 +211,12 @@
SCPONLY_PATH_PROG_DEFINE([PROG_RSYNC], [rsync], [/bin:/usr/bin:/sbin:/usr/sbin])
fi
+# svn-compat conditionals:
+if test "x$enable_svn_compat" != "x" && test "x$enable_svn_compat" != "xno"; then
+ AC_MSG_NOTICE([enabling subversion compatability...])
+ SCPONLY_PATH_PROG_DEFINE([PROG_SVN], [svnserve], [/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin])
+fi
+
dnl with-sftp-server conditionals:
if test "x$scponly_sftp_compat" != "x"; then
AC_MSG_NOTICE([enabling SFTP compatability...])
diff -ur scponly-3.11-orig/scponly.c scponly-3.11/scponly.c
--- scponly-3.11-orig/scponly.c 2004-03-22 06:30:38.000000000 +0100
+++ scponly-3.11/scponly.c 2004-10-10 16:48:57.000000000 +0200
@@ -58,6 +58,10 @@
{ PROG_RSYNC, 1 },
#endif /*ENABLE_RSYNC*/
+#ifdef SVN_COMPAT
+ {PROG_SVN, 1 },
+#endif /*ENABLE_SVN*/
+
NULL
};
More information about the scponly
mailing list