From 752980f370965b02e5ee9feb1cfead644f3936be Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 4 Dec 2014 19:47:10 +0530 Subject: [PATCH] Revert "packaging: updated hardcoded jasypt version to 1.9.2" This reverts commit 43f39a1ec37de08e5b8e97dfd74a853c0aae76c7. --- debian/rules | 2 +- packaging/centos63/cloud.spec | 4 ++-- scripts/installer/windows/acs.wxs | 6 +++--- scripts/installer/windows/client.wxs | 2 +- scripts/storage/secondary/cloud-install-sys-tmplt | 2 +- setup/bindir/cloud-setup-databases.in | 2 +- setup/bindir/cloud-setup-encryption.in | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 08fca4c69e5..197e243bcfe 100755 --- a/debian/rules +++ b/debian/rules @@ -135,7 +135,7 @@ install: install -D client/target/utilities/bin/cloud-sysvmadm $(DESTDIR)/usr/bin/cloudstack-sysvmadm install -D systemvm/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso # We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place - install -D agent/target/dependencies/jasypt-1.9.2.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib + install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib # cloudstack-python mkdir -p $(DESTDIR)/usr/lib/python2.7/dist-packages diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 32eee62f35e..072a0b94884 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -312,7 +312,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classe ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py -install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar +install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.0.jar install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_managementstartscriptpath}/%{name}-management @@ -664,7 +664,7 @@ fi %attr(0644,root,root) %{python_sitearch}/cloud_utils.py %attr(0644,root,root) %{python_sitearch}/cloud_utils.pyc %attr(0644,root,root) %{python_sitearch}/cloudutils/* -%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar +%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.0.jar %{_defaultdocdir}/%{name}-common-%{version}/LICENSE %{_defaultdocdir}/%{name}-common-%{version}/NOTICE diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs index fa8ff41a8a2..bf09afcd6eb 100644 --- a/scripts/installer/windows/acs.wxs +++ b/scripts/installer/windows/acs.wxs @@ -260,10 +260,10 @@ Execute="deferred" Return="check" /> @@ -307,4 +307,4 @@ - + \ No newline at end of file diff --git a/scripts/installer/windows/client.wxs b/scripts/installer/windows/client.wxs index 3c9121de69f..6cca15d3e00 100644 --- a/scripts/installer/windows/client.wxs +++ b/scripts/installer/windows/client.wxs @@ -1645,7 +1645,7 @@ - + diff --git a/scripts/storage/secondary/cloud-install-sys-tmplt b/scripts/storage/secondary/cloud-install-sys-tmplt index d31377afc1d..96b11de41d4 100755 --- a/scripts/storage/secondary/cloud-install-sys-tmplt +++ b/scripts/storage/secondary/cloud-install-sys-tmplt @@ -40,7 +40,7 @@ DISKSPACE=5120000 #free disk space required in kilobytes dbHost= dbUser= dbPassword= -jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.2.jar' +jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.0.jar' while getopts 'm:h:f:u:Ft:e:s:o:r:d:' OPTION do case $OPTION in diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index c751ddef973..be54ff7c4d8 100755 --- a/setup/bindir/cloud-setup-databases.in +++ b/setup/bindir/cloud-setup-databases.in @@ -67,7 +67,7 @@ class DBDeployer(object): dbDotProperties = {} dbDotPropertiesIndex = 0 encryptionKeyFile = '@MSCONF@/key' - encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.2.jar' + encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.0.jar' success = False magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate' tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql') diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in index a617d498162..35a1737e54f 100755 --- a/setup/bindir/cloud-setup-encryption.in +++ b/setup/bindir/cloud-setup-encryption.in @@ -64,7 +64,7 @@ class DBDeployer(object): dbDotProperties = {} dbDotPropertiesIndex = 0 encryptionKeyFile = '@MSCONF@/key' - encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.2.jar' + encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.0.jar' success = False magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'