Debian upgrade

build/lemonldap-ng/Makefile

@@ -80,6 +80,10 @@ LDAPSUFFIX=dc=example,dc=com
 
 # Other
 VERSION=`head -n1 changelog |sed -e 's/lemonldap-ng (//' -e 's/).*$$//'`
+PORTALSKINS=`ls lemonldap-ng-portal/example/skins/`
+MANAGERSKINS=`ls lemonldap-ng-manager/example/skins/`
+DIFF=diff -aburN -x '*.bak' -x .svn
+	
 SRCCOMMONDIR=lemonldap-ng-common
 SRCHANDLERDIR=lemonldap-ng-handler
 SRCPORTALDIR=lemonldap-ng-portal
@@ -511,3 +515,27 @@ debian-packages: debian-dist
 	tar xzf lemonldap-ng_$$version.orig.tar.gz && \
 	cd lemonldap-ng-$$version && \
 	debuild
+
+diff:
+	@# Portal
+	@$(DIFF) lemonldap-ng-portal/lib/Lemonldap/NG/Portal /usr/share/perl5/Lemonldap/NG/Portal ||true
+	@$(DIFF) lemonldap-ng-portal/example/scripts/purgeCentralCache /usr/share/lemonldap-ng/bin/purgeCentralCache ||true
+	@$(DIFF) lemonldap-ng-portal/example/scripts/buildPortalWSDL /usr/share/lemonldap-ng/bin/buildPortalWSDL ||true
+	@for i in $(PORTALSKINS); do \
+		$(DIFF) -x 'jquery*' lemonldap-ng-portal/example/skins/$$i /usr/share/lemonldap-ng/portal-skins/$$i; \
+	done ||true
+	@# Handler
+	@$(DIFF) lemonldap-ng-handler/lib/Lemonldap/NG/Handler /usr/share/perl5/Lemonldap/NG/Handler ||true
+	@# Common
+	@$(DIFF) lemonldap-ng-common/lib/Lemonldap/NG/Common /usr/share/perl5/Lemonldap/NG/Common ||true
+	@$(DIFF) lemonldap-ng-common/lib/Lemonldap/NG/Common.pm /usr/share/perl5/Lemonldap/NG/Common.pm ||true
+	@$(DIFF) lemonldap-ng-common/scripts/lmMigrateConfFiles2ini /usr/share/lemonldap-ng/bin/lmMigrateConfFiles2ini ||true
+	@$(DIFF) lemonldap-ng-common/scripts/convertConfig /usr/share/lemonldap-ng/bin/convertConfig ||true
+	@# Manager
+	@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager /usr/share/perl5/Lemonldap/NG/Manager ||true
+	@$(DIFF) lemonldap-ng-manager/lib/Lemonldap/NG/Manager.pm /usr/share/perl5/Lemonldap/NG/Manager.pm ||true
+	@$(DIFF) lemonldap-ng-manager/example/images /usr/share/lemonldap-ng/sessions-explorer-imgs ||true
+	for i in $(MANAGERSKINS); do \
+		$(DIFF) -x 'jquery*' lemonldap-ng-manager/example/skins/$$i /usr/share/lemonldap-ng/manager-skins/$$i; \
+	done ||true
+

build/lemonldap-ng/debian/README.Debian

@@ -50,7 +50,7 @@ IV - LEMONLDAP::NG CONFIGURATION STORAGE
 Package: liblemonldap-ng-conf-perl
 
 Lemonldap::NG configuration is stored by default in /var/lib/lemonldap-ng/conf.
-Modify /etc/lemonldap-ng/storage.conf to change configuration storage.
+Modify /etc/lemonldap-ng/lemonldap-ng.ini to change configuration storage.
 
 1.1 - Migrating from 'File' to 'DBI'
 

build/lemonldap-ng/debian/liblemonldap-ng-manager-perl.postinst

@@ -12,8 +12,6 @@ if [ "$1" == "configure" ]
 then
     chmod +x $SESSIONSFILE
     chmod +x $MANAGERFILE
-    chgrp www-data /etc/lemonldap-ng/apply.conf
-    chmod 640 /etc/lemonldap-ng/apply.conf
 fi
 
 

build/lemonldap-ng/debian/rules

@@ -72,6 +72,8 @@ install: build
 			APACHEGROUP=www-data
 
 	# Since Lenny, jquery.js is provided by libjs-jquery
+	find $(CURDIR)/debian/tmp -type f -regex '.*/jquery-[0-9].*\.js' -delete
+	find $(CURDIR)/debian/tmp -type f -name jquery.js -delete
 	rm -f $(CURDIR)/debian/tmp$(LMSHAREDIR)*-skins/*/jquery.js
 	perl -i -pe 's#(["'"'"']).*?jquery.js#$$1/javascript/jquery/jquery.js#' \
 			$(CURDIR)/debian/tmp/examples/manager/*.pl \

build/lemonldap-ng/debian/storage.conf

-#
-# This file contains parameters used by Lemonldap::NG to find its configuration
-#
-#
-# 1 - Type
-#
-# You can use one of the following:
-# * File: you have to set 'dirName' parameter. Example:
-#
-#           type = File
-#           dirName = /var/lib/lemonldap-ng/conf
-#
-# * DBI : you have to set 'dbiChain' (required) and 'dbiUser' and 'dbiPassword'
-#         if needed. Example:
-#
-#           type        = DBI
-#           dbiChain    = DBI:mysql:database=lemonldap-ng;host=1.2.3.4
-#           dbiUser     = lemonldap
-#           dbiPassword = password
-#
-# * SOAP: SOAP configuration access is a sort of proxy: the portal is
-#         configured to use the real session storage type (DBI or File for
-#         example).
-#         You have to set 'proxy' parameter. Example:
-#
-#           type         = SOAP
-#           proxy        = https://auth.example.com/index.pl/config
-#           proxyOptions = { timeout => 5 }
-#           User         = lemonldap
-#           Password     = mypassword
-#
-# * LDAP: you have to set ldapServer, ldapConfBranch, ldapBindDN and ldapBindPassword.
-#
-#           type             = LDAP
-#           ldapServer       = ldap://localhost
-#           ldapConfBase     = ou=conf,ou=applications,dc=example,dc=com
-#           ldapBindDN       = cn=manager,dc=example,dc=com
-#           ldapBindPassword = secret
-#
-#
-# 2 - LocalStorage
-#
-# To increase performances, use a local cache for the configuration. You have
-# to choose a Cache::Cache module and set it's parameters (1 line). Example:
-#
-#           localStorage = Cache::FileCache
-#           localStorageOptions = { 'namespace' => 'MyNamespace', 'default_expires_in' => 600, 'directory_umask' => '007', 'cache_root' => '/tmp', 'cache_depth' => 5, }
-
-type    = File
-dirName = /var/lib/lemonldap-ng/conf
-localStorage = Cache::FileCache
-localStorageOptions = { 'namespace' => 'MyNamespace', 'default_expires_in' => 600, 'directory_umask' => '007', 'cache_root' => '/tmp', 'cache_depth' => 5, }