[Pkg-samba-maint] [SCM] CTDB branch, debian-sid, updated. upstream/2.1-38-g33a8774

Mathieu Parent math.parent at gmail.com
Thu Jun 6 20:24:35 UTC 2013


The following commit has been merged in the debian-sid branch:
commit 93b5b772d330afd4786d34c42d98e6218d752ae9
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Thu Jun 6 21:14:17 2013 +0200

    Updated 0002-Display-compiler-commands.patch

diff --git a/debian/changelog b/debian/changelog
index cb3f9c1..e906f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ctdb (2.2+debian0-1) UNRELEASED; urgency=low
 
   * New upstream release 2.2
     - Removed 0001-Add-missing-LDFLAGS.patch, merged
+    - Updated 0002-Display-compiler-commands.patch
   * Use pristine-tar
   * Remove tdb, talloc and tevent from source and replace them by builddeps
 
diff --git a/debian/patches/0002-Display-compiler-commands.patch b/debian/patches/0002-Display-compiler-commands.patch
index 8bb4c14..e51d2fd 100644
--- a/debian/patches/0002-Display-compiler-commands.patch
+++ b/debian/patches/0002-Display-compiler-commands.patch
@@ -1,21 +1,20 @@
-From add07ecbe9fde471536751f6c9fd5baa507d502f Mon Sep 17 00:00:00 2001
 From: Mathieu Parent <math.parent at gmail.com>
-Date: Sat, 12 Jan 2013 15:18:37 +0100
-Subject: [PATCH 2/2] Display compiler commands
+Date: Thu, 6 Jun 2013 21:11:31 +0200
+Subject: [PATCH] Display compiler commands
 
 Necessary to detect missing (hardening) flags (automatically).
 
 Original Author: Simon Ruderich <simon at ruderich.org>
 Forwarded: https://lists.samba.org/archive/samba-technical/2013-January/089944.html
 ---
- Makefile.in |   60 +++++++++++++++++++++++++++++------------------------------
- 1 file changed, 30 insertions(+), 30 deletions(-)
+ Makefile.in |   64 +++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 32 insertions(+), 32 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 5871557..4140903 100755
+index bfeccf8..6c4f44d 100755
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -135,7 +135,7 @@ showlayout::
+@@ -145,7 +145,7 @@ showlayout::
  .c.o:
  	@echo Compiling $*.c
  	@mkdir -p `dirname $@`
@@ -24,7 +23,7 @@ index 5871557..4140903 100755
  
  dirs:
  	@mkdir -p $(DIRS)
-@@ -146,17 +146,17 @@ $(CTDB_VERSION_H):
+@@ -156,17 +156,17 @@ $(CTDB_VERSION_H):
  
  bin/ctdbd: $(CTDB_SERVER_OBJ)
  	@echo Linking $@
@@ -46,7 +45,7 @@ index 5871557..4140903 100755
  
  libctdb/libctdb.so: libctdb/libctdb.so.0
  	@echo Creating $@
-@@ -165,19 +165,19 @@ libctdb/libctdb.so: libctdb/libctdb.so.0
+@@ -175,23 +175,23 @@ libctdb/libctdb.so: libctdb/libctdb.so.0
  
  bin/scsi_io: $(CTDB_CLIENT_OBJ) utils/scsi_io/scsi_io.o 
  	@echo Linking $@
@@ -63,6 +62,11 @@ index 5871557..4140903 100755
 -	@$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ $+ $(TDB_LIBS) $(LIB_FLAGS)
  
+ bin/ctdb_lock_helper: server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ)
+ 	@echo Linking $@
+-	@$(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
++	$(CC) $(CFLAGS) -o $@ server/ctdb_lock_helper.o lib/util/util_file.o $(CTDB_EXTERNAL_OBJ) $(TDB_LIBS) $(LIB_FLAGS)
+ 
  bin/smnotify: utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o utils/smnotify/smnotify.o $(POPT_OBJ)
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ utils/smnotify/smnotify.o utils/smnotify/gen_xdr.o utils/smnotify/gen_smnotify.o $(POPT_OBJ) $(LIB_FLAGS)
@@ -70,7 +74,7 @@ index 5871557..4140903 100755
  
  utils/smnotify/smnotify.o: utils/smnotify/smnotify.c utils/smnotify/smnotify.h
  
-@@ -195,71 +195,71 @@ utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x utils/smnotify/smnotify
+@@ -209,75 +209,75 @@ utils/smnotify/gen_smnotify.c: utils/smnotify/smnotify.x utils/smnotify/smnotify
  
  bin/ping_pong: utils/ping_pong/ping_pong.o
  	@echo Linking $@
@@ -102,15 +106,15 @@ index 5871557..4140903 100755
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_one.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o 
+ tests/bin/ctdb_fetch_lock_once: libctdb/libctdb.a tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ)
  	@echo Linking $@
