Skip to contentSkip to conversation

libmspack: add new package

PATCH New Armin Kuster 1 participant 2 messages Jan 31, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libmspack: add new package

---
 recipes-security/libmspack/libmspack_0.4.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 recipes-security/libmspack/libmspack_0.4.bb
recipes-security/libmspack/libmspack_0.4.bb new file +16 -0
new file mode 100644
index 0000000..5d2061d
@@ -0,0 +1,16 @@
+SUMMARY = "A library for Microsoft compression formats"
+HOMEPAGE = "http://www.cabextract.org.uk/libmspack/"
+SECTION = "lib"
+LICENSE = "LGPL-2.1"
+DEPENDS = ""
+
+LIC_FILES_CHKSUM = "file://COPYING.LIB;beginline=1;endline=2;md5=5b1fd1f66ef926b3c8a5bb00a72a28dd"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/libm/${BPN}/${BPN}_${PV}.orig.tar.gz\
+"
+SRC_URI[md5sum] = "1ab10b507259993c74b4c41a88103b59"
+SRC_URI[sha256sum] = "b7958983f60cbec40d48ef87520210f9d8e2672a57a5ce0a2187b3d4fb2f5c68"
+
+inherit autotools
+
+S = "${WORKDIR}/${BP}alpha"
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/2 clamav: remove interal libmspack

---
 recipes-security/clamav/clamav_0.98.5.bb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)
recipes-security/clamav/clamav_0.98.5.bb +8 -11
index 73c9ab2..8f71654 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "ClamAV is an open source antivirus engine for detecting trojans,
 HOMEPAGE = "http://www.clamav.net/index.html"
 SECTION = "security"
 LICENSE = "LGPL-2.1"
-DEPENDS = "libtool db openssl zlib ncurses bzip2"
+DEPENDS = "libtool db openssl zlib ncurses bzip2 libmspack"
 
 LIC_FILES_CHKSUM = "file://COPYING.LGPL;beginline=2;endline=3;md5=4b89c05acc71195e9a06edfa2fa7d092"
 
@@ -14,13 +14,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}+dfsg.orig.tar.xz;name=arc
     file://0004-Fix-compiling-on-Hurd.patch \
     file://0005-Workaround-a-bug-in-libc-on-Hurd.patch \
     file://0006-remove-unnecessary-harmful-flags-from-libclamav.pc.patch \
-    file://0007-libclamav-use-libmspack.patch \
     file://0008-Add-upstream-systemd-support-for-clamav-daemon-and-c.patch \
     file://0009-fix-ssize_t-size_t-off_t-printf-modifier.patch \
     file://0010-hardcode-LLVM-linker-flag-because-llvm-config-return.patch \
-    file://0011-Add-libmspack-library-from-upstream-without-unnecess.patch \
-    file://0012-allow-to-use-internal-libmspack-if-the-external-is-n.patch \
-    file://0013-fix-autoreconf-with-embedded-libmspack.patch \
     file://0014-remove-AC_CONFIG_SRCDIR-llvm-configure-from-libclama.patch \
     file://0015-bb-10731-Allow-to-specificy-a-group-for-the-socket-o.patch \
     file://0016-clamav-milter-add-additinal-SMFIF_-flags-before-invo.patch \
@@ -35,23 +31,24 @@ SRC_URI = "${DEBIAN_MIRROR}/main/c/${BPN}/${BPN}_${PV}+dfsg.orig.tar.xz;name=arc
 SRC_URI[archive.md5sum] = "34d5e8698e57ce45c4a8c3c2cb211cf3"
 SRC_URI[archive.sha256sum] = "0e353f646a0add17ca42e75ccfc7edf4f8b7c1acc972a86c317543f6b365db2d"
 
-inherit autotools-brokensep pkgconfig useradd
+inherit autotools-brokensep pkgconfig useradd systemd
+
+UID = "clamav"
+GID = "clamav"
 
 S = "${WORKDIR}/${BPN}-${PV}+dfsg"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG += " ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)}"
+PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
 PACKAGECONFIG[xml] = "--with-xml=${STAGING_LIBDIR}/.., --with-xml=no, libxml2,"
 PACKAGECONFIG[json] = "--with-libjson=${STAGING_LIBDIR}, --without-libjson, json,"
 PACKAGECONFIG[curl] = "--with-libcurl=${STAGING_LIBDIR}, --without-libcurl, curl,"
 PACKAGECONFIG[ipv6] = "--enable-ipv6, --disable-ipv6"
-
-UID = "clamav"
-GID = "clamav"
+PACKAGECONFI[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', "
 
 EXTRA_OECONF += " --with-user=${UID}  --with-group=${GID} \
-            --without-libcheck-prefix \
-            --disable-unrar \
+            --without-libcheck-prefix --disable-unrar \
             --disable-llvm \
             --with-openssl=${STAGING_LIBDIR}/.. \
             --with-zlib=${STAGING_LIBDIR}/.. \
Signature · 1 line
1.9.1