Skip to contentSkip to conversation

package/libmspack: new package

PATCH New Bernd Kuhls 2 participants 3 messages Oct 5, 2019 – Oct 10, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 package/libmspack: new package

Needed for upcoming clamav version bump to 0.102.0.

Package passed test-pkg:

                             andes-nds32 [ 1/44]: OK
                             arm-aarch64 [ 2/44]: OK
                        br-aarch64-glibc [ 3/44]: OK
                           br-arcle-hs38 [ 4/44]: OK
                            br-arm-basic [ 5/44]: OK
                  br-arm-cortex-a9-glibc [ 6/44]: OK
                   br-arm-cortex-a9-musl [ 7/44]: OK
                   br-arm-cortex-m4-full [ 8/44]: OK
                             br-arm-full [ 9/44]: OK
                    br-arm-full-nothread [10/44]: OK
                      br-arm-full-static [11/44]: OK
                   br-i386-pentium4-full [12/44]: OK
                br-i386-pentium-mmx-musl [13/44]: OK
                       br-m68k-5208-full [14/44]: OK
                      br-m68k-68040-full [15/44]: OK
                    br-microblazeel-full [16/44]: OK
                 br-mips32r6-el-hf-glibc [17/44]: OK
                      br-mips64-n64-full [18/44]: OK
                 br-mips64r6-el-hf-glibc [19/44]: OK
                      br-mipsel-o32-full [20/44]: OK
                          br-nios2-glibc [21/44]: OK
                      br-openrisc-uclibc [22/44]: OK
               br-powerpc-603e-basic-cpp [23/44]: OK
             br-powerpc64le-power8-glibc [24/44]: OK
               br-powerpc64-power7-glibc [25/44]: OK
                  br-powerpc-e500mc-full [26/44]: OK
                              br-riscv32 [27/44]: OK
                              br-riscv64 [28/44]: OK
                             br-sh4-full [29/44]: OK
                        br-sparc64-glibc [30/44]: OK
                         br-sparc-uclibc [31/44]: OK
                    br-x86-64-core2-full [32/44]: OK
                          br-x86-64-musl [33/44]: OK
                          br-xtensa-full [34/44]: OK
                       linaro-aarch64-be [35/44]: OK
                          linaro-aarch64 [36/44]: OK
                              linaro-arm [37/44]: OK
                     sourcery-arm-armv4t [38/44]: OK
                            sourcery-arm [39/44]: OK
                     sourcery-arm-thumb2 [40/44]: OK
                         sourcery-mips64 [41/44]: OK
                           sourcery-mips [42/44]: OK
                          sourcery-nios2 [43/44]: OK
                         sourcery-x86-64 [44/44]: OK

44 builds, 0 skipped, 0 build failed, 0 legal-info failed

---
v2: no changes

 DEVELOPERS                       |  1 +
 package/Config.in                |  1 +
 package/libmspack/Config.in      |  7 +++++++
 package/libmspack/libmspack.hash |  3 +++
 package/libmspack/libmspack.mk   | 13 +++++++++++++
 5 files changed, 25 insertions(+)
 create mode 100644 package/libmspack/Config.in
 create mode 100644 package/libmspack/libmspack.hash
 create mode 100644 package/libmspack/libmspack.mk
DEVELOPERS +1 -0
index d9f580a8a5..7ec94cfa38 100644
@@ -349,6 +349,7 @@ F:	package/libilbc/
 F:	package/libldns/
 F:	package/libmicrohttpd/
 F:	package/libminiupnpc/
+F:	package/libmspack/
 F:	package/libnatpmp/
 F:	package/libnpth/
 F:	package/libogg/
package/Config.in +1 -0
index 77207854cd..8a9634a743 100644
@@ -1210,6 +1210,7 @@ endmenu
 
 menu "Compression and decompression"
 	source "package/libarchive/Config.in"
+	source "package/libmspack/Config.in"
 	source "package/libsquish/Config.in"
 	source "package/libzip/Config.in"
 	source "package/lzo/Config.in"
package/libmspack/Config.in new file +7 -0
new file mode 100644
index 0000000000..e2b1a9059a
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBMSPACK
+	bool "libmspack"
+	help
+	  libmspack is a portable library for some loosely related
+	  Microsoft compression formats
+
+	  https://www.cabextract.org.uk/libmspack
package/libmspack/libmspack.hash new file +3 -0
new file mode 100644
index 0000000000..b12e9b6280
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 bac862dee6e0fc10d92c70212441d9f8ad9b0222edc9a708c3ead4adb1b24a8e  libmspack-0.10.1alpha.tar.gz
+sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7  COPYING.LIB
package/libmspack/libmspack.mk new file +13 -0
new file mode 100644
index 0000000000..e9fdc3ca8d
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libmspack
+#
+################################################################################
+
+LIBMSPACK_VERSION = 0.10.1alpha
+LIBMSPACK_SITE = https://www.cabextract.org.uk/libmspack
+LIBMSPACK_LICENSE = LGPL-2.1
+LIBMSPACK_LICENSE_FILES = COPYING.LIB
+LIBMSPACK_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 2/2 package/clamav: bump version to 0.102.0

Release notes:
https://blog.clamav.net/2019/10/clamav-01020-has-been-released.html

Added dependencies to libcurl and libmspack.

Although it is technically possible to build this package without libcurl it makes no sense because only libclamav would be built by passing the new configure option --enable-libclamav-only but this would disable most of the package rendering the scan for viruses impossible. Therefore we decided to make libcurl a mandatory dependency.

libmspack was added as dependency to avoid building the internally provided code for this package, we prefer to provide needed libraries ourselves. Linking against internally-built libmspack is broken anyway but we do not bother to fix the problem, use system libmspack instead.

