base-system-busybox: removed; we'll use the busybox pkg instead.
This commit is contained in:
Juan RP
parent
61687e4c91
commit
db13038efe
File diff suppressed because it is too large
Load Diff
|
|
@ -1,39 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# udhcpc script edited by Tim Riker <Tim@Rikers.org>
|
||||
|
||||
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
|
||||
|
||||
RESOLV_CONF="/etc/resolv.conf"
|
||||
[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
|
||||
[ -n "$subnet" ] && NETMASK="netmask $subnet"
|
||||
|
||||
case "$1" in
|
||||
deconfig)
|
||||
/sbin/ifconfig $interface 0.0.0.0
|
||||
;;
|
||||
|
||||
renew|bound)
|
||||
/sbin/ifconfig $interface $ip $BROADCAST $NETMASK
|
||||
|
||||
if [ -n "$router" ] ; then
|
||||
echo "deleting routers"
|
||||
while route del default gw 0.0.0.0 dev $interface ; do
|
||||
:
|
||||
done
|
||||
|
||||
for i in $router ; do
|
||||
route add default gw $i dev $interface
|
||||
done
|
||||
fi
|
||||
|
||||
echo -n > $RESOLV_CONF
|
||||
[ -n "$domain" ] && echo search $domain >> $RESOLV_CONF
|
||||
for i in $dns ; do
|
||||
echo adding dns $i
|
||||
echo nameserver $i >> $RESOLV_CONF
|
||||
done
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
|
||||
index 39ffa08..432551c 100644
|
||||
--- libbb/pw_encrypt.c
|
||||
+++ libbb/pw_encrypt.c
|
||||
@@ -59,7 +59,7 @@ char* FAST_FUNC crypt_make_pw_salt(char salt[MAX_PW_SALT_LEN], const char *algo)
|
||||
*salt_ptr++ = '$';
|
||||
#if !ENABLE_USE_BB_CRYPT || ENABLE_USE_BB_CRYPT_SHA
|
||||
if (algo[0] == 's') { /* sha */
|
||||
- salt[1] = '5' + (strcmp(algo, "sha512") == 0);
|
||||
+ salt[1] = '6' - (strcmp(algo, "sha256") == 0);
|
||||
len = 16/2;
|
||||
}
|
||||
#endif
|
||||
diff --git a/loginutils/chpasswd.c b/loginutils/chpasswd.c
|
||||
index 54ed737..59ea602 100644
|
||||
--- loginutils/chpasswd.c
|
||||
+++ loginutils/chpasswd.c
|
||||
@@ -13,11 +13,13 @@
|
||||
//usage: "Read user:password from stdin and update /etc/passwd\n"
|
||||
//usage: IF_LONG_OPTS(
|
||||
//usage: "\n -e,--encrypted Supplied passwords are in encrypted form"
|
||||
-//usage: "\n -m,--md5 Use MD5 encryption instead of DES"
|
||||
+//usage: "\n -m,--md5 Use MD5 encryption instead of SHA512"
|
||||
+//usage: "\n -d,--des Use DES encryption instead of SHA512"
|
||||
//usage: )
|
||||
//usage: IF_NOT_LONG_OPTS(
|
||||
//usage: "\n -e Supplied passwords are in encrypted form"
|
||||
-//usage: "\n -m Use MD5 encryption instead of DES"
|
||||
+//usage: "\n -m Use MD5 encryption instead of SHA512"
|
||||
+//usage: "\n -d Use DES encryption instead of SHA512"
|
||||
//usage: )
|
||||
|
||||
//TODO: implement -c ALGO
|
||||
@@ -26,11 +28,13 @@
|
||||
static const char chpasswd_longopts[] ALIGN1 =
|
||||
"encrypted\0" No_argument "e"
|
||||
"md5\0" No_argument "m"
|
||||
+ "des\0" No_argument "d"
|
||||
;
|
||||
#endif
|
||||
|
||||
#define OPT_ENC 1
|
||||
#define OPT_MD5 2
|
||||
+#define OPT_DES 4
|
||||
|
||||
int chpasswd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||
int chpasswd_main(int argc UNUSED_PARAM, char **argv)
|
||||
@@ -41,9 +45,9 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (getuid() != 0)
|
||||
bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
|
||||
|
||||
- opt_complementary = "m--e:e--m";
|
||||
+ opt_complementary = "m--e:e--m:d--e:e--d:m--d:d--m";
|
||||
IF_LONG_OPTS(applet_long_options = chpasswd_longopts;)
|
||||
- opt = getopt32(argv, "em");
|
||||
+ opt = getopt32(argv, "emd");
|
||||
|
||||
while ((name = xmalloc_fgetline(stdin)) != NULL) {
|
||||
char *free_me;
|
||||
@@ -61,12 +65,14 @@ int chpasswd_main(int argc UNUSED_PARAM, char **argv)
|
||||
if (!(opt & OPT_ENC)) {
|
||||
char salt[sizeof("$N$XXXXXXXX")];
|
||||
|
||||
- crypt_make_salt(salt, 1);
|
||||
+ salt[0] = '$';
|
||||
+ salt[1] = '6';
|
||||
+ salt[2] = '$';
|
||||
+ crypt_make_salt(salt + 3, 4);
|
||||
if (opt & OPT_MD5) {
|
||||
- salt[0] = '$';
|
||||
salt[1] = '1';
|
||||
- salt[2] = '$';
|
||||
- crypt_make_salt(salt + 3, 4);
|
||||
+ } else if (opt & OPT_DES) {
|
||||
+ crypt_make_salt(salt, 1);
|
||||
}
|
||||
free_me = pass = pw_encrypt(pass, salt, 0);
|
||||
}
|
||||
|
|
@ -1,62 +0,0 @@
|
|||
# Build template for 'base-system-busybox'.
|
||||
pkgname=base-system-busybox
|
||||
version=1.23.2
|
||||
revision=7
|
||||
wrksrc="busybox-${version}"
|
||||
homepage="http://www.busybox.net"
|
||||
hostmakedepends="perl"
|
||||
short_desc="The Swiss Army Knife of Embedded Linux - base-system replacements"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
license="GPL-2"
|
||||
distfiles="${homepage}/downloads/busybox-$version.tar.bz2"
|
||||
checksum=05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a
|
||||
|
||||
register_shell="/bin/sh"
|
||||
conflicts="base-system>=0"
|
||||
|
||||
# Applets provided by this busybox version.
|
||||
# Keep this list updated with ${FILESDIR}/dotconfig.
|
||||
#
|
||||
# XXX bzip2 provides libbz2, split it into libbz2 pkg.
|
||||
# XXX pgrep/pkill do not support -s0,1 required by runit-void.
|
||||
#
|
||||
_FEATURES="acpid coreutils cpio dash diffutils dosfstools findutils awk
|
||||
grep gzip hdparm ifenslave iproute2 iputils less lsof netcat nvi
|
||||
patch powertop psmisc rfkill run-parts sed tar
|
||||
traceroute util-linux which whois xz ncurses"
|
||||
for f in ${_FEATURES}; do
|
||||
provides+=" ${f}-${version}_${revision}"
|
||||
conflicts+=" ${f}>=0"
|
||||
done
|
||||
|
||||
depends="base-files runit-void xbps kbd eudev shadow kmod ncurses-base procps-ng tzdata ethtool"
|
||||
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
*-musl) depends+=" musl";;
|
||||
*) depends+=" glibc-locales";;
|
||||
esac
|
||||
|
||||
pre_build() {
|
||||
cp -f ${FILESDIR}/dotconfig .config
|
||||
if [ "$CROSS_BUILD" ]; then
|
||||
sed -e "s,\(CONFIG_CROSS_COMPILER_PREFIX\).*,\1=\"${XBPS_CROSS_TRIPLET}-\",g" -i .config
|
||||
fi
|
||||
}
|
||||
do_build() {
|
||||
rm -f ${XBPS_WRAPPERDIR}/strip
|
||||
make ${makejobs}
|
||||
}
|
||||
do_install() {
|
||||
# Install everything to /usr/bin.
|
||||
vmkdir usr/bin
|
||||
for f in bin sbin; do
|
||||
ln -sfr ${DESTDIR}/usr/bin ${DESTDIR}/${f}
|
||||
done
|
||||
make CONFIG_PREFIX=${DESTDIR} install
|
||||
vinstall ${FILESDIR}/udhcpc-default.script \
|
||||
755 usr/share/udhcpc default.script
|
||||
mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
|
||||
rm -f ${DESTDIR}/{,s}bin
|
||||
# Provide /sbin/init symlink to runit.
|
||||
ln -s runit-init ${DESTDIR}/usr/bin/init
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
pkgname=busybox
|
||||
ignore="*.0"
|
||||
Loading…
Reference in New Issue