r654 - in lvm2/trunk/debian: . patches

Bastian Blank waldi at alioth.debian.org
Mon Feb 23 01:15:35 UTC 2009 

Author: waldi
Date: Mon Feb 23 01:15:34 2009
New Revision: 654

Log:
* debian/control:
  Add libselinux1-dev to the build depends, remove libdevmapper-dev.
* debian/rules: Set libdevmapper ABI.
* debian/patches: Merge patches vom devmapper.


Added:
   lvm2/trunk/debian/patches/dmsetup-export.patch   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/patches/dmsetup-export.patch
   lvm2/trunk/debian/patches/libdm-abi.patch   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/patches/abi.patch
   lvm2/trunk/debian/patches/libdm-atomic.patch   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/patches/atomic.patch
   lvm2/trunk/debian/patches/libdm-type-kernel_dev_t.patch   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/patches/type-kernel_dev_t.patch
   lvm2/trunk/debian/patches/pkgconfig.patch   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/patches/pkgconfig.patch
Modified:
   lvm2/trunk/debian/control
   lvm2/trunk/debian/patches/config.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/libs-cleanup.patch
   lvm2/trunk/debian/patches/series
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	(original)
+++ lvm2/trunk/debian/control	Mon Feb 23 01:15:34 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>> 4.2), automake, libcman-dev (>> 2), libdevmapper-dev (>> 2:1.02.27), libdlm-dev (>> 2), libreadline5-dev, quilt
+Build-Depends: debhelper (>> 4.2), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline5-dev, libselinux1-dev, quilt
 Standards-Version: 3.7.3
 
 Package: lvm2

Modified: lvm2/trunk/debian/patches/config.patch
==============================================================================
--- lvm2/trunk/debian/patches/config.patch	(original)
+++ lvm2/trunk/debian/patches/config.patch	Mon Feb 23 01:15:34 2009
@@ -1,6 +1,6 @@
 --- a/doc/example.conf
 +++ b/doc/example.conf
-@@ -259,7 +259,7 @@
+@@ -264,7 +264,7 @@
      # Full pathnames can be given.
  
      # Search this directory first for shared libraries.

