geos_one/CASA
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scripts modified with -fstack-protect option, and micasad was updated to support try-restart and status commands.

Browse Source
This commit is contained in:
Cameron (Kamran) Mashayekhi
2006-02-13 16:52:25 +00:00
parent ec458809d0
commit 4c374e507d
13 changed files with 84 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CASA.changes
View File

@@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Feb 13 8:50:22 MST 2006 - cmashayekhi@novell.com
- compiler option -fstack-protector was added to the build scripts
- buffer overflow in pam-sscs.c was fixed.
- try-restart and status command line options were added to the
micad script and CASA.spec was updated
-------------------------------------------------------------------
Thu Feb 9 13:57:41 CET 2006 - meissner@suse.de
- disabled CASA by default again. #147934
- fixed file lists
- actually builds on all Mono supporting platforms now.
-------------------------------------------------------------------
Thu Feb 9 02:19:05 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 8 17:45:50 MST 2006 - cmashayekhi@novell.com Wed Feb 8 17:45:50 MST 2006 - cmashayekhi@novell.com

44
c_micasad/startup/micasad
View File

@@ -30,34 +30,66 @@ rc_reset
case "$1" in case "$1" in
start) start)
echo -n "Starting miCASA daemon" echo "Starting miCASA daemon"
startproc -f $MICASAD_BIN startproc -f $MICASAD_BIN
# Remember status and be verbose # Remember status and be verbose
rc_status -v rc_status -v
;; ;;
stop) stop)
echo -n "Shutting miCASA daemon down" echo "Shutting miCASA daemon down"
#killproc -TERM $MICASAD_BIN #killproc -TERM $MICASAD_BIN
pid=`cat /var/run/micasad.pid` pid=`cat /var/run/micasad.pid` > /dev/null 2>&1
kill -s TERM $pid kill -s TERM $pid > /dev/null 2>&1
# Remember status and be verbose # Remember status and be verbose
rc_status -v rc_status -v
;; ;;
try-restart|condrestart)
# $0 status >/dev/null && $0 restart
$0 restart
rc_status
;;
restart) restart)
## Stop the service and regardless of whether it was ## Stop the service and regardless of whether it was
## running or not, start it again. ## running or not, start it again.
echo -n "Restarting miCASA daemon" echo "Restarting miCASA daemon"
$0 stop $0 stop
$0 start $0 start
# Remember status and be quiet # Remember status and be quiet
rc_status rc_status
;; ;;
status)
echo "Checking for service micasad ..."
checkproc micasad
if [ $? == 0 ]
then
echo -n "0 - service up and running"
elif [ $? == 1 ]
then
echo -n "1 - service dead, but /var/run/pid file exists"
elif [ $? == 2 ]
then
echo -n "2 - service dead, but /var/lock/lock file exists"
elif [ $? == 3 ]
then
echo -n "3 - service not running (unused)"
elif [ $? == 4 ]
then
echo -n "4 - service status unknown"
else
echo -n "5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)"
fi
rc_status -v
;;
*) *)
echo "Usage: $0 {start|stop|restart}" echo "Usage: $0 {start|stop|restart|try-restart|status}"
exit 1 exit 1
;; ;;
esac esac

25
shsrc/lshsrc/CASA.spec
View File

@@ -12,6 +12,7 @@
# neededforbuild glade-sharp gnome-filesystem mono mono-core gtk2-devel gtk2 gtk-sharp gtk-sharp-gapi glib-sharp glib2 glib2-devel qt3-devel gcc-c++ kdeutils3 kdelibs3-devel kdelibs3 qt3 qt3-devel kdesdk3 libstdc++-devel pkgconfig gnome-keyring gnome-keyring-devel glib-devel glib pam pam-devel java2 krb5-devel libgssapi # neededforbuild glade-sharp gnome-filesystem mono mono-core gtk2-devel gtk2 gtk-sharp gtk-sharp-gapi glib-sharp glib2 glib2-devel qt3-devel gcc-c++ kdeutils3 kdelibs3-devel kdelibs3 qt3 qt3-devel kdesdk3 libstdc++-devel pkgconfig gnome-keyring gnome-keyring-devel glib-devel glib pam pam-devel java2 krb5-devel libgssapi
Name: CASA Name: CASA
# Provo auto build does not hav the BuildRequires option yet... next line is for Germany.
#BuildRequires: glade-sharp gnome-filesystem mono mono-core gtk2-devel gtk2 gtk-sharp gtk-sharp-gapi glib-sharp glib2 glib2-devel qt3-devel gcc-c++ kdeutils3 kdelibs3-devel kdelibs3 qt3 qt3-devel kdesdk3 libstdc++-devel pkgconfig gnome-keyring gnome-keyring-devel glib-devel glib pam pam-devel java2 krb5-devel libgssapi #BuildRequires: glade-sharp gnome-filesystem mono mono-core gtk2-devel gtk2 gtk-sharp gtk-sharp-gapi glib-sharp glib2 glib2-devel qt3-devel gcc-c++ kdeutils3 kdelibs3-devel kdelibs3 qt3 qt3-devel kdesdk3 libstdc++-devel pkgconfig gnome-keyring gnome-keyring-devel glib-devel glib pam pam-devel java2 krb5-devel libgssapi
URL: http://www.novell.com/products URL: http://www.novell.com/products
%define prefix /usr/share/doc/packages %define prefix /usr/share/doc/packages
@@ -149,18 +150,24 @@ echo "/usr/%{_lib}/" >> %{buildroot}/etc/ld.so.conf.d/CASA.conf
%post %post
if [ $1 -eq 1 ] && [ $1 -eq 2 ]
then
insserv /etc/init.d/micasad
casacfgpam
# /etc/init.d/micasad start
fi
if [ $1 -eq 1 ] if [ $1 -eq 1 ]
then then
insserv /etc/init.d/micasad
casacfgpam
/etc/init.d/micasad start /etc/init.d/micasad start
fi fi
if [ $1 -eq 2 ]
then #if [ $1 -eq 2 ]
insserv /etc/init.d/micasad #then
casacfgpam # insserv /etc/init.d/micasad
/etc/init.d/micasad restart # casacfgpam
fi # /etc/init.d/micasad restart
#fi
/sbin/ldconfig /sbin/ldconfig
%post gui %post gui
@@ -174,7 +181,7 @@ fi
%postun %postun
# %restart_on_update micasad *** This macro is not working *** %restart_on_update
%insserv_cleanup %insserv_cleanup
/sbin/ldconfig /sbin/ldconfig

