Commit 0ede4e2e authored by Richard Levitte's avatar Richard Levitte
Browse files

Stop using tardy 



Instead of piping through tardy, and possibly suffering from bugs in certain
versions, use --transform, --owner and --group directly with GNU tar (we
already expect that tar variant).

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(cherry picked from commit 27f98436)

Conflicts:
	Makefile.org
parent 9b914c7f

Makefile.org

+17 −14
Original line number Diff line number Diff line
@@ -585,25 +585,28 @@ update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h a 
# would occur. Therefore the list of files is temporarily stored into a file

# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal

# tar does not support the --files-from option.

tar:

TAR_COMMAND=$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list \

	                       --owner openssl --group openssl \

			       --transform 's|^|openssl-$(VERSION)/|' \

			       -cvf -



../$(TARFILE).list:

	find * \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \

	       \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \

	       \! -name '*test' \! -name '.#*' \! -name '*~' \

	    | sort > ../$(TARFILE).list



tar: ../$(TARFILE).list

	find . -type d -print | xargs chmod 755

	find . -type f -print | xargs chmod a+r

	find . -type f -perm -0100 -print | xargs chmod a+x

	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \

	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \

	tardy --user_number=0  --user_name=openssl \

	      --group_number=0 --group_name=openssl \

	      --prefix=openssl-$(VERSION) - |\

	gzip --best >../$(TARFILE).gz; \

	rm -f ../$(TARFILE).list; \

	$(TAR_COMMAND) | gzip --best >../$(TARFILE).gz

	rm -f ../$(TARFILE).list

	ls -l ../$(TARFILE).gz



tar-snap:

	@$(TAR) $(TARFLAGS) -cvf - \

		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\

	tardy --user_number=0  --user_name=openssl \

	      --group_number=0 --group_name=openssl \

	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\

tar-snap: ../$(TARFILE).list

	$(TAR_COMMAND) > ../$(TARFILE)

	rm -f ../$(TARFILE).list

	ls -l ../$(TARFILE)



dist: