[packages/poldek] - updated verify-fix.patch; rel 7
mis
mis at pld-linux.org
Wed Mar 19 21:54:39 CET 2025
commit 86a7b6eaa9c5b3401fa4dfd0972043bcf6bf385c
Author: mis <mis at pld-linux.org>
Date: Wed Mar 19 21:48:56 2025 +0100
- updated verify-fix.patch; rel 7
poldek.spec | 2 +-
verify-fix.patch | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 102 insertions(+), 1 deletion(-)
---
diff --git a/poldek.spec b/poldek.spec
index 2db399f..e2d72fb 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -22,7 +22,7 @@
%define ver_rpm 1:4.14
%endif
-%define rel 6
+%define rel 7
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 3907054..7951b1a 100644
--- a/verify-fix.patch
+++ b/verify-fix.patch
@@ -120,3 +120,104 @@ index 0027ee0..e2bc01d 100644
cmdctx_printf(cmdctx, "%-*s %-*s\n",
term_width_div2 + term_width_div2/10 - 1, pkg_name,
(term_width/7), srcrpm ? srcrpm : "(unset)");
+diff --git a/vfile/vfile.h b/vfile/vfile.h
+index 3b55b00..b1612f2 100644
+--- a/vfile/vfile.h
++++ b/vfile/vfile.h
+@@ -174,11 +174,11 @@ EXPORT int vf_url_as_path(char *buf, size_t size, const char *url);
+
+ /* replace password with "x" * len(password) */
+ EXPORT const char *vf_url_hidepasswd(char *buf, int size, const char *url);
+-#define vf_url_hidepasswd_s(url) vf_url_hidepasswd(alloca(PATH_MAX), PATH_MAX, url)
++#define vf_url_hidepasswd_s(url) vf_url_hidepasswd(alloca(256), 256, url)
+
+ /* applies vf_url_hidepasswd() + slim down url string to maxl */
+ EXPORT const char *vf_url_slim(char *buf, int size, const char *url, int maxl);
+-#define vf_url_slim_s(url, maxl) vf_url_slim(alloca(PATH_MAX), PATH_MAX, url, (maxl) > 40 ? (maxl) : 40)
++#define vf_url_slim_s(url, maxl) vf_url_slim(alloca(256), 256, url, (maxl) > 40 ? (maxl) : 40)
+
+ EXPORT char *vf_url_unescape(const char *url);
+
+diff --git a/pkg.h b/pkg.h
+index 15a68c4..59f3e84 100644
+--- a/pkg.h
++++ b/pkg.h
+@@ -223,14 +223,14 @@ EXPORT int pkg_has_pkgcnfl(struct pkg *pkg, struct pkg *cpkg);
+
+ /* src.rpm */
+ EXPORT char *pkg_srcfilename(const struct pkg *pkg, char *buf, size_t size);
+-#define pkg_srcfilename_s(pkg) pkg_srcfilename(pkg, alloca(512), 512)
++#define pkg_srcfilename_s(pkg) pkg_srcfilename(pkg, alloca(256), 256)
+
+ /* RET %path/%name-%version-%release.%arch.rpm */
+ EXPORT char *pkg_filename(const struct pkg *pkg, char *buf, size_t size);
+-#define pkg_filename_s(pkg) pkg_filename(pkg, alloca(512), 512)
++#define pkg_filename_s(pkg) pkg_filename(pkg, alloca(256), 256)
+
+ EXPORT char *pkg_path(const struct pkg *pkg, char *buf, size_t size);
+-#define pkg_path_s(pkg) pkg_path(pkg, alloca(512), 512)
++#define pkg_path_s(pkg) pkg_path(pkg, alloca(256), 256)
+
+ EXPORT char *pkg_localpath(const struct pkg *pkg, char *path, size_t size,
+ const char *cachedir);
+@@ -251,13 +251,13 @@ EXPORT int pkg_printf(const struct pkg *pkg, const char *str);
+ EXPORT int pkg_snprintf(char *str, size_t size, const struct pkg *pkg);
+ EXPORT char *pkg_str(char *str, size_t size, const struct pkg *pkg);
+
+-#define pkg_snprintf_s(pkg) pkg_str(alloca(512), 512, pkg)
+-#define pkg_snprintf_s0(pkg) pkg_str(alloca(512), 512, pkg)
+-#define pkg_snprintf_s1(pkg) pkg_str(alloca(512), 512, pkg)
++#define pkg_snprintf_s(pkg) pkg_str(alloca(256), 256, pkg)
++#define pkg_snprintf_s0(pkg) pkg_str(alloca(256), 256, pkg)
++#define pkg_snprintf_s1(pkg) pkg_str(alloca(256), 256, pkg)
+
+ EXPORT int pkg_evr_snprintf(char *str, size_t size, const struct pkg *pkg);
+ EXPORT char *pkg_evr_str(char *str, size_t size, const struct pkg *pkg);
+-#define pkg_evr_snprintf_s(pkg) pkg_evr_str(alloca(512), 512, pkg)
++#define pkg_evr_snprintf_s(pkg) pkg_evr_str(alloca(256), 256, pkg)
+
+ /* must be free()d by pkguinf_free(); see pkgu.h */
+ EXPORT struct pkguinf *pkg_uinf(const struct pkg *pkg);
+diff --git a/pkgdir/pkg_restore.c b/pkgdir/pkg_restore.c
+index e7e9373..8dfb4c9 100644
+--- a/pkgdir/pkg_restore.c
++++ b/pkgdir/pkg_restore.c
+@@ -202,9 +202,9 @@ struct pkg *pkg_restore_st(tn_stream *st, tn_alloc *na, struct pkg *pkg,
+ int tag, last_tag, tag_binsize = PKG_STORETAG_SIZENIL;
+ const char *errmg_double_tag = "%s:%lu: double '%c' tag";
+ const char *errmg_ldtag = "%s:%lu: load '%c' tag error";
++ int load_full_fl = (ldflags & PKGDIR_LD_FULLFLIST);
+
+ #if 0
+- printf("FULL %d\n", (ldflags & PKGDIR_LD_FULLFLIST));
+ if (depdirs) {
+ int i;
+ printf("depdirs %p %d\n", depdirs, n_array_size(depdirs));
+@@ -387,13 +387,13 @@ struct pkg *pkg_restore_st(tn_stream *st, tn_alloc *na, struct pkg *pkg,
+
+ case PKG_STORETAG_FL:
+ pkgt.nodep_files_offs = n_stream_tell(st);
+- //printf("flag_fullflist %d, %p\n", flag_fullflist, depdirs);
+- if ((ldflags & PKGDIR_LD_FULLFLIST) == 0 && depdirs == NULL) {
++ if (!load_full_fl && depdirs == NULL) {
+ pkgfl_skip_st(st);
+
+ } else {
+ tn_tuple *fl;
+- if (pkgfl_restore_st(na, &fl, st, depdirs, 1) < 0) {
++
++ if (pkgfl_restore_st(na, &fl, st, load_full_fl ? NULL : depdirs, 1) < 0) {
+ logn(LOGERR, errmg_ldtag, fn, ul_offs, *line);
+ nerr++;
+ goto l_end;
+@@ -422,6 +422,10 @@ struct pkg *pkg_restore_st(tn_stream *st, tn_alloc *na, struct pkg *pkg,
+
+ pkgt.pkgfl = ffl;
+ }
++
++ pkgt.flags |= PKGT_HAS_FILES;
++ if (load_full_fl)
++ pkgt.flags |= PKGT_HAS_ALLFILES;
+ }
+ break;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/86a7b6eaa9c5b3401fa4dfd0972043bcf6bf385c
More information about the pld-cvs-commit
mailing list