[arch-commits] Commit in busybox/trunk (PKGBUILD busybox.install config)

Eli Schwartz eschwartz at archlinux.org
Tue May 22 21:47:10 UTC 2018 

    Date: Tuesday, May 22, 2018 @ 21:47:09
  Author: eschwartz
Revision: 327778

upgpkg: busybox 1.28.4-1

upstream release
remove install script for preserving suid, see FS#25999
update some options useful for desktop builds
remove old workarounds

Modified:
  busybox/trunk/PKGBUILD
  busybox/trunk/config
Deleted:
  busybox/trunk/busybox.install

-----------------+
 PKGBUILD        |   20 ++++++++++----------
 busybox.install |   16 ----------------
 config          |   37 ++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-22 21:33:09 UTC (rev 327777)
+++ PKGBUILD	2018-05-22 21:47:09 UTC (rev 327778)
@@ -3,25 +3,22 @@
 # Contributor: Jens Pranaitis <jens at jenux.homelinux.org>
 
 pkgname=busybox
-pkgver=1.28.3
+pkgver=1.28.4
 pkgrel=1
 pkgdesc="Utilities for rescue and embedded systems"
 arch=("x86_64")
 url="https://www.busybox.net"
 license=('GPL')
-makedepends=("make" "gcc" "sed" "ncurses" "musl" "kernel-headers-musl")
-install=busybox.install
+makedepends=("ncurses" "musl" "kernel-headers-musl")
 source=("$url/downloads/$pkgname-$pkgver.tar.bz2"
-	"config")
-sha256sums=('ad0d22033f23e696f9a71a4c2f9210194dda39b024a79151f4ac278995332a6e'
-            '5ac1b35aa9fee3be15a4ce10e533de35ea9e51f888186a45222e102f35c36bc6')
+        "config")
+sha256sums=('e3c14a3699dc7e82fed397392957afc78e37bdf25398ac38ead6e84621b2ae6a'
+            '7f868afafe381712f45c1c8e8bfe452b40450c1cf56a7313b6746747d9bac323')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
   cp "$srcdir"/config .config
-  sed '1,1i#include <sys/resource.h>' -i include/libbb.h
-  # if you want to run menuconfig uncomment the following line:
-#  make menuconfig ; return 1
   # reproducible build
   export KCONFIG_NOTIMESTAMP=1
   make CC=musl-gcc
@@ -29,7 +26,10 @@
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  install -Dm755 busybox "$pkgdir"/usr/bin/busybox
+
+  install -Dm0755 busybox "$pkgdir"/usr/bin/busybox
+
+  # docs
   install -Dm644 docs/busybox.1 "$pkgdir"/usr/share/man/man1/busybox.1
   for doc in BusyBox.html BusyBox.txt; do
     install -Dm644 docs/$doc "$pkgdir"/usr/share/doc/$pkgname/$doc

Deleted: busybox.install
===================================================================
--- busybox.install	2018-05-22 21:33:09 UTC (rev 327777)
+++ busybox.install	2018-05-22 21:47:09 UTC (rev 327778)
@@ -1,16 +0,0 @@
-_tmp_dir=tmp/busybox.upgrade
-
-post_install() {
-  echo "You may want to do setuid on /usr/bin/busybox"
-  echo "  chmod 4555 /usr/bin/busybox"
-}
-
-pre_upgrade() {
-  mkdir ${_tmp_dir} || exit 1
-  busybox stat -c %a usr/bin/busybox >${_tmp_dir}/busybox.upgrade.script
-}
-
-post_upgrade() {
-  [ -f ${_tmp_dir}/busybox.upgrade.script ] && busybox chmod `busybox cat ${_tmp_dir}/busybox.upgrade.script` usr/bin/busybox
-  busybox rm -rf ${_tmp_dir}
-}

Modified: config
===================================================================
--- config	2018-05-22 21:33:09 UTC (rev 327777)
+++ config	2018-05-22 21:47:09 UTC (rev 327778)
@@ -1,7 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.28.1
-# Mon Feb 19 12:49:10 2018
+# Busybox version: 1.28.4
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -8,7 +7,7 @@
 #
 # Settings
 #
-# CONFIG_DESKTOP is not set
+CONFIG_DESKTOP=y
 # CONFIG_EXTRA_COMPAT is not set
 # CONFIG_FEDORA_COMPAT is not set
 CONFIG_INCLUDE_SUSv2=y
