Re: [Rpm-maint] [rpm-software-management/rpm] Remove unused target variable from rpmspec.c (#736)

2019-06-04 Thread Panu Matilainen
pmatilai approved this pull request.

Right, an obvious cleanup. Thanks for spotting, and the PR.



-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/736#pullrequestreview-245830036___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Remove unused target variable from rpmspec.c (#736)

2019-06-04 Thread Panu Matilainen
Merged #736 into master.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/736#event-2390248364___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Fix bogus if-condition in find-debuginfo.sh (#735) (#737)

2019-06-04 Thread Panu Matilainen
pmatilai commented on this pull request.

It might be implemented internally in bash, but generally speaking "[" is an 
external command (try 'ls -l /bin/[') and needs to be surrounded by space, and 
even in bash it's common good style anyway (see elsewhere in the script). Shell 
coding style differs from that of C...

For the same externality reason (ie to avoid fork+exec), the [ command 
implements it's own and-operator as -a switch, which is commonly used in 
find-debuginfo.sh instead of &&, but that's strictly optional as find-debuginfo 
is a bash script.



-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/737#pullrequestreview-245829005___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Fix bogus if-condition in find-debuginfo.sh (#735) (#737)

2019-06-04 Thread pavlinamv
Introduced in commit 1da9e83, spotted by covscan.
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/737

-- Commit Summary --

  * Fix bogus if-condition in find-debuginfo.sh (#735)

-- File Changes --

M scripts/find-debuginfo.sh (2)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/737.patch
https://github.com/rpm-software-management/rpm/pull/737.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/737
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Remove unused target variable from rpmspec.c (#736)

2019-06-04 Thread Howard Johnson
Commit d2f48e93d32e222d4727b9684d2032f9bb9fc498 moved the --target
argument to be global, but didn't completely remove the local target
variable from rpmspec.c, or the code that used it to trigger re-loading
the rpm configuration files (which is now handled by the global argument
callback in poptALL.c).
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/736

-- Commit Summary --

  * Remove unused target variable from rpmspec.c

-- File Changes --

M rpmspec.c (7)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/736.patch
https://github.com/rpm-software-management/rpm/pull/736.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/736
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] rpmsign --signfiles is broken on master (#723)

2019-06-04 Thread David Shea
https://gist.github.com/dashea/ffe49cb5703d3e44870d71006bfeedd0 is a script 
that will create an rpm and all of the necessary keys, run rpmsign --signfiles, 
and verify the results. I ran it against 
https://github.com/rpm-software-management/rpm/pull/734 and the signature is 
correct.


-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/723#issuecomment-498761620___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Bogus if-condition in find-debuginfo.sh (#735)

2019-06-04 Thread Panu Matilainen
Introduced in commit 1da9e839bb573b9187403983f5a69853ab364306, spotted by 
covscan:

```
Error: SHELLCHECK_WARNING: [#def1]
/usr/lib/rpm/find-debuginfo.sh:216:4: warning: (..) is a subshell. Did you mean 
[ .. ], a test expression? [SC2205]
#  214|   fi
#  215|   
#  216|-> if ("$strip_g" = "true") && ("$strip_glibs" = "true"); then
#  217| echo >&2 "*** ERROR: -g  and --g-libs cannot be used together"
#  218| exit 2
```


-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/735___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] rpmsign --signfiles is broken on master (#723)

2019-06-04 Thread Panu Matilainen
Should be fixed in PR #734 , but I'd still appreciate if you can verify, and 
also for a full reproducer, like said I'm not at all convinced I'm doing the 
right thing with these tools.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/723#issuecomment-498612728___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Fix --signfiles regression (#723) (#734)

2019-06-04 Thread Panu Matilainen
Fixes, AFAICT, the --signfiles regression introduced in commit 
8f8fe718413a4066ecc6718f92091d9e87a2d443 and clarifies the code a bit in a 
separate commit.
You can view, comment on, or merge this pull request online at:

  https://github.com/rpm-software-management/rpm/pull/734

-- Commit Summary --

  * Fix --signfiles regression introduced when refactoring
  * Rename variable to make its usage and the surrounding code clearer

-- File Changes --

M sign/rpmsignfiles.c (8)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/734.patch
https://github.com/rpm-software-management/rpm/pull/734.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/734
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] missing popt Requires in rpm.pc (#724)

2019-06-04 Thread Panu Matilainen
Closed #724.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/724#event-2387437402___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] missing popt Requires in rpm.pc (#724)

2019-06-04 Thread Panu Matilainen
The superfluous include is removed now (commit 
74033a316520aa7877f62e39296f293b7d4493e0), thanks for pointing that out.
Linking to popt is entirely optional for API users though, so the private libs 
is the right place for it.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/724#issuecomment-498589079___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] rpmsign --signfiles is broken on master (#723)

2019-06-04 Thread Panu Matilainen
Oh and thanks for spotting and reporting, shipping regressions is never nice.

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/723#issuecomment-498586931___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] rpmsign --signfiles is broken on master (#723)

2019-06-04 Thread Panu Matilainen
The point of that commit is that those digests are already in the desired 
binary format inside the file objects, so there's no need to do it again. 
AFAICS the problem is that it's still passing digest and diglen to sign_hash() 
when it should pass fdigest instead:

```
--- a/sign/rpmsignfiles.c
+++ b/sign/rpmsignfiles.c
@@ -50,7 +50,7 @@ const char *key, char *keypass, uint32_t *siglenp)
 signature[0] = '\x03';
 
 /* calculate file signature */
-siglen = sign_hash(algo, digest, diglen, key, keypass, signature+1);
+siglen = sign_hash(algo, fdigest, diglen, key, keypass, signature+1);
 if (siglen < 0) {
rpmlog(RPMLOG_ERR, _("sign_hash failed\n"));
return NULL;
```

If you can try the above "patch", great, but even better would be a full 
reproducer procedure, starting from scratch (key creation and all) so we can 
try creating a proper testcase to avoid future regressions. I know I managed to 
set *something* up at some point in time, but I never was convinced I was doing 
the right thing and here we are...

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/issues/723#issuecomment-498585867___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint