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: 17-Dec-2003 18:21:55
Branch: HEAD Handle: 2003121717215301
Modified files:
openpkg-src/ripe-dbase ripe-dbase-setup.sh ripe-dbase.spec
openpkg-web news.txt
Log:
fix database initialization and some config file paths and database
names
Summary:
Revision Changes Path
1.3 +14 -22 openpkg-src/ripe-dbase/ripe-dbase-setup.sh
1.8 +9 -4 openpkg-src/ripe-dbase/ripe-dbase.spec
1.7802 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase-setup.sh
============================================================================
$ cvs diff -u -r1.2 -r1.3 ripe-dbase-setup.sh
--- openpkg-src/ripe-dbase/ripe-dbase-setup.sh 16 Dec 2003 17:06:21 -0000
1.2
+++ openpkg-src/ripe-dbase/ripe-dbase-setup.sh 17 Dec 2003 17:21:54 -0000
1.3
@@ -7,30 +7,22 @@
password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
-# FIXME: Not sure about the database name here, because after all the
-# 'RIPADMIN' is created below by create.RIPADMIN.sql. The
-# 'create.tables.sql' should come first however, as is done in
-# example scripts in the vendor sources. It gets passed a variable
-# 'DB' which is very unclear. I guess I'll put 'RIPADMIN' in there,
-# though that is very suspicious becuase 'RIPADMIN' is possibly not
-# created yet (see first sentence in this FIXME).
[EMAIL PROTECTED]@/bin/mysqladmin --user=root --password=$password create RIPADMIN
-
-# create the default RIPE database schema
-# FIXME: Do we need all of this SQL code, and what is the meaning of one
-# pass or two pass database creation? Which do we want to do?
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPADMIN
<@l_prefix@/libexec/ripe-dbase/SQL/create.tables.sql
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password
<@l_prefix@/libexec/ripe-dbase/SQL/create.RIPADMIN.sql
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPADMIN
<@l_prefix@/libexec/ripe-dbase/SQL/main.index.1
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPADMIN
<@l_prefix@/libexec/ripe-dbase/SQL/aux.index.2
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPADMIN
<@l_prefix@/libexec/ripe-dbase/SQL/leaf.index.2
-
-# FIXME: Probably suck RIPE objects vie FTP or their special protocol here
-
-# create a MySQL username/password for RIPE
-# FIXME: Is this the database name that we should use for the first FIXME?
+# create a MySQL username/password for RIPEDB and RIPADMIN
@l_prefix@/bin/mysql --user=root --password=$password mysql <<EOF
+GRANT ALL ON RIPEDB.* TO [EMAIL PROTECTED] IDENTIFIED BY 'RIPEDB';
GRANT ALL ON RIPADMIN.* TO [EMAIL PROTECTED] IDENTIFIED BY 'RIPADMIN';
FLUSH PRIVILEGES;
EOF
+
+# create the default RIPEDB database schema
[EMAIL PROTECTED]@/bin/mysqladmin --user=root --password=$password create RIPEDB
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPEDB
<@l_prefix@/libexec/ripe-dbase/SQL/create.tables.sql
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPEDB
<@l_prefix@/libexec/ripe-dbase/SQL/main.index.1
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPEDB
<@l_prefix@/libexec/ripe-dbase/SQL/aux.index.2
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password RIPEDB
<@l_prefix@/libexec/ripe-dbase/SQL/leaf.index.2
+
+# create the default RIPADMIN database schema
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password
<@l_prefix@/libexec/ripe-dbase/SQL/create.RIPADMIN.sql
+
+# FIXME: Probably suck RIPE objects vie FTP or their special protocol here
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 ripe-dbase.spec
--- openpkg-src/ripe-dbase/ripe-dbase.spec 16 Dec 2003 17:06:21 -0000 1.7
+++ openpkg-src/ripe-dbase/ripe-dbase.spec 17 Dec 2003 17:21:54 -0000 1.8
@@ -24,10 +24,8 @@
##
# FIXME: rse: run-command script must be debugged
-# FIXME: rse: mysql database initialization must be debugged
# FIXME: rse: whois database data initial loading from RIPE NCC ftp service
snapshots?
# FIXME: rse: whois database data periodic updating from RIPE NCC
-# FIXME: ms: on ripe.config.sample line 579, depends on GnuPG?
# package information
Name: ripe-dbase
@@ -39,7 +37,7 @@
Group: Database
License: RIPE NCC
Version: 3.2.0
-Release: 20031216
+Release: 20031217
# list of sources
Source0: ftp://ftp.ripe.net/ripe/dbase/software/ripe-dbase-%{version}.tar.gz
@@ -70,7 +68,14 @@
%patch -p0
%{l_shtool} subst \
-e 's;^RIPADMIN sqlhost,3306,dbuser,dbpsw,RIPADMIN;RIPADMIN
localhost,3306,root,pwd,RIPADMIN;' \
- conf/rip.conf.sample
+ -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;' \
+ conf/rip.conf.sample.in
+ %{l_shtool} subst \
+ -e 's;^\(DATABASE.*\)SAMPLEDB;\1RIPEDB;' \
+ -e 's;^\(host:.*\)sqlhost;\1localhost;' \
+ -e 's;^\(user:.*\)dbuser;\1root;' \
+ -e 's;^\(password:.*\)dbpsw;\1pwd;' \
+ conf/sources.config.sample.in
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7801 -r1.7802 news.txt
--- openpkg-web/news.txt 17 Dec 2003 16:01:06 -0000 1.7801
+++ openpkg-web/news.txt 17 Dec 2003 17:21:53 -0000 1.7802
@@ -1,3 +1,4 @@
+17-Dec-2003: Upgraded package: P<ripe-dbase-3.2.0-20031217>
17-Dec-2003: Upgraded package: P<apache-1.3.29-20031217>
17-Dec-2003: Upgraded package: P<snmpdx-0.2.8-20031217>
17-Dec-2003: Upgraded package: P<pureftpd-1.0.17a-20031217>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
