New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

repackaging mangles some bits #9

Open
bmwiedemann opened this Issue Sep 5, 2018 · 2 comments

Comments

Projects
None yet
2 participants
@bmwiedemann
Member

bmwiedemann commented Sep 5, 2018

In addition to #8 there are some more bits that vary between local osc build (without signing) and the repackaged server-side build.

Anyone can use a osc checkout home:bmwiedemann:reproducible:pesign and the nachbau script from
https://github.com/bmwiedemann/reproducibleopensuse
to generate such diffs

vhba-kmp has the minimum diff of:

comparing PROVIDES
-kernel-uname-r 8 4.18.5-1-default
+kernel-uname-r 16392 4.18.5-1-default

xtables-addons has a lot more

 ___QF_PROVIDES___
-libxt_ACCOUNT.so()(64bit) 0
-libxt_ACCOUNT_cl.so.0()(64bit) 0
+libxt_ACCOUNT.so()(64bit) 32768
+libxt_ACCOUNT_cl.so.0()(64bit) 32768

-/bin/sh 0
+/bin/sh 16384
 /sbin/ldconfig 1280
 /sbin/ldconfig 4352
-/usr/bin/perl 0
-libc.so.6()(64bit) 0
-libc.so.6(GLIBC_2.2.5)(64bit) 0
-libc.so.6(GLIBC_2.3)(64bit) 0
-libc.so.6(GLIBC_2.3.4)(64bit) 0
-libc.so.6(GLIBC_2.4)(64bit) 0
-libxt_ACCOUNT_cl.so.0()(64bit) 0
-libxtables.so.12()(64bit) 0
+/usr/bin/perl 16384
+libc.so.6()(64bit) 16384

-/usr/share/doc/packages/xtables-addons 0 (none) 40755 root root 0 4294966784
+/usr/share/doc/packages/xtables-addons 0 (none) 40755 root root 0 0

/usr/sbin/iptaccount differs in ELF section .dynstr
@@ -31,4 +31,4 @@
  07d8 6c696263 5f737461 72745f6d 61696e00  libc_start_main.
  07e8 474c4942 435f322e 3400474c 4942435f  GLIBC_2.4.GLIBC_
  07f8 322e322e 3500474c 4942435f 322e332e  2.2.5.GLIBC_2.3.
- 0808 3400                                 4.
+ 0808 34002f75 73722f6c 69623634 00        4./usr/lib64.

The last part is from debuginfo which probably gets stripped twice.
Many of the diffs in rpmtags come from

lib/rpmds.h:    RPMSENSE_FIND_REQUIRES = (1 << 14), /*!< find-requires generated dependency. */
lib/rpmds.h:    RPMSENSE_FIND_PROVIDES = (1 << 15), /*!< find-provides generated dependency. */

lcp added a commit that referenced this issue Sep 10, 2018

rpm: forward a few more flags
As reported in issue#9(*), REQUIRES and PROVIDES were also missing.

Per rpmds.h:
RPMSENSE_FIND_REQUIRES = (1 << 14), /*!< find-requires generated dependency. */
RPMSENSE_FIND_PROVIDES = (1 << 15), /*!< find-provides generated dependency. */

(*) #9

Signed-off-by: Gary Lin <glin@suse.com>
@lcp

This comment has been minimized.

Show comment
Hide comment
@lcp

lcp Sep 10, 2018

Collaborator

Added the two missing flags in 7eca70b

Collaborator

lcp commented Sep 10, 2018

Added the two missing flags in 7eca70b

@lcp lcp closed this Sep 10, 2018

@bmwiedemann

This comment has been minimized.

Show comment
Hide comment
@bmwiedemann

bmwiedemann Sep 10, 2018

Member

Tested your patch and it breaks the kmp build:

[   68s] + rpmbuild --define '%buildroot /home/abuild/rpmbuild/BUILDROOT/pesign-repackage-1.0-37.5.i386' --define '%disturl obs://build.opensuse.org/home:bmwiedemann:reproducible:pesign/openSUSE_Factory/6fc8ed725e1f4cb7c62b758227f1d2fe-vhba-kmp' --define '%_builddir /home/abuild/rpmbuild/BUILD/pesign-repackage-1.0' --define '%_suse_insert_debug_package %{nil}' -bb repackage.spec
[   68s] error: line 47: Bad Requirename: qualifiers: requires(requires): kernel-uname-r = 4.18.6-1-default
Member

bmwiedemann commented Sep 10, 2018

Tested your patch and it breaks the kmp build:

[   68s] + rpmbuild --define '%buildroot /home/abuild/rpmbuild/BUILDROOT/pesign-repackage-1.0-37.5.i386' --define '%disturl obs://build.opensuse.org/home:bmwiedemann:reproducible:pesign/openSUSE_Factory/6fc8ed725e1f4cb7c62b758227f1d2fe-vhba-kmp' --define '%_builddir /home/abuild/rpmbuild/BUILD/pesign-repackage-1.0' --define '%_suse_insert_debug_package %{nil}' -bb repackage.spec
[   68s] error: line 47: Bad Requirename: qualifiers: requires(requires): kernel-uname-r = 4.18.6-1-default

@lcp lcp reopened this Sep 11, 2018

lcp added a commit that referenced this issue Sep 11, 2018

Revert "rpm: forward a few more flags"
This reverts commit 7eca70b.

The commit caused build error:
#9 (comment)

Signed-off-by: Gary Lin <glin@suse.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment