[Pkg-samba-maint] r3913 - trunk/samba/debian
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Mon Sep 26 19:54:33 UTC 2011
Author: vorlon
Date: 2011-09-26 19:54:32 +0000 (Mon, 26 Sep 2011)
New Revision: 3913
Modified:
trunk/samba/debian/changelog
trunk/samba/debian/control
trunk/samba/debian/rules
Log:
Bump build-depends on debhelper to 8.9.4, so we ensure we have
dpkg-buildflags by default and get full build hardening enabled out of
the box - critical for a server like samba.
Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog 2011-09-26 19:46:35 UTC (rev 3912)
+++ trunk/samba/debian/changelog 2011-09-26 19:54:32 UTC (rev 3913)
@@ -21,6 +21,9 @@
libsmbclient-dev Multi-Arch: same.
* Exclude .c files from dh_compress, so our .c examples can build out of
the box in the packages.
+ * Bump build-depends on debhelper to 8.9.4, so we ensure we have
+ dpkg-buildflags by default and get full build hardening enabled out of
+ the box - critical for a server like samba.
-- Steve Langasek <vorlon at debian.org> Sat, 24 Sep 2011 13:36:50 -0700
Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control 2011-09-26 19:46:35 UTC (rev 3912)
+++ trunk/samba/debian/control 2011-09-26 19:54:32 UTC (rev 3913)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), libpam0g-dev, libreadline-dev,
+Build-Depends: debhelper (>= 8.9.4~), libpam0g-dev, libreadline-dev,
libcups2-dev | libcupsys2-dev,
libacl1-dev [linux-any],
libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules 2011-09-26 19:46:35 UTC (rev 3912)
+++ trunk/samba/debian/rules 2011-09-26 19:54:32 UTC (rev 3913)
@@ -5,14 +5,9 @@
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-CFLAGS = -g -Wall
+DEB_CFLAGS_MAINT_APPEND := -Wall
+export DEB_CFLAGS_MAINT_APPEND
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
DESTDIR=`pwd`/debian/tmp
%:
@@ -70,7 +65,7 @@
if [ -f debian/config.cache ]; then \
cp -f debian/config.cache source3/config.cache; \
fi
- CFLAGS="$(CFLAGS)" dh_auto_configure -Dsource3 -- $(conf_args)
+ dh_auto_configure -Dsource3 -- $(conf_args)
override_dh_auto_build:
dh_auto_build -Dsource3 -- everything nsswitch
More information about the Pkg-samba-maint
mailing list