[arch-commits] Commit in cups/trunk (PKGBUILD cups-no-export-ssllibs.patch)

[Jan de Groot]

    Date: Thursday, July 28, 2011 @ 05:24:50
  Author: jgc
Revision: 133458

upgpkg: cups 1.4.7-3
Add patch from Fedora: do not export SSL libraries in cups-config --libs. This resolves unneeded linking to libgcrypt

Added:
  cups/trunk/cups-no-export-ssllibs.patch
Modified:
  cups/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |    7 ++++++-
 cups-no-export-ssllibs.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-28 06:00:29 UTC (rev 133457)
+++ PKGBUILD	2011-07-28 09:24:50 UTC (rev 133458)
@@ -4,7 +4,7 @@
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.4.7
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -12,10 +12,12 @@
              'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
 	cups-avahi.patch
+        cups-no-export-ssllibs.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
 md5sums=('1590033ab4c739b859aeb672fe849089'
          '8ebd390197501ffd709f0ee546937fd5'
+         '9b8467a1e51d360096b70e2c3c081e6c'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
@@ -26,6 +28,9 @@
   cd ${srcdir}/${pkgbase}-${pkgver}
   # Avahi support in the dnssd backend. patch from Fedora
   patch -Np1 -i ${srcdir}/cups-avahi.patch
+
+  # Do not export SSL libs in cups-config
+  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
   
   # Rebuild configure script for --enable-avahi.
   aclocal -I config-scripts

Added: cups-no-export-ssllibs.patch
===================================================================
--- cups-no-export-ssllibs.patch	                        (rev 0)
+++ cups-no-export-ssllibs.patch	2011-07-28 09:24:50 UTC (rev 133458)
@@ -0,0 +1,12 @@
+diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
+--- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
++++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
+@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
+ AC_SUBST(SSLFLAGS)
+ AC_SUBST(SSLLIBS)
+ 
+-EXPORT_SSLLIBS="$SSLLIBS"
++EXPORT_SSLLIBS=""
+ AC_SUBST(EXPORT_SSLLIBS)
+ 
+