r847 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Thu Feb 17 11:49:22 UTC 2011 

Author: waldi
Date: Thu Feb 17 11:49:21 2011
New Revision: 847

Log:
* debian/changelog: Update.
* debian/libdevmapper1.02.1.symbols: Add new symbols.
* debian/patches/config.patch, debian/patches/force-modprobe.patch,
  debian/patches/install.patch, debian/patches/libs-cleanup.patch,
  debian/patches/rules-subdir.patch: Update.
* debian/patches/series: Remove upstream patches.
* debian/patches/upstream-2.02.72.patch,
  debian/patches/upstream-define-union-semun.patch: Remove.

Deleted:
   lvm2/trunk/debian/patches/upstream-2.02.72.patch
   lvm2/trunk/debian/patches/upstream-define-union-semun.patch
Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/libdevmapper1.02.1.symbols
   lvm2/trunk/debian/patches/config.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/rules-subdir.patch
   lvm2/trunk/debian/patches/series

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/changelog	Thu Feb 17 11:49:21 2011	(r847)
@@ -1,3 +1,9 @@
+lvm2 (2.02.84-1) UNRELEASED; urgency=low
+
+  * New upstream version.
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 17 Feb 2011 12:04:40 +0100
+
 lvm2 (2.02.66-5) unstable; urgency=low
 
   * Remove old libdevmapper1.02 init script on upgrade. (closes: #549316)

Modified: lvm2/trunk/debian/libdevmapper1.02.1.symbols
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.symbols	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/libdevmapper1.02.1.symbols	Thu Feb 17 11:49:21 2011	(r847)
@@ -12,6 +12,8 @@
  dm_bounds_check_debug at Base 2:1.02.20
  dm_cookie_supported at Base 2:1.02.36
  dm_create_dir at Base 2:1.02.24
+ dm_create_lockfile at Base 2:1.02.63
+ dm_daemon_is_running at Base 2:1.02.63
  dm_dir at Base 2:1.02.20
  dm_driver_version at Base 2:1.02.20
  dm_dump_memory_debug at Base 2:1.02.20
@@ -74,8 +76,10 @@
  dm_pool_strdup at Base 2:1.02.20
  dm_pool_strndup at Base 2:1.02.20
  dm_pool_zalloc at Base 2:1.02.20
+ dm_prepare_selinux_context at Base 2:1.02.63
  dm_realloc_aux at Base 2:1.02.20
  dm_regex_create at Base 2:1.02.20
+ dm_regex_fingerprint at Base 2:1.02.63
  dm_regex_match at Base 2:1.02.20
  dm_report_field_int32 at Base 2:1.02.27
  dm_report_field_int at Base 2:1.02.27
@@ -109,6 +113,8 @@
  dm_task_no_open_count at Base 2:1.02.20
  dm_task_query_inactive_table at Base 2:1.02.44
  dm_task_run at Base 2:1.02.20
+ dm_task_secure_data at Base 2:1.02.63
+ dm_task_set_add_node at Base 2:1.02.63
  dm_task_set_cookie at Base 2:1.02.36
  dm_task_set_event_nr at Base 2:1.02.20
  dm_task_set_geometry at Base 2:1.02.20
@@ -120,6 +126,7 @@
  dm_task_set_mode at Base 2:1.02.20
  dm_task_set_name at Base 2:1.02.20
  dm_task_set_newname at Base 2:1.02.20
+ dm_task_set_newuuid at Base 2:1.02.63
  dm_task_set_read_ahead at Base 2:1.02.24
  dm_task_set_ro at Base 2:1.02.20
  dm_task_set_sector at Base 2:1.02.20
@@ -146,6 +153,8 @@
  dm_tree_node_add_linear_target at Base 2:1.02.20
  dm_tree_node_add_mirror_target at Base 2:1.02.20
  dm_tree_node_add_mirror_target_log at Base 2:1.02.20
+ dm_tree_node_add_replicator_dev_target at Base 2:1.02.63
+ dm_tree_node_add_replicator_target at Base 2:1.02.63
  dm_tree_node_add_snapshot_merge_target at Base 2:1.02.44
  dm_tree_node_add_snapshot_origin_target at Base 2:1.02.20
  dm_tree_node_add_snapshot_target at Base 2:1.02.20
@@ -157,6 +166,7 @@
  dm_tree_node_get_name at Base 2:1.02.20
  dm_tree_node_get_uuid at Base 2:1.02.20
  dm_tree_node_num_children at Base 2:1.02.20
+ 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_size_changed at Base 2:1.02.36
  dm_tree_preload_children at Base 2:1.02.20
@@ -171,3 +181,5 @@
  dm_udev_set_checking at Base 2:1.02.44
  dm_udev_set_sync_support at Base 2:1.02.36
  dm_udev_wait at Base 2:1.02.36
+ dm_zalloc_aux at Base 2:1.02.63
+ dm_zalloc_aux_debug at Base 2:1.02.63

Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/patches/config.patch	Thu Feb 17 11:49:21 2011	(r847)
@@ -1,6 +1,6 @@
 --- a/doc/example.conf.in
 +++ b/doc/example.conf.in
-@@ -312,7 +312,7 @@
+@@ -345,7 +345,7 @@
      # Full pathnames can be given.
  
      # Search this directory first for shared libraries.

Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/patches/force-modprobe.patch	Thu Feb 17 11:49:21 2011	(r847)
@@ -1,6 +1,6 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -934,11 +934,7 @@
+@@ -1096,11 +1096,7 @@
  fi
  
  ################################################################################
@@ -11,5 +11,5 @@
 -fi
 +AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["/sbin/modprobe"], [The path to 'modprobe', if available.])
  
