19443217 Sane should be enabled with ASLR
authorhaiqian.feng@oracle.com <haiqian.feng@oracle.com>
Tue, 19 May 2015 20:39:08 -0700
changeset 4316 2e2c630382bc
parent 4315 6a79bbbd44ef
child 4317 9a10842d8fa9
19443217 Sane should be enabled with ASLR 15468841 SUNBT6681834 support 64bit version of libsane 20808167 scanimage binary failed at link stage with new 64-bit compiler
components/sane-backends/Makefile
components/sane-backends/sane-backends.p5m
components/sane-frontends/Makefile
--- a/components/sane-backends/Makefile	Tue May 19 16:53:20 2015 -0700
+++ b/components/sane-backends/Makefile	Tue May 19 20:39:08 2015 -0700
@@ -42,11 +42,16 @@
 CONFIGURE_OPTIONS +=	--sysconfdir=/etc
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 
-configure:	$(CONFIGURE_32)
+configure:	$(CONFIGURE_32_and_64)
+
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
 
-build:		$(BUILD_32)
+COMPONENT_BUILD_ARGS += LDFLAGS="$(CC_BITS)"
 
-install:	$(INSTALL_32)
+build:          $(BUILD_32_and_64)
+
+install:        $(INSTALL_32_and_64)
 
 test:		$(NO_TESTS)
 
--- a/components/sane-backends/sane-backends.p5m	Tue May 19 16:53:20 2015 -0700
+++ b/components/sane-backends/sane-backends.p5m	Tue May 19 20:39:08 2015 -0700
@@ -144,11 +144,195 @@
     original_name=SUNWsane-backend:etc/sane.d/umax1220u.conf preserve=renamenew
 file path=etc/sane.d/umax_pp.conf owner=root group=bin mode=0644 \
     original_name=SUNWsane-backend:etc/sane.d/umax_pp.conf preserve=renamenew
+file path=usr/bin/$(MACH64)/sane-config
 file path=usr/bin/sane-config
-file path=usr/bin/sane-find-scanner
-file path=usr/bin/scanimage
+file usr/bin/$(MACH64)/sane-find-scanner path=usr/bin/sane-find-scanner
+file usr/bin/$(MACH64)/scanimage path=usr/bin/scanimage
 file path=usr/include/sane/sane.h
 file path=usr/include/sane/saneopts.h
