Re: [Rpm-maint] [rpm-software-management/rpm] Warn if %else is after %else (#649)

2019-05-14 Thread Florian Festi
Typo in the first sentence of the commit message: "odrering"

-- 
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/649#issuecomment-492232761___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Add support for %patchlist and %sourcelist spec sections (#679)

2019-05-14 Thread Panu Matilainen
Merged #679 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/679#event-2340075923___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Warn if %else is after %else (#649)

2019-05-14 Thread pavlinamv
pavlinamv commented on this pull request.



> +size_t textLen;
+const char *text;
+int withArgs;
+int isConditional;
+int wrongPrecursors;
+const char *info_text;
+} * parsedSpecLine;
+
+static struct parsedSpecLine_s const lineTypes[] = {
+{ LINE_ENDIF,  LEN_AND_STR("%endif")  , 0, 1, LINE_ENDIF, "with no 
%%if"},
+{ LINE_ELSE,   LEN_AND_STR("%else")   , 0, 1, LINE_ENDIF | LINE_ELSE, 
"after %%else" },
+{ LINE_IF, LEN_AND_STR("%if") , 1, 1, 0, "after %%if"},
+{ LINE_IFARCH, LEN_AND_STR("%ifarch") , 1, 1, 0, "after %%ifarch"},
+{ LINE_IFNARCH,LEN_AND_STR("%ifnarch"), 1, 1, 0, "after %%ifnarch"},
+{ LINE_IFOS,   LEN_AND_STR("%ifos")   , 1, 1, 0, "after %%ifos"},
+{ LINE_IFNOS,  LEN_AND_STR("%ifnos")  , 1, 1, 0, "after %%ifnos"},

>The %ifs should not have any info text because there are no such error cases, 
>and the texts should be marked for translation.

>Programmatically constructed messages tend to be a problem for translators, 
>might better to have the whole string in one piece, ie "%s with no %s" and "%s 
>after %s" to allow translators to at least reorder the words.

Changed in the new version

>  Also, isn't this now missing the else-with-no-if case, or am I just 
> misreading it?

No in this case it wrote e.g.
/data/SPECS/attrtest.spec:1: %%endif with no %%if
/data/SPECS/configtest.spec:1: %%else with no %%if

> Hmm, "with no" could just as well be changed into "before", which makes the 
> messages more in line with each other: this is just about the order of 
> things, so things are either before or after its proper place.

This message appears e.g. in case that in spec file is only one conditional: 
%endif. So in this case there is no %if after the %endif, thus changing "with 
no" into "before" good idea.

-- 
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/649#discussion_r283789959___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Warn if %else is after %else (#649)

2019-05-14 Thread pavlinamv
pavlinamv commented on this pull request.



> @@ -462,6 +430,16 @@ int readLine(rpmSpec spec, int strip)
 lineType = parseLineType(s);
 if (!lineType)
goto after_classification;
+
+/* for a conditional check its ordering */
+if (lineType->isConditional &&
+   (spec->readStack->lastConditional->id & lineType->wrongPrecursors)) {
+   rpmlog(RPMLOG_ERR,_("%s:%d: Got %%%s %s\n"),

Removed in the new version.

-- 
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/649#discussion_r283789969___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Run binary package generation and file classification in parallel threads (#695)

2019-05-14 Thread Panu Matilainen
Maybe third time's the charm... while walking the dog I remembered the hash 
table added in commit e33045e35c09cda530a9e665c367693e285b6511 that wasn't 
there when these patches were created needs thread protection now.

-- 
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/695#issuecomment-49222___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Run binary package generation and file classification in parallel threads (#695)

2019-05-14 Thread Panu Matilainen
@pmatilai pushed 1 commit.

b42103a0f539c600a8b3de423d9db76501623b98  fixup! Run file classification in 
parallel threads


-- 
You are receiving this because you are subscribed to this thread.
View it on GitHub:
https://github.com/rpm-software-management/rpm/pull/695/files/e6c79e5d48e5373aa86ef28b8dae9f072208..b42103a0f539c600a8b3de423d9db76501623b98
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Run binary package generation and file classification in parallel threads (#695)

2019-05-14 Thread Panu Matilainen
@ffesti spotted a bug in the binaryPackages() for loop logic, fixed in the 
first push but then a regression introduced in commit  
0f21bdd0d7b2c45564ddb5a24bbebd530867bd54 caused one test to fail. Now rebased 
on top of the regression fix... pffft.

-- 
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/695#issuecomment-492195330___
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 use-after-free introduced in 0f21bdd0d7b2c45564ddb5a24bbebd530867… (#705)

2019-05-14 Thread Panu Matilainen
Merged #705 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/705#event-2339744626___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


[Rpm-maint] [rpm-software-management/rpm] Fix use-after-free introduced in 0f21bdd0d7b2c45564ddb5a24bbebd530867… (#705)

2019-05-14 Thread Panu Matilainen
…bd54

Unlike typical fooFree() functions in rpm, Fclose() doesn't set the
pointer to NULL so there's a use-after-free in checking for Ferror()
that segfaults and stuff. Delay Fclose() until the end so we actually
catch io errors too, that was another thing that went missing in
commit 0f21bdd0d7b2c45564ddb5a24bbebd530867bd54 (although it would've
probably caused an error via null digest instead)
You can view, comment on, or merge this pull request online at:

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

-- Commit Summary --

  * Fix use-after-free introduced in 0f21bdd0d7b2c45564ddb5a24bbebd530867bd54

-- File Changes --

M rpmio/rpmfileutil.c (2)

-- Patch Links --

https://github.com/rpm-software-management/rpm/pull/705.patch
https://github.com/rpm-software-management/rpm/pull/705.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/705
___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Revert "Allow packagers to specify individual scriptlets as critical" (#700)

2019-05-14 Thread Panu Matilainen
Actually it's not this patch that should be discussed but the behavior overall, 
but that belongs to a ticket or a PR implementing something new.

-- 
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/700#issuecomment-492154645___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Revert "Allow packagers to specify individual scriptlets as critical" (#700)

2019-05-14 Thread Panu Matilainen
Merged #700 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/700#event-2339406668___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Panu Matilainen
Anyway, dropped the docstring change from the "expand all macros" commit, its 
all in the cleanup commit instead.

-- 
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/698#issuecomment-492153501___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Panu Matilainen
And yeah there is going to be some overhead from using a hash, but otoh this 
also eliminates a whole lot of overhead that is currently running on each file, 
and if we ever want to run more than one file at a time through a generator 
there's not a whole lot of choice.

-- 
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/698#issuecomment-492152211___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Panu Matilainen
Oh, I left the doc string fix as a separate commit because it eliminates *all* 
the useless docstrings from rpmfc so its not really related to these.

-- 
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/698#issuecomment-492151515___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Only switch to userns-root if we actually need it for chroot() (#704)

2019-05-14 Thread Florian Festi
Merged #704 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/704#event-2339355061___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Florian Festi
Looks good. Please squash the doc string fix and push upstream!

-- 
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/698#issuecomment-492147815___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Florian Festi
I was first concerned that all this "putting stuff in data structures" might 
create overhead. After having a deeper look this is not a problem. Storing a 
few more integers  while we have the whole set of file names in memory will 
probably not kill anyone.

-- 
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/698#issuecomment-492146873___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Panu Matilainen
pmatilai commented on this pull request.



>   * @param dsContext  RPMSENSE_FIND_PROVIDES or RPMSENSE_FIND_REQUIRES
  * @param tagN RPMTAG_PROVIDENAME or RPMTAG_REQUIRENAME
  * @return 0 on success
  */
 static int rpmfcHelper(rpmfc fc, int ix, const struct exclreg_s *excl,
-  const char *nsdep, const char *depname,
-  rpmsenseFlags dsContext, rpmTagVal tagN)
+  rpmsenseFlags dsContext, rpmTagVal tagN,
+  const char *namespace, const char *cmd)

Okay, axed them all in a separate commit.

-- 
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/698#discussion_r283687973___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Florian Festi
ffesti commented on this pull request.



>   * @param dsContext  RPMSENSE_FIND_PROVIDES or RPMSENSE_FIND_REQUIRES
  * @param tagN RPMTAG_PROVIDENAME or RPMTAG_REQUIRENAME
  * @return 0 on success
  */
 static int rpmfcHelper(rpmfc fc, int ix, const struct exclreg_s *excl,
-  const char *nsdep, const char *depname,
-  rpmsenseFlags dsContext, rpmTagVal tagN)
+  rpmsenseFlags dsContext, rpmTagVal tagN,
+  const char *namespace, const char *cmd)

Fine with me.

-- 
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/698#discussion_r283684007___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Panu Matilainen
pmatilai commented on this pull request.



>   * @param dsContext  RPMSENSE_FIND_PROVIDES or RPMSENSE_FIND_REQUIRES
  * @param tagN RPMTAG_PROVIDENAME or RPMTAG_REQUIRENAME
  * @return 0 on success
  */
 static int rpmfcHelper(rpmfc fc, int ix, const struct exclreg_s *excl,
-  const char *nsdep, const char *depname,
-  rpmsenseFlags dsContext, rpmTagVal tagN)
+  rpmsenseFlags dsContext, rpmTagVal tagN,
+  const char *namespace, const char *cmd)

Urgh, yeah. Mind if I just nuke the doc string, it's just an internal helper 
after all...?

-- 
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/698#discussion_r283680925___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Dependency generator optimization and cleanup (#698)

2019-05-14 Thread Florian Festi
ffesti commented on this pull request.



>   * @param dsContext  RPMSENSE_FIND_PROVIDES or RPMSENSE_FIND_REQUIRES
  * @param tagN RPMTAG_PROVIDENAME or RPMTAG_REQUIRENAME
  * @return 0 on success
  */
 static int rpmfcHelper(rpmfc fc, int ix, const struct exclreg_s *excl,
-  const char *nsdep, const char *depname,
-  rpmsenseFlags dsContext, rpmTagVal tagN)
+  rpmsenseFlags dsContext, rpmTagVal tagN,
+  const char *namespace, const char *cmd)

The new params are not added to the doc string

-- 
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/698#pullrequestreview-237093313___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Stop papering over the security disaster known as prelink (#701)

2019-05-14 Thread Florian Festi
Merged #701 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/701#event-2339264198___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] %buildarch does not reflect architecture of current %package declaration (#689)

2019-05-14 Thread Florian Festi
Closed #689 via 7ca03925d88d27266a4f8bec7a35e8c3b1117279.

-- 
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/689#event-2339204562___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Sanitize spec tag macro creation (#693)

2019-05-14 Thread Florian Festi
Merged #693 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/693#event-2339204434___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Only switch to userns-root if we actually need it for chroot() (#704)

2019-05-14 Thread Panu Matilainen
Commit message updated

-- 
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/704#issuecomment-492120276___
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 nonexistent macro "Q" from the table of builtin macros (#697)

2019-05-14 Thread Florian Festi
Merged #697 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/697#event-2339191927___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Only switch to userns-root if we actually need it for chroot() (#704)

2019-05-14 Thread Panu Matilainen
I can certainly clarify it though.

-- 
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/704#issuecomment-492118767___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Only switch to userns-root if we actually need it for chroot() (#704)

2019-05-14 Thread Panu Matilainen
Hmm, it's not a typo, it refers both to the chroot and root user inside the 
user namespace.

-- 
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/704#issuecomment-492118579___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Adopt compiler flags related enhancements from Fedora (#692)

2019-05-14 Thread Panu Matilainen
Merged #692 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/692#event-2339175588___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint


Re: [Rpm-maint] [rpm-software-management/rpm] Only switch to userns-root if we actually need it for chroot() (#704)

2019-05-14 Thread Florian Festi
"userns-root" in the patch description looks like a typo.

-- 
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/704#issuecomment-492117715___
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 memleak in rpmfcApplyInternal() in standalone operation (eg rpmdeps) (#699)

2019-05-14 Thread Florian Festi
Merged #699 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/699#event-2339160393___
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint