/hg/icedtea7: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 14 02:04:30 UTC 2015
changeset c963ccc12877 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=c963ccc12877
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 00:48:43 2015 +0100
PR2390: Make elliptic curve removal optional
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2390: Make elliptic curve removal
optional
* INSTALL:
Document --enable-non-nss-curves.
* Makefile.am:
(ICEDTEA_PATCHES): Only apply
the RH1022017 patch when non-NSS
curves are not enabled.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_NON_NSS_CURVES): New
macro to allow non-NSS curves to
be turned on.
* configure.ac:
Invoke IT_ENABLE_NON_NSS_CURVES.
* fsg.sh.in:
Don't alter the curve list when
non-NSS curves are enabled.
changeset 6f9dc8a83dd4 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=6f9dc8a83dd4
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 00:51:24 2015 +0100
Add IcedTea issue PR2478 to 8065238 listing.
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Add IcedTea issue to 8065238
listing.
changeset 2d4857a0d343 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2d4857a0d343
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 01:56:21 2015 +0100
PR2499: Update remove-intree-libraries.sh script
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2499: Update remove-intree-libraries.sh script
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_SUNEC): Rename enable_sunec to
ENABLE_SUNEC and substitute into autoconf
generated files.
* remove-intree-libraries.sh.in:
Bump zlib version to 1.2.8. Update enablement
tests following PR1661. Check that system library
code exists first before deleting and fail if not.
changeset 219bd49d5d66 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=219bd49d5d66
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 02:41:22 2015 +0100
PR2500: Add executable stack markings to callNative.S on JamVM
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2500: Add executable stack markings
to callNative.S on JamVM
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
(jamvm): Drop setting -noexecstack in
LDFLAGS; replaced by code fix in JamVM.
* NEWS: Updated.
* patches/jamvm/noexecstack.patch:
Add notes to assembly files in order to
turn off executable stack.
changeset d5723da37acc in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d5723da37acc
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 03:04:04 2015 +0100
PR2507, G541462: Only apply PaX markings by default on running PaX kernels
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2507, G541462: Only apply PaX markings by default
on running PaX kernels
* NEWS: Updated.
* acinclude.m4:
(IT_HAS_PAX): Use grep directly rather
than piping from cat.
(IT_WITH_PAX): Use ${pax_active} as the
default value. Handle --with-pax and
--without-pax options (i.e. without arguments)
better.
diffstat:
ChangeLog | 65 +++++++++++++++++++++++++++++
INSTALL | 1 +
Makefile.am | 11 +---
NEWS | 6 ++-
acinclude.m4 | 90 +++++++++++++++++++++++++---------------
configure.ac | 1 +
fsg.sh.in | 7 +-
patches/jamvm/noexecstack.patch | 48 +++++++++++++++++++++
remove-intree-libraries.sh.in | 38 ++++++++++++++---
9 files changed, 214 insertions(+), 53 deletions(-)
diffs (447 lines):
diff -r a3dbf73342b5 -r d5723da37acc ChangeLog
--- a/ChangeLog Mon Jul 13 15:12:51 2015 +0100
+++ b/ChangeLog Tue Jul 14 03:04:04 2015 +0100
@@ -1,3 +1,68 @@
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2507, G541462: Only apply PaX markings by default
+ on running PaX kernels
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_HAS_PAX): Use grep directly rather
+ than piping from cat.
+ (IT_WITH_PAX): Use ${pax_active} as the
+ default value. Handle --with-pax and
+ --without-pax options (i.e. without arguments)
+ better.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2500: Add executable stack markings
+ to callNative.S on JamVM
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patch.
+ (jamvm): Drop setting -noexecstack in
+ LDFLAGS; replaced by code fix in JamVM.
+ * NEWS: Updated.
+ * patches/jamvm/noexecstack.patch:
+ Add notes to assembly files in order to
+ turn off executable stack.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2499: Update remove-intree-libraries.sh script
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_SUNEC): Rename enable_sunec to
+ ENABLE_SUNEC and substitute into autoconf
+ generated files.
+ * remove-intree-libraries.sh.in:
+ Bump zlib version to 1.2.8. Update enablement
+ tests following PR1661. Check that system library
+ code exists first before deleting and fail if not.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * NEWS: Add IcedTea issue to 8065238
+ listing.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2390: Make elliptic curve removal
+ optional
+ * INSTALL:
+ Document --enable-non-nss-curves.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Only apply
+ the RH1022017 patch when non-NSS
+ curves are not enabled.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_NON_NSS_CURVES): New
+ macro to allow non-NSS curves to
+ be turned on.
+ * configure.ac:
+ Invoke IT_ENABLE_NON_NSS_CURVES.
+ * fsg.sh.in:
+ Don't alter the curve list when
+ non-NSS curves are enabled.
+
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2172: --enable-jamvm builds broken, missing
diff -r a3dbf73342b5 -r d5723da37acc INSTALL
--- a/INSTALL Mon Jul 13 15:12:51 2015 +0100
+++ b/INSTALL Tue Jul 14 03:04:04 2015 +0100
@@ -201,6 +201,7 @@
* --enable-native-debuginfo: Include debuginfo in native binaries.
* --enable-java-debuginfo: Include debuginfo in Java class files.
* --enable-infinality: Use fontconfig for better font rendering
+* --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521})
Testing
=======
diff -r a3dbf73342b5 -r d5723da37acc Makefile.am
--- a/Makefile.am Mon Jul 13 15:12:51 2015 +0100
+++ b/Makefile.am Tue Jul 14 03:04:04 2015 +0100
@@ -272,19 +272,17 @@
if BUILD_JAMVM
ICEDTEA_PATCHES += \
patches/jamvm/find_class_from_caller.patch \
- patches/jamvm/pr2172-tempdir.patch
+ patches/jamvm/pr2172-tempdir.patch \
+ patches/jamvm/noexecstack.patch
endif
if ENABLE_NSS
-ICEDTEA_PATCHES += patches/nss-config.patch \
- patches/rh1022017.patch
+ICEDTEA_PATCHES += patches/nss-config.patch
endif
-if ENABLE_SUNEC
-if !ENABLE_NSS
+if !USE_NON_NSS_CURVES
ICEDTEA_PATCHES += patches/rh1022017.patch
endif
-endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -2291,7 +2289,6 @@
stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
if BUILD_JAMVM
cd jamvm/jamvm && \
- LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
./autogen.sh --with-java-runtime-library=openjdk7 \
--prefix=$(abs_top_builddir)/jamvm/install ; \
$(MAKE) ; \
diff -r a3dbf73342b5 -r d5723da37acc NEWS
--- a/NEWS Mon Jul 13 15:12:51 2015 +0100
+++ b/NEWS Tue Jul 14 03:04:04 2015 +0100
@@ -258,7 +258,7 @@
- S8064667: Add -XX:+CheckEndorsedAndExtDirs flag to JDK 8
- S8064846: Lazy-init thread safety problems in core reflection
- S8065098: JColorChooser no longer supports drag and drop between two JVM instances
- - S8065238: javax.naming.NamingException after upgrade to JDK 8
+ - S8065238, PR2478: javax.naming.NamingException after upgrade to JDK 8
- S8065552: setAccessible(true) on fields of Class may throw a SecurityException
- S8065553: Failed Java web start via IPv6 (Java7u71 or later)
- S8065609: 7u76 l10n resource file translation update
@@ -315,12 +315,15 @@
- PR2323: System GConf without system GIO configuration broken
- PR2328: GCJ uses ppc64el named libarch directory on ppc64le
- PR2341: Update README & INSTALL files
+ - PR2390: Make elliptic curve removal optional
- PR2394: ppc64le does not support -Xshare:dump
- PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
- PR2446: Support system libsctp
- PR2458: Policy JAR files should be timestamped with the date of the policy file they hold
- PR2482, RH489586, RH1236619: OpenJDK can't handle spaces in zone names in /etc/sysconfig/clock
- PR2496: Enable system PCSC support by default
+ - PR2499: Update remove-intree-libraries.sh script
+ - PR2507, G541462: Only apply PaX markings by default on running PaX kernels
* AArch64 port
- Add copyright to aarch64_ad.m4
- S8069593: Changes to JavaThread::_thread_state must use acquire and release
@@ -441,6 +444,7 @@
- PR2520: --enable-cacao builds broken, missing JVM_GetTemporaryDirectory impl.
* JamVM
- PR2172: --enable-jamvm builds broken, missing JVM_GetTemporaryDirectory impl
+ - PR2500: Add executable stack markings to callNative.S on JamVM
* ARM32 port
- PR2228: Add ARM32 JIT
- PR2297: Use the IcedTea 2.6.0 HotSpot on ARM32 by default
diff -r a3dbf73342b5 -r d5723da37acc acinclude.m4
--- a/acinclude.m4 Mon Jul 13 15:12:51 2015 +0100
+++ b/acinclude.m4 Tue Jul 14 03:04:04 2015 +0100
@@ -2341,7 +2341,7 @@
AC_DEFUN_ONCE([IT_HAS_PAX],
[
AC_MSG_CHECKING([if a PaX kernel is in use])
- if cat /proc/self/status | grep '^PaX' >&AS_MESSAGE_LOG_FD 2>&1; then
+ if grep '^PaX' /proc/self/status >&AS_MESSAGE_LOG_FD 2>&1; then
pax_active=yes;
else
pax_active=no;
@@ -2358,41 +2358,44 @@
AC_ARG_WITH([pax],
[AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
[
- if test "x${withval}" = "xyes"; then
- PAX_COMMAND=no
- else
- PAX_COMMAND="${withval}"
- fi
+ PAX_COMMAND="${withval}"
],
[
- PAX_COMMAND=no
+ PAX_COMMAND=${pax_active}
])
- AC_MSG_RESULT(${PAX_COMMAND})
- if test "x${PAX_COMMAND}" == "xno"; then
+ if test "x${PAX_COMMAND}" == "xyes"; then
+ AC_MSG_RESULT([no])
PAX_COMMAND=${PAX_DEFAULT}
+ AC_MSG_NOTICE([PaX enabled but no tool specified; using ${PAX_DEFAULT}])
+ else
+ AC_MSG_RESULT(${PAX_COMMAND})
fi
- AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
- if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
- AC_MSG_RESULT([yes])
+ if test "x${PAX_COMMAND}" != "xno"; then
+ AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
+ if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PAX_COMMAND=""
+ AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "chpax")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl")
+ fi
+ fi
else
- AC_MSG_RESULT([no])
PAX_COMMAND=""
- AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
- if test -z "${PAX_COMMAND}"; then
- AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
- fi
- if test -z "${PAX_COMMAND}"; then
- AC_PATH_PROG(PAX_COMMAND, "chpax")
- fi
- if test -z "${PAX_COMMAND}"; then
- AC_PATH_PROG(PAX_COMMAND, "paxctl")
- fi
- if test -z "${PAX_COMMAND}"; then
- if test "x${pax_active}" = "xyes"; then
- AC_MSG_ERROR("No PaX utility found and running on a PaX kernel.")
- else
- AC_MSG_WARN("No PaX utility found.")
- fi
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ if test "x${pax_active}" = "xyes"; then
+ AC_MSG_ERROR("No PaX utility found and running on a PaX kernel.")
+ else
+ AC_MSG_WARN("No PaX utility found.")
fi
fi
if test -n "${PAX_COMMAND}"; then
@@ -2692,19 +2695,18 @@
[
case "${enableval}" in
yes)
- enable_sunec=yes
+ ENABLE_SUNEC=yes
;;
*)
- enable_sunec=no
+ ENABLE_SUNEC=no
;;
esac
],
[
- enable_sunec=no
+ ENABLE_SUNEC=no
])
- AC_MSG_RESULT([$enable_sunec])
- AM_CONDITIONAL([ENABLE_SUNEC], test x"${enable_sunec}" = "xyes")
- if test x"${enable_sunec}" = "xyes"; then
+ AC_MSG_RESULT([$ENABLE_SUNEC])
+ if test x"${ENABLE_SUNEC}" = "xyes"; then
PKG_CHECK_MODULES(NSS_SOFTOKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
@@ -2719,6 +2721,8 @@
AC_SUBST(SUNEC_CFLAGS)
AC_SUBST(SUNEC_LIBS)
fi
+ AM_CONDITIONAL([ENABLE_SUNEC], test x"${ENABLE_SUNEC}" = "xyes")
+ AC_SUBST(ENABLE_SUNEC)
])
AC_DEFUN_ONCE([IT_CHECK_TOOLS_JAR_EXISTS],
@@ -3017,3 +3021,19 @@
AM_CONDITIONAL(USE_SYSTEM_SCTP, test x"${ENABLE_SYSTEM_SCTP}" = "xtrue")
AC_SUBST(ENABLE_SYSTEM_SCTP)
])
+
+AC_DEFUN_ONCE([IT_ENABLE_NON_NSS_CURVES],
+[
+ AC_MSG_CHECKING([whether to enable elliptic curves beyond those supported by NSS])
+ AC_ARG_ENABLE([non-nss-curves],
+ [AS_HELP_STRING(--enable-non-nss-curves,register curves beyond the 3 NSS defines [[default=no]])],
+ [
+ ENABLE_NON_NSS_CURVES="${enableval}"
+ ],
+ [
+ ENABLE_NON_NSS_CURVES="no"
+ ])
+ AC_MSG_RESULT(${ENABLE_NON_NSS_CURVES})
+ AM_CONDITIONAL(USE_NON_NSS_CURVES, test x"${ENABLE_NON_NSS_CURVES}" = "xyes")
+ AC_SUBST(ENABLE_NON_NSS_CURVES)
+])
diff -r a3dbf73342b5 -r d5723da37acc configure.ac
--- a/configure.ac Mon Jul 13 15:12:51 2015 +0100
+++ b/configure.ac Tue Jul 14 03:04:04 2015 +0100
@@ -181,6 +181,7 @@
IT_ENABLE_JAR_COMPRESSION
IT_CHECK_ADDITIONAL_VMS
IT_ENABLE_ARM32JIT
+IT_ENABLE_NON_NSS_CURVES
IT_WITH_VERSION_SUFFIX
IT_ENABLE_HG
diff -r a3dbf73342b5 -r d5723da37acc fsg.sh.in
--- a/fsg.sh.in Mon Jul 13 15:12:51 2015 +0100
+++ b/fsg.sh.in Tue Jul 14 03:04:04 2015 +0100
@@ -108,6 +108,7 @@
echo "Removing EC source code we don't build"
rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl
-echo "Syncing EC list with NSS"
-patch -Np0 < @abs_top_srcdir@/patches/pr2124.patch
-
+if test "x at ENABLE_NON_NSS_CURVES@" = "xno"; then
+ echo "Syncing EC list with NSS"
+ patch -Np0 < @abs_top_srcdir@/patches/pr2124.patch
+fi
diff -r a3dbf73342b5 -r d5723da37acc patches/jamvm/noexecstack.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/noexecstack.patch Tue Jul 14 03:04:04 2015 +0100
@@ -0,0 +1,48 @@
+diff --git a/src/os/linux/arm/callNative.S jamvm/jamvm/src/os/linux/arm/callNative.S
+index 245afd1..1583023 100644
+--- jamvm.orig/jamvm/src/os/linux/arm/callNative.S
++++ jamvm/jamvm/src/os/linux/arm/callNative.S
+@@ -36,3 +36,7 @@
+ #include "callNativeOABI.S"
+ #endif
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git jamvm.orig/jamvm/src/os/linux/mips/callNative.S jamvm/jamvm/src/os/linux/mips/callNative.S
+index cede343..90d9163 100644
+--- jamvm.orig/jamvm/src/os/linux/mips/callNative.S
++++ jamvm/jamvm/src/os/linux/mips/callNative.S
+@@ -184,3 +184,7 @@ return:
+ j $31
+ .end callJNIMethod
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git jamvm.orig/jamvm/src/os/linux/powerpc/callNative.S jamvm/jamvm/src/os/linux/powerpc/callNative.S
+index aa47f6a..763dc0a 100644
+--- jamvm.orig/jamvm/src/os/linux/powerpc/callNative.S
++++ jamvm/jamvm/src/os/linux/powerpc/callNative.S
+@@ -281,3 +281,7 @@ return:
+ mr 1,11
+ blr
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git jamvm.orig/jamvm/src/os/linux/x86_64/callNative.S jamvm/jamvm/src/os/linux/x86_64/callNative.S
+index 26404e6..9fb5cdf 100644
+--- jamvm.orig/jamvm/src/os/linux/x86_64/callNative.S
++++ jamvm/jamvm/src/os/linux/x86_64/callNative.S
+@@ -267,3 +267,7 @@ float_ret:
+ addq $8, %rcx
+ jmp return
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff -r a3dbf73342b5 -r d5723da37acc remove-intree-libraries.sh.in
--- a/remove-intree-libraries.sh.in Mon Jul 13 15:12:51 2015 +0100
+++ b/remove-intree-libraries.sh.in Tue Jul 14 03:04:04 2015 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
-ZLIB_VERSION=1.2.3
+ZLIB_VERSION=1.2.8
ZIP_SRC=openjdk/jdk/src/share/native/java/util/zip/zlib-${ZLIB_VERSION}
JPEG_SRC=openjdk/jdk/src/share/native/sun/awt/image/jpeg/jpeg-6b
GIF_SRC=openjdk/jdk/src/share/native/sun/awt/giflib
@@ -8,27 +8,47 @@
LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms
PCSC_SRC=openjdk/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-if test "x at ENABLE_SYSTEM_ZLIB@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_ZLIB@" = "xtrue"; then
+ if [ ! -d ${ZIP_SRC} ]; then
+ echo "${ZIP_SRC} does not exist. Refusing to proceed."
+ exit -1;
+ fi
echo "Removing zlib"
rm -rvf ${ZIP_SRC}
fi
-if test "x at ENABLE_SYSTEM_JPEG@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_JPEG@" = "xtrue"; then
+ if [ ! -d ${JPEG_SRC} ]; then
+ echo "${JPEG_SRC} does not exist. Refusing to proceed."
+ exit -2;
+ fi
echo "Removing libjpeg"
rm -rvf ${JPEG_SRC}
fi
-if test "x at ENABLE_SYSTEM_GIF@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_GIF@" = "xtrue"; then
+ if [ ! -d ${GIF_SRC} ]; then
+ echo "${GIF_SRC} does not exist. Refusing to proceed."
+ exit -3;
+ fi
echo "Removing giflib"
rm -rvf ${GIF_SRC}
fi
-if test "x at ENABLE_SYSTEM_PNG@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_PNG@" = "xtrue"; then
+ if [ ! -d ${PNG_SRC} ]; then
+ echo "${PNG_SRC} does not exist. Refusing to proceed."
+ exit -4;
+ fi
echo "Removing libpng"
rm -rvf ${PNG_SRC}
fi
-if test "x at ENABLE_SYSTEM_LCMS@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_LCMS@" = "xtrue"; then
+ if [ ! -f ${LCMS_SRC}/cmscam02.c ]; then
+ echo "${LCMS_SRC}/cmscam02.c does not exist. Refusing to proceed."
+ exit -5;
+ fi
echo "Removing lcms"
rm -vf ${LCMS_SRC}/cmscam02.c
rm -vf ${LCMS_SRC}/cmscgats.c
@@ -59,7 +79,11 @@
rm -vf ${LCMS_SRC}/lcms2_plugin.h
fi
-if test "x at ENABLE_SYSTEM_PCSC@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_PCSC@" = "xtrue"; then
+ if [ ! -d ${PCSC_SRC} ]; then
+ echo "${PCSC_SRC} does not exist. Refusing to proceed."
+ exit -6;
+ fi
echo "Removing libpcsc headers"
rm -rvf ${PCSC_SRC}
fi
More information about the distro-pkg-dev
mailing list