OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [email protected] Module: openpkg-src Date: 25-Dec-2008 10:19:40 Branch: HEAD Handle: 2008122509193901 Added files: openpkg-src/subversion fsl.subversion Modified files: openpkg-src/subversion rc.subversion subversion.spec Log: add OSSP fsl support for svnserve Summary: Revision Changes Path 1.1 +16 -0 openpkg-src/subversion/fsl.subversion 1.11 +16 -1 openpkg-src/subversion/rc.subversion 1.158 +17 -3 openpkg-src/subversion/subversion.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/subversion/fsl.subversion ============================================================================ $ cvs diff -u -r0 -r1.1 fsl.subversion --- /dev/null 2008-12-25 10:16:21 +0100 +++ fsl.subversion 2008-12-25 10:19:40 +0100 @@ -0,0 +1,16 @@ +## +## fsl.subversion -- OSSP fsl configuration +## + +ident .*(svnserve)/.+ q{ + prefix( + prefix="%b %d %H:%M:%S %N <%L> $1[%P]: " + ) + -> { + debug: file( + path="@l_prefix@/var/subversion/subversion.log", + perm=0664 + ) + } +}; + @@ . patch -p0 <<'@@ .' Index: openpkg-src/subversion/rc.subversion ============================================================================ $ cvs diff -u -r1.10 -r1.11 rc.subversion --- openpkg-src/subversion/rc.subversion 15 Nov 2008 18:58:16 -0000 1.10 +++ openpkg-src/subversion/rc.subversion 25 Dec 2008 09:19:40 -0000 1.11 @@ -11,7 +11,13 @@ subversion_daemon_host="127.0.0.1" subversion_daemon_port="3690" subversion_daemon_root="@l_prefix@/var/subversion/default" - subversion_daemon_pidfile="@l_prefix@/var/subversion/svnserve.pid" + subversion_daemon_pidfile="@l_prefix@/var/subversion/subversion.pid" + subversion_daemon_logfile="@l_prefix@/var/subversion/subversion.log" + subversion_daemon_log_prolog="true" + subversion_daemon_log_epilog="true" + subversion_daemon_log_numfiles="10" + subversion_daemon_log_minsize="1M" + subversion_daemon_log_complevel="9" %common subversion_signal () { @@ -54,6 +60,15 @@ rcService subversion active no && exit 0 rc subversion stop start +%daily -u @l_susr@ + rcService subversion enable yes || exit 0 + shtool rotate -f \ + -n $subversion_daemon_log_numfiles -s $subversion_daemon_log_minsize -d \ + -z $subversion_daemon_log_complevel -m 664 -o @l_susr@ -g @l_sgrp@ \ + -P "$subversion_daemon_log_prolog" \ + -E "$subversion_daemon_log_epilog; rc subversion restart" \ + $subversion_daemon_logfile + %env rcService subversion enable yes || exit 0 if rcVarIsYes subversion_env; then @@ . patch -p0 <<'@@ .' Index: openpkg-src/subversion/subversion.spec ============================================================================ $ cvs diff -u -r1.157 -r1.158 subversion.spec --- openpkg-src/subversion/subversion.spec 23 Dec 2008 09:37:15 -0000 1.157 +++ openpkg-src/subversion/subversion.spec 25 Dec 2008 09:19:40 -0000 1.158 @@ -40,9 +40,10 @@ Group: SCM License: Apache/BSD Version: %{V_opkg} -Release: 20081223 +Release: 20081225 # package options +%option with_fsl yes %option with_cvs2svn no %option with_svn2cvs no %option with_apache no @@ -62,6 +63,7 @@ Source7: subversion.config.apache Source8: subversion.servers Source9: rc.subversion +Source10: fsl.subversion Patch0: subversion.patch # build information @@ -71,6 +73,10 @@ PreReq: OpenPKG, openpkg >= 20060823 BuildPreReq: diffutils, db, openssl, zlib, libiconv, expat PreReq: diffutils, db, openssl, zlib, libiconv, expat +%if "%{with_fsl}" == "yes" +BuildPreReq: fsl +PreReq: fsl +%endif %if "%{with_cvs2svn}" == "yes" PreReq: rcs, python, python::with_dbm = yes %endif @@ -163,8 +169,8 @@ CC="%{l_cc}" \ CFLAGS="%{l_cflags -O}" \ CPPFLAGS="%{l_cppflags libxml2 .}" \ - LDFLAGS="%{l_ldflags} `pkg-config db --libs-only-L`" \ - LIBS="`pkg-config db --libs-only-l` -lz" \ + LDFLAGS="%{l_ldflags} `pkg-config db --libs-only-L` %{l_fsl_ldflags}" \ + LIBS="`pkg-config db --libs-only-l` -lz %{l_fsl_libs}" \ CONFIG_SHELL="%{l_bash}" \ ./configure \ --prefix=%{l_prefix} \ @@ -381,6 +387,13 @@ %{SOURCE rc.subversion} \ $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/ + # install OSSP fsl configuration + %{l_shtool} mkdir -f -p -m 755 \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl + %{l_shtool} install -c -m 644 %{l_value -s -a} \ + %{SOURCE fsl.subversion} \ + $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/ + # create directory for default repository and svnserve pidfile %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/var/subversion @@ -389,6 +402,7 @@ %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ %{l_files_std} \ '%config %{l_prefix}/etc/subversion/*' \ + '%config %{l_prefix}/etc/fsl/fsl.subversion' \ '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/subversion' \ '%doc %{l_prefix}/share/subversion/svn-book.*' @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List [email protected]
