- Timestamp:
- Feb 16, 2009, 11:38:00 AM (16 years ago)
- Branches:
- master
- Children:
- ea546c8
- Parents:
- 19776da
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/busybox-1.13.2-branch_update-3.patch
r19776da r7791a76 1 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 02- 03-20092 Date: 02-16-2009 3 3 Initial Package Version: 1.13.2 4 4 Origin: Upstream … … 9 9 diff -Naur busybox-1.13.2.orig/archival/tar.c busybox-1.13.2/archival/tar.c 10 10 --- busybox-1.13.2.orig/archival/tar.c 2008-11-09 09:28:02.000000000 -0800 11 +++ busybox-1.13.2/archival/tar.c 2009-02- 03 18:52:40.994695068-080011 +++ busybox-1.13.2/archival/tar.c 2009-02-16 11:36:01.760066770 -0800 12 12 @@ -591,8 +591,6 @@ 13 13 struct TarBallInfo tbInfo; … … 19 19 tbInfo.verboseFlag = verboseFlag; 20 20 21 diff -Naur busybox-1.13.2.orig/include/libbb.h busybox-1.13.2/include/libbb.h 22 --- busybox-1.13.2.orig/include/libbb.h 2008-12-30 19:06:45.000000000 -0800 23 +++ busybox-1.13.2/include/libbb.h 2009-02-16 11:36:00.780793407 -0800 24 @@ -1275,7 +1275,13 @@ 25 PSSCAN_UTIME = 1 << 13, 26 PSSCAN_TTY = 1 << 14, 27 PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, 28 - PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF), 29 + /* NB: used by find_pid_by_name(). Any applet using it 30 + * needs to be mentioned here. */ 31 + PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL 32 + || ENABLE_PGREP || ENABLE_PKILL 33 + || ENABLE_PIDOF 34 + || ENABLE_SESTATUS 35 + ), 36 USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) 37 PSSCAN_START_TIME = 1 << 18, 38 PSSCAN_CPU = 1 << 19, 21 39 diff -Naur busybox-1.13.2.orig/init/init.c busybox-1.13.2/init/init.c 22 40 --- busybox-1.13.2.orig/init/init.c 2008-12-30 19:06:45.000000000 -0800 23 +++ busybox-1.13.2/init/init.c 2009-02- 03 18:52:38.186515155-080041 +++ busybox-1.13.2/init/init.c 2009-02-16 11:35:55.638637240 -0800 24 42 @@ -671,15 +671,14 @@ 25 43 */ … … 73 91 diff -Naur busybox-1.13.2.orig/modutils/depmod.c busybox-1.13.2/modutils/depmod.c 74 92 --- busybox-1.13.2.orig/modutils/depmod.c 2008-11-09 09:28:03.000000000 -0800 75 +++ busybox-1.13.2/modutils/depmod.c 2009-02- 03 18:52:37.966500907-080093 +++ busybox-1.13.2/modutils/depmod.c 2009-02-16 11:35:55.041711971 -0800 76 94 @@ -33,7 +33,7 @@ 77 95 enum { … … 195 213 diff -Naur busybox-1.13.2.orig/modutils/modutils-24.c busybox-1.13.2/modutils/modutils-24.c 196 214 --- busybox-1.13.2.orig/modutils/modutils-24.c 2008-11-28 22:48:56.000000000 -0800 197 +++ busybox-1.13.2/modutils/modutils-24.c 2009-02- 03 18:52:40.062637519-0800215 +++ busybox-1.13.2/modutils/modutils-24.c 2009-02-16 11:36:01.295790474 -0800 198 216 @@ -2150,7 +2150,7 @@ 199 217 sec->name = name; … … 295 313 diff -Naur busybox-1.13.2.orig/testsuite/mdev.tests busybox-1.13.2/testsuite/mdev.tests 296 314 --- busybox-1.13.2.orig/testsuite/mdev.tests 2008-11-09 09:28:19.000000000 -0800 297 +++ busybox-1.13.2/testsuite/mdev.tests 2009-02- 03 18:52:38.510535828-0800315 +++ busybox-1.13.2/testsuite/mdev.tests 2009-02-16 11:36:01.053896354 -0800 298 316 @@ -111,6 +111,22 @@ 299 317 … … 321 339 diff -Naur busybox-1.13.2.orig/util-linux/mdev.c busybox-1.13.2/util-linux/mdev.c 322 340 --- busybox-1.13.2.orig/util-linux/mdev.c 2008-11-09 09:28:22.000000000 -0800 323 +++ busybox-1.13.2/util-linux/mdev.c 2009-02- 03 18:52:38.510535828-0800341 +++ busybox-1.13.2/util-linux/mdev.c 2009-02-16 11:36:01.053896354 -0800 324 342 @@ -179,8 +179,9 @@ 325 343 unsigned i, n;
Note:
See TracChangeset
for help on using the changeset viewer.