Copied: lvm2/trunk/debian/patches/dmsetup-export.patch (from r653, /devmapper/trunk/debian/patches/dmsetup-export.patch)
==============================================================================
--- /devmapper/trunk/debian/patches/dmsetup-export.patch	(original)
+++ lvm2/trunk/debian/patches/dmsetup-export.patch	Mon Feb 23 01:15:34 2009
@@ -1,6 +1,6 @@
---- a/dmsetup/dmsetup.c
-+++ b/dmsetup/dmsetup.c
-@@ -1076,6 +1076,82 @@
+--- a/tools/dmsetup.c
++++ b/tools/dmsetup.c
+@@ -1075,6 +1075,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)))
  {
-@@ -2122,6 +2198,7 @@
+@@ -2121,6 +2197,7 @@
  	{"targets", "", 0, 0, _targets},
  	{"version", "", 0, 0, _version},
  	{"setgeometry", "<device> <cyl> <head> <sect> <start>", 5, 5, _setgeometry},

Modified: lvm2/trunk/debian/patches/drop-realtime.patch
==============================================================================
--- lvm2/trunk/debian/patches/drop-realtime.patch	(original)
+++ lvm2/trunk/debian/patches/drop-realtime.patch	Mon Feb 23 01:15:34 2009
@@ -1,7 +1,7 @@
 --- a/lib/Makefile.in
 +++ b/lib/Makefile.in
 @@ -80,7 +80,6 @@
- 	misc/lvm-file.c \
+ 	misc/lvm-globals.c \
  	misc/lvm-string.c \
  	misc/lvm-wrappers.c \
 -	misc/timestamp.c \
@@ -179,23 +179,23 @@
 -
 --- a/configure.in
 +++ b/configure.in
-@@ -38,7 +38,6 @@
- 		DEVMAPPER=yes
+@@ -39,7 +39,6 @@
  		ODIRECT=yes
  		DM_IOCTLS=yes
+ 		SELINUX=yes
 -		REALTIME=yes
  		CLUSTER=internal
- 		FSADM=no
+ 		FSADM=yes
  		;;
-@@ -52,7 +51,6 @@
- 		DEVMAPPER=yes
+@@ -54,7 +53,6 @@
  		ODIRECT=no
  		DM_IOCTLS=no
+ 		SELINUX=no
 -		REALTIME=no
  		CLUSTER=none
  		FSADM=no
  		;;
-@@ -275,13 +273,6 @@
+@@ -314,13 +312,6 @@
  AC_MSG_RESULT($READLINE)
  
  ################################################################################
@@ -209,8 +209,8 @@
  dnl -- Build cluster LVM daemon
  AC_MSG_CHECKING(whether to build cluster LVM daemon)
  AC_ARG_WITH(clvmd,
-@@ -429,19 +420,6 @@
- AC_MSG_RESULT($STATIC_LINK)
+@@ -547,19 +538,6 @@
+ fi
  
  ################################################################################
 -dnl -- Check for realtime clock support
@@ -229,11 +229,11 @@
  dnl -- Check for getopt
  AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
  
-@@ -574,7 +552,6 @@
+@@ -737,7 +715,6 @@
  AC_SUBST(FSADM)
  AC_SUBST(GROUP)
  AC_SUBST(HAVE_LIBDL)
 -AC_SUBST(HAVE_REALTIME)
+ AC_SUBST(HAVE_SELINUX)
  AC_SUBST(INTL)
  AC_SUBST(INTL_PACKAGE)
- AC_SUBST(JOBS)

Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch	(original)
+++ lvm2/trunk/debian/patches/force-modprobe.patch	Mon Feb 23 01:15:34 2009
@@ -1,7 +1,7 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -517,11 +517,7 @@
- AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
+@@ -638,11 +638,7 @@
+ fi
  
  ################################################################################
 -AC_PATH_PROG(MODPROBE_CMD, modprobe)
@@ -12,4 +12,4 @@
 +AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["/sbin/modprobe"], [The path to 'modprobe', if available.])
  
  ################################################################################
- LVM_VERSION="\"`cat VERSION 2>/dev/null || echo Unknown`\""
+ dnl -- dmeventd pidfile and executable path

Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch	(original)
+++ lvm2/trunk/debian/patches/install.patch	Mon Feb 23 01:15:34 2009
@@ -1,34 +1,33 @@
 --- a/tools/Makefile.in
 +++ b/tools/Makefile.in
-@@ -141,22 +141,16 @@
+@@ -156,21 +156,21 @@
  endif
  
- install_cmdlib_dynamic: liblvm2cmd.so
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.so \
--		$(libdir)/liblvm2cmd.so.$(LIB_VERSION)
-+	$(INSTALL) -D liblvm2cmd.so $(libdir)/liblvm2cmd.so.$(LIB_VERSION)
- 	$(LN_S) -f liblvm2cmd.so.$(LIB_VERSION) $(libdir)/liblvm2cmd.so
+ install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd.$(LIB_SUFFIX) \
++	$(INSTALL) -D liblvm2cmd.$(LIB_SUFFIX) \
+ 		$(libdir)/liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION_LVM)
+ 	$(LN_S) -f liblvm2cmd.$(LIB_SUFFIX).$(LIB_VERSION_LVM) $(libdir)/liblvm2cmd.$(LIB_SUFFIX)
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
--		$(includedir)/lvm2cmd.h
-+	$(INSTALL) -D -m 644 lvm2cmd.h $(includedir)/lvm2cmd.h
++	$(INSTALL_DATA) -D lvm2cmd.h \
+ 		$(includedir)/lvm2cmd.h
  
  install_cmdlib_static: liblvm2cmd-static.a
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) liblvm2cmd-static.a \
--		$(libdir)/liblvm2cmd.a.$(LIB_VERSION)
--	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION) $(libdir)/liblvm2cmd.a
++	$(INSTALL) liblvm2cmd-static.a \
+ 		$(libdir)/liblvm2cmd.a.$(LIB_VERSION_LVM)
+ 	$(LN_S) -f liblvm2cmd.a.$(LIB_VERSION_LVM) $(libdir)/liblvm2cmd.a
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 lvm2cmd.h \
--		$(includedir)/lvm2cmd.h
-+	$(INSTALL) -D -m 644 liblvm2cmd-static.a $(libdir)/liblvm2cmd.a
-+	$(INSTALL) -D -m 644 lvm2cmd.h $(includedir)/lvm2cmd.h
++	$(INSTALL_DATA) -D lvm2cmd.h \
+ 		$(includedir)/lvm2cmd.h
  
  install_tools_dynamic: lvm .commands
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm \
--		$(sbindir)/lvm
-+	$(INSTALL) -D lvm $(sbindir)/lvm
++	$(INSTALL) -D lvm \
+ 		$(sbindir)/lvm
  	@echo Creating symbolic links for individual commands in $(sbindir)
  	@( \
- 		for v in `cat .commands`; do \
-@@ -166,7 +160,6 @@
+@@ -181,14 +181,13 @@
  	)
  
  install_tools_static: lvm.static
