[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc1-93-g1e3a90a
Francesco Paolo Lovergine
frankie at debian.org
Mon Feb 4 08:41:47 UTC 2013
The following commit has been merged in the master branch:
commit 608d4ccedc8df75c3250811d1983eec0d5f78c5f
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Tue Jan 15 11:35:07 2013 +0100
Fixed hardening-checks dependency and rules.
diff --git a/debian/changelog b/debian/changelog
index c1dc413..89762bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ proftpd-dfsg (1.3.5~rc1-2) experimental; urgency=low
* New patch: `contrib_hardening_flags' adds hardening flags to contrib/ modules.
(Thanks Simon Ruderich for the patch).
(closes: #668196)
+ * Added hardening-includes b-d.
-- Francesco Paolo Lovergine <frankie at debian.org> Thu, 10 Jan 2013 10:57:37 +0100
diff --git a/debian/control b/debian/control
index 0d88523..89bbcb0 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Build-Depends: autotools-dev,
unixodbc-dev,
zlib1g-dev,
libgeoip-dev,
- libmemcached-dev
+ libmemcached-dev,
+ hardening-includes
Homepage: http://www.proftpd.org/
Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
diff --git a/debian/control.in b/debian/control.in
index 9904f91..4676045 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,7 +21,8 @@ Build-Depends: autotools-dev,
unixodbc-dev,
zlib1g-dev,
libgeoip-dev,
- libmemcached-dev
+ libmemcached-dev,
+ hardening-includes
Homepage: http://www.proftpd.org/
Vcs-Git: git://git.debian.org/pkg-proftpd/proftpd-dfsg.git
Vcs-Browser: http://git.debian.org/?p=pkg-proftpd/proftpd-dfsg.git
diff --git a/debian/rules b/debian/rules
index e41aa98..4687d30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -68,7 +68,7 @@ install: build
dh_prep
$(MAKE) DESTDIR=$(CURDIR)/debian/tmp INSTALL_STRIP="$(INSTALL_STRIP)" install
- find -type f \(-executable -o -name \*.so\*\) -exec hardening-check {} +
+ find $(CURDIR)/debian/tmp -type f \( -executable -o -name \*.so\* \) -exec hardening-check {} +
configure: configure-stamp
configure-stamp:
--
ProFTPD core package
More information about the Pkg-proftpd-maintainers
mailing list