The branch, master has been updated
via 05f5eb2927fcc973e8ba0679d0904846e26ca79f (commit)
from 503c90889ea252e3467189f9002e6e40f4c2aeaa (commit)
- Shortlog ------------------------------------------------------------
05f5eb2 Do not use backticks inside double quotes in m4 files
Summary of changes:
ChangeLog | 6 ++++++
debian/changelog | 2 ++
m4/arch.m4 | 4 ++--
m4/libs.m4 | 4 ++--
4 files changed, 12 insertions(+), 4 deletions(-)
-----------------------------------------------------------------------
Details of changes:
commit 05f5eb2927fcc973e8ba0679d0904846e26ca79f
Author: Guillem Jover <[EMAIL PROTECTED]>
Date: Fri Jan 18 09:25:02 2008 +0200
Do not use backticks inside double quotes in m4 files
Fix portability issues with ancient shells on HP-UX. Closes: #24514
diff --git a/ChangeLog b/ChangeLog
index 774a5c2..62910a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-01-18 Guillem Jover <[EMAIL PROTECTED]>
+ * m4/arch.m4 (_DPKG_ARCHITECTURE): Do not use backticks inside double
+ quotes, to support ancient shells.
+ * m4/libs.m4 (DPKG_LIB_SELINUX): Likewise.
+
+2008-01-18 Guillem Jover <[EMAIL PROTECTED]>
+
* utils/start-stop-daemon.c (do_help): Coalesce mandatory options
into a single paragraph, and state that at least one is required.
diff --git a/debian/changelog b/debian/changelog
index 062c5dc..546172d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ dpkg (1.14.16) UNRELEASED; urgency=low
* Fix start-stop-daemon --help output to state that --name is one of the
possible required options to use. Closes: #354999
* Demote dselect from priority important to optional. Closes: #461327
+ * Fix portability issues on HP-UX, by not using backticks inside double
+ quotes in m4 files. Closes: #24514
[ Frank Lichtenheld ]
* Make the -L option of dpkg-parsechangelog actually work (it's
diff --git a/m4/arch.m4 b/m4/arch.m4
index e6f242a..2f3ae5f 100644
--- a/m4/arch.m4
+++ b/m4/arch.m4
@@ -4,8 +4,8 @@
# the target architecture, to avoid duplicating its logic.
AC_DEFUN([_DPKG_ARCHITECTURE], [
AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
-$2="`cd $srcdir/scripts; \
- PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`"
+$2=`cd $srcdir/scripts; \
+ PERL5LIB=$(pwd) ./dpkg-architecture.pl -t$target -q$1 2>/dev/null`
])# _DPKG_ARCHITECURE
# DPKG_CPU_TYPE
diff --git a/m4/libs.m4 b/m4/libs.m4
index 3a1531b..1bb1cea 100644
--- a/m4/libs.m4
+++ b/m4/libs.m4
@@ -71,9 +71,9 @@ if test "x$with_selinux" != "xno"; then
[AC_DEFINE(WITH_SELINUX, 1,
[Define to 1 to compile in SELinux support])
if test "x$with_selinux" = "xstatic"; then
- dpkg_selinux_libs="-Wl,-Bstatic `pkg-config --static
--libs libselinux` -Wl,-Bdynamic"
+ dpkg_selinux_libs="-Wl,-Bstatic "`pkg-config --static
--libs libselinux`" -Wl,-Bdynamic"
else
- dpkg_selinux_libs="`pkg-config --libs libselinux`"
+ dpkg_selinux_libs=`pkg-config --libs libselinux`
fi
SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS
}$dpkg_selinux_libs"
with_selinux="yes"],
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
