Hello community, here is the log from the commit of package CASA_auth_token_svc checked in at Fri Nov 17 01:48:52 CET 2006. -------- --- CASA_auth_token_svc/CASA_auth_token_svc.changes 2006-10-23 23:50:12.000000000 +0200 +++ /mounts/work_users/ro/STABLE/CASA_auth_token_svc/CASA_auth_token_svc.changes 2006-11-17 01:00:53.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 17 01:00:21 CET 2006 - ro@suse.de + +- do not hardcode IBM java (java vendor is platform dependant) + +------------------------------------------------------------------- New: ---- CASA_auth_token_svc-1.7.925.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CASA_auth_token_svc.spec ++++++ --- /var/tmp/diff_new_pack.nB8VF5/_old 2006-11-17 01:48:37.000000000 +0100 +++ /var/tmp/diff_new_pack.nB8VF5/_new 2006-11-17 01:48:37.000000000 +0100 @@ -15,16 +15,18 @@ %define debug_opt "" URL: http://www.novell.com/products -BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv java-1_5_0-ibm java-1_5_0-ibm-devel libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit update-alternatives +BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit +BuildRequires: java-sdk-1.5.0 update-alternatives %define prefix /usr License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Autoreqprov: on %define bldno 1.7.925 Version: 1.7.925 -Release: 1 +Release: 8 Summary: Novell CASA Authentication Token Service Source: %{name}-%{version}.tar.bz2 +Patch: CASA_auth_token_svc-1.7.925.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: java-1_5_0-ibm servletapi5 tomcat5 sysvinit insserv identity-abstraction PreReq: %fillup_prereq %insserv_prereq @@ -84,7 +86,7 @@ %prep %setup -q -#%patch +%patch %if %{_lib} == "lib64" %define binsource bin64 %else @@ -274,19 +276,16 @@ %config /etc/CASA/authtoken/svc/auth_mechanisms/Krb5Authenticate/mechanism.settings %config /etc/CASA/authtoken/svc/auth_mechanisms/PwdAuthenticate/mechanism.settings ## CASA_auth_token_jaas_support ## - -%pre -n CASA_auth_token_jaas_support +#pre -n CASA_auth_token_jaas_support # Nothing to do in this pre script %post -n CASA_auth_token_jaas_support /sbin/ldconfig # Setup the keystore for the clients %{prefix}/share/java/CASA/authtoken/bin/client_keystore_setup.sh - -%preun -n CASA_auth_token_jaas_support +#preun -n CASA_auth_token_jaas_support # Nothing to do in this preun script - -%postun -n CASA_auth_token_jaas_support +#postun -n CASA_auth_token_jaas_support # Nothing to do in this preun script %files -n CASA_auth_token_jaas_support @@ -322,6 +321,8 @@ %config /etc/CASA/authtoken/keys/client/crypto.properties %changelog -n CASA_auth_token_svc +* Fri Nov 17 2006 - ro@suse.de +- do not hardcode IBM java (java vendor is platform dependant) * Mon Oct 23 2006 - ro@suse.de - remove java-1_5_0-ibm-alsa from BuildRequires (again) - remove "noarch" from package, not possible when requiring ++++++ CASA_auth_token_svc-1.7.925.dif ++++++ --- package/linux/CASA_auth_token_svc.spec +++ package/linux/CASA_auth_token_svc.spec 2006/11/17 00:19:20 @@ -17,7 +17,8 @@ Name: CASA_auth_token_svc URL: http://www.novell.com/products -BuildRequires: libstdc++ gcc-c++ glib2-devel libstdc++-devel pkgconfig java-1_5_0-ibm java-1_5_0-ibm-devel java-1_5_0-ibm-alsa update-alternatives mono-devel servletapi5 identity-abstraction sysvinit insserv +BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit +BuildRequires: java-sdk-1.5.0 update-alternatives %define prefix /usr License: LGPL Group: Applications/System --- package/linux/CASA_auth_token_svc.spec.in +++ package/linux/CASA_auth_token_svc.spec.in 2006/11/17 00:19:10 @@ -17,7 +17,8 @@ Name: @PACKAGE@ URL: http://www.novell.com/products -BuildRequires: libstdc++ gcc-c++ glib2-devel libstdc++-devel pkgconfig java-1_5_0-ibm java-1_5_0-ibm-devel java-1_5_0-ibm-alsa update-alternatives mono-devel servletapi5 identity-abstraction sysvinit insserv +BuildRequires: gcc-c++ glib2-devel identity-abstraction insserv libstdc++ libstdc++-devel mono-devel pkgconfig servletapi5 sysvinit +BuildRequires: java-sdk-1.5.0 update-alternatives %define prefix /usr License: LGPL Group: Applications/System --- server/Jaas/linux/client_keystore_setup.sh +++ server/Jaas/linux/client_keystore_setup.sh 2006/11/16 23:59:57 @@ -41,10 +41,10 @@ if [ -f /etc/CASA/authtoken/keys/casaatsdSigningCert ]; then echo "Setting up the clients's keystore" # Import the certificate to the client's keystore - /usr/lib/jvm/java-1.5.0-ibm/bin/keytool -import -noprompt -keystore /etc/CASA/authtoken/keys/client/jks-store -alias signingCert -storepass secret -keypass secret -file /etc/CASA/authtoken/keys/casaatsdSigningCert + /usr/lib/jvm/java-1.5.0/bin/keytool -import -noprompt -keystore /etc/CASA/authtoken/keys/client/jks-store -alias signingCert -storepass secret -keypass secret -file /etc/CASA/authtoken/keys/casaatsdSigningCert # List the content's of the client's keystore - #/usr/lib/jvm/java-1.5.0-ibm/bin/keytool -list -rfc -keystore client/jks-store -alias signingCert -storepass secret + #/usr/lib/jvm/java-1.5.0/bin/keytool -list -rfc -keystore client/jks-store -alias signingCert -storepass secret else echo "File /etc/CASA/authtoken/keys/casaatsdSigningCert not found" fi --- server/Jaas/make_test.sh +++ server/Jaas/make_test.sh 2006/11/17 00:00:04 @@ -8,6 +8,6 @@ fi fi echo "*** Compiling the test application ***" -/usr/lib/jvm/java-1.5.0-ibm/bin/javac -g -sourcepath src -classpath /usr/share/java/CASA/authtoken/CasaJaasSupport.jar:/usr/share/java/CASA/authtoken/CasaAuthToken.jar -d build-test/classes src/com/novell/casa/jaas/sample/SampleApp.java src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java +/usr/lib/jvm/java-1.5.0/bin/javac -g -sourcepath src -classpath /usr/share/java/CASA/authtoken/CasaJaasSupport.jar:/usr/share/java/CASA/authtoken/CasaAuthToken.jar -d build-test/classes src/com/novell/casa/jaas/sample/SampleApp.java src/com/novell/casa/jaas/sample/SampleAppCallbackHandler.java echo "*** Done compiling ***" --- server/Jaas/run_test.sh +++ server/Jaas/run_test.sh 2006/11/17 00:00:13 @@ -1,4 +1,4 @@ echo "*** Starting the test application ***" -export JAVA_HOME=/usr/lib/jvm/java-1.5.0-ibm -/usr/lib/jvm/java-1.5.0-ibm/bin/java -classpath build-test/classes:/usr/share/java/CASA/authtoken/CasaJaasSupport.jar:/usr/share/java/CASA/authtoken/CasaAuthToken.jar:/usr/share/java/CASA/authtoken/external/axis-ant.jar:/usr/share/java/CASA/authtoken/external/axis.jar:/usr/share/java/CASA/authtoken/external/commons-discovery-0.2.jar:/usr/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar:/usr/share/java/CASA/authtoken/external/commons-logging-api.jar:/usr/share/java/CASA/authtoken/external/jaxrpc.jar:/usr/share/java/CASA/authtoken/external/log4j-1.2.8.jar:/usr/share/java/CASA/authtoken/external/saaj.jar:/usr/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar:/usr/share/java/CASA/authtoken/external/wss4j-1.5.0.jar:/usr/share/java/CASA/authtoken/external/xalan.jar:/usr/share/java/CASA/authtoken/external/xercesImpl.jar:/usr/share/java/CASA/authtoken/external/xml-apis.jar:/usr/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar:/usr/share/java/xerces-j2.jar:/etc/CASA/ authtoken/keys/client -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Djava.security.auth.login.config=src/com/novell/casa/jaas/sample/SampleApp.conf -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n com.novell.casa.jaas.sample.SampleApp +export JAVA_HOME=/usr/lib/jvm/java-1.5.0 +/usr/lib/jvm/java-1.5.0/bin/java -classpath build-test/classes:/usr/share/java/CASA/authtoken/CasaJaasSupport.jar:/usr/share/java/CASA/authtoken/CasaAuthToken.jar:/usr/share/java/CASA/authtoken/external/axis-ant.jar:/usr/share/java/CASA/authtoken/external/axis.jar:/usr/share/java/CASA/authtoken/external/commons-discovery-0.2.jar:/usr/share/java/CASA/authtoken/external/commons-logging-1.0.4.jar:/usr/share/java/CASA/authtoken/external/commons-logging-api.jar:/usr/share/java/CASA/authtoken/external/jaxrpc.jar:/usr/share/java/CASA/authtoken/external/log4j-1.2.8.jar:/usr/share/java/CASA/authtoken/external/saaj.jar:/usr/share/java/CASA/authtoken/external/wsdl4j-1.5.1.jar:/usr/share/java/CASA/authtoken/external/wss4j-1.5.0.jar:/usr/share/java/CASA/authtoken/external/xalan.jar:/usr/share/java/CASA/authtoken/external/xercesImpl.jar:/usr/share/java/CASA/authtoken/external/xml-apis.jar:/usr/share/java/CASA/authtoken/external/xmlsec-1.2.1.jar:/usr/share/java/xerces-j2.jar:/etc/CASA/auth token/keys/client -Dorg.xml.sax.driver=org.apache.xerces.parsers.SAXParser -Djava.security.auth.login.config=src/com/novell/casa/jaas/sample/SampleApp.conf -Xrunjdwp:transport=dt_socket,address=5005,server=y,suspend=n com.novell.casa.jaas.sample.SampleApp --- server/Svc/linux/envvars +++ server/Svc/linux/envvars 2006/11/16 23:59:47 @@ -8,7 +8,7 @@ ############################################################ CATALINA_BASE="/srv/www/casaats" CATALINA_HOME="/usr/share/tomcat5" -JAVA_HOME="/usr/lib/jvm/java-1.5.0-ibm" +JAVA_HOME="/usr/lib/jvm/java-1.5.0" JAVA_OPTS="-Dcom.novell.casa.authtoksvc.config=/etc/CASA/authtoken/svc" export CATALINA_BASE CATALINA_HOME JAVA_HOME JAVA_OPTS --- server/Svc/linux/server_keystore_setup.sh +++ server/Svc/linux/server_keystore_setup.sh 2006/11/16 23:59:40 @@ -47,16 +47,16 @@ echo "Setting up the server's keystore" # Create the server keystore with the key that will be used for signing tokens host=`hostname -f` - /usr/lib/jvm/java-1.5.0-ibm/bin/keytool -genkey -alias signingKey -keystore /etc/CASA/authtoken/keys/server/jks-store -dname "cn=casaatsd@$host" -validity 3600 -keypass secret -storepass secret + /usr/lib/jvm/java-1.5.0/bin/keytool -genkey -alias signingKey -keystore /etc/CASA/authtoken/keys/server/jks-store -dname "cn=casaatsd@$host" -validity 3600 -keypass secret -storepass secret # Export self-signed certificate for the signing key - /usr/lib/jvm/java-1.5.0-ibm/bin/keytool -export -keystore /etc/CASA/authtoken/keys/server/jks-store -alias signingKey -storepass secret -keypass secret -file /etc/CASA/authtoken/keys/casaatsdSigningCert + /usr/lib/jvm/java-1.5.0/bin/keytool -export -keystore /etc/CASA/authtoken/keys/server/jks-store -alias signingKey -storepass secret -keypass secret -file /etc/CASA/authtoken/keys/casaatsdSigningCert # List the contents of the server's keystore - #usr/lib/jvm/java-1.5.0-ibm/bin/keytool -list -rfc -keystore /etc/CASA/authtoken/keys/server/jks-store -alias signingKey -storepass secret + #usr/lib/jvm/java-1.5.0/bin/keytool -list -rfc -keystore /etc/CASA/authtoken/keys/server/jks-store -alias signingKey -storepass secret # Print the exported cert - #usr/lib/jvm/java-1.5.0-ibm/bin/keytool -printcert -file /etc/CASA/authtoken/keys/casaatsdSigningCert + #usr/lib/jvm/java-1.5.0/bin/keytool -printcert -file /etc/CASA/authtoken/keys/casaatsdSigningCert # Make sure that the keystore is only accessible by the service chown casaatsd:casaauth /etc/CASA/authtoken/keys/server/jks-store ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org