+++ /dev/null
---- installer/poldek/capreq.c 2004/01/10 12:45:34 1.25.4.1
-+++ installer/poldek/capreq.c 2004/12/01 16:24:52 1.25.4.2
-@@ -639,24 +639,22 @@
- if (flag & RPMSENSE_EQUAL)
- cr->cr_relflags |= REL_EQ;
-
--
-+ if (crtype == CRTYPE_REQ) {
- #ifndef HAVE_RPM_EXTDEPS
-- if (flag & RPMSENSE_PREREQ) {
-- n_assert(crtype == CRTYPE_REQ);
-- cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
-- }
-+ if (flag & RPMSENSE_PREREQ) {
-+ n_assert(crtype == CRTYPE_REQ);
-+ cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
-+ }
- #else
-- if (isLegacyPreReq(flag)) { /* prepared by rpm < 4.0.2 */
-- n_assert(crtype == CRTYPE_REQ);
-- cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
-+ if (isLegacyPreReq(flag)) { /* prepared by rpm < 4.0.2 */
-+ cr->cr_flags |= CAPREQ_PREREQ | CAPREQ_PREREQ_UN;
-
-- } else if (isInstallPreReq(flag)) {
-- n_assert(crtype == CRTYPE_REQ);
-- cr->cr_flags |= CAPREQ_PREREQ;
-+ } else if (isInstallPreReq(flag)) {
-+ cr->cr_flags |= CAPREQ_PREREQ;
-
-- } else if (isErasePreReq(flag)) {
-- n_assert(crtype == CRTYPE_REQ);
-- cr->cr_flags |= CAPREQ_PREREQ_UN;
-+ } else if (isErasePreReq(flag)) {
-+ cr->cr_flags |= CAPREQ_PREREQ_UN;
-+ }
- }
- #endif /* HAVE_RPM_EXTDEPS */
- }
+++ /dev/null
---- /var/home/mis/rpm/BUILD/poldek-0.18.7/pkgset-install.c 2004-12-28 12:29:19.885741480 +0100
-+++ pkgset-install.c 2004-12-28 12:30:52.456668560 +0100
-@@ -11,7 +11,7 @@
- */
-
- /*
-- $Id$
-+ $Id$
- */
-
- #ifdef HAVE_CONFIG_H
-@@ -752,14 +752,14 @@
- if (db_dep->flags & PROCESS_AS_NEW) {
- int i, n;
- char errmsg[4096];
-- n = n_snprintf(errmsg, sizeof(errmsg), _("%s is required by "),
-+ n = n_snprintf(errmsg, sizeof(errmsg), _("%s is required by"),
- capreq_snprintf_s(req));
-
- for (i=0; i < n_array_size(db_dep->pkgs); i++) {
- struct pkg *p = n_array_nth(db_dep->pkgs, i);
-
- snprintf(&errmsg[n], sizeof(errmsg) - n, "%s%s",
-- pkg_is_installed(p) ? "" : _("already marked "),
-+ pkg_is_installed(p) ? "" : _(" already marked "),
- pkg_snprintf_s(p));
-
- logn(LOGERR, "%s", errmsg);
-@@ -875,7 +875,7 @@
- }
- }
-
-- if (pkg->fl && dbpkg->pkg->fl) {
-+ if (dbpkg->pkg->fl) {
- struct capreq *cap;
- int j, k;
-
-@@ -967,7 +967,9 @@
- /* cached */
- if (db_deps_provides(upg->db_deps, req, DBDEP_DBSATISFIED)) {
- DBGF("%s: satisfied by db [cached]\n", capreq_snprintf_s(req));
--
-+
-+ } else if (tomark && marked_for_removal(tomark, upg)) {
-+ DBGF_F("%s: marked for removal\n", pkg_snprintf_s(tomark));
-
- } else if (pkgdb_match_req(upg->inst->db, req, 1,
- upg->uninst_set->dbpkgs)) {
-@@ -976,9 +978,10 @@
- upg->strict);
-
- //dbpkg_set_dump(upg->uninst_set);
-- if ((pkg->flags & PKG_DBPKG) == 0)
-- db_deps_add(upg->db_deps, true_req, pkg, tomark,
-- PROCESS_AS_NEW | DBDEP_DBSATISFIED);
-+ // commented out - pkg_drags() should not touch upg context
-+ //if ((pkg->flags & PKG_DBPKG) == 0)
-+ // db_deps_add(upg->db_deps, true_req, pkg, tomark,
-+ // PROCESS_AS_NEW | DBDEP_DBSATISFIED);
-
- } else if (tomark || tomark == NULL) { /* don't care found or not */
- ntoinstall++;
-@@ -1144,7 +1147,7 @@
- if (marked_for_removal_by_req(real_tomark, req, upg)) {
- logn(LOGERR, _("%s (cap %s) is required by %s%s"),
- pkg_snprintf_s(real_tomark), capreq_snprintf_s(req),
-- pkg_is_installed(pkg) ? "" : _("already marked "),
-+ pkg_is_installed(pkg) ? "" : " already marked",
- pkg_snprintf_s0(pkg));
- upg->nerr_dep++;
-
+++ /dev/null
-diff -r -u poldek-0.18.7/shell/ls.c poldek-0.18.7-patrys/shell/ls.c
---- poldek-0.18.7/shell/ls.c 2004-02-16 20:33:37.000000000 +0100
-+++ poldek-0.18.7-patrys/shell/ls.c 2004-12-01 20:00:57.723621464 +0100
-@@ -325,35 +325,35 @@
- *hdr = '\0';
-
- if (flags & OPT_LS_GROUP) {
-- snprintf(fmt_hdr, sizeof(fmt_hdr), "%%-%ds%%-%ds\n",
-- term_width_div2 + term_width_div2/10, (term_width/7));
-+ snprintf(fmt_hdr, sizeof(fmt_hdr), "%%-%ds %%-%ds\n",
-+ term_width_div2 + term_width_div2/10-1, (term_width/7));
-
-- snprintf(fmt_pkg, sizeof(fmt_pkg), "%%-%ds%%-%ds\n",
-- term_width_div2 + term_width_div2/10, (term_width/7));
-+ snprintf(fmt_pkg, sizeof(fmt_pkg), "%%-%ds %%-%ds\n",
-+ term_width_div2 + term_width_div2/10-1, (term_width/7));
-
- snprintf(hdr, sizeof(hdr), fmt_hdr, _("package"), _("group"));
-
- } else if (flags & OPT_LS_LONG) {
- if ((flags & OPT_LS_UPGRADEABLE) == 0) {
-- snprintf(fmt_hdr, sizeof(fmt_hdr), "%%-%ds%%-%ds %%%ds\n",
-- term_width_div2 + term_width_div2/10, (term_width/7),
-+ snprintf(fmt_hdr, sizeof(fmt_hdr), "%%-%ds %%-%ds %%%ds\n",
-+ term_width_div2 + term_width_div2/10-1, (term_width/7),
- (term_width/8) + 2);
-
-- snprintf(fmt_pkg, sizeof(fmt_pkg), "%%-%ds%%%ds %%%ds\n",
-- term_width_div2 + term_width_div2/10, (term_width/7),
-+ snprintf(fmt_pkg, sizeof(fmt_pkg), "%%-%ds %%%ds %%%ds\n",
-+ term_width_div2 + term_width_div2/10-1, (term_width/7),
- (term_width/8));
- snprintf(hdr, sizeof(hdr), fmt_hdr,
- _("package"), _("build date"), _("size"));
-
-
- } else {
-- snprintf(fmt_hdr, sizeof(fmt_hdr), "%%-%ds%%-%ds%%-%ds%%%ds\n",
-- (term_width/2) - 1, (term_width/6) - 1,
-- (term_width/6) - 1, (term_width/5) - 1);
--
-- snprintf(fmt_pkg, sizeof(fmt_pkg), "%%-%ds%%-%ds%%-%ds%%%ds\n",
-- (term_width/2) - 1, (term_width/6) - 1,
-- (term_width/6) - 1, (term_width/6) - 1);
-+ snprintf(fmt_hdr, sizeof(fmt_hdr), "%%-%ds %%-%ds %%-%ds %%%ds\n",
-+ (term_width/2) - 2, (term_width/6) - 2,
-+ (term_width/6) - 2, (term_width/5) - 1);
-+
-+ snprintf(fmt_pkg, sizeof(fmt_pkg), "%%-%ds %%-%ds %%-%ds %%%ds\n",
-+ (term_width/2) - 2, (term_width/6) - 2,
-+ (term_width/6) - 2, (term_width/6) - 1);
-
- if (flags & OPT_LS_INSTALLED)
- snprintf(hdr, sizeof(hdr), fmt_hdr, _("installed"),
-@@ -386,6 +386,7 @@
- pkg_name = shpkg->nevr;
-
- if (npkgs == 0)
-+ if (verbose >= 0)
- sh_printf_c(out_stream, PRCOLOR_YELLOW, "%s", hdr);
-
- if (flags & OPT_LS_LONG) {
-@@ -432,6 +433,7 @@
- npkgs++;
- }
-
-+ if (verbose >= 0)
- if (npkgs) {
- if ((flags & OPT_LS_LONG) == 0 && out_stream != stdout) {
- sh_printf_c(out_stream, PRCOLOR_YELLOW,
+++ /dev/null
-diff -Nurb b.poldek-0.18.7/capreq.c n.poldek-0.18.7/capreq.c
---- b.poldek-0.18.7/capreq.c 2004-01-10 14:04:48.000000000 +0100
-+++ n.poldek-0.18.7/capreq.c 2004-11-11 15:11:01.501825408 +0100
-@@ -39,7 +39,7 @@
- #include "misc.h"
-
- static void *(*capreq_alloc_fn)(size_t) = n_malloc;
--static void (*capreq_free_fn)(void*) = n_free;
-+static void (*capreq_free_fn)(void*) = free;
-
- void set_capreq_allocfn(void *(*cr_allocfn)(size_t), void (*cr_freefn)(void*),
- void **prev_alloc, void **prev_free)
-diff -Nurb b.poldek-0.18.7/fileindex.c n.poldek-0.18.7/fileindex.c
---- b.poldek-0.18.7/fileindex.c 2004-09-25 16:16:06.000000000 +0200
-+++ n.poldek-0.18.7/fileindex.c 2004-11-11 15:11:28.151774000 +0100
-@@ -26,7 +26,7 @@
- #include "fileindex.h"
-
- #define obstack_chunk_alloc n_malloc
--#define obstack_chunk_free n_free
-+#define obstack_chunk_free free
-
- struct file_ent {
- struct flfile *flfile;
-diff -Nurb b.poldek-0.18.7/pkg.c n.poldek-0.18.7/pkg.c
---- b.poldek-0.18.7/pkg.c 2004-09-25 16:15:36.000000000 +0200
-+++ n.poldek-0.18.7/pkg.c 2004-11-11 15:12:03.494401104 +0100
-@@ -35,7 +35,7 @@
- int poldek_conf_promote_epoch = 0;
-
- static void *(*pkg_alloc_fn)(size_t) = n_malloc;
--static void (*pkg_free_fn)(void*) = n_free;
-+static void (*pkg_free_fn)(void*) = free;
-
- #if 0 /* disabled cause gives not reasonable profit */
- void set_pkg_allocfn(void *(*pkg_allocfn)(size_t), void (*pkg_freefn)(void*))
-diff -Nurb b.poldek-0.18.7/pkgfl.c n.poldek-0.18.7/pkgfl.c
---- b.poldek-0.18.7/pkgfl.c 2004-07-05 21:11:25.000000000 +0200
-+++ n.poldek-0.18.7/pkgfl.c 2004-11-11 15:12:28.333624968 +0100
-@@ -34,7 +34,7 @@
- #include "h2n.h"
-
- #define obstack_chunk_alloc n_malloc
--#define obstack_chunk_free n_free
-+#define obstack_chunk_free free
-
- struct flmark {
- tn_array *dirs;
-diff -Nurb b.poldek-0.18.7/pkgset.c n.poldek-0.18.7/pkgset.c
---- b.poldek-0.18.7/pkgset.c 2004-07-02 19:42:40.000000000 +0200
-+++ n.poldek-0.18.7/pkgset.c 2004-11-11 15:13:01.797537680 +0100
-@@ -49,7 +49,7 @@
- int ask_pkg(const char *capname, struct pkg **pkgs, struct pkg *deflt);
-
- #define obstack_chunk_alloc n_malloc
--#define obstack_chunk_free n_free
-+#define obstack_chunk_free free
-
- struct obstack_s {
- int ucnt;
-@@ -471,7 +471,7 @@
- pkgset_order(ps);
- mem_info(1, "MEM after order");
-
-- set_capreq_allocfn(n_malloc, n_free, NULL, NULL);
-+ set_capreq_allocfn(n_malloc, free, NULL, NULL);
- return ps->nerrors == 0;
- }
-
-diff -Nurb b.poldek-0.18.7/trurlib/xmalloc.c n.poldek-0.18.7/trurlib/xmalloc.c
---- b.poldek-0.18.7/trurlib/xmalloc.c 2002-05-06 19:01:04.000000000 +0200
-+++ n.poldek-0.18.7/trurlib/xmalloc.c 2004-11-11 15:13:50.949065512 +0100
-@@ -23,6 +23,6 @@
-
- void xfree(void *ptr)
- {
-- n_free(ptr);
-+ free(ptr);
- }
-
+++ /dev/null
---- poldek-0.18.7/pkgset-install.c~ 2004-10-21 00:48:03.000000000 +0200
-+++ poldek-0.18.7/pkgset-install.c 2004-10-21 00:48:03.000000000 +0200
-@@ -752,14 +752,14 @@
- if (db_dep->flags & PROCESS_AS_NEW) {
- int i, n;
- char errmsg[4096];
-- n = n_snprintf(errmsg, sizeof(errmsg), _("%s is required by"),
-+ n = n_snprintf(errmsg, sizeof(errmsg), _("%s is required by "),
- capreq_snprintf_s(req));
-
- for (i=0; i < n_array_size(db_dep->pkgs); i++) {
- struct pkg *p = n_array_nth(db_dep->pkgs, i);
-
- snprintf(&errmsg[n], sizeof(errmsg) - n, "%s%s",
-- pkg_is_installed(p) ? "" : " already marked ",
-+ pkg_is_installed(p) ? "" : _("already marked "),
- pkg_snprintf_s(p));
-
- logn(LOGERR, "%s", errmsg);
-@@ -1144,7 +1144,7 @@
- if (marked_for_removal_by_req(real_tomark, req, upg)) {
- logn(LOGERR, _("%s (cap %s) is required by %s%s"),
- pkg_snprintf_s(real_tomark), capreq_snprintf_s(req),
-- pkg_is_installed(pkg) ? "" : " already marked",
-+ pkg_is_installed(pkg) ? "" : _("already marked "),
- pkg_snprintf_s0(pkg));
- upg->nerr_dep++;
-
---- poldek-0.18.7/po/de.po~ 2004-10-21 00:52:58.000000000 +0200
-+++ poldek-0.18.7/po/de.po 2004-10-21 00:52:58.000000000 +0200
-@@ -942,8 +942,12 @@
-
- #: pkgset-install.c:755
- #, c-format
--msgid "%s is required by"
--msgstr "'%s' wird benötigt von"
-+msgid "%s is required by "
-+msgstr "'%s' wird benötigt von "
-+
-+#: pkgset-install.c:762 pkgset-install.c:1147
-+msgid "already marked "
-+msgstr ""
-
- #: pkgset-install.c:816
- #, c-format
---- poldek-0.18.7/po/pl.po~ 2004-10-21 00:51:36.000000000 +0200
-+++ poldek-0.18.7/po/pl.po 2004-10-21 00:51:36.000000000 +0200
-@@ -924,8 +924,12 @@
-
- #: pkgset-install.c:755
- #, c-format
--msgid "%s is required by"
--msgstr "%s jest wymagany przez"
-+msgid "%s is required by "
-+msgstr "%s jest wymagany przez "
-+
-+#: pkgset-install.c:762 pkgset-install.c:1147
-+msgid "already marked "
-+msgstr "ju¿ zaznaczony "
-
- #: pkgset-install.c:816
- #, c-format
-@@ -1015,12 +1015,12 @@
- #: pkgset-install.c:1897
- #, c-format
- msgid "Need to download about %s of archives. "
--msgstr ""
-+msgstr "Do ¶ci±gniêcia potrzeba oko³o %s pakietów. "
-
- #: pkgset-install.c:1903
- #, c-format
- msgid "_After unpacking about %s will be used."
--msgstr ""
-+msgstr "Po rozpakowaniu oko³o %s zostanie u¿ytych."
-
- #: pkgset-install.c:1931
- #, c-format
---- poldek-0.18.7/po/poldek.pot~ 2004-10-21 00:50:21.000000000 +0200
-+++ poldek-0.18.7/po/poldek.pot 2004-10-21 00:50:36.000000000 +0200
-@@ -906,7 +906,11 @@
-
- #: pkgset-install.c:755
- #, c-format
--msgid "%s is required by"
-+msgid "%s is required by "
-+msgstr ""
-+
-+#: pkgset-install.c:762 pkgset-install.c:1147
-+msgid "already marked "
- msgstr ""
-
- #: pkgset-install.c:816
+++ /dev/null
---- poldek-0.18.7/vfile/vfprogress.c~ 2004-09-25 16:15:45.000000000 +0200
-+++ poldek-0.18.7/vfile/vfprogress.c 2004-11-16 19:21:35.011756552 +0100
-@@ -171,7 +171,7 @@
- bar->transfer_rate = total;
-
- nn = n_snprintf(unit_line, sizeof(unit_line), "[%s (%s/s)]",
-- total_str, total_str);
-+ total_str, transfer_str);
- } else {
- int n = 0;
- char eta_str[64];
projects / packages / poldek.git / commitdiff