@@ -36,32 +35,32 @@
 -		$(staticdir)/lvm.static
 +	$(INSTALL) -D lvm.static $(staticdir)/lvm.static
  
- install: $(INSTALL_TARGETS)
+ install_dmsetup_dynamic: dmsetup
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 
+ install_dmsetup_static: dmsetup.static
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 
+ install_device-mapper: $(INSTALL_DMSETUP_TARGETS)
+ 
 --- a/daemons/clvmd/Makefile.in
 +++ b/daemons/clvmd/Makefile.in
-@@ -89,8 +89,7 @@
+@@ -104,8 +104,8 @@
  .PHONY: install_clvmd
  
  install_clvmd: $(TARGETS)
 -	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) clvmd \
--		$(sbindir)/clvmd
-+	$(INSTALL) -D clvmd $(sbindir)/clvmd
+-		$(usrsbindir)/clvmd
++	$(INSTALL) -D clvmd \
++		$(sbindir)/clvmd
  
  install: $(INSTALL_TARGETS)
  
---- a/dmeventd/mirror/Makefile.in
-+++ b/dmeventd/mirror/Makefile.in
-@@ -30,6 +30,5 @@
- include $(top_srcdir)/make.tmpl
- 
- install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
--	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
--		$(libdir)/$<.$(LIB_VERSION)
-+	$(INSTALL) -D $< $(libdir)/$<.$(LIB_VERSION)
- 	$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
 --- a/lib/format1/Makefile.in
 +++ b/lib/format1/Makefile.in
-@@ -30,7 +30,6 @@
+@@ -31,7 +31,6 @@
  include $(top_srcdir)/make.tmpl
  
  install: liblvm2format1.so
@@ -72,7 +71,7 @@
  
 --- a/lib/format_pool/Makefile.in
 +++ b/lib/format_pool/Makefile.in
-@@ -27,8 +27,7 @@
+@@ -28,8 +28,7 @@
  include $(top_srcdir)/make.tmpl
  
  install: liblvm2formatpool.so
@@ -84,7 +83,7 @@
  
 --- a/lib/locking/Makefile.in
 +++ b/lib/locking/Makefile.in
-@@ -23,8 +23,7 @@
+@@ -24,8 +24,7 @@
  include $(top_srcdir)/make.tmpl
  
  install install_cluster: liblvm2clusterlock.so
@@ -96,7 +95,7 @@
  
 --- a/lib/mirror/Makefile.in
 +++ b/lib/mirror/Makefile.in
-@@ -23,7 +23,6 @@
+@@ -24,7 +24,6 @@
  include $(top_srcdir)/make.tmpl
  
  install: liblvm2mirror.so
@@ -107,7 +106,7 @@
  
 --- a/lib/snapshot/Makefile.in
 +++ b/lib/snapshot/Makefile.in
-@@ -23,8 +23,7 @@
+@@ -24,8 +24,7 @@
  include $(top_srcdir)/make.tmpl
  
  install: liblvm2snapshot.so
@@ -119,12 +118,12 @@
  
 --- a/man/Makefile.in
 +++ b/man/Makefile.in
-@@ -46,14 +46,14 @@
+@@ -62,14 +62,14 @@
  	@for f in $(MAN8); \
  	do \
  	   $(RM) $(MAN8DIR)/$$f; \
 -	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-+	   @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $$f $(MAN8DIR)/$$f; \
++	   $(INSTALL_DATA) -D $$f $(MAN8DIR)/$$f; \
  	done
  
  	@echo "Installing $(MAN5) in $(MAN5DIR)"
@@ -132,14 +131,176 @@
  	do \
  	   $(RM) $(MAN5DIR)/$$f; \
 -	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN5DIR)/$$f; \
-+	   @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $$f $(MAN5DIR)/$$f; \
++	   $(INSTALL_DATA) -D $$f $(MAN5DIR)/$$f; \
  	done
  
  install_cluster:
