File dbxtool-fixes.patch of Package dbxtool.16777

Index: dbxtool-8/src/iter.c
===================================================================
--- dbxtool-8.orig/src/iter.c
+++ dbxtool-8/src/iter.c
@@ -114,8 +114,8 @@ esd_iter_next(esd_iter *iter, efi_guid_t
 					sizeof (iter->esd->SignatureOwner)) {
 				warnx("X.509 Cert ASN.1 size does not match "
 				      "SignatureList Size (%d vs %ld)",
-				      asn1size, iter->len -
-					sizeof (iter->esd->SignatureOwner));
+				      asn1size, (long)(iter->len -
+					sizeof (iter->esd->SignatureOwner)));
 			}
 		}
 
@@ -224,8 +224,8 @@ esl_iter_next(esl_iter *iter, efi_guid_t
 		esl_get_type(iter, &type);
 		if (iter->len - iter->offset > iter->esl->SignatureListSize) {
 			warnx("EFI Signature List is malformed");
-			errx(1, "list has %zd bytes left, element is %"PRIu32" bytes",
-			     iter->len - iter->offset,
+			errx(1, "list has %ld bytes left, element is %"PRIu32" bytes",
+			     (long)(iter->len - iter->offset),
 			     iter->esl->SignatureListSize);
 		}
 		if (!efi_guid_cmp(&type, &efi_guid_x509_cert)) {
@@ -241,8 +241,8 @@ esl_iter_next(esl_iter *iter, efi_guid_t
 							 - sizeof (efi_guid_t)) {
 				warnx("X.509 Cert ASN.1 size does not match "
 				      "SignatureList Size (%d vs %ld)",
-				      asn1size, iter->esl->SignatureSize -
-						sizeof (efi_guid_t));
+				      asn1size, (long)(iter->esl->SignatureSize -
+						sizeof (efi_guid_t)));
 			}
 
 		}
Index: dbxtool-8/Make.defaults
===================================================================
--- dbxtool-8.orig/Make.defaults
+++ dbxtool-8/Make.defaults
@@ -10,7 +10,7 @@ BUILDFLAGS = $(CFLAGS) -fPIC -fshort-wch
 		-Wall -Wextra -Werror -Werror=format-security \
 		-Wsign-compare -Werror=sign-compare \
 		-Wno-unused-result -Wno-unused-function -Wno-error=cpp \
-		-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong \
+		-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector \
 		--param=ssp-buffer-size=4 -fexceptions
 ASFLAGS    =
 LDFLAGS	   = -nostdlib