SOURCES (megabajt): poldek-vserver-packages.patch, poldek-config.p...
megabajt
megabajt at pld-linux.org
Fri Jan 4 10:50:49 CET 2008
Author: megabajt Date: Fri Jan 4 09:50:49 2008 GMT
Module: SOURCES Tag: megabajt
---- Log message:
- updated for 20080103.17 snap
---- Files affected:
SOURCES:
poldek-vserver-packages.patch (1.1 -> 1.1.4.1) , poldek-config.patch (1.5 -> 1.5.4.1) , poldek-dir-dot.patch (1.1 -> 1.1.2.1) , poldek-suggests-one-package.patch (1.1 -> 1.1.2.1)
---- Diffs:
================================================================
Index: SOURCES/poldek-vserver-packages.patch
diff -u SOURCES/poldek-vserver-packages.patch:1.1 SOURCES/poldek-vserver-packages.patch:1.1.4.1
--- SOURCES/poldek-vserver-packages.patch:1.1 Mon May 15 15:39:46 2006
+++ SOURCES/poldek-vserver-packages.patch Fri Jan 4 10:50:44 2008
@@ -1,11 +1,13 @@
---- poldek-0.20/conf/poldek.conf~ 2006-05-15 16:37:25.044005851 +0300
-+++ poldek-0.20/conf/poldek.conf 2006-05-15 16:38:11.555045489 +0300
-@@ -135,7 +135,8 @@
+diff -urN poldek-0.21-cvs20080103.17/conf/poldek.conf poldek-0.21-cvs20080103.17.new/conf/poldek.conf
+--- poldek-0.21-cvs20080103.17/conf/poldek.conf 2008-01-03 17:24:33.000000000 +0100
++++ poldek-0.21-cvs20080103.17.new/conf/poldek.conf 2008-01-03 17:35:47.000000000 +0100
+@@ -135,8 +135,8 @@
# Ignore package list - packages fits given mask will be invisible.
- # ignore = *-smp-* foo*
+ # ignore = *-smp-* foo*
+-# ignore = vserver-packages
-#ignore =
-+# we ignore vserver-packages by default, util-vserver has it's own poldek config.
++# We ignore vserver-packages by default, util-vserver has it's own poldek config.
+ignore = vserver-packages
# Conflicts with already installed packages are treated as resolved
================================================================
Index: SOURCES/poldek-config.patch
diff -u SOURCES/poldek-config.patch:1.5 SOURCES/poldek-config.patch:1.5.4.1
--- SOURCES/poldek-config.patch:1.5 Wed Jan 31 20:03:12 2007
+++ SOURCES/poldek-config.patch Fri Jan 4 10:50:44 2008
@@ -1,5 +1,6 @@
---- poldek-0.20/conf/poldek.conf 2006-03-10 16:45:19.000000000 +0200
-+++ poldek-0.20/conf/poldek.conf 2007-01-31 17:48:31.288247465 +0200
+diff -urN poldek-0.21-cvs20080103.17/conf/poldek.conf poldek-0.21-cvs20080103.17.new/conf/poldek.conf
+--- poldek-0.21-cvs20080103.17/conf/poldek.conf 2008-01-03 17:24:33.000000000 +0100
++++ poldek-0.21-cvs20080103.17.new/conf/poldek.conf 2008-01-03 17:38:28.000000000 +0100
@@ -127,11 +127,11 @@
#confirm removal = yes
@@ -8,15 +9,16 @@
+choose equivalents manually = yes
# Prevent package listed from being upgraded if they are already installed.
- # hold = kernel* dev
+ # hold = kernel*
-#hold =
+hold = kernel*
# Ignore package list - packages fits given mask will be invisible.
- # ignore = *-smp-* foo*
---- poldek-0.20/conf/source.conf~ 2005-10-28 19:16:24.000000000 +0300
-+++ poldek-0.20/conf/source.conf 2006-05-31 22:45:40.030363503 +0300
-@@ -82,4 +82,4 @@
+ # ignore = *-smp-* foo*
+diff -urN poldek-0.21-cvs20080103.17/conf/source.conf poldek-0.21-cvs20080103.17.new/conf/source.conf
+--- poldek-0.21-cvs20080103.17/conf/source.conf 2008-01-03 17:24:33.000000000 +0100
++++ poldek-0.21-cvs20080103.17.new/conf/source.conf 2008-01-03 17:38:59.000000000 +0100
+@@ -85,4 +85,4 @@
#hold = kernel*
#ignore = kernel*-smp-*
#dscr = pl_PL
================================================================
Index: SOURCES/poldek-dir-dot.patch
diff -u SOURCES/poldek-dir-dot.patch:1.1 SOURCES/poldek-dir-dot.patch:1.1.2.1
--- SOURCES/poldek-dir-dot.patch:1.1 Thu Nov 22 18:16:31 2007
+++ SOURCES/poldek-dir-dot.patch Fri Jan 4 10:50:44 2008
@@ -1,13 +1,13 @@
-diff -urN poldek-0.21-cvs20070703.00.org/misc.c poldek-0.21-cvs20070703.00/misc.c
---- poldek-0.21-cvs20070703.00.org/misc.c 2007-07-02 20:30:48.000000000 +0200
-+++ poldek-0.21-cvs20070703.00/misc.c 2007-11-22 18:09:26.899099602 +0100
-@@ -526,6 +526,9 @@
- {
+diff -urN poldek-0.21-cvs20080103.17/misc.c poldek-0.21-cvs20080103.17.new/misc.c
+--- poldek-0.21-cvs20080103.17/misc.c 2007-07-02 18:39:22.000000000 +0200
++++ poldek-0.21-cvs20080103.17.new/misc.c 2008-01-03 17:49:38.000000000 +0100
+@@ -527,6 +527,9 @@
if (strstr(path, "./") == NULL)
return NULL;
-+
+
+ if (strncmp(path, ".", 1) == 0)
+ return get_current_dir_name();
-
++
#ifdef HAVE_CANONICALIZE_FILE_NAME /* have safe GNU ext? */
return realpath(path, NULL);
+ #else
================================================================
Index: SOURCES/poldek-suggests-one-package.patch
diff -u SOURCES/poldek-suggests-one-package.patch:1.1 SOURCES/poldek-suggests-one-package.patch:1.1.2.1
--- SOURCES/poldek-suggests-one-package.patch:1.1 Mon Nov 26 18:23:46 2007
+++ SOURCES/poldek-suggests-one-package.patch Fri Jan 4 10:50:44 2008
@@ -1,6 +1,6 @@
-diff -urN poldek/ask.c poldek.new/ask.c
---- poldek/ask.c 2007-07-08 18:48:11.000000000 +0200
-+++ poldek.new/ask.c 2007-11-18 18:55:32.000000000 +0100
+diff -urN poldek-0.21-cvs20080103.17/ask.c poldek-0.21-cvs20080103.17.new/ask.c
+--- poldek-0.21-cvs20080103.17/ask.c 2007-07-08 18:48:11.000000000 +0200
++++ poldek-0.21-cvs20080103.17.new/ask.c 2008-01-03 17:50:33.000000000 +0100
@@ -87,6 +87,38 @@
return answer;
}
@@ -66,9 +66,9 @@
ctx->data_choose_equiv_fn = NULL;
ctx->choose_equiv_fn = term_choose_pkg;
}
-diff -urN poldek/install/requirements.c poldek.new/install/requirements.c
---- poldek/install/requirements.c 2007-07-12 23:29:26.000000000 +0200
-+++ poldek.new/install/requirements.c 2007-11-18 18:42:27.000000000 +0100
+diff -urN poldek-0.21-cvs20080103.17/install/requirements.c poldek-0.21-cvs20080103.17.new/install/requirements.c
+--- poldek-0.21-cvs20080103.17/install/requirements.c 2007-07-12 23:29:26.000000000 +0200
++++ poldek-0.21-cvs20080103.17.new/install/requirements.c 2008-01-03 17:50:33.000000000 +0100
@@ -244,46 +244,94 @@
}
@@ -194,9 +194,9 @@
for (i=0; i < n_array_size(reqs); i++) {
struct capreq *req = n_array_nth(reqs, i);
-diff -urN poldek/lib_init.c poldek.new/lib_init.c
---- poldek/lib_init.c 2007-07-09 20:31:14.000000000 +0200
-+++ poldek.new/lib_init.c 2007-11-17 22:42:56.000000000 +0100
+diff -urN poldek-0.21-cvs20080103.17/lib_init.c poldek-0.21-cvs20080103.17.new/lib_init.c
+--- poldek-0.21-cvs20080103.17/lib_init.c 2007-07-09 20:31:14.000000000 +0200
++++ poldek-0.21-cvs20080103.17.new/lib_init.c 2008-01-03 17:50:33.000000000 +0100
@@ -1226,6 +1226,15 @@
ctx->data_ts_confirm_fn = vv;
break;
@@ -213,22 +213,20 @@
case POLDEK_CONF_CHOOSEEQUIV_CB:
if ((vv = va_arg(ap, void*)))
ctx->choose_equiv_fn = vv;
-diff -urN poldek/poldek.h poldek.new/poldek.h
---- poldek/poldek.h 2007-07-01 23:04:26.000000000 +0200
-+++ poldek.new/poldek.h 2007-11-17 21:33:31.000000000 +0100
-@@ -53,7 +53,8 @@
- #define POLDEK_CONF_GOODBYE_CB 22
- #define POLDEK_CONF_CONFIRM_CB 23
+diff -urN poldek-0.21-cvs20080103.17/poldek.h poldek-0.21-cvs20080103.17.new/poldek.h
+--- poldek-0.21-cvs20080103.17/poldek.h 2007-07-11 00:56:17.000000000 +0200
++++ poldek-0.21-cvs20080103.17.new/poldek.h 2008-01-03 17:57:35.000000000 +0100
+@@ -55,6 +55,7 @@
#define POLDEK_CONF_TSCONFIRM_CB 24
--#define POLDEK_CONF_CHOOSEEQUIV_CB 25
-+#define POLDEK_CONF_SUGSCONFIRM_CB 25
-+#define POLDEK_CONF_CHOOSEEQUIV_CB 26
+ #define POLDEK_CONF_CHOOSEEQUIV_CB 25
+ #define POLDEK_CONF_VFILEPROGRESS 26
++#define POLDEK_CONF_SUGSCONFIRM_CB 27
int poldek_configure(struct poldek_ctx *ctx, int param, ...);
-diff -urN poldek/poldek_intern.h poldek.new/poldek_intern.h
---- poldek/poldek_intern.h 2007-07-08 18:59:15.000000000 +0200
-+++ poldek.new/poldek_intern.h 2007-11-17 22:47:39.000000000 +0100
+diff -urN poldek-0.21-cvs20080103.17/poldek_intern.h poldek-0.21-cvs20080103.17.new/poldek_intern.h
+--- poldek-0.21-cvs20080103.17/poldek_intern.h 2007-07-08 18:59:15.000000000 +0200
++++ poldek-0.21-cvs20080103.17.new/poldek_intern.h 2008-01-03 17:55:52.000000000 +0100
@@ -38,6 +38,10 @@
void *data_ts_confirm_fn;
int (*ts_confirm_fn)(void *data, const struct poldek_ts *ts); /* confirm transaction */
@@ -240,20 +238,19 @@
void *data_choose_equiv_fn;
int (*choose_equiv_fn)(void *data, const struct poldek_ts *ts,
const char *cap, tn_array *pkgs, int hint);
-@@ -74,6 +78,10 @@
+@@ -74,6 +78,9 @@
int poldek__ts_confirm(const struct poldek_ts *ts);
+int poldek__sugs_confirm(const struct poldek_ts *ts,
+ int default_answer, const char *message);
+
-+
int poldek__choose_equiv(const struct poldek_ts *ts,
const char *capname, tn_array *pkgs, struct pkg *hint);
-diff -urN poldek/poldek_ts.c poldek.new/poldek_ts.c
---- poldek/poldek_ts.c 2007-07-11 00:56:17.000000000 +0200
-+++ poldek.new/poldek_ts.c 2007-11-17 22:56:19.000000000 +0100
+diff -urN poldek-0.21-cvs20080103.17/poldek_ts.c poldek-0.21-cvs20080103.17.new/poldek_ts.c
+--- poldek-0.21-cvs20080103.17/poldek_ts.c 2007-07-11 00:56:17.000000000 +0200
++++ poldek-0.21-cvs20080103.17.new/poldek_ts.c 2008-01-03 17:56:33.000000000 +0100
@@ -54,6 +54,7 @@
extern int poldek_term_confirm(int default_answer, const char *msg);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/poldek-vserver-packages.patch?r1=1.1&r2=1.1.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/poldek-config.patch?r1=1.5&r2=1.5.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/poldek-dir-dot.patch?r1=1.1&r2=1.1.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/poldek-suggests-one-package.patch?r1=1.1&r2=1.1.2.1&f=u
More information about the pld-cvs-commit
mailing list