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

Fixed issues that were keeping the component from building on STABLE.

Browse Source 
Also made necessary changes to the spec files as recommended by
autobuild and to conform with the spec file on STABLE.
This commit is contained in:
Juan Carlos Luciani
2008-06-03 16:01:53 +00:00
parent df9110cfec
commit 268046b8ee
5 changed files with 40 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CASA-auth-token/server/AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD
View File

@@ -16,9 +16,9 @@
### BEGIN INIT INFO
# Provides: casa_atvd
# Required-Start: $local_fs $remote_fs
# X-UnitedLinux-Should-Start: $syslog $time
# Should-Start: $syslog $time
# Required-Stop: $local_fs $remote_fs
# X-UnitedLinux-Should-Stop: $syslog $time
# Should-Stop: $syslog $time
# Default-Start: 2 3 5
# Default-Stop:
# Short-Description: Casa Authtoken Validate Daemon

8
CASA-auth-token/server/AuthTokenValidate/Svc/linux/Makefile.am
View File

@@ -41,15 +41,15 @@ ROOT = ../../..
LIBDIR = $(ROOT)/$(LIB)
BINDIR = $(ROOT)/$(BIN)
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/bin
IBM_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/bin
if LIB64
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/amd64/server
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/amd64/server
else
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre-1.5.0/lib/i386/server
SUN_JAVA_LIBDIR = /usr/$(LIB)/jvm/jre/lib/i386/server
endif
JAVA_INCDIR = /usr/$(LIB)/jvm/java-1.5.0/include
JAVA_INCDIR = /usr/$(LIB)/jvm/java/include
# handle Mono secondary dependencies
export MONO_PATH := $(MONO_PATH)

10
CASA-auth-token/server/AuthTokenValidate/Svc/linux/envvars
View File

@@ -38,21 +38,21 @@ else
SUNLIBDIR=i386
fi
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)
if [ -z "${TEST_IBM_JVM}" ]; then
# Assume Sun JVM
JVM_VER=SUN
if [ -z "${LD_LIBRARY_PATH}" ]; then
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/lib/$SUNLIBDIR/server
else
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/lib/$SUNLIBDIR/server
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/lib/$SUNLIBDIR/server
fi
else
JVM_VER=IBM
if [ -z "${LD_LIBRARY_PATH}" ]; then
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic
LD_LIBRARY_PATH=/usr/$LIB/jvm/jre/bin:/usr/$LIB/jvm/jre/bin/classic
else
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre-1.5.0/bin:/usr/$LIB/jvm/jre-1.5.0/bin/classic
LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}":/usr/$LIB/jvm/jre/bin:/usr/$LIB/jvm/jre/bin/classic
fi
fi
export JVM_VER

1
CASA-auth-token/server/AuthTokenValidate/Svc/linux/internal.h
View File

@@ -49,6 +49,7 @@ extern "C" {
#include <sys/stat.h>
#include <sys/file.h>
#include <assert.h> // Ensure that NDEBUG is defined for release builds!
#include <limits.h>
#include <sys/ipc.h>
#include <casa_s_ipc.h>
}

52
CASA-auth-token/server/package/linux/CASA_auth_token_server.spec.in
View File

@@ -14,14 +14,14 @@ Name: CASA_auth_token_server
%define cfg Release
%define debug_opt ""
URL: http://www.novell.com/products
Url: http://www.novell.com/products
BuildRequires: CASA-devel apache2-devel expat gcc-c++ glib2-devel libstdc++ libstdc++-devel mono-devel pam-devel pkgconfig update-alternatives java-sdk-1.5.0 sysvinit insserv pwdutils
%ifarch %ix86
BuildRequires: java-1_5_0-ibm-alsa
%endif
%define prefix /usr
License: LGPL
License: LGPL v2.1 or later
Group: System/Libraries
Autoreqprov: on
%define bldno @VERSION@
@@ -38,21 +38,23 @@ PreReq: /usr/sbin/groupadd, /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/gete
%description
CASA_auth_token is an authentication token infrastructure with support
for multiple authentication mechanisms with an emphasis on providing a scalable
single sign-on solution.
for multiple authentication mechanisms with an emphasis on providing a
scalable single sign-on solution.
A key feature of CASA_auth_token is that its authentication tokens contain
identity information about the entity being authenticated. This information is
made available to the consuming services. The amount of information contained in
the tokens is configured on a per-service basis. Because of this feature, we say
that CASA_auth_token projects an "Authenticated Identity".
A key feature of CASA_auth_token is that its authentication tokens
contain identity information about the entity being authenticated. This
information is made available to the consuming services. The amount of
information contained in the tokens is configured on a per-service
basis. Because of this feature, we say that CASA_auth_token projects an
"Authenticated Identity".
The CASA_auth_token_server package contains the CASA (Common Authentication
Services Adapter) authentication token infrastructure lower level libraries for
token verification from native code ("C"). It is recomended that this library
not be invoked directly by applications, instead it is recomended that
appplication invoke its services through the support modules provided to
integrate with PAM or the Apache Web Server.
The CASA_auth_token_server package contains the CASA (Common
Authentication Services Adapter) authentication token infrastructure
lower level libraries for token verification from native code ("C"). It
is recomended that this library not be invoked directly by
applications, instead it is recomended that appplication invoke its
services through the support modules provided to integrate with PAM or
the Apache Web Server.
Authors:
--------
@@ -60,6 +62,7 @@ Authors:
%package -n CASA_auth_token_pam_support
License: LGPL v2.1 or later
Summary: Novell CASA Authentication Token PAM Support Components
Group: System/Libraries
Requires: CASA_auth_token_server pam
@@ -85,6 +88,7 @@ Authors:
%package -n CASA_auth_token_apache2_2_support
License: LGPL v2.1 or later
Summary: Novell CASA Authentication Token Apache2_2 Support Components
Group: System/Libraries
Requires: apache2 CASA_auth_token_server
@@ -114,6 +118,7 @@ Authors:
%package -n CASA_auth_token_server-devel
License: LGPL v2.1 or later
Summary: Novell CASA Authentication Token Server Development Files
Group: Development/Libraries/C and C++
Requires: CASA-devel CASA_auth_token_server CASA_auth_token_jaas_support CASA_auth_token_pam_support CASA_auth_token_apache2_2_support
@@ -149,9 +154,7 @@ Authors:
%build
export PATH=.:$PATH:/usr/%_lib/qt3/bin
%if %suse_version > 1000
export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -fstack-protector"
%endif
./autogen.sh
make
@@ -192,11 +195,8 @@ install -m 755 %{_lib}/%{cfg}/libcasa_s_ipc.so %{buildroot}%{prefix}/%{_lib}/lib
# Symbolic Links
ln -sf casa_iden_token.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so
ln -sf casa_iden_token.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.1
ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so
ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so.1
ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so
ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so.1
# Bins
@@ -205,7 +205,7 @@ install -m 755 %{binsource}/%{cfg}/CasaAuthtokenValidateD %{buildroot}%{prefix}/
# Others
install -m 644 %{_lib}/%{cfg}/CasaIdentityToken.conf %{buildroot}/etc/CASA/authtoken/modules/CasaIdentityToken.conf
install -m 755 AuthTokenValidate/Svc/linux/CasaAuthtokenValidateD %{buildroot}/etc/init.d/casa_atvd
install -m 750 AuthTokenValidate/Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/validate/
install -m 640 AuthTokenValidate/Svc/linux/envvars %{buildroot}/etc/CASA/authtoken/validate/
ln -sf casa_atvd %{buildroot}%{prefix}/sbin/rccasa_atvd
@@ -229,6 +229,10 @@ install -m 644 include/casa_s_authtoken.h %{buildroot}%{prefix}/include
install -m 644 include/casa_c_ipc.h %{buildroot}%{prefix}/include
install -m 644 include/casa_s_ipc.h %{buildroot}%{prefix}/include
# Symbolic Links
ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
ln -sf libcasa_c_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_c_ipc.so
ln -sf libcasa_s_ipc.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_ipc.so
%clean
rm -rf $RPM_BUILD_ROOT
@@ -284,13 +288,10 @@ rm -rf /var/lib/CASA/authtoken/validate
%dir /etc/CASA/authtoken/validate
%dir /etc/CASA/authtoken/modules
%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno}
%{prefix}/%{_lib}/libcasa_s_authtoken.so
%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
%{prefix}/%{_lib}/libcasa_c_ipc.so.%{bldno}
%{prefix}/%{_lib}/libcasa_c_ipc.so
%{prefix}/%{_lib}/libcasa_c_ipc.so.1
%{prefix}/%{_lib}/libcasa_s_ipc.so.%{bldno}
%{prefix}/%{_lib}/libcasa_s_ipc.so
%{prefix}/%{_lib}/libcasa_s_ipc.so.1
%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so.%{bldno}
%{prefix}/%{_lib}/CASA/authtoken/casa_iden_token.so
@@ -359,6 +360,9 @@ rm -rf /var/lib/CASA/authtoken/validate
%{prefix}/include/casa_s_authtoken.h
%{prefix}/include/casa_c_ipc.h
%{prefix}/include/casa_s_ipc.h
%{prefix}/%{_lib}/libcasa_s_authtoken.so
%{prefix}/%{_lib}/libcasa_c_ipc.so
%{prefix}/%{_lib}/libcasa_s_ipc.so
%changelog -n CASA_auth_token_server