diff options
| author | nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7> | 2012-05-20 15:30:55 +0000 |
|---|---|---|
| committer | nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7> | 2012-05-20 15:30:55 +0000 |
| commit | 346bc7c0df43cbacfc5b1b1dce75fe371388e5f7 (patch) | |
| tree | 6e2cf3db92446b641dc89bb7f369c8b3c4f55904 | |
| parent | d977bc5d1947d88450664e04fe220c54db2be3ee (diff) | |
| download | shadow-346bc7c0df43cbacfc5b1b1dce75fe371388e5f7.tar.gz | |
* debian/control: Bump Standards-Version to 3.9.3 (no changes needed).
* debian/rules: Simplify setting of hardening flags. cdbs 0.4.103 needed to
get hardened version of shadow-utils. Restore previous requirement on
dpkg-dev to 1.13.5.
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rwxr-xr-x | debian/rules | 7 |
3 files changed, 6 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 3c4d35a4..deaf1336 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,10 @@ shadow (1:4.1.5.1-1) unstable; urgency=low bug now fixed more than 10 years ago. * debian/shadowconfig.sh: Display issues, but dot not prompt interactively to fix passwd/group/shadow/gshadow issues. Closes: #638263 + * debian/control: Bump Standards-Version to 3.9.3 (no changes needed). + * debian/rules: Simplify setting of hardening flags. cdbs 0.4.103 needed to + get hardened version of shadow-utils. Restore previous requirement on + dpkg-dev to 1.13.5. [ Christian Perrier ] * Complete Polish translation of logoutd(8). Closes: #668880 diff --git a/debian/control b/debian/control index 125fbb9d..31d630c8 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,9 @@ Source: shadow Section: admin Priority: required Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org> -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Uploaders: Christian Perrier <bubulle@debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net> -Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.16.1~), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3) +Build-Depends: autoconf, automake1.9, libtool, gettext, libpam0g-dev, debhelper (>= 6.0.7~), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [linux-any], libsemanage1-dev [linux-any], gnome-doc-utils (>= 0.4.3) Vcs-Svn: svn://svn.debian.org/svn/pkg-shadow/debian/trunk Vcs-Browser: http://svn.debian.org/viewsvn/pkg-shadow/debian/trunk Homepage: http://pkg-shadow.alioth.debian.org/ diff --git a/debian/rules b/debian/rules index 6f893de9..e0a15157 100755 --- a/debian/rules +++ b/debian/rules @@ -8,15 +8,8 @@ ifeq ($(DEB_HOST_ARCH_OS),hurd) override DEB_ARCH_PACKAGES=passwd endif -# To be set before loading any CDBS files (#651964) -#CDBS_FIX_COMPILE_FLAGS = 1 # Enable PIE, BINDNOW, and possible future flags. -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# Unfortunately, this is not working (#651966), set flags manually - export DEB_BUILD_MAINT_OPTIONS = hardening=+all -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk include /usr/share/cdbs/1/rules/debhelper.mk # Specify where dh_install will find the files that it needs to move: |