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: 16-Dec-2003 18:06:22
Branch: HEAD Handle: 2003121617061902
Modified files:
openpkg-src/ripe-dbase ripe-dbase-setup.sh ripe-dbase.spec
openpkg-web news.txt
Log:
align with MySQL, and advance default SQL schema creation script
Summary:
Revision Changes Path
1.2 +20 -9 openpkg-src/ripe-dbase/ripe-dbase-setup.sh
1.7 +5 -1 openpkg-src/ripe-dbase/ripe-dbase.spec
1.7780 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase-setup.sh
============================================================================
$ cvs diff -u -r1.1 -r1.2 ripe-dbase-setup.sh
--- openpkg-src/ripe-dbase/ripe-dbase-setup.sh 5 Dec 2003 17:07:08 -0000
1.1
+++ openpkg-src/ripe-dbase/ripe-dbase-setup.sh 16 Dec 2003 17:06:21 -0000
1.2
@@ -7,19 +7,30 @@
password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
-# create the MySQL database for RIPE
-# FIXME: possible reuse scripts from original distribution
[EMAIL PROTECTED]@/libexec/ripe-dbase/make_db
[EMAIL PROTECTED]@/libexec/ripe-dbase/make_mysql_user
[EMAIL PROTECTED]@/bin/mysqladmin --user=root --password=$password create ripe
+# 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
-# FIXME: probably suck RIPE objects vie FTP or their special protocol here
-## create the default RIPE database schema
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password ripe
<@l_prefix@/libexec/ripe-dbase/SQL/create.tables.sql
+# 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?
@l_prefix@/bin/mysql --user=root --password=$password mysql <<EOF
-GRANT ALL ON ripe.* TO [EMAIL PROTECTED] IDENTIFIED BY 'ripe';
+GRANT ALL ON RIPADMIN.* TO [EMAIL PROTECTED] IDENTIFIED BY 'RIPADMIN';
FLUSH PRIVILEGES;
EOF
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 ripe-dbase.spec
--- openpkg-src/ripe-dbase/ripe-dbase.spec 15 Dec 2003 17:19:12 -0000 1.6
+++ openpkg-src/ripe-dbase/ripe-dbase.spec 16 Dec 2003 17:06:21 -0000 1.7
@@ -27,6 +27,7 @@
# 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
@@ -38,7 +39,7 @@
Group: Database
License: RIPE NCC
Version: 3.2.0
-Release: 20031215
+Release: 20031216
# list of sources
Source0: ftp://ftp.ripe.net/ripe/dbase/software/ripe-dbase-%{version}.tar.gz
@@ -67,6 +68,9 @@
%prep
%setup -q
%patch -p0
+ %{l_shtool} subst \
+ -e 's;^RIPADMIN sqlhost,3306,dbuser,dbpsw,RIPADMIN;RIPADMIN
localhost,3306,root,pwd,RIPADMIN;' \
+ conf/rip.conf.sample
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7779 -r1.7780 news.txt
--- openpkg-web/news.txt 16 Dec 2003 14:07:26 -0000 1.7779
+++ openpkg-web/news.txt 16 Dec 2003 17:06:19 -0000 1.7780
@@ -1,3 +1,4 @@
+16-Dec-2003: Upgraded package: P<ripe-dbase-3.2.0-20031216>
16-Dec-2003: New package: P<radiator-3.7.1-20031216>
16-Dec-2003: Upgraded package: P<grepmail-5.22-20031216>
16-Dec-2003: Upgraded package: P<perl-sys-20031216-20031216>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
