public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2 ./Makefile.in ./VERSION ./WHATS_NEW ./con ...
@ 2004-06-24 8:02 agk
0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2004-06-24 8:02 UTC (permalink / raw)
To: lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2004-06-24 08:02:38
Modified files:
. : Makefile.in VERSION WHATS_NEW configure
configure.in
include : .symlinks
lib : Makefile.in
lib/locking : locking.c locking_types.h
Added files:
daemons : Makefile.in
daemons/clvmd : Makefile.in clvm.h clvmd-cman.c clvmd-command.c
clvmd-comms.h clvmd-gulm.c clvmd-gulm.h clvmd.c
clvmd.h cnxman-socket.h libclvm.c libclvm.h
lvm-functions.c lvm-functions.h system-lv.c
system-lv.h tcp-comms.c tcp-comms.h
lib/locking : Makefile.in cluster_locking.c
scripts : clvmd_fix_conf.sh clvmd_init
Log message:
Add cluster support.
Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.10&r2=1.11
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/VERSION.diff?cvsroot=lvm2&r1=1.38&r2=1.39
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.53&r2=1.54
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/configure.diff?cvsroot=lvm2&r1=1.33&r2=1.34
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/configure.in.diff?cvsroot=lvm2&r1=1.32&r2=1.33
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/Makefile.in.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/Makefile.in.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvm.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-cman.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-command.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-comms.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-gulm.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd-gulm.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/cnxman-socket.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/libclvm.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/libclvm.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/lvm-functions.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/system-lv.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/system-lv.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/tcp-comms.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/tcp-comms.h.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/include/.symlinks.diff?cvsroot=lvm2&r1=1.33&r2=1.34
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/Makefile.in.diff?cvsroot=lvm2&r1=1.67&r2=1.68
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/locking/Makefile.in.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/locking/cluster_locking.c.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/locking/locking.c.diff?cvsroot=lvm2&r1=1.23&r2=1.24
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/lib/locking/locking_types.h.diff?cvsroot=lvm2&r1=1.9&r2=1.10
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/scripts/clvmd_fix_conf.sh.diff?cvsroot=lvm2&r1=NONE&r2=1.1
http://sources.redhat.com/cgi-bin/cvsweb.cgi/LVM2/scripts/clvmd_init.diff?cvsroot=lvm2&r1=NONE&r2=1.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 ./Makefile.in ./VERSION ./WHATS_NEW ./con ...
@ 2010-07-28 13:55 agk
0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2010-07-28 13:55 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2010-07-28 13:55:43
Modified files:
. : Makefile.in VERSION WHATS_NEW configure
configure.in
daemons/clvmd : clvm.h clvmd.c clvmd.h
lib/misc : configure.h.in
Log message:
Change clvmd to communicate with lvm via a socket in /var/run/lvm. (mbroz)
https://bugzilla.redhat.com/show_bug.cgi?id=614248 [CVE-2010-2526]
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.58&r2=1.59
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/VERSION.diff?cvsroot=lvm2&r1=1.248&r2=1.249
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1674&r2=1.1675
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/configure.diff?cvsroot=lvm2&r1=1.136&r2=1.137
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/configure.in.diff?cvsroot=lvm2&r1=1.149&r2=1.150
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvm.h.diff?cvsroot=lvm2&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=1.73&r2=1.74
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.h.diff?cvsroot=lvm2&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/misc/configure.h.in.diff?cvsroot=lvm2&r1=1.25&r2=1.26
--- LVM2/Makefile.in 2010/07/20 15:25:39 1.58
+++ LVM2/Makefile.in 2010/07/28 13:55:42 1.59
@@ -84,6 +84,7 @@
$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_BACKUP_DIR)
$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_CACHE_DIR)
$(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_LOCK_DIR)
+ $(INSTALL_ROOT_DIR) $(DESTDIR)$(DEFAULT_RUN_DIR)
$(INSTALL_ROOT_DATA) /dev/null $(DESTDIR)$(DEFAULT_CACHE_DIR)/.cache
install_initscripts:
--- LVM2/VERSION 2010/07/28 11:49:42 1.248
+++ LVM2/VERSION 2010/07/28 13:55:42 1.249
@@ -1 +1 @@
-2.02.71(2)-cvs (2010-07-28)
+2.02.72(2)-cvs (2010-07-28)
--- LVM2/WHATS_NEW 2010/07/28 11:49:42 1.1674
+++ LVM2/WHATS_NEW 2010/07/28 13:55:42 1.1675
@@ -1,3 +1,9 @@
+Version 2.02.72 - 28th July 2010 [CVE-2010-2526]
+=================================================
+ Change clvmd to communicate with lvm2 via a socket in /var/run/lvm.
+ Return controlled error if clvmd is run by non-root user.
+ Add configure --default-run-dir for /var/run/lvm.
+
Version 2.02.71 - 28th July 2010
================================
Document LVM fault handling in doc/lvm_fault_handling.txt.
--- LVM2/configure 2010/07/21 12:54:21 1.136
+++ LVM2/configure 2010/07/28 13:55:42 1.137
@@ -863,6 +863,7 @@
with_udevdir
with_dmeventd_pidfile
with_dmeventd_path
+with_default_run_dir
with_default_system_dir
with_default_archive_subdir
with_default_backup_subdir
@@ -1599,6 +1600,7 @@
dmeventd pidfile [/var/run/dmeventd.pid]
--with-dmeventd-path=PATH
dmeventd path [EPREFIX/sbin/dmeventd]
+ --with-default-run-dir=DIR Default run directory [/var/run/lvm]
--with-default-system-dir=DIR
default LVM system directory [/etc/lvm]
--with-default-archive-subdir=SUBDIR
@@ -17816,6 +17818,21 @@
fi
+
+
+
+# Check whether --with-default-run-dir was given.
+if test "${with_default_run_dir+set}" = set; then
+ withval=$with_default_run_dir; DEFAULT_RUN_DIR="$withval"
+else
+ DEFAULT_RUN_DIR="/var/run/lvm"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_RUN_DIR "$DEFAULT_RUN_DIR"
+_ACEOF
+
+
################################################################################
# Check whether --with-default-system-dir was given.
--- LVM2/configure.in 2010/07/20 15:25:39 1.149
+++ LVM2/configure.in 2010/07/28 13:55:42 1.150
@@ -1127,6 +1127,13 @@
[Path to dmeventd binary.])
fi
+AH_TEMPLATE(DEFAULT_RUN_DIR, [Name of default run directory.])
+AC_ARG_WITH(default-run-dir,
+ [ --with-default-run-dir=DIR Default run directory [[/var/run/lvm]] ],
+ [ DEFAULT_RUN_DIR="$withval" ],
+ [ DEFAULT_RUN_DIR="/var/run/lvm" ])
+AC_DEFINE_UNQUOTED(DEFAULT_RUN_DIR,["$DEFAULT_RUN_DIR"] )
+
################################################################################
dnl -- various defaults
AC_ARG_WITH(default-system-dir,
--- LVM2/daemons/clvmd/clvm.h 2010/04/20 14:07:38 1.8
+++ LVM2/daemons/clvmd/clvm.h 2010/07/28 13:55:43 1.9
@@ -22,6 +22,8 @@
#ifndef _CLVM_H
#define _CLVM_H
+#include "configure.h"
+
struct clvm_header {
uint8_t cmd; /* See below */
uint8_t flags; /* See below */
@@ -45,9 +47,8 @@
#define CLVMD_FLAG_SYSTEMLV 2 /* Data in system LV under my node name */
#define CLVMD_FLAG_NODEERRS 4 /* Reply has errors in node-specific portion */
-/* Name of the local socket to communicate between libclvm and clvmd */
-//static const char CLVMD_SOCKNAME[]="/var/run/clvmd";
-static const char CLVMD_SOCKNAME[] = "\0clvmd";
+/* Name of the local socket to communicate between lvm and clvmd */
+static const char CLVMD_SOCKNAME[]= DEFAULT_RUN_DIR "/clvmd.sock";
/* Internal commands & replies */
#define CLVMD_CMD_REPLY 1
--- LVM2/daemons/clvmd/clvmd.c 2010/07/13 13:51:02 1.73
+++ LVM2/daemons/clvmd/clvmd.c 2010/07/28 13:55:43 1.74
@@ -123,6 +123,7 @@
static int process_reply(const struct clvm_header *msg, int msglen,
const char *csid);
static int open_local_sock(void);
+static void close_local_sock(int local_socket);
static int check_local_clvmd(void);
static struct local_client *find_client(int clientid);
static void main_loop(int local_sock, int cmd_timeout);
@@ -276,6 +277,23 @@
unlink(CLVMD_PIDFILE);
}
+/*
+ * clvmd require dm-ioctl capability for operation
+ */
+static void check_permissions()
+{
+ if (getuid() || geteuid()) {
+ log_error("Cannot run as a non-root user.");
+
+ /*
+ * Fail cleanly here if not run as root, instead of failing
+ * later when attempting a root-only operation
+ * Preferred exit code from an initscript for this.
+ */
+ exit(4);
+ }
+}
+
int main(int argc, char *argv[])
{
int local_sock;
@@ -305,9 +323,11 @@
exit(0);
case 'R':
+ check_permissions();
return refresh_clvmd(1)==1?0:1;
case 'S':
+ check_permissions();
return restart_clvmd(clusterwide_opt)==1?0:1;
case 'C':
@@ -353,6 +373,8 @@
}
}
+ check_permissions();
+
/* Setting debug options on an existing clvmd */
if (debug_opt && !check_local_clvmd()) {
@@ -521,6 +543,7 @@
/* Do some work */
main_loop(local_sock, cmd_timeout);
+ close_local_sock(local_sock);
destroy_lvm();
return 0;
@@ -864,7 +887,6 @@
closedown:
clops->cluster_closedown();
- close(local_sock);
}
static __attribute__ ((noreturn)) void wait_for_child(int c_pipe, int timeout)
@@ -1963,20 +1985,30 @@
return ret;
}
+static void close_local_sock(int local_socket)
+{
+ if (local_socket != -1 && close(local_socket))
+ stack;
+
+ if (CLVMD_SOCKNAME[0] != '\0' && unlink(CLVMD_SOCKNAME))
+ stack;
+}
/* Open the local socket, that's the one we talk to libclvm down */
static int open_local_sock()
{
- int local_socket;
+ int local_socket = -1;
struct sockaddr_un sockaddr;
+ mode_t old_mask;
+
+ close_local_sock(local_socket);
+ old_mask = umask(0077);
/* Open local socket */
- if (CLVMD_SOCKNAME[0] != '\0')
- unlink(CLVMD_SOCKNAME);
local_socket = socket(PF_UNIX, SOCK_STREAM, 0);
if (local_socket < 0) {
log_error("Can't create local socket: %m");
- return -1;
+ goto error;
}
/* Set Close-on-exec & non-blocking */
@@ -1989,18 +2021,19 @@
sockaddr.sun_family = AF_UNIX;
if (bind(local_socket, (struct sockaddr *) &sockaddr, sizeof(sockaddr))) {
log_error("can't bind local socket: %m");
- close(local_socket);
- return -1;
+ goto error;
}
if (listen(local_socket, 1) != 0) {
log_error("listen local: %m");
- close(local_socket);
- return -1;
+ goto error;
}
- if (CLVMD_SOCKNAME[0] != '\0')
- chmod(CLVMD_SOCKNAME, 0600);
+ umask(old_mask);
return local_socket;
+error:
+ close_local_sock(local_socket);
+ umask(old_mask);
+ return -1;
}
void process_message(struct local_client *client, const char *buf, int len,
--- LVM2/daemons/clvmd/clvmd.h 2007/08/17 11:51:23 1.11
+++ LVM2/daemons/clvmd/clvmd.h 2010/07/28 13:55:43 1.12
@@ -20,9 +20,6 @@
#define CLVMD_MINOR_VERSION 2
#define CLVMD_PATCH_VERSION 1
-/* Name of the cluster LVM admin lock */
-#define ADMIN_LOCK_NAME "CLVMD_ADMIN"
-
/* Default time (in seconds) we will wait for all remote commands to execute
before declaring them dead */
#define DEFAULT_CMD_TIMEOUT 60
--- LVM2/lib/misc/configure.h.in 2010/07/13 13:51:03 1.25
+++ LVM2/lib/misc/configure.h.in 2010/07/28 13:55:43 1.26
@@ -35,6 +35,9 @@
/* Name of default locking directory. */
#undef DEFAULT_LOCK_DIR
+/* Name of default run directory. */
+#undef DEFAULT_RUN_DIR
+
/* Define to 0 to reinstate the pre-2.02.54 handling of unit suffixes. */
#undef DEFAULT_SI_UNIT_CONSISTENCY
^ permalink raw reply [flat|nested] 3+ messages in thread
* LVM2 ./Makefile.in ./VERSION ./WHATS_NEW ./con ...
@ 2009-05-22 14:45 agk
0 siblings, 0 replies; 3+ messages in thread
From: agk @ 2009-05-22 14:45 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: agk@sourceware.org 2009-05-22 14:45:00
Modified files:
. : Makefile.in VERSION WHATS_NEW configure
configure.in
liblvm : Makefile.in
test/api : Makefile.in
Log message:
Rename liblvm.so to liblvm2app.so and use configure --enable-applib.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/Makefile.in.diff?cvsroot=lvm2&r1=1.32&r2=1.33
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/VERSION.diff?cvsroot=lvm2&r1=1.194&r2=1.195
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.1122&r2=1.1123
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/configure.diff?cvsroot=lvm2&r1=1.93&r2=1.94
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/configure.in.diff?cvsroot=lvm2&r1=1.98&r2=1.99
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/liblvm/Makefile.in.diff?cvsroot=lvm2&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/api/Makefile.in.diff?cvsroot=lvm2&r1=1.5&r2=1.6
--- LVM2/Makefile.in 2009/03/16 18:28:04 1.32
+++ LVM2/Makefile.in 2009/05/22 14:44:59 1.33
@@ -22,7 +22,11 @@
SUBDIRS += po
endif
-SUBDIRS += lib tools daemons libdm liblvm
+SUBDIRS += lib tools daemons libdm
+
+ifeq ("@APPLIB@", "yes")
+ SUBDIRS += liblvm
+endif
ifeq ($(MAKECMDGOALS),distclean)
SUBDIRS += daemons/clvmd \
@@ -46,7 +50,7 @@
lib: libdm
liblvm: lib
daemons: lib tools
-tools: lib device-mapper liblvm
+tools: lib device-mapper
po: tools daemons
libdm.device-mapper: include.device-mapper
--- LVM2/VERSION 2009/05/21 03:04:52 1.194
+++ LVM2/VERSION 2009/05/22 14:44:59 1.195
@@ -1 +1 @@
-2.02.46-cvs (2009-05-21)
+2.02.47-cvs (2009-05-22)
--- LVM2/WHATS_NEW 2009/05/21 11:11:30 1.1122
+++ LVM2/WHATS_NEW 2009/05/22 14:44:59 1.1123
@@ -1,5 +1,6 @@
-Version 2.02.47 - 21st May 2009
+Version 2.02.47 - 22nd May 2009
===============================
+ Rename liblvm.so to liblvm2app.so and use configure --enable-applib.
Reinstate version in liblvm2cmd.so soname. (2.02.44)
Version 2.02.46 - 21st May 2009
--- LVM2/configure 2009/04/24 21:44:15 1.93
+++ LVM2/configure 2009/05/22 14:44:59 1.94
@@ -690,9 +690,11 @@
CLDNOWHOLEARCHIVE
CLDFLAGS
BUILD_DMEVENTD
+APPLIB
MODPROBE_CMD
MSGFMT
LVM2CMD_LIB
+LVM2APP_LIB
GENHTML
LCOV
CPG_LIBS
@@ -800,6 +802,7 @@
enable_compat
enable_ioctl
enable_o_direct
+enable_applib
enable_cmdlib
enable_pkgconfig
enable_fsadm
@@ -1467,6 +1470,7 @@
--enable-compat Enable support for old device-mapper versions
--disable-driver Disable calls to device-mapper in the kernel
--disable-o_direct Disable O_DIRECT
+ --enable-applib Build application library
--enable-cmdlib Build shared command library
--enable-pkgconfig Install pkgconfig support
--enable-fsadm Enable fsadm
@@ -9707,6 +9711,23 @@
fi
################################################################################
+{ $as_echo "$as_me:$LINENO: checking whether to build liblvm2app.so application library" >&5
+$as_echo_n "checking whether to build liblvm2app.so application library... " >&6; }
+# Check whether --enable-applib was given.
+if test "${enable_applib+set}" = set; then
+ enableval=$enable_applib; APPLIB=$enableval
+else
+ APPLIB=no
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $APPLIB" >&5
+$as_echo "$APPLIB" >&6; }
+
+test x$APPLIB = xyes \
+ && LVM2APP_LIB=-llvm2app \
+ || LVM2APP_LIB=
+
+################################################################################
{ $as_echo "$as_me:$LINENO: checking whether to compile liblvm2cmd.so" >&5
$as_echo_n "checking whether to compile liblvm2cmd.so... " >&6; }
# Check whether --enable-cmdlib was given.
@@ -12659,6 +12680,7 @@
+
################################################################################
ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile"
--- LVM2/configure.in 2009/04/24 21:44:15 1.98
+++ LVM2/configure.in 2009/05/22 14:44:59 1.99
@@ -424,6 +424,18 @@
fi
################################################################################
+dnl -- Enable liblvm2app.so
+AC_MSG_CHECKING(whether to build liblvm2app.so application library)
+AC_ARG_ENABLE(applib,
+ [ --enable-applib Build application library],
+ APPLIB=$enableval, APPLIB=no)
+AC_MSG_RESULT($APPLIB)
+AC_SUBST([LVM2APP_LIB])
+test x$APPLIB = xyes \
+ && LVM2APP_LIB=-llvm2app \
+ || LVM2APP_LIB=
+
+################################################################################
dnl -- Enable cmdlib
AC_MSG_CHECKING(whether to compile liblvm2cmd.so)
AC_ARG_ENABLE(cmdlib, [ --enable-cmdlib Build shared command library],
@@ -747,6 +759,7 @@
LVM_PATCHLEVEL=`echo "$VER" | $AWK -F '.' '{print $3}'`
################################################################################
+AC_SUBST(APPLIB)
AC_SUBST(BUILD_DMEVENTD)
AC_SUBST(CFLAGS)
AC_SUBST(CFLOW_CMD)
--- LVM2/liblvm/Makefile.in 2009/04/08 14:04:35 1.5
+++ LVM2/liblvm/Makefile.in 2009/05/22 14:45:00 1.6
@@ -19,7 +19,7 @@
SOURCES =\
lvm_base.c
-LIB_NAME = liblvm
+LIB_NAME = liblvm2app
LIB_VERSION = $(LIB_VERSION_LVM)
VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_LVM)
--- LVM2/test/api/Makefile.in 2009/04/28 19:08:25 1.5
+++ LVM2/test/api/Makefile.in 2009/05/22 14:45:00 1.6
@@ -25,7 +25,7 @@
TARGETS = test
-LVMLIBS = -llvm -ldevmapper
+LVMLIBS = @LVM2APP_LIB@ -ldevmapper
DEFS += -D_REENTRANT
CFLAGS += -fno-strict-aliasing
@@ -35,6 +35,6 @@
LDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
CLDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
-test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm.so $(top_srcdir)/libdm/libdevmapper.so
+test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm2app.so $(top_srcdir)/libdm/libdevmapper.so
$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-07-28 13:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-06-24 8:02 LVM2 ./Makefile.in ./VERSION ./WHATS_NEW ./con agk
2009-05-22 14:45 agk
2010-07-28 13:55 agk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).