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: 15-Aug-2006 21:30:36
Branch: HEAD Handle: 2006081520303500
Modified files:
openpkg-src/ripe-dbase rc.ripe-dbase ripe-dbase-setup.sh ripe-dbase.spec
Log:
cleanup packaging and remove hard-coded MySQL username
Summary:
Revision Changes Path
1.12 +7 -7 openpkg-src/ripe-dbase/rc.ripe-dbase
1.5 +10 -8 openpkg-src/ripe-dbase/ripe-dbase-setup.sh
1.47 +1 -1 openpkg-src/ripe-dbase/ripe-dbase.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/rc.ripe-dbase
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.ripe-dbase
--- openpkg-src/ripe-dbase/rc.ripe-dbase 4 Aug 2004 10:33:36 -0000
1.11
+++ openpkg-src/ripe-dbase/rc.ripe-dbase 15 Aug 2006 19:30:35 -0000
1.12
@@ -16,26 +16,26 @@
%status -u @l_susr@ -o
ripe_dbase_usable="unknown"
ripe_dbase_active="no"
- rcService ripe-dbase enable yes && \
+ rcService ripe_dbase enable yes && \
ripe_dbase_signal 0 && ripe_dbase_active="yes"
echo "ripe_dbase_enable=\"$ripe_dbase_enable\""
echo "ripe_dbase_usable=\"$ripe_dbase_usable\""
echo "ripe_dbase_active=\"$ripe_dbase_active\""
%start -u @l_susr@
- rcService ripe-dbase enable yes || exit 0
- rcService ripe-dbase active yes && exit 0
+ rcService ripe_dbase enable yes || exit 0
+ rcService ripe_dbase active yes && exit 0
nohup @l_prefix@/bin/whois_rip -p ${ripe_dbase_pidfile} \
-c ${ripe_dbase_cfgfile} &
%stop -u @l_susr@
- rcService ripe-dbase enable yes || exit 0
- rcService ripe-dbase active no && exit 0
+ rcService ripe_dbase enable yes || exit 0
+ rcService ripe_dbase active no && exit 0
ripe_dbase_signal TERM
sleep 8
%restart -u @l_susr@
- rcService ripe-dbase enable yes || exit 0
- rcService ripe-dbase active no && exit 0
+ rcService ripe_dbase enable yes || exit 0
+ rcService ripe_dbase active no && exit 0
rc ripe-dbase stop start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase-setup.sh
============================================================================
$ cvs diff -u -r1.4 -r1.5 ripe-dbase-setup.sh
--- openpkg-src/ripe-dbase/ripe-dbase-setup.sh 23 Dec 2003 18:00:30
-0000 1.4
+++ openpkg-src/ripe-dbase/ripe-dbase-setup.sh 15 Aug 2006 19:30:35
-0000 1.5
@@ -3,24 +3,26 @@
## ripedb-setup
##
-# determine MySQL root password
+# determine MySQL administrator username/password
+username=`grep "^user" @l_prefix@/etc/mysql/my.pwd |\
+ sed -e 's;^user[^=]*= *;;' -e 's; *$;;'`
password=`grep "^password" @l_prefix@/etc/mysql/my.pwd |\
sed -e 's;^password[^=]*= *;;' -e 's; *$;;'`
# create a MySQL username/password for RIPEDB and RIPADMIN
[EMAIL PROTECTED]@/bin/mysql --user=root --password=$password mysql <<EOF
[EMAIL PROTECTED]@/bin/mysql --user=$username --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
[EMAIL PROTECTED]@/bin/mysqladmin --user=$username --password=$password
create RIPEDB
[EMAIL PROTECTED]@/bin/mysql --user=$username --password=$password RIPEDB
<@l_prefix@/libexec/ripe-dbase/SQL/create.tables.sql
[EMAIL PROTECTED]@/bin/mysql --user=$username --password=$password RIPEDB
<@l_prefix@/libexec/ripe-dbase/SQL/main.index.1
[EMAIL PROTECTED]@/bin/mysql --user=$username --password=$password RIPEDB
<@l_prefix@/libexec/ripe-dbase/SQL/aux.index.2
[EMAIL PROTECTED]@/bin/mysql --user=$username --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
[EMAIL PROTECTED]@/bin/mysql --user=$username --password=$password
<@l_prefix@/libexec/ripe-dbase/SQL/create.RIPADMIN.sql
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ripe-dbase/ripe-dbase.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 ripe-dbase.spec
--- openpkg-src/ripe-dbase/ripe-dbase.spec 16 May 2006 06:59:48 -0000
1.46
+++ openpkg-src/ripe-dbase/ripe-dbase.spec 15 Aug 2006 19:30:35 -0000
1.47
@@ -33,7 +33,7 @@
Group: Database
License: RIPE NCC
Version: 3.2.0
-Release: 20060516
+Release: 20060815
# package options
%option with_extobjs no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
