[packages/poldek] - updated verify-fix.patch; rel 6
mis
mis at pld-linux.org
Wed Mar 19 18:01:26 CET 2025
commit 3e00aaa4ebe631f3da369e20b1b2a57ca6fddfba
Author: mis <mis at pld-linux.org>
Date: Wed Mar 19 17:34:35 2025 +0100
- updated verify-fix.patch; rel 6
poldek.spec | 2 +-
verify-fix.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/poldek.spec b/poldek.spec
index d876914..2db399f 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -22,7 +22,7 @@
%define ver_rpm 1:4.14
%endif
-%define rel 5
+%define rel 6
Summary: RPM packages management helper tool
Summary(hu.UTF-8): RPM csomagkezelést segítő eszköz
Summary(pl.UTF-8): Pomocnicze narzędzie do zarządzania pakietami RPM
diff --git a/verify-fix.patch b/verify-fix.patch
index 183bc69..3907054 100644
--- a/verify-fix.patch
+++ b/verify-fix.patch
@@ -72,3 +72,51 @@ index 84ea6f4..9845bce 100644
while ((m = n_hash_it_get(&it, NULL)) != NULL) {
if (set)
m->flags |= flag;
+diff --git a/cli/dent.c b/cli/dent.c
+index b24a723..f4cd4bb 100644
+--- a/cli/dent.c
++++ b/cli/dent.c
+@@ -36,13 +36,14 @@ struct pkg_dent *pkg_dent_new(struct poclidek_ctx *cctx, const char *name,
+ struct pkg *pkg, int flags, const char *dirpath)
+ {
+ struct pkg_dent *ent;
+- int dirpath_at = 0, dirpath_len = 0, len = 0;
++ int name_len = 0, dirpath_at = 0, dirpath_len = 0, len = 0;
+
+ if (name) {
+ while (*name == '/')
+ name++;
+
+- len += strlen(name) + 1;
++ name_len = strlen(name);
++ len += name_len + 1;
+ n_assert(flags & PKG_DENT_DIR);
+ n_assert(dirpath);
+
+@@ -60,7 +61,7 @@ struct pkg_dent *pkg_dent_new(struct poclidek_ctx *cctx, const char *name,
+ if (name) {
+ char *p;
+
+- memcpy(ent->_buf, name, len);
++ memcpy(ent->_buf, name, name_len + 1);
+ ent->name = ent->_buf;
+
+ if (dirpath) {
+diff --git a/cli/ls.c b/cli/ls.c
+index 0027ee0..e2bc01d 100644
+--- a/cli/ls.c
++++ b/cli/ls.c
+@@ -585,9 +585,10 @@ int do_ls(const tn_array *ents, struct cmdctx *cmdctx, const tn_array *evrs)
+ cmdctx_printf(cmdctx, "%-*s %-*s\n",
+ term_width_div2 + term_width_div2/10 - 1, pkg_name,
+ (term_width/7), group ? group : "(unset)");
+- }
+- else if (flags & OPT_LS_SOURCERPM) {
+- const char *srcrpm = pkg_srcfilename_s(pkg);
++ } else if (flags & OPT_LS_SOURCERPM) {
++ char buf[512];
++ const char *srcrpm = pkg_srcfilename(pkg, buf, sizeof(buf));
++
+ cmdctx_printf(cmdctx, "%-*s %-*s\n",
+ term_width_div2 + term_width_div2/10 - 1, pkg_name,
+ (term_width/7), srcrpm ? srcrpm : "(unset)");
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/3e00aaa4ebe631f3da369e20b1b2a57ca6fddfba
More information about the pld-cvs-commit
mailing list