+link path=usr/lib/$(MACH64)/libsane.so target=libsane.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/libsane.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/libsane.so.1 target=libsane.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-abaton.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-abaton.so.1 \
+    target=libsane-abaton.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-apple.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-apple.so.1 \
+    target=libsane-apple.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-artec.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-artec.so.1 \
+    target=libsane-artec.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-artec_eplus48u.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-artec_eplus48u.so.1 \
+    target=libsane-artec_eplus48u.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-as6e.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-as6e.so.1 \
+    target=libsane-as6e.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-avision.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-avision.so.1 \
+    target=libsane-avision.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-bh.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-bh.so.1 \
+    target=libsane-bh.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-canon.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-canon.so.1 \
+    target=libsane-canon.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-canon630u.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-canon630u.so.1 \
+    target=libsane-canon630u.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-cardscan.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-cardscan.so.1 \
+    target=libsane-cardscan.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-coolscan.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-coolscan.so.1 \
+    target=libsane-coolscan.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-coolscan2.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-coolscan2.so.1 \
+    target=libsane-coolscan2.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-dc25.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-dc25.so.1 \
+    target=libsane-dc25.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-dell1600n_net.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-dell1600n_net.so.1 \
+    target=libsane-dell1600n_net.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-dll.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-dll.so.1 \
+    target=libsane-dll.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-dmc.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-dmc.so.1 \
+    target=libsane-dmc.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-epjitsu.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-epjitsu.so.1 \
+    target=libsane-epjitsu.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-epson.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-epson.so.1 \
+    target=libsane-epson.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-fujitsu.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-fujitsu.so.1 \
+    target=libsane-fujitsu.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-genesys.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-genesys.so.1 \
+    target=libsane-genesys.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-gt68xx.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-gt68xx.so.1 \
+    target=libsane-gt68xx.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-hp.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-hp.so.1 \
+    target=libsane-hp.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-hp3500.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-hp3500.so.1 \
+    target=libsane-hp3500.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-hp3900.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-hp3900.so.1 \
+    target=libsane-hp3900.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-hp5400.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-hp5400.so.1 \
+    target=libsane-hp5400.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-hp5590.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-hp5590.so.1 \
+    target=libsane-hp5590.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-hpljm1005.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-hpljm1005.so.1 \
+    target=libsane-hpljm1005.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-hs2p.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-hs2p.so.1 \
+    target=libsane-hs2p.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-ibm.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-ibm.so.1 \
+    target=libsane-ibm.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-leo.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-leo.so.1 \
+    target=libsane-leo.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-lexmark.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-lexmark.so.1 \
+    target=libsane-lexmark.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-ma1509.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-ma1509.so.1 \
+    target=libsane-ma1509.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-matsushita.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-matsushita.so.1 \
+    target=libsane-matsushita.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-microtek.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-microtek.so.1 \
+    target=libsane-microtek.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-microtek2.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-microtek2.so.1 \
+    target=libsane-microtek2.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-mustek.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-mustek.so.1 \
+    target=libsane-mustek.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-mustek_usb.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-mustek_usb.so.1 \
+    target=libsane-mustek_usb.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-mustek_usb2.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-mustek_usb2.so.1 \
+    target=libsane-mustek_usb2.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-nec.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-nec.so.1 \
+    target=libsane-nec.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-net.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-net.so.1 \
+    target=libsane-net.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-pie.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-pie.so.1 \
+    target=libsane-pie.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-pixma.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-pixma.so.1 \
+    target=libsane-pixma.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-plustek.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-plustek.so.1 \
+    target=libsane-plustek.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-plustek_pp.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-plustek_pp.so.1 \
+    target=libsane-plustek_pp.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-ricoh.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-ricoh.so.1 \
+    target=libsane-ricoh.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-sceptre.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-sceptre.so.1 \
+    target=libsane-sceptre.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-sharp.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-sharp.so.1 \
+    target=libsane-sharp.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-sm3600.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-sm3600.so.1 \
+    target=libsane-sm3600.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-sm3840.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-sm3840.so.1 \
+    target=libsane-sm3840.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-snapscan.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-snapscan.so.1 \
+    target=libsane-snapscan.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-sp15c.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-sp15c.so.1 \
+    target=libsane-sp15c.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-st400.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-st400.so.1 \
+    target=libsane-st400.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-teco1.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-teco1.so.1 \
+    target=libsane-teco1.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-teco2.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-teco2.so.1 \
+    target=libsane-teco2.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-teco3.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-teco3.so.1 \
+    target=libsane-teco3.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-test.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-test.so.1 \
+    target=libsane-test.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-u12.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-u12.so.1 \
+    target=libsane-u12.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-umax.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-umax.so.1 \
+    target=libsane-umax.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-umax1220u.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-umax1220u.so.1 \
+    target=libsane-umax1220u.so.$(COMPONENT_VERSION)
+file path=usr/lib/$(MACH64)/sane/libsane-umax_pp.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/sane/libsane-umax_pp.so.1 \
+    target=libsane-umax_pp.so.$(COMPONENT_VERSION)
 link path=usr/lib/libsane.so target=libsane.so.$(COMPONENT_VERSION)
 file path=usr/lib/libsane.so.$(COMPONENT_VERSION)
 link path=usr/lib/libsane.so.1 target=libsane.so.$(COMPONENT_VERSION)
--- a/components/sane-frontends/Makefile	Tue May 19 16:53:20 2015 -0700
+++ b/components/sane-frontends/Makefile	Tue May 19 20:39:08 2015 -0700
@@ -47,6 +47,9 @@
 
 configure:	$(CONFIGURE_32)
 
+# Enable ASLR for this component
+ASLR_MODE = $(ASLR_ENABLE)
+
 build:		$(BUILD_32)
 
 install:	$(INSTALL_32)