[Pkg-samba-maint] [samba] 01/01: Add no_build_options.patch: make package more reproducible by disabling build options output.

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch master
in repository samba.

commit 6ed3639841edaee3d1bdc7bf9f44551c78b41dd4
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Sun Apr 3 18:37:52 2016 +0000

    Add no_build_options.patch: make package more reproducible by disabling build options output.
---
 debian/changelog                      |  4 +++
 debian/patches/no_build_options.patch | 53 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 source3/smbd/server.c                 |  5 +---
 source3/wscript_build                 | 12 +-------
 5 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab19027..e2b5d45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ samba (2:4.3.6+dfsg-2) UNRELEASED; urgency=medium
   [ Steven Chamberlain ]
   * ctdb: Fix detection of gnukfreebsd (Closes: #802621)
 
+  [ Jelmer Vernooij ]
+  * Add no_build_options.patch: make package more reproducible by
+    disabling build options output.
+
  -- Mathieu Parent <sathieu at debian.org>  Thu, 31 Mar 2016 22:26:11 +0200
 
 samba (2:4.3.6+dfsg-1) unstable; urgency=medium
diff --git a/debian/patches/no_build_options.patch b/debian/patches/no_build_options.patch
new file mode 100644
index 0000000..4773d28
--- /dev/null
+++ b/debian/patches/no_build_options.patch
@@ -0,0 +1,53 @@
+diff --git a/source3/smbd/server.c b/source3/smbd/server.c
+index 8c77500..fa05a28 100644
+--- a/source3/smbd/server.c
++++ b/source3/smbd/server.c
+@@ -1200,7 +1200,7 @@ extern void build_options(bool screen);
+ 	}
+ 
+ 	if (print_build_options) {
+-		build_options(True); /* Display output to screen as well as debug */
++		DEBUG(0, ("For build options, please check the Debian packaging (apt-get source samba)."));
+ 		exit(0);
+ 	}
+ 
+@@ -1271,9 +1271,6 @@ extern void build_options(bool screen);
+ 	DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
+ 		 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
+ 
+-	/* Output the build options to the debug log */ 
+-	build_options(False);
+-
+ 	if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4) {
+ 		DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
+ 		exit(1);
+diff --git a/source3/wscript_build b/source3/wscript_build
+index 8adb942..fbf79c8 100755
+--- a/source3/wscript_build
++++ b/source3/wscript_build
+@@ -7,16 +7,6 @@ LIBS='ICONV'
+ 
+ config_h = "../include/config.h"
+ 
+-bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
+-
+-t = bld.SAMBA_GENERATOR('build_env.h',
+-                        source='script/build_env.sh',
+-                        target='include/build_env.h',
+-                        rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
+-# todo: work out what is really wanted here
+-t.env.SRCDIR = bld.path.abspath()
+-t.env.BUILDDIR = bld.path.abspath()
+-
+ bld.SETUP_BUILD_GROUPS()
+ 
+ ######################## SUBSYSTEMS #################################
+@@ -609,7 +599,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
+                    smbd/oplock_linux.c
+                    smbd/notify.c
+                    smbd/notify_msg.c
+-                   smbd/build_options.c''' + NOTIFY_SOURCES,
++                   ''' + NOTIFY_SOURCES,
+                    deps='''
+                    talloc
+                    tevent
diff --git a/debian/patches/series b/debian/patches/series
index a56334f..be341ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ Fix-privacy-breach-on-google.com.patch
 fix-cluster-build.diff
 disable-socketwrapper.diff
 ctdb-Fix-detection-of-gnukfreebsd.patch
+no_build_options.patch
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 8c77500..fa05a28 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1200,7 +1200,7 @@ extern void build_options(bool screen);
 	}
 
 	if (print_build_options) {
-		build_options(True); /* Display output to screen as well as debug */
+		DEBUG(0, ("For build options, please check the Debian packaging (apt-get source samba)."));
 		exit(0);
 	}
 
@@ -1271,9 +1271,6 @@ extern void build_options(bool screen);
 	DEBUG(2,("uid=%d gid=%d euid=%d egid=%d\n",
 		 (int)getuid(),(int)getgid(),(int)geteuid(),(int)getegid()));
 
-	/* Output the build options to the debug log */ 
-	build_options(False);
-
 	if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4) {
 		DEBUG(0,("ERROR: Samba is not configured correctly for the word size on your machine\n"));
 		exit(1);
diff --git a/source3/wscript_build b/source3/wscript_build
index 8adb942..fbf79c8 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -7,16 +7,6 @@ LIBS='ICONV'
 
 config_h = "../include/config.h"
 
-bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
-
-t = bld.SAMBA_GENERATOR('build_env.h',
-                        source='script/build_env.sh',
-                        target='include/build_env.h',
-                        rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
-# todo: work out what is really wanted here
-t.env.SRCDIR = bld.path.abspath()
-t.env.BUILDDIR = bld.path.abspath()
-
 bld.SETUP_BUILD_GROUPS()
 
 ######################## SUBSYSTEMS #################################
@@ -609,7 +599,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                    smbd/oplock_linux.c
                    smbd/notify.c
                    smbd/notify_msg.c
-                   smbd/build_options.c''' + NOTIFY_SOURCES,
+                   ''' + NOTIFY_SOURCES,
                    deps='''
                    talloc
                    tevent

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git