- ################################################################################
- dnl -- dmeventd pidfile and executable path
+ 
+ lvm_exec_prefix=$exec_prefix

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/patches/install.patch	Thu Feb 17 11:49:21 2011	(r847)
@@ -1,14 +1,14 @@
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
+ CC ?= @CC@
  RANLIB = @RANLIB@
- SHELL = /bin/sh
  INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL@ -m 644
  MKDIR_P = @MKDIR_P@
  MSGFMT = @MSGFMT@
  LCOV = @LCOV@
-@@ -88,22 +89,14 @@
+@@ -92,22 +93,14 @@
  endif
  
  # Handle installation of files
@@ -35,10 +35,10 @@
  
  .SUFFIXES: .c .d .o .so .a .po .pot .mo .dylib
  
-@@ -313,7 +306,7 @@
+@@ -324,7 +317,7 @@
  install_lib_shared: $(LIB_SHARED)
  	$(INSTALL_PROGRAM) -D $< $(libdir)/$(<F).$(LIB_VERSION)
- 	$(INSTALL) -d $(usrlibdir)
+ 	$(INSTALL_DIR) $(usrlibdir)
 -	$(LN_S) -f $(USRLIB_RELPATH)$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
 +	$(LN_S) -f @libdir@/$(<F).$(LIB_VERSION) $(usrlibdir)/$(<F)
  

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Thu Feb 17 11:49:21 2011	(r847)
@@ -8,16 +8,16 @@
  		LIB_SUFFIX=so
  		DEVMAPPER=yes
  		ODIRECT=yes
-@@ -307,7 +306,7 @@
+@@ -362,7 +361,7 @@
  AC_MSG_CHECKING(whether to enable readline)
  AC_ARG_ENABLE([readline],
-   [  --disable-readline      Disable readline support],
--  [READLINE=$enableval], [READLINE=maybe])
-+  [READLINE=$enableval], [READLINE=yes])
+ 	      AC_HELP_STRING([--disable-readline], [disable readline support]),
+-	      READLINE=$enableval, READLINE=maybe)
++	      READLINE=$enableval, READLINE=yes)
  AC_MSG_RESULT($READLINE)
  
  ################################################################################
-@@ -825,20 +824,9 @@
+@@ -982,21 +981,9 @@
  ################################################################################
  dnl -- Check for selinux
  if test x$SELINUX = xyes; then
