diff options
| author | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2011-08-02 04:35:55 +0000 |
| commit | bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (patch) | |
| tree | f9551a1d3c67d2113cc5fc5c3f8816bcbaad0540 /extra/cups | |
| parent | 1173ff2dba7d0fd3c45f170a5e353a76b7a5da2f (diff) | |
Tue Aug 2 04:35:55 UTC 2011
Diffstat (limited to 'extra/cups')
| -rw-r--r-- | extra/cups/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/cups/cups-no-export-ssllibs.patch | 12 | ||||
| -rw-r--r-- | extra/cups/cups.install | 2 |
3 files changed, 20 insertions, 3 deletions
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 753d439df..1f58e5f22 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131768 2011-07-14 19:06:35Z andyrtr $ +# $Id: PKGBUILD 133458 2011-07-28 09:24:50Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> 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 @@ makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils '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 @@ build() { 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 diff --git a/extra/cups/cups-no-export-ssllibs.patch b/extra/cups/cups-no-export-ssllibs.patch new file mode 100644 index 000000000..9be3c819b --- /dev/null +++ b/extra/cups/cups-no-export-ssllibs.patch @@ -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) + + diff --git a/extra/cups/cups.install b/extra/cups/cups.install index 0b7245aa7..47c3d9b82 100644 --- a/extra/cups/cups.install +++ b/extra/cups/cups.install @@ -14,7 +14,7 @@ post_upgrade() { fi if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then # important upgrade notice - echo "daemon srcript has been renamed to /etc/rc.d/cupsd" + echo "daemon script has been renamed to /etc/rc.d/cupsd" echo "change your entry in /etc/rc.conf" fi } |