svn commit: r310786 - in head/sysutils: . busybox busybox-unstable busybox-unstable/files busybox/files
Matthias Andree
mandree at FreeBSD.org
Mon Jan 21 23:55:23 UTC 2013
Author: mandree
Date: Mon Jan 21 23:55:21 2013
New Revision: 310786
URL: http://svnweb.freebsd.org/changeset/ports/310786
Log:
busybox:
- add fixes from upstream (bumping portrevision)
- permit overriding USE_GCC from environment (but note that GCC is
required due to GCC extensions that are unsupported by clang)
- actually pass CC and CXX as themselves, and HOSTCC/HOSTCXX through
MAKE_ARGS, so that it actually gets effective
- add install conflict with busybox-unstable
busybox-unstable:
- new port, based on the fixed busybox, for the unstable 1.21 branch,
with install conflict with busybox-[1-9]*
Added:
head/sysutils/busybox-unstable/
- copied from r310722, head/sysutils/busybox/
head/sysutils/busybox-unstable/files/patch-procps__ps.c (contents, props changed)
head/sysutils/busybox/files/patch-procps__ps.c (contents, props changed)
Deleted:
head/sysutils/busybox-unstable/files/patch-scripts__kconfig__mconf.c
Modified:
head/sysutils/Makefile
head/sysutils/busybox-unstable/Makefile
head/sysutils/busybox-unstable/distinfo (contents, props changed)
head/sysutils/busybox-unstable/files/data-.config (contents, props changed)
head/sysutils/busybox-unstable/files/patch-include__platform.h (contents, props changed)
head/sysutils/busybox/Makefile
head/sysutils/busybox/distinfo (contents, props changed)
Modified: head/sysutils/Makefile
==============================================================================
--- head/sysutils/Makefile Mon Jan 21 22:30:55 2013 (r310785)
+++ head/sysutils/Makefile Mon Jan 21 23:55:21 2013 (r310786)
@@ -90,6 +90,7 @@
SUBDIR += bulk_extractor
SUBDIR += burn
SUBDIR += busybox
+ SUBDIR += busybox-unstable
SUBDIR += byobu
SUBDIR += ccd2iso
SUBDIR += cciss_vol_status
Modified: head/sysutils/busybox-unstable/Makefile
==============================================================================
--- head/sysutils/busybox/Makefile Sun Jan 20 23:03:34 2013 (r310722)
+++ head/sysutils/busybox-unstable/Makefile Mon Jan 21 23:55:21 2013 (r310786)
@@ -1,14 +1,11 @@
-# New ports collection makefile for: busybox
-# Date created: Aug.18, 2008
-# Whom: luigi at FreeBSD.org
-#
+# Created by: luigi at FreeBSD.org
# $FreeBSD$
-#
PORTNAME= busybox
-PORTVERSION= 1.20.2
+PORTVERSION= 1.21.0
CATEGORIES= sysutils misc shells
MASTER_SITES= http://www.busybox.net/downloads/
+PKGNAMESUFFIX= -unstable
#PATCH_SITES= http://www.busybox.net/downloads/fixes-${PORTVERSION}/
#PATCH_DIST_STRIP= -p1
@@ -21,17 +18,21 @@ LICENSE= GPLv2
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
+CONFLICTS_INSTALL= busybox-[1-9]*
+
MAKE_JOBS_SAFE= yes
-MAKE_ARGS+= SKIP_STRIP=y
+MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
USE_BZIP2= yes
USE_GMAKE= yes
# avoid clang, breaks in findutils/find.c l. 752+,
# uses a GCC extension/invalid C code:
-USE_GCC= 4.2+
+USE_GCC?= 4.2+
PLIST_FILES= bin/busybox
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
USE_PERL5_BUILD= yes
PORTDOCS= *
.endif
@@ -50,7 +51,7 @@ do-configure:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
${RM} -f ${DOCSDIR}/.gitignore
.endif
Modified: head/sysutils/busybox-unstable/distinfo
==============================================================================
--- head/sysutils/busybox/distinfo Sun Jan 20 23:03:34 2013 (r310722)
+++ head/sysutils/busybox-unstable/distinfo Mon Jan 21 23:55:21 2013 (r310786)
@@ -1,2 +1,2 @@
-SHA256 (busybox-1.20.2.tar.bz2) = eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882
-SIZE (busybox-1.20.2.tar.bz2) = 2186738
+SHA256 (busybox-1.21.0.tar.bz2) = eb9d268627783297f5f459cb9bd61a94e395dc7cb3647e10ec186e0159aa36ed
+SIZE (busybox-1.21.0.tar.bz2) = 2200841
Modified: head/sysutils/busybox-unstable/files/data-.config
==============================================================================
--- head/sysutils/busybox/files/data-.config Sun Jan 20 23:03:34 2013 (r310722)
+++ head/sysutils/busybox-unstable/files/data-.config Mon Jan 21 23:55:21 2013 (r310786)
@@ -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-unstable/files/patch-include__platform.h
==============================================================================
--- head/sysutils/busybox/files/patch-include__platform.h Sun Jan 20 23:03:34 2013 (r310722)
+++ head/sysutils/busybox-unstable/files/patch-include__platform.h Mon Jan 21 23:55:21 2013 (r310786)
@@ -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
Added: head/sysutils/busybox-unstable/files/patch-procps__ps.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/busybox-unstable/files/patch-procps__ps.c Mon Jan 21 23:55:21 2013 (r310786)
@@ -0,0 +1,15 @@
+WARNING - this patch only fixes a compiler warning, but does not work on
+FreeBSD (see src/usr.bin/w/w.c for how to do this), but it would work
+with a /proc/uptime in Linux layout, discarding the decimal fraction.
+
+--- ./procps/ps.c.orig 2012-12-22 23:39:01.000000000 +0100
++++ ./procps/ps.c 2013-01-22 00:04:53.000000000 +0100
+@@ -83,7 +83,7 @@
+ if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
+ bb_perror_msg_and_die("can't read %s", "/proc/uptime");
+ buf[sizeof(buf)-1] = '\0';
+- sscanf(buf, "%l", &uptime);
++ sscanf(buf, "%ld", &uptime);
+ return uptime;
+ #else
+ struct timespec ts;
Modified: head/sysutils/busybox/Makefile
==============================================================================
--- head/sysutils/busybox/Makefile Mon Jan 21 22:30:55 2013 (r310785)
+++ head/sysutils/busybox/Makefile Mon Jan 21 23:55:21 2013 (r310786)
@@ -1,18 +1,17 @@
-# New ports collection makefile for: busybox
-# Date created: Aug.18, 2008
-# Whom: luigi at FreeBSD.org
-#
+# Created by: luigi at FreeBSD.org
# $FreeBSD$
-#
PORTNAME= busybox
PORTVERSION= 1.20.2
+PORTREVISION= 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= \
+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
MAINTAINER= mandree at FreeBSD.org
COMMENT= Busybox for FreeBSD
@@ -21,17 +20,21 @@ LICENSE= GPLv2
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
+CONFLICTS_INSTALL= busybox-unstable-*
+
MAKE_JOBS_SAFE= yes
-MAKE_ARGS+= SKIP_STRIP=y
+MAKE_ARGS+= SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
USE_BZIP2= yes
USE_GMAKE= yes
# avoid clang, breaks in findutils/find.c l. 752+,
# uses a GCC extension/invalid C code:
-USE_GCC= 4.2+
+USE_GCC?= 4.2+
PLIST_FILES= bin/busybox
-.if !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
USE_PERL5_BUILD= yes
PORTDOCS= *
.endif
@@ -50,7 +53,7 @@ do-configure:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
${RM} -f ${DOCSDIR}/.gitignore
.endif
Modified: head/sysutils/busybox/distinfo
==============================================================================
--- head/sysutils/busybox/distinfo Mon Jan 21 22:30:55 2013 (r310785)
+++ head/sysutils/busybox/distinfo Mon Jan 21 23:55:21 2013 (r310786)
@@ -1,2 +1,8 @@
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
Added: head/sysutils/busybox/files/patch-procps__ps.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sysutils/busybox/files/patch-procps__ps.c Mon Jan 21 23:55:21 2013 (r310786)
@@ -0,0 +1,15 @@
+WARNING - this patch only fixes a compiler warning, but does not work on
+FreeBSD (see src/usr.bin/w/w.c for how to do this), but it would work
+with a /proc/uptime in Linux layout, discarding the decimal fraction.
+
+--- ./procps/ps.c.orig 2012-12-22 23:39:01.000000000 +0100
++++ ./procps/ps.c 2013-01-22 00:04:53.000000000 +0100
+@@ -83,7 +83,7 @@
+ if (open_read_close("/proc/uptime", buf, sizeof(buf)) <= 0)
+ bb_perror_msg_and_die("can't read %s", "/proc/uptime");
+ buf[sizeof(buf)-1] = '\0';
+- sscanf(buf, "%l", &uptime);
++ sscanf(buf, "%ld", &uptime);
+ return uptime;
+ #else
+ struct timespec ts;
More information about the svn-ports-all
mailing list