-@@ -61,5 +61,5 @@
+@@ -77,7 +77,7 @@
  	@for f in $(MAN8CLUSTER); \
  	do \
  	   $(RM) $(MAN8DIR)/$$f; \
 -	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
-+	   @INSTALL@ -D $(OWNER) $(GROUP) -m 644 $$f $(MAN8DIR)/$$f; \
++	   $(INSTALL_DATA) -D $$f $(MAN8DIR)/$$f; \
+ 	done
+ 
+ install_device-mapper:
+@@ -85,5 +85,5 @@
+ 	@for f in $(MAN8DM); \
+ 	do \
+ 	   $(RM) $(MAN8DIR)/$$f; \
+-	   @INSTALL@ -D $(OWNER) $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \
++	   $(INSTALL_DATA) -D $$f $(MAN8DIR)/$$f; \
  	done
+--- a/libdm/Makefile.in
++++ b/libdm/Makefile.in
+@@ -55,11 +55,7 @@
+ 	install_ioctl install_ioctl_static \
+ 	install_pkgconfig
+ 
+-INSTALL_TYPE = install_dynamic
+-
+-ifeq ("@STATIC_LINK@", "yes")
+-  INSTALL_TYPE += install_static
+-endif
++INSTALL_TYPE = install_dynamic install_static
+ 
+ ifeq ("@PKGCONFIG@", "yes")
+   INSTALL_TYPE += install_pkgconfig
+@@ -70,7 +66,7 @@
+ install_device-mapper: install
+ 
+ install_include:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \
++	$(INSTALL_DATA) -D libdevmapper.h \
+ 		$(includedir)/libdevmapper.h
+ 
+ install_dynamic: install_ at interface@
+@@ -81,15 +77,15 @@
+ 	$(LN_S) -f libdevmapper.a.$(LIB_VERSION_DM) $(libdir)/libdevmapper.a
+ 
+ install_ioctl: ioctl/libdevmapper.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D $< \
+ 		$(libdir)/libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
+ 
+ install_pkgconfig:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.pc \
++	$(INSTALL_DATA) -D libdevmapper.pc \
+ 		$(usrlibdir)/pkgconfig/devmapper.pc
+ 
+ install_ioctl_static: ioctl/libdevmapper.a
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D $< \
+ 		$(libdir)/libdevmapper.a.$(LIB_VERSION_DM)
+ 
+ $(VERSIONED_SHLIB): %.$(LIB_SUFFIX).$(LIB_VERSION_DM): $(interface)/%.$(LIB_SUFFIX)
+--- a/daemons/dmeventd/Makefile.in
++++ b/daemons/dmeventd/Makefile.in
+@@ -64,25 +64,21 @@
+ install_device-mapper: install
+ 
+ install_include:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \
+-		$(includedir)/libdevmapper-event.h
++	$(INSTALL) -D -m 644 libdevmapper-event.h $(includedir)/libdevmapper-event.h
+ 
+ install_dynamic: libdevmapper-event.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
++	$(INSTALL) -D $< $(libdir)/libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION)
+ 	$(LN_S) -f libdevmapper-event.$(LIB_SUFFIX).$(LIB_VERSION) \
+ 		$(libdir)/libdevmapper-event.$(LIB_SUFFIX)
+ 
+ install_dmeventd: dmeventd
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< $(sbindir)/$<
++	$(INSTALL) -D $< $(sbindir)/$<
+ 
+ install_pkgconfig:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.pc \
+-		$(usrlibdir)/pkgconfig/devmapper-event.pc
++	$(INSTALL) -D -m 644 libdevmapper-event.pc $(usrlibdir)/pkgconfig/devmapper-event.pc
+ 
+ install_static: libdevmapper-event.a
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+-		$(libdir)/libdevmapper-event.a.$(LIB_VERSION)
++	$(INSTALL) -D $< $(libdir)/libdevmapper-event.a.$(LIB_VERSION)
+ 	$(LN_S) -f libdevmapper-event.a.$(LIB_VERSION) $(libdir)/libdevmapper-event.a
+ 
+ $(VERSIONED_SHLIB): $(LIB_SHARED)
+--- a/daemons/dmeventd/plugins/mirror/Makefile.in
++++ b/daemons/dmeventd/plugins/mirror/Makefile.in
+@@ -32,6 +32,6 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D $< \
+ 		$(libdir)/$<.$(LIB_VERSION)
+ 	$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
++++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
+@@ -32,6 +32,6 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
++	$(INSTALL) -D $< \
+ 		$(libdir)/$<.$(LIB_VERSION)
+ 	$(LN_S) -f $<.$(LIB_VERSION) $(libdir)/$<
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -23,7 +23,7 @@
+ install:
+ 	@if [ ! -e $(confdir)/$(CONFDEST) ]; then \
+ 		echo "Installing $(CONFSRC) as $(confdir)/$(CONFDEST)"; \
+-		@INSTALL@ -D $(OWNER) $(GROUP) -m 644 $(CONFSRC) \
++		$(INSTALL_DATA) -D $(CONFSRC) \
+ 			$(confdir)/$(CONFDEST); \
+ 	fi
+ 
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -21,6 +21,7 @@
+ RANLIB = @RANLIB@
+ SHELL = /bin/sh
+ INSTALL = @INSTALL@
++INSTALL_DATA = $(INSTALL) -m 644
+ MKDIR_P = @MKDIR_P@
+ MSGFMT = @MSGFMT@
+ LCOV = @LCOV@
+@@ -54,11 +55,6 @@
+ interface = @interface@
+ interfacedir = $(top_srcdir)/libdm/$(interface)
+ 
+-# setup misc variables
+-# define the ownership variables for the binaries and man pages
+-OWNER = @OWNER@
+-GROUP = @GROUP@
+-
+ # The number of jobs to run, if blank, defaults to the make standard
+ ifndef MAKEFLAGS
+ MAKEFLAGS = @JOBS@
+@@ -105,9 +101,6 @@
+ #CFLAGS += -pg
+ #LDFLAGS += -pg
+ 
+-STRIP=
+-#STRIP = -s
+-
+ LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
+ 
+ LIB_VERSION_LVM := $(shell cat $(top_srcdir)/VERSION | \
+--- a/scripts/Makefile.in
++++ b/scripts/Makefile.in
+@@ -18,9 +18,9 @@
+ include $(top_srcdir)/make.tmpl
+ 
+ install:
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) lvm_dump.sh \
++	$(INSTALL) -D lvm_dump.sh \
+ 		$(sbindir)/lvmdump
+ ifeq ("@FSADM@", "yes")
+-	$(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) fsadm.sh \
++	$(INSTALL) -D fsadm.sh \
+ 		$(sbindir)/fsadm
+ endif

