r927 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Sun Mar 3 11:33:01 UTC 2013
Author: waldi
Date: Sun Mar 3 11:33:01 2013
New Revision: 927
Log:
* debian/changelog: Set version to 2.02.98-1.
* debian/libdevmapper1.02.1.symbols: Add new symbols.
* debian/patches: Refresh and delete old patches.
* debian/rules: Set path of thin_check executable.
Deleted:
lvm2/trunk/debian/patches/upstream-fix-discard-1.patch
lvm2/trunk/debian/patches/upstream-fix-discard-2.patch
lvm2/trunk/debian/patches/upstream-fix-discard-3.patch
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/libdevmapper1.02.1.symbols
lvm2/trunk/debian/patches/dirs.patch
lvm2/trunk/debian/patches/dm-event-api.patch
lvm2/trunk/debian/patches/force-modprobe.patch
lvm2/trunk/debian/patches/install.patch
lvm2/trunk/debian/patches/libs-cleanup.patch
lvm2/trunk/debian/patches/missing-dmeventd.patch
lvm2/trunk/debian/patches/monitoring-default-off.patch
lvm2/trunk/debian/patches/series
lvm2/trunk/debian/rules
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/changelog Sun Mar 3 11:33:01 2013 (r927)
@@ -1,3 +1,9 @@
+lvm2 (2.02.98-1) UNRELEASED; urgency=low
+
+ * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org> Sun, 03 Mar 2013 12:04:37 +0100
+
lvm2 (2.02.95-6) unstable; urgency=low
* Drop cluster (clvm) support. It never properly worked and is more dead
Modified: lvm2/trunk/debian/libdevmapper1.02.1.symbols
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.symbols Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/libdevmapper1.02.1.symbols Sun Mar 3 11:33:01 2013 (r927)
@@ -48,6 +48,7 @@
dm_config_tree_find_str at Base 2:1.02.74
dm_config_tree_find_str_allow_empty at Base 2:1.02.74
dm_config_write_node at Base 2:1.02.74
+ dm_config_write_one_node at Base 2:1.02.77
dm_cookie_supported at Base 2:1.02.36
dm_count_chars at Base 2:1.02.74
dm_create_dir at Base 2:1.02.24
@@ -169,6 +170,8 @@
dm_task_get_names at Base 2:1.02.20
dm_task_get_read_ahead at Base 2:1.02.24
dm_task_get_uuid at Base 2:1.02.20
+ dm_task_get_uuid_mangled at Base 2:1.02.77
+ dm_task_get_uuid_unmangled at Base 2:1.02.77
dm_task_get_versions at Base 2:1.02.20
dm_task_no_flush at Base 2:1.02.20
dm_task_no_open_count at Base 2:1.02.20
@@ -236,6 +239,8 @@
dm_tree_node_set_callback at Base 2:1.02.74
dm_tree_node_set_presuspend_node at Base 2:1.02.63
dm_tree_node_set_read_ahead at Base 2:1.02.24
+ dm_tree_node_set_thin_external_origin at Base 2:1.02.77
+ dm_tree_node_set_thin_pool_discard at Base 2:1.02.77
dm_tree_node_set_udev_flags at Base 2:1.02.74
dm_tree_node_size_changed at Base 2:1.02.36
dm_tree_preload_children at Base 2:1.02.20
@@ -254,5 +259,6 @@
dm_unescape_colons_and_at_signs at Base 2:1.02.74
dm_unescape_double_quotes at Base 2:1.02.74
dm_uuid_prefix at Base 2:1.02.74
+ dm_vasprintf at Base 2:1.02.77
dm_zalloc_aux at Base 2:1.02.63
dm_zalloc_aux_debug at Base 2:1.02.63
Modified: lvm2/trunk/debian/patches/dirs.patch
==============================================================================
--- lvm2/trunk/debian/patches/dirs.patch Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/dirs.patch Sun Mar 3 11:33:01 2013 (r927)
@@ -1,15 +1,15 @@
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
-@@ -86,7 +86,7 @@
- # It is safe to delete the contents: the tools regenerate it.
- # (The old setting 'cache' is still respected if neither of
- # these new ones is present.)
+@@ -97,7 +97,7 @@
+ # N.B. If obtain_device_list_from_udev is set to 1 the list of
+ # devices is instead obtained from udev and any existing .cache
+ # file is removed.
- cache_dir = "@DEFAULT_SYS_DIR@/@DEFAULT_CACHE_SUBDIR@"
+ cache_dir = "/run/lvm"
cache_file_prefix = ""
# You can turn off writing this cache file by setting this to 0.
-@@ -405,7 +405,7 @@
+@@ -425,7 +425,7 @@
# Full pathnames can be given.
# Search this directory first for shared libraries.
@@ -20,7 +20,7 @@
# locking_library = "liblvm2clusterlock.so"
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
-@@ -827,10 +827,8 @@
+@@ -853,18 +853,16 @@
if (cache_dir || cache_file_prefix) {
if (dm_snprintf(cache_file, sizeof(cache_file),
@@ -32,8 +32,7 @@
+ cache_dir ? : DEFAULT_RUN_DIR,
cache_file_prefix ? : DEFAULT_CACHE_FILE_PREFIX) < 0) {
log_error("Persistent cache filename too long.");
- f3->destroy(f3);
-@@ -838,8 +836,8 @@
+ goto bad;
}
} else if (!(dev_cache = find_config_tree_str(cmd, "devices/cache", NULL)) &&
(dm_snprintf(cache_file, sizeof(cache_file),
@@ -43,10 +42,10 @@
+ DEFAULT_RUN_DIR,
DEFAULT_CACHE_FILE_PREFIX) < 0)) {
log_error("Persistent cache filename too long.");
- f3->destroy(f3);
+ goto bad;
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
-@@ -912,8 +912,17 @@
+@@ -911,8 +911,17 @@
{
void *dl;
struct dso_data *ret = NULL;
Modified: lvm2/trunk/debian/patches/dm-event-api.patch
==============================================================================
--- lvm2/trunk/debian/patches/dm-event-api.patch Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/dm-event-api.patch Sun Mar 3 11:33:01 2013 (r927)
@@ -1,6 +1,6 @@
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
-@@ -344,7 +344,7 @@
+@@ -340,7 +340,7 @@
return bytes == size;
}
@@ -9,7 +9,7 @@
struct dm_event_daemon_message *msg, int cmd,
const char *dso_name, const char *dev_name,
enum dm_event_mask evmask, uint32_t timeout)
-@@ -467,7 +467,7 @@
+@@ -463,7 +463,7 @@
return ret;
}
@@ -18,7 +18,7 @@
{
/* FIXME? Is fifo the most suitable method? Why not share
comms/daemon code with something else e.g. multipath? */
-@@ -514,10 +514,10 @@
+@@ -510,10 +510,10 @@
if (!_start_daemon(dmeventd_path, fifos))
return_0;
@@ -31,7 +31,7 @@
{
if (flock(fifos->server, LOCK_UN))
log_error("flock unlock %s", fifos->server_path);
-@@ -596,16 +596,16 @@
+@@ -592,16 +592,16 @@
return -ESRCH;
}
@@ -51,7 +51,7 @@
return ret;
}
-@@ -814,7 +814,7 @@
+@@ -810,7 +810,7 @@
char *p;
struct dm_event_daemon_message msg = { 0, 0, NULL };
@@ -72,24 +72,24 @@
dm_event_get_version
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
-@@ -1827,14 +1827,14 @@
+@@ -1842,14 +1842,14 @@
/* Get the list of registrations from the running daemon. */
- if (!init_fifos(&fifos)) {
+ if (!dm_event_daemon_init_fifos(&fifos)) {
fprintf(stderr, "WARNING: Could not initiate communication with existing dmeventd.\n");
- return;
+ exit(EXIT_FAILURE);
}
if (!dm_event_get_version(&fifos, &version)) {
fprintf(stderr, "WARNING: Could not communicate with existing dmeventd.\n");
- fini_fifos(&fifos);
+ dm_event_daemon_fini_fifos(&fifos);
- return;
+ exit(EXIT_FAILURE);
}
-@@ -1845,7 +1845,7 @@
+@@ -1860,7 +1860,7 @@
exit(EXIT_FAILURE);
}
@@ -98,7 +98,7 @@
exit(EXIT_FAILURE);
}
-@@ -1874,12 +1874,12 @@
+@@ -1889,7 +1889,7 @@
}
_initial_registrations[count] = 0;
@@ -107,6 +107,15 @@
fprintf(stderr, "Old dmeventd refused to die.\n");
exit(EXIT_FAILURE);
}
+@@ -1899,12 +1899,12 @@
+ * until one fails.
+ */
+ for (i = 0; i < 10; ++i) {
+- if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_DIE, "-", "-", 0, 0))
++ if (dm_event_daemon_talk(&fifos, &msg, DM_EVENT_CMD_DIE, "-", "-", 0, 0))
+ break; /* yep, it's dead probably */
+ usleep(10);
+ }
- fini_fifos(&fifos);
+ dm_event_daemon_fini_fifos(&fifos);
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Sun Mar 3 11:33:01 2013 (r927)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -1086,11 +1086,7 @@
+@@ -1316,11 +1316,7 @@
fi
################################################################################
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/install.patch Sun Mar 3 11:33:01 2013 (r927)
@@ -12,7 +12,7 @@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
LCOV = @LCOV@
-@@ -71,8 +72,7 @@
+@@ -74,8 +75,7 @@
tmpfiles_dir = $(DESTDIR)@tmpfilesdir@
ocf_scriptdir = $(DESTDIR)@OCFDIR@
@@ -22,7 +22,7 @@
DEFAULT_SYS_DIR = @DEFAULT_SYS_DIR@
DEFAULT_ARCHIVE_DIR = $(DEFAULT_SYS_DIR)/@DEFAULT_ARCHIVE_SUBDIR@
-@@ -96,22 +96,14 @@
+@@ -99,22 +99,14 @@
endif
# Handle installation of files
@@ -49,7 +49,7 @@
.SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
-@@ -344,17 +336,14 @@
+@@ -346,17 +338,14 @@
$(INSTALL_DIR) $(usrlibdir)
$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Sun Mar 3 11:33:01 2013 (r927)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -416,7 +416,7 @@
+@@ -436,7 +436,7 @@
AC_MSG_CHECKING(whether to enable readline)
AC_ARG_ENABLE([readline],
AC_HELP_STRING([--disable-readline], [disable readline support]),
@@ -9,7 +9,7 @@
AC_MSG_RESULT($READLINE)
################################################################################
-@@ -1067,21 +1067,9 @@
+@@ -1173,21 +1173,9 @@
################################################################################
dnl -- Check for selinux
if test x$SELINUX = xyes; then
@@ -34,7 +34,7 @@
fi
################################################################################
-@@ -1102,49 +1090,6 @@
+@@ -1208,49 +1196,6 @@
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
################################################################################
@@ -84,7 +84,7 @@
dnl -- Internationalisation stuff
AC_MSG_CHECKING(whether to enable internationalisation)
AC_ARG_ENABLE(nls,
-@@ -1225,7 +1170,8 @@
+@@ -1338,7 +1283,8 @@
################################################################################
dnl -- Ensure additional headers required
if test x$READLINE = xyes; then
@@ -94,7 +94,7 @@
fi
if test x$CLVMD != xnone; then
-@@ -1469,6 +1415,7 @@
+@@ -1581,6 +1527,7 @@
AC_SUBST(SALCK_CFLAGS)
AC_SUBST(SALCK_LIBS)
AC_SUBST(SELINUX_LIBS)
Modified: lvm2/trunk/debian/patches/missing-dmeventd.patch
==============================================================================
--- lvm2/trunk/debian/patches/missing-dmeventd.patch Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/missing-dmeventd.patch Sun Mar 3 11:33:01 2013 (r927)
@@ -3,11 +3,11 @@
--- a/daemons/dmeventd/libdevmapper-event.c
+++ b/daemons/dmeventd/libdevmapper-event.c
-@@ -441,7 +441,10 @@
+@@ -437,7 +437,10 @@
/* server is not running */
- if (!strncmp(DMEVENTD_PATH, "/", 1) && stat(DMEVENTD_PATH, &statbuf)) {
-- log_sys_error("stat", DMEVENTD_PATH);
+ if ((args[0][0] == '/') && stat(args[0], &statbuf)) {
+- log_sys_error("stat", args[0]);
+ if (errno != ENOENT)
+ log_error("Unable to find " DMEVENTD_PATH ": %s", strerror(errno));
+ else
@@ -15,7 +15,7 @@
return 0;
}
-@@ -627,10 +630,19 @@
+@@ -623,10 +626,19 @@
if ((err = _do_event(DM_EVENT_CMD_REGISTER_FOR_EVENT, dmevh->dmeventd_path, &msg,
dmevh->dso, uuid, dmevh->mask, dmevh->timeout)) < 0) {
@@ -41,7 +41,7 @@
dm_free(msg.data);
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
-@@ -1197,10 +1197,12 @@
+@@ -1214,10 +1214,12 @@
if (!r)
return_0;
@@ -57,7 +57,7 @@
}
#endif
-@@ -1214,7 +1216,7 @@
+@@ -1231,7 +1233,7 @@
{
#ifdef DMEVENTD
int i, pending = 0, monitored;
@@ -66,7 +66,7 @@
struct dm_list *tmp, *snh, *snht;
struct lv_segment *seg;
struct lv_segment *log_seg;
-@@ -1319,25 +1321,30 @@
+@@ -1366,25 +1368,30 @@
continue;
/* FIXME specify events */
Modified: lvm2/trunk/debian/patches/monitoring-default-off.patch
==============================================================================
--- lvm2/trunk/debian/patches/monitoring-default-off.patch Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/monitoring-default-off.patch Sun Mar 3 11:33:01 2013 (r927)
@@ -8,10 +8,10 @@
+#define DEFAULT_DMEVENTD_MONITOR 0
#define DEFAULT_BACKGROUND_POLLING 1
- #define DEFAULT_THIN_CHECK_EXECUTABLE "/sbin/thin_check -q"
+ #define DEFAULT_THIN_CHECK_OPTIONS "-q"
--- a/doc/example.conf.in
+++ b/doc/example.conf.in
-@@ -677,7 +677,7 @@
+@@ -720,7 +720,7 @@
# Monitoring is enabled by default when activating logical volumes.
# Set to 0 to disable monitoring or use the --ignoremonitoring option.
@@ -22,7 +22,7 @@
# synchronising or merging data, they check and report progress
--- a/tools/toollib.c
+++ b/tools/toollib.c
-@@ -1505,8 +1505,6 @@
+@@ -1500,8 +1500,6 @@
int get_activation_monitoring_mode(struct cmd_context *cmd,
int *monitoring_mode)
{
@@ -31,7 +31,7 @@
if (arg_count(cmd, monitor_ARG) &&
(arg_count(cmd, ignoremonitoring_ARG) ||
arg_count(cmd, sysinit_ARG))) {
-@@ -1514,14 +1512,15 @@
+@@ -1509,14 +1507,15 @@
return 0;
}
Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/patches/series Sun Mar 3 11:33:01 2013 (r927)
@@ -6,7 +6,4 @@
implicit-pointer.patch
dm-event-api.patch
monitoring-default-off.patch
-upstream-fix-discard-1.patch
-upstream-fix-discard-2.patch
-upstream-fix-discard-3.patch
missing-dmeventd.patch
Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules Thu Jan 3 04:29:55 2013 (r926)
+++ lvm2/trunk/debian/rules Sun Mar 3 11:33:01 2013 (r927)
@@ -78,12 +78,13 @@
--libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
--with-optimisation="$(CFLAGS_OPT_DEB)" \
--with-cluster=none \
- --with-thin=internal \
--with-device-uid=0 \
--with-device-gid=6 \
--with-device-mode=0660 \
--with-default-run-dir=/run/lvm \
--with-default-locking-dir=/run/lock/lvm \
+ --with-thin=internal \
+ --with-thin-check=/sbin/thin_check \
--enable-applib \
--enable-cmdlib \
--enable-dmeventd \
More information about the pkg-lvm-commits
mailing list