mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-01-11 15:00:34 +00:00
Code Issues Projects Releases Wiki Activity

meta-security: Convert to new override syntax

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-07-29 16:31:12 -07:00
parent d3a484abf8
commit 11a67b861a
49 changed files with 785 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
recipes-scanners/arpwatch/arpwatch_3.1.bb
View File

@@ -66,14 +66,14 @@ INITSCRIPT_NAME = "arpwatch"
INITSCRIPT_PARAMS = "start 02 2 3 4 5 . stop 20 0 1 6 ."
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "--system ${ARPWATCH_UID}"
USERADD_PARAM_${PN} = "--system -g ${ARPWATCH_GID} --home-dir \
GROUPADD_PARAM:${PN} = "--system ${ARPWATCH_UID}"
USERADD_PARAM:${PN} = "--system -g ${ARPWATCH_GID} --home-dir \
${localstatedir}/spool/${BPN} \
--no-create-home --shell /bin/false ${BPN}"
CONFFILE_FILES = "${sysconfdir}/${PN}.conf"
FILES_${PN} = "${bindir} ${sbindir} ${prefix}/etc/rc.d \
FILES:${PN} = "${bindir} ${sbindir} ${prefix}/etc/rc.d \
${sysconfdir} /var/lib/arpwatch"
RDEPENDS_${PN} = "libpcap postfix postfix-cfg"
RDEPENDS:${PN} = "libpcap postfix postfix-cfg"

6
recipes-scanners/buck-security/buck-security_0.7.bb
View File

@@ -26,16 +26,16 @@ do_install() {
}
FILES_${PN} = "${bindir}/*"
FILES:${PN} = "${bindir}/*"
RDEPENDS_${PN} = "coreutils gnupg net-tools perl perl-module-data-dumper \
RDEPENDS:${PN} = "coreutils gnupg net-tools perl perl-module-data-dumper \
perl-module-file-basename perl-module-file-spec perl-module-getopt-long \
perl-module-lib perl-module-posix perl-module-term-ansicolor \
perl-module-time-localtime pinentry perl-module-pod-usage \
perl-module-pod-text perl-module-file-glob \
"
RDEPENDS_${PN}_class-native = "coreutils net-tools perl perl-module-data-dumper \
RDEPENDS:${PN}:class-native = "coreutils net-tools perl perl-module-data-dumper \
perl-module-file-basename perl-module-file-spec perl-module-getopt-long \
perl-module-lib perl-module-posix perl-module-term-ansicolor \
perl-module-time-localtime perl-module-file-glob\

2
recipes-scanners/checksec/checksec_2.4.0.bb
View File

@@ -16,4 +16,4 @@ do_install() {
install -m 0755 ${S}/checksec ${D}${bindir}
}
RDEPENDS_${PN} = "bash openssl-bin binutils"
RDEPENDS:${PN} = "bash openssl-bin binutils"

2
recipes-scanners/checksecurity/checksecurity_2.0.15.bb
View File

@@ -18,4 +18,4 @@ do_install() {
oe_runmake PREFIX=${D}
}
RDEPENDS_${PN} = "perl libenv-perl perl-module-tie-array perl-module-getopt-long perl-module-file-glob perl-module-carp perl-module-env perl-module-tap-parser-iterator-array util-linux findutils coreutils"
RDEPENDS:${PN} = "perl libenv-perl perl-module-tie-array perl-module-getopt-long perl-module-file-glob perl-module-carp perl-module-env perl-module-tap-parser-iterator-array util-linux findutils coreutils"

38
recipes-scanners/clamav/clamav_0.104.0.bb
View File

@@ -52,7 +52,7 @@ PACKAGECONFIG[systemd] = "-DENABLE_SYSTEMD=ON -DSYSTEMD_UNIT_DIR=${systemd_syste
export OECMAKE_C_FLAGS += " -I${STAGING_INCDIR} -L ${RECIPE_SYSROOT}${nonarch_libdir} -L${STAGING_LIBDIR} -lpthread"
do_install_append () {
do_install:append () {
install -d ${D}/${sysconfdir}
install -d ${D}/${localstatedir}/lib/clamav
install -d ${D}${sysconfdir}/clamav ${D}${sysconfdir}/default/volatiles
@@ -76,7 +76,7 @@ do_install_append () {
oe_multilib_header clamav-types.h
}
pkg_postinst_${PN} () {
pkg_postinst:${PN} () {
if [ -z "$D" ]; then
if command -v systemd-tmpfiles >/dev/null; then
systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/clamav.conf
@@ -89,17 +89,17 @@ pkg_postinst_${PN} () {
PACKAGES += "${PN}-daemon ${PN}-clamdscan ${PN}-freshclam ${PN}-libclamav"
FILES_${PN} = "${bindir}/clambc ${bindir}/clamscan ${bindir}/clamsubmit ${sbindir}/clamonacc \
FILES:${PN} = "${bindir}/clambc ${bindir}/clamscan ${bindir}/clamsubmit ${sbindir}/clamonacc \
${bindir}/*sigtool ${mandir}/man1/clambc* ${mandir}/man1/clamscan* \
${mandir}/man1/sigtool* ${mandir}/man1/clambsubmit* \
${docdir}/clamav/*"
FILES_${PN}-clamdscan = " ${bindir}/clamdscan \
FILES:${PN}-clamdscan = " ${bindir}/clamdscan \
${docdir}/clamdscan/* \
${mandir}/man1/clamdscan* \
"
FILES_${PN}-daemon = "${bindir}/clamconf ${bindir}/clamdtop ${sbindir}/clamd \
FILES:${PN}-daemon = "${bindir}/clamconf ${bindir}/clamdtop ${sbindir}/clamd \
${mandir}/man1/clamconf* ${mandir}/man1/clamdtop* \
${mandir}/man5/clamd* ${mandir}/man8/clamd* \
${sysconfdir}/clamd.conf* \
@@ -111,7 +111,7 @@ FILES_${PN}-daemon = "${bindir}/clamconf ${bindir}/clamdtop ${sbindir}/clamd \
${systemd_system_unitdir}/clamav-clamonacc.service \
"
FILES_${PN}-freshclam = "${bindir}/freshclam \
FILES:${PN}-freshclam = "${bindir}/freshclam \
${sysconfdir}/freshclam.conf* \
/usr/etc/freshclam.conf* \
${sysconfdir}/clamav ${sysconfdir}/default/volatiles \
@@ -121,33 +121,33 @@ FILES_${PN}-freshclam = "${bindir}/freshclam \
${mandir}/man5/freshclam.conf.* \
${systemd_system_unitdir}/clamav-freshclam.service"
FILES_${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \
FILES:${PN}-dev = " ${bindir}/clamav-config ${libdir}/*.la \
${libdir}/pkgconfig/*.pc \
${mandir}/man1/clamav-config.* \
${includedir}/*.h ${docdir}/libclamav* "
FILES_${PN}-staticdev = "${libdir}/*.a"
FILES:${PN}-staticdev = "${libdir}/*.a"
FILES_${PN}-libclamav = "${libdir}/libclamav.so* ${libdir}/libclammspack.so* \
FILES:${PN}-libclamav = "${libdir}/libclamav.so* ${libdir}/libclammspack.so* \
${libdir}/libfreshclam.so* ${docdir}/libclamav/* \
${libdir}/libmspack* "
FILES_${PN}-doc = "${mandir}/man/* \
FILES:${PN}-doc = "${mandir}/man/* \
${datadir}/man/* \
${docdir}/* "
USERADD_PACKAGES = "${PN}"
GROUPADD_PARAM_${PN} = "--system ${CLAMAV_UID}"
USERADD_PARAM_${PN} = "--system -g ${CLAMAV_GID} --home-dir \
GROUPADD_PARAM:${PN} = "--system ${CLAMAV_UID}"
USERADD_PARAM:${PN} = "--system -g ${CLAMAV_GID} --home-dir \
${localstatedir}/lib/${BPN} \
--no-create-home --shell /sbin/nologin ${BPN}"
RPROVIDES_${PN} += "${PN}-systemd"
RREPLACES_${PN} += "${PN}-systemd"
RCONFLICTS_${PN} += "${PN}-systemd"
RPROVIDES:${PN} += "${PN}-systemd"
RREPLACES:${PN} += "${PN}-systemd"
RCONFLICTS:${PN} += "${PN}-systemd"
SYSTEMD_PACKAGES = "${PN}-daemon ${PN}-freshclam"
SYSTEMD_SERVICE_${PN}-daemon = "clamav-daemon.service"
SYSTEMD_SERVICE_${PN}-freshclam = "clamav-freshclam.service"
SYSTEMD_SERVICE:${PN}-daemon = "clamav-daemon.service"
SYSTEMD_SERVICE:${PN}-freshclam = "clamav-freshclam.service"
RDEPENDS_${PN} = "openssl ncurses-libncurses libxml2 libbz2 ncurses-libtinfo curl libpcre2 clamav-freshclam clamav-libclamav"
RDEPENDS_${PN}-daemon = "clamav"
RDEPENDS:${PN} = "openssl ncurses-libncurses libxml2 libbz2 ncurses-libtinfo curl libpcre2 clamav-freshclam clamav-libclamav"
RDEPENDS:${PN}-daemon = "clamav"

122
recipes-scanners/clamav/files/fix2_libcurl_check.patch Normal file
View File

@@ -0,0 +1,122 @@
clamav .102.2 tries to find clamav using culf_config. Use EO pkg_config instead
Upstream-Status: OE specific
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Index: git/configure
===================================================================
--- git.orig/configure
+++ git/configure
@@ -28850,39 +28850,14 @@ $as_echo_n "checking for libcurl install
if test "${with_libcurl+set}" = set; then :
withval=$with_libcurl;
find_curl="no"
-if test "X$withval" = "Xyes"; then
- find_curl="yes"
-else
- if test "X$withval" != "Xno"; then
- if test -f "${withval}/bin/curl-config"; then
- LIBCURL_HOME="$withval"
- have_curl="yes"
- fi
- fi
-fi
-
-else
- find_curl="yes"
-fi
-
-
-if test "X$find_curl" = "Xyes"; then
- for p in /usr/local /usr ; do
- if test -f "${p}/bin/curl-config"; then
- LIBCURL_HOME=$p
- have_curl="yes"
- fi
- done
-fi
-
-if test "X$have_curl" = "Xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBCURL_HOME" >&5
-$as_echo "$LIBCURL_HOME" >&6; }
- if test -f "$LIBCURL_HOME/bin/curl-config"; then
+ #save_LDFLAGS="$LDFLAGS"
+ if test "X$withval" != "Xno"; then
+ LIBCURL_HOME="$withval"
+ if test "${PKG_CONFIG} libcurl --exists"; then
CURL_LDFLAGS="$LDFLAGS"
- CURL_LIBS=$($LIBCURL_HOME/bin/curl-config --libs)
- CURL_CPPFLAGS=$($LIBCURL_HOME/bin/curl-config --cflags)
- else
+ CURL_LIBS=$($PKG_CONFIG libcurl --libs)
+ CURL_CPPFLAGS=$($PKG_CONFIG libcurl --cflags)
+ else
if test "$LIBCURL_HOME" != "/usr"; then
CURL_LDFLAGS="-L$LIBCURL_HOME/lib"
CURL_CPPFLAGS="-I$LIBCURL_HOME/include"
@@ -28891,60 +28866,12 @@ $as_echo "$LIBCURL_HOME" >&6; }
CURL_CPPFLAGS=""
fi
CURL_LIBS="-lcurl"
- fi
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$CURL_LDFLAGS $CURL_LIBS"
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
-$as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
-if ${ac_cv_lib_curl_curl_easy_init+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurl $CURL_LIBS
- $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char curl_easy_init ();
-int
-main ()
-{
-return curl_easy_init ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_curl_curl_easy_init=yes
-else
- ac_cv_lib_curl_curl_easy_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5
-$as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; }
-if test "x$ac_cv_lib_curl_curl_easy_init" = xyes; then :
-
- curl_msg="";
- have_curl="yes";
- CLAMSUBMIT_LIBS="$CLAMSUBMIT_LIBS $CURL_LDFLAGS $CURL_LIBS";
- CLAMSUBMIT_CFLAGS="$CLAMSUBMIT_CFLAGS $CURL_CPPFLAGS";
- FRESHCLAM_LIBS="$FRESHCLAM_LIBS $CURL_LDFLAGS $CURL_LIBS";
- FRESHCLAM_CPPFLAGS="$FRESHCLAM_CPPFLAGS $CURL_CPPFLAGS"
-
-else
-
- as_fn_error $? "Your libcurl is misconfigured. libcurl (e.g. libcurl-devel) is required in order to build freshclam and clamsubmit." "$LINENO" 5
+ fi
-fi
+ have_curl="yes"
+ LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$CURL_LDFLAGS $CURL_LIBS"
+ fi
LDFLAGS="$save_LDFLAGS"
else

24
recipes-scanners/clamav/files/test.patch Normal file
View File

@@ -0,0 +1,24 @@
Index: clamav-0.103.0/Makefile.am
===================================================================
--- clamav-0.103.0.orig/Makefile.am
+++ clamav-0.103.0/Makefile.am
@@ -28,7 +28,6 @@ else
SUBDIRS = libltdl libclamav shared libfreshclam clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.cmake.md INSTALL.autotools.md NEWS.md README.md cmake CMakeLists.txt CMakeOptions.cmake $(top_srcdir)/**/CMakeLists.txt libclammspack/config.h.in.cmake clamav-config.h.cmake.in target.h.cmake.in autogen.sh
-bin_SCRIPTS=clamav-config
if BUILD_CLAMONACC
SUBDIRS += clamonacc
Index: clamav-0.103.0/Makefile.in
===================================================================
--- clamav-0.103.0.orig/Makefile.in
+++ clamav-0.103.0/Makefile.in
@@ -641,7 +641,6 @@ ACLOCAL_AMFLAGS = -I m4
@BUILD_LIBCLAMAV_ONLY_TRUE@SUBDIRS = libclamav $(am__append_1) \
@BUILD_LIBCLAMAV_ONLY_TRUE@ $(am__append_2) $(am__append_3)
@BUILD_LIBCLAMAV_ONLY_FALSE@bin_SCRIPTS = clamav-config
-@BUILD_LIBCLAMAV_ONLY_TRUE@bin_SCRIPTS = clamav-config
@BUILD_LIBCLAMAV_ONLY_FALSE@EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.cmake.md INSTALL.autotools.md NEWS.md README.md cmake CMakeLists.txt CMakeOptions.cmake $(top_srcdir)/**/CMakeLists.txt libclammspack/config.h.in.cmake clamav-config.h.cmake.in target.h.cmake.in autogen.sh
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libclamav.pc