commit 104856ea17161eb3a508913c2b7ed701f2e4f6aa

Author: Panu Matilainen <pmatilai@redhat.com>

Date:   Tue Oct 7 15:37:21 2014 +0300

    Unbreak size and archive size generation on big-endian systems

    - Fix regression from commit 68bddc353a7ea87ea00ad957858cd509e845e84c,

      accessing a 64bit int as if it were a 32bit one doesn't make it one.

diff --git a/build/pack.c b/build/pack.c

index 28834dc..15f005a 100644

--- a/build/pack.c

+++ b/build/pack.c

@@ -273,9 +273,6 @@ static rpmRC generateSignature(char *SHA1, uint8_t *MD5, rpm_loff_t size,

 {

     Header sig = NULL;

     struct rpmtd_s td;

-    rpmTagVal sizetag;

-    rpmTagVal payloadtag;

-    rpm_tagtype_t typetag;

     rpmRC rc = RPMRC_OK;

     char *reservedSpace;

     int spaceSize = 0;

@@ -297,29 +294,33 @@ static rpmRC generateSignature(char *SHA1, uint8_t *MD5, rpm_loff_t size,

     td.data = MD5;

     headerPut(sig, &td, HEADERPUT_DEFAULT);

+    rpmtdReset(&td);

+    td.count = 1;

     if (payloadSize < UINT32_MAX) {

-	sizetag = RPMSIGTAG_SIZE;

-	payloadtag = RPMSIGTAG_PAYLOADSIZE;

-	typetag = RPM_INT32_TYPE;

+	rpm_off_t p = payloadSize;

+	rpm_off_t s = size;

+	td.type = RPM_INT32_TYPE;

+

+	td.tag = RPMSIGTAG_PAYLOADSIZE;

+	td.data = &p;

+	headerPut(sig, &td, HEADERPUT_DEFAULT);

+

+	td.tag = RPMSIGTAG_SIZE;

+	td.data = &s;

+	headerPut(sig, &td, HEADERPUT_DEFAULT);

     } else {

-	sizetag = RPMSIGTAG_LONGSIZE;

-	payloadtag = RPMSIGTAG_LONGARCHIVESIZE;

-	typetag = RPM_INT64_TYPE;

-    }

+	rpm_loff_t p = payloadSize;

+	rpm_loff_t s = size;

+	td.type = RPM_INT64_TYPE;

-    rpmtdReset(&td);

-    td.tag = payloadtag;

-    td.count = 1;

-    td.type = typetag;

-    td.data = &payloadSize;

-    headerPut(sig, &td, HEADERPUT_DEFAULT);

+	td.tag = RPMSIGTAG_LONGARCHIVESIZE;

+	td.data = &p;

+	headerPut(sig, &td, HEADERPUT_DEFAULT);

-    rpmtdReset(&td);

-    td.tag = sizetag;

-    td.count = 1;

-    td.type = typetag;

-    td.data = &siz;;

-    headerPut(sig, &td, HEADERPUT_DEFAULT);

+	td.tag = RPMSIGTAG_LONGSIZE;

+	td.data = &s;

+	headerPut(sig, &td, HEADERPUT_DEFAULT);

+    }

     spaceSize = rpmExpandNumeric("%{__gpg_reserved_space}");

     if(spaceSize > 0) {