Copied: lvm2/trunk/debian/patches/libdm-abi.patch (from r653, /devmapper/trunk/debian/patches/abi.patch)
==============================================================================
--- /devmapper/trunk/debian/patches/abi.patch	(original)
+++ lvm2/trunk/debian/patches/libdm-abi.patch	Mon Feb 23 01:15:34 2009
@@ -1,6 +1,6 @@
---- trunk.orig/lib/libdm-common.c
-+++ trunk/lib/libdm-common.c
-@@ -233,9 +233,9 @@
+--- a/libdm/libdm-common.c
++++ b/libdm/libdm-common.c
+@@ -240,9 +240,9 @@
  	return 1;
  }
  
@@ -11,7 +11,7 @@
  	security_context_t scontext;
  
  	if (is_selinux_enabled() <= 0)
-@@ -256,9 +256,9 @@
+@@ -263,9 +263,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)
-@@ -302,10 +302,8 @@
+@@ -309,10 +309,8 @@
  
  	log_debug("Created %s", path);
  

Copied: lvm2/trunk/debian/patches/libdm-atomic.patch (from r653, /devmapper/trunk/debian/patches/atomic.patch)
==============================================================================
--- /devmapper/trunk/debian/patches/atomic.patch	(original)
+++ lvm2/trunk/debian/patches/libdm-atomic.patch	Mon Feb 23 01:15:34 2009
@@ -1,6 +1,6 @@
---- a/lib/libdm-common.c
-+++ b/lib/libdm-common.c
-@@ -263,12 +263,19 @@
+--- a/libdm/libdm-common.c
++++ b/libdm/libdm-common.c
+@@ -270,12 +270,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,7 +21,7 @@
  
  	if (stat(path, &info) >= 0) {
  		if (!S_ISBLK(info.st_mode)) {
-@@ -280,32 +287,35 @@
+@@ -287,32 +294,35 @@
  		/* If right inode already exists we don't touch uid etc. */
  		if (info.st_rdev == dev)
  			return 1;
@@ -50,19 +50,18 @@
  	}
  
 -	log_debug("Created %s", path);
--
--	if (!dm_set_selinux_context(path, S_IFBLK))
--		return 0;
 +	if (!dm_set_selinux_context(tmppath, S_IFBLK))
 +		goto error;
  
+-	if (!dm_set_selinux_context(path, S_IFBLK))
+-		return 0;
 +	if (rename(tmppath, path) < 0) {
 +		log_error("Unable to replace device node for '%s'", dev_name);
 +		goto error;
 +	}
 +
 +	log_debug("Created %s", path);
-+
+ 
  	return 1;
 +
 +error:

Copied: lvm2/trunk/debian/patches/libdm-type-kernel_dev_t.patch (from r653, /devmapper/trunk/debian/patches/type-kernel_dev_t.patch)
==============================================================================
--- /devmapper/trunk/debian/patches/type-kernel_dev_t.patch	(original)
+++ lvm2/trunk/debian/patches/libdm-type-kernel_dev_t.patch	Mon Feb 23 01:15:34 2009
@@ -1,9 +1,9 @@
---- devmapper-1.02.20.orig/lib/ioctl/libdm-compat.h
-+++ devmapper-1.02.20/lib/ioctl/libdm-compat.h
+--- a/libdm/ioctl/libdm-compat.h
++++ b/libdm/ioctl/libdm-compat.h
 @@ -19,6 +19,7 @@
  #include "kdev_t.h"
+ #include "dm-ioctl.h"
  #include <inttypes.h>
- #include <linux/dm-ioctl.h>
 +#include <linux/types.h>
  #include <sys/ioctl.h>
  
@@ -26,11 +26,11 @@
  };
  
  enum {
---- devmapper-1.02.20.orig/include/kdev_t.h
-+++ devmapper-1.02.20/include/kdev_t.h
+--- a/libdm/misc/kdev_t.h
++++ b/libdm/misc/kdev_t.h
 @@ -15,8 +15,12 @@
- #ifndef _DM_KDEV_H
- #define _DM_KDEV_H
+ #ifndef _LIBDM_KDEV_H
+ #define _LIBDM_KDEV_H
  
 +#include <linux/types.h>
 +

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	(original)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Mon Feb 23 01:15:34 2009
@@ -1,74 +1,23 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -38,7 +38,6 @@
- 		DEVMAPPER=yes
- 		ODIRECT=yes
- 		DM_IOCTLS=yes
--		SELINUX=yes
- 		REALTIME=yes
- 		CLUSTER=internal
- 		FSADM=no
-@@ -53,7 +52,6 @@
- 		DEVMAPPER=yes
- 		ODIRECT=no
- 		DM_IOCTLS=no
--		SELINUX=no
- 		REALTIME=no
- 		CLUSTER=none
- 		FSADM=no
-@@ -401,23 +399,6 @@
- fi;
- 
- ################################################################################
--dnl -- Check for termcap (Shamelessly copied from parted 1.4.17)
--if test x$READLINE = xyes; then
--	AC_SEARCH_LIBS(tgetent, ncurses curses termcap termlib, ,
--		AC_MSG_ERROR(
--termcap could not be found which is required for the
----enable-readline option (which is enabled by default).  Either disable readline
--support with --disable-readline or download and install termcap from:
--	ftp.gnu.org/gnu/termcap
--Note: if you are using precompiled packages you will also need the development
--  package as well (which may be called termcap-devel or something similar).
--Note: (n)curses also seems to work as a substitute for termcap.  This was
--  not found either - but you could try installing that as well.
--)
--	)
--fi
--
--################################################################################
- dnl -- Check for dlopen
- AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
+@@ -532,29 +532,18 @@
+ 	if test x$HAVE_SEPOL = xyes; then
+ 		AC_DEFINE([HAVE_SEPOL], 1,
+ 		  [Define to 1 if sepol_check_context is available.])
+-		LIBS="-lsepol $LIBS"
++		LIBS_SEPOL="-lsepol"
+ 	fi
  
-@@ -448,46 +429,6 @@
- AC_MSG_RESULT($STATIC_LINK)
+ 	AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
  
- ################################################################################
--dnl -- Disable selinux
--AC_MSG_CHECKING(whether to enable selinux support)
--AC_ARG_ENABLE(selinux, [  --disable-selinux       Disable selinux support],
--  SELINUX=$enableval)
--AC_MSG_RESULT($SELINUX)
--
--################################################################################
--dnl -- Check for selinux
--if test x$SELINUX = xyes; then
--	AC_CHECK_LIB(sepol, sepol_check_context, HAVE_SEPOL=yes, HAVE_SEPOL=no)
--
--	if test x$HAVE_SEPOL = xyes; then
--		AC_DEFINE([HAVE_SEPOL], 1,
--		  [Define to 1 if sepol_check_context is available.])
--		LIBS="-lsepol $LIBS"
--	fi
--
--	AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
--
--	if test x$HAVE_SELINUX = xyes; then
--		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
+ 	if test x$HAVE_SELINUX = xyes; then
+ 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
 -		LIBS="-lselinux $LIBS"
--	else
--		AC_MSG_WARN(Disabling selinux)
--	fi
++		LIBS_SELINUX="-lselinux"
++		LIBS_SELINUX_STATIC="$LIBS_SELINUX $LIBS_SEPOL -lpthread"
+ 	else
+ 		AC_MSG_WARN(Disabling selinux)
+ 	fi
 -
 -	# With --enable-static_link and selinux enabled, linking
 -	# fails on at least Debian unstable due to unsatisfied references
@@ -81,44 +30,26 @@
 -				LIB_PTHREAD=-lpthread])
 -		LIBS=$lvm_saved_libs
 -	fi
