OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 22-Dec-2003 18:22:58
Branch: HEAD Handle: 2003122217225602
Modified files:
openpkg-src/ripe-dbase ripe-dbase.spec
openpkg-web news.txt
Log:
add missing substitutions, handle bad default data tarball name for
make_db script, and improve postinstall instructions text
Summary:
Revision Changes Path
1.10 +29 -16 openpkg-src/ripe-dbase/ripe-dbase.spec
1.7864 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.spec
============================================================================
$ cvs diff -u -r1.9 -r1.10 ripe-dbase.spec
--- openpkg-src/ripe-dbase/ripe-dbase.spec 19 Dec 2003 17:17:51 -0000 1.9
+++ openpkg-src/ripe-dbase/ripe-dbase.spec 22 Dec 2003 17:22:58 -0000 1.10
@@ -36,7 +36,7 @@
Group: Database
License: RIPE NCC
Version: 3.2.0
-Release: 20031219
+Release: 20031222
# list of sources
Source0: ftp://ftp.ripe.net/ripe/dbase/software/ripe-dbase-%{version}.tar.gz
@@ -67,15 +67,19 @@
%patch -p0
%{l_shtool} subst \
-e 's;^RIPADMIN sqlhost,3306,dbuser,dbpsw,RIPADMIN;RIPADMIN
localhost,3306,root,pwd,RIPADMIN;' \
- -e 's;^UPDSOURCE SAMPLE sqlhost,3306,dbuser,dbpsw,SAMPLEDB
whois.mydb.net,43001,43004;UPDSOURCE SAMPLE localhost,3306,root,pwd,RIPEDB
whois.mydb.net,43001,43004;' \
+ -e 's;^UPDSOURCE SAMPLE sqlhost,3306,dbuser,dbpsw,SAMPLEDB
whois.mydb.net,43001,43004;UPDSOURCE RIPE localhost,3306,root,pwd,RIPEDB
localhost,43001,43004;' \
conf/rip.config.sample.in
%{l_shtool} subst \
-e 's;^\(DATABASE.*\)SAMPLEDB;\1RIPEDB;' \
+ -e 's;^\(SOURCE.*\)SAMPLE;\1RIPE;' \
-e 's;^\(database.*\)SAMPLEDB;\1RIPEDB;' \
-e 's;^\(host:.*\)sqlhost;\1localhost;' \
-e 's;^\(user:.*\)dbuser;\1root;' \
-e 's;^\(password:.*\)dbpsw;\1pwd;' \
conf/sources.config.sample
+ %{l_shtool} subst \
+ -e 's;sample.db.gz;ripe.db.gz;' \
+ bin/load/make_db.in
%build
CC="%{l_cc}" \
@@ -127,24 +131,33 @@
if [ $1 -eq 1 ]; then
# display final hints on initial installation
( echo "1. To complete this installation of the RIPE Whois server,"
- echo " please start MySQL and initialize the database like this:"
+ echo " please change all 'pwd' text in the following files:"
+ echo " \$ $RPM_INSTALL_PREFIX/etc/ripe-dbase/rip.config.sample"
+ echo " \$ $RPM_INSTALL_PREFIX/etc/ripe-dbase/sources.config.sample"
+ echo " The text should match the MySQL password stored in:"
+ echo " \$ $RPM_INSTALL_PREFIX/etc/mysql/my.pwd"
+ echo ""
+ echo "2. Now start the MySQL server:"
echo " \$ $RPM_INSTALL_PREFIX/etc/rc mysql start"
- echo " \$ $RPM_INSTALL_PREFIX/sbin/ripe-dbase-setup"
echo ""
- echo "2. Although the RIPE Whois server is ready to run, it has no"
- echo " data to serve yet. As an optional step, download this data"
- echo " from RIPE and integrate it into the database:"
- echo " \$ cd $RPM_INSTALL_PREFIX/var/ripe-dbase/tmp/load/RIPE"
- echo " \$ ftp ftp.ripe.net"
- echo " \$ get ripe/dbase/ripe.db.gz"
- echo " \$ get ripe/dbase/RIPE.CURRENTSERIAL"
- echo " \$ quit
- echo " \$ gzip -d ripe.db.gz"
- echo " \$ $RPM_INSTALL_PREFIX/libexec/ripe-dbase/make_db \\"
+ echo "Choose to either use the WHOIS server with (3a) no initial data,"
+ echo "or (3b) the full contents of the current RIPE database snapshot."
+ echo ""
+ echo "3a. To begin using the WHOIS server with an empty RIPE database,
run:"
+ echo " \$ $RPM_INSTALL_PREFIX/sbin/ripe-dbase-setup"
+ echo ""
+ echo "3b. To begin using the WHOIS server with actual RIPE data, do the"
+ echo "following. This step can take many hours due to downloading"
+ echo "ripe.db.gz (~60 Mb) and make_db data importing:"
+ echo " \$ cd $RPM_INSTALL_PREFIX/var/ripe-dbase/tmp/load/RIPE"
+ echo " \$ ftp ftp.ripe.net:ripe/dbase"
+ echo " \$ mget RIPE.CURRENTSERIAL ripe.db.gz"
+ echo " \$ quit"
+ echo " \$ $RPM_INSTALL_PREFIX/libexec/ripe-dbase/make_db \\"
echo " -c $RPM_INSTALL_PREFIX/etc/ripe-dbase/rip.config.sample
\\"
- echo " -s
$RPM_INSTALL_PREFIX/var/ripe-dbase/tmp/load/RIPE/ripe.db -1"
+ echo " -s RIPE -1"
echo ""
- echo "3. Start the server by running:"
+ echo "4. Finally start the WHOIS server by running:"
echo " \$ $RPM_INSTALL_PREFIX/etc/rc ripe-dbase start"
) | %{l_rpmtool} msg -b -t notice
fi
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7863 -r1.7864 news.txt
--- openpkg-web/news.txt 22 Dec 2003 07:26:11 -0000 1.7863
+++ openpkg-web/news.txt 22 Dec 2003 17:22:56 -0000 1.7864
@@ -1,3 +1,4 @@
+22-Dec-2003: Upgraded package: P<ripe-dbase-3.2.0-20031222>
22-Dec-2003: Upgraded package: P<gnutls-1.0.3-20031222>
22-Dec-2003: Upgraded package: P<perl-tk-20031222-20031222>
22-Dec-2003: New package: P<afio-2.5-20031222>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
