mirror of
https://git.yoctoproject.org/meta-security
synced 2026-01-12 03:10:13 +00:00
xmlsec1: Remove, moved to meta-oe
Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Adrian Bunk
committed by
Armin Kuster
Armin Kuster
parent
10ac9f8bff
commit
7ce3c3368a
@@ -56,4 +56,3 @@ RECIPE_MAINTAINER_pn-smack = "Armin Kuster <akuster808@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-sssd = "Armin Kuster <akuster808@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-suricata = "Armin Kuster <akuster808@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-tripwire = "Armin Kuster <akuster808@gmail.com>"
|
||||
RECIPE_MAINTAINER_pn-xmlsec1 = "Armin Kuster <akuster808@gmail.com>"
|
||||
|
||||
@@ -13,7 +13,6 @@ SUMMARY_${PN} = "Security packages with ptests"
|
||||
RDEPENDS_${PN} = " \
|
||||
ptest-runner \
|
||||
samhain-standalone-ptest \
|
||||
xmlsec1-ptest \
|
||||
keyutils-ptest \
|
||||
libseccomp-ptest \
|
||||
python-scapy-ptest \
|
||||
|
||||
@@ -29,7 +29,6 @@ RDEPENDS_packagegroup-security-utils = "\
|
||||
pinentry \
|
||||
python-scapy \
|
||||
ding-libs \
|
||||
xmlsec1 \
|
||||
keyutils \
|
||||
libseccomp \
|
||||
${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd", "",d)} \
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
From c1c980a95d85bcaf8802524d6148783522b300d7 Mon Sep 17 00:00:00 2001
|
||||
From: Yulong Pei <Yulong.pei@windriver.com>
|
||||
Date: Wed, 21 Jul 2010 22:33:43 +0800
|
||||
Subject: [PATCH] change finding path of nss and nspr
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
|
||||
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
|
||||
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||
---
|
||||
configure.ac | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 951b3eb..1fdeb0f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -866,10 +866,10 @@ MOZILLA_MIN_VERSION="1.4"
|
||||
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
|
||||
NSPR_PACKAGE=mozilla-nspr
|
||||
NSS_PACKAGE=mozilla-nss
|
||||
-NSPR_INCLUDE_MARKER="nspr/nspr.h"
|
||||
+NSPR_INCLUDE_MARKER="nspr.h"
|
||||
NSPR_LIB_MARKER="libnspr4$shrext"
|
||||
NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
|
||||
-NSS_INCLUDE_MARKER="nss/nss.h"
|
||||
+NSS_INCLUDE_MARKER="nss3/nss.h"
|
||||
NSS_LIB_MARKER="libnss3$shrext"
|
||||
NSS_LIBS_LIST="-lnss3 -lsmime3"
|
||||
|
||||
@@ -898,24 +898,24 @@ fi
|
||||
dnl Priority 1: User specifies the path to installation
|
||||
if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
|
||||
AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
|
||||
- if test -f "$with_nspr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/lib/$NSPR_LIB_MARKER" ; then
|
||||
- NSPR_INCLUDE_PATH="$with_nspr/include"
|
||||
- NSPR_LIB_PATH="$with_nspr/lib"
|
||||
+ if test -f "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" -a -f "$with_nspr/${libdir}/$NSPR_LIB_MARKER" ; then
|
||||
+ NSPR_INCLUDE_PATH="$with_nspr/usr/include"
|
||||
+ NSPR_LIB_PATH="$with_nspr/${libdir}"
|
||||
NSPR_FOUND="yes"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?])
|
||||
+ AC_MSG_ERROR([not found: "$with_nspr/usr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?])
|
||||
fi
|
||||
fi
|
||||
if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
|
||||
AC_MSG_CHECKING(for nss library installation in "$with_nss" folder)
|
||||
- if test -f "$with_nss/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/lib/$NSS_LIB_MARKER" ; then
|
||||
- NSS_INCLUDE_PATH="$with_nss/include"
|
||||
- NSS_LIB_PATH="$with_nss/lib"
|
||||
+ if test -f "$with_nss/usr/include/$NSS_INCLUDE_MARKER" -a -f "$with_nss/${libdir}/$NSS_LIB_MARKER" ; then
|
||||
+ NSS_INCLUDE_PATH="$with_nss/usr/include/nss3"
|
||||
+ NSS_LIB_PATH="$with_nss/${libdir}"
|
||||
NSS_FOUND="yes"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?])
|
||||
+ AC_MSG_ERROR([not found: "$with_nss/usr/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?])
|
||||
fi
|
||||
fi
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From 847dc52f5a50e34ee4d6e3dc2c708711747a58ca Mon Sep 17 00:00:00 2001
|
||||
From: Yulong Pei <Yulong.pei@windriver.com>
|
||||
Date: Thu, 21 Jan 2010 14:11:20 +0800
|
||||
Subject: [PATCH] force to use our own libtool
|
||||
|
||||
Upstream-Status: Inappropriate [ OE specific ]
|
||||
|
||||
Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
|
||||
|
||||
---
|
||||
ltmain.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ltmain.sh b/ltmain.sh
|
||||
index 147d758..a61f16b 100644
|
||||
--- a/ltmain.sh
|
||||
+++ b/ltmain.sh
|
||||
@@ -6969,7 +6969,7 @@ func_mode_link ()
|
||||
dir=$func_resolve_sysroot_result
|
||||
# We need an absolute path.
|
||||
case $dir in
|
||||
- [\\/]* | [A-Za-z]:[\\/]*) ;;
|
||||
+ =* | [\\/]* | [A-Za-z]:[\\/]*) ;;
|
||||
*)
|
||||
absdir=`cd "$dir" && pwd`
|
||||
test -z "$absdir" && \
|
||||
@@ -1,40 +0,0 @@
|
||||
From 83a1381e1d6bd1b5ec3df6f7c4bc1f4fe4f860b6 Mon Sep 17 00:00:00 2001
|
||||
From: Jackie Huang <jackie.huang@windriver.com>
|
||||
Date: Thu, 15 Jun 2017 14:44:01 +0800
|
||||
Subject: [PATCH] xmlsec1: add new recipe
|
||||
|
||||
This enables the building of the examples directory
|
||||
and it's installed as ptest.
|
||||
|
||||
Upstream-Status: Inappropriate [ OE ptest specific ]
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
|
||||
---
|
||||
examples/Makefile | 12 ++++++++++--
|
||||
1 file changed, 10 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/Makefile b/examples/Makefile
|
||||
index 89b1d61..c1cbcca 100644
|
||||
--- a/examples/Makefile
|
||||
+++ b/examples/Makefile
|
||||
@@ -8,9 +8,17 @@ PROGRAMS = \
|
||||
decrypt1 decrypt2 decrypt3 \
|
||||
xmldsigverify
|
||||
|
||||
+ifndef CC
|
||||
CC = gcc
|
||||
-CFLAGS += -g $(shell xmlsec1-config --cflags) -DUNIX_SOCKETS
|
||||
-LDLIBS += -g $(shell xmlsec1-config --libs)
|
||||
+endif
|
||||
+
|
||||
+CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS
|
||||
+LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 )
|
||||
+
|
||||
+DESTDIR = /usr/share/xmlsec1
|
||||
+install-ptest:
|
||||
+ if [ ! -d $(DESTDIR) ]; then mkdir -p $(DESTDIR); fi
|
||||
+ cp * $(DESTDIR)
|
||||
|
||||
all: $(PROGRAMS)
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
check_return() {
|
||||
if [ $? == 0 ]; then
|
||||
echo -e "PASS: $1\n"
|
||||
else
|
||||
echo -e "FAIL: $1\n"
|
||||
fi
|
||||
}
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Signing a template file..."
|
||||
./sign1 sign1-tmpl.xml rsakey.pem > sign1-res.xml
|
||||
./verify1 sign1-res.xml rsapub.pem
|
||||
check_return sign-tmpl
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Signing a dynamicaly created template..."
|
||||
./sign2 sign2-doc.xml rsakey.pem > sign2-res.xml
|
||||
./verify1 sign2-res.xml rsapub.pem
|
||||
check_return sign-dynamic-templ
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Signing with X509 certificate..."
|
||||
./sign3 sign3-doc.xml rsakey.pem rsacert.pem > sign3-res.xml
|
||||
./verify3 sign3-res.xml ca2cert.pem cacert.pem
|
||||
check_return sign-x509
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Verifying a signature with a single key..."
|
||||
./verify1 sign1-res.xml rsapub.pem
|
||||
./verify1 sign2-res.xml rsapub.pem
|
||||
check_return verify-single-key
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Verifying a signature with keys manager..."
|
||||
./verify2 sign1-res.xml rsapub.pem
|
||||
./verify2 sign2-res.xml rsapub.pem
|
||||
check_return verify-keys-manager
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Verifying a signature with X509 certificates..."
|
||||
./verify3 sign3-res.xml ca2cert.pem cacert.pem
|
||||
check_return verify-x509
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Verifying a signature with additional restrictions..."
|
||||
./verify4 verify4-res.xml ca2cert.pem cacert.pem
|
||||
check_return verify-res
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Encrypting data with a template file..."
|
||||
./encrypt1 encrypt1-tmpl.xml deskey.bin > encrypt1-res.xml
|
||||
./decrypt1 encrypt1-res.xml deskey.bin
|
||||
check_return encrypt-tmpl
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Encrypting data with a dynamicaly created template..."
|
||||
./encrypt2 encrypt2-doc.xml deskey.bin > encrypt2-res.xml
|
||||
./decrypt1 encrypt2-res.xml deskey.bin
|
||||
check_return encrypt-dynamic-tmpl
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Encrypting data with a session key..."
|
||||
./encrypt3 encrypt3-doc.xml rsakey.pem > encrypt3-res.xml
|
||||
./decrypt3 encrypt3-res.xml
|
||||
check_return encrypt-session-key
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Decrypting data with a single key..."
|
||||
./decrypt1 encrypt1-res.xml deskey.bin
|
||||
./decrypt1 encrypt2-res.xml deskey.bin
|
||||
check_return encrypt-single-key
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Decrypting data with keys manager..."
|
||||
./decrypt2 encrypt1-res.xml deskey.bin
|
||||
./decrypt2 encrypt2-res.xml deskey.bin
|
||||
check_return encrypt-keys-manager
|
||||
|
||||
echo "---------------------------------------------------"
|
||||
echo "Writing a custom keys manager..."
|
||||
./decrypt3 encrypt1-res.xml
|
||||
./decrypt3 encrypt2-res.xml
|
||||
check_return write-keys-manager
|
||||
@@ -1,30 +0,0 @@
|
||||
From 0c38c6864e7ba8f53a657d87894f24374a6a4932 Mon Sep 17 00:00:00 2001
|
||||
From: Jackie Huang <jackie.huang@windriver.com>
|
||||
Date: Tue, 30 Dec 2014 11:18:17 +0800
|
||||
Subject: [PATCH] examples: allow build in separate dir
|
||||
|
||||
Upstream-Status: Inappropriate [ OE specific ]
|
||||
|
||||
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
||||
|
||||
---
|
||||
examples/Makefile | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/examples/Makefile b/examples/Makefile
|
||||
index c1cbcca..3f1bd14 100644
|
||||
--- a/examples/Makefile
|
||||
+++ b/examples/Makefile
|
||||
@@ -12,8 +12,10 @@ ifndef CC
|
||||
CC = gcc
|
||||
endif
|
||||
|
||||
-CFLAGS += -I../include -g $(shell PKG_CONFIG_PATH=.. pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS
|
||||
-LDLIBS += -L../src/.libs -g $(shell PKG_CONFIG_PATH=.. pkg-config --libs xmlsec1 )
|
||||
+top_srcdir = ..
|
||||
+top_builddir = ..
|
||||
+CFLAGS += -I$(top_srcdir)/include -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --cflags xmlsec1 ) -DUNIX_SOCKETS
|
||||
+LDLIBS += -L$(top_builddir)/src/.libs -g $(shell PKG_CONFIG_PATH=$(top_srcdir) pkg-config --libs xmlsec1 )
|
||||
|
||||
DESTDIR = /usr/share/xmlsec1
|
||||
install-ptest:
|
||||
@@ -1,64 +0,0 @@
|
||||
SUMMARY = "XML Security Library is a C library based on LibXML2"
|
||||
DESCRIPTION = "\
|
||||
XML Security Library is a C library based on \
|
||||
LibXML2 and OpenSSL. The library was created with a goal to support major \
|
||||
XML security standards "XML Digital Signature" and "XML Encryption". \
|
||||
"
|
||||
HOMEPAGE = "http://www.aleksey.com/xmlsec/"
|
||||
DEPENDS = "libtool libxml2 libxslt zlib"
|
||||
|
||||
LICENSE = "MIT"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
|
||||
|
||||
SECTION = "libs"
|
||||
|
||||
SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
|
||||
file://fix-ltmain.sh.patch \
|
||||
file://change-finding-path-of-nss.patch \
|
||||
file://makefile-ptest.patch \
|
||||
file://xmlsec1-examples-allow-build-in-separate-dir.patch \
|
||||
file://run-ptest \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "69b8d95c009a404462e19f335e650241"
|
||||
SRC_URI[sha256sum] = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"
|
||||
|
||||
inherit autotools-brokensep ptest pkgconfig
|
||||
|
||||
CFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3"
|
||||
CPPFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3"
|
||||
|
||||
PACKAGECONFIG ??= "gnutls libgcrypt nss openssl des"
|
||||
PACKAGECONFIG[gnutls] = ",,gnutls"
|
||||
PACKAGECONFIG[libgcrypt] = ",,libgcrypt"
|
||||
PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/../.. --with-nspr=${STAGING_LIBDIR}/../..,,nss nspr"
|
||||
PACKAGECONFIG[openssl] = ",,openssl"
|
||||
PACKAGECONFIG[des] = ",--disable-des,,"
|
||||
|
||||
# these can be dynamically loaded with xmlSecCryptoDLLoadLibrary()
|
||||
FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so"
|
||||
FILES_${PN} += "${libdir}/libxmlsec1-*.so"
|
||||
INSANE_SKIP_${PN} = "dev-so"
|
||||
|
||||
FILES_${PN}-dev += "${libdir}/xmlsec1Conf.sh"
|
||||
FILES_${PN}-dbg += "${PTEST_PATH}/.debug/*"
|
||||
|
||||
RDEPENDS_${PN}-ptest += "${PN}-dev"
|
||||
INSANE_SKIP_${PN}-ptest += "dev-deps"
|
||||
|
||||
PTEST_EXTRA_ARGS = "top_srcdir=${S} top_builddir=${B}"
|
||||
|
||||
do_compile_ptest () {
|
||||
oe_runmake -C ${S}/examples ${PTEST_EXTRA_ARGS} all
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \
|
||||
${libdir}/pkgconfig/xmlsec1-openssl.pc; do
|
||||
sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i
|
||||
done
|
||||
}
|
||||
|
||||
do_install_ptest () {
|
||||
oe_runmake -C ${S}/examples DESTDIR=${D}${PTEST_PATH} ${PTEST_EXTRA_ARGS} install-ptest
|
||||
}
|
||||
Reference in New Issue
Block a user