Thanks for the patches and patience!
--
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/1242#issuecomment-63888___
Rpm-maint
Merged #1242 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/1242#event-3376500848___
Rpm-maint mailing list
@pan93412 pushed 1 commit.
9b056de66b76cace442440d51b618a56310f2f69 l10n: zh_TW: fix the issues in
translation
--
You are receiving this because you are subscribed to this thread.
View it on GitHub:
> I would move `import re` to the top imports and just be done with it.
We can discuss this in a separate issue. It hasn't changed here.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@pan93412 pushed 1 commit.
3a766f1a3d8078b5d5b3be2a7b739b3b1b1cd578 l10n: zh_TW: fix the issues in
translation
--
You are receiving this because you are subscribed to this thread.
View it on GitHub:
@zerng07 commented on this pull request.
> @@ -3993,7 +3967,7 @@ msgstr "%s：Fflush 失敗： %s\n"
#: sign/rpmgensig.c:203
msgid "Unsupported PGP signature\n"
-msgstr "不支援的 PGP 簽名\n"
+msgstr "不支援的 PGP 簽署\n"
簽章
--
You are receiving this because you are subscribed to this thread.
Reply to this
@zerng07 commented on this pull request.
> msgid "unexpected argument"
-msgstr "未預期的 ]"
+msgstr "預期不是引數"
未預期引數
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: rpmio/macro.c:1390
msgid ""
"Too many levels of recursion in macro expansion. It is likely caused by "
"recursive macro declaration.\n"
-msgstr "巨集附加元件中太多遞迴階級。這可能是因為遞迴巨集聲明而造成。\n"
+msgstr "巨集展開的遞迴階級更多。這可能是因為遞迴巨集聲明所導致的。\n"
階層
--
You are
@zerng07 commented on this pull request.
> @@ -3905,7 +3879,7 @@ msgstr "警告："
#: rpmio/rpmlog.c:269
msgid "Error writing to log"
-msgstr ""
+msgstr "寫入至記錄檔時發生錯誤"
紀錄為名詞，記錄為動詞
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on
@zerng07 commented on this pull request.
> msgid "unexpected end of expression"
-msgstr "| 預期於表述式的結尾"
+msgstr "表述式非預期結束"
未預期結束
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
> msgid "unmatched ("
-msgstr "不符合的 (\n"
+msgstr "未配對的 ("
不成對的 (，看起來是者小括號沒有 match 成對。
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: lib/transaction.c:1272
msgid "no digest"
-msgstr ""
+msgstr "沒有 digest"
摘要
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: lib/signature.c:213
msgid "Unable to reload signature header.\n"
msgstr "無法重新載入簽署表頭。\n"
#: lib/transaction.c:1272
msgid "no signature"
-msgstr ""
+msgstr "沒有簽署"
簽章
--
You are receiving this because you are subscribed to this thread.
@zerng07 commented on this pull request.
>
#: rpmio/expression.c:370
msgid "macro expansion returned a bare word, please use \"...\""
msgstr ""
#: rpmio/expression.c:372
msgid "macro expansion did not return an integer"
-msgstr ""
+msgstr "巨集展開未回傳數字"
整數 instead of 數字
--
You are
@zerng07 commented on this pull request.
> @@ -3668,7 +3656,7 @@ msgstr "遺漏 %c %s"
#: lib/verify.c:440
#, c-format
msgid "Unsatisfied dependencies for %s:\n"
-msgstr "%s 的不滿足相依性：\n"
+msgstr "%s 的不滿足依賴關係：\n"
「的」是綴字
--
You are receiving this because you are subscribed to this thread.
@zerng07 commented on this pull request.
> @@ -3591,17 +3579,17 @@ msgstr "%s 標籤 %u：無效的大小 %u"
#: lib/rpmvs.c:197
#, c-format
msgid "%s tag %u: invalid OpenPGP signature"
-msgstr "%s 標籤 %u：無效的 OpenGPG 簽名"
+msgstr "%s 標籤 %u：無效的 OpenGPG 簽署"
簽章
--
You are receiving this because you are
@zerng07 commented on this pull request.
> @@ -3614,7 +3602,7 @@ msgstr "%s%s"
#: lib/rpmvs.c:281
msgid "signature"
-msgstr "簽名"
+msgstr "簽署"
簽章
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: lib/rpmds.c:1411
#, c-format
msgid "Unknown rich dependency op '%.*s'"
-msgstr "未知的富相依性操作「%.*s」"
+msgstr "未知的富依賴關係操作「%.*s」"
豐富依賴關係
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it
@zerng07 commented on this pull request.
>
#: lib/rpmds.c:1251
msgid "support for rich dependencies."
-msgstr "支援富相依性"
+msgstr "支援富依賴關係。"
豐富依賴關係
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: lib/poptQV.c:111
msgid "query/verify the package(s) which provide a dependency"
-msgstr "查詢/校驗提供某些相依軟體包的軟體包"
+msgstr "查詢/核驗提供某些相依軟體包的軟體包"
依賴軟體包
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly
@zerng07 commented on this pull request.
>
#: lib/poptQV.c:105 lib/poptQV.c:107
msgid "query/verify the package(s) which require a dependency"
-msgstr "查詢/校驗需要某些相依軟體包的軟體包"
+msgstr "查詢/核驗需要某些相依軟體包的軟體包"
依賴軟體包
--
You are receiving this because you are subscribed to this thread.
Reply to
I would move `import re` to the top imports and just be done with it.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
> This pull request **introduces 1 alert** when merging
> [592a6d5](https://github.com/rpm-software-management/rpm/commit/592a6d5980010c63eb76c31ddd8954fba9cbaa92)
> into
> [8734c1b](https://github.com/rpm-software-management/rpm/commit/8734c1b97e39e3c7d3ac8396c4d6a2733852545c)
> - [view on
>
@zerng07 commented on this pull request.
>
#: lib/poptALL.c:235
msgid "don't verify package signature(s)"
-msgstr "不校驗軟體包簽署"
+msgstr "不核驗軟體包簽署"
簽章
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
> msgid "RPM v3 packages are deprecated: %s\n"
-msgstr "第 %d 行：%s 重複：%s\n"
+msgstr "RPM v3 軟體包已過時：%s\n"
過時 should be 棄用
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: lib/header.c:971
msgid "hdr load: BAD"
-msgstr "hdr_load：壞的"
+msgstr "hdr_load：無效"
損壞 better than 無效
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: lib/header.c:1958
msgid "signature "
-msgstr "簽名"
+msgstr "簽署 "
verb as 簽署, noun as 簽章
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@zerng07 commented on this pull request.
>
#: lib/backend/ndb/rpmpkg.c:125
#, c-format
msgid "rpmpkg: Version mismatch. Expected version: %u. Found version: %u\n"
-msgstr ""
+msgstr "rpmpkg：版本不符。期望版本：%u。找到版本：%u\n"
預期 is better than 期望
--
You are receiving this because you are subscribed
@zerng07 commented on this pull request.
>
#: lib/backend/ndb/rpmidx.c:204
#, c-format
msgid "rpmidx: Version mismatch. Expected version: %u. Found version: %u\n"
-msgstr ""
+msgstr "rpmidx：版本不符。期望版本：%u。找到版本：%u\n"
預期 is better than 期望
--
You are receiving this because you are subscribed
@zerng07 commented on this pull request.
>
#: lib/backend/ndb/rpmxdb.c:237
#, c-format
msgid "rpmxdb: Version mismatch. Expected version: %u. Found version: %u\n"
-msgstr ""
+msgstr "rpmxdb：版本不符。期望版本：%u。找到版本：%u\n"
預期 is better than 期望
--
You are receiving this because you are subscribed
This pull request **introduces 1 alert** when merging
592a6d5980010c63eb76c31ddd8954fba9cbaa92 into
8734c1b97e39e3c7d3ac8396c4d6a2733852545c - [view on
LGTM.com](https://lgtm.com/projects/g/rpm-software-management/rpm/rev/pr-b6979aa46105339f8a0843eae399433dc33d6444)
**new alerts:**
* 1 for
@zerng07 commented on this pull request.
> @@ -463,7 +460,7 @@ msgstr "--hash (-h) 可能只能在軟體包安裝或擦除時指定"
#: rpm.c:148
msgid "--percent may only be specified during package installation and erasure"
-msgstr "-- percent 可能只能在軟體包安裝或擦除時指定"
+msgstr "-- percent 只能在軟體包安裝或擦除時指定"
抹除 instead of 擦除 for
@zerng07 commented on this pull request.
> @@ -1579,9 +1571,7 @@ msgstr "無法決定策略名稱：%s\n"
msgid ""
"'%s' type given with other types in %%semodule %s. Compacting types to "
"'%s'.\n"
-msgstr ""
-"「%s」類型以及其他類型給出了 %%semodule %s\n"
-"壓縮類型至「%s」\n"
+msgstr "「%s」類型以及其他類型提供了 %%semodule
I have modified the commits to take out the test suite and opened it as a new
PR https://github.com/rpm-software-management/rpm/pull/1242.
Am therefore closing this PR in favour of the new one.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or
@zerng07 commented on this pull request.
>
#: build/parseReqs.c:57
msgid "Versioned file name not permitted"
msgstr "包含版本的檔案名稱不被允許"
#: build/parseReqs.c:222
msgid "No rich dependencies allowed for this type"
-msgstr "此類型並沒有豐富的相依性。"
+msgstr "此類型並沒有富依賴關係"
富依賴性 is not understandable for
Closed #1195.
--
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/1195#event-3374229415___
Rpm-maint mailing list
This is a modification of PR
https://github.com/rpm-software-management/rpm/pull/1195, where Ive
deleted all mentions of the test suite.
CC @pmatilai, @Conan-Kudo, @ffesti, @hroncok
You can view, comment on, or merge this pull request online at:
@zerng07 commented on this pull request.
> msgid "Illegal character (0x%x) in filename: %s\n"
-msgstr "非法字符「%c」(0x%x)"
+msgstr "檔名中有非法字元 (0x%x)：%s\n"
非法 is better changed to 不合規
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on
Fine with me, did not want to get this in 4.16 anyway :)
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
FWIW, I plan to merge this once 4.16 is branched off. Not wanting extra drama
this close to beta...
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
@pmatilai commented on this pull request.
> @@ -168,7 +169,8 @@ typedef enum pgpPubkeyAlgo_e {
PGPPUBKEYALGO_EC = 18, /*!< Elliptic Curve */
PGPPUBKEYALGO_ECDSA= 19, /*!< ECDSA */
PGPPUBKEYALGO_ELGAMAL = 20, /*!< Elgamal */
-
And thanks for the patches.
--
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/1202#issuecomment-634045670___
Rpm-maint mailing
Merged #1202 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/1202#event-3373707254___
Rpm-maint mailing list
Thanks for the info. Note that this pull request does not make rpm use some
different signature system: it still only supports pgp (RFC4880) signatures.
Only very old rpm versions used gpg to verify the signatures, rpm has its own
pgp functions since ages.
(See also issue #1193 for a discussion
@pmatilai commented on this pull request.
> +}
+
+static char *rpmVeritySignFile(rpmfi fi, size_t *sig_size, char *key,
+ char *keypass, char *cert, uint16_t algo,
+ uint32_t block_size)
+{
+struct libfsverity_merkle_tree_params
@pmatilai commented on this pull request.
> + * Copyright (C) 2020 Facebook
+ *
+ * Author: Jes Sorensen
+ */
+
+#include "system.h"
+
+#include /* RPMSIGTAG & related */
+#include /* rpmlog */
+#include
+#include /* rpmDigestLength */
+#include
@pmatilai commented on this pull request.
> if (deleting) { /* Nuke all the signature tags. */
deleteSigs(sigh);
+ deleteFileSigs(sigh);
I think deleting file signatures needs to be a separate thing from the main
package signatures, you might want to delete one but not the
@pmatilai commented on this pull request.
> @@ -396,6 +397,16 @@ static void deleteSigs(Header sigh)
headerDel(sigh, RPMSIGTAG_PGP5);
}
+static void deleteFileSigs(Header sigh)
+{
+headerDel(sigh, RPMSIGTAG_FILESIGNATURELENGTH);
+headerDel(sigh, RPMSIGTAG_FILESIGNATURES);
+
@pmatilai commented on this pull request.
> @@ -71,6 +71,18 @@ void headerMergeLegacySigs(Header h, Header sigh)
case RPMSIGTAG_FILESIGNATURELENGTH:
td.tag = RPMTAG_FILESIGNATURELENGTH;
break;
+ case RPMSIGTAG_VERITYSIGNATURES:
+ td.tag =
@pmatilai commented on this pull request.
> +digest_hex = pgpHexStr(digest->digest, digest->digest_size);
+rpmlog(RPMLOG_DEBUG, _("file(size %li): %s: digest(%i): %s, idx %i\n"),
+ file_size, rpmfiFN(fi), digest->digest_size, digest_hex,
+ rpmfiFX(fi));
+
+
@pmatilai commented on this pull request.
> @@ -116,8 +116,12 @@ struct rpmfiles_s {
int digestalgo;/*!< File digest algorithm */
int signaturelength; /*!< File signature length */
+int veritysiglength; /*!< Verity signature length */
+uint16_t
@pmatilai commented on this pull request.
> +}
+
+rpmlog(RPMLOG_DEBUG, _("key: %s\n"), key);
+rpmlog(RPMLOG_DEBUG, _("cert: %s\n"), cert);
+
+compr = headerGetString(h, RPMTAG_PAYLOADCOMPRESSOR);
+rpmio_flags = rstrscat(NULL, "r.", compr ? compr : "gzip", NULL);
+
+gzdi
@pmatilai commented on this pull request.
> @@ -430,6 +438,10 @@ typedef enum rpmSigTag_e {
RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
+
@pmatilai commented on this pull request.
> @@ -430,6 +438,10 @@ typedef enum rpmSigTag_e {
RPMSIGTAG_SHA256 = RPMTAG_SHA256HEADER,
RPMSIGTAG_FILESIGNATURES = RPMTAG_SIG_BASE + 18,
RPMSIGTAG_FILESIGNATURELENGTH = RPMTAG_SIG_BASE + 19,
+
Just to xref, in ostree we recently merged an ed25519 signing system too: see
https://github.com/ostreedev/ostree/issues/1233
and https://github.com/ostreedev/ostree/pull/1878
The main motivation apparently is that GPG being lgplv3 and carrying the patent
clauses is problematic for some people
@mlschroe commented on this pull request.
> @@ -168,7 +169,8 @@ typedef enum pgpPubkeyAlgo_e {
PGPPUBKEYALGO_EC = 18, /*!< Elliptic Curve */
PGPPUBKEYALGO_ECDSA= 19, /*!< ECDSA */
PGPPUBKEYALGO_ELGAMAL = 20, /*!< Elgamal */
-
@mlschroe commented on this pull request.
> @@ -168,7 +169,8 @@ typedef enum pgpPubkeyAlgo_e {
PGPPUBKEYALGO_EC = 18, /*!< Elliptic Curve */
PGPPUBKEYALGO_ECDSA= 19, /*!< ECDSA */
PGPPUBKEYALGO_ELGAMAL = 20, /*!< Elgamal */
-
Don't bother. In the near future you can just use whatever you want for the
tests:
https://github.com/rpm-software-management/rpm/issues/1199#issuecomment-633979688
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
> 1. [...] That's not really different from when people work on their own
> packages first and push it back upstream.
Hmm, I thought this was in a separate repo actually, but I see it's just Fedora
dist-git. Like noted in earlier comments, stuff developing their own
test-suites is a certain
rpmSpecGetSection() returns it when passed RPMBUILD_NONE. Guess adding this to
the API is what you remember even if it has been a while:
`
c38504c4ba build/rpmspec.h (Panu Matilainen 2011-06-17 13:44:39 +0300 78) * As
a special case, RPMBUILD_NONE as section returns the entire spec in
With the trend of increasingly dynamic content generation for specs (currently
via complex macros, in future automatic & dynamic sub packages, #329, #1222
etc) the originating spec and the parsed one might differ by hundreds of lines,
making it really hard to grasp how we got from A to B. It
Ok, sounds good. I'll separate out the test suite.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
Merged #1238 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/1238#event-3372608234___
Rpm-maint mailing list
Closed #1236 via #1238.
--
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/1236#event-3372608246___
Rpm-maint mailing list
> I am not 100% sure why this rubs me the wrong way. It just doesn't feel
> right. A few thoughts and observations:
I had a largely similar feeling about this PR so I fair enough :grinning:
The answer is probably somewhere in the middle.
> It is hard to generate spec file fragments from within
At any rate, I'm totally fine with merging just the code right now and worry
about the rest later.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
Maybe add a comment to the top of the script explaining the model: this is
developed and tested at repository at `` and rpm only maintains a
read-only copy of that, synced from time to time. At least that's how I
perceive this thing.
--
You are receiving this because you are subscribed to
> I'd rather see this pushed to an external file entirely. That would
>
> * drive the intended usage home with a sledgehammer
>
> * make it easier to generate spec fragments from %build
>
> * simplify the parsing as you don't need to try not to parse a thing when
> you're parsing
As a short term thing, we just need to merge in the code, so other changes
don't diverge too much.
Not having the tests here is something that I'd rather avoid -- how do we
expect everybody to remember that the tests are somewhere else?
--
You are receiving this because you are subscribed to
Sorry for the holdup folks, I've been mulling over this quite a bit. The tests
that is.
The test-suite is a deal-breaker really. Rpm's test-suite is the autotest-based
thing, and everything in rpm needs to use that for tests. We can't have
individual bits and pieces bring in their own infra,
70 matches
Mail list logo
