Package: pptp-linux Version: 1.7.2-6 Severity: grave Tags: patch User: debian-...@lists.debian.org Usertags: kfreebsd
Hi, This package is uninstallable on kfreebsd-amd64 because of its dependency on ppp. On Debian GNU/kFreeBSD, equivalent (but not CLI-compatible) functionality is provided by freebsd-ppp package. It appears that pptp-linux includes support for this alternate interface. Attached patch should fix the dependency problem and enable interaction with freebsd-ppp in upstream source. It is loosely based on this patch [1] from the FreeBSD ports collection. [1] http://www.freebsd.org/cgi/cvsweb.cgi/ports/net/pptpclient/files/patch-aa?rev=1.6 -- System Information: Debian Release: 6.0.3 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: kfreebsd-amd64 (x86_64) Kernel: kFreeBSD 8.1-1-amd64 Locale: LANG=ca_AD.UTF-8, LC_CTYPE=ca_AD.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
=== modified file 'debian/control' --- debian/control 2011-11-10 19:12:51 +0000 +++ debian/control 2011-11-10 19:15:39 +0000 @@ -6,8 +6,8 @@ Standards-Version: 3.9.0 Build-Depends: debhelper (>= 7.0) Package: pptp-linux -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ppp (>= 2.4.2), binutils +Architecture: linux-any kfreebsd-any +Depends: ${shlibs:Depends}, ${misc:Depends}, ppp (>= 2.4.2) [!kfreebsd-any] | freebsd-ppp [kfreebsd-any], binutils Description: Point-to-Point Tunneling Protocol (PPTP) Client Client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP. Allows connection to a PPTP based VPN as used === added file 'debian/patches/kfreebsd-gnu.diff' --- debian/patches/kfreebsd-gnu.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/kfreebsd-gnu.diff 2011-11-10 19:14:57 +0000 @@ -0,0 +1,29 @@ +--- a/Makefile ++++ b/Makefile +@@ -2,9 +2,15 @@ + VERSION=1.7.2 + RELEASE= + ++UNAME = $(shell uname -s) ++ + ################################################################# + # CHANGE THIS LINE to point to the location of your pppd binary. ++ifeq ($(UNAME), GNU/kFreeBSD) ++PPPD = /usr/sbin/ppp ++else + PPPD = /usr/sbin/pppd ++endif + ################################################################# + + BINDIR=$(DESTDIR)/usr/sbin +@@ -17,6 +23,10 @@ + DEBUG = -g + INCLUDE = + CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) ++ifeq ($(UNAME), GNU/kFreeBSD) ++CFLAGS += -DUSER_PPP ++endif ++ + LIBS = -lutil + # Solaris 10 + # LIBS = -lnsl -lsocket -lresolv === added file 'debian/patches/series' --- debian/patches/series 1970-01-01 00:00:00 +0000 +++ debian/patches/series 2011-11-10 19:13:38 +0000 @@ -0,0 +1 @@ +kfreebsd-gnu.diff