[csw-devel] SF.net SVN: gar:[11894] csw/mgar/pkg/cups/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Dec 13 00:55:19 CET 2010
Revision: 11894
http://gar.svn.sourceforge.net/gar/?rev=11894&view=rev
Author: wahwah
Date: 2010-12-12 23:55:19 +0000 (Sun, 12 Dec 2010)
Log Message:
-----------
cups: Version bump to 1.4.5, and a patch
Also, killing the cupslinks package.
Modified Paths:
--------------
csw/mgar/pkg/cups/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/cups/trunk/files/0009-giving-precedence-to-statvfs-in-printers.c.patch
Modified: csw/mgar/pkg/cups/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cups/trunk/Makefile 2010-12-12 20:49:03 UTC (rev 11893)
+++ csw/mgar/pkg/cups/trunk/Makefile 2010-12-12 23:55:19 UTC (rev 11894)
@@ -57,6 +57,7 @@
PATCHFILES += CFLAGS-leaking-to-C++-compiler.patch
PATCHFILES += 0008-Adding-CFLAGS-and-CXXFLAGS-to-linker-calls.patch
PATCHFILES += 0009-Add-workaround-for-krb5-config-outputting-CFLAGS.patch
+PATCHFILES += 0009-giving-precedence-to-statvfs-in-printers.c.patch
BUILD_DEP_PKGS = CSWggettext
BUILD_DEP_PKGS += CSWjpeg
@@ -77,12 +78,19 @@
PACKAGES += CSWcupsdoc
PACKAGES += CSWcupsdev
PACKAGES += CSWcups
-PACKAGES += CSWcupslinks
-INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu
-CATALOGNAME_CSWcupslinks = cups_links
+
+# The problematic cupslinks package
+# PACKAGES += CSWcupslinks
+# INCOMPATIBLE_PKGS_CSWcupslinks = SUNWpcr SUNWpcu
+# CATALOGNAME_CSWcupslinks = cups_links
+# ARCHALL_CSWcupslinks = 1
+# PKGFILES_CSWcupslinks = /usr/sbin/.*
+# PKGFILES_CSWcupslinks += /usr/bin/.*
+# SPKG_DESC_CSWcupslinks = Drop-in replacement for SUNWpcu and SUNWpcr
+# CUPSLINKS_TARGET = cupslinks
+
ARCHALL_CSWcups = 1
-ARCHALL_CSWcupslinks = 1
ARCHALL_CSWcupsdoc = 1
RUNTIME_DEP_PKGS_CSWcups += CSWcupsd
@@ -91,6 +99,7 @@
RUNTIME_DEP_PKGS_CSWcupsd += CSWkrb5lib
RUNTIME_DEP_PKGS_CSWcupsd += CSWlibdbus
RUNTIME_DEP_PKGS_CSWcupsd += CSWzlib
+RUNTIME_DEP_PKGS_CSWcupsd += CSWoldaprt
RUNTIME_DEP_PKGS_CSWcupsdev += CSWlibcups
@@ -151,8 +160,6 @@
PKGFILES_CSWcupsclient += $(mandir)/man5/ppdcfile\.5
PKGFILES_CSWcupsclient += $(mandir)/man7/(drv|notifier)\.7
PKGFILES_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW
-PKGFILES_CSWcupslinks = /usr/sbin/.*
-PKGFILES_CSWcupslinks += /usr/bin/.*
SPKG_DESC_CSWcups = Common Unix Printing System
SPKG_DESC_CSWlibcups = Empty transitional package (was: CUPS libraries)
@@ -160,7 +167,6 @@
SPKG_DESC_CSWcupsclient = CUPS client binaries
SPKG_DESC_CSWcupsdoc = CUPS documentation
SPKG_DESC_CSWcupsdev = CUPS header files
-SPKG_DESC_CSWcupslinks = Drop-in replacement for SUNWpcu and SUNWpcr
# Packages compliant with the shared library policy.
PACKAGES += CSWlibcups2
@@ -255,6 +261,9 @@
CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcupsimage2
CHECKPKG_OVERRIDES_CSWcupsdev += surplus-dependency|CSWlibcupscgi1
+CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsclient
+CHECKPKG_OVERRIDES_CSWcups += surplus-dependency|CSWcupsd
+
# http://lists.opencsw.org/pipermail/maintainers/2009-September/004249.html
SAMPLECONF_CSWcupsd = $(sysconfdir)/cups/cupsd\.conf\.CSW
SAMPLECONF_CSWcupsclient += $(sysconfdir)/cups/client\.conf\.CSW
@@ -312,12 +321,12 @@
# The following overrides are necessary because of a bug in krb5-config, please
# see bug http://www.opencsw.org/bugtrack/view.php?id=4384
-CHECKPKG_OVERRIDES_CSWcupsd += bad-rpath-entry|/opt/csw/lib/|opt/csw/sbin/cupsd
-CHECKPKG_OVERRIDES_CSWlibcups2 += bad-rpath-entry|/opt/csw/lib/|opt/csw/lib/libcups.so.2
+CHECKPKG_OVERRIDES_CSWcupsd += bad-rpath-entry
+CHECKPKG_OVERRIDES_CSWlibcups2 += bad-rpath-entry
include gar/category.mk
-post-install-modulated:
+post-install-modulated: $(CUPSLINKS_TARGET)
(cd $(DESTDIR)$(sysconfdir)/cups; \
echo "Making .CSW configs in $(DESTDIR)$(sysconfdir)/cups"; \
for i in cupsd.conf; do \
@@ -330,6 +339,13 @@
ginstall -m 644 \
$(FILEDIR)/client.conf.CSW \
$(DESTDIR)$(sysconfdir)/cups/client.conf.CSW
+ for f in $(DESTDIR)$(libdir)/cups/backend/*; do \
+ chmod 0700 $${f}; \
+ done
+ @$(MAKECOOKIE)
+
+cupslinks:
+ # https://www.opencsw.org/mantis/view.php?id=2924
ginstall -d -m 755 $(DESTDIR)/usr/bin
for f in cancel lp lpoptions lppassd lpq lpr lprm lpstat; do \
ln -s ../../opt/csw/bin/$$f $(DESTDIR)/usr/bin/$$f; \
@@ -338,7 +354,3 @@
for f in accept lpadmin lpc lpinfo lpmove reject; do \
ln -s ../../opt/csw/sbin/$$f $(DESTDIR)/usr/sbin/$$f; \
done
- for f in $(DESTDIR)$(libdir)/cups/backend/*; do \
- chmod 0700 $${f}; \
- done
- @$(MAKECOOKIE)
Added: csw/mgar/pkg/cups/trunk/files/0009-giving-precedence-to-statvfs-in-printers.c.patch
===================================================================
--- csw/mgar/pkg/cups/trunk/files/0009-giving-precedence-to-statvfs-in-printers.c.patch (rev 0)
+++ csw/mgar/pkg/cups/trunk/files/0009-giving-precedence-to-statvfs-in-printers.c.patch 2010-12-12 23:55:19 UTC (rev 11894)
@@ -0,0 +1,42 @@
+From 6773ba8aafda87c8f4a5ebee4fd919037cd24f35 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Sun, 12 Dec 2010 03:24:12 +0100
+Subject: [PATCH] giving precedence to statvfs in printers.c
+
+---
+ scheduler/printers.c | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/scheduler/printers.c b/scheduler/printers.c
+index 0b8aff1..31bcbc4 100644
+--- a/scheduler/printers.c
++++ b/scheduler/printers.c
+@@ -490,19 +490,19 @@ cupsdCreateCommonData(void)
+ * or the filesystem is larger than 2TiB, always report INT_MAX.
+ */
+
+-#ifdef HAVE_STATFS
+- if (statfs(RequestRoot, &spoolinfo))
++#ifdef HAVE_STATVFS
++ if (statvfs(RequestRoot, &spoolinfo))
+ k_supported = INT_MAX;
+- else if ((spoolsize = (double)spoolinfo.f_bsize * spoolinfo.f_blocks / 1024) >
++ else if ((spoolsize = (double)spoolinfo.f_frsize * spoolinfo.f_blocks / 1024) >
+ INT_MAX)
+ k_supported = INT_MAX;
+ else
+ k_supported = (int)spoolsize;
+
+-#elif defined(HAVE_STATVFS)
+- if (statvfs(RequestRoot, &spoolinfo))
++#elif defined(HAVE_STATFS)
++ if (statfs(RequestRoot, &spoolinfo))
+ k_supported = INT_MAX;
+- else if ((spoolsize = (double)spoolinfo.f_frsize * spoolinfo.f_blocks / 1024) >
++ else if ((spoolsize = (double)spoolinfo.f_bsize * spoolinfo.f_blocks / 1024) >
+ INT_MAX)
+ k_supported = INT_MAX;
+ else
+--
+1.7.3.2
+
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