mirror of
https://git.yoctoproject.org/meta-security
synced 2026-07-17 04:07:20 +00:00
Security layer version 1.0
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
This commit is contained in:
@@ -0,0 +1,73 @@
|
||||
From 34698c7f561fb575293a1c991a71e1b4ddc5ae73 Mon Sep 17 00:00:00 2001
|
||||
From: Andrei Dinu <andrei.adrianx.dinu@intel.com>
|
||||
Date: Fri, 5 Jul 2013 11:56:58 +0300
|
||||
Subject: [PATCH] Mandir and perl install dir were overwritten with faulty
|
||||
information in the Makefile. Now the Mandir and perl
|
||||
install dir are sent via paramters from the recipe.
|
||||
|
||||
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
|
||||
---
|
||||
Makefile.pl | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.pl b/Makefile.pl
|
||||
index 9ca5602..8776e18 100644
|
||||
--- a/Makefile.pl
|
||||
+++ b/Makefile.pl
|
||||
@@ -131,6 +131,8 @@ foreach (keys %MODULES){
|
||||
|
||||
# adjust DESTDIR, if needed
|
||||
$DESTDIR = $ENV{DESTDIR} if(defined $ENV{DESTDIR});
|
||||
+$MANDIR = $ENV{MANDIR} if(defined $ENV{MANDIR});
|
||||
+$INSTALLDIR = $ENV{INSTALLDIR} if(defined $ENV{INSTALLDIR});
|
||||
|
||||
# parse command line build options
|
||||
while($COMMAND = shift @ARGV){
|
||||
@@ -171,7 +173,7 @@ sub command_install_pod {
|
||||
command_build() if(!-e $TARGET);
|
||||
die("Can not install without Config.pm") if($MODULES{Config}==0);
|
||||
$CWD=&cwd if($MODULES{Cwd}>0);
|
||||
- my $where=$DESTDIR . $Config{'man3direxp'};
|
||||
+ my $where=$DESTDIR . $MANDIR;
|
||||
my $t = $TARGET;
|
||||
if($LIBRARY){
|
||||
$t="$PACKAGE.3pm";
|
||||
@@ -219,7 +221,7 @@ sub command_install_pod {
|
||||
sub command_uninstall_pod {
|
||||
die("Can not uninstall without Config.pm") if($MODULES{Config}==0);
|
||||
$CWD=&cwd if($MODULES{Cwd}>0);
|
||||
- my $where=$DESTDIR . $Config{'man3direxp'};
|
||||
+ my $where=$DESTDIR . $MANDIR;
|
||||
my $t = $TARGET;
|
||||
if($LIBRARY){
|
||||
$t="$PACKAGE.3pm";
|
||||
@@ -243,7 +245,7 @@ sub command_install_library {
|
||||
command_build() if(!-e $TARGET);
|
||||
die("Can not install without Config.pm") if($MODULES{Config}==0);
|
||||
$CWD=&cwd if($MODULES{Cwd}>0);
|
||||
- my $where=$DESTDIR . $Config{'installsitelib'};
|
||||
+ my $where=$DESTDIR . $INSTALLDIR;
|
||||
if(!-e $where){
|
||||
print STDOUT "WARNING!\n\n",
|
||||
"The local perl site directory does not exist:\n",
|
||||
@@ -271,7 +273,7 @@ sub command_install_library {
|
||||
sub command_uninstall_library {
|
||||
die("Can not uninstall without Config.pm") if($MODULES{Config}==0);
|
||||
$CWD=&cwd if($MODULES{Cwd}>0);
|
||||
- my $where=$DESTDIR . $Config{'installsitelib'};
|
||||
+ my $where=$DESTDIR . $INSTALLDIR;
|
||||
chdir($where);
|
||||
if(-e $TARGET){
|
||||
unlink $TARGET;
|
||||
@@ -401,7 +403,7 @@ sub command_socket_diag {
|
||||
sub command_install_compat {
|
||||
die("Can not install without Config.pm") if($MODULES{Config}==0);
|
||||
$CWD=&cwd if($MODULES{Cwd}>0);
|
||||
- my $where=$DESTDIR . $Config{'installsitelib'};
|
||||
+ my $where=$DESTDIR . $INSTALLDIR;
|
||||
if(!-e $where){
|
||||
print STDOUT "WARNING!\n\n",
|
||||
"The local perl site directory does not exist:\n",
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
DESCRIPTION = "This package contains the Parser.pm module with friends."
|
||||
|
||||
SECTION = "libs"
|
||||
LICENSE = "Artistic-1.0 | GPL-1.0+"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://README;md5=6c3dacf9f405c7483870ab5f148770c3"
|
||||
|
||||
DEPENDS += "perl"
|
||||
|
||||
SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "9128a45893097dfa3bf03301b19c5efe"
|
||||
SRC_URI[sha256sum] = "be918b3749d3ff93627f72ee4b825683332ecb4c81c67a3a8d72b0435ffbd802"
|
||||
|
||||
S = "${WORKDIR}/HTML-Parser-${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
|
||||
}
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -0,0 +1,25 @@
|
||||
DESCRIPTION = "This package contains the DNS.pm module with friends."
|
||||
|
||||
SECTION = "libs"
|
||||
LICENSE = "Artistic-1.0 | GPL-1.0+"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://README;md5=f21d77d9c6b56a07470bbce561b169e3"
|
||||
|
||||
DEPENDS += "perl"
|
||||
|
||||
SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "393e48ec6f28abe5ed30204276e02775"
|
||||
SRC_URI[sha256sum] = "a62cae0be54a9684c305456cb95515a0bd3128d6ef3093b6069fe8e8e8d5943f"
|
||||
|
||||
S = "${WORKDIR}/Net-DNS-${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
|
||||
}
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -0,0 +1,24 @@
|
||||
DESCRIPTION = "Perl module for using OpenSSL"
|
||||
|
||||
SECTION = "libs"
|
||||
LICENSE = "Artistic-1.0 | GPL-1.0+"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://README;md5=94ec8036b939a2e3c9b5e7f10af8f4ee"
|
||||
|
||||
DEPENDS += "perl openssl"
|
||||
|
||||
SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "473b8d66ca69d5784bb0e428721f58e0"
|
||||
SRC_URI[sha256sum] = "8cd5f09722e07b4e436102cb3a4b93623d753c171665ca9752c3b39a62ea3a79"
|
||||
|
||||
S = "${WORKDIR}/Net-SSLeay-${PV}"
|
||||
|
||||
EXTRA_CPANFLAGS = "INC='-I${STAGING_INCDIR}' LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto -lz'"
|
||||
|
||||
inherit cpan
|
||||
|
||||
do_compile() {
|
||||
export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name 'libc-*.so')"
|
||||
cpan_do_compile
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
DESCRIPTION = "This package contains the IP.pm module with friends."
|
||||
|
||||
SECTION = "libs"
|
||||
LICENSE = "Artistic-1.0 | GPL-1.0+"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://Copying;md5=cde580764a0fbc0f02fafde4c65d6227"
|
||||
|
||||
DEPENDS += "perl"
|
||||
|
||||
SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/NetAddr-IP-${PV}.tar.gz"
|
||||
|
||||
SRC_URI[md5sum] = "7721135fcea390327f75421a6b701144"
|
||||
SRC_URI[sha256sum] = "96739afc484eca1597c4f4b520864b342169c8fdeef486778511e5a1527ba4e7"
|
||||
|
||||
S = "${WORKDIR}/NetAddr-IP-${PV}"
|
||||
|
||||
EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR} EXPATINCPATH=${STAGING_INCDIR}"
|
||||
|
||||
inherit cpan
|
||||
|
||||
do_compile() {
|
||||
cpan_do_compile
|
||||
}
|
||||
BBCLASSEXTEND = "native"
|
||||
@@ -0,0 +1,24 @@
|
||||
DESCRIPTION = "Libwhisker is a Perl module geared specificly for HTTP testing."
|
||||
|
||||
SECTION = "libs"
|
||||
LICENSE = "Artistic-1.0 | GPL-1.0+"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=254b8e29606fce6d1c1a4c9e32354573"
|
||||
|
||||
DEPENDS = "perl"
|
||||
|
||||
SRC_URI = "http://sourceforge.net/projects/whisker/files/libwhisker/${PV}/libwhisker2-${PV}.tar.gz \
|
||||
file://libwhisker2.patch"
|
||||
|
||||
SRC_URI[md5sum] = "7cc1718dddde8f9a439d5622ae2f37eb"
|
||||
SRC_URI[sha256sum] = "f45a1cf2ad2637b29dd1b13d7221ea12e3923ea09d107ced446400f19070a42f"
|
||||
|
||||
S = "${WORKDIR}/libwhisker2-2.5"
|
||||
|
||||
inherit cpan-base perlnative
|
||||
|
||||
do_install() {
|
||||
install -d 755 ${D}${PERLLIBDIRS}/vendor_perl/${PERLVERSION}
|
||||
install -d 755 ${D}${datadir}/perl/${PERLVERSION}
|
||||
oe_runmake install DESTDIR=${D} INSTALLDIR=${PERLLIBDIRS}/vendor_perl/${PERLVERSION} MANDIR=${datadir}/perl/${PERLVERSION}
|
||||
}
|
||||
Reference in New Issue
Block a user