Skip to content

Commit 867c7cb

Browse files
pmatilaidmnks
authored andcommitted
Preparing for 6.0.0 final
The tag alignment change in v6 format test is worth noting: this happens because the rpm version string is shorter here (5.90.92 vs 6.0.0). That it only happens with the v6 test is probably a matter of other tag alignment masking the difference. These tests should be turned into pinned tests due to this version dependency: #3956. Fixes: #3946
1 parent 5552556 commit 867c7cb

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.18)
22

33
project(rpm
4-
VERSION 5.99.92
4+
VERSION 6.0.0
55
DESCRIPTION "The RPM Package Manager"
66
HOMEPAGE_URL "http://rpm.org"
77
LANGUAGES C CXX

tests/data/misc/rpmdump6.txt

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -235,103 +235,103 @@ Tag #27 [region]
235235
Tag #28 [region]
236236
tagno: 1080 (Changelogtime)
237237
type: 4 (int32)
238-
offset: 1572
238+
offset: 1568
239239
count: 1
240240

241241
Tag #29 [region]
242242
tagno: 1081 (Changelogname)
243243
type: 8 (argv)
244-
offset: 1576
244+
offset: 1572
245245
count: 1
246246

247247
Tag #30 [region]
248248
tagno: 1082 (Changelogtext)
249249
type: 8 (argv)
250-
offset: 1614
250+
offset: 1610
251251
count: 1
252252

253253
Tag #31 [region]
254254
tagno: 1094 (Cookie)
255255
type: 6 (string)
256-
offset: 1632
256+
offset: 1628
257257
count: 1
258258

259259
Tag #32 [region]
260260
tagno: 1095 (Filedevices)
261261
type: 4 (int32)
262-
offset: 1652
262+
offset: 1648
263263
count: 20
264264

265265
Tag #33 [region]
266266
tagno: 1096 (Fileinodes)
267267
type: 4 (int32)
268-
offset: 1732
268+
offset: 1728
269269
count: 20
270270

271271
Tag #34 [region]
272272
tagno: 1097 (Filelangs)
273273
type: 8 (argv)
274-
offset: 1812
274+
offset: 1808
275275
count: 20
276276

277277
Tag #35 [region]
278278
tagno: 1112 (Provideflags)
279279
type: 4 (int32)
280-
offset: 1832
280+
offset: 1828
281281
count: 1
282282

283283
Tag #36 [region]
284284
tagno: 1113 (Provideversion)
285285
type: 8 (argv)
286-
offset: 1836
286+
offset: 1832
287287
count: 1
288288

289289
Tag #37 [region]
290290
tagno: 1116 (Dirindexes)
291291
type: 4 (int32)
292-
offset: 1844
292+
offset: 1840
293293
count: 20
294294

295295
Tag #38 [region]
296296
tagno: 1117 (Basenames)
297297
type: 8 (argv)
298-
offset: 1924
298+
offset: 1920
299299
count: 20
300300

301301
Tag #39 [region]
302302
tagno: 1118 (Dirnames)
303303
type: 8 (argv)
304-
offset: 2014
304+
offset: 2010
305305
count: 10
306306

307307
Tag #40 [region]
308308
tagno: 1122 (Optflags)
309309
type: 6 (string)
310-
offset: 2054
310+
offset: 2050
311311
count: 1
312312

313313
Tag #41 [region]
314314
tagno: 1124 (Payloadformat)
315315
type: 6 (string)
316-
offset: 2061
316+
offset: 2057
317317
count: 1
318318

319319
Tag #42 [region]
320320
tagno: 1126 (Payloadflags)
321321
type: 6 (string)
322-
offset: 2066
322+
offset: 2062
323323
count: 1
324324

325325
Tag #43 [region]
326326
tagno: 1132 (Platform)
327327
type: 6 (string)
328-
offset: 2067
328+
offset: 2063
329329
count: 1
330330

331331
Tag #44 [region]
332332
tagno: 1140 (Filecolors)
333333
type: 4 (int32)
334-
offset: 2080
334+
offset: 2076
335335
count: 20
336336

337337
Tag #45 [region]

tests/pinned/rpmsigdig.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SHA3_256HEADER: (none)
2-
SHA256HEADER: 5332222014e747fce97fd37e333e8bd0d598dea79c7cf85516360acfd99bb43c
3-
SHA1HEADER: 4fe4eb2dfe453e5f1f2043000d1698079d23c8c0
4-
SIGMD5: 8313f2199766a97a2dda0fd910b046a5
2+
SHA256HEADER: 6c543a86abeba0985d446cfa57002f26206fe1f22c95d7691788c2550bccc72c
3+
SHA1HEADER: abff41e0bf50aa090db72f0be9f0a9c615e12627
4+
SIGMD5: 14ec6ed4fe7dd153c3c80eff5f82bd9d
55
PAYLOADSHA256: 116ce41ebb72f1877cda3d7dedaf5b78770e202d6389ade4e415d78548d703a8
66
PAYLOADSHA256ALT: 116ce41ebb72f1877cda3d7dedaf5b78770e202d6389ade4e415d78548d703a8
77
PAYLOADSHA3_256: (none)

tests/pinned/rpmsigdig6.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
SHA3_256HEADER: d6f29455b97e0101723b14f9d5a9202497c826c7c1dd5fced91192e01c01357f
2-
SHA256HEADER: 7b91dd567dc5ab6b961f9729f1f216aee886045eae4ec4ba987ec57c78d304ab
1+
SHA3_256HEADER: 5eccf79c2b2f810570a8cb53ff6ac50d9191d77c93e609bd33386b02ee2ffcd1
2+
SHA256HEADER: 640f33c7364b2329d680117e98c5f40c2aa51296917b3c1d291cf4d99ba6f94f
33
SHA1HEADER: (none)
44
SIGMD5: (none)
55
PAYLOADSHA256: 2f916d301d47ee34f16b74c7c49d11448fceb5487c6ba53c04950423fffeab95

0 commit comments

Comments
 (0)