[csw-devel] SF.net SVN: gar:[9754] csw/mgar/pkg/cups/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Sun Apr 25 09:01:58 CEST 2010
Revision: 9754
http://gar.svn.sourceforge.net/gar/?rev=9754&view=rev
Author: wahwah
Date: 2010-04-25 07:01:57 +0000 (Sun, 25 Apr 2010)
Log Message:
-----------
cups: Version 1.4.3 builds, but there are still problems: (1) rpath, (2) init file outside sysconfdir
Modified Paths:
--------------
csw/mgar/pkg/cups/trunk/Makefile
csw/mgar/pkg/cups/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch
Removed Paths:
-------------
csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile 2010-04-24 20:18:10 UTC (rev 9753)
+++ csw/mgar/pkg/cups/trunk/Makefile 2010-04-25 07:01:57 UTC (rev 9754)
@@ -3,7 +3,7 @@
# $Id$
GARNAME = cups
-GARVERSION = 1.4.2
+GARVERSION = 1.4.3
CATEGORIES = net
define BLURB
@@ -52,9 +52,9 @@
PATCHFILES = 0001-cswcups-for-service-name.patch
PATCHFILES += 0002-Adding-the-refcount-member-to-mime_type_t.patch
PATCHFILES += 0003-Reference-counting-for-printers-only.patch
-PATCHFILES += 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
PATCHFILES += 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
PATCHFILES += 0007-Solaris-zone-support-in-init-script.patch
+PATCHFILES += CFLAGS-leaking-to-C++-compiler.patch
BUILD_DEP_PKGS = CSWggettext
BUILD_DEP_PKGS += CSWjpeg
@@ -94,7 +94,7 @@
RUNTIME_DEP_PKGS_CSWlibcups += CSWpng
RUNTIME_DEP_PKGS_CSWlibcups += CSWtiff
RUNTIME_DEP_PKGS_CSWlibcups += CSWzlib
-RUNTIME_DEP_PKGS_CSWcupsdev += CSWcupsd
+RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcups
PKGFILES_CSWlibcups = $(libdir)/libcups.*
@@ -106,7 +106,7 @@
PKGFILES_CSWcupsdev += $(bindir)/cups-config
PKGFILES_CSWcupsdev += $(datadir)/cups/ppdc.*
PKGFILES_CSWcupsdev += $(datadir)/cups/drv.*
-PKGFILES_CSWcupsd = $(sysconfdir)/init\.d/.*
+PKGFILES_CSWcupsd += $(prefix)/etc/init\.d/.*
PKGFILES_CSWcupsd += $(sysconfdir)/rc.*
PKGFILES_CSWcupsd += $(sysconfdir)/cups/cupsd.*
PKGFILES_CSWcupsd += $(sysconfdir)/cups/interfaces.*
@@ -162,7 +162,7 @@
# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html
SAMPLECONF_CSWcupsd = $(sysconfdir)/cups/cupsd\.conf\.CSW
SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW
-INITSMF = $(sysconfdir)/init\.d/cswcups
+INITSMF = $(prefix)/etc/init\.d/cswcups
LD_OPTIONS = -R/opt/csw/lib/\$$ISALIST -R/opt/csw/lib
@@ -203,10 +203,22 @@
OPTIM = $(OPTIM_$(GARFLAVOR))
export OPTIM
+INITDIR=/opt/csw/etc
+export INITDIR
+
LICENSE = LICENSE.txt
+CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcups
+CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsclient
+CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsd
+
include gar/category.mk
+pre-configure-modulated:
+ # This command will fail, but it's okay, it's enough to get the job done.
+ (cd $(WORKSRC); autoreconf || true)
+ @$(MAKECOOKIE)
+
post-install-modulated:
(cd $(DESTDIR)$(sysconfdir)/cups; \
echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \
Modified: csw/mgar/pkg/cups/trunk/checksums
===================================================================
--- csw/mgar/pkg/cups/trunk/checksums 2010-04-24 20:18:10 UTC (rev 9753)
+++ csw/mgar/pkg/cups/trunk/checksums 2010-04-25 07:01:57 UTC (rev 9754)
@@ -1,11 +1,11 @@
1e5e54a2b503cfdeeda1b683bcccab83 0001-cswcups-for-service-name.patch
0da4ea6bf72d61adfc4316a738b90ab5 0002-Adding-the-refcount-member-to-mime_type_t.patch
a80b8543633e2f9b3b1e531ac2289306 0003-Reference-counting-for-printers-only.patch
-bbf0295c76cd06b5311ac3a3467fd431 0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
0dd35cc0938696577104852781ec1df6 0006-Fail-compilation-if-no-SSL-impl-chosen.patch
44ff410e237d6f4f9f0fe650ba2c7fa0 0007-Solaris-zone-support-in-init-script.patch
+e5a145b36404974a689ac694f679d1e1 CFLAGS-leaking-to-C++-compiler.patch
cf6a3fe902545aac1ab2303e41c08a3e CSWcupsclient.preinstall
ca7718998e56c320c08a77cfefe046f6 CSWcupsd.postremove
cf6a3fe902545aac1ab2303e41c08a3e CSWcupsd.preinstall
4e6b68d829be4e88afd27ac4897957f4 client.conf.CSW
-d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2
+e70b1c3f60143d7310c1d74c111a21ab cups-1.4.3-source.tar.bz2
Deleted: csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2010-04-24 20:18:10 UTC (rev 9753)
+++ csw/mgar/pkg/cups/trunk/files/0005-Mapping-gnutls_record_recv-return-error-codes-to-err.patch 2010-04-25 07:01:57 UTC (rev 9754)
@@ -1,42 +0,0 @@
-From 77851ae023d84a70379d8897ca5b2e5cfcfebeba Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Wed, 21 Oct 2009 12:40:39 +0200
-Subject: [PATCH] Mapping gnutls_record_recv return error codes to errno
-
----
- cups/http.c | 19 ++++++++++++++++++-
- 1 files changed, 18 insertions(+), 1 deletions(-)
-
-diff --git a/cups/http.c b/cups/http.c
-index 840e3fc..e255375 100644
---- a/cups/http.c
-+++ b/cups/http.c
-@@ -2719,7 +2719,24 @@ http_read_ssl(http_t *http, /* I - Connection to server */
- return (SSL_read((SSL *)(http->tls), buf, len));
-
- # elif defined(HAVE_GNUTLS)
-- return (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len));
-+ int result;
-+ result = (gnutls_record_recv(((http_tls_t *)(http->tls))->session, buf, len));
-+ if (result < 0 && !errno) {
-+ switch (result)
-+ {
-+ case GNUTLS_E_INTERRUPTED :
-+ errno = EINTR;
-+ break;
-+ case GNUTLS_E_AGAIN :
-+ errno = EAGAIN;
-+ break;
-+ default :
-+ errno = EPIPE;
-+ break;
-+ }
-+ result = -1;
-+ }
-+ return result;
-
- # elif defined(HAVE_CDSASSL)
- int result; /* Return value */
---
-1.6.5
-
Added: csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch (rev 0)
+++ csw/mgar/pkg/cups/trunk/files/CFLAGS-leaking-to-C++-compiler.patch 2010-04-25 07:01:57 UTC (rev 9754)
@@ -0,0 +1,11 @@
+--- cups-1.4.3/config-scripts/cups-gssapi.m4.orig 2010-04-24 14:27:26.897008812 +0200
++++ cups-1.4.3/config-scripts/cups-gssapi.m4 2010-04-24 14:27:53.269633434 +0200
+@@ -35,7 +35,7 @@
+ AC_DEFINE(HAVE_GSSAPI, 1, [Whether GSSAPI is available])
+ CFLAGS="`$KRB5CONFIG --cflags` $CFLAGS"
+ CPPFLAGS="`$KRB5CONFIG --cflags` $CPPFLAGS"
+- LIBGSSAPI="-lgss `$KRB5CONFIG --libs`")
++ LIBGSSAPI="-lgss `CFLAGS= $KRB5CONFIG --libs`")
+ ;;
+ *)
+ # Other platforms just ask for GSSAPI
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list