[Pkg-netatalk-devel] Bug#836757: netatalk: please drop the build dependency on hardening-wrapper

[Chris Lamb]

tags 836757 + pending patch
thanks

I've uploaded netatalk 2.2.5-1.1 to DELAYED/5:
  
  netatalk (2.2.5-1.1) unstable; urgency=medium
  
    * Non-maintainer upload.
    * Drop Build-Depends on hardening-wrapper. (Closes: #836757)

The full debdiff is attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby at debian.org / chris-lamb.co.uk
       `-
-------------- next part --------------
diff -Nru netatalk-2.2.5/debian/changelog netatalk-2.2.5/debian/changelog
--- netatalk-2.2.5/debian/changelog	2014-04-23 15:48:09.000000000 +0100
+++ netatalk-2.2.5/debian/changelog	2016-09-28 11:27:14.000000000 +0100
@@ -1,3 +1,10 @@
+netatalk (2.2.5-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop Build-Depends on hardening-wrapper. (Closes: #836757)
+
+ -- Chris Lamb <lamby at debian.org>  Wed, 28 Sep 2016 11:27:14 +0100
+
 netatalk (2.2.5-1) unstable; urgency=medium
 
   [ upstream ]
diff -Nru netatalk-2.2.5/debian/control netatalk-2.2.5/debian/control
--- netatalk-2.2.5/debian/control	2014-04-23 15:48:09.000000000 +0100
+++ netatalk-2.2.5/debian/control	2016-09-28 11:27:14.000000000 +0100
@@ -19,8 +19,7 @@
  libavahi-client-dev,
  libldap2-dev,
  libacl1-dev,
- d-shlibs,
- hardening-includes
+ d-shlibs
 Build-Conflicts: libavahi-compat-libdnssd-dev
 Vcs-Git: git://anonscm.debian.org/pkg-netatalk/netatalk.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-netatalk/netatalk.git
diff -Nru netatalk-2.2.5/debian/rules netatalk-2.2.5/debian/rules
--- netatalk-2.2.5/debian/rules	2014-04-23 10:04:04.000000000 +0100
+++ netatalk-2.2.5/debian/rules	2016-09-28 11:27:14.000000000 +0100
@@ -17,18 +17,19 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/hardening-includes/hardening.make
 
 DEB_UPSTREAM_URL = http://downloads.sourceforge.net/netatalk
 DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/~(alpha|beta|rc)/-\1/
 
 # Tighten security - more info at http://wiki.debian.org/Hardening
-CFLAGS += $(HARDENING_CFLAGS)
-LDFLAGS += $(HARDENING_LDFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS += $(shell dpkg-buildflags --get LDFLAGS)
 
 # use code paths internalized since CUPS 1.6
 # more info: https://www.cups.org/pipermail/cups-devel/2013-April/014729.html