Skip to contentSkip to conversation

xmlsec1: Remove, moved to meta-oe

PATCH New Adrian Bunk 1 participant 1 message Aug 28, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xmlsec1: Remove, moved to meta-oe

---
 conf/distro/include/maintainers.inc           |  1 -
 .../packagegroup-core-security-ptest.bb       |  1 -
 .../packagegroup-core-security.bb             |  1 -
 .../xmlsec1/change-finding-path-of-nss.patch  | 67 ---------------
 .../xmlsec1/xmlsec1/fix-ltmain.sh.patch       | 26 ------
 .../xmlsec1/xmlsec1/makefile-ptest.patch      | 40 ---------
 recipes-security/xmlsec1/xmlsec1/run-ptest    | 85 -------------------
 ...examples-allow-build-in-separate-dir.patch | 30 -------
 recipes-security/xmlsec1/xmlsec1_1.2.28.bb    | 64 --------------
 9 files changed, 315 deletions(-)
 delete mode 100644 recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
 delete mode 100644 recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch
 delete mode 100644 recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch
 delete mode 100755 recipes-security/xmlsec1/xmlsec1/run-ptest
 delete mode 100644 recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
 delete mode 100644 recipes-security/xmlsec1/xmlsec1_1.2.28.bb
conf/distro/include/maintainers.inc +0 -1
index 94b45f2..47f5317 100644
@@ -56,4 +56,3 @@ RECIPE_MAINTAINER_pn-smack = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-sssd = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-suricata = "Armin Kuster <[email protected]>"
 RECIPE_MAINTAINER_pn-tripwire = "Armin Kuster <[email protected]>"
-RECIPE_MAINTAINER_pn-xmlsec1 = "Armin Kuster <[email protected]>"
recipes-security/packagegroup/packagegroup-core-security-ptest.bb +0 -1
index 4934889..ddcf208 100644
@@ -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 \
recipes-security/packagegroup/packagegroup-core-security.bb +0 -1
index 9165eef..20ba46f 100644
@@ -29,7 +29,6 @@ RDEPENDS_packagegroup-security-utils = "\
     pinentry \
     python-scapy \
     ding-libs \
-    xmlsec1 \
     keyutils \
     libseccomp \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd", "",d)} \
recipes-security/xmlsec1/xmlsec1/change-finding-path-of-nss.patch deleted +0 -67

67 lines not on this page · raw message

recipes-security/xmlsec1/xmlsec1/fix-ltmain.sh.patch deleted +0 -26
deleted file mode 100644
index af598fe..0000000
@@ -1,26 +0,0 @@
-From 847dc52f5a50e34ee4d6e3dc2c708711747a58ca Mon Sep 17 00:00:00 2001
-From: Yulong Pei <[email protected]>
-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 <[email protected]>
-
----
- 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" && \
recipes-security/xmlsec1/xmlsec1/makefile-ptest.patch deleted +0 -40
deleted file mode 100644
index d453569..0000000
@@ -1,40 +0,0 @@
-From 83a1381e1d6bd1b5ec3df6f7c4bc1f4fe4f860b6 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <[email protected]>
-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 <[email protected]>
-
----
- 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)
- 
recipes-security/xmlsec1/xmlsec1/run-ptest deleted +0 -85

85 lines not on this page · raw message

recipes-security/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch deleted +0 -30
deleted file mode 100644
index 8b2533e..0000000
@@ -1,30 +0,0 @@
-From 0c38c6864e7ba8f53a657d87894f24374a6a4932 Mon Sep 17 00:00:00 2001
-From: Jackie Huang <[email protected]>
-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 <[email protected]>
-
----
- 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:
recipes-security/xmlsec1/xmlsec1_1.2.28.bb deleted +0 -64

64 lines not on this page · raw message

Signature · 1 line
2.17.1