Browse Source

Drop change-chroot-dir patch, can be handled using a configure option as well

Christoph Biedl 3 years ago
parent
commit
30e7829109
3 changed files with 2 additions and 18 deletions
  1. 0 15
      debian/patches/change-chroot-dir.patch
  2. 0 1
      debian/patches/series
  3. 2 2
      debian/rules

+ 0 - 15
debian/patches/change-chroot-dir.patch

@@ -1,15 +0,0 @@
-Subject: Change PRIVDROP_CHROOT_DIR to a real location
-Author: Christoph Biedl <debian.packages.hhqj@manchmal.in-ulm.de>
-Forwarded: not-needed
-
---- a/softflowd.h
-+++ b/softflowd.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #ifndef PRIVDROP_CHROOT_DIR
--# define PRIVDROP_CHROOT_DIR	"/var/empty"
-+# define PRIVDROP_CHROOT_DIR	"/var/run/softflowd/chroot"
- #endif
- /*
-  * Capture length for libpcap: Must fit the link layer header, plus 

+ 0 - 1
debian/patches/series

@@ -1,2 +1 @@
-change-chroot-dir.patch
 fix-typos.patch

+ 2 - 2
debian/rules

@@ -6,8 +6,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 	dh $@
 
 override_dh_auto_configure:
-	autoreconf
 	dh_auto_configure -- \
 		--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
+		--infodir=\$${prefix}/share/info \
+		--with-chrootdir=/var/run/softflowd/chroot