r729 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Fri Sep 18 17:37:44 UTC 2009
Author: waldi
Date: Fri Sep 18 17:37:44 2009
New Revision: 729
Log:
* debian/changelog: Update version to 2.02.52.
* debian/patches: Update patches.
Deleted:
lvm2/trunk/debian/patches/upstream-pvcreate-partition.patch
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/patches/config.patch
lvm2/trunk/debian/patches/dmsetup-export.patch
lvm2/trunk/debian/patches/drop-realtime.patch
lvm2/trunk/debian/patches/force-modprobe.patch
lvm2/trunk/debian/patches/install.patch
lvm2/trunk/debian/patches/libdm-abi.patch
lvm2/trunk/debian/patches/libdm-atomic.patch
lvm2/trunk/debian/patches/libs-cleanup.patch
lvm2/trunk/debian/patches/rules-subdir.patch
lvm2/trunk/debian/patches/series
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/changelog Fri Sep 18 17:37:44 2009 (r729)
@@ -1,8 +1,9 @@
-lvm2 (2.02.51-5) UNRELEASED; urgency=low
+lvm2 (2.02.52-1) UNRELEASED; urgency=low
+ * New upstram version.
* Fix clvm init script. (closes: #542169)
- -- Bastian Blank <waldi at debian.org> Tue, 15 Sep 2009 13:58:09 +0200
+ -- Bastian Blank <waldi at debian.org> Fri, 18 Sep 2009 17:28:42 +0000
lvm2 (2.02.51-4) unstable; urgency=low
Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/config.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -1,6 +1,6 @@
--- a/doc/example.conf
+++ b/doc/example.conf
-@@ -294,7 +294,7 @@
+@@ -305,7 +305,7 @@
# Full pathnames can be given.
# Search this directory first for shared libraries.
Modified: lvm2/trunk/debian/patches/dmsetup-export.patch
==============================================================================
--- lvm2/trunk/debian/patches/dmsetup-export.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/dmsetup-export.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -1,6 +1,6 @@
--- a/tools/dmsetup.c
+++ b/tools/dmsetup.c
-@@ -1333,6 +1333,82 @@
+@@ -1342,6 +1342,82 @@
return r;
}
@@ -83,7 +83,7 @@
/* Show target names and their version numbers */
static int _targets(int argc __attribute((unused)), char **argv __attribute((unused)), void *data __attribute((unused)))
{
-@@ -2434,6 +2510,7 @@
+@@ -2443,6 +2519,7 @@
{"version", "", 0, 0, _version},
{"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, _setgeometry},
{"splitname", "<device> [<subsystem>]", 1, 2, _splitname},
Modified: lvm2/trunk/debian/patches/drop-realtime.patch
==============================================================================
--- lvm2/trunk/debian/patches/drop-realtime.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/drop-realtime.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -206,10 +206,10 @@
-AC_MSG_RESULT($REALTIME)
-
-################################################################################
- dnl -- Build cluster LVM daemon
- AC_MSG_CHECKING(whether to build cluster LVM daemon)
- AC_ARG_WITH(clvmd,
-@@ -557,19 +548,6 @@
+ dnl -- Init pkg-config with dummy invokation:
+ dnl -- this is required because PKG_CHECK_MODULES macro is expanded
+ dnl -- to initialize the pkg-config environment only at the first invokation,
+@@ -811,19 +802,6 @@
fi
################################################################################
@@ -229,9 +229,9 @@
dnl -- Check for getopt
AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
-@@ -778,7 +756,6 @@
- AC_SUBST(FSADM)
- AC_SUBST(GROUP)
+@@ -1041,7 +1019,6 @@
+ AC_SUBST(GULM_CFLAGS)
+ AC_SUBST(GULM_LIBS)
AC_SUBST(HAVE_LIBDL)
-AC_SUBST(HAVE_REALTIME)
AC_SUBST(HAVE_SELINUX)
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -663,11 +663,7 @@
+@@ -917,11 +917,7 @@
fi
################################################################################
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/install.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -1,6 +1,6 @@
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -160,21 +160,21 @@
+@@ -163,21 +163,21 @@
endif
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
@@ -27,7 +27,7 @@
$(sbindir)/lvm
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
-@@ -185,14 +185,13 @@
+@@ -188,14 +188,13 @@
)
install_tools_static: lvm.static
@@ -47,7 +47,7 @@
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
-@@ -107,8 +107,8 @@
+@@ -97,8 +97,8 @@
.PHONY: install_clvmd
install_clvmd: $(TARGETS)
Modified: lvm2/trunk/debian/patches/libdm-abi.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-abi.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/libdm-abi.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -1,6 +1,6 @@
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
-@@ -301,9 +301,9 @@
+@@ -306,9 +306,9 @@
return 1;
}
@@ -11,7 +11,7 @@
security_context_t scontext;
if (is_selinux_enabled() <= 0)
-@@ -324,9 +324,9 @@
+@@ -329,9 +329,9 @@
}
freecon(scontext);
@@ -22,7 +22,7 @@
static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
uid_t uid, gid_t gid, mode_t mode)
-@@ -372,10 +372,8 @@
+@@ -378,10 +378,8 @@
log_debug("Created %s", path);
@@ -35,7 +35,7 @@
}
--- a/lib/activate/fs.c
+++ b/lib/activate/fs.c
-@@ -196,10 +196,8 @@
+@@ -199,10 +199,8 @@
return 0;
}
Modified: lvm2/trunk/debian/patches/libdm-atomic.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-atomic.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/libdm-atomic.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -1,6 +1,6 @@
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
-@@ -331,12 +331,19 @@
+@@ -336,12 +336,19 @@
static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
uid_t uid, gid_t gid, mode_t mode)
{
@@ -21,12 +21,13 @@
if (stat(path, &info) >= 0) {
if (!S_ISBLK(info.st_mode)) {
-@@ -359,23 +366,32 @@
+@@ -364,24 +371,33 @@
"node creation.", path);
old_mask = umask(0);
- if (mknod(path, S_IFBLK | mode, dev) < 0) {
+ if (mknod(tmppath, S_IFBLK | mode, dev) < 0) {
+ umask(old_mask);
log_error("Unable to make device node for '%s'", dev_name);
- return 0;
+ goto error;
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -8,7 +8,7 @@
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
-@@ -522,24 +521,6 @@
+@@ -776,24 +775,6 @@
fi;
################################################################################
@@ -33,7 +33,7 @@
dnl -- Check for dlopen
AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
-@@ -570,34 +551,9 @@
+@@ -824,34 +805,9 @@
################################################################################
dnl -- Check for selinux
if test x$SELINUX = xyes; then
@@ -71,7 +71,7 @@
fi
################################################################################
-@@ -621,7 +577,7 @@
+@@ -875,7 +831,7 @@
dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
if test x$READLINE != xno; then
rl_found=yes
@@ -80,7 +80,7 @@
test x$READLINE:$rl_found = xyes:no &&
AC_MSG_ERROR(
GNU Readline could not be found which is required for the
-@@ -829,6 +785,9 @@
+@@ -1092,6 +1048,9 @@
AC_SUBST(JOBS)
AC_SUBST(LDDEPS)
AC_SUBST(LIBS)
@@ -90,7 +90,7 @@
AC_SUBST(LIB_SUFFIX)
AC_SUBST(LOCALEDIR)
AC_SUBST(LVM1)
-@@ -851,7 +810,6 @@
+@@ -1118,7 +1077,6 @@
AC_SUBST(STATICDIR)
AC_SUBST(STATIC_LINK)
AC_SUBST(UDEV_RULES)
@@ -100,7 +100,7 @@
AC_SUBST(missingkernel)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -99,6 +99,9 @@
+@@ -102,6 +102,9 @@
LVMLIBS += -ldevmapper
@@ -110,7 +110,7 @@
DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
include $(top_srcdir)/make.tmpl
-@@ -111,14 +114,13 @@
+@@ -114,14 +117,13 @@
dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/rules-subdir.patch Fri Sep 18 17:37:44 2009 (r729)
@@ -78,18 +78,18 @@
endif
$(TARGETS): $(OBJECTS)
-@@ -229,12 +190,12 @@
+@@ -229,12 +191,12 @@
%.mo: %.po
$(MSGFMT) -o $@ $<
-clean: $(SUBDIRS.clean)
+clean: subdirs-clean
$(RM) $(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
- $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \
+ $(SOURCES2:%.c=%.d) $(SOURCES:%.c=%.pot) $(SOURCES:%.c=%.gcno) \
$(SOURCES:%.c=%.gcda) $(LDDEPS)
-distclean: $(SUBDIRS.distclean)
-+distclean: subdirs-distclean
++distclean: subdir-distclean
$(RM) -rf $(DISTCLEAN_DIRS)
$(RM) $(DISTCLEAN_TARGETS) \
$(OBJECTS) $(TARGETS) $(CLEAN_TARGETS) $(SOURCES:%.c=%.d) \
@@ -104,7 +104,7 @@
ifeq ("@APPLIB@", "yes")
SUBDIRS += liblvm
-@@ -50,31 +50,6 @@
+@@ -53,31 +53,6 @@
include make.tmpl
Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series Tue Sep 15 11:58:40 2009 (r728)
+++ lvm2/trunk/debian/patches/series Fri Sep 18 17:37:44 2009 (r729)
@@ -11,4 +11,3 @@
dmsetup-export.patch
rules-subdir.patch
implicit-pointer.patch
-upstream-pvcreate-partition.patch
More information about the pkg-lvm-commits
mailing list