@@ -27,6 +27,7 @@
 -
 -	AC_CHECK_LIB([selinux], [is_selinux_enabled], [
 -		AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
+-		AC_CHECK_HEADERS([selinux/label.h])
 -		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
 -		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
 -		SELINUX_PC="libselinux"
@@ -41,7 +42,7 @@
  fi
  
  ################################################################################
-@@ -859,49 +847,6 @@
+@@ -1017,49 +1004,6 @@
  AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
  
  ################################################################################
@@ -90,8 +91,8 @@
 -################################################################################
  dnl -- Internationalisation stuff
  AC_MSG_CHECKING(whether to enable internationalisation)
- AC_ARG_ENABLE(nls, [  --enable-nls            Enable Native Language Support],
-@@ -959,7 +904,8 @@
+ AC_ARG_ENABLE(nls,
+@@ -1119,7 +1063,8 @@
  ################################################################################
  dnl -- Ensure additional headers required
  if test x$READLINE = xyes; then
@@ -101,7 +102,7 @@
  fi
  
  if test x$CLVMD != xnone; then
-@@ -1163,6 +1109,7 @@
+@@ -1359,6 +1304,7 @@
  AC_SUBST(SALCK_CFLAGS)
  AC_SUBST(SALCK_LIBS)
  AC_SUBST(SELINUX_LIBS)
@@ -109,43 +110,3 @@
  AC_SUBST(SELINUX_PC)
  AC_SUBST(SNAPSHOTS)
  AC_SUBST(STATICDIR)
---- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -104,8 +104,6 @@
- 	LVMLIBS += -ldevmapper-event
- endif
- 
--LVMLIBS += -ldevmapper
--
- DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
- 
- CFLOW_LIST = lvmcmdlib.c lvm2cmd.c
-@@ -114,17 +112,17 @@
- 
- include $(top_builddir)/make.tmpl
- 
--LIBS += $(UDEV_LIBS)
-+LIBS += -ldevmapper $(UDEV_LIBS)
- 
- device-mapper: $(TARGETS_DM)
- 
- dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
--	      -o $@ dmsetup.o -ldevmapper $(LIBS)
-+	      -o $@ dmsetup.o $(LIBS)
- 
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
--	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
-+	      -o $@ dmsetup.o $(STATIC_LIBS) $(LIBS)
- 
- all: device-mapper
- 
-@@ -144,6 +142,7 @@
- 	cat $(top_builddir)/lib/liblvm-internal.a > $@
- 	$(AR) rs $@ $(OBJECTS) lvmcmdlib.o lvm2cmd-static.o
- 
-+liblvm2cmd.$(LIB_SUFFIX): LIBS += $(DL_LIBS)
- liblvm2cmd.$(LIB_SUFFIX): liblvm2cmd.a $(LDDEPS)
- 	$(CC) -shared -Wl,-soname,$@.$(LIB_VERSION) \
- 	$(CFLAGS) $(CLDFLAGS) -o $@ $(LVMLIBS) $(LIBS) \

Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/patches/rules-subdir.patch	Thu Feb 17 11:49:21 2011	(r847)
@@ -1,9 +1,9 @@
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
-@@ -166,62 +166,23 @@
- .PHONY: all pofile distclean clean cleandir cflow device-mapper
+@@ -172,67 +172,23 @@
  .PHONY: install install_cluster install_device-mapper install_lvm2
  .PHONY: install_lib_shared install_dm_plugin install_lvm2_plugin
+ .PHONY: install_ocf
 -.PHONY: $(SUBDIRS) $(SUBDIRS.install) $(SUBDIRS.clean) $(SUBDIRS.distclean)
 -.PHONY: $(SUBDIRS.pofile) $(SUBDIRS.install_cluster) $(SUBDIRS.cflow)
 -.PHONY: $(SUBDIRS.device-mapper) $(SUBDIRS.install-device-mapper)
@@ -13,6 +13,7 @@
 -SUBDIRS.install_cluster := $(SUBDIRS:=.install_cluster)
 -SUBDIRS.install_device-mapper := $(SUBDIRS:=.install_device-mapper)
 -SUBDIRS.install_lvm2 := $(SUBDIRS:=.install_lvm2)
+-SUBDIRS.install_ocf := $(SUBDIRS:=.install_ocf)
 -SUBDIRS.pofile := $(SUBDIRS:=.pofile)
 -SUBDIRS.cflow := $(SUBDIRS:=.cflow)
 -SUBDIRS.clean := $(SUBDIRS:=.clean)
@@ -27,6 +28,7 @@
 -install_cluster: all $(SUBDIRS.install_cluster)
 -install_device-mapper: $(SUBDIRS.install_device-mapper)
 -install_lvm2: $(SUBDIRS.install_lvm2)
+-install_ocf: $(SUBDIRS.install_ocf)
 -cflow: $(SUBDIRS.cflow)
 -
 -$(SUBDIRS): $(SUBDIRS.device-mapper)
@@ -47,6 +49,9 @@
 -$(SUBDIRS.install_lvm2): $(SUBDIRS)
 -	$(MAKE) -C $(@:.install_lvm2=) install_lvm2
 -
+-$(SUBDIRS.install_ocf):
+-	$(MAKE) -C $(@:.install_ocf=) install_ocf
+-
 -$(SUBDIRS.clean):
 -	-$(MAKE) -C $(@:.clean=) clean
 -
@@ -74,7 +79,7 @@
  endif
  
  ifneq ("$(CFLOW_LIST_TARGET)", "")
-@@ -342,9 +303,9 @@
+@@ -353,9 +309,9 @@
  	  $(POTFILES) $(SOURCES:%.c=%.d) $(SOURCES:%.c=%.gcno) $(SOURCES:%.c=%.gcda) \
  	  $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
  
@@ -97,7 +102,7 @@
  
  ifeq ("@APPLIB@", "yes")
    SUBDIRS += liblvm
-@@ -42,32 +42,6 @@
+@@ -42,34 +42,6 @@
  
  include make.tmpl
  
@@ -108,7 +113,9 @@
 -tools: lib device-mapper
 -po: tools daemons
 -
+-lib.device-mapper: include.device-mapper
 -libdm.device-mapper: include.device-mapper
+-liblvm.device-mapper: include.device-mapper
 -daemons.device-mapper: libdm.device-mapper
 -tools.device-mapper: libdm.device-mapper
 -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
@@ -132,7 +139,7 @@
  	@CSCOPE_CMD@ -b -R -s$(top_srcdir)
 --- a/man/Makefile.in
 +++ b/man/Makefile.in
-@@ -58,9 +58,7 @@
+@@ -64,9 +64,7 @@
  
  .PHONY: man install_man5 install_man8
  

Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series	Sun Jan 23 17:31:30 2011	(r846)
+++ lvm2/trunk/debian/patches/series	Thu Feb 17 11:49:21 2011	(r847)
@@ -1,9 +1,7 @@
-upstream-define-union-semun.patch
-upstream-2.02.72.patch
 install.patch
 libs-cleanup.patch
 config.patch
 force-modprobe.patch
-libdm-atomic.patch
+#libdm-atomic.patch
 rules-subdir.patch
 implicit-pointer.patch

More information about the pkg-lvm-commits mailing list