[Xedeb-commits] jlbec commits r20 - in trunk: debian/server sources
svn-commits@oss.oracle.com
svn-commits at oss.oracle.com
Wed Feb 1 12:51:43 CST 2006
Author: jlbec
Date: 2006-02-01 12:43:43 -0600 (Wed, 01 Feb 2006)
New Revision: 20
Modified:
trunk/debian/server/changelog
trunk/debian/server/oracle-xe.install
trunk/debian/server/postinst
trunk/debian/server/preinst
trunk/sources/oracle-xe-10.2.0.1.tar.gz
trunk/sources/oracle_server.spec
Log:
o Updated the server to the 20060112 label.
Modified: trunk/debian/server/changelog
===================================================================
--- trunk/debian/server/changelog 2005-12-15 22:41:30 UTC (rev 19)
+++ trunk/debian/server/changelog 2006-02-01 18:43:43 UTC (rev 20)
@@ -1,3 +1,15 @@
+oracle-xe (10.2.0.1-0.7) unstable; urgency=low
+
+ * Sync up latest XE (20060112)
+
+ -- Joel Becker <joel.becker at oracle.com> Tue, 24 Jan 2006 15:07:35 -0800
+
+oracle-xe (10.2.0.1-0.6) unstable; urgency=low
+
+ * Sync up latest XE (20051221)
+
+ -- Joel Becker <joel.becker at oracle.com> Fri, 23 Dec 2005 17:07:35 -0800
+
oracle-xe (10.2.0.1-0.5) unstable; urgency=low
* Sync up latest XE
Modified: trunk/debian/server/oracle-xe.install
===================================================================
--- trunk/debian/server/oracle-xe.install 2005-12-15 22:41:30 UTC (rev 19)
+++ trunk/debian/server/oracle-xe.install 2006-02-01 18:43:43 UTC (rev 20)
@@ -24,6 +24,7 @@
debian/tmp/usr/share/applications/oraclexe-gotoonlineforum.desktop
debian/tmp/usr/share/applications/oraclexe-readdocumentation.desktop
debian/tmp/usr/share/applications/oraclexe-registerforonlineforum.desktop
+debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/runsqlplus.sh
debian/tmp/usr/share/applications/oraclexe-runsql.desktop
debian/tmp/usr/share/applications/oraclexe-startdb.desktop
debian/tmp/usr/share/applications/oraclexe-stopdb.desktop
Modified: trunk/debian/server/postinst
===================================================================
--- trunk/debian/server/postinst 2005-12-15 22:41:30 UTC (rev 19)
+++ trunk/debian/server/postinst 2006-02-01 18:43:43 UTC (rev 20)
@@ -2,7 +2,7 @@
#DEBHELPER#
-echo "Executing Post-install steps.........."
+echo "Executing Post-install steps..."
if `grep -q ^dba: /etc/group`
then
echo ""
@@ -23,21 +23,8 @@
/usr/sbin/useradd -g dba -d /usr/lib/oracle/xe -s /bin/bash oracle
fi
-#if `grep -q oraclexe /etc/passwd`
-#then
-# /usr/sbin/usermod -G dba oraclexe
-#else
-# /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oraclexe
-#fi
/bin/chown -R oracle:dba /usr/lib/oracle/xe
-#if [ -d /etc/init.d ]
-#then
-# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/init.d/oracle-xe
-#else
-# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/rc.d/init.d/oracle-xe
-#fi
-
# SGA & PGA algo
sgamin=146800640
pgamin=16777216
@@ -124,16 +111,23 @@
homedir=`sh -c "echo ~$USER"`
fi
-if [ "$homedir" != "/root" ]
+home=`echo $homedir | cut -d "/" -f2`
+
+drive=`df -l \/$home | head -2 | tail -1 | awk '{print $1}'`
+check=`expr match "$drive" '\(^/dev*\)'`
+if [ "$check" != "" ];
then
- if [ -d $homedir/.gnome-desktop ]
+ if [ "$homedir" != "/root" ]
then
- cp /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/.gnome-desktop
+ if [ -d $homedir/.gnome-desktop ]
+ then
+ cp -f /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/.gnome-desktop
+ fi
+ if [ -d $homedir/Desktop ]
+ then
+ cp -f /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/Desktop
+ fi
fi
- if [ -d $homedir/Desktop ]
- then
- cp /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/Desktop
- fi
fi
rm -fr /usr/lib/oracle/screenrc
Modified: trunk/debian/server/preinst
===================================================================
--- trunk/debian/server/preinst 2005-12-15 22:41:30 UTC (rev 19)
+++ trunk/debian/server/preinst 2006-02-01 18:43:43 UTC (rev 20)
@@ -13,13 +13,13 @@
# ORACLE_BASE must be unset
if `env | grep -q ORACLE_BASE`
then
- /bin/csh -c "unsetenv ORACLE_BASE"
+ unset ORACLE_BASE
fi
# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
- diskspace=`df -k /usr/lib/oracle | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
+ diskspace=`df -k /usr/lib/oracle | grep % | tr -s " " | cut -d" " -f4 | tail -1`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -29,7 +29,7 @@
exit 1
fi
else
- diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
+ diskspace=`df -k /usr/lib | grep % | tr -s " " | cut -d" " -f4 | tail -1`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -216,3 +216,6 @@
/sbin/sysctl -p > /dev/null
fi
+# Don't fail, even on sysctl errors
+exit 0
+
Modified: trunk/sources/oracle-xe-10.2.0.1.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/sources/oracle_server.spec
===================================================================
--- trunk/sources/oracle_server.spec 2005-12-15 22:41:30 UTC (rev 19)
+++ trunk/sources/oracle_server.spec 2006-02-01 18:43:43 UTC (rev 20)
@@ -33,13 +33,13 @@
# ORACLE_BASE must be unset
if `env | grep -q ORACLE_BASE`
then
- /bin/csh -c "unsetenv ORACLE_BASE"
+ /bin/sh -c "unset ORACLE_BASE"
fi
# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
- diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
+ diskspace=`df -k /usr/lib/oracle | grep % | tr -s " " | cut -d" " -f4 | tail -1`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -49,7 +49,7 @@
exit 1
fi
else
- diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
+ diskspace=`df -k /usr/lib | grep % | tr -s " " | cut -d" " -f4 | tail -1`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -259,14 +259,14 @@
make install
%post
-echo "Executing Post-install steps.........."
+echo "Executing Post-install steps..."
if `grep -q ^dba: /etc/group`
then
echo ""
else
/usr/sbin/groupadd dba
fi
-id oracle > /dev/null
+id oracle > /dev/null 2>&1
status=$?
if test $status -eq 0
then
@@ -280,23 +280,11 @@
/usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oracle
fi
-#if `grep -q oraclexe /etc/passwd`
-#then
-# /usr/sbin/usermod -G dba oraclexe
-#else
-# /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oraclexe
-#fi
/bin/chown -R oracle:dba /usr/lib/oracle/xe
/sbin/ldconfig >/dev/null
/bin/chown -R oracle:dba /usr/lib/oracle/xe
-#if [ -d /etc/init.d ]
-#then
-# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/init.d/oracle-xe
mkdir -p --mode=0755 ${RPM_BUILD_ROOT}/usr/share/pixmaps
-#else
-# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/rc.d/init.d/oracle-xe
-#fi
/bin/chmod 755 /etc/init.d/oracle-xe
/sbin/chkconfig --add oracle-xe
@@ -467,31 +455,22 @@
if [ -f /etc/xdg/menus/applications.menu ]
then
- cp -r /usr/share/desktop-menu-files/oraclexe-10g.directory /usr/share/desktop-directories/oraclexe-10g.directory
- cp -r /usr/share/desktop-menu-files/oraclexe-gethelp.directory /usr/share/desktop-directories/oraclexe-gethelp.directory
- cp -r /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe.menu /etc/xdg/menus
- if [ -f /tmp/applications.menu.tmp ]
- then
- (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp$$
- /bin/chmod 664 /tmp/applications.menu.tmp$$
- cp -rf /tmp/applications.menu.tmp$$ /etc/xdg/menus/applications.menu
- else
- (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
- /bin/chmod 664 /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
- fi
+ cp -f /usr/share/desktop-menu-files/oraclexe-10g.directory /usr/share/desktop-directories/oraclexe-10g.directory
+ cp -f /usr/share/desktop-menu-files/oraclexe-gethelp.directory /usr/share/desktop-directories/oraclexe-gethelp.directory
+ cp -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe.menu /etc/xdg/menus
+ sed -i '1,/<\/Menu>/ { /<\/Menu>/ r /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu
+ }' /etc/xdg/menus/applications.menu
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- if [ -f /tmp/applications.menu.tmp ]
- then
- (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp$$
- /bin/chmod 664 /tmp/applications.menu.tmp$$
- cp -rf /tmp/applications.menu.tmp$$ /etc/X11/desktop-menus/applications.menu
- else
- (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
- /bin/chmod 664 /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
- fi
+ sed -i '1,/<\/Query>/ { /<\/Query>/ r /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu
+ }' /etc/X11/desktop-menus/applications.menu
+elif [ -f /etc/xdg/menus/applications-merged/kde-essential.menu ]
+then
+ cp -f /usr/share/desktop-menu-files/oraclexe-10g.directory /usr/share/desktop-directories/oraclexe-10g.directory
+ cp -f /usr/share/desktop-menu-files/oraclexe-gethelp.directory /usr/share/desktop-directories/oraclexe-gethelp.directory
+ cp -f /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe.menu /etc/xdg/menus
+ sed -i '1,/<\/Menu>/ { /<\/Menu>/ r /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-asianux.menu
+ }' /etc/xdg/menus/applications-merged/kde-essential.menu
fi
homedir=`echo $HOME`
@@ -500,24 +479,25 @@
homedir=`sh -c "echo ~$USER"`
fi
-if [ "$homedir" != "/root" ]
+home=`echo $homedir | cut -d "/" -f2`
+
+drive=`df -l \/$home | head -2 | tail -1 | awk '{print $1}'`
+check=`expr match "$drive" '\(^/dev*\)'`
+if [ "$check" != "" ];
then
- if [ -d $homedir/.gnome-desktop ]
+ if [ "$homedir" != "/root" ]
then
- cp /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/.gnome-desktop
+ if [ -d $homedir/.gnome-desktop ]
+ then
+ cp -f /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/.gnome-desktop
+ fi
+ if [ -d $homedir/Desktop ]
+ then
+ cp -f /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/Desktop
+ fi
fi
- if [ -d $homedir/Desktop ]
- then
- cp /usr/share/applications/oraclexe-getstarteddesktop.desktop $homedir/Desktop
- fi
fi
-if test -f /tmp/applications.menu.tmp$$
-then
- rm -fr /tmp/applications.menu.tmp$$
-else
- rm -fr /tmp/applications.menu.tmp
-fi
rm -fr /usr/lib/oracle/screenrc
rm -fr /usr/lib/oracle/gtkrc
rm -fr /usr/lib/oracle/emacs
@@ -528,6 +508,11 @@
rm -fr /usr/lib/oracle/bashrc-DEFAULT
rm -fr /usr/lib/oracle/bashrc_logout
rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/rdbms/admin/patch
+/bin/sed -i 's/\$MKDIR/\/bin\/mkdir/g' /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/install/sqlnet/setowner.sh
+/bin/sed -i 's/\$CHMOD/\/bin\/chmod/g' /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/install/sqlnet/setowner.sh
+/bin/sed -i 's/\$CHOWN/\/bin\/chown/g' /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/install/sqlnet/setowner.sh
+sh /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/install/sqlnet/setowner.sh
+
echo -e "You must run '/etc/init.d/oracle-xe configure' as the root user to
configure the database."
echo
@@ -572,6 +557,7 @@
rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/server
rm -fr /usr/lib/oracle/xe/app/oracle/doc
+rm -fr /usr/share/doc/oracle_xe
rm -fr /usr/share/desktop-menu-files/oraclexe-10g.directory
rm -fr /usr/share/desktop-menu-files/oraclexe-gethelp.directory
rm -fr /var/lib/menu/kde/Applications/OracleXE
@@ -579,41 +565,23 @@
rm -fr /usr/share/gnome/vfolders/oraclexe-gethelp.directory
if [ -f /etc/xdg/menus/applications.menu ]
then
- rm -fr /usr/share/desktop-directories/oraclexe-10g.directory
- rm -fr /usr/share/desktop-directories/oraclexe-gethelp.directory
- rm -r /etc/xdg/menus/oraclexe.menu
- if [ -f /tmp/applications.menu ]
- then
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu$$
- /bin/chmod 664 /tmp/applications.menu$$
- cp -rf /tmp/applications.menu$$ /etc/xdg/menus/applications.menu
- else
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
- /bin/chmod 664 /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
- fi
+ rm -f /usr/share/desktop-directories/oraclexe-10g.directory
+ rm -f /usr/share/desktop-directories/oraclexe-gethelp.directory
+ rm -f /etc/xdg/menus/oraclexe.menu
+
+ sed -i '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/d' /etc/xdg/menus/applications.menu
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- if [ -f /tmp/applications.menu ]
- then
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu$$
- /bin/chmod 664 /tmp/applications.menu$$
- cp -rf /tmp/applications.menu$$ /etc/X11/desktop-menus/applications.menu
- else
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
- /bin/chmod 664 /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
-
- fi
-fi
-
-if test -f /tmp/applications.menu$$
+ sed -i '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/d' /etc/X11/desktop-menus/applications.menu
+elif [ -f /etc/xdg/menus/applications-merged/kde-essential.menu ]
then
- rm -fr /tmp/applications.menu$$
-else
- rm -fr /tmp/applications.menu
+ rm -f /usr/share/desktop-directories/oraclexe-10g.directory
+ rm -f /usr/share/desktop-directories/oraclexe-gethelp.directory
+ rm -f /etc/xdg/menus/oraclexe.menu
+ sed -i '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/d' /etc/xdg/menus/applications-merged/kde-essential.menu
fi
+
homedir=`echo $HOME`
if [ "$homedir" = "/root" ]
then
@@ -637,18 +605,22 @@
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/seeddb
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/log
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/backup.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/backupdatabase.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/cloneDBCreation.sql
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/CloneRmanRestore.sql
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/init.ora
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe.menu
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-asianux.menu
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/postScripts.sql
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/restore.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/restoredatabase.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/rmanRestoreDatafiles.sql
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/rmanBackup.sql
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/sqlplus.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/startdb.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/startdb.sql
@@ -663,6 +635,7 @@
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/readdocumentation.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/readonlinehelp.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/registerforonlineforum.sh
+/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/runsqlplus.sh
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/ctx
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/dbs
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/demo
@@ -695,12 +668,10 @@
/usr/share/man/man1/sqlldr.1.gz
/usr/share/doc/oracle_xe/LICENSE
/usr/share/pixmaps/*
-#/usr/share/applications/oraclexe-Backup.desktop
/usr/share/applications/oraclexe-dbhp.desktop
/usr/share/applications/oraclexe-gotoonlineforum.desktop
/usr/share/applications/oraclexe-readdocumentation.desktop
/usr/share/applications/oraclexe-registerforonlineforum.desktop
-#/usr/share/applications/oraclexe-Restore.desktop
/usr/share/applications/oraclexe-runsql.desktop
/usr/share/applications/oraclexe-startdb.desktop
/usr/share/applications/oraclexe-stopdb.desktop
@@ -709,14 +680,10 @@
/usr/share/applications/oraclexe-readonlinehelp.desktop
/usr/share/applications/oraclexe-backup.desktop
/usr/share/applications/oraclexe-restore.desktop
-#/var/lib/menu/kde/Applications/OracleXE.directory
-#/var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
/usr/share/gnome/vfolders/oraclexe-10g.directory
/usr/share/gnome/vfolders/oraclexe-gethelp.directory
/usr/share/desktop-menu-files/oraclexe-gethelp.directory
/usr/share/desktop-menu-files/oraclexe-10g.directory
-#/usr/share/desktop-directories/oraclexe-GetHelp.directory
-#/usr/share/desktop-directories/OracleXE.directory
/usr/lib/oracle/xe/app/oracle/doc
More information about the Xedeb-commits
mailing list