From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 10 19:00:01 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 11F988C2 for ; Fri, 10 May 2013 19:00:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id E7D6D188 for ; Fri, 10 May 2013 19:00:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r4AJ00LS099034 for ; Fri, 10 May 2013 19:00:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r4AJ00a9099033; Fri, 10 May 2013 19:00:00 GMT (envelope-from gnats) Resent-Date: Fri, 10 May 2013 19:00:00 GMT Resent-Message-Id: <201305101900.r4AJ00a9099033@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nikolai Lifanov Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A195F64E for ; Fri, 10 May 2013 18:51:40 +0000 (UTC) (envelope-from lifanov@mail.lifanov.com) Received: from mail.lifanov.com (mail.lifanov.com [206.125.175.12]) by mx1.freebsd.org (Postfix) with ESMTP id 7D742FF for ; Fri, 10 May 2013 18:51:40 +0000 (UTC) Received: by mail.lifanov.com (Postfix, from userid 1001) id E3BCB1A20AD; Fri, 10 May 2013 18:51:33 +0000 (UTC) Message-Id: <20130510185133.E3BCB1A20AD@mail.lifanov.com> Date: Fri, 10 May 2013 18:51:33 +0000 (UTC) From: Nikolai Lifanov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/178490: [patch] sysutils/debootstrap X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Nikolai Lifanov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 May 2013 19:00:01 -0000 >Number: 178490 >Category: ports >Synopsis: [patch] sysutils/debootstrap >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri May 10 19:00:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Nikolai Lifanov >Release: FreeBSD 9.1-RELEASE amd64 >Organization: >Environment: System: FreeBSD mail.lifanov.com 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64 >Description: In its present state, sysutils/debootstrap doesn't work, since it hardcodes "/usr/bin/dpkg" binary, which might not be installed. >How-To-Repeat: make -C /usr/ports/sysutils/debootstrap install mkdir /var/tmp/wheezy debootstrap wheezy /var/tmp/wheezy --foreign >Fix: Apply attached patch. Changes: * fix "dpkg" location * update debootstrap 1.0.46 -> 1.0.49 --- debootstrap.shar begins here --- # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # debootstrap # debootstrap/files # debootstrap/files/patch-Makefile # debootstrap/files/patch-debootstrap # debootstrap/Makefile # debootstrap/distinfo # debootstrap/pkg-descr # debootstrap/pkg-message # debootstrap/pkg-plist # echo c - debootstrap mkdir -p debootstrap > /dev/null 2>&1 echo c - debootstrap/files mkdir -p debootstrap/files > /dev/null 2>&1 echo x - debootstrap/files/patch-Makefile sed 's/^X//' >debootstrap/files/patch-Makefile << '4a1e6ed69bdd7f2f4149b8791d3ccb75' X--- Makefile.orig 2011-08-15 20:29:37.000000000 +0200 X+++ Makefile 2011-08-25 19:19:09.951348991 +0200 X@@ -13,17 +13,17 @@ X rm -f devices.tar.gz X rm -rf dev X X-DSDIR=$(DESTDIR)/usr/share/debootstrap X+DSDIR=$(PREFIX)/share/debootstrap X install: X mkdir -p $(DSDIR)/scripts X- mkdir -p $(DESTDIR)/usr/sbin X+ mkdir -p $(PREFIX)/sbin X X cp -a scripts/* $(DSDIR)/scripts/ X- install -o root -g root -m 0644 functions $(DSDIR)/ X+ install -o root -g wheel -m 0644 functions $(DSDIR)/ X X- sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap X- chown root:root $(DESTDIR)/usr/sbin/debootstrap X- chmod 0755 $(DESTDIR)/usr/sbin/debootstrap X+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(PREFIX)/sbin/debootstrap X+ chown root:wheel $(PREFIX)/sbin/debootstrap X+ chmod 0755 $(PREFIX)/sbin/debootstrap X X ifeq ($(shell uname),Linux) X install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/ 4a1e6ed69bdd7f2f4149b8791d3ccb75 echo x - debootstrap/files/patch-debootstrap sed 's/^X//' >debootstrap/files/patch-debootstrap << '890484ad2bd1a99bbdb6d2698abe6f49' X--- debootstrap.orig 2011-08-25 20:19:23.294346076 +0200 X+++ debootstrap 2011-08-25 20:22:42.850735086 +0200 X@@ -419,6 +419,10 @@ X esac X fi X X+if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then X+ HOST_ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch` X+fi X+ X if [ -z "$ARCH" ]; then X ARCH=$HOST_ARCH X fi 890484ad2bd1a99bbdb6d2698abe6f49 echo x - debootstrap/Makefile sed 's/^X//' >debootstrap/Makefile << 'e515ee920c32a0040db850209d1ac32d' X# Created by: Martin Matuska X# $FreeBSD: sysutils/debootstrap/Makefile 314998 2013-03-23 06:00:49Z rm $ X XPORTNAME= debootstrap XPORTVERSION= 1.0.49 XPORTREVISION= 1 XCATEGORIES= sysutils XMASTER_SITES= ${MASTER_SITE_DEBIAN} XMASTER_SITE_SUBDIR= pool/main/d/${PORTNAME} XDISTNAME= ${PORTNAME}_${PORTVERSION} X XMAINTAINER= mm@FreeBSD.org XCOMMENT= Install Debian base system into a directory X XRUN_DEPENDS= wget:${PORTSDIR}/ftp/wget X XWRKSRC= ${WRKDIR}/${PORTNAME} XNO_BUILD= yes XUSE_GMAKE= yes XMAKE_ARGS= DESTDIR="${PREFIX}" X XMAN8= debootstrap.8 X XONLY_FOR_ARCHS= i386 amd64 XONLY_FOR_ARCHS_REASON= Debian GNU/kFreeBSD available only for i386 and amd64 X Xpost-patch: X @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,g' \ X ${WRKSRC}/debootstrap X @${REINPLACE_CMD} -e 's,/usr/bin/dpkg,${PREFIX}/bin/dpkg,g' \ X ${WRKSRC}/debootstrap X Xpost-install: X @${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \ X ${MAN8PREFIX}/man/man8/debootstrap.8 X @${CAT} ${PKGMESSAGE} X X.include e515ee920c32a0040db850209d1ac32d echo x - debootstrap/distinfo sed 's/^X//' >debootstrap/distinfo << 'c0660883366052fc2a75f988b4fcf65e' XSHA256 (debootstrap_1.0.49.tar.gz) = 5018df1793eda465d1db72e89b117fd7051915f0df86a65ed6b408d82a0e1443 XSIZE (debootstrap_1.0.49.tar.gz) = 56785 c0660883366052fc2a75f988b4fcf65e echo x - debootstrap/pkg-descr sed 's/^X//' >debootstrap/pkg-descr << 'ddb6c31d0e9bac5166bf797b608e98f9' Xdebootstrap is a tool which will install a Debian base system into Xa subdirectory of another, already installed system. It doesn't require an Xinstallation CD, just access to a Debian repository. X XIn FreeBSD, you can use debootstrap to install Debian into Xa subdirectory of your existing FreeBSD installation (i386 or amd64) Xand then run Debian GNU/kFreeBSD (i386 or amd64) or Debian Linux (i386) Xin a jail or chroot. X XWWW: http://wiki.debian.org/Debootstrap ddb6c31d0e9bac5166bf797b608e98f9 echo x - debootstrap/pkg-message sed 's/^X//' >debootstrap/pkg-message << '46f273c5505b0c8a65aee42e203918b1' X*** NOTE *** XTo successfully create an installation of Debian GNU/kFreeBSD Xdebootstrap requires the following kernel modules loaded: X Xfdescfs linprocfs linsysfs tmpfs 46f273c5505b0c8a65aee42e203918b1 echo x - debootstrap/pkg-plist sed 's/^X//' >debootstrap/pkg-plist << '87ca53de9f16ccedd9ccd463b3965b7f' Xsbin/debootstrap Xshare/debootstrap/functions Xshare/debootstrap/scripts/breezy Xshare/debootstrap/scripts/dapper Xshare/debootstrap/scripts/edgy Xshare/debootstrap/scripts/etch Xshare/debootstrap/scripts/etch-m68k Xshare/debootstrap/scripts/feisty Xshare/debootstrap/scripts/gutsy Xshare/debootstrap/scripts/hardy Xshare/debootstrap/scripts/hoary Xshare/debootstrap/scripts/hoary.buildd Xshare/debootstrap/scripts/intrepid Xshare/debootstrap/scripts/jaunty Xshare/debootstrap/scripts/karmic Xshare/debootstrap/scripts/lenny Xshare/debootstrap/scripts/lucid Xshare/debootstrap/scripts/maverick Xshare/debootstrap/scripts/natty Xshare/debootstrap/scripts/oldstable Xshare/debootstrap/scripts/oneiric Xshare/debootstrap/scripts/potato Xshare/debootstrap/scripts/precise Xshare/debootstrap/scripts/quantal Xshare/debootstrap/scripts/raring Xshare/debootstrap/scripts/sarge Xshare/debootstrap/scripts/sarge.buildd Xshare/debootstrap/scripts/sarge.fakechroot Xshare/debootstrap/scripts/sid Xshare/debootstrap/scripts/squeeze Xshare/debootstrap/scripts/stable Xshare/debootstrap/scripts/testing Xshare/debootstrap/scripts/unstable Xshare/debootstrap/scripts/warty Xshare/debootstrap/scripts/warty.buildd Xshare/debootstrap/scripts/wheezy Xshare/debootstrap/scripts/woody Xshare/debootstrap/scripts/woody.buildd X@dirrm share/debootstrap/scripts X@dirrm share/debootstrap 87ca53de9f16ccedd9ccd463b3965b7f exit --- debootstrap.shar ends here --- >Release-Note: >Audit-Trail: >Unformatted: