[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#649684: freebsd-net-tools: cannot upgrade (file conflict with pf)



Package: pf
Version: 8.2+ds2-11
Severity: serious
Justification: breaks upgrade
Tags: patch

Hi,

>From today's upgrade:

	Unpacking pf (from .../pf_8.2+ds2-11_kfreebsd-amd64.deb) ...
	dpkg: error processing //var/cache/apt/archives/pf_8.2+ds2-11_kfreebsd-amd64.deb (--install):
	 trying to overwrite '/etc/pf.os', which is also in package freebsd-net-tools 8.2+ds2-8
	dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)

The patch below fixes it for me.

(Side note: after the upgrade, freebsd-net-tools still thinks it has
some responsibility for that conffile:

	$ dpkg -s freebsd-net-tools
[...]
	Conffiles:
	 /etc/regdomain.xml f29c82797992a14772e556b6a7e9fd5c
	 /etc/pf.os 952dc772fa3aa453eeca6ae3b295e5e2 obsolete
	Description: FreeBSD networking tools
	 This package provides the FreeBSD tools needed to manage networking on
	 GNU/kFreeBSD.

Not sure if that's a problem or not.)
---
 debian/changelog |    8 ++++++++
 debian/control   |    3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4e9fdc8..fffa959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+freebsd-utils (8.2+ds2-11.1) local; urgency=low
+
+  * pf: Breaks, Replaces freebsd-net-tools versions that provided
+    /etc/pf.os, pfctl, and authpf.
+  * pf: Remove Replaces relation against freebsd-utils.
+
+ -- Jonathan Nieder <jrnieder@gmail.com>  Wed, 23 Nov 2011 00:01:12 -0600
+
 freebsd-utils (8.2+ds2-11) unstable; urgency=low
 
   * Unify all __unused fixes into a single patch.
diff --git a/debian/control b/debian/control
index e849197..2fcb26e 100644
--- a/debian/control
+++ b/debian/control
@@ -240,7 +240,8 @@ Section: net
 Priority: important
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: freebsd-utils (<< 8.2+ds2-11)
+Breaks: freebsd-net-tools (<< 8.2+ds2-11)
+Replaces: freebsd-net-tools (<< 8.2+ds2-11)
 Homepage: http://www.openbsd.org/faq/pf/
 Description: The OpenBSD Packet Filter
  Packet Filter (from here on referred to as PF) is OpenBSD's system for
-- 
1.7.8.rc3




Reply to: