[PATCH 0/2] [meta-security] Cleanup of perl recipes.

[PATCH 0/2] [meta-security] Cleanup of perl recipes.

[mulhern]

Cleanup of perl recipes for CPAN modules in meta-security layer. One is
renamed, one is removed because a recipe already exists in core.
The following changes since commit 5ec81ec5b117de41ed56eb05df271f103213d7be:

  Bastille: document the current status and usability of the Bastille install. (2013-08-30 15:42:10 -0400)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib mulhern/bug5081
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mulhern/bug5081

mulhern (2):
  libenv-perl: Remove redundant recipe in meta-security layer.
  libcurses-perl: curses-perl renamed to libcurses-perl.

 recipes-security/bastille/bastille_3.2.1.bb        |    2 +-
 .../checksecurity/checksecurity_2.0.14.bb          |    2 +-
 recipes-security/perl/env-perl_1.04.bb             |   25 --------------------
 ...{curses-perl_1.28.bb => libcurses-perl_1.28.bb} |    0
 4 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 recipes-security/perl/env-perl_1.04.bb
 rename recipes-security/perl/{curses-perl_1.28.bb => libcurses-perl_1.28.bb} (100%)

-- 
1.7.10.4

[PATCH 1/2] libenv-perl: Remove redundant recipe in meta-security layer.

[mulhern]

[YOCTO #5081]

The recipe meta-security/recipes-security/env-perl_1.04.bb is removed since
there is a recipe for the same Perl module at
poky/meta/recipes-lsb4/perl/libenv-perl_1.04.bb. The dependency on env-perl
in the checksecurity recipe is updated to a recipe on libenv-perl.

Signed-off-by: mulhern <mulhern@yoctoproject.org>
---
 .../checksecurity/checksecurity_2.0.14.bb          |    2 +-
 recipes-security/perl/env-perl_1.04.bb             |   25 --------------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 recipes-security/perl/env-perl_1.04.bb

diff --git a/recipes-security/checksecurity/checksecurity_2.0.14.bb b/recipes-security/checksecurity/checksecurity_2.0.14.bb
index 83a24a7..70dfd03 100644
--- a/recipes-security/checksecurity/checksecurity_2.0.14.bb
+++ b/recipes-security/checksecurity/checksecurity_2.0.14.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "checksecurity is a simple package which will scan your system for
 SECTION = "security"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-RDEPENDS_${PN} = "perl env-perl perl-module-tie-array perl-module-getopt-long perl-module-file-glob util-linux findutils coreutils"
+RDEPENDS_${PN} = "perl libenv-perl perl-module-tie-array perl-module-getopt-long perl-module-file-glob util-linux findutils coreutils"
 
 SRC_URI = "http://ftp.de.debian.org/debian/pool/main/c/checksecurity/checksecurity_${PV}.tar.gz \
            file://setuid-log-folder.patch"
diff --git a/recipes-security/perl/env-perl_1.04.bb b/recipes-security/perl/env-perl_1.04.bb
deleted file mode 100644
index 4aeba4f..0000000
--- a/recipes-security/perl/env-perl_1.04.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "This package contains the Env.pm \
-               perl module that imports environment variables as scalars or arrays"
-
-SECTION = "libs"
-LICENSE = "Artistic-1.0 | GPL-1.0+"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=76c1cbf18db56b3340d91cb947943bd3"
-
-SRC_URI[md5sum] = "fdba5c0690e66972c96fee112cf5f25c"
-SRC_URI[sha256sum] = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0"
-
-DEPENDS += "perl"
-
-SRC_URI = "http://search.cpan.org/CPAN/authors/id/F/FL/FLORA/Env-${PV}.tar.gz"
-
-S = "${WORKDIR}/Env-${PV}"
-
-EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
-
-inherit cpan
-
-do_compile() {
-	export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
-	cpan_do_compile
-}
-- 
1.7.10.4

[PATCH 2/2] libcurses-perl: curses-perl renamed to libcurses-perl.

[mulhern]

[YOCTO #5081]

The recipe meta-security/recipes-security/perl/curses-perl_1.28.bb is renamed
to libcurses-perl_1.28.bb to conform to accepted naming scheme.
The dependency in the Bastille recipe is updated accordingly.

Signed-off-by: mulhern <mulhern@yoctoproject.org>
---
 recipes-security/bastille/bastille_3.2.1.bb                          |    2 +-
 .../perl/{curses-perl_1.28.bb => libcurses-perl_1.28.bb}             |    0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename recipes-security/perl/{curses-perl_1.28.bb => libcurses-perl_1.28.bb} (100%)

diff --git a/recipes-security/bastille/bastille_3.2.1.bb b/recipes-security/bastille/bastille_3.2.1.bb
index 06215a2..ef697d7 100644
--- a/recipes-security/bastille/bastille_3.2.1.bb
+++ b/recipes-security/bastille/bastille_3.2.1.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://${S}/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
 # Bash is needed for set +o privileged (check busybox), might also need ncurses
 DEPENDS = "virtual/kernel"
-RDEPENDS_${PN} = "perl bash tcl perl-module-getopt-long perl-module-text-wrap lib-perl perl-module-file-path perl-module-mime-base64 perl-module-file-find perl-module-errno perl-module-file-glob perl-module-tie-hash-namedcapture perl-module-file-copy perl-module-english perl-module-exporter perl-module-cwd curses-perl coreutils"
+RDEPENDS_${PN} = "perl bash tcl perl-module-getopt-long perl-module-text-wrap lib-perl perl-module-file-path perl-module-mime-base64 perl-module-file-find perl-module-errno perl-module-file-glob perl-module-tie-hash-namedcapture perl-module-file-copy perl-module-english perl-module-exporter perl-module-cwd libcurses-perl coreutils"
 FILES_${PN} += "/run/lock/subsys/bastille"
 
 inherit allarch module-base
diff --git a/recipes-security/perl/curses-perl_1.28.bb b/recipes-security/perl/libcurses-perl_1.28.bb
similarity index 100%
rename from recipes-security/perl/curses-perl_1.28.bb
rename to recipes-security/perl/libcurses-perl_1.28.bb
-- 
1.7.10.4