tags 836761 + pending patch
thanks

I've uploaded srtp 1.4.5~20130609~dfsg-1.3 to DELAYED/5:
  
  srtp (1.4.5~20130609~dfsg-1.3) unstable; urgency=medium
  
    * Non-maintainer upload.
    * Drop the build dependency on hardening-wrapper. (Closes: #836761)

The full debdiff is attached.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      la...@debian.org / chris-lamb.co.uk
       `-
diff -Nru srtp-1.4.5~20130609~dfsg/debian/changelog 
srtp-1.4.5~20130609~dfsg/debian/changelog
--- srtp-1.4.5~20130609~dfsg/debian/changelog   2016-04-02 19:43:20.000000000 
+0200
+++ srtp-1.4.5~20130609~dfsg/debian/changelog   2016-09-25 13:02:12.000000000 
+0200
@@ -1,3 +1,10 @@
+srtp (1.4.5~20130609~dfsg-1.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Drop the build dependency on hardening-wrapper. (Closes: #836761)
+
+ -- Chris Lamb <la...@debian.org>  Sun, 25 Sep 2016 13:02:12 +0200
+
 srtp (1.4.5~20130609~dfsg-1.2) unstable; urgency=high
 
   [ Markus Koschany ]
diff -Nru srtp-1.4.5~20130609~dfsg/debian/control 
srtp-1.4.5~20130609~dfsg/debian/control
--- srtp-1.4.5~20130609~dfsg/debian/control     2016-04-02 19:43:20.000000000 
+0200
+++ srtp-1.4.5~20130609~dfsg/debian/control     2016-09-25 13:02:12.000000000 
+0200
@@ -9,7 +9,6 @@
  procps,
  psmisc,
  miscfiles,
- hardening-includes,
  doxygen-latex | doxygen,
  doxygen-latex | texlive-latex-recommended,
  texlive-fonts-recommended,
diff -Nru srtp-1.4.5~20130609~dfsg/debian/rules 
srtp-1.4.5~20130609~dfsg/debian/rules
--- srtp-1.4.5~20130609~dfsg/debian/rules       2016-04-02 19:43:20.000000000 
+0200
+++ srtp-1.4.5~20130609~dfsg/debian/rules       2016-09-25 13:02:12.000000000 
+0200
@@ -21,7 +21,12 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/upstream-tarball.mk
-include /usr/share/hardening-includes/hardening.make
+
+# Tighten security - more info at http://wiki.debian.org/Hardening
+# ...except this, causing "relocation [...]; recompile with -fPIC" failure
+export DEB_BUILD_MAINT_OPTIONS=hardening=-pie
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 # Update this checksum when new releases occur, to catch silent server side 
file content forges
 DEB_UPSTREAM_TARBALL_MD5 = f706820bb54a4ff805c3f04f31a13082
@@ -48,14 +53,6 @@
 
 CFLAGS += -D_REENTRANT
 
-# Tighten security - more info at http://wiki.debian.org/Hardening
-CDBS_BUILD_DEPENDS += , hardening-includes
-CFLAGS += $(HARDENING_CFLAGS)
-LDFLAGS += $(HARDENING_LDFLAGS)
-
-# ...except this, causing "relocation [...]; recompile with -fPIC" failure
-DEB_BUILD_HARDENING_PIE:=0
-
 # Reapply default strong optimizations unless noopt in DEB_BUILD_OPTIONS
 CFLAGS += $(if $(filter noopt,$(DEB_BUILD_OPTIONS))-O0,-O4 
-fexpensive-optimizations -funroll-loops)
 

Reply via email to