* [PATCH 1/3] tcp-wrappers: Rename conflicting variable STRINGS in Makefile
@ 2013-05-10 10:53 Martin Jansa
2013-05-10 10:53 ` [PATCH 2/3] tcp-wrappers: fix indentation Martin Jansa
2013-05-10 10:53 ` [PATCH 3/3] bitbake.conf: export STRINGS Martin Jansa
0 siblings, 2 replies; 3+ messages in thread
From: Martin Jansa @ 2013-05-10 10:53 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../tcp-wrappers-7.6/rename_strings_variable.patch | 35 ++++++++++++++++++++++
.../tcp-wrappers/tcp-wrappers_7.6.bb | 1 +
2 files changed, 36 insertions(+)
create mode 100644 meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
new file mode 100644
index 0000000..7650600
--- /dev/null
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/rename_strings_variable.patch
@@ -0,0 +1,35 @@
+STRINGS name conflicts with variable for strings tools (e.g. i586-oe-linux-strings)
+
+Upstream-Status: Pending
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+--- tcp_wrappers_7.6/Makefile.orig 2013-04-18 23:41:58.277981740 +0200
++++ tcp_wrappers_7.6/Makefile 2013-04-18 23:42:42.513978966 +0200
+@@ -309,7 +309,7 @@
+ pyramid:
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ="environ.o vfprintf.o" \
+- STRINGS="-Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy" \
++ STRINGS_FLAGS="-Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy" \
+ NETGROUP="-DNETGROUP -DUSE_GETDOMAIN" TLI= all
+
+ # Untested.
+@@ -419,7 +419,7 @@
+ # Uncomment the following if your C library does not provide the
+ # strchr/strrchr/memcmp routines, but comes with index/rindex/bcmp.
+ #
+-#STRINGS= -Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy
++#STRINGS_FLAGS= -Dstrchr=index -Dstrrchr=rindex -Dmemcmp=bcmp -Dno_memcpy
+
+ #################################################################
+ # System dependencies: selection of non-default object libraries.
+@@ -690,7 +690,7 @@
+ $(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
+ -DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
+ -DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
+- $(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
++ $(UCHAR) $(TABLES) $(STRINGS_FLAGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
+ $(VSYSLOG) $(HOSTNAME)
+
+ LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index ba94008..3586a35 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -39,6 +39,7 @@ SRC_URI = "ftp://ftp.porcupine.org/pub/security/tcp_wrappers_${PV}.tar.gz \
file://socklen_t.patch \
file://tcpdchk_libwrapped.patch \
file://ldflags.patch \
+ file://rename_strings_variable.patch \
\
file://try-from.8 \
file://safe_finger.8"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] tcp-wrappers: fix indentation
2013-05-10 10:53 [PATCH 1/3] tcp-wrappers: Rename conflicting variable STRINGS in Makefile Martin Jansa
@ 2013-05-10 10:53 ` Martin Jansa
2013-05-10 10:53 ` [PATCH 3/3] bitbake.conf: export STRINGS Martin Jansa
1 sibling, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2013-05-10 10:53 UTC (permalink / raw)
To: openembedded-core
---
.../tcp-wrappers/tcp-wrappers_7.6.bb | 40 +++++++++++-----------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
index 3586a35..c7954e7 100644
--- a/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers_7.6.bb
@@ -1,6 +1,6 @@
SUMMARY = "Security tool that is a wrapper for TCP daemons"
DESCRIPTION = "Tools for monitoring and filtering incoming requests for tcp \
- services."
+ services."
SECTION = "console/network"
LICENSE = "BSD"
@@ -51,25 +51,25 @@ S = "${WORKDIR}/tcp_wrappers_${PV}"
PARALLEL_MAKE = ""
EXTRA_OEMAKE = "'CC=${CC}' \
- 'AR=${AR}' \
- 'RANLIB=${RANLIB}' \
- 'REAL_DAEMON_DIR=${sbindir}' \
- 'STYLE=-DPROCESS_OPTIONS' \
- 'FACILITY=LOG_DAEMON' \
- 'SEVERITY=LOG_INFO' \
- 'BUGS=' \
- 'VSYSLOG=' \
- 'RFC931_TIMEOUT=10' \
- 'ACCESS=-DHOSTS_ACCESS' \
- 'KILL_OPT=-DKILL_IP_OPTIONS' \
- 'UMASK=-DDAEMON_UMASK=022' \
- 'NETGROUP=${EXTRA_OEMAKE_NETGROUP}' \
- 'LIBS=-lnsl' \
- 'ARFLAGS=rv' \
- 'AUX_OBJ=weak_symbols.o' \
- 'TLI=' \
- 'COPTS=' \
- 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'"
+ 'AR=${AR}' \
+ 'RANLIB=${RANLIB}' \
+ 'REAL_DAEMON_DIR=${sbindir}' \
+ 'STYLE=-DPROCESS_OPTIONS' \
+ 'FACILITY=LOG_DAEMON' \
+ 'SEVERITY=LOG_INFO' \
+ 'BUGS=' \
+ 'VSYSLOG=' \
+ 'RFC931_TIMEOUT=10' \
+ 'ACCESS=-DHOSTS_ACCESS' \
+ 'KILL_OPT=-DKILL_IP_OPTIONS' \
+ 'UMASK=-DDAEMON_UMASK=022' \
+ 'NETGROUP=${EXTRA_OEMAKE_NETGROUP}' \
+ 'LIBS=-lnsl' \
+ 'ARFLAGS=rv' \
+ 'AUX_OBJ=weak_symbols.o' \
+ 'TLI=' \
+ 'COPTS=' \
+ 'EXTRA_CFLAGS=${CFLAGS} -DSYS_ERRLIST_DEFINED -DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len'"
EXTRA_OEMAKE_NETGROUP = "-DNETGROUP -DUSE_GETDOMAIN"
EXTRA_OEMAKE_NETGROUP_libc-uclibc = "-DUSE_GETDOMAIN"
--
1.8.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] bitbake.conf: export STRINGS
2013-05-10 10:53 [PATCH 1/3] tcp-wrappers: Rename conflicting variable STRINGS in Makefile Martin Jansa
2013-05-10 10:53 ` [PATCH 2/3] tcp-wrappers: fix indentation Martin Jansa
@ 2013-05-10 10:53 ` Martin Jansa
1 sibling, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2013-05-10 10:53 UTC (permalink / raw)
To: openembedded-core
* remove STRINGS export from systemd
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/bitbake.conf | 1 +
meta/recipes-core/systemd/systemd_199.bb | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 86a4831..fda7bc8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -454,6 +454,7 @@ export RANLIB = "${HOST_PREFIX}ranlib"
export STRIP = "${HOST_PREFIX}strip"
export OBJCOPY = "${HOST_PREFIX}objcopy"
export OBJDUMP = "${HOST_PREFIX}objdump"
+export STRINGS = "${HOST_PREFIX}strings"
export NM = "${HOST_PREFIX}nm"
PYTHON = "${@sys.executable}"
diff --git a/meta/recipes-core/systemd/systemd_199.bb b/meta/recipes-core/systemd/systemd_199.bb
index 08cb0c6..fadc385 100644
--- a/meta/recipes-core/systemd/systemd_199.bb
+++ b/meta/recipes-core/systemd/systemd_199.bb
@@ -86,7 +86,6 @@ EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
do_configure_prepend() {
export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}"
- export STRINGS="${HOST_PREFIX}strings"
export GPERF="${HOST_PREFIX}gperf"
sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
--
1.8.2.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-10 11:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-10 10:53 [PATCH 1/3] tcp-wrappers: Rename conflicting variable STRINGS in Makefile Martin Jansa
2013-05-10 10:53 ` [PATCH 2/3] tcp-wrappers: fix indentation Martin Jansa
2013-05-10 10:53 ` [PATCH 3/3] bitbake.conf: export STRINGS Martin Jansa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox