Use libtool -fstack-protector support in cups

4 files changed, 21 insertions, 11 deletions

diff --git a/print/cups/Makefile b/print/cups/Makefile
index de9b6b825ae..e4b428707a8 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2014/02/12 23:18:28 tron Exp $
+# $NetBSD: Makefile,v 1.202 2014/05/10 13:42:08 richard Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -70,8 +70,8 @@ CONFIGURE_ENV+=		DSOFLAGS=${LDFLAGS:M*:Q}
 .include "options.mk"
 
 .if ${OPSYS} == "SunOS"
-LIBS_SSP =		-lssp_nonshared -lssp
-CONFIGURE_ENV+=		LIBS_SSP=${LIBS_SSP:M*:Q}
+#LIBS_SSP =		-lssp_nonshared -lssp
+#CONFIGURE_ENV+=		LIBS_SSP=${LIBS_SSP:M*:Q}
 LIBS.SunOS+=		-liconv
 .endif
 
diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk
index d64b1e482d9..9ed5115e775 100644
--- a/print/cups/buildlink3.mk
+++ b/print/cups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.32 2014/02/12 23:18:28 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.33 2014/05/10 13:42:08 richard Exp $
 
 BUILDLINK_TREE+=	cups
 
@@ -20,6 +20,7 @@ pkgbase := cups
 .include "../../net/mDNSResponder/buildlink3.mk"
 .endif
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/print/cups/distinfo b/print/cups/distinfo
index ad295b9b6c5..f274d3d0918 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.96 2013/10/12 06:01:58 richard Exp $
+$NetBSD: distinfo,v 1.97 2014/05/10 13:42:08 richard Exp $
 
 SHA1 (cups-1.5.4-source.tar.bz2) = cb39961cbaf1851a47694828ad9a7cdf4da51fbd
 RMD160 (cups-1.5.4-source.tar.bz2) = 9d6a7fd69d3036ec1f3dfd9c70672a2c6fb517b6
 Size (cups-1.5.4-source.tar.bz2) = 9583002 bytes
 SHA1 (patch-ac) = d99dfa6e71efdc5f069c2c3e73e1b29beebf5c9b
 SHA1 (patch-ad) = a8d6610c4057ae98d98435ba577606e3c2bfb4b9
-SHA1 (patch-ae) = 60e31e8a98e4bbd191d3ec98d12fc70fa0a881ea
+SHA1 (patch-ae) = 67e846ac428b4c44d8da9b49d959fa4f14fbb494
 SHA1 (patch-af) = 025f198dd491a55ffc460d03d3ad23a100fe5271
 SHA1 (patch-ag) = 680c1c7fb44d8153b5825252d2e297a5196ca98e
 SHA1 (patch-ah) = 27d9b92a2f1ae116162b4f24d9aab3a955d52052
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index 81b1ce9a405..b8a2afd3ad3 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.30 2012/09/18 15:17:32 drochner Exp $
+$NetBSD: patch-ae,v 1.31 2014/05/10 13:42:08 richard Exp $
 
 For proper libtool usage split CC into CC_COMPILE and CC with libtool
 mode options compile/link respectively.
 
 Same for CXX.
 
---- Makedefs.in.orig	2012-03-01 01:05:55.000000000 +0100
-+++ Makedefs.in	2012-09-12 16:45:31.000000000 +0200
+--- Makedefs.in.orig	2012-03-01 00:05:55.000000000 +0000
++++ Makedefs.in
 @@ -19,9 +19,11 @@
  
  AR		=	@AR@
@@ -21,7 +21,7 @@ Same for CXX.
  DSO		=	@DSO@
  DSOXX		=	@DSOXX@
  HTMLDOC		=	@HTMLDOC@
-@@ -41,12 +43,12 @@
+@@ -41,12 +43,12 @@ SHELL		=	/bin/sh
  # Installation programs...
  #
  
@@ -37,7 +37,16 @@ Same for CXX.
  INSTALL_MAN	=	$(INSTALL) -c -m 444
  INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
  
-@@ -279,19 +281,19 @@
+@@ -145,7 +147,7 @@ CXXLIBS		=	@CXXLIBS@
+ DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
+ DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
+ DNSSD_BACKEND	=	@DNSSD_BACKEND@
+-DSOFLAGS	=	-L../cups @DSOFLAGS@
++DSOFLAGS	=	-L../cups @DSOFLAGS@ $(OPTIM)
+ DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
+ DNSSDLIBS	=	@DNSSDLIBS@
+ FONTS		=	@FONTS@
+@@ -279,19 +281,19 @@ DBUSDIR		=	@DBUSDIR@
  
  .c.o:
  	echo Compiling $<...