--	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(TDB_OBJ) $(POPT_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
-+	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(TDB_OBJ) $(POPT_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
+-	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
++	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_lock_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
  
- tests/bin/ctdb_fetch_readonly_once: libctdb/libctdb.a tests/src/ctdb_fetch_readonly_once.o
+ tests/bin/ctdb_fetch_readonly_once: libctdb/libctdb.a tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ)
  	@echo Linking $@
--	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(TDB_OBJ) $(POPT_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
-+	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(TDB_OBJ) $(POPT_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
+-	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
++	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_fetch_readonly_once.o $(CTDB_EXTERNAL_OBJ) libctdb/libctdb.a $(LIB_FLAGS)
  
  tests/bin/ctdb_fetch_readonly_loop: $(CTDB_CLIENT_OBJ) tests/src/ctdb_fetch_readonly_loop.o
  	@echo Linking $@
@@ -122,44 +126,49 @@ index 5871557..4140903 100755
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_trackingdb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_trackingdb_test.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_update_record: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record.o 
+ tests/bin/ctdb_update_record: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record.o
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_update_record_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record_persistent.o 
+ tests/bin/ctdb_update_record_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_update_record_persistent.o
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_update_record_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o 
+ tests/bin/ctdb_store: $(CTDB_CLIENT_OBJ) tests/src/ctdb_store.o
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_store.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_traverse: $(CTDB_CLIENT_OBJ) tests/src/ctdb_traverse.o 
+ tests/bin/ctdb_traverse: $(CTDB_CLIENT_OBJ) tests/src/ctdb_traverse.o
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_traverse.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_traverse.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_randrec: $(CTDB_CLIENT_OBJ) tests/src/ctdb_randrec.o 
+ tests/bin/ctdb_randrec: $(CTDB_CLIENT_OBJ) tests/src/ctdb_randrec.o
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_randrec.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_randrec.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_persistent.o 
+ tests/bin/ctdb_persistent: $(CTDB_CLIENT_OBJ) tests/src/ctdb_persistent.o
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_persistent.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
- tests/bin/ctdb_transaction: $(CTDB_CLIENT_OBJ) tests/src/ctdb_transaction.o 
+ tests/bin/ctdb_porting_tests: $(CTDB_CLIENT_OBJ) tests/src/ctdb_porting_tests.o
+ 	@echo Linking $@
+-	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
++	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_porting_tests.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
+ 
+ tests/bin/ctdb_transaction: $(CTDB_CLIENT_OBJ) tests/src/ctdb_transaction.o
  	@echo Linking $@
 -	@$(CC) $(CFLAGS) -o $@ tests/src/ctdb_transaction.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
 +	$(CC) $(CFLAGS) -o $@ tests/src/ctdb_transaction.o $(CTDB_CLIENT_OBJ) $(LIB_FLAGS)
  
  CTDB_SERVER_MOST_OBJ = $(CTDB_SERVER_OBJ:server/ctdbd.o=)
  CTDBD_TEST_C = $(CTDB_SERVER_MOST_OBJ:.o=.c) tests/src/ctdbd_test.c
-@@ -273,23 +273,23 @@ tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
+@@ -291,23 +291,23 @@ tests/src/ctdb_takeover_tests.o: tests/src/ctdb_takeover_tests.c $(CTDBD_TEST_C)
  
  tests/bin/ctdb_takeover_tests: $(CTDB_TEST_OBJ) tests/src/ctdb_takeover_tests.o
  	@echo Linking $@

-- 
CTDB



More information about the Pkg-samba-maint mailing list