From 72550385f2c99f86de17cfa8c0bc5c62baccd8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= Date: Tue, 14 Oct 2008 15:50:37 +0000 Subject: [PATCH] LEMONLDAP::NG : preparation for v0.9.3 and full installation RPM --- build/lemonldap-ng/Makefile | 23 ++++++++++------ build/lemonldap-ng/changelog | 7 +++++ build/redhat/lemonldap-ng.spec | 48 +++++++++++++++++++++++++--------- 3 files changed, 58 insertions(+), 20 deletions(-) diff --git a/build/lemonldap-ng/Makefile b/build/lemonldap-ng/Makefile index f8ecda9dc..1a5865c8c 100644 --- a/build/lemonldap-ng/Makefile +++ b/build/lemonldap-ng/Makefile @@ -1,10 +1,11 @@ #!/usr/bin/make -# Example CHROOT -EXAMPLECHROOT=`pwd`/example/ +# Example and real root installation +EXAMPLEROOT=`pwd`/example/ +REALROOT=$(EXAMPLEROOT) # Subfolders -SYSTEMCONFDIR=$(EXAMPLECHROOT)etc/lemonldap-ng/ -SCRIPTSDIR=$(EXAMPLECHROOT)var/lib/lemonldap-ng/ +SYSTEMCONFDIR=$(EXAMPLEROOT)etc/lemonldap-ng/ +SCRIPTSDIR=$(EXAMPLEROOT)var/lib/lemonldap-ng/ # DNS Domain for cookie and virtual hosts DNSDOMAIN="example.com" # LDAP parameters @@ -24,6 +25,12 @@ DESTPORTALDIR=$(SCRIPTSDIR)portal/ DESTHANDLERDIR=$(SCRIPTSDIR)handler/ DESTMANAGERDIR=$(SCRIPTSDIR)manager/ DESTDOCSDIR=$(SCRIPTSDIR)docs/ +# Real directories for file content substitution +REALSYSTEMCONFDIR=$(REALROOT)etc/lemonldap-ng/ +REALSCRIPTSDIR=$(REALROOT)var/lib/lemonldap-ng/ +REALDESTFILECONFDIR=$(REALSYSTEMCONFDIR)conf/ +REALDESTSESSIONDIR=$(REALSCRIPTSDIR)sessions/ +REALDESTLASPDIR=$(REALSCRIPTSDIR)liberty-alliance-sp-portal all: handler manager portal @@ -107,9 +114,9 @@ example: all @cp -a _example/etc/lemonldap-ng/* ${SYSTEMCONFDIR} @cp -a _example/var/lib/lemonldap-ng/* ${SCRIPTSDIR} @cp -a doc/* ${DESTDOCSDIR} - @find ${DESTLASPDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${DESTLASPDIR}'#g;s#__CONFDIR__/?#'${DESTFILECONFDIR}'#g' {} \; - @find ${SCRIPTSDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${SCRIPTSDIR}'#g;s#__SYSCONFDIR__/?#'${SYSTEMCONFDIR}'#g;s#__CONFDIR__/?#'${DESTFILECONFDIR}'#g;s#__SESSIONDIR__/?#'${DESTSESSIONDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;s#__LDAPHOST__#'${LDAPHOST}'#g;s#__LDAPPORT__#'${LDAPPORT}'#g;s#__LDAPSUFFIX__#'${LDAPSUFFIX}'#g;' {} \; - @find ${SYSTEMCONFDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${SCRIPTSDIR}'#g;s#__SESSIONDIR__/?#'${DESTSESSIONDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;s#__LDAPHOST__#'${LDAPHOST}'#g;s#__LDAPPORT__#'${LDAPPORT}'#g;s#__LDAPSUFFIX__#'${LDAPSUFFIX}'#g;' {} \; + @find ${DESTLASPDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${REALDESTLASPDIR}'#g;s#__CONFDIR__/?#'${REALDESTFILECONFDIR}'#g' {} \; + @find ${SCRIPTSDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${REALSCRIPTSDIR}'#g;s#__SYSCONFDIR__/?#'${REALSYSTEMCONFDIR}'#g;s#__CONFDIR__/?#'${REALDESTFILECONFDIR}'#g;s#__SESSIONDIR__/?#'${REALDESTSESSIONDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;s#__LDAPHOST__#'${LDAPHOST}'#g;s#__LDAPPORT__#'${LDAPPORT}'#g;s#__LDAPSUFFIX__#'${LDAPSUFFIX}'#g;' {} \; + @find ${SYSTEMCONFDIR} -type f -exec perl -i -pe 's#__DIR__/?#'${REALSCRIPTSDIR}'#g;s#__SESSIONDIR__/?#'${REALDESTSESSIONDIR}'#g;s#__DNSDOMAIN__#'${DNSDOMAIN}'#g;s#__LDAPHOST__#'${LDAPHOST}'#g;s#__LDAPPORT__#'${LDAPPORT}'#g;s#__LDAPSUFFIX__#'${LDAPSUFFIX}'#g;' {} \; @echo @echo "LemonLDAP::NG example v${VERSION} is installed with these parameters:" @echo " - System configuration: ${SYSTEMCONFDIR}" @@ -151,7 +158,7 @@ postconf: postconf_hosts postconf_unixrights @echo "Post configuration done" production_preconf: -# TODO: modify EXAMPLECHROOT and set it to / +# TODO: modify EXAMPLEROOT and set it to / # TODO: ask parameters value (like DNSDOMAIN, LDAPHOST, etc.) production_install: production_preconf example diff --git a/build/lemonldap-ng/changelog b/build/lemonldap-ng/changelog index 0f0e1ccfd..f4450d4a4 100644 --- a/build/lemonldap-ng/changelog +++ b/build/lemonldap-ng/changelog @@ -1,3 +1,10 @@ +lemonldap-ng (0.9.3) unstable; urgency=low + + * New menu and skin (pastel) + * Authentication and UserDB separation + + -- Clement Oudot Mon, 13 Oct 2008 18:00:00 +0200 + lemonldap-ng (0.9.2.2) unstable; urgency=low * Bug in default rule (Closes: #310938) diff --git a/build/redhat/lemonldap-ng.spec b/build/redhat/lemonldap-ng.spec index 999c86055..fd3ab8d7a 100644 --- a/build/redhat/lemonldap-ng.spec +++ b/build/redhat/lemonldap-ng.spec @@ -1,23 +1,26 @@ Name: lemonldap-ng -Version: 0.9.2 -Release: 1%{?dist} -Summary: Lemonldap-ng Web SSO module +Version: 0.9.3 +Release: 1.el5.ow2 +Summary: LemonLDAP-NG WebSSO Group: Applications/System -License: GPL +License: GPL URL: http://wiki.lemonldap.objectweb.org Source0: http://download.forge.objectweb.org/lemonldap/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Packager: David Hannequin, Clement Oudot +Vendor: OW2 BuildArch: noarch BuildRequires: perl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl-Apache-Session, perl-LDAP, perl-Email-MIME-Encodings, perl-CGI-Session, -Requires: perl-libwww-perl, perl-DBI, perl-Cache-Cache, perl-XML-Simple, perl-SOAP-Lite, perl-HTML-Template +Requires: perl-Apache-Session, perl-LDAP, perl-Email-MIME-Encodings, perl-CGI-Session +Requires: perl-libwww-perl, perl-DBI, perl-Cache-Cache, perl-XML-Simple, perl-SOAP-Lite, perl-HTML-Template %description -Lemonldap::NG is a modular Web-SSO based on Apache::Session modules. It simplifies the build of a protected area with a few changes in the application. It manages both authentication and authorization and provides headers for accounting. So you can have a full AAA protection for your web space as described below. +LemonLDAP::NG is a modular Web-SSO based on Apache::Session modules. It simplifies the build of a protected area with a few changes in the application. It manages both authentication and authorization and provides headers for accounting. So you can have a full AAA protection for your web space as described below. %prep %setup -q @@ -27,16 +30,37 @@ make %{?_smp_mflags} make test %install -rm -rf $RPM_BUILD_ROOT -make install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} +# Set EXAMPLEROOT to BuildRoot and REALROOT to / +sed -i 's#^EXAMPLEROOT=.*#EXAMPLEROOT=%{buildroot}/#' Makefile +sed -i 's#^REALROOT=.*#REALROOT=/#' Makefile +# Install example +make example +# Set UNIX rights +make postconf_unixrights +# TODO : symlink apache config in /etc/httpd/conf.d %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc +%doc /var/lib/lemonldap-ng/docs +%doc /usr/share/man/ +%config /etc/lemonldap-ng +/var/lib/lemonldap-ng/portal +/var/lib/lemonldap-ng/manager +/var/lib/lemonldap-ng/handler +/var/lib/lemonldap-ng/sessions +/var/lib/lemonldap-ng/liberty-alliance-sp-portal +/var/lib/lemonldap-ng/test +/usr/bin/lmConfig_File2MySQL +/usr/lib/perl5/ %changelog +* Tue Oct 14 2008 Clement Oudot +- Use v0.9.3 +- Install example * Tue Oct 7 2008 David Hannequin - initial RPM