From 76c404da69c12a40235933575508bc25e5cd9277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Tue, 12 Feb 2019 21:15:33 +0100 Subject: [PATCH 1/2] Remove node_modules when creating dist --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e23076b01..53b6ecd0b 100644 --- a/Makefile +++ b/Makefile @@ -1011,18 +1011,18 @@ manager_uninstall: manager dist: clean @mkdir -p lemonldap-ng-$(VERSION) @cp -pRH $$(find * -maxdepth 0|grep -v -e "\(lemonldap-ng-$(VERSION)\|debian\|rpm\)") lemonldap-ng-$(VERSION) - @rm -rf $$(find lemonldap-ng-$(VERSION) -name .svn -print) @find $$dir -name '*.bak' -delete @rm -rf lemonldap-ng-$(VERSION)/lemonldap-ng-$(VERSION) + @rm -rf lemonldap-ng-$(VERSION)/node_modules @$(COMPRESS) lemonldap-ng-$(VERSION).$(COMPRESSSUFFIX) lemonldap-ng-$(VERSION) @rm -rf lemonldap-ng-$(VERSION) rpm-dist: clean @mkdir -p lemonldap-ng-$(VERSION) @cp -pRH $$(find * -maxdepth 0|grep -v -e "\(lemonldap-ng-$(VERSION)\|debian\)") lemonldap-ng-$(VERSION) - @rm -rf $$(find lemonldap-ng-$(VERSION) -name .svn -print) @find $$dir -name '*.bak' -delete @rm -rf lemonldap-ng-$(VERSION)/lemonldap-ng-$(VERSION) + @rm -rf lemonldap-ng-$(VERSION)/node_modules @$(COMPRESS) lemonldap-ng-$(VERSION).$(COMPRESSSUFFIX) lemonldap-ng-$(VERSION) @rm -rf lemonldap-ng-$(VERSION) @@ -1030,13 +1030,13 @@ rpm-dist: clean debian-dist: clean @mkdir -p lemonldap-ng-$(VERSION) @cp -pRH $$(find * -maxdepth 0|grep -v -e "\(lemonldap-ng-$(VERSION)\|rpm\)") lemonldap-ng-$(VERSION) - @rm -rf $$(find lemonldap-ng-$(VERSION) -name .svn -print) @find $$dir -name '*.bak' -delete @cp lemonldap-ng-$(VERSION)/_example/etc/handler-apache2.X.conf lemonldap-ng-$(VERSION)/_example/etc/handler-apache2.conf @cp lemonldap-ng-$(VERSION)/_example/etc/manager-apache2.X.conf lemonldap-ng-$(VERSION)/_example/etc/manager-apache2.conf @cp lemonldap-ng-$(VERSION)/_example/etc/portal-apache2.X.conf lemonldap-ng-$(VERSION)/_example/etc/portal-apache2.conf @cp lemonldap-ng-$(VERSION)/_example/etc/test-apache2.X.conf lemonldap-ng-$(VERSION)/_example/etc/test-apache2.conf @rm -rf lemonldap-ng-$(VERSION)/lemonldap-ng-$(VERSION) + @rm -rf lemonldap-ng-$(VERSION)/node_modules @$(COMPRESS) lemonldap-ng_$(VERSION).orig.$(COMPRESSSUFFIX) lemonldap-ng-$(VERSION) @rm -rf lemonldap-ng-$(VERSION) From a1894974a5e94cb756ffea6ad9509d0d4c3bc9fa Mon Sep 17 00:00:00 2001 From: Xavier Guimard Date: Wed, 13 Feb 2019 07:01:02 +0100 Subject: [PATCH 2/2] Add Crypt::URandom in common deps (CLoses: RT#128494) --- lemonldap-ng-common/Makefile.PL | 1 + 1 file changed, 1 insertion(+) diff --git a/lemonldap-ng-common/Makefile.PL b/lemonldap-ng-common/Makefile.PL index faf883128..0c0af0207 100644 --- a/lemonldap-ng-common/Makefile.PL +++ b/lemonldap-ng-common/Makefile.PL @@ -63,6 +63,7 @@ WriteMakefile( 'Crypt::OpenSSL::RSA' => 0, 'Crypt::OpenSSL::X509' => 0, 'Crypt::Rijndael' => 0, + 'Crypt::URandom' => 0, 'Digest::SHA' => 0, 'HTML::Template' => 0, 'JSON' => 0,