Hello community, here is the log from the commit of package CASA_auth_token_server checked in at Thu Aug 14 15:04:49 CEST 2008. -------- --- CASA_auth_token_server/CASA_auth_token_server.changes 2008-06-05 19:12:44.000000000 +0200 +++ /mounts/work_users/ro/STABLE/CASA_auth_token_server/CASA_auth_token_server.changes 2008-08-14 14:35:46.799372000 +0200 @@ -1,0 +2,6 @@ +Thu Aug 14 14:35:31 CEST 2008 - ro@suse.de + +- use generic tag for java in buildrequires +- try a little harder to find libjvm + +------------------------------------------------------------------- New: ---- CASA_auth_token_server-1.7.1547.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ CASA_auth_token_server.spec ++++++ --- /var/tmp/diff_new_pack.Y11215/_old 2008-08-14 15:03:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Y11215/_new 2008-08-14 15:03:56.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package CASA_auth_token_server (Version 1.7.1547 ) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,19 +22,17 @@ %define cfg Release %define debug_opt "" Url: http://www.novell.com/products -BuildRequires: CASA-devel apache2-devel expat gcc-c++ glib2-devel insserv java-sdk-1.5.0 libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig pwdutils sysvinit update-alternatives -%ifarch %ix86 -BuildRequires: java-1_5_0-ibm-alsa -%endif +BuildRequires: CASA-devel apache2-devel expat gcc-c++ glib2-devel insserv java-sdk >= 1.5 libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig pwdutils sysvinit update-alternatives %define prefix /usr License: LGPL v2.1 or later Group: System/Libraries AutoReqProv: on %define bldno 1.7.1547 Version: 1.7.1547 -Release: 1 +Release: 30 Summary: Novell CASA Authentication Token Libraries for C/C++ Server Applications Source: %{name}-%{version}.tar.bz2 +Patch: CASA_auth_token_server-1.7.1547.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: jre >= 1.5.0 Requires: expat binutils CASA_auth_token_jaas_support sysvinit insserv @@ -153,7 +158,7 @@ %prep %setup -q -#%patch +%patch %if %{_lib} == "lib64" %define binsource bin64 %else @@ -346,6 +351,9 @@ %{prefix}/%{_lib}/libcasa_s_ipc.so %changelog +* Thu Aug 14 2008 ro@suse.de +- use generic tag for java in buildrequires +- try a little harder to find libjvm * Thu Jun 05 2008 jluciani@novell.com - Fixed problem that was causing us to incorrectly set JAVA_HOME on non-64bit systems were the /usr/lib64 folder exists. @@ -365,26 +373,26 @@ the library destructor. This addresses BUG 353752. * Mon Dec 03 2007 ro@suse.de - fix build with gcc-4.3 -* Mon Apr 02 2007 jluciani@novell.com +* Tue Apr 03 2007 jluciani@novell.com - Added pwdutils to BuildRequires to fix a build problem. -* Fri Feb 16 2007 schoi@novell.com +* Sat Feb 17 2007 schoi@novell.com - fix the build failure on x86_64 * Mon Feb 12 2007 jluciani@novell.com - Removed BuildRequires dependency on glade-sharp. - Stopped deleting the user casaatvd during RPM un-install to avoid issues created when files created by that user are orphaned. -* Thu Feb 08 2007 jluciani@novell.com +* Fri Feb 09 2007 jluciani@novell.com - Resolved Bug 243162. -* Wed Feb 07 2007 jluciani@novell.com +* Thu Feb 08 2007 jluciani@novell.com - Resolved Bug 243159. -* Wed Feb 07 2007 jluciani@novell.com +* Thu Feb 08 2007 jluciani@novell.com - Resolved Bugs 243122, 243124, 243125, 243135, 243138, 243142, 243143, 243144, 243147, 243148, 243155, 243156, 243158. * Wed Jan 24 2007 jluciani@novell.com - Made a spec file change to support applications that want to dynamically load our libraries. -* Wed Jan 03 2007 jluciani@novell.com +* Thu Jan 04 2007 jluciani@novell.com - Fixed casa_atvd not starting by default problem documented in BUG228036. - Fixed problem that was causing token validation to fail because @@ -396,29 +404,29 @@ sequence. * Tue Dec 19 2006 cgardner@novell.com - Fix build on ix86, require java alsa package. -* Fri Dec 08 2006 jluciani@novell.com +* Sat Dec 09 2006 jluciani@novell.com - Made changes resulting from self-code review of the project. -* Mon Dec 04 2006 jluciani@novell.com +* Tue Dec 05 2006 jluciani@novell.com - Fixed "Shutting..." rc script output problem documented in BUG225027. -* Tue Nov 28 2006 jluciani@novell.com +* Wed Nov 29 2006 jluciani@novell.com - Fixed 64-bit platform problems introduced while addressing bugs: BUG222541, BUG216949, BUG215221. * Wed Nov 22 2006 jluciani@novell.com - Resolved the following bugs: BUG222541, BUG216949, BUG215221. * Tue Nov 21 2006 jluciani@novell.com - Fixed makefile issue. -* Fri Nov 17 2006 jluciani@novell.com +* Sat Nov 18 2006 jluciani@novell.com - Removed hard dependency on IBM JVM. * Mon Nov 13 2006 jluciani@novell.com - Separated the non-java folder into client and server projects in order to better support distributions that target desktops. From now on, this changes files will only contain information that applies to the server project. -* Thu Nov 09 2006 jluciani@novell.com +* Fri Nov 10 2006 jluciani@novell.com - Finished the changes to enable client/ATS communications over SSL. -* Tue Nov 07 2006 jluciani@novell.com +* Wed Nov 08 2006 jluciani@novell.com - Made changes to enable client/ats communication over SSL. (Not quite done with this yet). - Updated the make system to allow Windows builds to be made from @@ -432,15 +440,15 @@ * Mon Oct 09 2006 jluciani@novell.com - Cleaned up compiler warnings that were present in some of the components. -* Fri Oct 06 2006 schoi@novell.com +* Sat Oct 07 2006 schoi@novell.com - Add the CASA build check as dependency in spec file -* Thu Oct 05 2006 jluciani@novell.com +* Fri Oct 06 2006 jluciani@novell.com - Ported the client to Linux and created the CASA_auth_token_client package. * Mon Oct 02 2006 jluciani@novell.com - Made spec file modifications suggested by SuSE. The changes entailed leveraging RPM macros instead of using my own scripts to make the RPM more solid. -* Thu Sep 14 2006 jluciani@novell.com +* Fri Sep 15 2006 jluciani@novell.com - Added rc script for Validate AuthToken Service. * Thu Sep 14 2006 jluciani@novell.com - Created the Validate AuthToken Service and made all of the necessary changes ++++++ CASA_auth_token_server-1.7.1547.dif ++++++ --- AuthTokenValidate/Svc/linux/envvars +++ AuthTokenValidate/Svc/linux/envvars 2008/08/14 12:49:48 @@ -39,7 +39,8 @@ fi TEST_IBM_JVM=$(/usr/$LIB/jvm/jre/bin/java -version 2>&1 | grep -i ibm) -if [ -z "${TEST_IBM_JVM}" ]; then +TEST_BEA_JVM=$(/usr/$LIB/jvm/jre/bin/java -version 2>&1 | grep -i jrockit) +if [ -z "${TEST_IBM_JVM}" -a -z "${TEST_BEA_JVM}" ]; then # Assume Sun JVM JVM_VER=SUN if [ -z "${LD_LIBRARY_PATH}" ]; then @@ -47,12 +48,24 @@ else LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/lib/$SUNLIBDIR/server fi +elif [ -z "${TEST_BEA_JVM}" ]; then + # Assume BEA JVM + JVM_VER=BEA + if [ -z "${LD_LIBRARY_PATH}" ]; then + LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/lib/ia64/jrockit + else + LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/lib/ia64/jrockit + fi else JVM_VER=IBM + for i in /usr/$LIB/jvm/jre/lib/* /usr/$LIB/jvm/jre/bin ; do + test -d $i/classic || continue + break + done if [ -z "${LD_LIBRARY_PATH}" ]; then - LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/bin:/usr/$LIB/jvm/jre/bin/classic + LD_LIBRARY_PATH=$i:$i/classic else - LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/bin:/usr/$LIB/jvm/jre/bin/classic + LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":$i:$i/classic fi fi export JVM_VER --- AuthTokenValidate/Svc/linux/Makefile.am +++ AuthTokenValidate/Svc/linux/Makefile.am 2008/08/14 13:00:12 @@ -42,6 +42,9 @@ BINDIR = $(ROOT)/$(BIN) IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/bin +IBM_JAVA_XLIBDIR = @JVM_LIBDIR@ +IBM_JAVA_THREAD = @JVM_LIB_THREAD@ +BEA_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/ia64/jrockit if LIB64 SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/amd64/server @@ -72,12 +75,17 @@ CPPFLAGS += -Wno-format-extra-args -fno-strict-aliasing -fPIC $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) if IBM_JVM -LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -lj9thr23 -ldl -LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic +LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig $(IBM_JAVA_THREAD) -ldl +LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(IBM_JAVA_LIBDIR) -L$(IBM_JAVA_LIBDIR)/classic -L$(IBM_JAVA_XLIBDIR) +else +if BEA_JVM +LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -ldl +LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(BEA_JAVA_LIBDIR) else LIBS += -lpthread -lcasa_s_ipc -ljvm -ljsig -ldl LDFLAGS += -L$(LIBDIR)/$(TARGET_CFG) -L$(SUN_JAVA_LIBDIR) endif +endif OBJDIR = ./$(TARGET_CFG)/$(LIB) OBJS = $(addprefix $(OBJDIR)/, $(CFILES:%.c=%.o)) $(addprefix $(OBJDIR)/, $(CPPFILES:%.cpp=%.o)) --- configure.in +++ configure.in 2008/08/14 12:59:30 @@ -202,15 +202,34 @@ # # Check for IBM JVM # -if test -d /usr/$LIB/jvm/jre-1.5.0 +JVM_LIBDIR="" +JVM_LIB_THREAD="" +if test -d /usr/$LIB/jvm/jre then -test_ibm_jvm=$(/usr/$LIB/jvm/jre-1.5.0/bin/java -version 2>&1 | grep -i ibm) +test_ibm_jvm=$(/usr/$LIB/jvm/jre/bin/java -version 2>&1 | grep -i ibm) +test_bea_jvm=$(/usr/$LIB/jvm/jre/bin/java -version 2>&1 | grep -i jrockit) if test "$test_ibm_jvm" = "" then - # Assume Sun JVM - JVM_VER=SUN + if test "$test_bea_jvm" = "" + then + # Assume Sun JVM + JVM_VER=SUN + else + # Assume Bea JVM + JVM_VER=BEA + fi else JVM_VER=IBM + for i in /usr/$LIB/jvm/jre/lib/* /usr/$LIB/jvm/jre/bin ; do + test -d $i/classic || continue + JVM_LIBDIR=$i + break + done + for i in j9thr23 j9thr24 ; do + test -f $JVM_LIBDIR/lib$i.so || continue + JVM_LIB_THREAD="-l$i" + break + done fi else # Assume Sun JVM @@ -218,7 +237,10 @@ fi AC_SUBST(JVM_VER) +AC_SUBST(JVM_LIBDIR) +AC_SUBST(JVM_LIB_THREAD) AM_CONDITIONAL(IBM_JVM, test "$JVM_VER" = IBM) +AM_CONDITIONAL(BEA_JVM, test "$JVM_VER" = BEA) # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de