1. photon
  2. Commit 691da02f25a06a39dfe5f6e9951d4d7cebcb63f1
Browse code

Follow similar logging to previous openssl versions for c_rehash

Change-Id: I5c23001c1f930593bfe825b7adc165039b3ff3c2
Reviewed-on: http://photon-jenkins.eng.vmware.com/210
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George

suezzelur authored on 2015/12/03 09:50:27
Showing 2 changed files
SPECS/openssl/c_rehash.patch
History View file @ 691da02
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,64 @@
0 
+--- openssl-1.0.2d-orig/tools/c_rehash	2015-07-09 05:03:10.000000000 -0700
1 
+@@ -165,14 +165,14 @@
2 
+ 		$hash .= ".$suffix";
3 
+ 		if ($symlink_exists) {
4 
+ 			symlink $fname, $hash;
5 
+-			print "link $fname -> $hash\n" if $verbose;
6 
++			print "link $fname => $hash\n";
7 
+ 		} else {
8 
+ 			open IN,"<$fname" or die "can't open $fname for read";
9 
+ 			open OUT,">$hash" or die "can't open $hash for write";
10 
+ 			print OUT <IN>;	# does the job for small text files
11 
+ 			close OUT;
12 
+ 			close IN;
13 
+-			print "copy $fname -> $hash\n" if $verbose;
14 
++			print "copy $fname => $hash\n";
15 
+ 		}
16 
+ 		$hashlist{$hash} = $fprint;
17 
+ }
18 
+@@ -200,10 +200,10 @@
19 
+ 		$hash .= ".r$suffix";
20 
+ 		if ($symlink_exists) {
21 
+ 			symlink $fname, $hash;
22 
+-			print "link $fname -> $hash\n" if $verbose;
23 
++			print "link $fname => $hash\n";
24 
+ 		} else {
25 
+ 			system ("cp", $fname, $hash);
26 
+-			print "cp $fname -> $hash\n" if $verbose;
27 
++			print "cp $fname => $hash\n";
28 
+ 		}
29 
+ 		$hashlist{$hash} = $fprint;
30 
+ }
31 
+--- openssl-1.0.2d-orig/tools/c_rehash.in	2015-07-09 04:57:15.000000000 -0700
32 
+@@ -165,14 +165,14 @@
33 
+ 		$hash .= ".$suffix";
34 
+ 		if ($symlink_exists) {
35 
+ 			symlink $fname, $hash;
36 
+-			print "link $fname -> $hash\n" if $verbose;
37 
++			print "link $fname => $hash\n";
38 
+ 		} else {
39 
+ 			open IN,"<$fname" or die "can't open $fname for read";
40 
+ 			open OUT,">$hash" or die "can't open $hash for write";
41 
+ 			print OUT <IN>;	# does the job for small text files
42 
+ 			close OUT;
43 
+ 			close IN;
44 
+-			print "copy $fname -> $hash\n" if $verbose;
45 
++			print "copy $fname => $hash\n";
46 
+ 		}
47 
+ 		$hashlist{$hash} = $fprint;
48 
+ }
49 
+@@ -200,10 +200,10 @@
50 
+ 		$hash .= ".r$suffix";
51 
+ 		if ($symlink_exists) {
52 
+ 			symlink $fname, $hash;
53 
+-			print "link $fname -> $hash\n" if $verbose;
54 
++			print "link $fname => $hash\n";
55 
+ 		} else {
56 
+ 			system ("cp", $fname, $hash);
57 
+-			print "cp $fname -> $hash\n" if $verbose;
58 
++			print "cp $fname => $hash\n";
59 
+ 		}
60 
+ 		$hashlist{$hash} = $fprint;
61 
+ }
SPECS/openssl/openssl.spec
History View file @ 691da02
... ... 
@@ -1,7 +1,7 @@
1 1 
 Summary:	Management tools and libraries relating to cryptography
2 2 
 Name:		openssl
3 3 
 Version:	1.0.2d
4 
-Release:	2%{?dist}
4 
+Release:	3%{?dist}
5 5 
 License:	OpenSSL
6 6 
 URL:		http://www.openssl.org
7 7 
 Group:		System Environment/Security
... ... 
@@ -9,6 +9,7 @@ Vendor:		VMware, Inc.
9 9 
 Distribution:	Photon
10 10 
 Source0:	http://www.openssl.org/source/%{name}-%{version}.tar.gz
11 11 
 %define sha1 openssl=d01d17b44663e8ffa6a33a5a30053779d9593c3d
12 
+Patch:		c_rehash.patch
12 13 
 Requires:	bash glibc libgcc
13 14
14 15 
 %description
... ... 
@@ -34,6 +35,7 @@ Perl scripts that convert certificates and keys to various formats.
34 34
35 35 
 %prep
36 36 
 %setup -q
37 
+%patch -p1
37 38
38 39 
 %build
39 40 
 export CFLAGS="%{optflags}"
... ... 
@@ -89,6 +91,8 @@ rm -rf %{buildroot}/*
89 89 
 /%{_sysconfdir}/ssl/misc/CA.pl
90 90
91 91 
 %changelog
92 
+*   Wed Dec 02 2015 Anish Swaminathan <anishs@vmware.com> 1.0.2d-3
93 
+-   Follow similar logging to previous openssl versions for c_rehash.
92 94 
 *   Fri Aug 07 2015 Sharath George <sharathg@vmware.com> 1.0.2d-2
93 95 
 -   Split perl scripts to a different package.
94 96 
 *   Fri Jul 24 2015 Chang Lee <changlee@vmware.com> 1.0.2d-1