--fi
--
--################################################################################
- dnl -- Check for realtime clock support
- if test x$REALTIME = xyes; then
- 	AC_CHECK_LIB(rt, clock_gettime, HAVE_REALTIME=yes, HAVE_REALTIME=no)
-@@ -597,10 +538,6 @@
- 
- AC_CHECK_HEADERS(libdevmapper.h,,AC_MSG_ERROR(bailing out))
- 
--if test x$HAVE_SELINUX = xyes; then
--	AC_CHECK_HEADERS(selinux/selinux.h,,AC_MSG_ERROR(bailing out))
--fi
--
- ################################################################################
- AC_PATH_PROG(MODPROBE_CMD, modprobe)
+ fi
  
-@@ -638,12 +575,10 @@
- AC_SUBST(GROUP)
- AC_SUBST(HAVE_LIBDL)
- AC_SUBST(HAVE_REALTIME)
--AC_SUBST(HAVE_SELINUX)
- AC_SUBST(INTL)
- AC_SUBST(INTL_PACKAGE)
+ ################################################################################
+@@ -755,6 +744,8 @@
  AC_SUBST(JOBS)
  AC_SUBST(LDDEPS)
--AC_SUBST(LIBS)
+ AC_SUBST(LIBS)
++AC_SUBST(LIBS_SELINUX)
++AC_SUBST(LIBS_SELINUX_STATIC)
  AC_SUBST(LIB_SUFFIX)
  AC_SUBST(LOCALEDIR)
  AC_SUBST(LVM1)
-@@ -659,7 +594,6 @@
+@@ -769,7 +760,6 @@
  AC_SUBST(SNAPSHOTS)
  AC_SUBST(STATICDIR)
  AC_SUBST(STATIC_LINK)
 -AC_SUBST([LIB_PTHREAD])
- 
- ################################################################################
- dnl -- First and last lines should not contain files to generate in order to
+ AC_SUBST(interface)
+ AC_SUBST(kerneldir)
+ AC_SUBST(missingkernel)
 --- a/lib/activate/fs.c
 +++ b/lib/activate/fs.c
 @@ -174,10 +174,8 @@
@@ -132,3 +63,72 @@
  
  	return 1;
  }
+--- a/tools/Makefile.in
++++ b/tools/Makefile.in
+@@ -95,6 +95,8 @@
+ 
+ LVMLIBS += -ldevmapper
+ 
++LDFLAGS_DMSETUP_STATIC = @LIBS_SELINUX_STATIC@
++
+ DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
+ 
+ include $(top_srcdir)/make.tmpl
+@@ -107,8 +109,7 @@
+ 
+ dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
+ 	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
+-	      -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) \
+-	      $(LIB_PTHREAD)
++	      -L$(interfacedir) -L$(DESTDIR)/lib -ldevmapper $(LIBS) $(LDFLAGS_DMSETUP_STATIC)
+ 
+ all: device-mapper
+ 
+--- a/daemons/dmeventd/Makefile.in
++++ b/daemons/dmeventd/Makefile.in
+@@ -44,7 +44,7 @@
+ 
+ dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
+ 	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \
+-	-L. -ldevmapper-event $(LIBS) -rdynamic
++	-L. -ldevmapper-event
+ 
+ .PHONY: install_dynamic install_static install_include \
+ 	install_pkgconfig install_dmeventd
+--- a/libdm/Makefile.in
++++ b/libdm/Makefile.in
+@@ -44,6 +44,8 @@
+ VERSIONED_SHLIB = libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
+ LIB_VERSION = $(LIB_VERSION_DM)
+ 
++LDFLAGS += @LIBS_SELINUX@
++
+ DEFS += -DDM_DEVICE_UID=@DM_DEVICE_UID@ -DDM_DEVICE_GID=@DM_DEVICE_GID@ \
+ 	-DDM_DEVICE_MODE=@DM_DEVICE_MODE@
+ 
+--- a/make.tmpl.in
++++ b/make.tmpl.in
+@@ -99,7 +99,6 @@
+ #DEFS += -DBOUNDS_CHECK
+ 
+ #CFLAGS += -pg
+-#LDFLAGS += -pg
+ 
+ LVM_VERSION := $(shell cat $(top_srcdir)/VERSION)
+ 
+@@ -195,13 +194,13 @@
+ ifeq ("@LIB_SUFFIX@","so")
+ $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
+ 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
+-	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++	$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
+ endif
+ 
+ ifeq ("@LIB_SUFFIX@","dylib")
+ $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
+ 	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
+-	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
++	$(CFLAGS) $(LDFLAGS) $(CLDFLAGS) $(OBJECTS) -o $@
+ endif
+ 
+ %.so: %.a

