Date: Thu, 4 Jul 2013 06:49:42 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322265 - in head/sysutils: busybox busybox-unstable busybox/files Message-ID: <201307040649.r646ngqL091873@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Thu Jul 4 06:49:41 2013 New Revision: 322265 URL: http://svnweb.freebsd.org/changeset/ports/322265 Log: Update stable to 1.21.0, and mark -unstable IGNORE for now. ChangeLog: http://busybox.net/ Deleted: head/sysutils/busybox/files/patch-380c8a0-xz-support-concatenated-.xz-streams head/sysutils/busybox/files/patch-fix-grep--Fw-not-respecting-the--w-option.patch head/sysutils/busybox/files/patch-fix-move_to_unaligned16.patch head/sysutils/busybox/files/patch-lineedit-initialize-delptr head/sysutils/busybox/files/patch-mdev-fix-mode-of-dir1-in-=dir1-dir2-file-rule head/sysutils/busybox/files/patch-scripts__kconfig__mconf.c head/sysutils/busybox/files/patch-xz-fix-put_unaligned_e32 Modified: head/sysutils/busybox-unstable/Makefile head/sysutils/busybox/Makefile head/sysutils/busybox/distinfo head/sysutils/busybox/files/data-.config (contents, props changed) head/sysutils/busybox/files/patch-include__platform.h (contents, props changed) Modified: head/sysutils/busybox-unstable/Makefile ============================================================================== --- head/sysutils/busybox-unstable/Makefile Thu Jul 4 06:37:48 2013 (r322264) +++ head/sysutils/busybox-unstable/Makefile Thu Jul 4 06:49:41 2013 (r322265) @@ -17,14 +17,14 @@ PATCHFILES= busybox-1.21.0-mdev.patch \ MAINTAINER= mandree@FreeBSD.org COMMENT= Busybox for FreeBSD -FORBIDDEN= Patch files on download site re-rolled and not yet investigated - LICENSE= GPLv2 BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed CONFLICTS_INSTALL= busybox-[1-9]* +IGNORE= is older than stable version. Use sysutils/busybox + PORTSCOUT= limitw:1,ODD MAKE_JOBS_SAFE= yes Modified: head/sysutils/busybox/Makefile ============================================================================== --- head/sysutils/busybox/Makefile Thu Jul 4 06:37:48 2013 (r322264) +++ head/sysutils/busybox/Makefile Thu Jul 4 06:49:41 2013 (r322265) @@ -2,16 +2,13 @@ # $FreeBSD$ PORTNAME= busybox -PORTVERSION= 1.20.2 -PORTREVISION= 3 +PORTVERSION= 1.21.1 CATEGORIES= sysutils misc shells MASTER_SITES= http://www.busybox.net/downloads/ PATCH_SITES= http://www.busybox.net/downloads/fixes-${PORTVERSION}/ PATCH_DIST_STRIP= -p1 -PATCHFILES= busybox-1.20.2-kernel_ver.patch \ - busybox-1.20.2-ntpd.patch \ - busybox-1.20.2-sys-resource.patch +PATCHFILES= MAINTAINER= mandree@FreeBSD.org COMMENT= Busybox for FreeBSD @@ -22,8 +19,6 @@ BUILD_DEPENDS= gsed:${PORTSDIR}/textproc CONFLICTS_INSTALL= busybox-unstable-* -PORTSCOUT= limitw:1,EVEN - MAKE_JOBS_SAFE= yes MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}" USE_BZIP2= yes Modified: head/sysutils/busybox/distinfo ============================================================================== --- head/sysutils/busybox/distinfo Thu Jul 4 06:37:48 2013 (r322264) +++ head/sysutils/busybox/distinfo Thu Jul 4 06:49:41 2013 (r322265) @@ -1,8 +1,2 @@ -SHA256 (busybox-1.20.2.tar.bz2) = eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 -SIZE (busybox-1.20.2.tar.bz2) = 2186738 -SHA256 (busybox-1.20.2-kernel_ver.patch) = 707ea6e4455c08337df0e8c86d21970aca2b9b1f71f2bc2ae1b48f59881438a8 -SIZE (busybox-1.20.2-kernel_ver.patch) = 540 -SHA256 (busybox-1.20.2-ntpd.patch) = 34600b94a842b25e551998b164c8fe5ff52b63cb72a258e0f39ebe976f524e70 -SIZE (busybox-1.20.2-ntpd.patch) = 493 -SHA256 (busybox-1.20.2-sys-resource.patch) = 35d632df48e66c5b9184d9571e9b9dfdd436ea76b7f02d13e5807f440361a0d6 -SIZE (busybox-1.20.2-sys-resource.patch) = 3561 +SHA256 (busybox-1.21.1.tar.bz2) = cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303 +SIZE (busybox-1.21.1.tar.bz2) = 2201917 Modified: head/sysutils/busybox/files/data-.config ============================================================================== --- head/sysutils/busybox/files/data-.config Thu Jul 4 06:37:48 2013 (r322264) +++ head/sysutils/busybox/files/data-.config Thu Jul 4 06:49:41 2013 (r322265) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.2 -# Tue Jul 17 04:11:27 2012 +# Busybox version: 1.21.0 +# Mon Jan 21 21:22:08 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -16,7 +16,7 @@ CONFIG_HAVE_DOT_CONFIG=y # CONFIG_EXTRA_COMPAT is not set CONFIG_INCLUDE_SUSv2=y CONFIG_USE_PORTABLE_CODE=y -# CONFIG_PLATFORM_LINUX is not set +CONFIG_PLATFORM_LINUX=y CONFIG_FEATURE_BUFFERS_USE_MALLOC=y # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_UTMP is not set # CONFIG_FEATURE_WTMP is not set CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/var/run" CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y @@ -604,9 +606,11 @@ CONFIG_SCRIPTREPLAY=y # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set # CONFIG_FEATURE_VOLUMEID_FAT is not set +# CONFIG_FEATURE_VOLUMEID_EXFAT is not set # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set +# CONFIG_FEATURE_VOLUMEID_NILFS is not set # CONFIG_FEATURE_VOLUMEID_NTFS is not set # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set # CONFIG_FEATURE_VOLUMEID_UDF is not set @@ -614,6 +618,7 @@ CONFIG_SCRIPTREPLAY=y # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set # CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set # CONFIG_FEATURE_VOLUMEID_SYSV is not set # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set @@ -886,6 +891,13 @@ CONFIG_POWERTOP=y CONFIG_PSTREE=y CONFIG_PWDX=y CONFIG_SMEMCAP=y +# CONFIG_TOP is not set +# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set +# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +# CONFIG_FEATURE_TOPMEM is not set # CONFIG_UPTIME is not set # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set # CONFIG_FREE is not set @@ -906,13 +918,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set CONFIG_FEATURE_SHOW_THREADS=y CONFIG_WATCH=y @@ -1007,6 +1012,7 @@ CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_FEATURE_KMSG_SYSLOG=y # CONFIG_KLOGD is not set # CONFIG_FEATURE_KLOGD_KLOGCTL is not set CONFIG_LOGGER=y Modified: head/sysutils/busybox/files/patch-include__platform.h ============================================================================== --- head/sysutils/busybox/files/patch-include__platform.h Thu Jul 4 06:37:48 2013 (r322264) +++ head/sysutils/busybox/files/patch-include__platform.h Thu Jul 4 06:49:41 2013 (r322265) @@ -1,6 +1,6 @@ ---- ./include/platform.h.orig 2012-07-02 14:08:25.000000000 +0000 -+++ ./include/platform.h 2012-07-17 02:08:37.000000000 +0000 -@@ -423,6 +423,15 @@ +--- ./include/platform.h.orig 2013-01-14 05:19:43.000000000 +0100 ++++ ./include/platform.h 2013-01-21 21:26:34.000000000 +0100 +@@ -433,6 +433,15 @@ #if defined(__FreeBSD__) # undef HAVE_STRCHRNUL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307040649.r646ngqL091873>