From e1d46bdd6d201af69aff9be9240ba18c23339436 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Wed, 26 Jul 2006 17:06:46 +0000 Subject: [PATCH] Check-point of changes made to build under autobuild using the identity-abstraction that is part of it. --- CASA-auth-token/Makefile.am | 3 +- .../linux/CASA-auth-token-service.spec.in | 58 ++++++++++--------- .../server/AuthTokenSvc/Makefile.am | 6 +- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/CASA-auth-token/Makefile.am b/CASA-auth-token/Makefile.am index 4a48595d..84e5e7ff 100644 --- a/CASA-auth-token/Makefile.am +++ b/CASA-auth-token/Makefile.am @@ -24,8 +24,7 @@ SUBDIRS = server package DIST_SUBDIRS = include server package -#EXTRA_DIST = autogen.sh -EXTRA_DIST = autogen.sh bandit bandit/commons bandit/commons/* bandit/ia/* +EXTRA_DIST = autogen.sh .PHONY: package package-clean package-install package-uninstall package package-clean package-install package-uninstall: diff --git a/CASA-auth-token/package/linux/CASA-auth-token-service.spec.in b/CASA-auth-token/package/linux/CASA-auth-token-service.spec.in index 086bbb4d..8d62cad7 100644 --- a/CASA-auth-token/package/linux/CASA-auth-token-service.spec.in +++ b/CASA-auth-token/package/linux/CASA-auth-token-service.spec.in @@ -16,9 +16,10 @@ Name: @PACKAGE@ -URL: http://www.novell.com/products -BuildRequires: gcc-c++ glib2-devel krb5-devel libgssapi libstdc++-devel pam-devel pkgconfig java-1_5_0-ibm-devel apache2-devel update-alternatives mono-devel CASA-devel servletapi5 +URL: http://www.novell.com/products +BuildRequires: libstdc++ libgcc gcc-c++ glib2-devel krb5-devel libgssapi libstdc++-devel pam-devel pkgconfig java-1_5_0-ibm-devel apache2-devel update-alternatives mono-devel CASA-devel servletapi5 identity-abstraction %define prefix /usr +%define jprefix /usr/share/java License: LGPL Group: Applications/System Autoreqprov: on @@ -129,22 +130,24 @@ install -d %{buildroot}%{prefix} install -d %{buildroot}%{prefix}/%{_lib} install -d %{buildroot}%{prefix}/%{_lib}/security install -d %{buildroot}%{prefix}/include +install -d %{buildroot}%{prefix}/share +install -d %{buildroot}%{prefix}/share/java ## CASA-auth-token-service ## # Libs -install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war.%{bldno} +install -m 755 %{_lib}/java/CasaAuthTokenSvc.war %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war.%{bldno} # Lib Symbolic Links -ln -s CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war -ln -s CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthTokenSvc.war.1 +ln -sf CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war +ln -sf CasaAuthTokenSvc.war.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthTokenSvc.war.1 ## CASA-auth-token-server-support ## # Libs install -m 755 %{_lib}/%{cfg}/libcasa_s_authtoken.so %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno} # Lib Symbolic Links -ln -s libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so -ln -s libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.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 ## CASA-auth-token-pam-support ## # Libs @@ -152,27 +155,27 @@ install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/s #install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so # Lib Symbolic Links -ln -s pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so -ln -s pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.1 +ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so +ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.1 ## CASA-auth-token-apache2_2-support ## # Libs install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno} -# Lib Symbolic Linksln -s %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so -ln -s mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so -ln -s mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1 +# Lib Symbolic Links +ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so +ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1 ## CASA-auth-token-jaas-support ## # Libs -install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar.%{bldno} -install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar.%{bldno} +install -m 755 %{_lib}/java/CasaJaasSupport.jar %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar.%{bldno} +install -m 755 %{_lib}/java/CasaAuthToken.jar %{buildroot}%{prefix}/share/java/CasaAuthToken.jar.%{bldno} # Lib Symbolic Links -ln -s CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar -ln -s CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaJaasSupport.jar.1 -ln -s CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar -ln -s CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/%{_lib}/CasaAuthToken.jar.1 +ln -sf CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar +ln -sf CasaJaasSupport.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaJaasSupport.jar.1 +ln -sf CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthToken.jar +ln -sf CasaAuthToken.jar.%{bldno} %{buildroot}%{prefix}/share/java/CasaAuthToken.jar.1 ## CASA-auth-token-devel ## # Header Files @@ -199,9 +202,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%{prefix}/%{_lib}/CasaAuthTokenSvc.war.%{bldno} -%{prefix}/%{_lib}/CasaAuthTokenSvc.war -%{prefix}/%{_lib}/CasaAuthTokenSvc.war.1 +%{prefix}/share/java/CasaAuthTokenSvc.war.%{bldno} +%{prefix}/share/java/CasaAuthTokenSvc.war +%{prefix}/share/java/CasaAuthTokenSvc.war.1 ## CASA-auth-token-server-support ## @@ -239,6 +242,7 @@ rm -rf $RPM_BUILD_ROOT %files -n CASA-auth-token-pam-support %defattr(-,root,root) +%dir %{prefix}/%{_lib}/security %{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno} %{prefix}/%{_lib}/security/pam_casaauthtok.so %{prefix}/%{_lib}/security/pam_casaauthtok.so.1 @@ -279,12 +283,12 @@ rm -rf $RPM_BUILD_ROOT %files -n CASA-auth-token-jaas-support %defattr(-,root,root) -%{prefix}/%{_lib}/CasaJaasSupport.jar.%{bldno} -%{prefix}/%{_lib}/CasaJaasSupport.jar -%{prefix}/%{_lib}/CasaJaasSupport.jar.1 -%{prefix}/%{_lib}/CasaAuthToken.jar.%{bldno} -%{prefix}/%{_lib}/CasaAuthToken.jar -%{prefix}/%{_lib}/CasaAuthToken.jar.1 +%{prefix}/share/java/CasaJaasSupport.jar.%{bldno} +%{prefix}/share/java/CasaJaasSupport.jar +%{prefix}/share/java/CasaJaasSupport.jar.1 +%{prefix}/share/java/CasaAuthToken.jar.%{bldno} +%{prefix}/share/java/CasaAuthToken.jar +%{prefix}/share/java/CasaAuthToken.jar.1 ## CASA-auth-token-devel ## diff --git a/CASA-auth-token/server/AuthTokenSvc/Makefile.am b/CASA-auth-token/server/AuthTokenSvc/Makefile.am index 83153460..74d7ce0b 100644 --- a/CASA-auth-token/server/AuthTokenSvc/Makefile.am +++ b/CASA-auth-token/server/AuthTokenSvc/Makefile.am @@ -33,8 +33,8 @@ ROOT = ../.. LIBDIR = $(ROOT)/$(LIB) -IDENT_ABSTRACTION_DIR = $(ROOT)/bandit/ia -IDENT_ABSTRACTION_DEPENDANCIES_DIR = $(ROOT)/bandit/commons +IDENT_ABSTRACTION_DIR = /usr/share/java/identity-abstraction +IDENT_ABSTRACTION_DEPENDANCIES_DIR = /usr/share/java/identity-abstraction/dependancies JAVAROOT = . JAVAC= javac @@ -79,7 +79,7 @@ AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class)) LIBS = /usr/share/java/servletapi5.jar -CLASSPATH = $(IDENT_ABSTRACTION_DIR):$(LIBS) +CLASSPATH = $(IDENT_ABSTRACTION_DIR)/identity-abstraction.jar:$(LIBS) CUR_DIR := $(shell pwd)