From b1b5ba295cd5e38a56058c1207bda3804e74f446 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Wed, 4 Apr 2012 09:05:41 +0000 Subject: [PATCH] This commit was manufactured by cvs2git to create tag 'auto-ac-poldek- 0_30-1_rc5_5'. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Sprout from AC-DEVEL 2012-04-04 09:05:41 UTC cvs2git 'This commit was manufactured by cvs2git to create branch 'AC-DEVEL'.' Cherrypick from AC-DEVEL 2008-02-26 20:03:25 UTC cvs2git 'This commit was manufactured by cvs2git to create branch 'AC-DEVEL'.': poldek-dirdeps.patch -> 1.1.2.4 Cherrypick from master 2012-03-23 10:44:22 UTC Bartłomiej Zimoń '- rel 5; kill 404 errors when verbose killed': poldek-git.patch -> 1.7 Cherrypick from unlabeled-1.9.4 2010-08-22 15:51:56 UTC Elan Ruusamäe '- updated to 0.30-pre1 from HEAD': poldek-config.patch -> 1.9.4.1 Delete: ac-prog-libtool.patch gcc-fvisibility.patch makefile-tabs.patch poldek-158fix.patch poldek-317130.patch poldek-321546.patch poldek-abort-on-upgrade.patch poldek-add-arch-match.patch poldek-assertion-failed.patch poldek-both_langs.patch poldek-bug117hack.patch poldek-bug139.patch poldek-crash-on-invalid-locale.patch poldek-dont-ask-for-suggests-on-errors.patch poldek-dont-be-greedy.patch poldek-dont-lose-deps.patch poldek-dont-suggests-required-packages.patch poldek-export-missing-symbol.patch poldek-inline.patch poldek-keep-reinstalled-provides.patch poldek-ls-llu.patch poldek-ls-queryfmt.patch poldek-ls-source-rpm.patch poldek-missing-symbol.patch poldek-multilib-upgrade.patch poldek-multilib.patch poldek-no-inlines.patch poldek-nocolor-upgrade.patch poldek-noloop_on_terminal_loos.patch poldek-nonoorder.patch poldek-noutf8.patch poldek-op-ldalldesc.patch poldek-pkguinf-kill-assert.patch poldek-pkguinf-sourcerpm.patch poldek-po.patch poldek-prepare_url_fix.patch poldek-refcnt.patch poldek-score-reqs-marked-to-install.patch poldek-show_only_relative_used_space.patch poldek-sigint_emit.patch poldek-skip-suggests-on-upgrade.patch poldek-tty-for-erasures.patch poldek-unescape-urlencoded-strings.patch poldek-uninstall-greedy-fix.patch poldek-up_mini18n.patch poldek-upgrade-dist.patch poldek-zlib.patch --- ac-prog-libtool.patch | 10 - gcc-fvisibility.patch | 25 - makefile-tabs.patch | 31 - poldek-158fix.patch | 17 - poldek-317130.patch | 20 - poldek-321546.patch | 13 - poldek-abort-on-upgrade.patch | 10 - poldek-add-arch-match.patch | 51 - poldek-assertion-failed.patch | 35 - poldek-both_langs.patch | 58 - poldek-bug117hack.patch | 40 - poldek-bug139.patch | 58 - poldek-config.patch | 31 - poldek-crash-on-invalid-locale.patch | 29 - poldek-dirdeps.patch | 11 - poldek-dont-ask-for-suggests-on-errors.patch | 12 - poldek-dont-be-greedy.patch | 13 - poldek-dont-lose-deps.patch | 53 - poldek-dont-suggests-required-packages.patch | 74 - poldek-export-missing-symbol.patch | 16 - poldek-git.patch | 5983 ------------------ poldek-inline.patch | 12 - poldek-keep-reinstalled-provides.patch | 11 - poldek-ls-llu.patch | 13 - poldek-ls-queryfmt.patch | 1266 ---- poldek-ls-source-rpm.patch | 90 - poldek-missing-symbol.patch | 19 - poldek-multilib-upgrade.patch | 152 - poldek-multilib.patch | 10 - poldek-no-inlines.patch | 24 - poldek-nocolor-upgrade.patch | 19 - poldek-noloop_on_terminal_loos.patch | 15 - poldek-nonoorder.patch | 52 - poldek-noutf8.patch | 44 - poldek-op-ldalldesc.patch | 276 - poldek-pkguinf-kill-assert.patch | 13 - poldek-pkguinf-sourcerpm.patch | 101 - poldek-po.patch | 406 -- poldek-prepare_url_fix.patch | 11 - poldek-refcnt.patch | 22 - poldek-score-reqs-marked-to-install.patch | 151 - poldek-show_only_relative_used_space.patch | 90 - poldek-sigint_emit.patch | 53 - poldek-skip-suggests-on-upgrade.patch | 56 - poldek-tty-for-erasures.patch | 9 - poldek-unescape-urlencoded-strings.patch | 124 - poldek-uninstall-greedy-fix.patch | 76 - poldek-up_mini18n.patch | 11 - poldek-upgrade-dist.patch | 31 - poldek-zlib.patch | 177 - 50 files changed, 9924 deletions(-) delete mode 100644 ac-prog-libtool.patch delete mode 100644 gcc-fvisibility.patch delete mode 100644 makefile-tabs.patch delete mode 100644 poldek-158fix.patch delete mode 100644 poldek-317130.patch delete mode 100644 poldek-321546.patch delete mode 100644 poldek-abort-on-upgrade.patch delete mode 100644 poldek-add-arch-match.patch delete mode 100644 poldek-assertion-failed.patch delete mode 100644 poldek-both_langs.patch delete mode 100644 poldek-bug117hack.patch delete mode 100644 poldek-bug139.patch delete mode 100644 poldek-crash-on-invalid-locale.patch delete mode 100644 poldek-dont-ask-for-suggests-on-errors.patch delete mode 100644 poldek-dont-be-greedy.patch delete mode 100644 poldek-dont-lose-deps.patch delete mode 100644 poldek-dont-suggests-required-packages.patch delete mode 100644 poldek-export-missing-symbol.patch delete mode 100644 poldek-inline.patch delete mode 100644 poldek-keep-reinstalled-provides.patch delete mode 100644 poldek-ls-llu.patch delete mode 100644 poldek-ls-queryfmt.patch delete mode 100644 poldek-ls-source-rpm.patch delete mode 100644 poldek-missing-symbol.patch delete mode 100644 poldek-multilib-upgrade.patch delete mode 100644 poldek-multilib.patch delete mode 100644 poldek-no-inlines.patch delete mode 100644 poldek-nocolor-upgrade.patch delete mode 100644 poldek-noloop_on_terminal_loos.patch delete mode 100644 poldek-nonoorder.patch delete mode 100644 poldek-noutf8.patch delete mode 100644 poldek-op-ldalldesc.patch delete mode 100644 poldek-pkguinf-kill-assert.patch delete mode 100644 poldek-pkguinf-sourcerpm.patch delete mode 100644 poldek-po.patch delete mode 100644 poldek-prepare_url_fix.patch delete mode 100644 poldek-refcnt.patch delete mode 100644 poldek-score-reqs-marked-to-install.patch delete mode 100644 poldek-show_only_relative_used_space.patch delete mode 100644 poldek-sigint_emit.patch delete mode 100644 poldek-skip-suggests-on-upgrade.patch delete mode 100644 poldek-tty-for-erasures.patch delete mode 100644 poldek-unescape-urlencoded-strings.patch delete mode 100644 poldek-uninstall-greedy-fix.patch delete mode 100644 poldek-up_mini18n.patch delete mode 100644 poldek-upgrade-dist.patch delete mode 100644 poldek-zlib.patch diff --git a/ac-prog-libtool.patch b/ac-prog-libtool.patch deleted file mode 100644 index c17bf8c..0000000 --- a/ac-prog-libtool.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- poldek-0.30/configure.ac~ 2010-08-22 14:57:05.000000000 +0300 -+++ poldek-0.30/configure.ac 2010-08-22 14:58:09.298819202 +0300 -@@ -48,6 +48,7 @@ - - dnl Checks for programs. - LT_INIT -+AC_PROG_LIBTOOL - AC_PROG_CC() - #AC_PROG_CXX() - AC_C_INLINE diff --git a/gcc-fvisibility.patch b/gcc-fvisibility.patch deleted file mode 100644 index 5d4a80f..0000000 --- a/gcc-fvisibility.patch +++ /dev/null @@ -1,25 +0,0 @@ -Signed-off-by: Elan Ruusamäe - ---- poldek-0.30/configure.ac~ 2010-06-29 02:00:30.000000000 +0300 -+++ poldek-0.30/configure.ac 2010-08-22 14:25:03.838184361 +0300 -@@ -61,6 +61,7 @@ - AC_SUBST(AM_CFLAGS) - - if test -n "$GCC"; then -+ cflags_save="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - AC_MSG_CHECKING([whether gcc supports visibility]) - AC_TRY_COMPILE( -@@ -70,7 +71,11 @@ - extern __attribute__((__visibility__("default"))) int exportedfunc (void);], - [], - AC_MSG_RESULT(yes), -- AC_MSG_ERROR(["compiler does not support visibility"])) -+ [ -+ AC_MSG_WARN([compiler does not support visibility]) -+ CFLAGS="$cflags_save" -+ ] -+ ) - fi - - diff --git a/makefile-tabs.patch b/makefile-tabs.patch deleted file mode 100644 index a6ceec0..0000000 --- a/makefile-tabs.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- poldek-0.30/Makefile.am~ 2010-06-29 01:25:05.000000000 +0300 -+++ poldek-0.30/Makefile.am 2010-08-22 22:19:24.856916524 +0300 -@@ -131,17 +131,17 @@ - -rm -f core *.o *.bak *~ *% *\# TAGS gmon.out \#*\# dupa* conf/*~ - - poldek.pc: -- @ ( echo 'prefix=$(prefix)'; \ -- echo 'exec_prefix=$${exec_prefix}'; \ -- echo 'libdir=$${exec_prefix}/lib'; \ -- echo 'includedir=$${includedir}'; \ -- echo ''; \ -- echo 'Name: poldek'; \ -- echo 'Description: poldek libraries'; \ -- echo 'Version: '$(VERSION); \ -- echo 'Requires: '; \ -- echo 'Libs: -L$${libdir} -lpoldek -lvfile -ltrurl -ltndb'; \ -- echo 'Cflags: -I$${includedir}' ) > poldek.pc -+ @ ( echo 'prefix=$(prefix)'; \ -+ echo 'exec_prefix=$${exec_prefix}'; \ -+ echo 'libdir=$${exec_prefix}/lib'; \ -+ echo 'includedir=$${includedir}'; \ -+ echo ''; \ -+ echo 'Name: poldek'; \ -+ echo 'Description: poldek libraries'; \ -+ echo 'Version: $(VERSION)'; \ -+ echo 'Requires: '; \ -+ echo 'Libs: -L$${libdir} -lpoldek -lvfile -ltrurl -ltndb'; \ -+ echo 'Cflags: -I$${includedir}' ) > poldek.pc - - - include Makefile.extra diff --git a/poldek-158fix.patch b/poldek-158fix.patch deleted file mode 100644 index 530d438..0000000 --- a/poldek-158fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: install3/process.c -=================================================================== -RCS file: /cvsroot/poldek/poldek/install3/process.c,v -retrieving revision 1.5 -diff -u -r1.5 process.c ---- install3/process.c 13 May 2008 16:25:09 -0000 1.5 -+++ install3/process.c 7 Jun 2008 07:36:54 -0000 -@@ -61,6 +61,9 @@ - { - int i; - -+ if (i3_is_hand_marked(ictx, i3pkg->pkg)) -+ return; -+ - tracef(indent, "- rollbacking %s", pkg_id(i3pkg->pkg)); - iset_remove(ictx->inset, i3pkg->pkg); - i3_forget_error(ictx, i3pkg->pkg); diff --git a/poldek-317130.patch b/poldek-317130.patch deleted file mode 100644 index d77a87f..0000000 --- a/poldek-317130.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- poldek-0.30-cvs20080820.23/pkg.c~ 2009-01-14 17:33:56.297011561 +0200 -+++ poldek-0.30-cvs20080820.23/pkg.c 2009-01-14 17:33:59.170397703 +0200 -@@ -1451,15 +1451,13 @@ - - struct pkg *pkg_link(struct pkg *pkg) - { --#if ENABLE_TRACE -- if (strcmp(pkg->name, "XX") == 0) { -- DBGF("%p %s (pdir %s, na->refcnt=%d), refcnt=%d (%p)\n", -+ if (pkg->_refcnt >= INT16_MAX - 1) { -+ trace(1, "%p %s (pdir %s, na->refcnt=%d), refcnt=%d (%p)\n", - pkg, pkg_snprintf_s(pkg), - pkg->pkgdir ? pkgdir_idstr(pkg->pkgdir) : "", - pkg->na ? pkg->na->_refcnt : -1, - pkg->_refcnt, &pkg->_refcnt); - } --#endif - n_assert(pkg->_refcnt < INT16_MAX - 1); - pkg->_refcnt++; - return pkg; diff --git a/poldek-321546.patch b/poldek-321546.patch deleted file mode 100644 index 201c7df..0000000 --- a/poldek-321546.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- poldek-0.30-cvs20080820.23/pkgu.c~ 2009-01-26 20:12:20.700457198 +0200 -+++ poldek-0.30-cvs20080820.23/pkgu.c 2009-01-26 20:12:00.937750881 +0200 -@@ -576,8 +576,9 @@ - nbuf = n_buf_new(1024); - for (i=0; i < e_name.cnt; i++) { - char ts[32]; -+ time_t t = times[i]; - -- strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", gmtime((time_t*)×[i])); -+ strftime(ts, sizeof(ts), "%Y-%m-%d %H:%M:%S", gmtime((time_t*)&t)); - - n_buf_printf(nbuf, "* %s %s\n", ts, names[i]); - n_buf_printf(nbuf, "%s\n\n", texts[i]); diff --git a/poldek-abort-on-upgrade.patch b/poldek-abort-on-upgrade.patch deleted file mode 100644 index 87cff39..0000000 --- a/poldek-abort-on-upgrade.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- poldek-0.21-cvs20070703.00/pm/rpm/rpm.c~ 2007-07-02 00:04:27.000000000 +0300 -+++ poldek-0.21-cvs20070703.00/pm/rpm/rpm.c 2008-02-15 05:28:23.107186566 +0200 -@@ -221,6 +221,7 @@ - logn(LOGERR, _("%s%s: open rpm database failed"), - rootdir ? rootdir:"", dbpath ? dbpath : pm->default_dbpath); - rc = 0; -+ abort(); // XXX maybe re-exec ourselves after poldek binary upgrade? - } - - #if ENABLE_TRACE diff --git a/poldek-add-arch-match.patch b/poldek-add-arch-match.patch deleted file mode 100644 index 1fe61a0..0000000 --- a/poldek-add-arch-match.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/conf/poldek.conf b/conf/poldek.conf -index 13b1e21..24c34a0 100644 ---- a/conf/poldek.conf -+++ b/conf/poldek.conf -@@ -130,9 +130,11 @@ - choose equivalents manually = yes - - # Prevent package listed from being upgraded if they are already installed. -+# hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64 - hold = kernel* - - # Ignore package list - packages fits given mask will be invisible. -+# Masks are same as above. - # ignore = *-smp-* foo* - ignore = vserver-packages - #ignore = -diff --git a/pkgscore.c b/pkgscore.c -index f2a527c..0908410 100644 ---- a/pkgscore.c -+++ b/pkgscore.c -@@ -113,23 +113,28 @@ void pkgscore_match_init(struct pkgscore_s *psc, struct pkg *pkg) - n += n_snprintf(psc->pkgbuf, sizeof(psc->pkgbuf), - "%s:", pkg->pkgdir->name); - -+ // pkgname_off - size of pkgdir_name - psc->pkgname_off = n; -+ // pkgbuf - "repo_name:name-ver-rel.arch" - -- pkg_snprintf(&psc->pkgbuf[n], sizeof(psc->pkgbuf) - n, pkg); -+ n_snprintf(&psc->pkgbuf[n], sizeof(psc->pkgbuf) - n, "%s-%s-%s.%s", pkg->name, pkg->ver, pkg->rel, pkg_arch(pkg)); - psc->pkg = pkg; - } - - -- -+// return 0 if not match - int pkgscore_match(struct pkgscore_s *psc, const char *mask) - { -+ // match name - if (fnmatch(mask, psc->pkg->name, 0) == 0) - return 1; - -+ // match name-ver-rel.arch as string - if (psc->pkgname_off && - fnmatch(mask, &psc->pkgbuf[psc->pkgname_off], 0) == 0) - return 1; - -+ // match "repo_name:name-ver-rel.arch" as string - return fnmatch(mask, psc->pkgbuf, 0) == 0; - } - diff --git a/poldek-assertion-failed.patch b/poldek-assertion-failed.patch deleted file mode 100644 index 39e9a14..0000000 --- a/poldek-assertion-failed.patch +++ /dev/null @@ -1,35 +0,0 @@ -commit 7ac464b1d6d1cbeb6f6bcdaf4b477f0c21e3e334 -Author: Marcin Banasiak -Date: Thu Apr 9 19:11:23 2009 +0200 - - Enable checking for duplicates before adding new pkg to capreq_idx - - This change partially fixes lp#270503 on systems where multilib is not - used (see https://bugs.launchpad.net/poldek/+bug/270503/comments/1) and - in candidates is the only one package, but specified several times. - -diff --git a/capreqidx.c b/capreqidx.c -index 1af3a5f..7c31825 100644 ---- a/capreqidx.c -+++ b/capreqidx.c -@@ -92,7 +92,11 @@ int capreq_idx_add(struct capreq_idx *idx, const char *capname, - if (ent->_size == 1) /* crent_pkgs is NOT allocated */ - capreq_idx_ent_transform_to_array(ent); - --#if 0 /* not happens in fact */ -+ /* -+ * Sometimes, there are duplicates, especially in dotnet-* packages -+ * which provides multiple versions of one cap. For example dotnet-mono-zeroconf -+ * provides: mono(Mono.Zeroconf) = 1.0.0.0, mono(Mono.Zeroconf) = 2.0.0.0, etc. -+ */ - if (idx->flags & CAPREQ_IDX_CAP) { /* check for duplicates */ - register int i; - for (i=0; i < ent->items; i++) { -@@ -100,7 +104,6 @@ int capreq_idx_add(struct capreq_idx *idx, const char *capname, - return 1; - } - } --#endif - - if (ent->items == ent->_size) { - ent->_size *= 2; diff --git a/poldek-both_langs.patch b/poldek-both_langs.patch deleted file mode 100644 index 4e3004e..0000000 --- a/poldek-both_langs.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- poldek-0.30-cvs20080820.23/misc.c.old 2008-12-10 10:49:26.000000000 +0100 -+++ poldek-0.30-cvs20080820.23/misc.c 2008-12-10 10:49:56.000000000 +0100 -@@ -646,6 +646,15 @@ static char *cut_country_code (const cha - return newlang; - } - -+static inline void n_array_push_check_dup(tn_array *langs, char *value) -+{ -+ int i; -+ -+ for (i = 0; i < n_array_size(langs); i++) -+ if (strcmp(n_array_nth(langs, i), value) == 0) return; -+ n_array_push(langs, n_strdup(value)); -+} -+ - /* - * lang_match_avlangs: - * -@@ -656,24 +665,33 @@ static char *cut_country_code (const cha - static inline void lang_match_avlangs(tn_array *avlangs, tn_array *r_langs, - const char *lang, int *has_C) - { -+ char lang_utf8[32]; - char *cut = NULL; -- -+ - /* first try */ - if (n_array_bsearch(avlangs, lang)) { - if (strcmp(lang, "C") == 0) - *has_C = 1; -- -- n_array_push(r_langs, n_strdup(lang)); -+ -+ n_array_push_check_dup(r_langs, lang); - } -- -+ n_snprintf(lang_utf8, sizeof(lang_utf8), "%s.UTF-8", lang); -+ if (n_array_bsearch(avlangs, lang_utf8)) -+ n_array_push_check_dup(r_langs, lang_utf8); -+ - /* second try, without country code */ - if ((cut = cut_country_code(lang))) { - if (n_array_bsearch(avlangs, cut)) { - if (strcmp(cut, "C") == 0) - *has_C = 1; -- -- n_array_push(r_langs, cut); -+ -+ n_array_push_check_dup(r_langs, cut); - } -+ n_snprintf(lang_utf8, sizeof(lang_utf8), "%s.UTF-8", cut); -+ if (n_array_bsearch(avlangs, lang_utf8)) -+ n_array_push_check_dup(r_langs, lang_utf8); -+ -+ free(cut); - } - } - diff --git a/poldek-bug117hack.patch b/poldek-bug117hack.patch deleted file mode 100644 index 1430217..0000000 --- a/poldek-bug117hack.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: install3/requirements.c -=================================================================== -RCS file: /cvsroot/poldek/poldek/install3/requirements.c,v -retrieving revision 1.6 -diff -u -r1.6 requirements.c ---- install3/requirements.c 24 Feb 2008 22:10:41 -0000 1.6 -+++ install3/requirements.c 2 Mar 2008 23:03:26 -0000 -@@ -430,7 +430,6 @@ - - i3pkg->flags &= ~I3PKG_CROSSROAD; - if (candidates) { -- n_assert(n_array_size(candidates) > 1); - if (number_of_non_blacks(ictx, candidates) > 1) { - /* mark current package as crossroad and propagate mark down */ - i3pkg->flags |= I3PKG_CROSSROAD; -Index: install3/ictx.c -=================================================================== -RCS file: /cvsroot/poldek/poldek/install3/ictx.c,v -retrieving revision 1.3 -diff -u -r1.3 ictx.c ---- install3/ictx.c 30 Jan 2008 22:13:42 -0000 1.3 -+++ install3/ictx.c 2 Mar 2008 23:27:03 -0000 -@@ -208,6 +208,7 @@ - ictx->ts = NULL; - ictx->ps = NULL; - pkgmark_set_free(ictx->processed); -+ n_hash_free(ictx->errors); - memset(ictx, 0, sizeof(*ictx)); - } - -@@ -223,7 +224,8 @@ - - pkgmark_set_free(ictx->processed); - ictx->processed = pkgmark_set_new(0, PKGMARK_SET_IDPTR); -- -+ -+ n_hash_clean(ictx->errors); - ictx->abort = 0; - } - diff --git a/poldek-bug139.patch b/poldek-bug139.patch deleted file mode 100644 index b27d9d1..0000000 --- a/poldek-bug139.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: cli/cli.c -=================================================================== -RCS file: /cvsroot/poldek/poldek/cli/cli.c,v -retrieving revision 1.44 -diff -u -r1.44 cli/cli.c ---- cli/cli.c 3 Feb 2008 18:01:59 -0000 1.44 -+++ cli/cli.c 20 Apr 2008 11:41:01 -0000 -@@ -731,9 +731,12 @@ - const char *cmdline, struct cmd_pipe *cmd_pipe) - { - tn_array *cmd_chain; -- int rc = 0, i; -+ int rc = 0, i, _verbose; - - DBGF("%s\n", cmdline); -+ -+ /* keep verbose setting as it changes when '-q' option is used */ -+ _verbose = poldek_verbose (); - - cmd_chain = poclidek_prepare_cmdline(cctx, cmdline); - if (cmd_chain == NULL) -@@ -753,7 +756,10 @@ - else - rc = poclidek_exec_cmd_ent(cctx, ts, ent, NULL); - } -- -+ -+ /* restore verbose setting */ -+ poldek_set_verbose (_verbose); -+ - n_array_free(cmd_chain); - return rc; - } -Index: cli/shell.c -=================================================================== -RCS file: /cvsroot/poldek/poldek/cli/shell.c,v -retrieving revision 1.34 -diff -u -r1.34 cli/shell.c ---- cli/shell.c 3 Feb 2008 18:01:59 -0000 1.34 -+++ cli/shell.c 20 Apr 2008 11:41:02 -0000 -@@ -405,8 +405,6 @@ - - s = n_str_strip_ws(line); - if (*s) { -- int _verbose = poldek_verbose(); -- - shInCmd = 1; - DBGF("(%s)\n", s); - -@@ -417,8 +415,6 @@ - sigint_reset(); - shDone = 0; - shInCmd = 0; -- -- poldek_set_verbose(_verbose); - } - free(line); - diff --git a/poldek-config.patch b/poldek-config.patch index 4ad385c..8f25b0d 100644 --- a/poldek-config.patch +++ b/poldek-config.patch @@ -1,23 +1,3 @@ ---- poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:37:12.737381529 +0300 -+++ poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:38:47.231352866 +0300 -@@ -369,7 +369,7 @@ - - - -- - --