---
v2: typo fixes in patch description

 package/clamav/Config.in   |  2 ++
 package/clamav/clamav.hash |  2 +-
 package/clamav/clamav.mk   | 13 +++++--------
 3 files changed, 8 insertions(+), 9 deletions(-)
package/clamav/Config.in +2 -0
index 2017011b67..b3f09aebda 100644
@@ -4,6 +4,8 @@ config BR2_PACKAGE_CLAMAV
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBMSPACK
 	select BR2_PACKAGE_LIBTOOL
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
package/clamav/clamav.hash +1 -1
index 1246f4febf..aaebfd104c 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256 0bf094f0919d158a578421d66bc2569c8c8181233ba162bb51722f98c802bccd  clamav-0.101.4.tar.gz
+sha256 48fe188c46c793c2d0cb5c81c106e4690251aff6dc8aa6575dc688343291bee1  clamav-0.102.0.tar.gz
 sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584  COPYING
 sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed  COPYING.bzip2
 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6  COPYING.file
package/clamav/clamav.mk +5 -8
index 03ce4136a7..6500826339 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CLAMAV_VERSION = 0.101.4
+CLAMAV_VERSION = 0.102.0
 CLAMAV_SITE = https://www.clamav.net/downloads/production
 CLAMAV_LICENSE = GPL-2.0
 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
@@ -12,6 +12,8 @@ CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
 	COPYING.unrar COPYING.zlib
 CLAMAV_DEPENDENCIES = \
 	host-pkgconf \
+	libcurl \
+	libmspack \
 	libtool \
 	openssl \
 	zlib \
@@ -31,7 +33,9 @@ CLAMAV_CONF_OPTS = \
 	--with-dbdir=/var/lib/clamav \
 	--with-ltdl-include=$(STAGING_DIR)/usr/include \
 	--with-ltdl-lib=$(STAGING_DIR)/usr/lib \
+	--with-libcurl=$(STAGING_DIR)/usr \
 	--with-openssl=$(STAGING_DIR)/usr \
+	--with-system-libmspack=$(STAGING_DIR)/usr \
 	--with-zlib=$(STAGING_DIR)/usr \
 	--disable-zlib-vcheck \
 	--disable-rpath \
@@ -66,13 +70,6 @@ else
 CLAMAV_CONF_OPTS += --disable-xml
 endif
 
-ifeq ($(BR2_PACKAGE_LIBCURL),y)
-CLAMAV_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
-CLAMAV_DEPENDENCIES += libcurl
-else
-CLAMAV_CONF_OPTS += --without-libcurl
-endif
-
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 CLAMAV_CONF_OPTS += --with-iconv
 CLAMAV_DEPENDENCIES += libiconv
Signature · 1 line
2.20.1
#2 lore raw

PATCH v2 1/2 package/libmspack: new package

In reply to Bernd Kuhls
Quoted 48 lines · On Sat, 5 Oct 2019 22:59:20 +0200 Bernd Kuhls <[email protected]> wrote:

Needed for upcoming clamav version bump to 0.102.0.

Package passed test-pkg:

                             andes-nds32 [ 1/44]: OK
                             arm-aarch64 [ 2/44]: OK
                        br-aarch64-glibc [ 3/44]: OK
                           br-arcle-hs38 [ 4/44]: OK
                            br-arm-basic [ 5/44]: OK
                  br-arm-cortex-a9-glibc [ 6/44]: OK
                   br-arm-cortex-a9-musl [ 7/44]: OK
                   br-arm-cortex-m4-full [ 8/44]: OK
                             br-arm-full [ 9/44]: OK
                    br-arm-full-nothread [10/44]: OK
                      br-arm-full-static [11/44]: OK
                   br-i386-pentium4-full [12/44]: OK
                br-i386-pentium-mmx-musl [13/44]: OK
                       br-m68k-5208-full [14/44]: OK
                      br-m68k-68040-full [15/44]: OK
                    br-microblazeel-full [16/44]: OK
                 br-mips32r6-el-hf-glibc [17/44]: OK
                      br-mips64-n64-full [18/44]: OK
                 br-mips64r6-el-hf-glibc [19/44]: OK
                      br-mipsel-o32-full [20/44]: OK
                          br-nios2-glibc [21/44]: OK
                      br-openrisc-uclibc [22/44]: OK
               br-powerpc-603e-basic-cpp [23/44]: OK
             br-powerpc64le-power8-glibc [24/44]: OK
               br-powerpc64-power7-glibc [25/44]: OK
                  br-powerpc-e500mc-full [26/44]: OK
                              br-riscv32 [27/44]: OK
                              br-riscv64 [28/44]: OK
                             br-sh4-full [29/44]: OK
                        br-sparc64-glibc [30/44]: OK
                         br-sparc-uclibc [31/44]: OK
                    br-x86-64-core2-full [32/44]: OK
                          br-x86-64-musl [33/44]: OK
                          br-xtensa-full [34/44]: OK
                       linaro-aarch64-be [35/44]: OK
                          linaro-aarch64 [36/44]: OK
                              linaro-arm [37/44]: OK
                     sourcery-arm-armv4t [38/44]: OK
                            sourcery-arm [39/44]: OK
                     sourcery-arm-thumb2 [40/44]: OK
                         sourcery-mips64 [41/44]: OK
                           sourcery-mips [42/44]: OK
                          sourcery-nios2 [43/44]: OK
                         sourcery-x86-64 [44/44]: OK
Quoted 5 lines

44 builds, 0 skipped, 0 build failed, 0 legal-info failed

---
v2: no changes

Both patches applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com