Copied: lvm2/trunk/debian/patches/pkgconfig.patch (from r653, /devmapper/trunk/debian/patches/pkgconfig.patch)
==============================================================================
--- /devmapper/trunk/debian/patches/pkgconfig.patch	(original)
+++ lvm2/trunk/debian/patches/pkgconfig.patch	Mon Feb 23 01:15:34 2009
@@ -1,7 +1,7 @@
---- trunk.orig/lib/libdevmapper.pc.in
-+++ trunk/lib/libdevmapper.pc.in
+--- a/libdm/libdevmapper.pc.in
++++ b/libdm/libdevmapper.pc.in
 @@ -8,4 +8,4 @@
- Version: @DM_LIB_VERSION@
+ Version: @DM_LIB_PATCHLEVEL@
  Cflags: -I${includedir} 
  Libs: -L${libdir} -ldevmapper
 -Libs.private: -lselinux -lsepol

Modified: lvm2/trunk/debian/patches/series
==============================================================================
--- lvm2/trunk/debian/patches/series	(original)
+++ lvm2/trunk/debian/patches/series	Mon Feb 23 01:15:34 2009
@@ -4,3 +4,8 @@
 config.patch
 force-modprobe.patch
 permissions.patch
+libdm-type-kernel_dev_t.patch
+pkgconfig.patch
+libdm-abi.patch
+libdm-atomic.patch
+dmsetup-export.patch

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Feb 23 01:15:34 2009
@@ -11,6 +11,8 @@
 VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 VERSION := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,^[0-9]*:,,' -e 's,-[^-]*$$,,')
 
+LIBDEVMAPPER_ABINAME = 1.02.1
+
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 
@@ -88,7 +90,7 @@
 $(STAMPS_DIR)/build-deb: DIR = $(BUILD_DIR)/build-deb
 $(STAMPS_DIR)/build-deb: $(STAMPS_DIR)/setup-deb
 	dh_testdir
-	$(MAKE) -C $(DIR)
+	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(LIBDEVMAPPER_ABINAME)
 	touch $@
 
 build-udeb: $(STAMPS_DIR)/build-udeb
@@ -96,7 +98,7 @@
 $(STAMPS_DIR)/build-udeb: DIR = $(BUILD_DIR)/build-udeb
 $(STAMPS_DIR)/build-udeb: $(STAMPS_DIR)/setup-udeb
 	dh_testdir
-	$(MAKE) -C $(DIR)
+	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(LIBDEVMAPPER_ABINAME)
 	touch $@
 
 $(BUILD_DIR) $(STAMPS_DIR):

More information about the pkg-lvm-commits mailing list