Author: bdubbs
Date: 2012-06-07 14:38:04 -0600 (Thu, 07 Jun 2012)
New Revision: 10278
Modified:
trunk/BOOK/general/prog/cvsserver.xml
trunk/BOOK/general/prog/openjdk.xml
trunk/BOOK/general/prog/svnserver.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Update CVS/SVN server instructions.
Modified: trunk/BOOK/general/prog/cvsserver.xml
===================================================================
--- trunk/BOOK/general/prog/cvsserver.xml 2012-06-07 11:38:52 UTC (rev
10277)
+++ trunk/BOOK/general/prog/cvsserver.xml 2012-06-07 20:38:04 UTC (rev
10278)
@@ -50,8 +50,8 @@
<para>Create a new CVS repository with the following
commands:</para>
-<screen role="root"><userinput>mkdir /srv/cvsroot &&
-chmod 1777 /srv/cvsroot &&
+<screen role="root"><userinput>mkdir /srv/cvsroot &&
+chmod 1777 /srv/cvsroot &&
export CVSROOT=/srv/cvsroot &&
cvs init</userinput></screen>
@@ -111,19 +111,20 @@
echo anonymous: > /srv/cvsroot/CVSROOT/passwd &&
echo anonymous > /srv/cvsroot/CVSROOT/readers</userinput></screen>
- <para>If you use <command>inetd</command>, the following command
+<!-- <para>If you use <command>inetd</command>, the following command
will add the <application>CVS</application> entry to
<filename>/etc/inetd.conf</filename>:</para>
<screen role="root"><userinput>echo "2401 stream tcp nowait root
/usr/bin/cvs cvs -f \
- --allow-root=/srv/cvsroot pserver" >>
/etc/inetd.conf</userinput></screen>
+ - -allow-root=/srv/cvsroot pserver" >>
/etc/inetd.conf</userinput></screen>
<indexterm zone="cvsserver cvsserver-config">
<primary sortas="e-etc-inetd.conf">/etc/inetd.conf</primary>
</indexterm>
<para>Issue a <command>killall -HUP inetd</command> to reread the changed
- <filename>inetd.conf</filename> file.</para>
+ <filename>inetd.conf</filename> file.</para>
+-->
<!--
<para>If you use <command>xinetd</command>, the following command will
create
the CVS file as <filename>/etc/xinetd.d/cvspserver</filename>:</para>
Modified: trunk/BOOK/general/prog/openjdk.xml
===================================================================
--- trunk/BOOK/general/prog/openjdk.xml 2012-06-07 11:38:52 UTC (rev 10277)
+++ trunk/BOOK/general/prog/openjdk.xml 2012-06-07 20:38:04 UTC (rev 10278)
@@ -85,6 +85,8 @@
a complete runtime environment to run <application>Java</application>
programs.</para>
+ &lfs71_checked;
+
<note><para>The browser plugin and webstart implementation have been split
off into a separate project. To provide a complete implementation, you will
need to later install <xref linkend="icedtea-web"/>.</para></note>
@@ -127,8 +129,6 @@
here</ulink>.</para>
</note>
- &lfs71_checked;
-
<bridgehead renderas="sect3">Source Package Information</bridgehead>
<itemizedlist spacing="compact">
<listitem>
@@ -315,15 +315,15 @@
<systemitem class="username">root</systemitem> user:</para>
<screen role="root"><userinput>install -vdm755
/opt/OpenJDK-&openjdk-version;-bin &&
-cp -R * /opt/OpenJDK-&openjdk-version;-bin &&
+cp -R * /opt/OpenJDK-&openjdk-version;-bin &&
chown -R root:root /opt/OpenJDK-&openjdk-version;-bin</userinput></screen>
<para>Configure the temporary <application>OpenJDK</application>
installation with the following commands:</para>
-<screen><userinput>export PATH_HOLD="${PATH}" &&
+<screen><userinput>export PATH_HOLD="${PATH}" &&
export JAVA_HOME="/opt/OpenJDK-&openjdk-version;-bin" &&
-export CLASSPATH=".:/usr/share/java" &&
+export CLASSPATH=".:/usr/share/java" &&
export PATH="${PATH}:${JAVA_HOME}/bin"</userinput></screen>
<para>The binary version is now installed. If you don't want to compile the
@@ -347,7 +347,7 @@
not installed the js.jar file in another way, do so with the following
commands as the <systemitem class="username">root</systemitem> user:</para>
-<screen role="root"><userinput>unzip ../../rhino1_7R3.zip &&
+<screen role="root"><userinput>unzip ../../rhino1_7R3.zip &&
install -v -d -m755 /usr/share/java &&
install -v -m755 rhino1_7R3/*.jar /usr/share/java</userinput></screen>
@@ -357,13 +357,13 @@
source license. Put all of the individual components into the source tree
with the following commands:</para>
-<screen><userinput>cp -v ../corba.tar.gz . &&
-cp -v ../hotspot.tar.gz . &&
-cp -v ../jaxp.tar.gz . &&
-cp -v ../jaxws.tar.gz . &&
-cp -v ../jdk.tar.gz . &&
+<screen><userinput>cp -v ../corba.tar.gz . &&
+cp -v ../hotspot.tar.gz . &&
+cp -v ../jaxp.tar.gz . &&
+cp -v ../jaxws.tar.gz . &&
+cp -v ../jdk.tar.gz . &&
cp -v ../langtools.tar.gz . &&
-cp -v ../openjdk.tar.gz .</userinput></screen>
+cp -v ../openjdk.tar.gz .</userinput></screen>
<para>Apply a patch to generate a valid cacerts file using the system CA
certificates:</para>
Modified: trunk/BOOK/general/prog/svnserver.xml
===================================================================
--- trunk/BOOK/general/prog/svnserver.xml 2012-06-07 11:38:52 UTC (rev
10277)
+++ trunk/BOOK/general/prog/svnserver.xml 2012-06-07 20:38:04 UTC (rev
10278)
@@ -134,21 +134,21 @@
<filename>svntest/</filename>. You'll need to setup a directory
tree similar to the following:</para>
-<screen><literal> svntest/ # The name of the repository
- trunk/ # Contains the existing source tree
- BOOK/
- bootscripts/
- edguide/
- patches/
- scripts/
- branches/ # Needed for additional branches
- tags/ # Needed for tagging release
points</literal></screen>
+<screen><literal>svntest/ # The name of the repository
+ trunk/ # Contains the existing source tree
+ BOOK/
+ bootscripts/
+ edguide/
+ patches/
+ scripts/
+ branches/ # Needed for additional branches
+ tags/ # Needed for tagging release points</literal></screen>
<para>Once you've created your directory layout as shown above, you
are ready to do the initial import:</para>
<screen role="root"><userinput>svn import -m "Initial import." \
- <replaceable></path/to/source/tree></replaceable> \
+ <replaceable></path/to/source/tree></replaceable> \
file:///srv/svn/repositories/svntest</userinput></screen>
<para>Now change owner and group information on the
@@ -156,9 +156,9 @@
<systemitem class="groupname">svn</systemitem> and
<systemitem class="groupname">svntest</systemitem> groups:</para>
-<screen role="root"><userinput>chown -R svn:svntest
/srv/svn/repositories/svntest &&
-chmod -R g+w /srv/svn/repositories/svntest &&
-chmod g+s /srv/svn/repositories/svntest/db &&
+<screen role="root"><userinput>chown -R svn:svntest
/srv/svn/repositories/svntest &&
+chmod -R g+w /srv/svn/repositories/svntest &&
+chmod g+s /srv/svn/repositories/svntest/db &&
usermod -G svn,svntest -a
<replaceable><username></replaceable></userinput></screen>
<para><systemitem class="groupname">svntest</systemitem> is the group
@@ -208,7 +208,8 @@
repository using the following commands:</para>
<screen role="root"><userinput>cp
/srv/svn/repositories/svntest/conf/svnserve.conf \
- /srv/svn/repositories/svntest/conf/svnserve.conf.default &&
+ /srv/svn/repositories/svntest/conf/svnserve.conf.default &&
+
cat > /srv/svn/repositories/svntest/conf/svnserve.conf << "EOF"
<literal>[general]
anon-access = read
@@ -224,7 +225,7 @@
<sect3 id="svnserver-init">
<title>4. Starting the Server</title>
-
+<!--
<para>There are a couple of ways to start <command>svnserve</command>.
The most common way is to start it as an <command>inetd</command> or
<command>xinetd</command> process. Alternately, you can use a
@@ -272,11 +273,10 @@
}
# End /etc/xinetd.d/svn</literal>
-EOF</userinput></screen>
+EOF</userinput></screen> -->
- <para>Finally, if you wish to simply start the server at
- startup, install the svn bootscript included in the
- <xref linkend="bootscripts"/> package.</para>
+ <para>To start the server at boot time, install the svn bootscript
included
+ in the <xref linkend="bootscripts"/> package.</para>
<indexterm zone="svnserver svnserver-init">
<primary sortas="f-svn">svn</primary>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-06-07 11:38:52 UTC
(rev 10277)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-06-07 20:38:04 UTC
(rev 10278)
@@ -45,6 +45,10 @@
<para>June 7th, 2012</para>
<itemizedlist>
<listitem>
+ <para>[dj] - Updated subversion and cvs server instructions.
+ Fixes <ulink url="&blfs-ticket-root;3400">#3400</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[dj] - Added OpenJDK-1.7.0.4.</para>
</listitem>
<listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
