diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/alsa-lib/Makefile | 11 | ||||
| -rwxr-xr-x | package/base-files/src/etc/init.d/fs | 4 | ||||
| -rwxr-xr-x | package/base-files/src/etc/mdev/fs | 6 | ||||
| -rw-r--r-- | package/openssh/Makefile | 2 | ||||
| -rw-r--r-- | package/openssh/patches/patch-digest-openssl_c | 12 | ||||
| -rw-r--r-- | package/openssl/Makefile | 4 |
6 files changed, 12 insertions, 27 deletions
diff --git a/package/alsa-lib/Makefile b/package/alsa-lib/Makefile index cfc3d47f7..149f3d2ae 100644 --- a/package/alsa-lib/Makefile +++ b/package/alsa-lib/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= alsa-lib PKG_VERSION:= 1.0.28 -PKG_RELEASE:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= c9e21b88a2b3e6e12ea7ba0f3b271fc3 PKG_DESCR:= sound library PKG_SECTION:= libs/audio @@ -33,13 +33,10 @@ CONFIGURE_ARGS+= --disable-python alsa-lib-install: ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/lib - ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/share/alsa/{cards,pcm} + ${INSTALL_DIR} ${IDIR_ALSA_LIB}/usr/share/alsa ${CP} ${WRKINST}/usr/lib/libasound.so* ${IDIR_ALSA_LIB}/usr/lib - ${CP} ${WRKINST}/usr/share/alsa/alsa.conf ${IDIR_ALSA_LIB}/usr/share/alsa - ${CP} ${WRKINST}//usr/share/alsa/cards/aliases.conf \ - ${IDIR_ALSA_LIB}/usr/share/alsa/cards - ${CP} ${WRKINST}//usr/share/alsa/pcm/*.conf \ - ${IDIR_ALSA_LIB}/usr/share/alsa/pcm + ${CP} ${WRKINST}//usr/share/alsa/* \ + ${IDIR_ALSA_LIB}/usr/share/alsa include ${ADK_TOPDIR}/mk/host-bottom.mk include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/base-files/src/etc/init.d/fs b/package/base-files/src/etc/init.d/fs index 9527070a1..b110af3b9 100755 --- a/package/base-files/src/etc/init.d/fs +++ b/package/base-files/src/etc/init.d/fs @@ -24,14 +24,14 @@ for fs in $fstypes; do disks=$(grep -v "^#" /etc/fstab|grep $fs|awk '{ print $1 }') for disk in $disks; do logger -t 'Filesystem' "Found $disk with filesystem $fs" - mnt=$(grep -v "^#" /etc/fstab|grep "$disk "|awk '{ print $2 }') + mnt=$(grep -v "^#" /etc/fstab|grep "${disk}[[:blank:]]"|awk '{ print $2 }') grep $fs /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then [ -x /usr/sbin/fsck.$fs ] && { logger -t 'Filesystem' "checking $fs filesystem on $disk" fsck -p $disk >/dev/null 2>&1 } - logger -t 'Filesystem' "Mounting local filesystems" + logger -t 'Filesystem' "Mounting $disk to $mnt" mkdir -p $mnt > /dev/null 2>&1 mount $disk else diff --git a/package/base-files/src/etc/mdev/fs b/package/base-files/src/etc/mdev/fs index 6c8b08699..4f1e100f4 100755 --- a/package/base-files/src/etc/mdev/fs +++ b/package/base-files/src/etc/mdev/fs @@ -26,7 +26,7 @@ fi # check if already mounted via /etc/init.d/fs adk_check() { - mount | grep "${MDEV} " + mount | grep "${MDEV}[[:blank:]]" if [ $? -eq 0 ];then logger -t mdev "Filesystem on ${MDEV} already mounted" exit 0 @@ -46,8 +46,8 @@ adk_mount() { mkdir -p $mnt >/dev/null 2>&1 grep $procfs /proc/filesystems >/dev/null 2>&1 if [ $? -eq 0 ];then - logger -t mdev "Mounting local filesystems" - mount $mnt + logger -t mdev "Mounting $disk to $mnt" + mount $mnt 2>/dev/null if [ $? -ne 0 ];then logger -s -t 'Filesystem' "Mounting $disk failed" fi diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 1d8678e88..0951ee9d1 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh PKG_VERSION:= 6.7p1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 3246aa79317b1d23cae783a3bf8275d6 PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security diff --git a/package/openssh/patches/patch-digest-openssl_c b/package/openssh/patches/patch-digest-openssl_c deleted file mode 100644 index e45e83072..000000000 --- a/package/openssh/patches/patch-digest-openssl_c +++ /dev/null @@ -1,12 +0,0 @@ ---- openssh-6.7p1.orig/digest-openssl.c 2014-07-17 01:01:26.000000000 +0200 -+++ openssh-6.7p1/digest-openssl.c 2014-10-11 21:35:47.000000000 +0200 -@@ -54,7 +54,9 @@ struct ssh_digest { - /* NB. Indexed directly by algorithm number */ - const struct ssh_digest digests[] = { - { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 }, -+#ifndef OPENSSL_NO_RIPEMD - { SSH_DIGEST_RIPEMD160, "RIPEMD160", 20, EVP_ripemd160 }, -+#endif - { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 }, - { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, - { SSH_DIGEST_SHA384, "SHA384", 48, EVP_sha384 }, diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 769bdf628..be0b943c3 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssl PKG_VERSION:= 1.0.1i -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= c8dc151a671b9b92ff3e4c118b174972 PKG_DESCR:= secure socket layer libraries PKG_SECTION:= libs/crypto @@ -37,7 +37,7 @@ BUILD_STYLE:= manual INSTALL_TARGET:= install_sw FAKE_FLAGS+= INSTALL_PREFIX=${WRKINST} -OPENSSL_OPTIONS:= shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-ripemd no-cast +OPENSSL_OPTIONS:= shared threads no-err no-krb5 zlib-dynamic no-engines no-camellia no-idea no-rc5 no-mdc2 no-sha0 no-smime no-aes192 no-cast ifneq ($(ADK_PACKAGE_LIBOPENSSL_WITH_CRYPTODEV),) OPENSSL_OPTIONS+= -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS |