delete unused files

make-dummy-cert

@@ -1,28 +0,0 @@
-#!/bin/sh
-umask 077
-
-answers() {
-	echo --
-	echo SomeState
-	echo SomeCity
-	echo SomeOrganization
-	echo SomeOrganizationalUnit
-	echo localhost.localdomain
-	echo root@localhost.localdomain
-}
-
-if [ $# -eq 0 ] ; then
-	echo $"Usage: `basename $0` filename [...]"
-	exit 0
-fi
-
-for target in $@ ; do
-	PEM1=`/bin/mktemp /tmp/openssl.XXXXXX`
-	PEM2=`/bin/mktemp /tmp/openssl.XXXXXX`
-	trap "rm -f $PEM1 $PEM2" SIGINT
-	answers | /usr/bin/openssl req -newkey rsa:2048 -keyout $PEM1 -nodes -x509 -days 365 -out $PEM2 2> /dev/null
-	cat $PEM1 >  ${target}
-	echo ""   >> ${target}
-	cat $PEM2 >> ${target}
-	rm -f $PEM1 $PEM2
-done

openssl-1.1.1-build.patch

@@ -1,24 +1,24 @@
-diff -up openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl.build openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl
+#diff -up openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl.build openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl
---- openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl.build	2018-06-20 16:48:09.000000000 +0200
+#--- openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl.build	2018-06-20 16:48:09.000000000 +0200
-+++ openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl	2018-07-16 17:15:38.108831031 +0200
+#+++ openssl-1.1.1-pre8/Configurations/unix-Makefile.tmpl	2018-07-16 17:15:38.108831031 +0200
-@@ -680,7 +680,7 @@ uninstall_runtime:
+#@@ -680,7 +680,7 @@ uninstall_runtime:
- install_man_docs:
+# install_man_docs:
- 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+# 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
- 	@$(ECHO) "*** Installing manpages"
+# 	@$(ECHO) "*** Installing manpages"
--	$(PERL) $(SRCDIR)/util/process_docs.pl \
+#-	$(PERL) $(SRCDIR)/util/process_docs.pl \
-+	TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \
+#+	TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \
- 		--destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX)
+# 		--destdir=$(DESTDIR)$(MANDIR) --type=man --suffix=$(MANSUFFIX)
- 
+# 
- uninstall_man_docs:
+# uninstall_man_docs:
-@@ -692,7 +692,7 @@ uninstall_man_docs:
+#@@ -692,7 +692,7 @@ uninstall_man_docs:
- install_html_docs:
+# install_html_docs:
- 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
+# 	@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
- 	@$(ECHO) "*** Installing HTML manpages"
+# 	@$(ECHO) "*** Installing HTML manpages"
--	$(PERL) $(SRCDIR)/util/process_docs.pl \
+#-	$(PERL) $(SRCDIR)/util/process_docs.pl \
-+	TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \
+#+	TZ=UTC $(PERL) $(SRCDIR)/util/process_docs.pl \
- 		--destdir=$(DESTDIR)$(HTMLDIR) --type=html
+# 		--destdir=$(DESTDIR)$(HTMLDIR) --type=html
- 
+# 
- uninstall_html_docs:
+# uninstall_html_docs:
 diff -up openssl-1.1.1-pre8/Configurations/10-main.conf.build openssl-1.1.1-pre8/Configurations/10-main.conf
 --- openssl-1.1.1-pre8/Configurations/10-main.conf.build	2018-06-20 16:48:09.000000000 +0200
 +++ openssl-1.1.1-pre8/Configurations/10-main.conf	2018-07-16 17:17:10.312045203 +0200

openssl.spec

@@ -2,15 +2,12 @@
 Name:        openssl
 Epoch:       1
 Version:     1.1.1d
-Release:     2
+Release:     3
 Summary:     Cryptography and SSL/TLS Toolkit
 License:     OpenSSL and SSLeay
 URL:         https://www.openssl.org/
 Source0:     https://www.openssl.org/source/old/1.1.1/%{name}-%{version}.tar.gz
 Source1:     Makefile.certificate
-Source2:     make-dummy-cert
-Source3:     renew-dummy-cert
-# Support lib64
 Patch1:      openssl-1.1.1-build.patch
 Patch2:      openssl-1.1.1-fips.patch
 Patch6000:   CVE-2019-1551.patch
@@ -76,8 +73,6 @@ done
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/certs
 install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_pkgdocdir}/Makefile.certificate
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/make-dummy-cert
-install -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/renew-dummy-cert
 
 mv $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/misc/*.pl $RPM_BUILD_ROOT%{_bindir}
 mv $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/misc/tsget $RPM_BUILD_ROOT%{_bindir}
@@ -154,6 +149,9 @@ make test || :
 
 
 %changelog
+* Fri Jan 10 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:1.1.1d-3
+- delete unused files
+
 * Fri Dec 27 2019 openEuler Buildteam <buildteam@openeuler.org> - 1:1.1.1d-2
 - modify obsoletes
 

renew-dummy-cert

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-if [ $# -eq 0 ]; then
-	echo $"Usage: `basename $0` filename" 1>&2
-	exit 1
-fi
-
-PEM=$1
-REQ=`/bin/mktemp /tmp/openssl.XXXXXX`
-KEY=`/bin/mktemp /tmp/openssl.XXXXXX`
-CRT=`/bin/mktemp /tmp/openssl.XXXXXX`
-NEW=${PEM}_
-
-trap "rm -f $REQ $KEY $CRT $NEW" SIGINT
-
-if [ ! -f $PEM ]; then
-	echo "$PEM: file not found" 1>&2
-	exit 1
-fi
-
-umask 077
-
-OWNER=`ls -l $PEM | awk '{ printf "%s.%s", $3, $4; }'`
-
-openssl rsa -inform pem -in $PEM -out $KEY
-openssl x509 -x509toreq -in $PEM -signkey $KEY -out $REQ
-openssl x509 -req -in $REQ -signkey $KEY -days 365 \
-	-extfile /etc/pki/tls/openssl.cnf -extensions v3_ca -out $CRT
-
-(cat $KEY ; echo "" ; cat $CRT) > $NEW
-
-chown $OWNER $NEW
-
-mv -f $NEW $PEM
-
-rm -f $REQ $KEY $CRT
-
-exit 0
-