r779 - in lvm2/trunk/debian: . patches
Bastian Blank
waldi at alioth.debian.org
Tue Mar 16 20:54:42 UTC 2010
Author: waldi
Date: Tue Mar 16 20:54:42 2010
New Revision: 779
Log:
* debian/changelog: Set version to 2.02.62-1.
* debian/patches: Update to apply.
Modified:
lvm2/trunk/debian/changelog
lvm2/trunk/debian/patches/force-modprobe.patch
lvm2/trunk/debian/patches/install.patch
lvm2/trunk/debian/patches/libdm-static.patch
lvm2/trunk/debian/patches/libs-cleanup.patch
lvm2/trunk/debian/patches/rules-subdir.patch
Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog Tue Mar 16 20:36:29 2010 (r778)
+++ lvm2/trunk/debian/changelog Tue Mar 16 20:54:42 2010 (r779)
@@ -1,4 +1,4 @@
-lvm2 (2.02.61-1) UNRELEASED; urgency=low
+lvm2 (2.02.62-1) UNRELEASED; urgency=low
* New upstream version.
* Use 3.0 (quilt) source format.
Modified: lvm2/trunk/debian/patches/force-modprobe.patch
==============================================================================
--- lvm2/trunk/debian/patches/force-modprobe.patch Tue Mar 16 20:36:29 2010 (r778)
+++ lvm2/trunk/debian/patches/force-modprobe.patch Tue Mar 16 20:54:42 2010 (r779)
@@ -1,6 +1,6 @@
--- a/configure.in
+++ b/configure.in
-@@ -948,11 +948,7 @@
+@@ -928,11 +928,7 @@
fi
################################################################################
Modified: lvm2/trunk/debian/patches/install.patch
==============================================================================
--- lvm2/trunk/debian/patches/install.patch Tue Mar 16 20:36:29 2010 (r778)
+++ lvm2/trunk/debian/patches/install.patch Tue Mar 16 20:54:42 2010 (r779)
@@ -1,6 +1,6 @@
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -165,22 +165,17 @@
+@@ -164,22 +164,17 @@
endif
install_cmdlib_dynamic: liblvm2cmd.$(LIB_SUFFIX)
@@ -28,7 +28,7 @@
@echo Creating symbolic links for individual commands in $(sbindir)
@( \
for v in `cat $(srcdir)/.commands`; do \
-@@ -190,14 +185,13 @@
+@@ -189,14 +184,13 @@
)
install_tools_static: lvm.static
@@ -48,7 +48,7 @@
--- a/daemons/clvmd/Makefile.in
+++ b/daemons/clvmd/Makefile.in
-@@ -98,8 +98,8 @@
+@@ -99,8 +99,8 @@
.PHONY: install_clvmd
install_clvmd: $(TARGETS)
@@ -62,7 +62,7 @@
--- a/lib/format1/Makefile.in
+++ b/lib/format1/Makefile.in
@@ -32,7 +32,6 @@
- include ../../make.tmpl
+ include $(top_builddir)/make.tmpl
install: liblvm2format1.so
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -73,7 +73,7 @@
--- a/lib/format_pool/Makefile.in
+++ b/lib/format_pool/Makefile.in
@@ -29,8 +29,7 @@
- include ../../make.tmpl
+ include $(top_builddir)/make.tmpl
install: liblvm2formatpool.so
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -85,7 +85,7 @@
--- a/lib/locking/Makefile.in
+++ b/lib/locking/Makefile.in
@@ -25,8 +25,7 @@
- include ../../make.tmpl
+ include $(top_builddir)/make.tmpl
install install_cluster: liblvm2clusterlock.so
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -97,7 +97,7 @@
--- a/lib/mirror/Makefile.in
+++ b/lib/mirror/Makefile.in
@@ -25,7 +25,6 @@
- include ../../make.tmpl
+ include $(top_builddir)/make.tmpl
install: liblvm2mirror.so
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -108,7 +108,7 @@
--- a/lib/snapshot/Makefile.in
+++ b/lib/snapshot/Makefile.in
@@ -25,8 +25,7 @@
- include ../../make.tmpl
+ include $(top_builddir)/make.tmpl
install: liblvm2snapshot.so
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -156,7 +156,7 @@
install: install_lvm2 install_device-mapper
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
-@@ -73,7 +73,7 @@
+@@ -75,7 +75,7 @@
install_device-mapper: install
install_include:
@@ -165,7 +165,7 @@
$(includedir)/libdevmapper.h
install_dynamic: install_ at interface@
-@@ -81,19 +81,16 @@
+@@ -83,19 +83,16 @@
$(libdir)/libdevmapper.$(LIB_SUFFIX)
install_static: install_ at interface@_static
@@ -190,7 +190,7 @@
rm -f $@
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
-@@ -73,31 +73,29 @@
+@@ -72,31 +72,29 @@
endif
install_include:
@@ -231,7 +231,7 @@
--- a/daemons/dmeventd/plugins/mirror/Makefile.in
+++ b/daemons/dmeventd/plugins/mirror/Makefile.in
@@ -35,7 +35,6 @@
- LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ -ldevmapper-event-lvm2
+ LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
install_lvm2: libdevmapper-event-lvm2mirror.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -242,7 +242,7 @@
--- a/daemons/dmeventd/plugins/snapshot/Makefile.in
+++ b/daemons/dmeventd/plugins/snapshot/Makefile.in
@@ -35,7 +35,6 @@
- LIBS += -ldevmapper @LIB_PTHREAD@ @LVM2CMD_LIB@ -ldevmapper-event-lvm2
+ LIBS += @LVM2CMD_LIB@ -ldevmapper-event-lvm2 -ldevmapper $(PTHREAD_LIBS)
install_lvm2: libdevmapper-event-lvm2snapshot.$(LIB_SUFFIX)
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
@@ -271,7 +271,7 @@
MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
LCOV = @LCOV@
-@@ -56,11 +57,6 @@
+@@ -66,11 +67,6 @@
interface = @interface@
interfacebuilddir = $(top_builddir)/libdm/$(interface)
@@ -286,7 +286,7 @@
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -19,13 +19,10 @@
- include ../make.tmpl
+ include $(top_builddir)/make.tmpl
install:
- $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(srcdir)/lvm_dump.sh \
@@ -322,7 +322,7 @@
)
--- a/liblvm/Makefile.in
+++ b/liblvm/Makefile.in
-@@ -67,22 +67,19 @@
+@@ -68,22 +68,19 @@
install: $(INSTALL_TYPE) install_include
install_include:
@@ -411,7 +411,7 @@
fi
################################################################################
-@@ -1094,7 +1091,6 @@
+@@ -1083,7 +1080,6 @@
AC_SUBST(DM_LIB_VERSION)
AC_SUBST(DM_LIB_PATCHLEVEL)
AC_SUBST(FSADM)
@@ -419,11 +419,11 @@
AC_SUBST(GULM_CFLAGS)
AC_SUBST(GULM_LIBS)
AC_SUBST(HAVE_LIBDL)
-@@ -1118,7 +1114,6 @@
+@@ -1106,7 +1102,6 @@
AC_SUBST(LVM_RELEASE_DATE)
AC_SUBST(MIRRORS)
AC_SUBST(MSGFMT)
-AC_SUBST(OWNER)
AC_SUBST(PKGCONFIG)
AC_SUBST(POOL)
- AC_SUBST(QUORUM_CFLAGS)
+ AC_SUBST(PTHREAD_LIBS)
Modified: lvm2/trunk/debian/patches/libdm-static.patch
==============================================================================
--- lvm2/trunk/debian/patches/libdm-static.patch Tue Mar 16 20:36:29 2010 (r778)
+++ lvm2/trunk/debian/patches/libdm-static.patch Tue Mar 16 20:54:42 2010 (r779)
@@ -10,7 +10,7 @@
ifeq ("@LIB_SUFFIX@","dylib")
LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -60,11 +58,7 @@
+@@ -62,11 +60,7 @@
install_ioctl install_ioctl_static \
install_pkgconfig
Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch Tue Mar 16 20:36:29 2010 (r778)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch Tue Mar 16 20:54:42 2010 (r779)
@@ -8,80 +8,88 @@
LIB_SUFFIX=so
DEVMAPPER=yes
ODIRECT=yes
-@@ -785,24 +784,6 @@
- fi;
+@@ -820,18 +819,9 @@
+ ################################################################################
+ dnl -- Check for selinux
+ if test x$SELINUX = xyes; then
+- AC_CHECK_LIB([sepol], [sepol_check_context], [
+- AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
+- SELINUX_LIBS="-lsepol"])
+-
+- AC_CHECK_LIB([selinux], [is_selinux_enabled], [
+- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
+- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
+- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
+- HAVE_SELINUX=yes ], [
+- AC_MSG_WARN(Disabling selinux)
+- SELINUX_LIBS=
+- HAVE_SELINUX=no ])
++ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
++ LIBS_SELINUX="$(pkg-config --libs libselinux)"
++ LIBS_SELINUX_STATIC="$(pkg-config --libs --static libselinux)"
+ fi
################################################################################
--dnl -- Check for termcap (Shamelessly copied from parted 1.4.17)
+@@ -852,49 +842,6 @@
+ AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
+
+ ################################################################################
+-dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
-if test x$READLINE != xno; then
+- lvm_saved_libs=$LIBS
- AC_SEARCH_LIBS([tgetent], [tinfo ncurses curses termcap termlib],
-- [tg_found=yes], [tg_found=no])
-- test x$READLINE:$tg_found = xyes:no &&
-- AC_MSG_ERROR(
--termcap could not be found which is required for the
+- READLINE_LIBS=$ac_cv_search_tgetent, [
+- if test "$READLINE" = yes; then
+- 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.
--)
+- not found either - but you could try installing that as well.])
+- fi])
+- dnl -- Old systems may need extra termcap dependency explicitly in LIBS
+- AC_CHECK_LIB([readline], [readline], [
+- AC_DEFINE([READLINE_SUPPORT], 1,
+- [Define to 1 to include the LVM readline shell.])
+- dnl -- Try only with -lreadline and check for different symbol
+- LIBS=$lvm_saved_libs
+- AC_CHECK_LIB([readline], [rl_line_buffer],
+- [ READLINE_LIBS="-lreadline" ], [
+- AC_MSG_RESULT([linking -lreadline with $READLINE_LIBS needed])
+- READLINE_LIBS="-lreadline $READLINE_LIBS"
+- ]) ], [
+- READLINE_LIBS=
+- if test "$READLINE" = yes; then
+- AC_MSG_ERROR(
+-[GNU Readline 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 readline from:
+- ftp.gnu.org/gnu/readline
+-Note: if you are using precompiled packages you will also need the development
+-package as well (which may be called readline-devel or something similar).])
+- fi ])
+- LIBS="$READLINE_LIBS $lvm_saved_libs"
+- AC_CHECK_FUNCS([rl_completion_matches])
+- LIBS=$lvm_saved_libs
-fi
-
-################################################################################
- dnl -- Check for dlopen
- AC_CHECK_LIB(dl, dlopen, HAVE_LIBDL=yes, HAVE_LIBDL=no)
-
-@@ -833,35 +814,9 @@
+ dnl -- Internationalisation stuff
+ AC_MSG_CHECKING(whether to enable internationalisation)
+ AC_ARG_ENABLE(nls, [ --enable-nls Enable Native Language Support],
+@@ -952,7 +899,7 @@
################################################################################
- 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.])
-- SELINUX_LIBS="-lsepol $SELINUX_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.])
-- SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-- else
-- AC_MSG_WARN(Disabling selinux)
-- fi
-- LIBS="$SELINUX_LIBS $LIBS"
--
-- # With --enable-static_link and selinux enabled, linking
-- # fails on at least Debian unstable due to unsatisfied references
-- # to pthread_mutex_lock and _unlock. See if we need -lpthread.
-- if test "$STATIC_LINK-$HAVE_SELINUX" = yes-yes; then
-- lvm_saved_libs=$LIBS
-- LIBS="$LIBS -static"
-- AC_SEARCH_LIBS([pthread_mutex_lock], [pthread],
-- [test "$ac_cv_search_pthread_mutex_lock" = "none required" ||
-- LIB_PTHREAD=-lpthread])
-- LIBS=$lvm_saved_libs
-- fi
-+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+ LIBS_SELINUX="$(pkg-config --libs libselinux)"
-+ LIBS_SELINUX_STATIC="$(pkg-config --libs --static libselinux)"
+ dnl -- Ensure additional headers required
+ if test x$READLINE = xyes; then
+- AC_CHECK_HEADERS(readline/readline.h readline/history.h,,AC_MSG_ERROR(bailing out))
++ AC_CHECK_LIB([readline], [readline], [LIBS_READLINE="-lreadline"], AC_MSG_ERROR(bailing out))
fi
- ################################################################################
-@@ -885,7 +840,7 @@
- dnl -- Check for readline (Shamelessly copied from parted 1.4.17)
- if test x$READLINE != xno; then
- rl_found=yes
-- AC_CHECK_LIB([readline], [readline], , [rl_found=no])
-+ AC_CHECK_LIB([readline], [readline], [LIBS_READLINE="-lreadline $LIBS_READLINE"], [rl_found=no])
- test x$READLINE:$rl_found = xyes:no &&
- AC_MSG_ERROR(
- GNU Readline could not be found which is required for the
-@@ -1101,6 +1056,9 @@
+ if test x$CLVMD != xnone; then
+@@ -1089,6 +1036,9 @@
AC_SUBST(JOBS)
AC_SUBST(LDDEPS)
AC_SUBST(LIBS)
@@ -91,83 +99,30 @@
AC_SUBST(LIB_SUFFIX)
AC_SUBST(LOCALEDIR)
AC_SUBST(LVM1)
-@@ -1128,7 +1086,6 @@
- AC_SUBST(STATIC_LINK)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
--AC_SUBST([LIB_PTHREAD])
- AC_SUBST(interface)
- AC_SUBST(kerneldir)
- AC_SUBST(missingkernel)
---- a/tools/Makefile.in
-+++ b/tools/Makefile.in
-@@ -17,8 +17,6 @@
- top_builddir = @top_builddir@
- VPATH = @srcdir@
-
--LIB_PTHREAD = @LIB_PTHREAD@
--
- SOURCES =\
- dumpconfig.c \
- formats.c \
-@@ -105,6 +103,9 @@
-
- LVMLIBS += -ldevmapper
-
-+LDFLAGS_DMSETUP_STATIC = @LIBS_SELINUX_STATIC@
-+LDFLAGS_LVM = @LIBS_READLINE@
-+
- DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
-
- include ../make.tmpl
-@@ -113,22 +114,21 @@
-
- dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
- $(CC) $(CFLAGS) $(LDFLAGS) -L$(top_builddir)/libdm \
-- -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
-+ -o $@ dmsetup.o -ldevmapper $(LIBS)
-
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-- -o $@ dmsetup.o -ldevmapper $(LIBS) $(LIB_PTHREAD)
-+ -o $@ dmsetup.o -ldevmapper $(LIBS) $(LDFLAGS_DMSETUP_STATIC)
-
- all: device-mapper
-
- lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) lvm.o \
-- $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
-+ $(LVMLIBS) $(LIBS) $(LDFLAGS_LVM)
-
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a
- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-- $(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) \
-- -rdynamic
-+ $(OBJECTS) lvm-static.o $(LVMLIBS) $(LIBS) $(LDFLAGS_LVM)
-
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
- cat $(top_builddir)/lib/liblvm-internal.a > $@
+@@ -1104,7 +1054,6 @@
+ AC_SUBST(MSGFMT)
+ AC_SUBST(PKGCONFIG)
+ AC_SUBST(POOL)
+-AC_SUBST(PTHREAD_LIBS)
+ AC_SUBST(QUORUM_CFLAGS)
+ AC_SUBST(QUORUM_LIBS)
+ AC_SUBST(READLINE_LIBS)
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
-@@ -62,11 +62,11 @@
+@@ -61,7 +61,7 @@
dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
-- $(LVMLIBS) $(LIBS) -rdynamic
-+ $(LVMLIBS) $(LIBS)
+- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
++ $(DL_LIBS) $(LVMLIBS) $(LIBS)
dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-- dmeventd.o $(LVMLIBS) $(LIBS) -rdynamic
-+ dmeventd.o $(LVMLIBS) $(LIBS)
-
- ifeq ("@PKGCONFIG@", "yes")
- INSTALL_LIB_TARGETS += install_pkgconfig
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
-@@ -47,6 +47,8 @@
- VERSIONED_SHLIB = libdevmapper.$(LIB_SUFFIX).$(LIB_VERSION_DM)
- LIB_VERSION = $(LIB_VERSION_DM)
+@@ -49,6 +49,8 @@
+
+ include $(top_builddir)/make.tmpl
+LDFLAGS += @LIBS_SELINUX@
+
@@ -176,7 +131,7 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -104,7 +104,6 @@
+@@ -114,7 +114,6 @@
#DEFS += -DBOUNDS_CHECK
#CFLAGS += -pg
@@ -184,7 +139,7 @@
STRIP=
#STRIP = -s
-@@ -208,13 +207,13 @@
+@@ -218,13 +217,13 @@
ifeq ("@LIB_SUFFIX@","so")
$(LIB_SHARED): $(OBJECTS) $(LDDEPS)
$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
Modified: lvm2/trunk/debian/patches/rules-subdir.patch
==============================================================================
--- lvm2/trunk/debian/patches/rules-subdir.patch Tue Mar 16 20:36:29 2010 (r778)
+++ lvm2/trunk/debian/patches/rules-subdir.patch Tue Mar 16 20:54:42 2010 (r779)
@@ -1,6 +1,6 @@
--- a/make.tmpl.in
+++ b/make.tmpl.in
-@@ -131,65 +131,27 @@
+@@ -141,65 +141,27 @@
.PHONY: all install install_cluster pofile distclean clean cflow device-mapper
.PHONY: install_device-mapper install_lvm2
@@ -78,7 +78,7 @@
endif
$(TARGETS): $(OBJECTS)
-@@ -237,12 +199,12 @@
+@@ -247,12 +209,12 @@
%.mo: %.po
$(MSGFMT) -o $@ $<
More information about the pkg-lvm-commits
mailing list