diff options
| author | vorlon <vorlon@alioth.debian.org> | 2011-09-26 19:54:32 +0000 |
|---|---|---|
| committer | vorlon <vorlon@alioth.debian.org> | 2011-09-26 19:54:32 +0000 |
| commit | 777835155416cf784f21281dfc48b5e65a9abe85 (patch) | |
| tree | 0961902193e6f84e65f4c980818587c5e72cf102 /debian | |
| parent | 12be865754c65587f03856d0837a71f7a8d14734 (diff) | |
| download | samba-777835155416cf784f21281dfc48b5e65a9abe85.tar.gz | |
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.
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3913 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 11 |
3 files changed, 7 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 73444c8f6f..1300183301 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,9 @@ samba (2:3.5.11~dfsg-2) UNRELEASED; urgency=low 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@debian.org> Sat, 24 Sep 2011 13:36:50 -0700 diff --git a/debian/control b/debian/control index 248328defd..fc68e7aa4c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Debian Samba Maintainers <pkg-samba-maint@lists.alioth.debian.org> Uploaders: Steve Langasek <vorlon@debian.org>, Christian Perrier <bubulle@debian.org>, Noèl Köthe <noel@debian.org>, Jelmer Vernooij <jelmer@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, diff --git a/debian/rules b/debian/rules index ccda2fafdc..5d319ff4f9 100755 --- a/debian/rules +++ b/debian/rules @@ -5,13 +5,8 @@ DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -CFLAGS = -g -Wall - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif +DEB_CFLAGS_MAINT_APPEND := -Wall +export DEB_CFLAGS_MAINT_APPEND DESTDIR=`pwd`/debian/tmp @@ -70,7 +65,7 @@ override_dh_auto_configure: 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 |