@@ -56,10 +55,10 @@
 #
 # Installation Options ("make install" behavior)
 #
-CONFIG_INSTALL_APPLET_SYMLINKS=y
+# CONFIG_INSTALL_APPLET_SYMLINKS is not set
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
 # CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
+CONFIG_INSTALL_APPLET_DONT=y
 # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
 # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
 # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
@@ -93,7 +92,7 @@
 CONFIG_FEATURE_EDITING=y
 CONFIG_FEATURE_EDITING_MAX_LEN=1024
 # CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
+CONFIG_FEATURE_EDITING_HISTORY=255
 CONFIG_FEATURE_EDITING_SAVEHISTORY=y
 CONFIG_FEATURE_EDITING_SAVE_ON_EXIT=y
 CONFIG_FEATURE_REVERSE_SEARCH=y
@@ -180,9 +179,9 @@
 # CONFIG_FEATURE_TAR_SELINUX is not set
 CONFIG_UNZIP=y
 CONFIG_FEATURE_UNZIP_CDF=y
-# CONFIG_FEATURE_UNZIP_BZIP2 is not set
-# CONFIG_FEATURE_UNZIP_LZMA is not set
-# CONFIG_FEATURE_UNZIP_XZ is not set
+CONFIG_FEATURE_UNZIP_BZIP2=y
+CONFIG_FEATURE_UNZIP_LZMA=y
+CONFIG_FEATURE_UNZIP_XZ=y
 CONFIG_FEATURE_LZMA_FAST=y
 
 #
@@ -325,10 +324,10 @@
 CONFIG_UUENCODE=y
 CONFIG_WC=y
 CONFIG_FEATURE_WC_LARGE=y
-CONFIG_WHOAMI=y
 # CONFIG_WHO is not set
 # CONFIG_W is not set
 # CONFIG_USERS is not set
+CONFIG_WHOAMI=y
 CONFIG_YES=y
 
 #
@@ -392,7 +391,7 @@
 # klibc-utils
 #
 # CONFIG_MINIPS is not set
-CONFIG_NUKE=y
+# CONFIG_NUKE is not set
 CONFIG_RESUME=y
 CONFIG_RUN_INIT=y
 
@@ -499,10 +498,10 @@
 CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_CRYPT=y
 CONFIG_USE_BB_CRYPT_SHA=y
+# CONFIG_ADD_SHELL is not set
+# CONFIG_REMOVE_SHELL is not set
 CONFIG_ADDGROUP=y
 CONFIG_FEATURE_ADDUSER_TO_GROUP=y
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
 CONFIG_ADDUSER=y
 CONFIG_FEATURE_CHECK_NAMES=y
 CONFIG_LAST_ID=60000
@@ -752,10 +751,10 @@
 # CONFIG_FEATURE_DEVFS is not set
 # CONFIG_DEVMEM is not set
 CONFIG_FBSPLASH=y
-# CONFIG_FLASHCP is not set
 # CONFIG_FLASH_ERASEALL is not set
 # CONFIG_FLASH_LOCK is not set
 # CONFIG_FLASH_UNLOCK is not set
+# CONFIG_FLASHCP is not set
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
@@ -800,7 +799,6 @@
 CONFIG_STRINGS=y
 CONFIG_TIME=y
 CONFIG_TTYSIZE=y
-CONFIG_UBIRENAME=y
 CONFIG_UBIATTACH=y
 CONFIG_UBIDETACH=y
 CONFIG_UBIMKVOL=y
@@ -807,6 +805,7 @@
 CONFIG_UBIRMVOL=y
 CONFIG_UBIRSVOL=y
 CONFIG_UBIUPDATEVOL=y
+CONFIG_UBIRENAME=y
 CONFIG_VOLNAME=y
 CONFIG_WATCHDOG=y
 
@@ -1010,11 +1009,11 @@
 CONFIG_POWERTOP=y
 CONFIG_FEATURE_POWERTOP_INTERACTIVE=y
 CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_FEATURE_PS_LONG=y
-# CONFIG_FEATURE_PS_TIME is not set
+# CONFIG_FEATURE_PS_WIDE is not set
+# CONFIG_FEATURE_PS_LONG is not set
+CONFIG_FEATURE_PS_TIME=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
 CONFIG_PSTREE=y
 CONFIG_PWDX=y
 CONFIG_SMEMCAP=y

More information about the arch-commits mailing list