2
shsrc/lshsrc/mk-authkrb5token-ol
View File

@@ -20,7 +20,7 @@ fi
cd $PR/auth_token/krb5_token/linux cd $PR/auth_token/krb5_token/linux
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"../..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"../..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -fstack-protector -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)

2
shsrc/lshsrc/mk-authtoken-ol
View File

@@ -20,7 +20,7 @@ fi
cd $PR/auth_token/linux cd $PR/auth_token/linux
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -fstack-protector -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)

2
shsrc/lshsrc/mk-clientlogin-ol
View File

@@ -19,7 +19,7 @@ ARCH_LIB=
fi fi
cd $PR/c_clientlogin cd $PR/c_clientlogin
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall " $2 $3 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $5)
RCODE=$? RCODE=$?
cp ./Release/nwautologin ../bin/lux/ndbg/. cp ./Release/nwautologin ../bin/lux/ndbg/.

2
shsrc/lshsrc/mk-jmicasa-ol
View File

@@ -42,7 +42,7 @@ exit $RCODE
fi fi
cd ../jnsscs cd ../jnsscs
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-I\"$JAVA_HOME/include\" -I\"$JAVA_HOME/include/linux\" -DDEBUG -g -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-I\"$JAVA_HOME/include\" -I\"$JAVA_HOME/include/linux\" -DDEBUG -g -DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)

2
shsrc/lshsrc/mk-loginpam-ol
View File

@@ -20,7 +20,7 @@ fi
cd $PR/login_capture/PAM cd $PR/login_capture/PAM
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fno-strict-aliasing " $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fno-strict-aliasing -fstack-protector" $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)

2
shsrc/lshsrc/mk-micasa_gk-ol
View File

@@ -22,7 +22,7 @@ fi
export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig export PKG_CONFIG_PATH=/usr/lib$ARCH_LIB/pkgconfig:/opt/gnome/lib$ARCH_LIB/pkgconfig:/usr/local/lib$ARCH_LIB/pkgconfig
cd $PR/c_adlib/ad_gk/native cd $PR/c_adlib/ad_gk/native
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags gnome-keyring-1` `pkg-config --libs gnome-keyring-1` `pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="`pkg-config --cflags gnome-keyring-1` `pkg-config --libs gnome-keyring-1` `pkg-config --cflags glib-2.0` `pkg-config --libs glib-2.0` -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)

2
shsrc/lshsrc/mk-micasa_kw-ol
View File

@@ -24,7 +24,7 @@ fi
#(ln -f $COMMON_FILES $PR/c_micasadk) #(ln -f $COMMON_FILES $PR/c_micasadk)
cd $PR/c_adlib/ad_kw/native cd $PR/c_adlib/ad_kw/native
moc kwallets_rw.h -o kwallets_rw.moc moc kwallets_rw.h -o kwallets_rw.moc
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -g" $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I/opt/kde3/include -I/usr/lib/qt3/include -I/usr/X11R6/include -DSSCS_LINUX_PLAT_F -DQT_THREAD_SUPPORT -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAS -O2 -fmessage-length=0 -Wall -fstack-protector -g" $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
rm kwallets_rw.moc rm kwallets_rw.moc

2
shsrc/lshsrc/mk-micasacache-ol
View File

@@ -20,7 +20,7 @@ fi
cd $PR/c_micasacache cd $PR/c_micasacache
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=lib XTRA=ndbg MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)

2
shsrc/lshsrc/mk-micasadk-ol
View File

@@ -23,7 +23,7 @@ cd $PR/c_common
COMMON_FILES=$(ls) COMMON_FILES=$(ls)
(ln -f $COMMON_FILES $PR/c_micasadk) (ln -f $COMMON_FILES $PR/c_micasadk)
cd $PR/c_micasadk cd $PR/c_micasadk
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall" $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MODULE=shared MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-DSSCS_LINUX_PLAT_F -O2 -fmessage-length=0 -Wall -fstack-protector" $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)

2
shsrc/lshsrc/mk-pamauthtoken-ol
View File

@@ -20,7 +20,7 @@ fi
cd $PR/auth_token/PAM cd $PR/auth_token/PAM
(make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5) (make -I $PR/make -f Makefile ROOT=$PR PLAT=lux MIN_NUM=\"$MIN_SSS_NO\" PROD_NUM=\"$MAJ_SSS_NO\" BLD_VER=\"$BLD_NO\" ARC=\"$ARCH_LIB\" XTRA=ndbg XTRA_CFLAGS="-I\".\" -I\"..\" -DSSCS_LINUX_PLAT_F -02 -fmessage-length=0 -Wall -fstack-protector -Wno-format-extra-args -fno-strict-aliasing " $2 $3 $4 $5)
RCODE=$? RCODE=$?
rm -f $COMMON_FILES rm -f $COMMON_FILES
if(test $RCODE != 0) if(test $RCODE != 0)