X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-connectivity%2Fopenssl%2Fopenssl-0.9.8x%2Fdebian%2Fengines-path.patch;fp=meta-openvuplus%2Frecipes-connectivity%2Fopenssl%2Fopenssl-0.9.8x%2Fdebian%2Fengines-path.patch;h=0000000000000000000000000000000000000000;hp=5b4c7d5f770c9454c68e573e8cc626e74d6f288e;hb=6265fa9d50c79193e6b900686564be4f50de40ec;hpb=e7deb5688d334397f7b455e71f42585ce8f6b512

diff --git a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/engines-path.patch b/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/engines-path.patch
deleted file mode 100644
index 5b4c7d5..0000000
--- a/meta-openvuplus/recipes-connectivity/openssl/openssl-0.9.8x/debian/engines-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/Makefile.org
-===================================================================
---- openssl-0.9.8m.orig/Makefile.org	2010-01-27 16:06:36.000000000 +0000
-+++ openssl-0.9.8m/Makefile.org	2010-02-27 00:43:04.000000000 +0000
-@@ -620,7 +620,7 @@
- install_sw:
- 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
--		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-+		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
- 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
- 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-Index: openssl-0.9.8m/engines/Makefile
-===================================================================
---- openssl-0.9.8m.orig/engines/Makefile	2009-11-10 01:53:02.000000000 +0000
-+++ openssl-0.9.8m/engines/Makefile	2010-02-27 00:45:03.000000000 +0000
-@@ -101,13 +101,13 @@
- 				*DSO_DL*)	sfx="sl";;	\
- 				*)		sfx="bad";;	\
- 				esac; \
--				cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
-+				cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
- 			  else \
- 			  	sfx="so"; \
- 				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
- 			  fi; \
--			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
--			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
-+			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
-+			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
- 		done; \
- 	fi
- 
-Index: openssl-0.9.8m/Configure
-===================================================================
---- openssl-0.9.8m.orig/Configure	2010-02-27 00:40:42.000000000 +0000
-+++ openssl-0.9.8m/Configure	2010-02-27 00:46:47.000000000 +0000
-@@ -1738,7 +1738,7 @@
- 		# $foo is to become "$prefix/lib$multilib/engines";
- 		# as Makefile.org and engines/Makefile are adapted for
- 		# $multilib suffix.
--		my $foo = "$prefix/lib/engines";
-+		my $foo = "$prefix/lib/ssl/engines";
- 		$foo =~ s/\\/\\\\/g;
- 		print OUT "#define ENGINESDIR \"$foo\"\n";
- 		}