Re: 1.22.1 is released
On 20 January 2014 06:00:01 Denys Vlasenko wrote: 20 January 2014 -- BusyBox 1.22.1 (stable) Bug fix release. Please schedule the ash SHLVL for the next round. TIA, Sent with AquaMail for Android http://www.aqua-mail.com ___ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox
Fwd: Help installing busy box?
-- Forwarded message -- From: Brian Maneke Date: Fri, Jan 17, 2014 at 12:07 AM Subject: Help installing busy box? To: vda.li...@googlemail.com Hey i am trying to install busy box to my phone. LG OPTIMUS F3 Model: LG-LS720 Rom: JZ054K I have tried to install several different versions using the installer program but nothing takes Can you help? ___ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox
1.22.1 is released
20 January 2014 -- BusyBox 1.22.1 (stable) Bug fix release. 1.22.1 has fixes for: find (was requiring the path argument in some cases, unlike GNU find), grep (fixes for -w handling), ntpd (wasn't slewing time after large negative step), compile fixes for some configurations. -- vda ___ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox
Re: [PATCH 2/2] top.c: fix compilation warnings
Applied, thanks!
On Sat, Jan 18, 2014 at 3:36 PM, Bartosz Golaszewski
wrote:
> pfd[1] is unused
>
> Signed-off-by: Bartosz Golaszewski
> ---
> procps/top.c |5 -
> 1 file changed, 5 deletions(-)
>
> diff --git a/procps/top.c b/procps/top.c
> index 51f1c1a..530f45f 100644
> --- a/procps/top.c
> +++ b/procps/top.c
> @@ -917,17 +917,12 @@ enum {
> #if ENABLE_FEATURE_USE_TERMIOS
> static unsigned handle_input(unsigned scan_mask, unsigned interval)
> {
> - struct pollfd pfd[1];
> -
> if (option_mask32 & OPT_EOF) {
> /* EOF on stdin ("top sleep(interval);
> return scan_mask;
> }
>
> - pfd[0].fd = 0;
> - pfd[0].events = POLLIN;
> -
> while (1) {
> int32_t c;
>
> --
> 1.7.10.4
>
> ___
> busybox mailing list
> busybox@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
Re: [PATCH 1/2] ntpd: fix compilation warnings
Applied, thanks! On Sat, Jan 18, 2014 at 3:36 PM, Bartosz Golaszewski wrote: > GCC complained about since_last_update being set but not used. > > Signed-off-by: Bartosz Golaszewski > --- > networking/ntpd.c |4 > 1 file changed, 4 insertions(+) > > diff --git a/networking/ntpd.c b/networking/ntpd.c > index c4b0187..f1f99bb 100644 > --- a/networking/ntpd.c > +++ b/networking/ntpd.c > @@ -1328,7 +1328,9 @@ update_local_clock(peer_t *p) > #if !USING_KERNEL_PLL_LOOP > double freq_drift; > #endif > +#if !USING_KERNEL_PLL_LOOP || USING_INITIAL_FREQ_ESTIMATION > double since_last_update; > +#endif > double etemp, dtemp; > > abs_offset = fabs(offset); > @@ -1356,7 +1358,9 @@ update_local_clock(peer_t *p) > * action is and defines how the system reacts to large time > * and frequency errors. > */ > +#if !USING_KERNEL_PLL_LOOP || USING_INITIAL_FREQ_ESTIMATION > since_last_update = recv_time - G.reftime; > +#endif > #if !USING_KERNEL_PLL_LOOP > freq_drift = 0; > #endif > -- > 1.7.10.4 > > ___ > busybox mailing list > busybox@busybox.net > http://lists.busybox.net/mailman/listinfo/busybox ___ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox
[PATCH] Make networking/libiproute/iplink.c compile with kernel versions prior to 2.6.23
Without this patch it fails with:
CC networking/libiproute/iplink.o
networking/libiproute/iplink.c: In function 'vlan_parse_opt':
networking/libiproute/iplink.c:331:9: error: variable 'flags' has initializer
but incomplete type
networking/libiproute/iplink.c:331:25: error: storage size of 'flags' isn't
known
networking/libiproute/iplink.c:341:23: error: 'IFLA_VLAN_ID' undeclared (first
use in this function)
networking/libiproute/iplink.c:341:23: note: each undeclared identifier is
reported only once for each function it appears in
networking/libiproute/iplink.c:383:22: error: 'IFLA_VLAN_FLAGS' undeclared
(first use in this function)
networking/libiproute/iplink.c:331:25: warning: unused variable 'flags'
[-Wunused-variable]
networking/libiproute/iplink.c: In function 'do_add_or_delete':
networking/libiproute/iplink.c:453:35: error: 'IFLA_INFO_DATA' undeclared
(first use in this function)
make[2]: *** [networking/libiproute/iplink.o] Error 1
Signed-off-by: Eugene Rudoy
---
networking/libiproute/iplink.c | 12
1 file changed, 12 insertions(+)
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 286e59e..a6b1100 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -28,9 +28,21 @@
#undef IFLA_VLAN_PROTOCOL
#define IFLA_VLAN_PROTOCOL 5
+/* introduced in
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit?id=38f7b870d4a6a5d3ec21557e849620cb7d032965
/ v2.6.23 */
#ifndef IFLA_LINKINFO
# define IFLA_LINKINFO 18
# define IFLA_INFO_KIND 1
+# define IFLA_INFO_DATA 2
+#endif
+
+/* introduced in
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit?id=07b5b17e157b7018d0ca40ca0d1581a23096fb45
/ v2.6.23 */
+#ifndef IFLA_VLAN_MAX
+#define IFLA_VLAN_ID 1
+#define IFLA_VLAN_FLAGS 2
+struct ifla_vlan_flags {
+ __u32 flags;
+ __u32 mask;
+};
#endif
/* taken from linux/sockios.h */
--
1.8.5.2
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[PATCH] acpid: add FEATURE_SYSLOG
Hi, With this small patch, acpid can log to syslog Best regards. Souf. --- busybox-1.22.0/util-linux/Config.src.orig 2014-01-19 15:18:11.201728304 +0100 +++ busybox-1.22.0/util-linux/Config.src 2014-01-19 15:18:39.581727732 +0100 @@ -11,6 +11,7 @@ bool "acpid" default y select PLATFORM_LINUX + select FEATURE_SYSLOG help acpid listens to ACPI events coming either in textual form from /proc/acpi/event (though it is marked deprecated it is still widely --- busybox-1.22.0/docs/logging_and_backgrounding.txt.orig 2014-01-19 15:19:03.965727241 +0100 +++ busybox-1.22.0/docs/logging_and_backgrounding.txt 2014-01-19 15:19:42.689726461 +0100 @@ -23,7 +23,7 @@ Current situation is a bit of a mess: -acpid - auto-backgrounds unless -d +acpid - auto-backgrounds unless -d or -f crond - auto-backgrounds unless -f, logs to syslog unless -d or -L. option -d logs to stderr, -L FILE logs to FILE devfsd - (obsolete) @@ -48,7 +48,7 @@ Total: 13 applets (+1 obsolete), 4 log to syslog by default (crond fakeidentd inetd zcip), - 5 never log to syslog (acpid httpd telnetd klogd syslogd, last two + 4 never log to syslog (httpd telnetd klogd syslogd, last two - for obviously correct reasons), there are no daemons which always log to syslog, 12 auto-background if not run as inetd services (all except dnsd. ___ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox
[PATCH] mdev - add SELinux support
Add support for relabeling files. Files created or modified by mdev
should now have correct SELinux labels.
---
util-linux/mdev.c | 13 +
1 file changed, 13 insertions(+)
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index e80b58f..c8ef48d 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -759,6 +759,19 @@ static void make_device(char *device_name, char *path, int
operation)
}
if (mknod(node_name, rule->mode | type, makedev(major,
minor)) && errno != EEXIST)
bb_perror_msg("can't create '%s'", node_name);
+
+#if ENABLE_SELINUX
+ /* relabel file, don't care if it existed before or was
just created */
+ if (is_selinux_enabled()) {
+ security_context_t scontext = NULL;
+ char *node_path = xasprintf("/dev/%s",
node_name);
+
+ if (matchpathcon(node_path, rule->mode | type,
&scontext) == 0)
+ setfilecon(node_path, scontext);
+ freecon(scontext);
+ }
+#endif
+
if (ENABLE_FEATURE_MDEV_CONF) {
chmod(node_name, rule->mode);
chown(node_name, rule->ugid.uid,
rule->ugid.gid);
--
1.8.5.3
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[PATCH] add selinux support to mdev
I'm booting in enforcing mode and init initializes SELinux, later when mdev is started it needs to create files with correct permissions for system to work correctly. Following patch allows for easy booting of SELinux system with mdev as /dev manager. Amadeusz ___ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox
[PATCH] testsuite: fix last "which" change
In commit afa63b2dcdc9b9 I replaced `type -p' with `command -pv'. But actually it is wrong, the right substitution is `command -v'. We need to find our busybox which is in the first directory in $PATH, so `command -p' should not be used because it uses default PATH, not current value of PATH where our busybox binary resides. Signed-off-by: Michael Tokarev --- testsuite/which/which-uses-default-path |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/which/which-uses-default-path b/testsuite/which/which-uses-default-path index 349583d..92b6018 100644 --- a/testsuite/which/which-uses-default-path +++ b/testsuite/which/which-uses-default-path @@ -1,4 +1,4 @@ -BUSYBOX=$(command -pv busybox) +BUSYBOX=$(command -v busybox) SAVED_PATH=$PATH unset PATH $BUSYBOX which ls -- 1.7.10.4 ___ busybox mailing list busybox@busybox.net http://lists.busybox.net/mailman/listinfo/busybox
Re: bb-1.22.0 and grep -w
On Sat, Jan 18, 2014 at 6:18 PM, Karl Godt wrote:
> Sedat Dilek wrote:
>>
>> On Sat, Jan 18, 2014 at 9:25 AM, Karl Godt wrote:
>>
>>>
>>> Dear Busybox-Team !
>>>
>>> I am running Puppy Linux as my main OS, that relies on Busybox in the
>>> intial
>>> ramdisk about some 70% and also uses Busybox applets after switch_root
>>> quite a lot .
>>>
>>> The Initial-Ramdisk is not used after a traditional "normal" installation
>>> and /sbin/init in Puppy-4 times had been a link to /bin/busybox - but
>>> became
>>> a script that would run fsck in a pivot_root ramdisk if needed and reboot
>>> or
>>> exec /bin/busybox init if the filesystem found ok ( uses a simple flag
>>> file
>>> ) .
>>>
>>> I use code as
>>> LANG=C
>>> todayY=`date +%Y`;[ "$todayY" ] || todayY=''
>>> todayM=`date +%m | sed 's/^0//'`;[ "$todayM" ] || todayM=12
>>> todayD=`date +%d | sed 's/^0//'`;[ "$todayD" ] || todayD='1'
>>> #todayYDN=`date +%j`;[ "$todayYDN" ] || todayYDN=100
>>> todayYDN=`date +%j |sed 's%^0*%%'`;[ "$todayYDN" ] || todayYDN=100
>>>
>>> echo "
>>> todayY='$todayY'
>>> todayM='$todayM'
>>> todayD='$todayD'
>>> todayYDN='$todayYDN'
>>> "
>>>
>>> monthN=`for i in $(seq 1 12) ; do cal $i 1 | head -n 1 | grep -o
>>> '[[:alpha:]]*' | sed "s/^/$i /"; done`
>>> monthT=`echo "$monthN" | /bin/grep -w "^$todayM"`
>>> montTN=`echo "$monthT" | cut -f 1 -d ' '`
>>> montTO=`echo "$monthT" | cut -f 2 -d ' '`
>>>
>>> echo "monthN=$monthN"
>>> echo "monthT='$monthT'"
>>> echo "monthTN='$montTN'"
>>> echo "montTO='$montTO'"
>>>
>>> which gave me multiple lines for
>>>
>>> todayY='2014'
>>> todayM='1'
>>> todayD='18'
>>> todayYDN='18'
>>>
>>> monthN=1 January
>>> 2 February
>>> 3 March
>>> 4 April
>>> 5 May
>>> 6 June
>>> 7 July
>>> 8 August
>>> 9 September
>>> 10 October
>>> 11 November
>>> 12 December
>>> *monthT='1 January
>>> 11 November'
>>> monthTN='1
>>> 11'
>>> montTO='January
>>> November'*
>>>
>>> Bartosz Golaszewski (6):
>>> grep: don't bail out on first mismatch if '-w' option is set
>>>
>>> seems not to work as it should, it seems to grep '1' , '11' , '111' , ...
>>> if
>>> word is '1' , probably because it is a number .
>>>
>>>
>>> On the other side I am glad that
>>> bash-3.2# ash
>>>
>>> BusyBox v1.22.0Dell755-Opera2 (2014-01-18 04:29:48 GMT+1) built-in shell
>>> (ash)
>>> Enter 'help' for a list of built-in commands.
>>>
>>> / # grep -w '/' /proc/mounts
>>> rootfs / rootfs rw 0 0
>>> / #
>>>
>>> works , because former it worked as grep -Fw '/' /proc/mounts .
>>>
>>>
>>> Related to the '/' -character is a minor annoyance while substitution in
>>> ash
>>> :
>>> / # STRING=/mnt/somewhere/path/to/some/file
>>> / # echo "${STRING//\/mnt\/somewhere}"
>>> /mnt/somewhere/path/to/some/file
>>> / # echo "${STRING//\/mnt\/somewhere/}"
>>> /mnt/somewhere/path/to/some/file
>>> / # echo "${STRING//\/mnt\/somewhere/Replacement}"
>>> /mnt/somewhere/path/to/some/file
>>>
>>>
>>
>>
>> Hi,
>>
>> did you had a look at the busybox ML archive and post-v1.22.0 patches?
>> Cannot say offhand you hit the same problems.
>>
>> Regards,
>> - Sedat -
>>
>> [1] http://busybox.net/downloads/fixes-1.22.0/
>>
>>
>>>
>>> With best regards,
>>> Karl Reimer Godt
>>> ___
>>> busybox mailing list
>>> busybox@busybox.net
>>> http://lists.busybox.net/mailman/listinfo/busybox
>>>
>>
>>
>>
>
> No hadn't .
>
> Used git pull into a new folder yesterday and
>
> 1791 for t in `git tag -l`; do git checkout $t; git checkout -b new$t;
> sleep 1; done
> 1792 git branch
> 1793 git checkout new1_22_0
>
> bash-3.2# head Makefile
> VERSION = 1
> PATCHLEVEL = 22
> SUBLEVEL = 0
> EXTRAVERSION = Dell755-Opera2
> NAME = Unnamed
>
>
> / # busybox bbconfig | grep ENABLE_EXTRA_COMPAT
> /#
> /#
>
Did you test vanilla (unmodified! or GIT master/HEAD) busybox v1.22.0
with especially the grep-fix from [1]?
Does it help?
- Sedat -
[1] http://busybox.net/downloads/fixes-1.22.0/busybox-1.22.0-grep.patch
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
Re: [PATCH 2/2] sort: check global flags on fallback sort
Applied, thanks!
On Sat, Jan 18, 2014 at 3:25 PM, Bartosz Golaszewski
wrote:
> Sort now performs global reverse on fallback sort if -r is set. Before
> only key local flags were checked.
>
> Signed-off-by: Bartosz Golaszewski
> ---
> coreutils/sort.c |7 +--
> testsuite/sort.tests |3 ---
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/coreutils/sort.c b/coreutils/sort.c
> index 0b3b650..a3efe5b 100644
> --- a/coreutils/sort.c
> +++ b/coreutils/sort.c
> @@ -302,10 +302,13 @@ static int compare_keys(const void *xarg, const void
> *yarg)
> } /* for */
>
> /* Perform fallback sort if necessary */
> - if (!retval && !(option_mask32 & FLAG_s))
> + if (!retval && !(option_mask32 & FLAG_s)) {
> retval = strcmp(*(char **)xarg, *(char **)yarg);
> + if (option_mask32 & FLAG_r) return -retval;
> + } else {
> + if (flags & FLAG_r) return -retval;
> + }
>
> - if (flags & FLAG_r) return -retval;
> return retval;
> }
>
> diff --git a/testsuite/sort.tests b/testsuite/sort.tests
> index 91b282e..68fa3e4 100755
> --- a/testsuite/sort.tests
> +++ b/testsuite/sort.tests
> @@ -47,8 +47,6 @@ egg 1 2 papyrus
> 9993 0 algebra
> " "$data" ""
>
> -test x"$SKIP_KNOWN_BUGS" = x"" && {
> -# Busybox is definitely doing these wrong. FIXME
> testing "sort key range with numeric option and global reverse" \
> "sort -k2,3n -r input" \
> "egg 1 2 papyrus
> @@ -65,7 +63,6 @@ testing "sort key range with multiple options" "sort
> -k2,3rn input" \
> 42 1 3 woot
> egg1 2 papyrus
> " "$data" ""
> -}
>
> testing "sort key range with two -k options" "sort -k 2,2n -k 1,1r input" "\
> d 2
> --
> 1.7.10.4
>
> ___
> busybox mailing list
> busybox@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox
___
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
