mirror of
https://git.freebsd.org/ports.git
synced 2025-07-18 17:59:20 -04:00
Update to 1.0.36
This commit is contained in:
Martin Matuska
parent
f6c77ebb56
commit
c4c652e40f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=280505
5 changed files with 20 additions and 154 deletions
|
|
@ -6,7 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= debootstrap
|
||||
PORTVERSION= 1.0.32
|
||||
PORTVERSION= 1.0.36
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_DEBIAN}
|
||||
MASTER_SITE_SUBDIR= pool/main/d/${PORTNAME}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (debootstrap_1.0.32.tar.gz) = 3e235b1feb126ded2cf7ffe1d9a52562463a1136bb8ef615aafa406ed3ca3a51
|
||||
SIZE (debootstrap_1.0.32.tar.gz) = 55252
|
||||
SHA256 (debootstrap_1.0.36.tar.gz) = 40c0e4a2d8bcc82bf6a9cf6a1da7fde47a31684bb838acee45119d5b1aef445a
|
||||
SIZE (debootstrap_1.0.36.tar.gz) = 55185
|
||||
|
|
|
|||
|
|
@ -1,16 +1,6 @@
|
|||
--- Makefile.orig 2011-01-20 23:53:15.000000000 +0100
|
||||
+++ Makefile 2011-02-26 21:33:51.766311773 +0100
|
||||
@@ -3,31 +3,23 @@
|
||||
|
||||
MAKEDEV := /sbin/MAKEDEV
|
||||
|
||||
-ifneq ($(shell uname),GNU)
|
||||
-all: devices.tar.gz
|
||||
-else
|
||||
all:
|
||||
-endif
|
||||
|
||||
clean:
|
||||
--- Makefile.orig 2011-08-15 20:29:37.000000000 +0200
|
||||
+++ Makefile 2011-08-25 19:19:09.951348991 +0200
|
||||
@@ -13,17 +13,17 @@
|
||||
rm -f devices.tar.gz
|
||||
rm -rf dev
|
||||
|
||||
|
|
@ -28,13 +18,9 @@
|
|||
- sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap
|
||||
- chown root:root $(DESTDIR)/usr/sbin/debootstrap
|
||||
- chmod 0755 $(DESTDIR)/usr/sbin/debootstrap
|
||||
-
|
||||
-ifneq ($(shell uname),GNU)
|
||||
- install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
|
||||
-endif
|
||||
+ sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(PREFIX)/sbin/debootstrap
|
||||
+ chown root:wheel $(PREFIX)/sbin/debootstrap
|
||||
+ chmod 0755 $(PREFIX)/sbin/debootstrap
|
||||
|
||||
devices.tar.gz:
|
||||
rm -rf dev
|
||||
ifeq ($(shell uname),Linux)
|
||||
install -o root -g root -m 0644 devices.tar.gz $(DSDIR)/
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
--- debootstrap.orig 2011-02-26 21:36:23.197635062 +0100
|
||||
+++ debootstrap 2011-02-26 21:50:23.274213717 +0100
|
||||
@@ -384,6 +384,8 @@
|
||||
--- debootstrap.orig 2011-08-25 20:19:23.294346076 +0200
|
||||
+++ debootstrap 2011-08-25 20:22:42.850735086 +0200
|
||||
@@ -419,6 +419,10 @@
|
||||
esac
|
||||
fi
|
||||
|
||||
if [ "$ARCH" != "" ]; then
|
||||
true
|
||||
+elif [ "`uname -s`" = "FreeBSD" ]; then
|
||||
+ ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch`
|
||||
elif [ -x /usr/bin/dpkg ] && \
|
||||
/usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
|
||||
ARCH=`/usr/bin/dpkg --print-architecture`
|
||||
+if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then
|
||||
+ HOST_ARCH=kfreebsd-`/sbin/sysctl -n hw.machine_arch`
|
||||
+fi
|
||||
+
|
||||
if [ -z "$ARCH" ]; then
|
||||
ARCH=$HOST_ARCH
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,122 +0,0 @@
|
|||
--- functions.orig 2011-05-20 19:57:18.000000000 +0200
|
||||
+++ functions 2011-07-15 17:15:49.989386001 +0200
|
||||
@@ -236,9 +236,17 @@
|
||||
local expchecksum="$2"
|
||||
local expsize="$3"
|
||||
if [ "$DEBOOTSTRAP_CHECKSUM_FIELD" = "MD5SUM" ]; then
|
||||
- relchecksum=`md5sum < "$1" | sed 's/ .*$//'`
|
||||
+ if [ "`uname -s`" = "FreeBSD" ]; then
|
||||
+ relchecksum=`md5 < "$1"`
|
||||
+ else
|
||||
+ relchecksum=`md5sum < "$1" | sed 's/ .*$//'`
|
||||
+ fi
|
||||
else
|
||||
- relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
|
||||
+ if [ "`uname -s`" = "FreeBSD" ]; then
|
||||
+ relchecksum=`sha${SHA_SIZE} < "$1"`
|
||||
+ else
|
||||
+ relchecksum=`sha${SHA_SIZE}sum < "$1" | sed 's/ .*$//'`
|
||||
+ fi
|
||||
fi
|
||||
relsize=`wc -c < "$1"`
|
||||
if [ "$expsize" -ne "$relsize" ] || [ "$expchecksum" != "$relchecksum" ]; then
|
||||
@@ -524,9 +532,9 @@
|
||||
local i=
|
||||
if [ "$normi" != "" ]; then
|
||||
i="$normi"
|
||||
- elif [ -x /bin/bunzip2 ] && [ "$bz2i" != "" ]; then
|
||||
+ elif [ -x /bin/bunzip2 -o -x /usr/bin/bunzip2 ] && [ "$bz2i" != "" ]; then
|
||||
i="$bz2i"
|
||||
- elif [ -x /bin/gunzip ] && [ "$gzi" != "" ]; then
|
||||
+ elif [ -x /bin/gunzip -o -x /usr/bin/gunzip ] && [ "$gzi" != "" ]; then
|
||||
i="$gzi"
|
||||
fi
|
||||
if [ "$i" != "" ]; then
|
||||
@@ -552,11 +560,11 @@
|
||||
ext="$ext $normi ."
|
||||
i="$normi"
|
||||
fi
|
||||
- if [ -x /bin/bunzip2 ] && [ "$bz2i" != "" ]; then
|
||||
+ if [ -x /bin/bunzip2 -o -x /usr/bin/bunzip2 ] && [ "$bz2i" != "" ]; then
|
||||
ext="$ext $bz2i bz2"
|
||||
i="${i:-$bz2i}"
|
||||
fi
|
||||
- if [ -x /bin/gunzip ] && [ "$gzi" != "" ]; then
|
||||
+ if [ -x /bin/gunzip -o -x /usr/bin/gunzip ] && [ "$gzi" != "" ]; then
|
||||
ext="$ext $gzi gz"
|
||||
i="${i:-$gzi}"
|
||||
fi
|
||||
@@ -690,7 +698,7 @@
|
||||
for c in $COMPONENTS; do
|
||||
local path="dists/$SUITE/$c/binary-$ARCH/Packages"
|
||||
local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
|
||||
- if [ -x /bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
|
||||
+ if [ -x /bin/gunzip -o -x /usr/bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
|
||||
rm -f "$pkgdest"
|
||||
gunzip "$pkgdest.gz"
|
||||
elif get "$m/$path" "$pkgdest"; then
|
||||
@@ -948,12 +956,16 @@
|
||||
hurd-*)
|
||||
;;
|
||||
*)
|
||||
- umount_on_exit /dev/pts
|
||||
- umount_on_exit /dev/shm
|
||||
- umount_on_exit /proc/bus/usb
|
||||
- umount_on_exit /proc
|
||||
- umount "$TARGET/proc" 2>/dev/null || true
|
||||
- in_target mount -t proc proc /proc
|
||||
+ if [ `uname -s` = "FreeBSD" ] ; then
|
||||
+ mount -t linprocfs proc $TARGET/proc
|
||||
+ else
|
||||
+ umount_on_exit /dev/pts
|
||||
+ umount_on_exit /dev/shm
|
||||
+ umount_on_exit /proc/bus/usb
|
||||
+ umount_on_exit /proc
|
||||
+ umount "$TARGET/proc" 2>/dev/null || true
|
||||
+ in_target mount -t proc proc /proc
|
||||
+ fi
|
||||
if [ -d "$TARGET/sys" ] && \
|
||||
grep -q '[[:space:]]sysfs' /proc/filesystems 2>/dev/null; then
|
||||
umount_on_exit /sys
|
||||
@@ -978,13 +990,17 @@
|
||||
hurd-*)
|
||||
setup_devices_hurd ;;
|
||||
*)
|
||||
- if [ -e "$DEVICES_TARGZ" ]; then
|
||||
- zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
|
||||
+ if [ "`uname -s`" = "FreeBSD" ]; then
|
||||
+ mount -t devfs devfs $TARGET/dev
|
||||
else
|
||||
- if [ -e /dev/.devfsd ] ; then
|
||||
- in_target mount -t devfs devfs /dev
|
||||
+ if [ -e "$DEVICES_TARGZ" ]; then
|
||||
+ zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
|
||||
else
|
||||
- error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
|
||||
+ if [ -e /dev/.devfsd ] ; then
|
||||
+ in_target mount -t devfs devfs /dev
|
||||
+ else
|
||||
+ error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
|
||||
+ fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
@@ -1197,12 +1213,14 @@
|
||||
kfreebsd-*|hurd-*)
|
||||
;;
|
||||
*)
|
||||
- mknod "$1/test-dev-null" c 1 3 || return 1
|
||||
- if ! echo test > "$1/test-dev-null"; then
|
||||
+ if [ "`uname -s`" != "FreeBSD" ]; then
|
||||
+ mknod "$1/test-dev-null" c 1 3 || return 1
|
||||
+ if ! echo test > "$1/test-dev-null"; then
|
||||
+ rm -f "$1/test-dev-null"
|
||||
+ return 1
|
||||
+ fi
|
||||
rm -f "$1/test-dev-null"
|
||||
- return 1
|
||||
fi
|
||||
- rm -f "$1/test-dev-null"
|
||||
;;
|
||||
esac
|
||||
|
||||
Loading…
Add table
Reference in a new issue